oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

err_code has to be preserved as well. Short term fix

Browse Source
This commit is contained in:
Thomas Veerman 2011-10-25 12:12:20 +00:00
parent ca3fe9fdab
commit 9e21d55e37
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
servers/avfs/job.h
View File

@ -4,6 +4,7 @@
struct job { struct job {
struct fproc *j_fp; struct fproc *j_fp;
message j_m_in; message j_m_in;
int j_err_code;
void *(*j_func)(void *arg); void *(*j_func)(void *arg);
struct job *j_next; struct job *j_next;
}; };

5
servers/avfs/worker.c
View File

@ -187,6 +187,7 @@ PRIVATE void append_job(struct job *job, void *(*func)(void *arg))
new_job->j_m_in = m_in; new_job->j_m_in = m_in;
new_job->j_func = func; new_job->j_func = func;
new_job->j_next = NULL; new_job->j_next = NULL;
new_job->j_err_code = OK;
/* Append to queue */ /* Append to queue */
tail = job; tail = job;
@ -216,6 +217,7 @@ PUBLIC void worker_start(void *(*func)(void *arg))
worker->w_job.j_m_in = m_in; worker->w_job.j_m_in = m_in;
worker->w_job.j_func = func; worker->w_job.j_func = func;
worker->w_job.j_next = NULL; worker->w_job.j_next = NULL;
worker->w_job.j_err_code = OK;
worker_wake(worker); worker_wake(worker);
return; return;
} }
@ -232,6 +234,7 @@ PUBLIC void worker_start(void *(*func)(void *arg))
fp->fp_job.j_m_in = m_in; fp->fp_job.j_m_in = m_in;
fp->fp_job.j_func = func; fp->fp_job.j_func = func;
fp->fp_job.j_next = NULL; fp->fp_job.j_next = NULL;
fp->fp_job.j_err_code = OK;
fp->fp_flags |= FP_PENDING; fp->fp_flags |= FP_PENDING;
pending++; pending++;
} }
@ -271,11 +274,13 @@ PUBLIC void worker_wait(void)
worker = worker_self(); worker = worker_self();
worker->w_job.j_m_in = m_in; /* Store important global data */ worker->w_job.j_m_in = m_in; /* Store important global data */
worker->w_job.j_err_code = err_code;
assert(fp == worker->w_job.j_fp); assert(fp == worker->w_job.j_fp);
worker_sleep(worker); worker_sleep(worker);
/* We continue here after waking up */ /* We continue here after waking up */
fp = worker->w_job.j_fp; /* Restore global data */ fp = worker->w_job.j_fp; /* Restore global data */
m_in = worker->w_job.j_m_in; m_in = worker->w_job.j_m_in;
err_code = worker->w_job.j_err_code;
assert(worker->w_next == NULL); assert(worker->w_next == NULL);
} }