--- libaitsched/src/hooks.c 2012/08/08 08:25:39 1.12 +++ libaitsched/src/hooks.c 2012/08/22 13:37:23 1.14.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: hooks.c,v 1.12 2012/08/08 08:25:39 misho Exp $ +* $Id: hooks.c,v 1.14.2.2 2012/08/22 13:37:23 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -207,6 +207,14 @@ sched_hook_cancel(void *task, void *arg __unused) #endif break; #endif + case taskTHREAD: +#ifdef HAVE_LIBPTHREAD + pthread_cancel((pthread_t) TASK_VAL(t)); + if (TASK_FLAG(t) == PTHREAD_CREATE_JOINABLE) /* joinable thread */ + schedTask(TASK_ROOT(t), _sched_threadJoin, TASK_ARG(t), + TASK_VAL(t), TASK_DATA(t), TASK_DATLEN(t)); +#endif + TASK_UNLOCK(t); default: return NULL; } @@ -215,7 +223,43 @@ sched_hook_cancel(void *task, void *arg __unused) return NULL; } +#ifdef HAVE_LIBPTHREAD /* + * sched_hook_thread() - Default THREAD hook + * + * @task = current task + * @arg = pthread attributes + * return: <0 errors and 0 ok + */ +void * +sched_hook_thread(void *task, void *arg) +{ + sched_task_t *t = task; + pthread_t tid; + sigset_t ns, os; + + if (!t || !TASK_ROOT(t)) + return (void*) -1; + + sigfillset(&ns); + pthread_sigmask(SIG_BLOCK, &ns, &os); + if (pthread_create(&tid, (pthread_attr_t*) arg, + (void *(*)(void*)) TASK_FUNC(t), t)) { + LOGERR; + pthread_sigmask(SIG_SETMASK, &os, NULL); + return (void*) -1; + } + pthread_sigmask(SIG_SETMASK, &os, NULL); + + if (!TASK_ISLOCKED(t)) + TASK_LOCK(t); + + TASK_VAL(t) = (u_long) tid; + return NULL; +} +#endif + +/* * sched_hook_read() - Default READ hook * * @task = current task @@ -592,8 +636,11 @@ sched_hook_fetch(void *root, void *arg __unused) TAILQ_FOREACH_SAFE(task, &r->root_read, task_node, tmp) { if (TASK_FD(task) != ((intptr_t) res[i].udata)) continue; - else + else { flg++; + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = res[i].fflags; + } /* remove read handle */ #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&r->root_mtx[taskREAD]); @@ -642,8 +689,11 @@ sched_hook_fetch(void *root, void *arg __unused) TAILQ_FOREACH_SAFE(task, &r->root_write, task_node, tmp) { if (TASK_FD(task) != ((intptr_t) res[i].udata)) continue; - else + else { flg++; + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = res[i].fflags; + } /* remove write handle */ #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&r->root_mtx[taskWRITE]); @@ -692,8 +742,11 @@ sched_hook_fetch(void *root, void *arg __unused) TAILQ_FOREACH_SAFE(task, &r->root_alarm, task_node, tmp) { if ((uintptr_t) TASK_DATA(task) != ((uintptr_t) res[i].udata)) continue; - else + else { flg++; + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = res[i].fflags; + } /* remove alarm handle */ #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&r->root_mtx[taskALARM]); @@ -722,8 +775,8 @@ sched_hook_fetch(void *root, void *arg __unused) continue; else { flg++; - TASK_DATA(task) = (void*) (uintptr_t) res[i].data; - TASK_DATLEN(task) = res[i].fflags; + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = res[i].fflags; } /* remove node handle */ #ifdef HAVE_LIBPTHREAD @@ -753,8 +806,8 @@ sched_hook_fetch(void *root, void *arg __unused) continue; else { flg++; - TASK_DATA(task) = (void*) (uintptr_t) res[i].data; - TASK_DATLEN(task) = res[i].fflags; + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = res[i].fflags; } /* remove proc handle */ #ifdef HAVE_LIBPTHREAD @@ -782,8 +835,11 @@ sched_hook_fetch(void *root, void *arg __unused) TAILQ_FOREACH_SAFE(task, &r->root_signal, task_node, tmp) { if (TASK_VAL(task) != ((uintptr_t) res[i].udata)) continue; - else + else { flg++; + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = res[i].fflags; + } /* remove signal handle */ #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&r->root_mtx[taskSIGNAL]); @@ -812,8 +868,11 @@ sched_hook_fetch(void *root, void *arg __unused) acb = (struct aiocb*) TASK_VAL(task); if (acb != ((struct aiocb*) res[i].udata)) continue; - else + else { flg++; + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = res[i].fflags; + } /* remove user handle */ #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&r->root_mtx[taskAIO]); @@ -851,8 +910,11 @@ sched_hook_fetch(void *root, void *arg __unused) acbs = (struct aiocb**) TASK_VAL(task); if (acbs != ((struct aiocb**) res[i].udata)) continue; - else + else { flg++; + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = res[i].fflags; + } /* remove user handle */ #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&r->root_mtx[taskLIO]); @@ -900,8 +962,8 @@ sched_hook_fetch(void *root, void *arg __unused) continue; else { flg++; - TASK_DATA(task) = (void*) res[i].data; - TASK_DATLEN(task) = res[i].fflags; + TASK_RET(task) = res[i].data; + TASK_FLAG(task) = res[i].fflags; } /* remove user handle */ #ifdef HAVE_LIBPTHREAD @@ -958,10 +1020,10 @@ sched_hook_fetch(void *root, void *arg __unused) } /* put regular task priority task to ready queue, - if there is no ready task or reach max missing hit events */ + if there is no ready task or reach max missing hit for regular task */ if ((task = TAILQ_FIRST(&r->root_task))) { - if (!TAILQ_FIRST(&r->root_ready) || r->root_task_miss > r->root_miss) { - r->root_task_miss ^= r->root_task_miss; + if (!TAILQ_FIRST(&r->root_ready) || r->root_miss >= TASK_VAL(task)) { + r->root_miss ^= r->root_miss; #ifdef HAVE_LIBPTHREAD pthread_mutex_lock(&r->root_mtx[taskTASK]); @@ -979,9 +1041,9 @@ sched_hook_fetch(void *root, void *arg __unused) pthread_mutex_unlock(&r->root_mtx[taskREADY]); #endif } else - r->root_task_miss++; + r->root_miss++; } else - r->root_task_miss ^= r->root_task_miss; + r->root_miss ^= r->root_miss; /* OK, lets get ready task !!! */ task = TAILQ_FIRST(&r->root_ready);