Skip to content

Commit 0b868d5

Browse files
committed
General block device test: Fix thread stack allocation
The test case for multithreaded erase/program/read allocates a few Thread objects from the heap and starts them. It has a few problems: * To check that there will be enough heap to start a new thread, the test case tries to allocate a dummy buffer of the thread's heap size and then frees it, before starting the thread. Then the thread will allocate its own stack. Such check is not reliable, because threads that are already running also perform additional allocation (when running `test_thread_job()`) and may take away the memory we just checked. * When deleting all threads in a loop, the loop boundary misses the last thread if the last thread object was allocated but not started (i.e. due to failed thread stack allocation check). To fix the issues * Start a thread without any allocation test. Following the preceding commit "rtos: Thread: Make stack allocation failure runtime catchable", `Thread::start()` now returns `osErrorNoMemory` if stack allocation fails which we can handle. * Store pointers to all threads in a zero-initialized array, and free all elements at the end of the test.
1 parent 48cf1c9 commit 0b868d5

File tree

1 file changed

+11
-16
lines changed
  • storage/blockdevice/tests/TESTS/blockdevice/general_block_device

1 file changed

+11
-16
lines changed

storage/blockdevice/tests/TESTS/blockdevice/general_block_device/main.cpp

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -421,40 +421,35 @@ void test_multi_threads()
421421

422422
osStatus threadStatus;
423423
int i_ind, j_ind;
424-
char *dummy;
425424

426-
rtos::Thread **bd_thread = new (std::nothrow) rtos::Thread*[TEST_NUM_OF_THREADS];
427-
TEST_SKIP_UNLESS_MESSAGE((*bd_thread) != NULL, "not enough heap to run test.");
428-
memset(bd_thread, 0, TEST_NUM_OF_THREADS * sizeof(rtos::Thread *));
425+
rtos::Thread *bd_thread[TEST_NUM_OF_THREADS] {};
429426

430427
for (i_ind = 0; i_ind < TEST_NUM_OF_THREADS; i_ind++) {
431428

432429
bd_thread[i_ind] = new (std::nothrow) rtos::Thread((osPriority_t)((int)osPriorityNormal), TEST_THREAD_STACK_SIZE);
433-
dummy = new (std::nothrow) char[TEST_THREAD_STACK_SIZE];
434430

435-
if (!bd_thread[i_ind] || !dummy) {
436-
utest_printf("Not enough heap to run Thread %d !\n", i_ind + 1);
431+
if (!bd_thread[i_ind]) {
432+
utest_printf("Not enough heap to create Thread %d\n", i_ind + 1);
437433
break;
438434
}
439-
delete[] dummy;
440435

441436
threadStatus = bd_thread[i_ind]->start(callback(test_thread_job));
442-
if (threadStatus != 0) {
443-
utest_printf("Thread %d Start Failed!\n", i_ind + 1);
437+
if (threadStatus == osErrorNoMemory) {
438+
utest_printf("Not enough heap to start Thread %d\n", i_ind + 1);
439+
} else if (threadStatus != osOK) {
440+
utest_printf("Thread %d failed to start: %d\n", i_ind + 1, threadStatus);
444441
break;
445442
}
446443
}
447444

445+
// Join threads that successfully started
448446
for (j_ind = 0; j_ind < i_ind; j_ind++) {
449447
bd_thread[j_ind]->join();
450448
}
451449

452-
if (bd_thread) {
453-
for (j_ind = 0; j_ind < i_ind; j_ind++) {
454-
delete bd_thread[j_ind];
455-
}
456-
457-
delete[] bd_thread;
450+
// Delete all threads, even those that failed to start
451+
for (j_ind = 0; j_ind < TEST_NUM_OF_THREADS; j_ind++) {
452+
delete bd_thread[j_ind];
458453
}
459454
}
460455
#endif

0 commit comments

Comments
 (0)