diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2003-10-22 17:13:58 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2003-10-22 17:13:58 +0000 |
| commit | a51735cb4c92c873696e00e18ed75b64d6e9b2a7 (patch) | |
| tree | 8bb9c8e3d47c70c6ec53f103e18c2c38c7a16da1 | |
| parent | 2003-10-22 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-a51735cb4c92c873696e00e18ed75b64d6e9b2a7.tar.bz2 | |
2003-10-22 Joel Sherrill <joel@OARcorp.com>
PR 512/core
* src/tasks.c, src/taskvariabledelete.c: Run task variable destructor
when task variable is deleted. Also some style cleanup.
| -rw-r--r-- | cpukit/rtems/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/rtems/src/tasks.c | 4 | ||||
| -rw-r--r-- | cpukit/rtems/src/taskvariabledelete.c | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/cpukit/rtems/ChangeLog b/cpukit/rtems/ChangeLog index be5db3c071..8f784aa162 100644 --- a/cpukit/rtems/ChangeLog +++ b/cpukit/rtems/ChangeLog @@ -1,3 +1,9 @@ +2003-10-22 Joel Sherrill <joel@OARcorp.com> + + PR 512/core + * src/tasks.c, src/taskvariabledelete.c: Run task variable destructor + when task variable is deleted. Also some style cleanup. + 2003-09-11 Joel Sherrill <joel@OARcorp.com> PR 488/rtems diff --git a/cpukit/rtems/src/tasks.c b/cpukit/rtems/src/tasks.c index e9d7954c50..b7eadbea8a 100644 --- a/cpukit/rtems/src/tasks.c +++ b/cpukit/rtems/src/tasks.c @@ -109,8 +109,8 @@ User_extensions_routine _RTEMS_tasks_Delete_extension( while (tvp) { next = tvp->next; if (tvp->dtor) - (*tvp->dtor)(*tvp->ptr ); - if (executing == deleted) + (*tvp->dtor)(*tvp->ptr); + if (_Thread_Is_executing(deleted)) *tvp->ptr = tvp->gval; _Workspace_Free( tvp ); tvp = next; diff --git a/cpukit/rtems/src/taskvariabledelete.c b/cpukit/rtems/src/taskvariabledelete.c index 05f66d4cac..43a45471ab 100644 --- a/cpukit/rtems/src/taskvariabledelete.c +++ b/cpukit/rtems/src/taskvariabledelete.c @@ -53,10 +53,12 @@ rtems_status_code rtems_task_variable_delete( if (tvp->ptr == ptr) { if (prev) prev->next = tvp->next; else the_thread->task_variables = tvp->next; - if (_Thread_Is_executing (the_thread)) + if (tvp->dtor) + (*tvp->dtor)(*tvp->ptr); + if (_Thread_Is_executing(the_thread)) *tvp->ptr = tvp->gval; - _Thread_Enable_dispatch(); _Workspace_Free(tvp); + _Thread_Enable_dispatch(); return RTEMS_SUCCESSFUL; } prev = tvp; |