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

pthreads: Re-order some operations so that mutexes are placed in the inconsistent state BEFORE the clean-up callbacks are called.

Browse Source
This commit is contained in:
Gregory Nutt 2017-04-10 08:11:16 -06:00
parent 755e9312b5
commit b51b72b2db
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sched/Kconfig
View File

@ -601,8 +601,6 @@ config PTHREAD_CLEANUP_STACKSIZE
8 for a CPU with 32-bit addressing and 4 for a CPU with 16-bit 8 for a CPU with 32-bit addressing and 4 for a CPU with 16-bit
addressing. addressing.
endmenu # Pthread Options
config CANCELLATION_POINTS config CANCELLATION_POINTS
bool "Cancellation points" bool "Cancellation points"
default n default n
@ -611,6 +609,8 @@ config CANCELLATION_POINTS
cancellation points will also used with the () task_delete() API even if cancellation points will also used with the () task_delete() API even if
pthreads are not enabled. pthreads are not enabled.
endmenu # Pthread Options
menu "Performance Monitoring" menu "Performance Monitoring"
config SCHED_CPULOAD config SCHED_CPULOAD

12
sched/pthread/pthread_cancel.c
View File

@ -145,6 +145,12 @@ int pthread_cancel(pthread_t thread)
pthread_exit(PTHREAD_CANCELED); pthread_exit(PTHREAD_CANCELED);
} }
#ifndef CONFIG_PTHREAD_MUTEX_UNSAFE
/* Recover any mutexes still held by the canceled thread */
pthread_mutex_inconsistent(tcb);
#endif
#ifdef CONFIG_PTHREAD_CLEANUP #ifdef CONFIG_PTHREAD_CLEANUP
/* Perform any stack pthread clean-up callbacks. /* Perform any stack pthread clean-up callbacks.
* *
@ -162,12 +168,6 @@ int pthread_cancel(pthread_t thread)
(void)pthread_completejoin((pid_t)thread, PTHREAD_CANCELED); (void)pthread_completejoin((pid_t)thread, PTHREAD_CANCELED);
#ifndef CONFIG_PTHREAD_MUTEX_UNSAFE
/* Recover any mutexes still held by the canceled thread */
pthread_mutex_inconsistent(tcb);
#endif
/* Then let task_terminate do the real work */ /* Then let task_terminate do the real work */
return task_terminate((pid_t)thread, false); return task_terminate((pid_t)thread, false);

12
sched/pthread/pthread_exit.c
View File

@ -105,6 +105,12 @@ void pthread_exit(FAR void *exit_value)
tcb->cpcount = 0; tcb->cpcount = 0;
#endif #endif
#ifndef CONFIG_PTHREAD_MUTEX_UNSAFE
/* Recover any mutexes still held by the canceled thread */
pthread_mutex_inconsistent((FAR struct pthread_tcb_s *)tcb);
#endif
#ifdef CONFIG_PTHREAD_CLEANUP #ifdef CONFIG_PTHREAD_CLEANUP
/* Perform any stack pthread clean-up callbacks */ /* Perform any stack pthread clean-up callbacks */
@ -123,12 +129,6 @@ void pthread_exit(FAR void *exit_value)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#ifndef CONFIG_PTHREAD_MUTEX_UNSAFE
/* Recover any mutexes still held by the canceled thread */
pthread_mutex_inconsistent((FAR struct pthread_tcb_s *)tcb);
#endif
/* Perform common task termination logic. This will get called again later /* Perform common task termination logic. This will get called again later
* through logic kicked off by _exit(). However, we need to call it before * through logic kicked off by _exit(). However, we need to call it before
* calling _exit() in order certain operations if this is the last thread * calling _exit() in order certain operations if this is the last thread

4
sched/pthread/pthread_mutexconsistent.c
View File

@ -119,7 +119,6 @@ int pthread_mutex_consistent(FAR pthread_mutex_t *mutex)
/* The thread associated with the PID no longer exists */ /* The thread associated with the PID no longer exists */
mutex->pid = -1; mutex->pid = -1;
mutex->flags &= _PTHREAD_MFLAGS_ROBUST;
#ifdef CONFIG_PTHREAD_MUTEX_TYPES #ifdef CONFIG_PTHREAD_MUTEX_TYPES
mutex->nlocks = 0; mutex->nlocks = 0;
#endif #endif
@ -132,6 +131,9 @@ int pthread_mutex_consistent(FAR pthread_mutex_t *mutex)
} }
} }
/* Clear the inconsistent flag in any case */
mutex->flags &= _PTHREAD_MFLAGS_ROBUST;
sched_unlock(); sched_unlock();
ret = OK; ret = OK;
} }