version 1.6.4.1, 2012/05/30 08:07:45
|
version 1.7.2.1, 2012/05/31 14:17:59
|
Line 107 sched_hook_cancel(void *task, void *arg __unused)
|
Line 107 sched_hook_cancel(void *task, void *arg __unused)
|
sched_task_t *t = task; |
sched_task_t *t = task; |
struct kevent chg[1]; |
struct kevent chg[1]; |
struct timespec timeout = { 0, 0 }; |
struct timespec timeout = { 0, 0 }; |
uintptr_t ident; |
|
|
|
if (!t || !TASK_ROOT(t)) |
if (!t || !TASK_ROOT(t)) |
return (void*) -1; |
return (void*) -1; |
Line 119 sched_hook_cancel(void *task, void *arg __unused)
|
Line 118 sched_hook_cancel(void *task, void *arg __unused)
|
#else |
#else |
EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, (void*) TASK_FD(t)); |
EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, (void*) TASK_FD(t)); |
#endif |
#endif |
kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout); |
|
break; |
break; |
case taskWRITE: |
case taskWRITE: |
#ifdef __NetBSD__ |
#ifdef __NetBSD__ |
Line 127 sched_hook_cancel(void *task, void *arg __unused)
|
Line 125 sched_hook_cancel(void *task, void *arg __unused)
|
#else |
#else |
EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, (void*) TASK_FD(t)); |
EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, (void*) TASK_FD(t)); |
#endif |
#endif |
kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout); |
|
break; |
break; |
case taskALARM: |
case taskALARM: |
if (TASK_DATA(t)) |
|
ident = (uintptr_t) TASK_DATA(t); |
|
else |
|
ident = (uintptr_t) TASK_FUNC(t); |
|
#ifdef __NetBSD__ |
#ifdef __NetBSD__ |
EV_SET(&chg[0], ident, EVFILT_TIMER, EV_DELETE, 0, 0, (intptr_t) ident); | EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_DELETE, |
| 0, 0, (intptr_t) TASK_DATA(t)); |
#else |
#else |
EV_SET(&chg[0], ident, EVFILT_TIMER, EV_DELETE, 0, 0, (void*) ident); | EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_DELETE, |
| 0, 0, (void*) TASK_DATA(t)); |
#endif |
#endif |
kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout); |
|
break; |
break; |
default: | case taskNODE: |
| #ifdef __NetBSD__ |
| EV_SET(&chg[0], TASK_FD(t), EVFILT_VNODE, EV_DELETE, 0, 0, (intptr_t) TASK_FD(t)); |
| #else |
| EV_SET(&chg[0], TASK_FD(t), EVFILT_VNODE, EV_DELETE, 0, 0, (void*) TASK_FD(t)); |
| #endif |
break; |
break; |
|
case taskPROC: |
|
#ifdef __NetBSD__ |
|
EV_SET(&chg[0], TASK_VAL(t), EVFILT_PROC, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t)); |
|
#else |
|
EV_SET(&chg[0], TASK_VAL(t), EVFILT_PROC, EV_DELETE, 0, 0, (void*) TASK_VAL(t)); |
|
#endif |
|
break; |
|
case taskSIGNAL: |
|
#ifdef __NetBSD__ |
|
EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t)); |
|
#else |
|
EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_DELETE, 0, 0, (void*) TASK_VAL(t)); |
|
#endif |
|
break; |
|
case taskUSER: |
|
#ifdef __NetBSD__ |
|
EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t)); |
|
#else |
|
EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_DELETE, 0, 0, (void*) TASK_VAL(t)); |
|
#endif |
|
break; |
|
default: |
|
return (void*) -1; |
} |
} |
|
|
|
kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout); |
return NULL; |
return NULL; |
} |
} |
|
|
Line 166 sched_hook_read(void *task, void *arg __unused)
|
Line 189 sched_hook_read(void *task, void *arg __unused)
|
return (void*) -1; |
return (void*) -1; |
|
|
#ifdef __NetBSD__ |
#ifdef __NetBSD__ |
EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD, 0, 0, (intptr_t) TASK_FD(t)); | EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD | EV_CLEAR, 0, 0, (intptr_t) TASK_FD(t)); |
#else |
#else |
EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD, 0, 0, (void*) TASK_FD(t)); | EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD | EV_CLEAR, 0, 0, (void*) TASK_FD(t)); |
#endif |
#endif |
if (kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout) == -1) { |
if (kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout) == -1) { |
if (TASK_ROOT(t)->root_hooks.hook_exec.exception) |
if (TASK_ROOT(t)->root_hooks.hook_exec.exception) |
Line 199 sched_hook_write(void *task, void *arg __unused)
|
Line 222 sched_hook_write(void *task, void *arg __unused)
|
return (void*) -1; |
return (void*) -1; |
|
|
#ifdef __NetBSD__ |
#ifdef __NetBSD__ |
EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD, 0, 0, (intptr_t) TASK_FD(t)); | EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD | EV_CLEAR, 0, 0, (intptr_t) TASK_FD(t)); |
#else |
#else |
EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD, 0, 0, (void*) TASK_FD(t)); | EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD | EV_CLEAR, 0, 0, (void*) TASK_FD(t)); |
#endif |
#endif |
if (kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout) == -1) { |
if (kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout) == -1) { |
if (TASK_ROOT(t)->root_hooks.hook_exec.exception) |
if (TASK_ROOT(t)->root_hooks.hook_exec.exception) |
Line 227 sched_hook_alarm(void *task, void *arg __unused)
|
Line 250 sched_hook_alarm(void *task, void *arg __unused)
|
sched_task_t *t = task; |
sched_task_t *t = task; |
struct kevent chg[1]; |
struct kevent chg[1]; |
struct timespec timeout = { 0, 0 }; |
struct timespec timeout = { 0, 0 }; |
uintptr_t ident; |
|
|
|
if (!t || !TASK_ROOT(t)) |
if (!t || !TASK_ROOT(t)) |
return (void*) -1; |
return (void*) -1; |
|
|
if (TASK_DATA(t)) | #ifdef __NetBSD__ |
ident = (uintptr_t) TASK_DATA(t); | EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, |
else | t->task_val.ts.tv_sec * 1000 + t->task_val.ts.tv_nsec / 1000000, |
ident = (uintptr_t) TASK_FUNC(t); | (intptr_t) TASK_DATA(t)); |
| #else |
| EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, |
| t->task_val.ts.tv_sec * 1000 + t->task_val.ts.tv_nsec / 1000000, |
| (void*) TASK_DATA(t)); |
| #endif |
| if (kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout) == -1) { |
| if (TASK_ROOT(t)->root_hooks.hook_exec.exception) |
| TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL); |
| else |
| LOGERR; |
| return (void*) -1; |
| } |
|
|
|
return NULL; |
|
} |
|
|
|
/* |
|
* sched_hook_node() - Default NODE hook |
|
* |
|
* @task = current task |
|
* @arg = unused |
|
* return: <0 errors and 0 ok |
|
*/ |
|
void * |
|
sched_hook_node(void *task, void *arg __unused) |
|
{ |
|
sched_task_t *t = task; |
|
struct kevent chg[1]; |
|
struct timespec timeout = { 0, 0 }; |
|
|
|
if (!t || !TASK_ROOT(t)) |
|
return (void*) -1; |
|
|
#ifdef __NetBSD__ |
#ifdef __NetBSD__ |
EV_SET(&chg[0], ident, EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, 0, (intptr_t) ident); | EV_SET(&chg[0], TASK_FD(t), EVFILT_VNODE, EV_ADD | EV_CLEAR, |
| NOTE_DELETE | NOTE_WRITE | NOTE_EXTEND | NOTE_ATTRIB | |
| NOTE_LINK | NOTE_RENAME | NOTE_REVOKE, 0, (intptr_t) TASK_FD(t)); |
#else |
#else |
EV_SET(&chg[0], ident, EVFILT_TIMER, EV_ADD | EV_ONESHOT, 0, 0, (void*) ident); | EV_SET(&chg[0], TASK_FD(t), EVFILT_VNODE, EV_ADD | EV_CLEAR, |
| NOTE_DELETE | NOTE_WRITE | NOTE_EXTEND | NOTE_ATTRIB | |
| NOTE_LINK | NOTE_RENAME | NOTE_REVOKE, 0, (void*) TASK_FD(t)); |
#endif |
#endif |
if (kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout) == -1) { |
if (kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout) == -1) { |
if (TASK_ROOT(t)->root_hooks.hook_exec.exception) |
if (TASK_ROOT(t)->root_hooks.hook_exec.exception) |
Line 254 sched_hook_alarm(void *task, void *arg __unused)
|
Line 312 sched_hook_alarm(void *task, void *arg __unused)
|
} |
} |
|
|
/* |
/* |
|
* sched_hook_proc() - Default PROC hook |
|
* |
|
* @task = current task |
|
* @arg = unused |
|
* return: <0 errors and 0 ok |
|
*/ |
|
void * |
|
sched_hook_proc(void *task, void *arg __unused) |
|
{ |
|
sched_task_t *t = task; |
|
struct kevent chg[1]; |
|
struct timespec timeout = { 0, 0 }; |
|
|
|
if (!t || !TASK_ROOT(t)) |
|
return (void*) -1; |
|
|
|
#ifdef __NetBSD__ |
|
EV_SET(&chg[0], TASK_VAL(t), EVFILT_PROC, EV_ADD | EV_CLEAR, |
|
NOTE_EXIT | NOTE_FORK | NOTE_EXEC | NOTE_TRACK, 0, (intptr_t) TASK_VAL(t)); |
|
#else |
|
EV_SET(&chg[0], TASK_VAL(t), EVFILT_PROC, EV_ADD | EV_CLEAR, |
|
NOTE_EXIT | NOTE_FORK | NOTE_EXEC | NOTE_TRACK, 0, (void*) TASK_VAL(t)); |
|
#endif |
|
if (kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout) == -1) { |
|
if (TASK_ROOT(t)->root_hooks.hook_exec.exception) |
|
TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL); |
|
else |
|
LOGERR; |
|
return (void*) -1; |
|
} |
|
|
|
return NULL; |
|
} |
|
|
|
/* |
|
* sched_hook_signal() - Default SIGNAL hook |
|
* |
|
* @task = current task |
|
* @arg = unused |
|
* return: <0 errors and 0 ok |
|
*/ |
|
void * |
|
sched_hook_signal(void *task, void *arg __unused) |
|
{ |
|
sched_task_t *t = task; |
|
struct kevent chg[1]; |
|
struct timespec timeout = { 0, 0 }; |
|
|
|
if (!t || !TASK_ROOT(t)) |
|
return (void*) -1; |
|
|
|
#ifdef __NetBSD__ |
|
EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_ADD, 0, 0, (intptr_t) TASK_VAL(t)); |
|
#else |
|
EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_ADD, 0, 0, (void*) TASK_VAL(t)); |
|
#endif |
|
if (kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout) == -1) { |
|
if (TASK_ROOT(t)->root_hooks.hook_exec.exception) |
|
TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL); |
|
else |
|
LOGERR; |
|
return (void*) -1; |
|
} |
|
|
|
return NULL; |
|
} |
|
|
|
/* |
|
* sched_hook_user() - Default USER hook |
|
* |
|
* @task = current task |
|
* @arg = unused |
|
* return: <0 errors and 0 ok |
|
*/ |
|
void * |
|
sched_hook_user(void *task, void *arg __unused) |
|
{ |
|
sched_task_t *t = task; |
|
struct kevent chg[1]; |
|
struct timespec timeout = { 0, 0 }; |
|
|
|
if (!t || !TASK_ROOT(t)) |
|
return (void*) -1; |
|
|
|
#ifdef __NetBSD__ |
|
EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_ADD | EV_CLEAR, NOTE_FFNOP, 0, (intptr_t) TASK_VAL(t)); |
|
#else |
|
EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_ADD | EV_CLEAR, NOTE_FFNOP, 0, (void*) TASK_VAL(t)); |
|
#endif |
|
if (kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout) == -1) { |
|
if (TASK_ROOT(t)->root_hooks.hook_exec.exception) |
|
TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL); |
|
else |
|
LOGERR; |
|
return (void*) -1; |
|
} |
|
|
|
return NULL; |
|
} |
|
|
|
/* |
* sched_hook_fetch() - Default FETCH hook |
* sched_hook_fetch() - Default FETCH hook |
* |
* |
* @root = root task |
* @root = root task |
Line 270 sched_hook_fetch(void *root, void *arg __unused)
|
Line 429 sched_hook_fetch(void *root, void *arg __unused)
|
struct kevent evt[1], res[KQ_EVENTS]; |
struct kevent evt[1], res[KQ_EVENTS]; |
register int i; |
register int i; |
int en; |
int en; |
uintptr_t ident; |
|
|
|
if (!r) |
if (!r) |
return NULL; |
return NULL; |
Line 461 sched_hook_fetch(void *root, void *arg __unused)
|
Line 619 sched_hook_fetch(void *root, void *arg __unused)
|
} |
} |
break; |
break; |
case EVFILT_TIMER: |
case EVFILT_TIMER: |
if (TASK_DATA(task)) |
|
ident = (uintptr_t) TASK_DATA(task); |
|
else |
|
ident = (uintptr_t) TASK_FUNC(task); |
|
TAILQ_FOREACH_SAFE(task, &r->root_alarm, task_node, tmp) { |
TAILQ_FOREACH_SAFE(task, &r->root_alarm, task_node, tmp) { |
if (ident != ((uintptr_t) res[i].udata)) | if ((uintptr_t) TASK_DATA(task) != ((uintptr_t) res[i].udata)) |
continue; |
continue; |
/* remove alarm handle */ |
/* remove alarm handle */ |
#ifdef HAVE_LIBPTHREAD |
#ifdef HAVE_LIBPTHREAD |
Line 475 sched_hook_fetch(void *root, void *arg __unused)
|
Line 629 sched_hook_fetch(void *root, void *arg __unused)
|
TAILQ_REMOVE(&r->root_alarm, task, task_node); |
TAILQ_REMOVE(&r->root_alarm, task, task_node); |
#ifdef HAVE_LIBPTHREAD |
#ifdef HAVE_LIBPTHREAD |
pthread_mutex_unlock(&r->root_mtx[taskALARM]); |
pthread_mutex_unlock(&r->root_mtx[taskALARM]); |
|
#endif |
|
task->task_type = taskREADY; |
|
#ifdef HAVE_LIBPTHREAD |
|
pthread_mutex_lock(&r->root_mtx[taskREADY]); |
|
#endif |
|
TAILQ_INSERT_TAIL(&r->root_ready, task, task_node); |
|
#ifdef HAVE_LIBPTHREAD |
|
pthread_mutex_unlock(&r->root_mtx[taskREADY]); |
|
#endif |
|
break; |
|
} |
|
break; |
|
case EVFILT_VNODE: |
|
TAILQ_FOREACH_SAFE(task, &r->root_node, task_node, tmp) { |
|
if (TASK_FD(task) != ((intptr_t) res[i].udata)) |
|
continue; |
|
/* remove node handle */ |
|
#ifdef HAVE_LIBPTHREAD |
|
pthread_mutex_lock(&r->root_mtx[taskNODE]); |
|
#endif |
|
TAILQ_REMOVE(&r->root_node, task, task_node); |
|
#ifdef HAVE_LIBPTHREAD |
|
pthread_mutex_unlock(&r->root_mtx[taskNODE]); |
|
#endif |
|
task->task_type = taskREADY; |
|
#ifdef HAVE_LIBPTHREAD |
|
pthread_mutex_lock(&r->root_mtx[taskREADY]); |
|
#endif |
|
TAILQ_INSERT_TAIL(&r->root_ready, task, task_node); |
|
#ifdef HAVE_LIBPTHREAD |
|
pthread_mutex_unlock(&r->root_mtx[taskREADY]); |
|
#endif |
|
break; |
|
} |
|
break; |
|
case EVFILT_PROC: |
|
TAILQ_FOREACH_SAFE(task, &r->root_proc, task_node, tmp) { |
|
if (TASK_VAL(task) != ((uintptr_t) res[i].udata)) |
|
continue; |
|
/* remove proc handle */ |
|
#ifdef HAVE_LIBPTHREAD |
|
pthread_mutex_lock(&r->root_mtx[taskPROC]); |
|
#endif |
|
TAILQ_REMOVE(&r->root_proc, task, task_node); |
|
#ifdef HAVE_LIBPTHREAD |
|
pthread_mutex_unlock(&r->root_mtx[taskPROC]); |
|
#endif |
|
task->task_type = taskREADY; |
|
#ifdef HAVE_LIBPTHREAD |
|
pthread_mutex_lock(&r->root_mtx[taskREADY]); |
|
#endif |
|
TAILQ_INSERT_TAIL(&r->root_ready, task, task_node); |
|
#ifdef HAVE_LIBPTHREAD |
|
pthread_mutex_unlock(&r->root_mtx[taskREADY]); |
|
#endif |
|
break; |
|
} |
|
break; |
|
case EVFILT_SIGNAL: |
|
TAILQ_FOREACH_SAFE(task, &r->root_signal, task_node, tmp) { |
|
if (TASK_VAL(task) != ((uintptr_t) res[i].udata)) |
|
continue; |
|
/* remove signal handle */ |
|
#ifdef HAVE_LIBPTHREAD |
|
pthread_mutex_lock(&r->root_mtx[taskSIGNAL]); |
|
#endif |
|
TAILQ_REMOVE(&r->root_signal, task, task_node); |
|
#ifdef HAVE_LIBPTHREAD |
|
pthread_mutex_unlock(&r->root_mtx[taskSIGNAL]); |
|
#endif |
|
task->task_type = taskREADY; |
|
#ifdef HAVE_LIBPTHREAD |
|
pthread_mutex_lock(&r->root_mtx[taskREADY]); |
|
#endif |
|
TAILQ_INSERT_TAIL(&r->root_ready, task, task_node); |
|
#ifdef HAVE_LIBPTHREAD |
|
pthread_mutex_unlock(&r->root_mtx[taskREADY]); |
|
#endif |
|
break; |
|
} |
|
break; |
|
case EVFILT_USER: |
|
TAILQ_FOREACH_SAFE(task, &r->root_user, task_node, tmp) { |
|
if (TASK_VAL(task) != ((uintptr_t) res[i].udata)) |
|
continue; |
|
/* remove user handle */ |
|
#ifdef HAVE_LIBPTHREAD |
|
pthread_mutex_lock(&r->root_mtx[taskUSER]); |
|
#endif |
|
TAILQ_REMOVE(&r->root_user, task, task_node); |
|
#ifdef HAVE_LIBPTHREAD |
|
pthread_mutex_unlock(&r->root_mtx[taskUSER]); |
#endif |
#endif |
task->task_type = taskREADY; |
task->task_type = taskREADY; |
#ifdef HAVE_LIBPTHREAD |
#ifdef HAVE_LIBPTHREAD |