Merge pull request #15454 from world-direct/feature/cellularevents

0xc0170 · web-flow · commit b3a5d6a47338 · 2023-09-14T11:23:48.000+02:00
make cellular event queue size configurable
diff --git a/connectivity/cellular/mbed_lib.json b/connectivity/cellular/mbed_lib.json
@@ -48,6 +48,10 @@
         "at-handler-buffer-size" : {
             "help": "Size of the AT handler buffer",
             "value": 32
+        },
+        "event-queue-size": {
+            "help": "The amount of events the default EventQueue should store",
+            "value": 10
         }
     }
 }
diff --git a/connectivity/cellular/source/framework/device/CellularDevice.cpp b/connectivity/cellular/source/framework/device/CellularDevice.cpp
@@ -39,7 +39,7 @@ CellularDevice::CellularDevice() :
 #if MBED_CONF_CELLULAR_USE_SMS
     _sms_ref_count(0),
 #endif //MBED_CONF_CELLULAR_USE_SMS
-    _info_ref_count(0), _queue(10 * EVENTS_EVENT_SIZE), _state_machine(0),
+    _info_ref_count(0), _queue(MBED_CONF_CELLULAR_EVENT_QUEUE_SIZE * EVENTS_EVENT_SIZE), _state_machine(0),
     _status_cb(), _nw(0)
 #ifdef MBED_CONF_RTOS_PRESENT
     , _queue_thread(osPriorityNormal, 2048, NULL, "cellular_queue")
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/athandler/CMakeLists.txt
@@ -15,6 +15,7 @@ target_compile_definitions(${TEST_NAME}
         DEVICE_INTERRUPTIN=1
         MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
         MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE=32
+        MBED_CONF_CELLULAR_EVENT_QUEUE_SIZE=10
         MBED_CONF_RTOS_PRESENT=1
 )
 
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
@@ -21,6 +21,7 @@ target_compile_definitions(${TEST_NAME}
         DEVICE_INTERRUPTIN=1
         MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
         MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE=32
+        MBED_CONF_CELLULAR_EVENT_QUEUE_SIZE=10
 )
 
 target_sources(${TEST_NAME}
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellulardevice/CMakeLists.txt
@@ -19,6 +19,7 @@ target_compile_definitions(${TEST_NAME}
         DEVICE_INTERRUPTIN=1
         MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
         MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE=32
+        MBED_CONF_CELLULAR_EVENT_QUEUE_SIZE=10
 )
 
 target_sources(${TEST_NAME}
diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularstatemachine/CMakeLists.txt
@@ -20,6 +20,7 @@ target_compile_definitions(${TEST_NAME}
         DEVICE_INTERRUPTIN=1
         MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
         MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE=32
+        MBED_CONF_CELLULAR_EVENT_QUEUE_SIZE=10
 )
 
 target_sources(${TEST_NAME}

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,10 @@`
`48`	`48`	`"at-handler-buffer-size" : {`
`49`	`49`	`"help": "Size of the AT handler buffer",`
`50`	`50`	`"value": 32`
	`51`	`+ },`
	`52`	`+ "event-queue-size": {`
	`53`	`+ "help": "The amount of events the default EventQueue should store",`
	`54`	`+ "value": 10`
`51`	`55`	`}`
`52`	`56`	`}`
`53`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ target_compile_definitions(${TEST_NAME}`
`15`	`15`	`DEVICE_INTERRUPTIN=1`
`16`	`16`	`MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200`
`17`	`17`	`MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE=32`
	`18`	`+ MBED_CONF_CELLULAR_EVENT_QUEUE_SIZE=10`
`18`	`19`	`MBED_CONF_RTOS_PRESENT=1`
`19`	`20`	`)`
`20`	`21`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ target_compile_definitions(${TEST_NAME}`
`21`	`21`	`DEVICE_INTERRUPTIN=1`
`22`	`22`	`MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200`
`23`	`23`	`MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE=32`
	`24`	`+ MBED_CONF_CELLULAR_EVENT_QUEUE_SIZE=10`
`24`	`25`	`)`
`25`	`26`
`26`	`27`	`target_sources(${TEST_NAME}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ target_compile_definitions(${TEST_NAME}`
`19`	`19`	`DEVICE_INTERRUPTIN=1`
`20`	`20`	`MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200`
`21`	`21`	`MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE=32`
	`22`	`+ MBED_CONF_CELLULAR_EVENT_QUEUE_SIZE=10`
`22`	`23`	`)`
`23`	`24`
`24`	`25`	`target_sources(${TEST_NAME}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ target_compile_definitions(${TEST_NAME}`
`20`	`20`	`DEVICE_INTERRUPTIN=1`
`21`	`21`	`MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200`
`22`	`22`	`MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE=32`
	`23`	`+ MBED_CONF_CELLULAR_EVENT_QUEUE_SIZE=10`
`23`	`24`	`)`
`24`	`25`
`25`	`26`	`target_sources(${TEST_NAME}`