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

Update from Eric Norum to fix dereference of zero and correct

Browse Source 
test behavior.  Based on report from Victor V. Vengerov <vvv@oktet.ru>.
This commit is contained in:
Joel Sherrill
2000-05-16 18:44:03 +00:00
parent 405990a70c
commit 01e0e43f7f
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
c/src/exec/rtems/src/taskvariabledelete.c
View File

@@ -53,6 +53,8 @@ rtems_status_code rtems_task_variable_delete(
if (tvp->ptr == ptr) { if (tvp->ptr == ptr) {
if (prev) prev->next = tvp->next; if (prev) prev->next = tvp->next;
else the_thread->task_variables = tvp->next; else the_thread->task_variables = tvp->next;
if (_Thread_Is_executing (the_thread))
*tvp->ptr = tvp->gval;
_Thread_Enable_dispatch(); _Thread_Enable_dispatch();
_Workspace_Free(tvp); _Workspace_Free(tvp);
return RTEMS_SUCCESSFUL; return RTEMS_SUCCESSFUL;

30
c/src/tests/sptests/sp28/init.c
View File

@@ -23,6 +23,8 @@ rtems_task Init(rtems_task_argument argument);
#include <stdio.h> #include <stdio.h>
volatile void *taskvar; volatile void *taskvar;
volatile int nRunning;
volatile int nDeleted;
rtems_task rtems_task
subtask (rtems_task_argument arg) subtask (rtems_task_argument arg)
@@ -31,6 +33,9 @@ subtask (rtems_task_argument arg)
int i; int i;
rtems_status_code sc; rtems_status_code sc;
nRunning++;
while (nRunning != 3)
rtems_task_wake_after (0);
sc = rtems_task_variable_add (RTEMS_SELF, &taskvar, NULL); sc = rtems_task_variable_add (RTEMS_SELF, &taskvar, NULL);
if (sc != RTEMS_SUCCESSFUL) { if (sc != RTEMS_SUCCESSFUL) {
printf ("Can't add task variable: %s\n", rtems_status_text (sc)); printf ("Can't add task variable: %s\n", rtems_status_text (sc));
@@ -48,22 +53,35 @@ subtask (rtems_task_argument arg)
} }
} }
sc = rtems_task_variable_delete (RTEMS_SELF, &taskvar); sc = rtems_task_variable_delete (RTEMS_SELF, &taskvar);
nDeleted++;
if (sc != RTEMS_SUCCESSFUL) { if (sc != RTEMS_SUCCESSFUL) {
printf ("Can't delete task variable: %s\n", rtems_status_text (sc)); printf ("Can't delete task variable: %s\n", rtems_status_text (sc));
nRunning--;
rtems_task_suspend (RTEMS_SELF); rtems_task_suspend (RTEMS_SELF);
} }
for (i = 0 ; ; i++) { if ((int)taskvar == localvar) {
printf ("Task:%d deleted taskvar:%d localvar:%d\n", arg, (int)taskvar, localvar);
nRunning--;
rtems_task_suspend (RTEMS_SELF);
}
while (nDeleted != 3)
rtems_task_wake_after (0);
for (i = 0 ; i < 1000 ; i++) {
taskvar = (void *)(localvar = 100 * arg); taskvar = (void *)(localvar = 100 * arg);
rtems_task_wake_after (0); rtems_task_wake_after (0);
if (nRunning <= 1)
break;
if ((int)taskvar == localvar) { if ((int)taskvar == localvar) {
printf ("Task:%d taskvar:%d localvar:%d\n", arg, (int)taskvar, localvar); printf ("Task:%d taskvar:%d localvar:%d\n", arg, (int)taskvar, localvar);
nRunning--;
rtems_task_suspend (RTEMS_SELF); rtems_task_suspend (RTEMS_SELF);
} }
if ((arg == 3) && (i == 100)) { }
printf ("Task variables test succeeded.\n"); nRunning--;
while (nRunning)
rtems_task_wake_after (0);
printf ("Task variables test complete.\n");
exit (0); exit (0);
}
}
} }
void void
@@ -92,6 +110,8 @@ starttask (int arg)
rtems_task rtems_task
Init (rtems_task_argument ignored) Init (rtems_task_argument ignored)
{ {
printf ("Task variables test begins. Any output between\n");
printf ("this line and the `Task variables test complete' line indicates an error.\n");
starttask (1); starttask (1);
starttask (2); starttask (2);
starttask (3); starttask (3);