sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

examples/ostest: Add some delays to the pthread cancellation test. With deferred cancellation enabled, things happen more asynchronously

Browse Source
This commit is contained in:
Gregory Nutt 2016-12-10 16:41:16 -06:00
parent 8586535eb7
commit 5d48dd4871
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
examples/ostest/cancel.c
View File

@ -90,7 +90,7 @@ static FAR void *thread_waiter(FAR void *parameter)
}
}
/* The wait -- we will never awaken from this. */
/* Then wait -- we will never awaken from this. */
status = pthread_cond_wait(&cond, &mutex);
if (status != 0)
@ -210,11 +210,15 @@ void cancel_test(void)
/* Test 1: Normal Cancel *********************************************/
/* Start the waiter thread */
printf("cancel_test: Test 1: Normal Cancelation\n");
printf("cancel_test: Test 1: Normal Cancellation\n");
printf("cancel_test: Starting thread\n");
start_thread(&waiter, 1);
/* Then cancel it. It should be in the pthread_cond_wait now */
/* Then cancel it. It should be in the pthread_cond_wait now -- wait
* bit to make sure.
*/
usleep(100*1000);
printf("cancel_test: Canceling thread\n");
status = pthread_cancel(waiter);
@ -248,7 +252,7 @@ void cancel_test(void)
/* Test 2: Cancel Detached Thread ************************************/
printf("cancel_test: Test 2: Cancelation of detached thread\n");
printf("cancel_test: Test 2: Cancellation of detached thread\n");
printf("cancel_test: Re-starting thread\n");
restart_thread(&waiter, 1);
@ -260,7 +264,11 @@ void cancel_test(void)
printf("cancel_test: ERROR pthread_detach, status=%d\n", status);
}
/* Then cancel it. It should be in the pthread_cond_wait now */
/* Then cancel it. It should be in the pthread_cond_wait now -- wait a
* bit to be certain.
*/
usleep(100*1000);
printf("cancel_test: Canceling thread\n");
status = pthread_cancel(waiter);
@ -269,6 +277,15 @@ void cancel_test(void)
printf("cancel_test: ERROR pthread_cancel failed, status=%d\n", status);
}
#ifdef CONFIG_CANCELLATION_POINTS
/* If we are doing deferred cancellation, then we will have to wait a bit
* of the fallowing pthread_join() may succeed because it happens before
* before the cancellation.
*/
usleep(500*1000);
#endif
/* Join should now fail */
printf("cancel_test: Joining\n");
@ -309,6 +326,8 @@ void cancel_test(void)
* The cancelation should succeed, because the cancelation is pending.
*/
usleep(100*1000);
printf("cancel_test: Canceling thread\n");
status = pthread_cancel(waiter);
if (status != 0)