summaryrefslogtreecommitdiffstats
path: root/cpukit/libcsupport
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2014-03-25 10:54:49 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2014-03-31 08:29:43 +0200
commit1b1be254e7a3e3d6fe6d55d62010a81a7ef35411 (patch)
treec8bacf15b0f092728fd69debcb2387b65db33ed0 /cpukit/libcsupport
parentscore: Replace _Thread_Reset() (diff)
downloadrtems-1b1be254e7a3e3d6fe6d55d62010a81a7ef35411.tar.bz2
score: Thread life cycle re-implementation
The thread deletion is now supported on SMP. This change fixes the following PRs: PR1814: SMP race condition between stack free and dispatch PR2035: psxcancel reveals NULL pointer access in _Thread_queue_Extract() The POSIX cleanup handler are now called in the right context (should be called in the context of the terminating thread). http://pubs.opengroup.org/onlinepubs/009695399/functions/xsh_chap02_09.html Add a user extension the reflects a thread termination event. This is used to reclaim the Newlib reentrancy structure (may use file operations), the POSIX cleanup handlers and the POSIX key destructors.
Diffstat (limited to 'cpukit/libcsupport')
-rw-r--r--cpukit/libcsupport/include/rtems/libcsupport.h7
-rw-r--r--cpukit/libcsupport/src/newlibc_reent.c13
-rw-r--r--cpukit/libcsupport/src/resource_snapshot.c5
3 files changed, 18 insertions, 7 deletions
diff --git a/cpukit/libcsupport/include/rtems/libcsupport.h b/cpukit/libcsupport/include/rtems/libcsupport.h
index 8e56e4d250..7d40084ece 100644
--- a/cpukit/libcsupport/include/rtems/libcsupport.h
+++ b/cpukit/libcsupport/include/rtems/libcsupport.h
@@ -90,6 +90,10 @@ void newlib_delete_hook(
rtems_tcb *deleted_task
);
+void newlib_terminate_hook(
+ rtems_tcb *current_task
+);
+
#define RTEMS_NEWLIB_EXTENSION \
{ \
newlib_create_hook, /* rtems_task_create */ \
@@ -99,7 +103,8 @@ void newlib_delete_hook(
0, /* task_switch */ \
__RTEMS_NEWLIB_BEGIN, /* task_begin */ \
0, /* task_exitted */ \
- 0 /* fatal */ \
+ 0, /* fatal */ \
+ newlib_terminate_hook /* thread terminate */ \
}
typedef struct {
diff --git a/cpukit/libcsupport/src/newlibc_reent.c b/cpukit/libcsupport/src/newlibc_reent.c
index 88e5e183f8..cd3ac2a0ec 100644
--- a/cpukit/libcsupport/src/newlibc_reent.c
+++ b/cpukit/libcsupport/src/newlibc_reent.c
@@ -66,13 +66,16 @@ void newlib_delete_hook(
rtems_tcb *deleted_task
)
{
- struct _reent *ptr;
+ (void) current_task;
- ptr = deleted_task->libc_reent;
- deleted_task->libc_reent = NULL;
+ _Workspace_Free(deleted_task->libc_reent);
+}
- _reclaim_reent(ptr);
- _Workspace_Free(ptr);
+void newlib_terminate_hook(
+ rtems_tcb *current_task
+)
+{
+ _reclaim_reent(current_task->libc_reent);
}
#endif
diff --git a/cpukit/libcsupport/src/resource_snapshot.c b/cpukit/libcsupport/src/resource_snapshot.c
index 8ebbbdc84a..8c66f0f7c2 100644
--- a/cpukit/libcsupport/src/resource_snapshot.c
+++ b/cpukit/libcsupport/src/resource_snapshot.c
@@ -22,8 +22,9 @@
#include <rtems/libio_.h>
#include <rtems/malloc.h>
-#include <rtems/score/wkspace.h>
#include <rtems/score/protectedheap.h>
+#include <rtems/score/threadimpl.h>
+#include <rtems/score/wkspace.h>
#include <rtems/extensionimpl.h>
@@ -116,6 +117,8 @@ void rtems_resource_snapshot_take(rtems_resource_snapshot *snapshot)
free_all_delayed_blocks();
+ _Thread_Kill_zombies();
+
_Protected_heap_Get_information(RTEMS_Malloc_Heap, &snapshot->heap_info);
_Thread_Disable_dispatch();