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.10.2.6 and 1.11

version 1.10.2.6, 2012/08/01 16:47:06	version 1.11, 2012/08/02 13:56:19
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	#ifdef AIO_SUPPORT
struct aiocb *acb;	struct aiocb *acb;
#endif	#ifdef EVFILT_LIO
	struct aiocb **acbs;
	register int i;
	#endif /* EVFILT_LIO */
	#endif /* AIO_SUPPORT */

if (!t \|\| !TASK_ROOT(t))	if (!t \|\| !TASK_ROOT(t))
return (void*) -1;	return (void*) -1;
Line 159 sched_hook_cancel(void task, void arg __unused)	Line 163 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	#ifdef AIO_SUPPORT
case taskAIO:	case taskAIO:
#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));
Line 174 sched_hook_cancel(void task, void arg __unused)	Line 178 sched_hook_cancel(void task, void arg __unused)
TASK_VAL(t) = 0;	TASK_VAL(t) = 0;
}	}
break;	break;
	#ifdef EVFILT_LIO
	case taskLIO:
	#ifdef __NetBSD__
	EV_SET(&chg[0], TASK_VAL(t), EVFILT_LIO, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));
	#else
	EV_SET(&chg[0], TASK_VAL(t), EVFILT_LIO, EV_DELETE, 0, 0, (void*) TASK_VAL(t));
#endif	#endif
	acbs = (struct aiocb**) TASK_VAL(t);
	if (acbs) {
	for (i = 0; i < TASK_DATLEN(t); i++) {
	if (aio_cancel(acbs[i]->aio_fildes, acbs[i]) == AIO_CANCELED)
	aio_return(acbs[i]);
	free(acbs[i]);
	}
	free(acbs);
	TASK_VAL(t) = 0;
	}
	break;
	#endif /* EVFILT_LIO */
	#endif /* AIO_SUPPORT */
#ifdef EVFILT_USER	#ifdef EVFILT_USER
case taskUSER:	case taskUSER:
#ifdef __NetBSD__	#ifdef __NetBSD__
Line 454 sched_hook_fetch(void root, void arg __unused)	Line 477 sched_hook_fetch(void root, void arg __unused)
struct kevent evt[1], res[KQ_EVENTS];	struct kevent evt[1], res[KQ_EVENTS];
register int i, flg;	register int i, flg;
int en;	int en;
#ifdef EVFILT_AIO	#ifdef AIO_SUPPORT
int len, fd;	int len, fd;
struct aiocb *acb;	struct aiocb *acb;
#endif	#ifdef EVFILT_LIO
	int l;
	register int j;
	off_t off;
	struct aiocb **acbs;
	struct iovec *iv;
	#endif /* EVFILT_LIO */
	#endif /* AIO_SUPPORT */

if (!r)	if (!r)
return NULL;	return NULL;
Line 775 sched_hook_fetch(void root, void arg __unused)	Line 805 sched_hook_fetch(void root, void arg __unused)
if (flg > 1)	if (flg > 1)
evt->flags ^= evt->flags;	evt->flags ^= evt->flags;
break;	break;
#ifdef EVFILT_AIO	#ifdef AIO_SUPPORT
case EVFILT_AIO:	case EVFILT_AIO:
flg = 0;	flg = 0;
TAILQ_FOREACH_SAFE(task, &r->root_aio, task_node, tmp) {	TAILQ_FOREACH_SAFE(task, &r->root_aio, task_node, tmp) {
Line 806 sched_hook_fetch(void root, void arg __unused)	Line 836 sched_hook_fetch(void root, void arg __unused)
LOGERR;	LOGERR;
} else	} else
LOGERR;	LOGERR;

free(acb);	free(acb);
	TASK_DATLEN(task) = (u_long) len;
TASK_FD(task) = fd;	TASK_FD(task) = fd;
	}
	/* if match at least 2, don't remove resouce of event */
	if (flg > 1)
	evt->flags ^= evt->flags;
	break;
	#ifdef EVFILT_LIO
	case EVFILT_LIO:
	flg = 0;
	TAILQ_FOREACH_SAFE(task, &r->root_lio, task_node, tmp) {
	acbs = (struct aiocb**) TASK_VAL(task);
	if (acbs != ((struct aiocb**) res[i].udata))
	continue;
	else
	flg++;
	/* remove user handle */
	#ifdef HAVE_LIBPTHREAD
	pthread_mutex_lock(&r->root_mtx[taskLIO]);
	#endif
	TAILQ_REMOVE(&r->root_lio, task, task_node);
	#ifdef HAVE_LIBPTHREAD
	pthread_mutex_unlock(&r->root_mtx[taskLIO]);
	#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
	iv = (struct iovec*) TASK_DATA(task);
	fd = acbs[0]->aio_fildes;
	off = acbs[0]->aio_offset;
	for (j = len = 0; i < TASK_DATLEN(task); len += l, i++) {
	if ((iv[i].iov_len = aio_return(acbs[i])) == -1)
	l = 0;
	else
	l = iv[i].iov_len;
	free(acbs[i]);
	}
	free(acbs);
TASK_DATLEN(task) = (u_long) len;	TASK_DATLEN(task) = (u_long) len;
	TASK_FD(task) = fd;

	if (lseek(fd, off + len, SEEK_CUR) == -1)
	LOGERR;
}	}
/* if match at least 2, don't remove resouce of event */	/* if match at least 2, don't remove resouce of event */
if (flg > 1)	if (flg > 1)
evt->flags ^= evt->flags;	evt->flags ^= evt->flags;
break;	break;
#endif /* EVFILT_AIO */	#endif /* EVFILT_LIO */
	#endif /* AIO_SUPPORT */
#ifdef EVFILT_USER	#ifdef EVFILT_USER
case EVFILT_USER:	case EVFILT_USER:
flg = 0;	flg = 0;

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

Removed from v.1.10.2.6
changed lines
	Added in v.1.11