libaitsched/src/hooks.c - diff

Return to hooks.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitsched / src

Diff for /libaitsched/src/hooks.c between versions 1.7.2.2 and 1.10.2.4

version 1.7.2.2, 2012/05/31 14:45:10	version 1.10.2.4, 2012/08/01 14:49:37
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 };
	#ifdef EVFILT_AIO
	struct aiocb *acb;
	#endif

if (!t \|\| !TASK_ROOT(t))	if (!t \|\| !TASK_ROOT(t))
return (void*) -1;	return (void*) -1;
Line 156 sched_hook_cancel(void task, void arg __unused)	Line 159 sched_hook_cancel(void task, void arg __unused)
EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_DELETE, 0, 0, (void*) TASK_VAL(t));	EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_DELETE, 0, 0, (void*) TASK_VAL(t));
#endif	#endif
break;	break;
	#ifdef EVFILT_AIO
	case taskAIO:
	#ifdef __NetBSD__
	EV_SET(&chg[0], TASK_VAL(t), EVFILT_AIO, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));
	#else
	EV_SET(&chg[0], TASK_VAL(t), EVFILT_AIO, EV_DELETE, 0, 0, (void*) TASK_VAL(t));
	#endif
	acb = (struct aiocb*) TASK_VAL(t);
	if (acb) {
	aio_cancel(acb->aio_fildes, acb);
	free(acb);
	TASK_VAL(t) = 0;
	}
	break;
	#endif
	#ifdef EVFILT_USER
case taskUSER:	case taskUSER:
#ifdef __NetBSD__	#ifdef __NetBSD__
EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));	EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));
Line 163 sched_hook_cancel(void task, void arg __unused)	Line 182 sched_hook_cancel(void task, void arg __unused)
EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_DELETE, 0, 0, (void*) TASK_VAL(t));	EV_SET(&chg[0], TASK_VAL(t), EVFILT_USER, EV_DELETE, 0, 0, (void*) TASK_VAL(t));
#endif	#endif
break;	break;
	#endif
default:	default:
return (void*) -1;	return NULL;
}	}

kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout);	kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout);
Line 386 sched_hook_signal(void task, void arg __unused)	Line 406 sched_hook_signal(void task, void arg __unused)
* @arg = unused	* @arg = unused
* return: <0 errors and 0 ok	* return: <0 errors and 0 ok
*/	*/
	#ifdef EVFILT_USER
void *	void *
sched_hook_user(void task, void arg __unused)	sched_hook_user(void task, void arg __unused)
{	{
Line 413 sched_hook_user(void task, void arg __unused)	Line 434 sched_hook_user(void task, void arg __unused)

return NULL;	return NULL;
}	}
	#endif

/*	/*
* sched_hook_fetch() - Default FETCH hook	* sched_hook_fetch() - Default FETCH hook
Line 429 sched_hook_fetch(void root, void arg __unused)	Line 451 sched_hook_fetch(void root, void arg __unused)
struct timespec now, m, mtmp;	struct timespec now, m, mtmp;
struct timespec *timeout;	struct timespec *timeout;
struct kevent evt[1], res[KQ_EVENTS];	struct kevent evt[1], res[KQ_EVENTS];
register int i;	register int i, flg;
int en;	int en;
	#ifdef EVFILT_AIO
	int len;
	struct aiocb *acb;
	#endif

if (!r)	if (!r)
return NULL;	return NULL;
Line 531 sched_hook_fetch(void root, void arg __unused)	Line 557 sched_hook_fetch(void root, void arg __unused)
/* Put read/write task to ready queue */	/* Put read/write task to ready queue */
switch (res[i].filter) {	switch (res[i].filter) {
case EVFILT_READ:	case EVFILT_READ:
	flg = 0;
TAILQ_FOREACH_SAFE(task, &r->root_read, task_node, tmp) {	TAILQ_FOREACH_SAFE(task, &r->root_read, task_node, tmp) {
if (TASK_FD(task) != ((intptr_t) res[i].udata))	if (TASK_FD(task) != ((intptr_t) res[i].udata))
continue;	continue;
	else
	flg++;
/* remove read handle */	/* remove read handle */
#ifdef HAVE_LIBPTHREAD	#ifdef HAVE_LIBPTHREAD
pthread_mutex_lock(&r->root_mtx[taskREAD]);	pthread_mutex_lock(&r->root_mtx[taskREAD]);
Line 572 sched_hook_fetch(void root, void arg __unused)	Line 601 sched_hook_fetch(void root, void arg __unused)
pthread_mutex_unlock(&r->root_mtx[taskREADY]);	pthread_mutex_unlock(&r->root_mtx[taskREADY]);
#endif	#endif
}	}
break;
}	}
	/* if match at least 2, don't remove resouce of event */
	if (flg > 1)
	evt->flags ^= evt->flags;
break;	break;
case EVFILT_WRITE:	case EVFILT_WRITE:
	flg = 0;
TAILQ_FOREACH_SAFE(task, &r->root_write, task_node, tmp) {	TAILQ_FOREACH_SAFE(task, &r->root_write, task_node, tmp) {
if (TASK_FD(task) != ((intptr_t) res[i].udata))	if (TASK_FD(task) != ((intptr_t) res[i].udata))
continue;	continue;
	else
	flg++;
/* remove write handle */	/* remove write handle */
#ifdef HAVE_LIBPTHREAD	#ifdef HAVE_LIBPTHREAD
pthread_mutex_lock(&r->root_mtx[taskWRITE]);	pthread_mutex_lock(&r->root_mtx[taskWRITE]);
Line 617 sched_hook_fetch(void root, void arg __unused)	Line 651 sched_hook_fetch(void root, void arg __unused)
pthread_mutex_unlock(&r->root_mtx[taskREADY]);	pthread_mutex_unlock(&r->root_mtx[taskREADY]);
#endif	#endif
}	}
break;
}	}
	/* if match at least 2, don't remove resouce of event */
	if (flg > 1)
	evt->flags ^= evt->flags;
break;	break;
case EVFILT_TIMER:	case EVFILT_TIMER:
	flg = 0;
TAILQ_FOREACH_SAFE(task, &r->root_alarm, task_node, tmp) {	TAILQ_FOREACH_SAFE(task, &r->root_alarm, task_node, tmp) {
if ((uintptr_t) TASK_DATA(task) != ((uintptr_t) res[i].udata))	if ((uintptr_t) TASK_DATA(task) != ((uintptr_t) res[i].udata))
continue;	continue;
	else
	flg++;
/* remove alarm handle */	/* remove alarm handle */
#ifdef HAVE_LIBPTHREAD	#ifdef HAVE_LIBPTHREAD
pthread_mutex_lock(&r->root_mtx[taskALARM]);	pthread_mutex_lock(&r->root_mtx[taskALARM]);
Line 640 sched_hook_fetch(void root, void arg __unused)	Line 679 sched_hook_fetch(void root, void arg __unused)
#ifdef HAVE_LIBPTHREAD	#ifdef HAVE_LIBPTHREAD
pthread_mutex_unlock(&r->root_mtx[taskREADY]);	pthread_mutex_unlock(&r->root_mtx[taskREADY]);
#endif	#endif
break;
}	}
	/* if match at least 2, don't remove resouce of event */
	if (flg > 1)
	evt->flags ^= evt->flags;
break;	break;
case EVFILT_VNODE:	case EVFILT_VNODE:
	flg = 0;
TAILQ_FOREACH_SAFE(task, &r->root_node, task_node, tmp) {	TAILQ_FOREACH_SAFE(task, &r->root_node, task_node, tmp) {
if (TASK_FD(task) != ((intptr_t) res[i].udata))	if (TASK_FD(task) != ((intptr_t) res[i].udata))
continue;	continue;
else {	else {
TASK_DATA(task) = (void*) res[i].data;	flg++;
	TASK_DATA(task) = (void*) (uintptr_t) res[i].data;
TASK_DATLEN(task) = res[i].fflags;	TASK_DATLEN(task) = res[i].fflags;
}	}
/* remove node handle */	/* remove node handle */
Line 667 sched_hook_fetch(void root, void arg __unused)	Line 710 sched_hook_fetch(void root, void arg __unused)
#ifdef HAVE_LIBPTHREAD	#ifdef HAVE_LIBPTHREAD
pthread_mutex_unlock(&r->root_mtx[taskREADY]);	pthread_mutex_unlock(&r->root_mtx[taskREADY]);
#endif	#endif
break;
}	}
	/* if match at least 2, don't remove resouce of event */
	if (flg > 1)
	evt->flags ^= evt->flags;
break;	break;
case EVFILT_PROC:	case EVFILT_PROC:
	flg = 0;
TAILQ_FOREACH_SAFE(task, &r->root_proc, task_node, tmp) {	TAILQ_FOREACH_SAFE(task, &r->root_proc, task_node, tmp) {
if (TASK_VAL(task) != ((uintptr_t) res[i].udata))	if (TASK_VAL(task) != ((uintptr_t) res[i].udata))
continue;	continue;
else {	else {
TASK_DATA(task) = (void*) res[i].data;	flg++;
	TASK_DATA(task) = (void*) (uintptr_t) res[i].data;
TASK_DATLEN(task) = res[i].fflags;	TASK_DATLEN(task) = res[i].fflags;
}	}
/* remove proc handle */	/* remove proc handle */
Line 694 sched_hook_fetch(void root, void arg __unused)	Line 741 sched_hook_fetch(void root, void arg __unused)
#ifdef HAVE_LIBPTHREAD	#ifdef HAVE_LIBPTHREAD
pthread_mutex_unlock(&r->root_mtx[taskREADY]);	pthread_mutex_unlock(&r->root_mtx[taskREADY]);
#endif	#endif
break;
}	}
	/* if match at least 2, don't remove resouce of event */
	if (flg > 1)
	evt->flags ^= evt->flags;
break;	break;
case EVFILT_SIGNAL:	case EVFILT_SIGNAL:
	flg = 0;
TAILQ_FOREACH_SAFE(task, &r->root_signal, task_node, tmp) {	TAILQ_FOREACH_SAFE(task, &r->root_signal, task_node, tmp) {
if (TASK_VAL(task) != ((uintptr_t) res[i].udata))	if (TASK_VAL(task) != ((uintptr_t) res[i].udata))
continue;	continue;
	else
	flg++;
/* remove signal handle */	/* remove signal handle */
#ifdef HAVE_LIBPTHREAD	#ifdef HAVE_LIBPTHREAD
pthread_mutex_lock(&r->root_mtx[taskSIGNAL]);	pthread_mutex_lock(&r->root_mtx[taskSIGNAL]);
Line 717 sched_hook_fetch(void root, void arg __unused)	Line 769 sched_hook_fetch(void root, void arg __unused)
#ifdef HAVE_LIBPTHREAD	#ifdef HAVE_LIBPTHREAD
pthread_mutex_unlock(&r->root_mtx[taskREADY]);	pthread_mutex_unlock(&r->root_mtx[taskREADY]);
#endif	#endif
break;
}	}
	/* if match at least 2, don't remove resouce of event */
	if (flg > 1)
	evt->flags ^= evt->flags;
break;	break;
	#ifdef EVFILT_AIO
	case EVFILT_AIO:
	flg = 0;
	TAILQ_FOREACH_SAFE(task, &r->root_aio, task_node, tmp) {
	acb = (struct aiocb*) TASK_VAL(task);
	if (acb != ((struct aiocb*) res[i].ident) \|\|
	acb->aio_sigevent.sigev_value.sival_ptr != res[i].udata)
	continue;
	else
	flg++;
	/* remove user handle */
	#ifdef HAVE_LIBPTHREAD
	pthread_mutex_lock(&r->root_mtx[taskAIO]);
	#endif
	TAILQ_REMOVE(&r->root_aio, task, task_node);
	#ifdef HAVE_LIBPTHREAD
	pthread_mutex_unlock(&r->root_mtx[taskAIO]);
	#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
	if ((len = aio_return(acb)) != -1) {
	if (lseek(acb->aio_fildes, acb->aio_offset + len,
	SEEK_CUR) == -1)
	LOGERR;
	} else
	LOGERR;

	free(acb);
	TASK_VAL(task) = (u_long) len;
	}
	/* if match at least 2, don't remove resouce of event */
	if (flg > 1)
	evt->flags ^= evt->flags;
	break;
	#endif /* EVFILT_AIO */
	#ifdef EVFILT_USER
case EVFILT_USER:	case EVFILT_USER:
	flg = 0;
TAILQ_FOREACH_SAFE(task, &r->root_user, task_node, tmp) {	TAILQ_FOREACH_SAFE(task, &r->root_user, task_node, tmp) {
if (TASK_VAL(task) != ((uintptr_t) res[i].udata))	if (TASK_VAL(task) != ((uintptr_t) res[i].udata))
continue;	continue;
else {	else {
	flg++;
TASK_DATA(task) = (void*) res[i].data;	TASK_DATA(task) = (void*) res[i].data;
TASK_DATLEN(task) = res[i].fflags;	TASK_DATLEN(task) = res[i].fflags;
}	}
Line 744 sched_hook_fetch(void root, void arg __unused)	Line 842 sched_hook_fetch(void root, void arg __unused)
#ifdef HAVE_LIBPTHREAD	#ifdef HAVE_LIBPTHREAD
pthread_mutex_unlock(&r->root_mtx[taskREADY]);	pthread_mutex_unlock(&r->root_mtx[taskREADY]);
#endif	#endif
break;
}	}
	/* if match at least 2, don't remove resouce of event */
	if (flg > 1)
	evt->flags ^= evt->flags;
break;	break;
	#endif /* EVFILT_USER */
}	}
if (kevent(r->root_kq, evt, 1, NULL, 0, &now) == -1) {	if (kevent(r->root_kq, evt, 1, NULL, 0, &now) == -1) {
if (r->root_hooks.hook_exec.exception) {	if (r->root_hooks.hook_exec.exception) {

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.7.2.2
changed lines
	Added in v.1.10.2.4