From a51735cb4c92c873696e00e18ed75b64d6e9b2a7 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 22 Oct 2003 17:13:58 +0000 Subject: 2003-10-22 Joel Sherrill PR 512/core * src/tasks.c, src/taskvariabledelete.c: Run task variable destructor when task variable is deleted. Also some style cleanup. --- cpukit/rtems/ChangeLog | 6 ++++++ cpukit/rtems/src/tasks.c | 4 ++-- 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 + + 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 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; -- cgit v1.2.3