libaitsched/src/aitsched.c - diff

Return to aitsched.c CVS log

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

Diff for /libaitsched/src/aitsched.c between versions 1.1 and 1.2

version 1.1, 2011/08/05 15:52:00	version 1.2, 2011/10/04 12:34:33
Line 85 sched_SetErr(int eno, char *estr, ...)	Line 85 sched_SetErr(int eno, char *estr, ...)
/* Init and prepare scheduler functions */	/* Init and prepare scheduler functions */

/*	/*
	* schedRegisterHooks() - Register IO handles and bind tasks to it
	* @root = root task
	* return: -1 error or 0 ok
	*/
	int
	schedRegisterHooks(sched_root_task_t * __restrict root)
	{
	if (!root \|\| (root->root_data.iov_base && root->root_data.iov_len))
	return -1;

	if (root->root_hooks.hook_root.fini)
	root->root_hooks.hook_root.fini(root, NULL);
	memset(&root->root_hooks, 0, sizeof root->root_hooks);

	root->root_hooks.hook_add.read = sched_hook_read;
	root->root_hooks.hook_add.write = sched_hook_write;

	root->root_hooks.hook_exec.cancel = sched_hook_cancel;
	root->root_hooks.hook_exec.fetch = sched_hook_fetch;

	root->root_hooks.hook_root.init = sched_hook_init;
	root->root_hooks.hook_root.fini = sched_hook_fini;
	return 0;
	}

	/*
* schedInit() - Init scheduler	* schedInit() - Init scheduler
* @data = optional data if !=NULL	* @data = optional data if !=NULL
* @datlen = data len if data is set	* @datlen = data len if data is set
Line 97 schedInit(void ** __restrict data, size_t datlen)	Line 123 schedInit(void ** __restrict data, size_t datlen)
int (func)(sched_root_task_t );	int (func)(sched_root_task_t );

root = malloc(sizeof(sched_root_task_t));	root = malloc(sizeof(sched_root_task_t));
if (!root)	if (!root) {
LOGERR	LOGERR;
else {	} else {
memset(root, 0, sizeof(sched_root_task_t));	memset(root, 0, sizeof(sched_root_task_t));
	TAILQ_INIT(&root->root_read);
	TAILQ_INIT(&root->root_write);
	TAILQ_INIT(&root->root_timer);
	TAILQ_INIT(&root->root_event);
	TAILQ_INIT(&root->root_eventlo);
	TAILQ_INIT(&root->root_ready);
	TAILQ_INIT(&root->root_unuse);

if (data && *data) {	if (data && *data) {
if (datlen) {	if (datlen) {
root->root_data.iov_base = *data;	root->root_data.iov_base = *data;
root->root_data.iov_len = datlen;	root->root_data.iov_len = datlen;
} else {	} else {
func = *data;	func = (int()(sched_root_task_t)) data;
func(root);	func(root);
}	}
}	}

	if (root->root_hooks.hook_root.init)
	root->root_hooks.hook_root.init(root, NULL);
}	}

if (root->root_hooks.hook_root.init)
root->root_hooks.hook_root.init(root, NULL);
return root;	return root;
}	}

/*	/*
* schedRegisterIO() - Register IO handles and bind tasks to it
* @root = root task
* return: -1 error or 0 ok
*/
int
schedRegisterIO(sched_root_task_t * __restrict root)
{
if (!root \|\| (root->root_data.iov_base && root->root_data.iov_len))
return -1;

if (root->root_hooks.hook_root.fini)
root->root_hooks.hook_root.fini(root, NULL);
memset(&root->root_hooks, 0, sizeof root->root_hooks);

root->root_hooks.hook_add.read = sched_hook_read;
root->root_hooks.hook_add.write = sched_hook_write;

root->root_hooks.hook_exec.cancel = sched_hook_cancel;
root->root_hooks.hook_exec.fetch = sched_hook_fetch;

root->root_hooks.hook_root.init = sched_hook_init;
root->root_hooks.hook_root.fini = sched_hook_fini;

if (root->root_hooks.hook_root.init)
root->root_hooks.hook_root.init(root, NULL);
return 0;
}

/*
* schedEnd() - End scheduler & free all resources	* schedEnd() - End scheduler & free all resources
* @root = root task	* @root = root task
* return: -1 error or 0 ok	* return: -1 error or 0 ok
*/	*/
int	int
schedEnd(sched_root_task_t * __restrict root)	schedEnd(sched_root_task_t ** __restrict root)
{	{
sched_task_t *task;	sched_task_t *task;

if (!root)	if (!root \|\| !*root)
return -1;	return -1;

TAILQ_FOREACH(task, &root->root_read, task_node) {	TAILQ_FOREACH(task, &(*root)->root_read, task_node) {
schedCancel(task);	schedCancel(task);
}	}
TAILQ_FOREACH(task, &root->root_write, task_node) {	TAILQ_FOREACH(task, &(*root)->root_write, task_node) {
schedCancel(task);	schedCancel(task);
}	}
TAILQ_FOREACH(task, &root->root_timer, task_node) {	TAILQ_FOREACH(task, &(*root)->root_timer, task_node) {
schedCancel(task);	schedCancel(task);
}	}
TAILQ_FOREACH(task, &root->root_event, task_node) {	TAILQ_FOREACH(task, &(*root)->root_event, task_node) {
schedCancel(task);	schedCancel(task);
}	}
TAILQ_FOREACH(task, &root->root_ready, task_node) {	TAILQ_FOREACH(task, &(*root)->root_ready, task_node) {
schedCancel(task);	schedCancel(task);
}	}

while ((task = TAILQ_FIRST(&root->root_unuse))) {	while ((task = TAILQ_FIRST(&(*root)->root_unuse))) {
TAILQ_REMOVE(&root->root_unuse, task, task_node);	TAILQ_REMOVE(&(*root)->root_unuse, task, task_node);
free(task);	free(task);
}	}

if (root->root_hooks.hook_root.fini)	if ((*root)->root_hooks.hook_root.fini)
root->root_hooks.hook_root.fini(root, NULL);	(root)->root_hooks.hook_root.fini(root, NULL);

free(root);	free(*root);
	*root = NULL;
return 0;	return 0;
}	}

Line 316 schedCancelby(sched_root_task_t * __restrict root, sch	Line 322 schedCancelby(sched_root_task_t * __restrict root, sch
break;	break;
}	}
} else if (criteria == CRITERIA_FD) {	} else if (criteria == CRITERIA_FD) {
if (TASK_FD(task) == (u_long) param) {	if (TASK_FD(task) == (int) param) {
flg++;	flg++;
break;	break;
}	}
Line 356 schedCancelby(sched_root_task_t * __restrict root, sch	Line 362 schedCancelby(sched_root_task_t * __restrict root, sch
/*	/*
* schedRun() - Scheduler run loop	* schedRun() - Scheduler run loop
* @root = root task	* @root = root task
	* @killState = kill condition variable, if !=0 stop scheduler loop
* return: -1 error or 0 ok	* return: -1 error or 0 ok
*/	*/
int	int
schedRun(sched_root_task_t * __restrict root)	schedRun(sched_root_task_t * __restrict root, volatile intptr_t * __restrict killState)
{	{
sched_task_t *task;	sched_task_t *task;

Line 369 schedRun(sched_root_task_t * __restrict root)	Line 376 schedRun(sched_root_task_t * __restrict root)
if (root->root_hooks.hook_exec.run)	if (root->root_hooks.hook_exec.run)
if (root->root_hooks.hook_exec.run(root, NULL))	if (root->root_hooks.hook_exec.run(root, NULL))
return -1;	return -1;
if (root->root_hooks.hook_exec.fetch)	if (root->root_hooks.hook_exec.fetch) {
while ((task = root->root_hooks.hook_exec.fetch(root, NULL)))	if (killState)
schedCall(task);	while (!*killState && (task = root->root_hooks.hook_exec.fetch(root, NULL)))
	schedCall(task);
	else
	while ((task = root->root_hooks.hook_exec.fetch(root, NULL)))
	schedCall(task);
	}

return 0;	return 0;
}	}

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

Removed from v.1.1
changed lines
	Added in v.1.2