Merge pull request #10684 from jarvte/fix_athandler_destr

0xc0170 · web-flow · commit aba076065225 · 2019-09-04T11:52:59.000+02:00
Cellular: fix ATHandler destructor possible crash on delete
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularbase/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularbase/unittest.cmake
@@ -25,4 +25,6 @@ set(unittest-test-sources
   stubs/ATHandler_stub.cpp
   stubs/EventQueue_stub.cpp
   stubs/FileHandle_stub.cpp
+  stubs/ConditionVariable_stub.cpp
+  stubs/Mutex_stub.cpp
 )
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularcontext/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularcontext/unittest.cmake
@@ -42,4 +42,6 @@ set(unittest-test-sources
   stubs/CellularContext_stub.cpp
   stubs/CellularUtil_stub.cpp
   stubs/SocketAddress_stub.cpp
+  stubs/ConditionVariable_stub.cpp
+  stubs/Mutex_stub.cpp
 )
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellulardevice/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellulardevice/unittest.cmake
@@ -43,6 +43,8 @@ set(unittest-test-sources
   stubs/SerialBase_stub.cpp
   stubs/CellularStateMachine_stub.cpp
   stubs/CellularContext_stub.cpp
+  stubs/ConditionVariable_stub.cpp
+  stubs/Mutex_stub.cpp
 )
 
 # defines
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularinformation/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularinformation/unittest.cmake
@@ -25,4 +25,6 @@ set(unittest-test-sources
   stubs/EventQueue_stub.cpp
   stubs/FileHandle_stub.cpp
   stubs/mbed_assert_stub.c
+  stubs/ConditionVariable_stub.cpp
+  stubs/Mutex_stub.cpp
 )
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularnetwork/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularnetwork/unittest.cmake
@@ -28,4 +28,6 @@ set(unittest-test-sources
   stubs/mbed_assert_stub.c
   stubs/SocketAddress_stub.cpp
   stubs/randLIB_stub.cpp
+  stubs/ConditionVariable_stub.cpp
+  stubs/Mutex_stub.cpp
 )
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularsms/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularsms/unittest.cmake
@@ -27,4 +27,7 @@ set(unittest-test-sources
   stubs/us_ticker_stub.cpp
   stubs/mbed_assert_stub.c
   stubs/ThisThread_stub.cpp
+  stubs/mbed_wait_api_stub.cpp
+  stubs/ConditionVariable_stub.cpp
+  stubs/Mutex_stub.cpp
 )
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularstack/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularstack/unittest.cmake
@@ -29,4 +29,6 @@ set(unittest-test-sources
   stubs/SocketAddress_stub.cpp
   stubs/mbed_assert_stub.c
   stubs/ThisThread_stub.cpp
+  stubs/ConditionVariable_stub.cpp
+  stubs/Mutex_stub.cpp
 )
diff --git a/UNITTESTS/features/cellular/framework/AT/athandler/athandlertest.cpp b/UNITTESTS/features/cellular/framework/AT/athandler/athandlertest.cpp
@@ -51,6 +51,7 @@ class TestATHandler : public testing::Test {
         urc_callback_count = 0;
         CellularUtil_stub::char_ptr = NULL;
         CellularUtil_stub::char_pos = 0;
+        filehandle_stub_short_value_counter = 0;
     }
 
     void TearDown()
@@ -352,6 +353,7 @@ TEST_F(TestATHandler, test_ATHandler_cmd_start)
 {
     EventQueue que;
     FileHandle_stub fh1;
+    fh1.short_value = 0;
 
     ATHandler at(&fh1, que, 0, ",");
     mbed_poll_stub::revents_value = POLLOUT;
diff --git a/UNITTESTS/features/cellular/framework/AT/athandler/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/athandler/unittest.cmake
@@ -5,10 +5,12 @@
 
 # Add test specific include paths
 set(unittest-includes ${unittest-includes}
-  features/cellular/framework/common/util
+  ../platform
+  ../features/cellular/framework/common/util
   ../features/cellular/framework/common
   ../features/cellular/framework/AT
   ../features/frameworks/mbed-client-randlib/mbed-client-randlib
+  
 )
 
 # Source files
@@ -31,6 +33,10 @@ set(unittest-test-sources
   stubs/ThisThread_stub.cpp
   stubs/randLIB_stub.cpp
   stubs/CellularUtil_stub.cpp
+  stubs/ConditionVariable_stub.cpp
+  stubs/Mutex_stub.cpp
+  stubs/mbed_rtos_rtx_stub.c
+  stubs/rtx_mutex_stub.c
 )
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMBED_CONF_CELLULAR_DEBUG_AT=true -DOS_STACK_SIZE=2048")
diff --git a/UNITTESTS/features/cellular/framework/device/cellularcontext/unittest.cmake b/UNITTESTS/features/cellular/framework/device/cellularcontext/unittest.cmake
@@ -35,6 +35,8 @@ set(unittest-test-sources
   stubs/CellularDevice_stub.cpp
   stubs/equeue_stub.c
   stubs/ThisThread_stub.cpp
+  stubs/ConditionVariable_stub.cpp
+  stubs/Mutex_stub.cpp
 )
 
 # defines
diff --git a/UNITTESTS/features/cellular/framework/device/cellulardevice/unittest.cmake b/UNITTESTS/features/cellular/framework/device/cellulardevice/unittest.cmake
@@ -33,6 +33,8 @@ set(unittest-test-sources
   stubs/NetworkInterface_stub.cpp
   stubs/NetworkInterfaceDefaults_stub.cpp
   stubs/CellularContext_stub.cpp
+  stubs/ConditionVariable_stub.cpp
+  stubs/Mutex_stub.cpp
 )
 
 # defines
diff --git a/UNITTESTS/features/cellular/framework/device/cellularstatemachine/unittest.cmake b/UNITTESTS/features/cellular/framework/device/cellularstatemachine/unittest.cmake
@@ -38,6 +38,8 @@ set(unittest-test-sources
   stubs/EventQueue_stub.cpp
   stubs/equeue_stub.c
   stubs/CellularContext_stub.cpp
+  stubs/ConditionVariable_stub.cpp
+  stubs/Mutex_stub.cpp
 )
 
 # defines
diff --git a/UNITTESTS/features/lorawan/loramac/unittest.cmake b/UNITTESTS/features/lorawan/loramac/unittest.cmake
@@ -40,10 +40,13 @@ set(unittest-test-sources
   stubs/LoRaWANTimer_stub.cpp
   stubs/LoRaMacCommand_stub.cpp
   stubs/EventQueue_stub.cpp
-
+  stubs/Mutex_stub.cpp
 )
 
 # defines
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMBED_CONF_RTOS_PRESENT=1")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMBED_CONF_RTOS_PRESENT=1")
+
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMBED_CONF_LORA_ADR_ON=true -DMBED_CONF_LORA_PUBLIC_NETWORK=true -DMBED_CONF_LORA_NB_TRIALS=2 -DMBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMBED_CONF_LORA_ADR_ON=true -DMBED_CONF_LORA_PUBLIC_NETWORK=true -DMBED_CONF_LORA_NB_TRIALS=2 -DMBED_CONF_LORA_DOWNLINK_PREAMBLE_LENGTH=5")
 
diff --git a/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake b/UNITTESTS/features/lorawan/lorawaninterface/unittest.cmake
@@ -41,6 +41,7 @@ set(unittest-test-sources
   stubs/LoRaWANTimer_stub.cpp
   stubs/LoRaMacCommand_stub.cpp
   stubs/LoRaPHYEU868_stub.cpp
+  stubs/Mutex_stub.cpp
 )
 
 # defines
diff --git a/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake b/UNITTESTS/features/lorawan/lorawanstack/unittest.cmake
@@ -42,7 +42,7 @@ set(unittest-test-sources
   stubs/LoRaMacCommand_stub.cpp
   stubs/EventQueue_stub.cpp
   stubs/equeue_stub.c
-
+  stubs/Mutex_stub.cpp
 )
 
 # defines
diff --git a/UNITTESTS/stubs/ATHandler_stub.cpp b/UNITTESTS/stubs/ATHandler_stub.cpp
@@ -83,6 +83,9 @@ void ATHandler_stub::debug_call_count_clear()
 
 ATHandler::ATHandler(FileHandle *fh, EventQueue &queue, uint32_t timeout, const char *output_delimiter, uint16_t send_delay) :
     _nextATHandler(0),
+#if defined AT_HANDLER_MUTEX && defined MBED_CONF_RTOS_PRESENT
+    _oobCv(_fileHandleMutex),
+#endif
     _fileHandle(fh),
     _queue(queue),
     _ref_count(1),
diff --git a/UNITTESTS/stubs/ConditionVariable_stub.cpp b/UNITTESTS/stubs/ConditionVariable_stub.cpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2019, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef MBED_OS_UNITTESTS_STUBS_CONDITIONVARIABLE_STUB_CPP_
+#define MBED_OS_UNITTESTS_STUBS_CONDITIONVARIABLE_STUB_CPP_
+
+#include "ConditionVariable_stub.h"
+#include "mbed_error.h"
+#include "mbed_assert.h"
+
+bool ConditionVariable_stub::time_out = false;
+#ifdef MBED_CONF_RTOS_PRESENT
+using namespace rtos;
+
+ConditionVariable::ConditionVariable(Mutex &mutex): _mutex(mutex), _wait_list(0)
+{
+    // No initialization to do
+}
+
+ConditionVariable::~ConditionVariable()
+{
+}
+
+void ConditionVariable::notify_one()
+{
+
+}
+
+void ConditionVariable::wait()
+{
+}
+
+bool ConditionVariable::wait_for(uint32_t millisec)
+{
+    return ConditionVariable_stub::time_out;
+}
+
+void ConditionVariable::notify_all()
+{
+}
+#endif
+#endif /* MBED_OS_UNITTESTS_STUBS_CONDITIONVARIABLE_STUB_CPP_ */
diff --git a/UNITTESTS/stubs/ConditionVariable_stub.h b/UNITTESTS/stubs/ConditionVariable_stub.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2019, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef MBED_OS_UNITTESTS_STUBS_CONDITIONVARIABLE_STUB_H_
+#define MBED_OS_UNITTESTS_STUBS_CONDITIONVARIABLE_STUB_H_
+
+#include "rtos/ConditionVariable.h"
+
+namespace ConditionVariable_stub {
+extern bool time_out;
+}
+
+
+#endif /* MBED_OS_UNITTESTS_STUBS_CONDITIONVARIABLE_STUB_H_ */
diff --git a/UNITTESTS/stubs/mbed_rtos_rtx_stub.c b/UNITTESTS/stubs/mbed_rtos_rtx_stub.c
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2019, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "cmsis_os2.h"
+
+osMutexId_t               singleton_mutex_id;
diff --git a/UNITTESTS/stubs/rtx_mutex_stub.c b/UNITTESTS/stubs/rtx_mutex_stub.c
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2019, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "cmsis_os2.h"
+
+osStatus_t osMutexAcquire(osMutexId_t mutex_id, uint32_t timeout)
+{
+    return osOK;
+}
+
+osStatus_t osMutexRelease(osMutexId_t mutex_id)
+{
+    return osOK;
+}
diff --git a/UNITTESTS/target_h/cmsis_os2.h b/UNITTESTS/target_h/cmsis_os2.h
@@ -18,14 +18,16 @@
 #ifndef __CMSIS_OS2_H__
 #define __CMSIS_OS2_H__
 
+#ifdef  __cplusplus
+extern "C"
+{
+#endif
+
 #include <inttypes.h>
 
 //If conflicts, then remove these, copied from cmsis_os.h
 typedef int32_t                  osStatus;
 
-#define osOK 0
-#define osErrorNoMemory -5
-
 
 //These are from cmsis_os2.h
 typedef void *osSemaphoreId_t;
@@ -37,13 +39,27 @@ typedef struct {
     uint32_t                   cb_size;   ///< size of provided memory for control block
 } osSemaphoreAttr_t;
 
+/// Status code values returned by CMSIS-RTOS functions.
+typedef enum {
+    osOK                      =  0,         ///< Operation completed successfully.
+    osError                   = -1,         ///< Unspecified RTOS error: run-time error but no other error message fits.
+    osErrorTimeout            = -2,         ///< Operation not completed within the timeout period.
+    osErrorResource           = -3,         ///< Resource not available.
+    osErrorParameter          = -4,         ///< Parameter error.
+    osErrorNoMemory           = -5,         ///< System is out of memory: it was impossible to allocate or reserve memory for the operation.
+    osErrorISR                = -6,         ///< Not allowed in ISR context: the function cannot be called from interrupt service routines.
+    osStatusReserved          = 0x7FFFFFFF  ///< Prevents enum down-size compiler optimization.
+} osStatus_t;
+
 //Thread
 typedef enum {
     osPriorityNormal        = 24       ///< Priority: normal
 } osPriority_t;
 
 typedef void *osThreadId_t;
 
+typedef void *osMutexId_t;
+
 typedef void *osEventFlagsId_t;
 
 /// Attributes structure for thread.
@@ -74,5 +90,19 @@ typedef struct {
 #define osMutexPrioInherit    0x00000002U ///< Priority inherit protocol.
 #define osMutexRobust         0x00000008U ///< Robust mutex.
 
+/// Acquire a Mutex or timeout if it is locked.
+/// \param[in]     mutex_id      mutex ID obtained by \ref osMutexNew.
+/// \param[in]     timeout       \ref CMSIS_RTOS_TimeOutValue or 0 in case of no time-out.
+/// \return status code that indicates the execution status of the function.
+osStatus_t osMutexAcquire(osMutexId_t mutex_id, uint32_t timeout);
+
+/// Release a Mutex that was acquired by \ref osMutexAcquire.
+/// \param[in]     mutex_id      mutex ID obtained by \ref osMutexNew.
+/// \return status code that indicates the execution status of the function.
+osStatus_t osMutexRelease(osMutexId_t mutex_id);
+
+#ifdef  __cplusplus
+}
+#endif
 
 #endif
diff --git a/features/cellular/framework/AT/ATHandler.cpp b/features/cellular/framework/AT/ATHandler.cpp
diff --git a/features/cellular/framework/AT/ATHandler.h b/features/cellular/framework/AT/ATHandler.h
diff --git a/features/cellular/framework/AT/AT_CellularStack.h b/features/cellular/framework/AT/AT_CellularStack.h

Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,6 @@ set(unittest-test-sources`
`25`	`25`	`stubs/ATHandler_stub.cpp`
`26`	`26`	`stubs/EventQueue_stub.cpp`
`27`	`27`	`stubs/FileHandle_stub.cpp`
	`28`	`+ stubs/ConditionVariable_stub.cpp`
	`29`	`+ stubs/Mutex_stub.cpp`
`28`	`30`	`)`
Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,6 @@ set(unittest-test-sources`
`42`	`42`	`stubs/CellularContext_stub.cpp`
`43`	`43`	`stubs/CellularUtil_stub.cpp`
`44`	`44`	`stubs/SocketAddress_stub.cpp`
	`45`	`+ stubs/ConditionVariable_stub.cpp`
	`46`	`+ stubs/Mutex_stub.cpp`
`45`	`47`	`)`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ set(unittest-test-sources`
`43`	`43`	`stubs/SerialBase_stub.cpp`
`44`	`44`	`stubs/CellularStateMachine_stub.cpp`
`45`	`45`	`stubs/CellularContext_stub.cpp`
	`46`	`+ stubs/ConditionVariable_stub.cpp`
	`47`	`+ stubs/Mutex_stub.cpp`
`46`	`48`	`)`
`47`	`49`
`48`	`50`	`# defines`
Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,6 @@ set(unittest-test-sources`
`28`	`28`	`stubs/mbed_assert_stub.c`
`29`	`29`	`stubs/SocketAddress_stub.cpp`
`30`	`30`	`stubs/randLIB_stub.cpp`
	`31`	`+ stubs/ConditionVariable_stub.cpp`
	`32`	`+ stubs/Mutex_stub.cpp`
`31`	`33`	`)`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,7 @@ set(unittest-test-sources`
`27`	`27`	`stubs/us_ticker_stub.cpp`
`28`	`28`	`stubs/mbed_assert_stub.c`
`29`	`29`	`stubs/ThisThread_stub.cpp`
	`30`	`+ stubs/mbed_wait_api_stub.cpp`
	`31`	`+ stubs/ConditionVariable_stub.cpp`
	`32`	`+ stubs/Mutex_stub.cpp`
`30`	`33`	`)`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,6 @@ set(unittest-test-sources`
`29`	`29`	`stubs/SocketAddress_stub.cpp`
`30`	`30`	`stubs/mbed_assert_stub.c`
`31`	`31`	`stubs/ThisThread_stub.cpp`
	`32`	`+ stubs/ConditionVariable_stub.cpp`
	`33`	`+ stubs/Mutex_stub.cpp`
`32`	`34`	`)`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ class TestATHandler : public testing::Test {`
`51`	`51`	`urc_callback_count = 0;`
`52`	`52`	`CellularUtil_stub::char_ptr = NULL;`
`53`	`53`	`CellularUtil_stub::char_pos = 0;`
	`54`	`+ filehandle_stub_short_value_counter = 0;`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`void TearDown()`
`@@ -352,6 +353,7 @@ TEST_F(TestATHandler, test_ATHandler_cmd_start)`
`352`	`353`	`{`
`353`	`354`	`EventQueue que;`
`354`	`355`	`FileHandle_stub fh1;`
	`356`	`+ fh1.short_value = 0;`
`355`	`357`
`356`	`358`	`ATHandler at(&fh1, que, 0, ",");`
`357`	`359`	`mbed_poll_stub::revents_value = POLLOUT;`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ set(unittest-test-sources`
`35`	`35`	`stubs/CellularDevice_stub.cpp`
`36`	`36`	`stubs/equeue_stub.c`
`37`	`37`	`stubs/ThisThread_stub.cpp`
	`38`	`+ stubs/ConditionVariable_stub.cpp`
	`39`	`+ stubs/Mutex_stub.cpp`
`38`	`40`	`)`
`39`	`41`
`40`	`42`	`# defines`