Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/queue_registry_test' into 'master'

Browse source 
unit tests: fix queue registry test

See merge request !1528
This commit is contained in:
Ivan Grokhotkov 2017-11-15 14:51:18 +08:00
commit a4f9dfc6a4
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
components/freertos/test/test_freertos_debug_functions.c
View file

@ -18,7 +18,7 @@
#define NO_OF_QUEUES_TOTAL (NO_OF_QUEUES_PER_CORE * portNUM_PROCESSORS) #define NO_OF_QUEUES_TOTAL (NO_OF_QUEUES_PER_CORE * portNUM_PROCESSORS)
#define QUEUE_NAME_MAX_LENGTH 10 #define QUEUE_NAME_MAX_LENGTH 10
static SemaphoreHandle_t start_sem = NULL; static SemaphoreHandle_t start_sem[portNUM_PROCESSORS];
static SemaphoreHandle_t done_sem = NULL; static SemaphoreHandle_t done_sem = NULL;
static char *names[NO_OF_QUEUES_TOTAL]; static char *names[NO_OF_QUEUES_TOTAL];
static QueueHandle_t handles[NO_OF_QUEUES_TOTAL]; static QueueHandle_t handles[NO_OF_QUEUES_TOTAL];
@ -34,7 +34,7 @@ void test_queue_registry_task(void *arg)
sprintf(names[i + offset], "Queue%d%d", core, i); sprintf(names[i + offset], "Queue%d%d", core, i);
} }
xSemaphoreTake(start_sem, portMAX_DELAY); //Wait for start vQueueAddToRegistry() xSemaphoreTake(start_sem[core], portMAX_DELAY); //Wait for start vQueueAddToRegistry()
for(int i = 0; i < NO_OF_QUEUES_PER_CORE; i++){ for(int i = 0; i < NO_OF_QUEUES_PER_CORE; i++){
vQueueAddToRegistry(handles[i + offset] , names[i + offset]); //Register queues to queue registry vQueueAddToRegistry(handles[i + offset] , names[i + offset]); //Register queues to queue registry
} }
@ -42,7 +42,7 @@ void test_queue_registry_task(void *arg)
vTaskDelay(1); vTaskDelay(1);
xSemaphoreTake(start_sem, portMAX_DELAY); //Wait to start vQueueUnregisterQueue() xSemaphoreTake(start_sem[core], portMAX_DELAY); //Wait to start vQueueUnregisterQueue()
for(int i = 0; i < NO_OF_QUEUES_PER_CORE; i++){ for(int i = 0; i < NO_OF_QUEUES_PER_CORE; i++){
vQueueDelete(handles[i + offset]); //Internally calls vQueueUnregisterQueue vQueueDelete(handles[i + offset]); //Internally calls vQueueUnregisterQueue
} }
@ -53,16 +53,16 @@ void test_queue_registry_task(void *arg)
TEST_CASE("Test FreeRTOS Queue Registry", "[freertos]") TEST_CASE("Test FreeRTOS Queue Registry", "[freertos]")
{ {
//Create synchronization semaphores //Create synchronization semaphores and tasks to test queue registry
start_sem = xSemaphoreCreateCounting(portNUM_PROCESSORS, 0);
done_sem = xSemaphoreCreateCounting(portNUM_PROCESSORS, 0); done_sem = xSemaphoreCreateCounting(portNUM_PROCESSORS, 0);
for(int i = 0; i < portNUM_PROCESSORS; i++){ //Create tasks to test queue registry for(int i = 0; i < portNUM_PROCESSORS; i++){
start_sem[i] = xSemaphoreCreateBinary();
xTaskCreatePinnedToCore(test_queue_registry_task, "testing task", 4096, NULL, UNITY_FREERTOS_PRIORITY+1, NULL, i); xTaskCreatePinnedToCore(test_queue_registry_task, "testing task", 4096, NULL, UNITY_FREERTOS_PRIORITY+1, NULL, i);
} }
portDISABLE_INTERRUPTS(); portDISABLE_INTERRUPTS();
for(int i = 0; i < portNUM_PROCESSORS; i++){ for(int i = 0; i < portNUM_PROCESSORS; i++){
xSemaphoreGive(start_sem); //Trigger start xSemaphoreGive(start_sem[i]); //Trigger start
} }
portENABLE_INTERRUPTS(); portENABLE_INTERRUPTS();
for(int i = 0; i < portNUM_PROCESSORS; i++){ for(int i = 0; i < portNUM_PROCESSORS; i++){
@ -75,7 +75,7 @@ TEST_CASE("Test FreeRTOS Queue Registry", "[freertos]")
portDISABLE_INTERRUPTS(); portDISABLE_INTERRUPTS();
for(int i = 0; i < portNUM_PROCESSORS; i++){ for(int i = 0; i < portNUM_PROCESSORS; i++){
xSemaphoreGive(start_sem); //Trigger start xSemaphoreGive(start_sem[i]); //Trigger start
} }
portENABLE_INTERRUPTS(); portENABLE_INTERRUPTS();
for(int i = 0; i < portNUM_PROCESSORS; i++){ for(int i = 0; i < portNUM_PROCESSORS; i++){
@ -92,8 +92,10 @@ TEST_CASE("Test FreeRTOS Queue Registry", "[freertos]")
free(names[i]); free(names[i]);
names[i] = NULL; names[i] = NULL;
} }
vSemaphoreDelete(start_sem); for(int i = 0; i < portNUM_PROCESSORS; i++){
start_sem = NULL; vSemaphoreDelete(start_sem[i]);
start_sem[i] = NULL;
}
vSemaphoreDelete(done_sem); vSemaphoreDelete(done_sem);
done_sem = NULL; done_sem = NULL;
} }