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.11.2.2 and 1.14.2.1

version 1.11.2.2, 2012/08/01 12:49:26	version 1.14.2.1, 2012/08/21 11:07:16
Line 140 schedInit(void ** __restrict data, size_t datlen)	Line 140 schedInit(void ** __restrict data, size_t datlen)
} else {	} else {
memset(root, 0, sizeof(sched_root_task_t));	memset(root, 0, sizeof(sched_root_task_t));

	/* set default maximum regular task hit misses */
	root->root_miss = MAX_TASK_MISS;

/* INFINIT polling period by default */	/* INFINIT polling period by default */
sched_timespecinf(&root->root_poll);	sched_timespecinf(&root->root_poll);

Line 165 schedInit(void ** __restrict data, size_t datlen)	Line 168 schedInit(void ** __restrict data, size_t datlen)
TAILQ_INIT(&root->root_proc);	TAILQ_INIT(&root->root_proc);
TAILQ_INIT(&root->root_signal);	TAILQ_INIT(&root->root_signal);
TAILQ_INIT(&root->root_aio);	TAILQ_INIT(&root->root_aio);
	TAILQ_INIT(&root->root_lio);
TAILQ_INIT(&root->root_user);	TAILQ_INIT(&root->root_user);
TAILQ_INIT(&root->root_event);	TAILQ_INIT(&root->root_event);
TAILQ_INIT(&root->root_eventlo);	TAILQ_INIT(&root->root_task);
TAILQ_INIT(&root->root_suspend);	TAILQ_INIT(&root->root_suspend);
TAILQ_INIT(&root->root_ready);	TAILQ_INIT(&root->root_ready);
TAILQ_INIT(&root->root_unuse);	TAILQ_INIT(&root->root_unuse);
	TAILQ_INIT(&root->root_thread);

#ifdef HAVE_LIBPTHREAD	#ifdef HAVE_LIBPTHREAD
for (i = 0; i < taskMAX; i++)	for (i = 0; i < taskMAX; i++)
Line 228 schedEnd(sched_root_task_t ** __restrict root)	Line 233 schedEnd(sched_root_task_t ** __restrict root)
schedCancel(task);	schedCancel(task);
TAILQ_FOREACH_SAFE(task, &(*root)->root_aio, task_node, tmp)	TAILQ_FOREACH_SAFE(task, &(*root)->root_aio, task_node, tmp)
schedCancel(task);	schedCancel(task);
	TAILQ_FOREACH_SAFE(task, &(*root)->root_lio, task_node, tmp)
	schedCancel(task);
TAILQ_FOREACH_SAFE(task, &(*root)->root_user, task_node, tmp)	TAILQ_FOREACH_SAFE(task, &(*root)->root_user, task_node, tmp)
schedCancel(task);	schedCancel(task);
TAILQ_FOREACH_SAFE(task, &(*root)->root_event, task_node, tmp)	TAILQ_FOREACH_SAFE(task, &(*root)->root_event, task_node, tmp)
schedCancel(task);	schedCancel(task);
TAILQ_FOREACH_SAFE(task, &(*root)->root_eventlo, task_node, tmp)	TAILQ_FOREACH_SAFE(task, &(*root)->root_task, task_node, tmp)
schedCancel(task);	schedCancel(task);
TAILQ_FOREACH_SAFE(task, &(*root)->root_suspend, task_node, tmp)	TAILQ_FOREACH_SAFE(task, &(*root)->root_suspend, task_node, tmp)
schedCancel(task);	schedCancel(task);
TAILQ_FOREACH_SAFE(task, &(*root)->root_ready, task_node, tmp)	TAILQ_FOREACH_SAFE(task, &(*root)->root_ready, task_node, tmp)
schedCancel(task);	schedCancel(task);
	TAILQ_FOREACH_SAFE(task, &(*root)->root_thread, task_node, tmp)
	schedCancel(task);

#ifdef HAVE_LIBPTHREAD	#ifdef HAVE_LIBPTHREAD
pthread_mutex_lock(&(*root)->root_mtx[taskUNUSE]);	pthread_mutex_lock(&(*root)->root_mtx[taskUNUSE]);
Line 384 schedCancel(sched_task_t * __restrict task)	Line 393 schedCancel(sched_task_t * __restrict task)
case taskAIO:	case taskAIO:
queue = &TASK_ROOT(task)->root_aio;	queue = &TASK_ROOT(task)->root_aio;
break;	break;
	case taskLIO:
	queue = &TASK_ROOT(task)->root_lio;
	break;
case taskUSER:	case taskUSER:
queue = &TASK_ROOT(task)->root_user;	queue = &TASK_ROOT(task)->root_user;
break;	break;
case taskEVENT:	case taskEVENT:
queue = &TASK_ROOT(task)->root_event;	queue = &TASK_ROOT(task)->root_event;
break;	break;
case taskEVENTLO:	case taskTASK:
queue = &TASK_ROOT(task)->root_eventlo;	queue = &TASK_ROOT(task)->root_task;
break;	break;
case taskSUSPEND:	case taskSUSPEND:
queue = &TASK_ROOT(task)->root_suspend;	queue = &TASK_ROOT(task)->root_suspend;
Line 399 schedCancel(sched_task_t * __restrict task)	Line 411 schedCancel(sched_task_t * __restrict task)
case taskREADY:	case taskREADY:
queue = &TASK_ROOT(task)->root_ready;	queue = &TASK_ROOT(task)->root_ready;
break;	break;
	case taskTHREAD:
	queue = &TASK_ROOT(task)->root_thread;
	break;
default:	default:
queue = NULL;	queue = NULL;
}	}
Line 456 schedCancelby(sched_root_task_t * __restrict root, sch	Line 471 schedCancelby(sched_root_task_t * __restrict root, sch
return -2;	return -2;
if (schedCancelby(root, taskAIO, criteria, param, hook))	if (schedCancelby(root, taskAIO, criteria, param, hook))
return -2;	return -2;
	if (schedCancelby(root, taskLIO, criteria, param, hook))
	return -2;
if (schedCancelby(root, taskUSER, criteria, param, hook))	if (schedCancelby(root, taskUSER, criteria, param, hook))
return -2;	return -2;
if (schedCancelby(root, taskEVENT, criteria, param, hook))	if (schedCancelby(root, taskEVENT, criteria, param, hook))
return -2;	return -2;
if (schedCancelby(root, taskEVENTLO, criteria, param, hook))	if (schedCancelby(root, taskTASK, criteria, param, hook))
return -2;	return -2;
if (schedCancelby(root, taskSUSPEND, criteria, param, hook))	if (schedCancelby(root, taskSUSPEND, criteria, param, hook))
return -2;	return -2;
if (schedCancelby(root, taskREADY, criteria, param, hook))	if (schedCancelby(root, taskREADY, criteria, param, hook))
return -2;	return -2;
	if (schedCancelby(root, taskTHREAD, criteria, param, hook))
	return -2;
return 0;	return 0;
}	}
/* choosen queue */	/* choosen queue */
Line 494 schedCancelby(sched_root_task_t * __restrict root, sch	Line 513 schedCancelby(sched_root_task_t * __restrict root, sch
case taskAIO:	case taskAIO:
queue = &root->root_aio;	queue = &root->root_aio;
break;	break;
	case taskLIO:
	queue = &root->root_lio;
	break;
case taskUSER:	case taskUSER:
queue = &root->root_user;	queue = &root->root_user;
break;	break;
case taskEVENT:	case taskEVENT:
queue = &root->root_event;	queue = &root->root_event;
break;	break;
case taskEVENTLO:	case taskTASK:
queue = &root->root_eventlo;	queue = &root->root_task;
break;	break;
case taskSUSPEND:	case taskSUSPEND:
queue = &root->root_suspend;	queue = &root->root_suspend;
Line 509 schedCancelby(sched_root_task_t * __restrict root, sch	Line 531 schedCancelby(sched_root_task_t * __restrict root, sch
case taskREADY:	case taskREADY:
queue = &root->root_ready;	queue = &root->root_ready;
break;	break;
	case taskTHREAD:
	queue = &root->root_thread;
	break;
default:	default:
return 0;	return 0;
}	}
Line 654 schedPolling(sched_root_task_t * __restrict root, stru	Line 679 schedPolling(sched_root_task_t * __restrict root, stru
*	*
* @root = root task	* @root = root task
* @condValue = condition value, kill schedRun() if condValue == killState	* @condValue = condition value, kill schedRun() if condValue == killState
* return: -1 error ok 0 ok	* return: -1 error or 0 ok
*/	*/
inline int	inline int
schedTermCondition(sched_root_task_t * __restrict root, intptr_t condValue)	schedTermCondition(sched_root_task_t * __restrict root, intptr_t condValue)

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

Removed from v.1.11.2.2
changed lines
	Added in v.1.14.2.1