RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2005-10-04 Till Straumann <strauman@slac.stanford.edu>

Browse Source 
PR 829/rtems
	* rtems/src/tasks.c, rtems/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.
This commit is contained in:
Joel Sherrill
2005-10-04 21:55:24 +00:00
parent 1a561f8130
commit a93a23951e
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cpukit/ChangeLog
View File

@@ -1,3 +1,13 @@
2005-10-04 Till Straumann <strauman@slac.stanford.edu>
PR 829/rtems
* rtems/src/tasks.c, rtems/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-09-29 Eric Norum <norume@aps.anl.gov>
* libmisc/cpuuse/cpuuse.c: Remove floating point calculations and the

10
cpukit/rtems/src/tasks.c
View File

@@ -112,10 +112,14 @@ User_extensions_routine _RTEMS_tasks_Delete_extension(
deleted->task_variables = NULL;
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;
}

10
cpukit/rtems/src/taskvariabledelete.c
View File

@@ -60,10 +60,14 @@ 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 (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();
return RTEMS_SUCCESSFUL;