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.20.2.2 and 1.24.4.2

version 1.20.2.2, 2013/08/26 07:40:06	version 1.24.4.2, 2014/01/27 17:08:02
Line 62 sched_hook_init(void root, void arg __unused)	Line 62 sched_hook_init(void root, void arg __unused)
if (!r)	if (!r)
return (void*) -1;	return (void*) -1;

	#ifndef KQ_DISABLE
r->root_kq = kqueue();	r->root_kq = kqueue();
if (r->root_kq == -1) {	if (r->root_kq == -1) {
LOGERR;	LOGERR;
return (void*) -1;	return (void*) -1;
}	}
	#else
	r->root_kq ^= r->root_kq;
	FD_ZERO(&r->root_fds[0]);
	FD_ZERO(&r->root_fds[1]);
	#endif

return NULL;	return NULL;
}	}
Line 86 sched_hook_fini(void root, void arg __unused)	Line 92 sched_hook_fini(void root, void arg __unused)
if (!r)	if (!r)
return (void*) -1;	return (void*) -1;

	#ifndef KQ_DISABLE
if (r->root_kq > 2) {	if (r->root_kq > 2) {
close(r->root_kq);	close(r->root_kq);
r->root_kq = 0;	r->root_kq = 0;
}	}
	#else
	FD_ZERO(&r->root_fds[1]);
	FD_ZERO(&r->root_fds[0]);
	r->root_kq ^= r->root_kq;
	#endif

return NULL;	return NULL;
}	}
Line 105 void *	Line 117 void *
sched_hook_cancel(void task, void arg __unused)	sched_hook_cancel(void task, void arg __unused)
{	{
sched_task_t *t = task;	sched_task_t *t = task;
	#ifndef KQ_DISABLE
struct kevent chg[1];	struct kevent chg[1];
struct timespec timeout = { 0, 0 };	struct timespec timeout = { 0, 0 };
	#else
	sched_root_task_t *r = NULL;
	register int i;
	#endif
#ifdef AIO_SUPPORT	#ifdef AIO_SUPPORT
struct aiocb *acb;	struct aiocb *acb;
#ifdef EVFILT_LIO	#ifdef EVFILT_LIO
Line 117 sched_hook_cancel(void task, void arg __unused)	Line 134 sched_hook_cancel(void task, void arg __unused)

if (!t \|\| !TASK_ROOT(t))	if (!t \|\| !TASK_ROOT(t))
return (void*) -1;	return (void*) -1;
	#ifdef KQ_DISABLE
	r = TASK_ROOT(t);
	#endif

switch (TASK_TYPE(t)) {	switch (TASK_TYPE(t)) {
case taskREAD:	case taskREAD:
	#ifndef KQ_DISABLE
#ifdef __NetBSD__	#ifdef __NetBSD__
EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, (intptr_t) TASK_FD(t));	EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_DELETE, 0, 0, (intptr_t) TASK_FD(t));
#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
	#else
	FD_CLR(TASK_FD(t), &r->root_fds[0]);

	/* optimize select */
	for (i = r->root_kq - 1; i > 2; i--)
	if (FD_ISSET(i, &r->root_fds[0]) \|\| FD_ISSET(i, &r->root_fds[1]))
	break;
	if (i > 2)
	r->root_kq = i + 1;
	#endif
break;	break;
case taskWRITE:	case taskWRITE:
	#ifndef KQ_DISABLE
#ifdef __NetBSD__	#ifdef __NetBSD__
EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, (intptr_t) TASK_FD(t));	EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_DELETE, 0, 0, (intptr_t) TASK_FD(t));
#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
	#else
	FD_CLR(TASK_FD(t), &r->root_fds[1]);

	/* optimize select */
	for (i = r->root_kq - 1; i > 2; i--)
	if (FD_ISSET(i, &r->root_fds[0]) \|\| FD_ISSET(i, &r->root_fds[1]))
	break;
	if (i > 2)
	r->root_kq = i + 1;
	#endif
break;	break;
case taskALARM:	case taskALARM:
	#ifndef KQ_DISABLE
#ifdef __NetBSD__	#ifdef __NetBSD__
EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_DELETE,	EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_DELETE,
0, 0, (intptr_t) TASK_DATA(t));	0, 0, (intptr_t) TASK_DATA(t));
Line 141 sched_hook_cancel(void task, void arg __unused)	Line 184 sched_hook_cancel(void task, void arg __unused)
EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_DELETE,	EV_SET(&chg[0], (uintptr_t) TASK_DATA(t), EVFILT_TIMER, EV_DELETE,
0, 0, (void*) TASK_DATA(t));	0, 0, (void*) TASK_DATA(t));
#endif	#endif
	#endif
break;	break;
case taskNODE:	case taskNODE:
	#ifndef KQ_DISABLE
#ifdef __NetBSD__	#ifdef __NetBSD__
EV_SET(&chg[0], TASK_FD(t), EVFILT_VNODE, EV_DELETE, 0, 0, (intptr_t) TASK_FD(t));	EV_SET(&chg[0], TASK_FD(t), EVFILT_VNODE, EV_DELETE, 0, 0, (intptr_t) TASK_FD(t));
#else	#else
EV_SET(&chg[0], TASK_FD(t), EVFILT_VNODE, EV_DELETE, 0, 0, (void*) TASK_FD(t));	EV_SET(&chg[0], TASK_FD(t), EVFILT_VNODE, EV_DELETE, 0, 0, (void*) TASK_FD(t));
#endif	#endif
	#endif
break;	break;
case taskPROC:	case taskPROC:
	#ifndef KQ_DISABLE
#ifdef __NetBSD__	#ifdef __NetBSD__
EV_SET(&chg[0], TASK_VAL(t), EVFILT_PROC, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));	EV_SET(&chg[0], TASK_VAL(t), EVFILT_PROC, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));
#else	#else
EV_SET(&chg[0], TASK_VAL(t), EVFILT_PROC, EV_DELETE, 0, 0, (void*) TASK_VAL(t));	EV_SET(&chg[0], TASK_VAL(t), EVFILT_PROC, EV_DELETE, 0, 0, (void*) TASK_VAL(t));
#endif	#endif
	#endif
break;	break;
case taskSIGNAL:	case taskSIGNAL:
	#ifndef KQ_DISABLE
#ifdef __NetBSD__	#ifdef __NetBSD__
EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));	EV_SET(&chg[0], TASK_VAL(t), EVFILT_SIGNAL, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));
#else	#else
Line 164 sched_hook_cancel(void task, void arg __unused)	Line 213 sched_hook_cancel(void task, void arg __unused)
#endif	#endif
/* restore signal */	/* restore signal */
signal(TASK_VAL(t), SIG_DFL);	signal(TASK_VAL(t), SIG_DFL);
	#endif
break;	break;
#ifdef AIO_SUPPORT	#ifdef AIO_SUPPORT
case taskAIO:	case taskAIO:
	#ifndef KQ_DISABLE
#ifdef __NetBSD__	#ifdef __NetBSD__
EV_SET(&chg[0], TASK_VAL(t), EVFILT_AIO, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));	EV_SET(&chg[0], TASK_VAL(t), EVFILT_AIO, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));
#else	#else
Line 179 sched_hook_cancel(void task, void arg __unused)	Line 230 sched_hook_cancel(void task, void arg __unused)
free(acb);	free(acb);
TASK_VAL(t) = 0;	TASK_VAL(t) = 0;
}	}
	#endif
break;	break;
#ifdef EVFILT_LIO	#ifdef EVFILT_LIO
case taskLIO:	case taskLIO:
	#ifndef KQ_DISABLE
#ifdef __NetBSD__	#ifdef __NetBSD__
EV_SET(&chg[0], TASK_VAL(t), EVFILT_LIO, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));	EV_SET(&chg[0], TASK_VAL(t), EVFILT_LIO, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));
#else	#else
Line 197 sched_hook_cancel(void task, void arg __unused)	Line 250 sched_hook_cancel(void task, void arg __unused)
free(acbs);	free(acbs);
TASK_VAL(t) = 0;	TASK_VAL(t) = 0;
}	}
	#endif
break;	break;
#endif /* EVFILT_LIO */	#endif /* EVFILT_LIO */
#endif /* AIO_SUPPORT */	#endif /* AIO_SUPPORT */
#ifdef EVFILT_USER	#ifdef EVFILT_USER
case taskUSER:	case taskUSER:
	#ifndef KQ_DISABLE
#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));
#else	#else
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
	#endif
break;	break;
#endif /* EVFILT_USER */	#endif /* EVFILT_USER */
case taskTHREAD:	case taskTHREAD:
Line 224 sched_hook_cancel(void task, void arg __unused)	Line 280 sched_hook_cancel(void task, void arg __unused)
return NULL;	return NULL;
}	}

	#ifndef KQ_DISABLE
kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout);	kevent(TASK_ROOT(t)->root_kq, chg, 1, NULL, 0, &timeout);
	#endif
return NULL;	return NULL;
}	}

Line 275 void *	Line 333 void *
sched_hook_read(void task, void arg __unused)	sched_hook_read(void task, void arg __unused)
{	{
sched_task_t *t = task;	sched_task_t *t = task;
	#ifndef KQ_DISABLE
struct kevent chg[1];	struct kevent chg[1];
struct timespec timeout = { 0, 0 };	struct timespec timeout = { 0, 0 };
	#else
	sched_root_task_t *r = NULL;
	#endif

if (!t \|\| !TASK_ROOT(t))	if (!t \|\| !TASK_ROOT(t))
return (void*) -1;	return (void*) -1;
	#ifdef KQ_DISABLE
	r = TASK_ROOT(t);
	#endif

	#ifndef KQ_DISABLE
#ifdef __NetBSD__	#ifdef __NetBSD__
EV_SET(&chg[0], TASK_FD(t), EVFILT_READ, EV_ADD \| EV_CLEAR, 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
Line 293 sched_hook_read(void task, void arg __unused)	Line 359 sched_hook_read(void task, void arg __unused)
LOGERR;	LOGERR;
return (void*) -1;	return (void*) -1;
}	}
	#else
	FD_SET(TASK_FD(t), &r->root_fds[0]);
	if (TASK_FD(t) >= r->root_kq)
	r->root_kq = TASK_FD(t) + 1;
	#endif

return NULL;	return NULL;
}	}
Line 308 void *	Line 379 void *
sched_hook_write(void task, void arg __unused)	sched_hook_write(void task, void arg __unused)
{	{
sched_task_t *t = task;	sched_task_t *t = task;
	#ifndef KQ_DISABLE
struct kevent chg[1];	struct kevent chg[1];
struct timespec timeout = { 0, 0 };	struct timespec timeout = { 0, 0 };
	#else
	sched_root_task_t *r = NULL;
	#endif

if (!t \|\| !TASK_ROOT(t))	if (!t \|\| !TASK_ROOT(t))
return (void*) -1;	return (void*) -1;
	#ifdef KQ_DISABLE
	r = TASK_ROOT(t);
	#endif

	#ifndef KQ_DISABLE
#ifdef __NetBSD__	#ifdef __NetBSD__
EV_SET(&chg[0], TASK_FD(t), EVFILT_WRITE, EV_ADD \| EV_CLEAR, 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
Line 326 sched_hook_write(void task, void arg __unused)	Line 405 sched_hook_write(void task, void arg __unused)
LOGERR;	LOGERR;
return (void*) -1;	return (void*) -1;
}	}
	#else
	FD_SET(TASK_FD(t), &r->root_fds[1]);
	if (TASK_FD(t) >= r->root_kq)
	r->root_kq = TASK_FD(t) + 1;
	#endif

return NULL;	return NULL;
}	}
Line 340 sched_hook_write(void task, void arg __unused)	Line 424 sched_hook_write(void task, void arg __unused)
void *	void *
sched_hook_alarm(void task, void arg __unused)	sched_hook_alarm(void task, void arg __unused)
{	{
	#ifndef KQ_DISABLE
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 };
Line 364 sched_hook_alarm(void task, void arg __unused)	Line 449 sched_hook_alarm(void task, void arg __unused)
return (void*) -1;	return (void*) -1;
}	}

	#endif
return NULL;	return NULL;
}	}

Line 377 sched_hook_alarm(void task, void arg __unused)	Line 463 sched_hook_alarm(void task, void arg __unused)
void *	void *
sched_hook_node(void task, void arg __unused)	sched_hook_node(void task, void arg __unused)
{	{
	#ifndef KQ_DISABLE
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 };
Line 401 sched_hook_node(void task, void arg __unused)	Line 488 sched_hook_node(void task, void arg __unused)
return (void*) -1;	return (void*) -1;
}	}

	#endif
return NULL;	return NULL;
}	}

Line 414 sched_hook_node(void task, void arg __unused)	Line 502 sched_hook_node(void task, void arg __unused)
void *	void *
sched_hook_proc(void task, void arg __unused)	sched_hook_proc(void task, void arg __unused)
{	{
	#ifndef KQ_DISABLE
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 };
Line 436 sched_hook_proc(void task, void arg __unused)	Line 525 sched_hook_proc(void task, void arg __unused)
return (void*) -1;	return (void*) -1;
}	}

	#endif
return NULL;	return NULL;
}	}

Line 449 sched_hook_proc(void task, void arg __unused)	Line 539 sched_hook_proc(void task, void arg __unused)
void *	void *
sched_hook_signal(void task, void arg __unused)	sched_hook_signal(void task, void arg __unused)
{	{
	#ifndef KQ_DISABLE
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 };
Line 472 sched_hook_signal(void task, void arg __unused)	Line 563 sched_hook_signal(void task, void arg __unused)
return (void*) -1;	return (void*) -1;
}	}

	#endif
return NULL;	return NULL;
}	}

Line 486 sched_hook_signal(void task, void arg __unused)	Line 578 sched_hook_signal(void task, void arg __unused)
void *	void *
sched_hook_user(void task, void arg __unused)	sched_hook_user(void task, void arg __unused)
{	{
	#ifndef KQ_DISABLE
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 };
Line 508 sched_hook_user(void task, void arg __unused)	Line 601 sched_hook_user(void task, void arg __unused)
return (void*) -1;	return (void*) -1;
}	}

	#endif
return NULL;	return NULL;
}	}
#endif	#endif
Line 525 sched_hook_fetch(void root, void arg __unused)	Line 619 sched_hook_fetch(void root, void arg __unused)
sched_root_task_t *r = root;	sched_root_task_t *r = root;
sched_task_t task, tmp;	sched_task_t task, tmp;
struct timespec now, m, mtmp;	struct timespec now, m, mtmp;
struct timespec *timeout;	#ifndef KQ_DISABLE
struct kevent evt[1], res[KQ_EVENTS];	struct kevent evt[1], res[KQ_EVENTS];
	struct timespec *timeout, m, mtmp;
	#else
	struct timeval *timeout, tv;
	#endif
register int i, flg;	register int i, flg;
int en;	int en;
#ifdef AIO_SUPPORT	#ifdef AIO_SUPPORT
Line 601 sched_hook_fetch(void root, void arg __unused)	Line 699 sched_hook_fetch(void root, void arg __unused)
/* set wait INFTIM */	/* set wait INFTIM */
sched_timespecinf(&r->root_wait);	sched_timespecinf(&r->root_wait);
}	}
#else	#else /* ! TIMER_WITHOUT_SORT */
if (!TAILQ_FIRST(&r->root_task) && (task = TAILQ_FIRST(&r->root_timer))) {	if (!TAILQ_FIRST(&r->root_task) && (task = TAILQ_FIRST(&r->root_timer))) {
clock_gettime(CLOCK_MONOTONIC, &now);	clock_gettime(CLOCK_MONOTONIC, &now);

Line 612 sched_hook_fetch(void root, void arg __unused)	Line 710 sched_hook_fetch(void root, void arg __unused)
/* set wait INFTIM */	/* set wait INFTIM */
sched_timespecinf(&r->root_wait);	sched_timespecinf(&r->root_wait);
}	}
#endif	#endif /* TIMER_WITHOUT_SORT */
/* if present member of task, set NOWAIT */	/* if present member of task, set NOWAIT */
if (TAILQ_FIRST(&r->root_task))	if (TAILQ_FIRST(&r->root_task))
sched_timespecclear(&r->root_wait);	sched_timespecclear(&r->root_wait);

if (r->root_wait.tv_sec != -1 && r->root_wait.tv_nsec != -1)	if (r->root_wait.tv_sec != -1 && r->root_wait.tv_nsec != -1) {
	#ifndef KQ_DISABLE
timeout = &r->root_wait;	timeout = &r->root_wait;
else if (sched_timespecisinf(&r->root_poll))	#else
	sched_timespec2val(&r->root_wait, &tv);
	timeout = &tv;
	#endif /* KQ_DISABLE */
	} else if (sched_timespecisinf(&r->root_poll))
timeout = NULL;	timeout = NULL;
else	else {
	#ifndef KQ_DISABLE
timeout = &r->root_poll;	timeout = &r->root_poll;
	#else
	sched_timespec2val(&r->root_poll, &tv);
	timeout = &tv;
	#endif /* KQ_DISABLE */
	}

	#ifndef KQ_DISABLE
if ((en = kevent(r->root_kq, NULL, 0, res, KQ_EVENTS, timeout)) == -1) {	if ((en = kevent(r->root_kq, NULL, 0, res, KQ_EVENTS, timeout)) == -1) {
	#else
	if ((en = select(r->root_kq, &r->root_fds[0], &r->root_fds[1],
	&r->root_fds[0], timeout)) == -1) {
	#endif /* KQ_DISABLE */
if (r->root_hooks.hook_exec.exception) {	if (r->root_hooks.hook_exec.exception) {
if (r->root_hooks.hook_exec.exception(r, NULL))	if (r->root_hooks.hook_exec.exception(r, NULL))
return NULL;	return NULL;
} else if (errno != EINTR)	} else if (errno != EINTR)
LOGERR;	LOGERR;
return NULL;	goto skip_event;
}	}

	/* kevent dispatcher */
now.tv_sec = now.tv_nsec = 0;	now.tv_sec = now.tv_nsec = 0;
/* Go and catch the cat into pipes ... */	/* Go and catch the cat into pipes ... */
for (i = 0; i < en; i++) {	for (i = 0; i < en; i++) {
	#ifndef KQ_DISABLE
memcpy(evt, &res[i], sizeof evt);	memcpy(evt, &res[i], sizeof evt);
evt->flags = EV_DELETE;	evt->flags = EV_DELETE;
/* Put read/write task to ready queue */	/* Put read/write task to ready queue */
Line 1003 sched_hook_fetch(void root, void arg __unused)	Line 1120 sched_hook_fetch(void root, void arg __unused)
} else	} else
LOGERR;	LOGERR;
}	}
	#else /* end of kevent dispatcher */
	#endif /* KQ_DISABLE */
}	}

	skip_event:
/* timer update & put in ready queue */	/* timer update & put in ready queue */
clock_gettime(CLOCK_MONOTONIC, &now);	clock_gettime(CLOCK_MONOTONIC, &now);

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

Removed from v.1.20.2.2
changed lines
	Added in v.1.24.4.2