version 1.14.2.5, 2012/08/23 00:31:41
|
version 1.14.2.6, 2012/08/23 02:09:54
|
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 }; |
register int i = 0; |
|
#ifdef AIO_SUPPORT |
#ifdef AIO_SUPPORT |
struct aiocb *acb; |
struct aiocb *acb; |
#ifdef EVFILT_LIO |
#ifdef EVFILT_LIO |
|
register int i = 0; |
struct aiocb **acbs; |
struct aiocb **acbs; |
#endif /* EVFILT_LIO */ |
#endif /* EVFILT_LIO */ |
#endif /* AIO_SUPPORT */ |
#endif /* AIO_SUPPORT */ |
Line 209 sched_hook_cancel(void *task, void *arg __unused)
|
Line 209 sched_hook_cancel(void *task, void *arg __unused)
|
#endif |
#endif |
case taskTHREAD: |
case taskTHREAD: |
#ifdef HAVE_LIBPTHREAD |
#ifdef HAVE_LIBPTHREAD |
for (i = 0; i < MAX_TASK_MISS; i++) | pthread_cancel((pthread_t) TASK_VAL(t)); |
if (!pthread_cancel((pthread_t) TASK_VAL(t))) { | |
/* joinable thread */ | |
if (TASK_FLAG(t) == PTHREAD_CREATE_JOINABLE) | |
schedTask(TASK_ROOT(t), _sched_threadJoin, | |
TASK_ARG(t), TASK_VAL(t), | |
TASK_DATA(t), TASK_DATLEN(t)); | |
return NULL; | |
} | |
return (void*) -1; | |
#endif |
#endif |
default: |
default: |
return NULL; |
return NULL; |
Line 249 sched_hook_thread(void *task, void *arg)
|
Line 240 sched_hook_thread(void *task, void *arg)
|
sigfillset(&s); |
sigfillset(&s); |
pthread_sigmask(SIG_BLOCK, &s, &o); |
pthread_sigmask(SIG_BLOCK, &s, &o); |
if (pthread_create(&tid, (pthread_attr_t*) arg, |
if (pthread_create(&tid, (pthread_attr_t*) arg, |
(void *(*)(void*)) TASK_FUNC(t), t)) { | (void *(*)(void*)) _sched_threadWrapper, t)) { |
LOGERR; |
LOGERR; |
pthread_sigmask(SIG_SETMASK, &o, NULL); |
pthread_sigmask(SIG_SETMASK, &o, NULL); |
return (void*) -1; |
return (void*) -1; |
} | } else |
| TASK_VAL(t) = (u_long) tid; |
|
|
if (!TASK_ISLOCKED(t)) |
if (!TASK_ISLOCKED(t)) |
TASK_LOCK(t); |
TASK_LOCK(t); |
|
|
TASK_VAL(t) = (u_long) tid; |
|
pthread_sigmask(SIG_SETMASK, &o, NULL); |
pthread_sigmask(SIG_SETMASK, &o, NULL); |
return NULL; |
return NULL; |
} |
} |