Changeset a3b4632 in rtems

Timestamp:

10/04/05 21:53:58 (17 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Children:

24b6d2f

Parents:

dc4bd19

Message:

2005-10-04 Till Straumann <strauman@…>

PR 829/rtems

• src/tasks.c, src/taskvariabledelete.c: If task variables are deleted from a different context (i.e., executing context != owner of the task variable. The owner meaning the task that registered the dtor in question) the argument passed to the task variable dtor must be tvar and not *ptr which yields the executing task's value of the task variable instead of the owner's.

Location:

cpukit/rtems

Files:

• ChangeLog (modified) (1 diff)
• src/tasks.c (modified) (1 diff)
• src/taskvariabledelete.c (modified) (1 diff)

cpukit/rtems/ChangeLog

@@ +1 @@
+2005-10-04      Till Straumann <strauman@slac.stanford.edu>
+
+        PR 829/rtems
+        * src/tasks.c, src/taskvariabledelete.c: If task variables are deleted
+        from a different context (i.e., executing context != owner of the
+        task variable. The owner meaning the task that registered the dtor in
+        question) the argument passed to the task variable dtor must be tvar
+        and not *ptr which yields the executing task's value of the task
+        variable instead of the owner's.
+
 2005-08-18      Andrew Sinclair <Andrew.Sinclair@elprotech.com>
 

cpukit/rtems/src/tasks.c

@@ -109 +109 @@
   while (tvp) {
     next = tvp->next;
-    if  (tvp->dtor)
+    if (_Thread_Is_executing(deleted)) {
+      if  (tvp->dtor)
         (*tvp->dtor)(*tvp->ptr);
-    if (_Thread_Is_executing(deleted))
-        *tvp->ptr = tvp->gval;
+      *tvp->ptr = tvp->gval;
+    } else {
+      if  (tvp->dtor)
+        (*tvp->dtor)(tvp->tval);
+    }
     _Workspace_Free( tvp );
     tvp = next;

cpukit/rtems/src/taskvariabledelete.c

@@ -57 +57 @@
         if (prev) prev->next = tvp->next;
         else      the_thread->task_variables = tvp->next;
-        if (tvp->dtor)
-          (*tvp->dtor)(*tvp->ptr);
-        if (_Thread_Is_executing(the_thread))
+        if (_Thread_Is_executing(the_thread)) {
+          if (tvp->dtor)
+            (*tvp->dtor)(*tvp->ptr);
           *tvp->ptr = tvp->gval;
+        } else {
+          if (tvp->dtor)
+            (*tvp->dtor)(tvp->tval);
+        }
         _Workspace_Free(tvp);
         _Thread_Enable_dispatch();