version 1.18.4.2, 2013/08/15 17:58:31
|
version 1.18.4.5, 2013/08/15 18:43:44
|
Line 215 sched_hook_cancel(void *task, void *arg __unused)
|
Line 215 sched_hook_cancel(void *task, void *arg __unused)
|
#endif |
#endif |
return NULL; |
return NULL; |
case taskRTC: |
case taskRTC: |
timer_delete((timer_t) TASK_DATLEN(t)); | timer_delete((timer_t) TASK_FLAG(t)); |
schedCancel((sched_task_t*) TASK_RET(t)); |
schedCancel((sched_task_t*) TASK_RET(t)); |
return NULL; |
return NULL; |
default: |
default: |
Line 645 sched_hook_fetch(void *root, void *arg __unused)
|
Line 645 sched_hook_fetch(void *root, void *arg __unused)
|
else { |
else { |
flg++; |
flg++; |
TASK_RET(task) = res[i].data; |
TASK_RET(task) = res[i].data; |
TASK_FLAG(task) = res[i].fflags; | TASK_FLAG(task) = (u_long) res[i].fflags; |
} |
} |
/* remove read handle */ |
/* remove read handle */ |
#ifdef HAVE_LIBPTHREAD |
#ifdef HAVE_LIBPTHREAD |
Line 698 sched_hook_fetch(void *root, void *arg __unused)
|
Line 698 sched_hook_fetch(void *root, void *arg __unused)
|
else { |
else { |
flg++; |
flg++; |
TASK_RET(task) = res[i].data; |
TASK_RET(task) = res[i].data; |
TASK_FLAG(task) = res[i].fflags; | TASK_FLAG(task) = (u_long) res[i].fflags; |
} |
} |
/* remove write handle */ |
/* remove write handle */ |
#ifdef HAVE_LIBPTHREAD |
#ifdef HAVE_LIBPTHREAD |
Line 751 sched_hook_fetch(void *root, void *arg __unused)
|
Line 751 sched_hook_fetch(void *root, void *arg __unused)
|
else { |
else { |
flg++; |
flg++; |
TASK_RET(task) = res[i].data; |
TASK_RET(task) = res[i].data; |
TASK_FLAG(task) = res[i].fflags; | TASK_FLAG(task) = (u_long) res[i].fflags; |
} |
} |
/* remove alarm handle */ |
/* remove alarm handle */ |
#ifdef HAVE_LIBPTHREAD |
#ifdef HAVE_LIBPTHREAD |
Line 782 sched_hook_fetch(void *root, void *arg __unused)
|
Line 782 sched_hook_fetch(void *root, void *arg __unused)
|
else { |
else { |
flg++; |
flg++; |
TASK_RET(task) = res[i].data; |
TASK_RET(task) = res[i].data; |
TASK_FLAG(task) = res[i].fflags; | TASK_FLAG(task) = (u_long) res[i].fflags; |
} |
} |
/* remove node handle */ |
/* remove node handle */ |
#ifdef HAVE_LIBPTHREAD |
#ifdef HAVE_LIBPTHREAD |
Line 813 sched_hook_fetch(void *root, void *arg __unused)
|
Line 813 sched_hook_fetch(void *root, void *arg __unused)
|
else { |
else { |
flg++; |
flg++; |
TASK_RET(task) = res[i].data; |
TASK_RET(task) = res[i].data; |
TASK_FLAG(task) = res[i].fflags; | TASK_FLAG(task) = (u_long) res[i].fflags; |
} |
} |
/* remove proc handle */ |
/* remove proc handle */ |
#ifdef HAVE_LIBPTHREAD |
#ifdef HAVE_LIBPTHREAD |
Line 844 sched_hook_fetch(void *root, void *arg __unused)
|
Line 844 sched_hook_fetch(void *root, void *arg __unused)
|
else { |
else { |
flg++; |
flg++; |
TASK_RET(task) = res[i].data; |
TASK_RET(task) = res[i].data; |
TASK_FLAG(task) = res[i].fflags; | TASK_FLAG(task) = (u_long) res[i].fflags; |
} |
} |
/* remove signal handle */ |
/* remove signal handle */ |
#ifdef HAVE_LIBPTHREAD |
#ifdef HAVE_LIBPTHREAD |
Line 877 sched_hook_fetch(void *root, void *arg __unused)
|
Line 877 sched_hook_fetch(void *root, void *arg __unused)
|
else { |
else { |
flg++; |
flg++; |
TASK_RET(task) = res[i].data; |
TASK_RET(task) = res[i].data; |
TASK_FLAG(task) = res[i].fflags; | TASK_FLAG(task) = (u_long) res[i].fflags; |
} |
} |
/* remove user handle */ |
/* remove user handle */ |
#ifdef HAVE_LIBPTHREAD |
#ifdef HAVE_LIBPTHREAD |
Line 919 sched_hook_fetch(void *root, void *arg __unused)
|
Line 919 sched_hook_fetch(void *root, void *arg __unused)
|
else { |
else { |
flg++; |
flg++; |
TASK_RET(task) = res[i].data; |
TASK_RET(task) = res[i].data; |
TASK_FLAG(task) = res[i].fflags; | TASK_FLAG(task) = (u_long) res[i].fflags; |
} |
} |
/* remove user handle */ |
/* remove user handle */ |
#ifdef HAVE_LIBPTHREAD |
#ifdef HAVE_LIBPTHREAD |
Line 969 sched_hook_fetch(void *root, void *arg __unused)
|
Line 969 sched_hook_fetch(void *root, void *arg __unused)
|
else { |
else { |
flg++; |
flg++; |
TASK_RET(task) = res[i].data; |
TASK_RET(task) = res[i].data; |
TASK_FLAG(task) = res[i].fflags; | TASK_FLAG(task) = (u_long) res[i].fflags; |
} |
} |
/* remove user handle */ |
/* remove user handle */ |
#ifdef HAVE_LIBPTHREAD |
#ifdef HAVE_LIBPTHREAD |
Line 1136 sched_hook_rtc(void *task, void *arg __unused)
|
Line 1136 sched_hook_rtc(void *task, void *arg __unused)
|
sched_task_t *sigt = NULL, *t = task; |
sched_task_t *sigt = NULL, *t = task; |
struct itimerspec its; |
struct itimerspec its; |
struct sigevent evt; |
struct sigevent evt; |
timer_t *tmr = NULL; | timer_t tmr; |
|
|
if (!t || !TASK_ROOT(t)) |
if (!t || !TASK_ROOT(t)) |
return (void*) -1; |
return (void*) -1; |
|
|
tmr = malloc(sizeof(timer_t)); |
|
if (!tmr) { |
|
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; |
|
} |
|
|
|
memset(&evt, 0, sizeof evt); |
memset(&evt, 0, sizeof evt); |
evt.sigev_notify = SIGEV_SIGNAL; |
evt.sigev_notify = SIGEV_SIGNAL; |
evt.sigev_signo = (int) TASK_DATA(t) + SIGRTMIN; | evt.sigev_signo = TASK_DATLEN(t) + SIGRTMIN; |
evt.sigev_value.sival_ptr = tmr; | evt.sigev_value.sival_ptr = TASK_DATA(t); |
|
|
if (timer_create((clockid_t) TASK_DATA(t), &evt, evt.sigev_value.sival_ptr) == -1) { | if (timer_create(CLOCK_MONOTONIC, &evt, &tmr) == -1) { |
if (TASK_ROOT(t)->root_hooks.hook_exec.exception) |
if (TASK_ROOT(t)->root_hooks.hook_exec.exception) |
TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL); |
TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL); |
else |
else |
LOGERR; |
LOGERR; |
if (tmr) |
|
free(tmr); |
|
return (void*) -1; |
return (void*) -1; |
} else |
} else |
TASK_DATLEN(t) = (size_t) *tmr; | TASK_FLAG(t) = (u_long) tmr; |
|
|
if (!(sigt = schedSignal(TASK_ROOT(t), TASK_FUNC(t), TASK_ARG(t), evt.sigev_signo, |
if (!(sigt = schedSignal(TASK_ROOT(t), TASK_FUNC(t), TASK_ARG(t), evt.sigev_signo, |
TASK_DATA(t), TASK_DATLEN(t)))) { | TASK_DATA(t), (size_t) tmr))) { |
if (TASK_ROOT(t)->root_hooks.hook_exec.exception) |
if (TASK_ROOT(t)->root_hooks.hook_exec.exception) |
TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL); |
TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL); |
else |
else |
LOGERR; |
LOGERR; |
timer_delete(*tmr); | timer_delete(tmr); |
free(tmr); | |
return (void*) -1; |
return (void*) -1; |
} else |
} else |
TASK_RET(t) = (uintptr_t) sigt; |
TASK_RET(t) = (uintptr_t) sigt; |
Line 1182 sched_hook_rtc(void *task, void *arg __unused)
|
Line 1170 sched_hook_rtc(void *task, void *arg __unused)
|
its.it_value.tv_sec = t->task_val.ts.tv_sec; |
its.it_value.tv_sec = t->task_val.ts.tv_sec; |
its.it_value.tv_nsec = t->task_val.ts.tv_nsec; |
its.it_value.tv_nsec = t->task_val.ts.tv_nsec; |
|
|
if (timer_settime(*tmr, 0, &its, NULL) == -1) { | if (timer_settime(tmr, TIMER_RELTIME, &its, NULL) == -1) { |
if (TASK_ROOT(t)->root_hooks.hook_exec.exception) |
if (TASK_ROOT(t)->root_hooks.hook_exec.exception) |
TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL); |
TASK_ROOT(t)->root_hooks.hook_exec.exception(TASK_ROOT(t), NULL); |
else |
else |
LOGERR; |
LOGERR; |
schedCancel(sigt); |
schedCancel(sigt); |
timer_delete(*tmr); | timer_delete(tmr); |
free(tmr); | |
return (void*) -1; |
return (void*) -1; |
} |
} |
|
|