libaitsched/src/tasks.c - diff

Return to tasks.c CVS log

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

Diff for /libaitsched/src/tasks.c between versions 1.12.4.1 and 1.23

version 1.12.4.1, 2012/08/21 11:07:16	version 1.23, 2014/01/28 13:17:33
Line 12 terms:	Line 12 terms:
All of the documentation and software included in the ELWIX and AITNET	All of the documentation and software included in the ELWIX and AITNET
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012	Copyright 2004 - 2014
by Michael Pounov <misho@elwix.org>. All rights reserved.	by Michael Pounov <misho@elwix.org>. All rights reserved.

Redistribution and use in source and binary forms, with or without	Redistribution and use in source and binary forms, with or without
Line 46 SUCH DAMAGE.	Line 46 SUCH DAMAGE.
#include "global.h"	#include "global.h"


#pragma GCC visibility push(hidden)	/*
	* sched_useTask() - Get and init new task
inline sched_task_t *	*
_sched_useTask(sched_root_task_t * __restrict root)	* @root = root task
	* return: NULL error or !=NULL prepared task
	*/
	sched_task_t *
	sched_useTask(sched_root_task_t * __restrict root)
{	{
sched_task_t task, tmp;	sched_task_t task, tmp;

TAILQ_FOREACH_SAFE(task, &root->root_unuse, task_node, tmp) {
if (!TASK_ISLOCKED(task)) {
#ifdef HAVE_LIBPTHREAD	#ifdef HAVE_LIBPTHREAD
pthread_mutex_lock(&root->root_mtx[taskUNUSE]);	pthread_mutex_lock(&root->root_mtx[taskUNUSE]);
#endif	#endif
	TAILQ_FOREACH_SAFE(task, &root->root_unuse, task_node, tmp) {
	if (!TASK_ISLOCKED(task)) {
TAILQ_REMOVE(&root->root_unuse, task, task_node);	TAILQ_REMOVE(&root->root_unuse, task, task_node);
#ifdef HAVE_LIBPTHREAD
pthread_mutex_unlock(&root->root_mtx[taskUNUSE]);
#endif
break;	break;
}	}
}	}
	#ifdef HAVE_LIBPTHREAD
	pthread_mutex_unlock(&root->root_mtx[taskUNUSE]);
	#endif

if (!task) {	if (!task) {
task = malloc(sizeof(sched_task_t));	task = malloc(sizeof(sched_task_t));
Line 79 _sched_useTask(sched_root_task_t * __restrict root)	Line 83 _sched_useTask(sched_root_task_t * __restrict root)
return task;	return task;
}	}

inline sched_task_t *	/*
_sched_unuseTask(sched_task_t * __restrict task)	* sched_unuseTask() - Unlock and put task to unuse queue
	*
	* @task = task
	* return: always is NULL
	*/
	sched_task_t *
	sched_unuseTask(sched_task_t * __restrict task)
{	{
TASK_UNLOCK(task);	TASK_UNLOCK(task);
TASK_TYPE(task) = taskUNUSE;	TASK_TYPE(task) = taskUNUSE;
Line 96 _sched_unuseTask(sched_task_t * __restrict task)	Line 106 _sched_unuseTask(sched_task_t * __restrict task)
return task;	return task;
}	}

	#pragma GCC visibility push(hidden)

	#ifdef HAVE_LIBPTHREAD
	static void
	_sched_threadCleanup(sched_task_t *t)
	{
	if (!t \|\| !TASK_ROOT(t))
	return;

	pthread_mutex_lock(&TASK_ROOT(t)->root_mtx[taskTHREAD]);
	TAILQ_REMOVE(&TASK_ROOT(t)->root_thread, t, task_node);
	pthread_mutex_unlock(&TASK_ROOT(t)->root_mtx[taskTHREAD]);
	sched_unuseTask(t);
	}
	void *
	_sched_threadWrapper(sched_task_t *t)
	{
	void *ret = NULL;

	pthread_cleanup_push((void ()(void)) _sched_threadCleanup, t);

	if (!t \|\| !TASK_ROOT(t))
	pthread_exit(ret);

	pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
	/*
	pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
	*/

	/* notify parent, thread is ready for execution */
	pthread_testcancel();

	ret = schedCall(t);

	pthread_cleanup_pop(42);
	TASK_ROOT(t)->root_ret = ret;
	pthread_exit(ret);
	}
	#endif

	#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME)
	void *
	_sched_rtcWrapper(sched_task_t *t)
	{
	sched_task_func_t func;
	sched_task_t *task;
	sched_root_task_t *r;

	if (!t \|\| !TASK_ROOT(t) \|\| !TASK_DATA(t))
	return NULL;
	else {
	r = TASK_ROOT(t);
	task = (sched_task_t*) TASK_DATA(t);
	func = TASK_FUNC(task);
	}

	#ifdef HAVE_LIBPTHREAD
	pthread_mutex_lock(&r->root_mtx[taskRTC]);
	#endif
	TAILQ_REMOVE(&r->root_rtc, task, task_node);
	#ifdef HAVE_LIBPTHREAD
	pthread_mutex_unlock(&r->root_mtx[taskRTC]);
	#endif
	sched_unuseTask(task);

	timer_delete((timer_t) TASK_DATLEN(t));

	return schedCall(task);
	}
	#endif

#pragma GCC visibility pop	#pragma GCC visibility pop

	/*
	* sched_taskExit() - Exit routine for scheduler task, explicit required for thread tasks
	*
	* @task = current task
	* @retcode = return code
	* return: return code
	*/
	void *
	sched_taskExit(sched_task_t *task, intptr_t retcode)
	{
	if (!task \|\| !TASK_ROOT(task))
	return (void*) -1;

	if (TASK_ROOT(task)->root_hooks.hook_exec.exit)
	TASK_ROOT(task)->root_hooks.hook_exec.exit(task, (void*) retcode);

	TASK_ROOT(task)->root_ret = (void*) retcode;
	return (void*) retcode;
	}


/*	/*
* schedRead() - Add READ I/O task to scheduler queue	* schedRead() - Add READ I/O task to scheduler queue
*	*
Line 121 schedRead(sched_root_task_t * __restrict root, sched_t	Line 222 schedRead(sched_root_task_t * __restrict root, sched_t
return NULL;	return NULL;

/* get new task */	/* get new task */
if (!(task = _sched_useTask(root)))	if (!(task = sched_useTask(root)))
return NULL;	return NULL;

task->task_func = func;	task->task_func = func;
Line 148 schedRead(sched_root_task_t * __restrict root, sched_t	Line 249 schedRead(sched_root_task_t * __restrict root, sched_t
pthread_mutex_unlock(&root->root_mtx[taskREAD]);	pthread_mutex_unlock(&root->root_mtx[taskREAD]);
#endif	#endif
} else	} else
task = _sched_unuseTask(task);	task = sched_unuseTask(task);

return task;	return task;
}	}
Line 175 schedWrite(sched_root_task_t * __restrict root, sched_	Line 276 schedWrite(sched_root_task_t * __restrict root, sched_
return NULL;	return NULL;

/* get new task */	/* get new task */
if (!(task = _sched_useTask(root)))	if (!(task = sched_useTask(root)))
return NULL;	return NULL;

task->task_func = func;	task->task_func = func;
Line 202 schedWrite(sched_root_task_t * __restrict root, sched_	Line 303 schedWrite(sched_root_task_t * __restrict root, sched_
pthread_mutex_unlock(&root->root_mtx[taskWRITE]);	pthread_mutex_unlock(&root->root_mtx[taskWRITE]);
#endif	#endif
} else	} else
task = _sched_unuseTask(task);	task = sched_unuseTask(task);

return task;	return task;
}	}
Line 222 sched_task_t *	Line 323 sched_task_t *
schedNode(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd,	schedNode(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd,
void *opt_data, size_t opt_dlen)	void *opt_data, size_t opt_dlen)
{	{
	#ifdef KQ_DISABLE
	sched_SetErr(ENOTSUP, "disabled kqueue support");
	return NULL;
	#else
sched_task_t *task;	sched_task_t *task;
void *ptr;	void *ptr;

Line 229 schedNode(sched_root_task_t * __restrict root, sched_t	Line 334 schedNode(sched_root_task_t * __restrict root, sched_t
return NULL;	return NULL;

/* get new task */	/* get new task */
if (!(task = _sched_useTask(root)))	if (!(task = sched_useTask(root)))
return NULL;	return NULL;

task->task_func = func;	task->task_func = func;
Line 256 schedNode(sched_root_task_t * __restrict root, sched_t	Line 361 schedNode(sched_root_task_t * __restrict root, sched_t
pthread_mutex_unlock(&root->root_mtx[taskNODE]);	pthread_mutex_unlock(&root->root_mtx[taskNODE]);
#endif	#endif
} else	} else
task = _sched_unuseTask(task);	task = sched_unuseTask(task);

return task;	return task;
	#endif /* KQ_DISABLE */
}	}

/*	/*
Line 276 sched_task_t *	Line 382 sched_task_t *
schedProc(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long pid,	schedProc(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long pid,
void *opt_data, size_t opt_dlen)	void *opt_data, size_t opt_dlen)
{	{
	#ifdef KQ_DISABLE
	sched_SetErr(ENOTSUP, "disabled kqueue support");
	return NULL;
	#else
sched_task_t *task;	sched_task_t *task;
void *ptr;	void *ptr;

Line 283 schedProc(sched_root_task_t * __restrict root, sched_t	Line 393 schedProc(sched_root_task_t * __restrict root, sched_t
return NULL;	return NULL;

/* get new task */	/* get new task */
if (!(task = _sched_useTask(root)))	if (!(task = sched_useTask(root)))
return NULL;	return NULL;

task->task_func = func;	task->task_func = func;
Line 310 schedProc(sched_root_task_t * __restrict root, sched_t	Line 420 schedProc(sched_root_task_t * __restrict root, sched_t
pthread_mutex_unlock(&root->root_mtx[taskPROC]);	pthread_mutex_unlock(&root->root_mtx[taskPROC]);
#endif	#endif
} else	} else
task = _sched_unuseTask(task);	task = sched_unuseTask(task);

return task;	return task;
	#endif /* KQ_DISABLE */
}	}

/*	/*
Line 330 sched_task_t *	Line 441 sched_task_t *
schedUser(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long id,	schedUser(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long id,
void *opt_data, size_t opt_dlen)	void *opt_data, size_t opt_dlen)
{	{
	#ifdef KQ_DISABLE
	sched_SetErr(ENOTSUP, "disabled kqueue support");
	return NULL;
	#else
#ifndef EVFILT_USER	#ifndef EVFILT_USER
sched_SetErr(ENOTSUP, "Not supported kevent() filter");	sched_SetErr(ENOTSUP, "Not supported kevent() filter");
return NULL;	return NULL;
Line 341 schedUser(sched_root_task_t * __restrict root, sched_t	Line 456 schedUser(sched_root_task_t * __restrict root, sched_t
return NULL;	return NULL;

/* get new task */	/* get new task */
if (!(task = _sched_useTask(root)))	if (!(task = sched_useTask(root)))
return NULL;	return NULL;

task->task_func = func;	task->task_func = func;
Line 368 schedUser(sched_root_task_t * __restrict root, sched_t	Line 483 schedUser(sched_root_task_t * __restrict root, sched_t
pthread_mutex_unlock(&root->root_mtx[taskUSER]);	pthread_mutex_unlock(&root->root_mtx[taskUSER]);
#endif	#endif
} else	} else
task = _sched_unuseTask(task);	task = sched_unuseTask(task);

return task;	return task;
#endif	#endif /* EVFILT_USER */
	#endif /* KQ_DISABLE */
}	}

/*	/*
Line 389 sched_task_t *	Line 505 sched_task_t *
schedSignal(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long sig,	schedSignal(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, u_long sig,
void *opt_data, size_t opt_dlen)	void *opt_data, size_t opt_dlen)
{	{
	#ifdef KQ_DISABLE
	sched_SetErr(ENOTSUP, "disabled kqueue support");
	return NULL;
	#else
sched_task_t *task;	sched_task_t *task;
void *ptr;	void *ptr;

Line 396 schedSignal(sched_root_task_t * __restrict root, sched	Line 516 schedSignal(sched_root_task_t * __restrict root, sched
return NULL;	return NULL;

/* get new task */	/* get new task */
if (!(task = _sched_useTask(root)))	if (!(task = sched_useTask(root)))
return NULL;	return NULL;

task->task_func = func;	task->task_func = func;
Line 423 schedSignal(sched_root_task_t * __restrict root, sched	Line 543 schedSignal(sched_root_task_t * __restrict root, sched
pthread_mutex_unlock(&root->root_mtx[taskSIGNAL]);	pthread_mutex_unlock(&root->root_mtx[taskSIGNAL]);
#endif	#endif
} else	} else
task = _sched_unuseTask(task);	task = sched_unuseTask(task);

return task;	return task;
	#endif /* KQ_DISABLE */
}	}

/*	/*
Line 435 schedSignal(sched_root_task_t * __restrict root, sched	Line 556 schedSignal(sched_root_task_t * __restrict root, sched
* @func = task execution function	* @func = task execution function
* @arg = 1st func argument	* @arg = 1st func argument
* @ts = timeout argument structure, minimum alarm timer resolution is 1msec!	* @ts = timeout argument structure, minimum alarm timer resolution is 1msec!
* @opt_data = Optional data	* @opt_data = Alarm timer ID
* @opt_dlen = Optional data length	* @opt_dlen = Optional data length
* return: NULL error or !=NULL new queued task	* return: NULL error or !=NULL new queued task
*/	*/
Line 443 sched_task_t *	Line 564 sched_task_t *
schedAlarm(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, struct timespec ts,	schedAlarm(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, struct timespec ts,
void *opt_data, size_t opt_dlen)	void *opt_data, size_t opt_dlen)
{	{
	#ifdef KQ_DISABLE
	sched_SetErr(ENOTSUP, "disabled kqueue support");
	return NULL;
	#else
sched_task_t *task;	sched_task_t *task;
void *ptr;	void *ptr;

Line 450 schedAlarm(sched_root_task_t * __restrict root, sched_	Line 575 schedAlarm(sched_root_task_t * __restrict root, sched_
return NULL;	return NULL;

/* get new task */	/* get new task */
if (!(task = _sched_useTask(root)))	if (!(task = sched_useTask(root)))
return NULL;	return NULL;

task->task_func = func;	task->task_func = func;
Line 477 schedAlarm(sched_root_task_t * __restrict root, sched_	Line 602 schedAlarm(sched_root_task_t * __restrict root, sched_
pthread_mutex_unlock(&root->root_mtx[taskALARM]);	pthread_mutex_unlock(&root->root_mtx[taskALARM]);
#endif	#endif
} else	} else
task = _sched_unuseTask(task);	task = sched_unuseTask(task);

return task;	return task;
	#endif /* KQ_DISABLE */
}	}

#ifdef AIO_SUPPORT	#ifdef AIO_SUPPORT
Line 498 sched_task_t *	Line 624 sched_task_t *
schedAIO(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg,	schedAIO(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg,
struct aiocb * __restrict acb, void *opt_data, size_t opt_dlen)	struct aiocb * __restrict acb, void *opt_data, size_t opt_dlen)
{	{
	#ifdef KQ_DISABLE
	sched_SetErr(ENOTSUP, "disabled kqueue support");
	return NULL;
	#else
sched_task_t *task;	sched_task_t *task;
void *ptr;	void *ptr;

Line 505 schedAIO(sched_root_task_t * __restrict root, sched_ta	Line 635 schedAIO(sched_root_task_t * __restrict root, sched_ta
return NULL;	return NULL;

/* get new task */	/* get new task */
if (!(task = _sched_useTask(root)))	if (!(task = sched_useTask(root)))
return NULL;	return NULL;

task->task_func = func;	task->task_func = func;
Line 532 schedAIO(sched_root_task_t * __restrict root, sched_ta	Line 662 schedAIO(sched_root_task_t * __restrict root, sched_ta
pthread_mutex_unlock(&root->root_mtx[taskAIO]);	pthread_mutex_unlock(&root->root_mtx[taskAIO]);
#endif	#endif
} else	} else
task = _sched_unuseTask(task);	task = sched_unuseTask(task);

return task;	return task;
	#endif /* KQ_DISABLE */
}	}

/*	/*
Line 549 schedAIO(sched_root_task_t * __restrict root, sched_ta	Line 680 schedAIO(sched_root_task_t * __restrict root, sched_ta
* @offset = Offset from start of file, if =-1 from current position	* @offset = Offset from start of file, if =-1 from current position
* return: NULL error or !=NULL new queued task	* return: NULL error or !=NULL new queued task
*/	*/
inline sched_task_t *	sched_task_t *
schedAIORead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd,	schedAIORead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd,
void *buffer, size_t buflen, off_t offset)	void *buffer, size_t buflen, off_t offset)
{	{
	#ifdef KQ_DISABLE
	sched_SetErr(ENOTSUP, "disabled kqueue support");
	return NULL;
	#else
struct aiocb *acb;	struct aiocb *acb;
off_t off;	off_t off;

Line 589 schedAIORead(sched_root_task_t * __restrict root, sche	Line 724 schedAIORead(sched_root_task_t * __restrict root, sche
}	}

return schedAIO(root, func, arg, acb, buffer, buflen);	return schedAIO(root, func, arg, acb, buffer, buflen);
	#endif /* KQ_DISABLE */
}	}

/*	/*
Line 603 schedAIORead(sched_root_task_t * __restrict root, sche	Line 739 schedAIORead(sched_root_task_t * __restrict root, sche
* @offset = Offset from start of file, if =-1 from current position	* @offset = Offset from start of file, if =-1 from current position
* return: NULL error or !=NULL new queued task	* return: NULL error or !=NULL new queued task
*/	*/
inline sched_task_t *	sched_task_t *
schedAIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd,	schedAIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd,
void *buffer, size_t buflen, off_t offset)	void *buffer, size_t buflen, off_t offset)
{	{
	#ifdef KQ_DISABLE
	sched_SetErr(ENOTSUP, "disabled kqueue support");
	return NULL;
	#else
struct aiocb *acb;	struct aiocb *acb;
off_t off;	off_t off;

Line 643 schedAIOWrite(sched_root_task_t * __restrict root, sch	Line 783 schedAIOWrite(sched_root_task_t * __restrict root, sch
}	}

return schedAIO(root, func, arg, acb, buffer, buflen);	return schedAIO(root, func, arg, acb, buffer, buflen);
	#endif /* KQ_DISABLE */
}	}

#ifdef EVFILT_LIO	#ifdef EVFILT_LIO
Line 661 sched_task_t *	Line 802 sched_task_t *
schedLIO(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg,	schedLIO(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg,
struct aiocb ** __restrict acbs, void *opt_data, size_t opt_dlen)	struct aiocb ** __restrict acbs, void *opt_data, size_t opt_dlen)
{	{
	#ifdef KQ_DISABLE
	sched_SetErr(ENOTSUP, "disabled kqueue support");
	return NULL;
	#else
sched_task_t *task;	sched_task_t *task;
void *ptr;	void *ptr;

Line 668 schedLIO(sched_root_task_t * __restrict root, sched_ta	Line 813 schedLIO(sched_root_task_t * __restrict root, sched_ta
return NULL;	return NULL;

/* get new task */	/* get new task */
if (!(task = _sched_useTask(root)))	if (!(task = sched_useTask(root)))
return NULL;	return NULL;

task->task_func = func;	task->task_func = func;
Line 695 schedLIO(sched_root_task_t * __restrict root, sched_ta	Line 840 schedLIO(sched_root_task_t * __restrict root, sched_ta
pthread_mutex_unlock(&root->root_mtx[taskLIO]);	pthread_mutex_unlock(&root->root_mtx[taskLIO]);
#endif	#endif
} else	} else
task = _sched_unuseTask(task);	task = sched_unuseTask(task);

return task;	return task;
	#endif /* KQ_DISABLE */
}	}

/*	/*
Line 716 sched_task_t *	Line 862 sched_task_t *
schedLIORead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd,	schedLIORead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd,
struct iovec *bufs, size_t nbufs, off_t offset)	struct iovec *bufs, size_t nbufs, off_t offset)
{	{
	#ifdef KQ_DISABLE
	sched_SetErr(ENOTSUP, "disabled kqueue support");
	return NULL;
	#else
struct sigevent sig;	struct sigevent sig;
struct aiocb **acb;	struct aiocb **acb;
off_t off;	off_t off;
Line 770 schedLIORead(sched_root_task_t * __restrict root, sche	Line 920 schedLIORead(sched_root_task_t * __restrict root, sche
}	}

return schedLIO(root, func, arg, (void*) acb, bufs, nbufs);	return schedLIO(root, func, arg, (void*) acb, bufs, nbufs);
	#endif /* KQ_DISABLE */
}	}

/*	/*
Line 784 schedLIORead(sched_root_task_t * __restrict root, sche	Line 935 schedLIORead(sched_root_task_t * __restrict root, sche
* @offset = Offset from start of file, if =-1 from current position	* @offset = Offset from start of file, if =-1 from current position
* return: NULL error or !=NULL new queued task	* return: NULL error or !=NULL new queued task
*/	*/
inline sched_task_t *	sched_task_t *
schedLIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd,	schedLIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd,
struct iovec *bufs, size_t nbufs, off_t offset)	struct iovec *bufs, size_t nbufs, off_t offset)
{	{
	#ifdef KQ_DISABLE
	sched_SetErr(ENOTSUP, "disabled kqueue support");
	return NULL;
	#else
struct sigevent sig;	struct sigevent sig;
struct aiocb **acb;	struct aiocb **acb;
off_t off;	off_t off;
Line 842 schedLIOWrite(sched_root_task_t * __restrict root, sch	Line 997 schedLIOWrite(sched_root_task_t * __restrict root, sch
}	}

return schedLIO(root, func, arg, (void*) acb, bufs, nbufs);	return schedLIO(root, func, arg, (void*) acb, bufs, nbufs);
	#endif /* KQ_DISABLE */
}	}
#endif /* EVFILT_LIO */	#endif /* EVFILT_LIO */
#endif /* AIO_SUPPORT */	#endif /* AIO_SUPPORT */
Line 869 schedTimer(sched_root_task_t * __restrict root, sched_	Line 1025 schedTimer(sched_root_task_t * __restrict root, sched_
return NULL;	return NULL;

/* get new task */	/* get new task */
if (!(task = _sched_useTask(root)))	if (!(task = sched_useTask(root)))
return NULL;	return NULL;

task->task_func = func;	task->task_func = func;
Line 918 schedTimer(sched_root_task_t * __restrict root, sched_	Line 1074 schedTimer(sched_root_task_t * __restrict root, sched_
pthread_mutex_unlock(&root->root_mtx[taskTIMER]);	pthread_mutex_unlock(&root->root_mtx[taskTIMER]);
#endif	#endif
} else	} else
task = _sched_unuseTask(task);	task = sched_unuseTask(task);

return task;	return task;
}	}
Line 945 schedEvent(sched_root_task_t * __restrict root, sched_	Line 1101 schedEvent(sched_root_task_t * __restrict root, sched_
return NULL;	return NULL;

/* get new task */	/* get new task */
if (!(task = _sched_useTask(root)))	if (!(task = sched_useTask(root)))
return NULL;	return NULL;

task->task_func = func;	task->task_func = func;
Line 972 schedEvent(sched_root_task_t * __restrict root, sched_	Line 1128 schedEvent(sched_root_task_t * __restrict root, sched_
pthread_mutex_unlock(&root->root_mtx[taskEVENT]);	pthread_mutex_unlock(&root->root_mtx[taskEVENT]);
#endif	#endif
} else	} else
task = _sched_unuseTask(task);	task = sched_unuseTask(task);

return task;	return task;
}	}
Line 1000 schedTask(sched_root_task_t * __restrict root, sched_t	Line 1156 schedTask(sched_root_task_t * __restrict root, sched_t
return NULL;	return NULL;

/* get new task */	/* get new task */
if (!(task = _sched_useTask(root)))	if (!(task = sched_useTask(root)))
return NULL;	return NULL;

task->task_func = func;	task->task_func = func;
Line 1033 schedTask(sched_root_task_t * __restrict root, sched_t	Line 1189 schedTask(sched_root_task_t * __restrict root, sched_t
pthread_mutex_unlock(&root->root_mtx[taskTASK]);	pthread_mutex_unlock(&root->root_mtx[taskTASK]);
#endif	#endif
} else	} else
task = _sched_unuseTask(task);	task = sched_unuseTask(task);

return task;	return task;
}	}
Line 1060 schedSuspend(sched_root_task_t * __restrict root, sche	Line 1216 schedSuspend(sched_root_task_t * __restrict root, sche
return NULL;	return NULL;

/* get new task */	/* get new task */
if (!(task = _sched_useTask(root)))	if (!(task = sched_useTask(root)))
return NULL;	return NULL;

task->task_func = func;	task->task_func = func;
Line 1087 schedSuspend(sched_root_task_t * __restrict root, sche	Line 1243 schedSuspend(sched_root_task_t * __restrict root, sche
pthread_mutex_unlock(&root->root_mtx[taskSUSPEND]);	pthread_mutex_unlock(&root->root_mtx[taskSUSPEND]);
#endif	#endif
} else	} else
task = _sched_unuseTask(task);	task = sched_unuseTask(task);

return task;	return task;
}	}
Line 1114 schedCallOnce(sched_root_task_t * __restrict root, sch	Line 1270 schedCallOnce(sched_root_task_t * __restrict root, sch
return NULL;	return NULL;

/* get new task */	/* get new task */
if (!(task = _sched_useTask(root)))	if (!(task = sched_useTask(root)))
return NULL;	return NULL;

task->task_func = func;	task->task_func = func;
Line 1129 schedCallOnce(sched_root_task_t * __restrict root, sch	Line 1285 schedCallOnce(sched_root_task_t * __restrict root, sch

ret = schedCall(task);	ret = schedCall(task);

_sched_unuseTask(task);	sched_unuseTask(task);
return ret;	return ret;
}	}

Line 1139 schedCallOnce(sched_root_task_t * __restrict root, sch	Line 1295 schedCallOnce(sched_root_task_t * __restrict root, sch
* @root = root task	* @root = root task
* @func = task execution function	* @func = task execution function
* @arg = 1st func argument	* @arg = 1st func argument
* @detach = Detach thread from scheduler, if !=0	* @ss = stack size
* @opt_data = Optional data	* @opt_data = Optional data
* @opt_dlen = Optional data length	* @opt_dlen = Optional data length
* return: NULL error or !=NULL new queued task	* return: NULL error or !=NULL new queued task
*/	*/
sched_task_t *	sched_task_t *
schedThread(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int detach,	schedThread(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg,
void *opt_data, size_t opt_dlen)	size_t ss, void *opt_data, size_t opt_dlen)
{	{
#ifndef HAVE_LIBPTHREAD	#ifndef HAVE_LIBPTHREAD
sched_SetErr(ENOTSUP, "Not supported thread tasks");	sched_SetErr(ENOTSUP, "Not supported thread tasks");
return NULL;	return NULL;
#endif	#endif
sched_task_t *task;	sched_task_t *task;
void *ptr;
pthread_t tid;
pthread_attr_t attr;	pthread_attr_t attr;

if (!root \|\| !func)	if (!root \|\| !func)
return NULL;	return NULL;

/* get new task */	/* get new task */
if (!(task = _sched_useTask(root)))	if (!(task = sched_useTask(root))) {

return NULL;	return NULL;
	}

task->task_func = func;	task->task_func = func;
TASK_TYPE(task) = taskTHREAD;	TASK_TYPE(task) = taskTHREAD;
Line 1173 schedThread(sched_root_task_t * __restrict root, sched	Line 1329 schedThread(sched_root_task_t * __restrict root, sched
TASK_DATA(task) = opt_data;	TASK_DATA(task) = opt_data;
TASK_DATLEN(task) = opt_dlen;	TASK_DATLEN(task) = opt_dlen;

	pthread_attr_init(&attr);
	pthread_attr_setdetachstate(&attr, PTHREAD_DETACHED);
	if (ss && (errno = pthread_attr_setstacksize(&attr, ss))) {
	LOGERR;
	pthread_attr_destroy(&attr);
	return sched_unuseTask(task);
	}
	if ((errno = pthread_attr_getstacksize(&attr, &ss))) {
	LOGERR;
	pthread_attr_destroy(&attr);
	return sched_unuseTask(task);
	} else
	TASK_FLAG(task) = ss;
	if ((errno = pthread_attr_setguardsize(&attr, ss))) {
	LOGERR;
	pthread_attr_destroy(&attr);
	return sched_unuseTask(task);
	}
	#ifdef SCHED_RR
	pthread_attr_setschedpolicy(&attr, SCHED_RR);
	#else
	pthread_attr_setschedpolicy(&attr, SCHED_OTHER);
	#endif

	pthread_mutex_lock(&root->root_mtx[taskTHREAD]);
	TAILQ_INSERT_TAIL(&root->root_thread, TASK_ID(task), task_node);
	pthread_mutex_unlock(&root->root_mtx[taskTHREAD]);

if (root->root_hooks.hook_add.thread)	if (root->root_hooks.hook_add.thread)
ptr = root->root_hooks.hook_add.thread(task, NULL);	if (root->root_hooks.hook_add.thread(task, &attr)) {
	schedCancel(task);
	task = NULL;
	}
	pthread_attr_destroy(&attr);
	return task;
	}

	/*
	* schedRTC() - Add RTC task to scheduler queue
	*
	* @root = root task
	* @func = task execution function
	* @arg = 1st func argument
	* @ts = timeout argument structure, minimum alarm timer resolution is 1msec!
	* @opt_data = Optional RTC ID
	* @opt_dlen = Optional data length
	* return: NULL error or !=NULL new queued task
	*/
	sched_task_t *
	schedRTC(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, struct timespec ts,
	void *opt_data, size_t opt_dlen)
	{
	#if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME)
	sched_task_t *task;
	void *ptr;

	if (!root \|\| !func)
	return NULL;

	/* get new task */
	if (!(task = sched_useTask(root)))
	return NULL;

	task->task_func = func;
	TASK_TYPE(task) = taskRTC;
	TASK_ROOT(task) = root;

	TASK_ARG(task) = arg;
	TASK_TS(task) = ts;

	TASK_DATA(task) = opt_data;
	TASK_DATLEN(task) = opt_dlen;

	if (root->root_hooks.hook_add.rtc)
	ptr = root->root_hooks.hook_add.rtc(task, NULL);
else	else
ptr = NULL;	ptr = NULL;

if (!ptr) {	if (!ptr) {
pthread_mutex_lock(&root->root_mtx[taskTHREAD]);	#ifdef HAVE_LIBPTHREAD
TAILQ_INSERT_TAIL(&root->root_thread, TASK_ID(task), task_node);	pthread_mutex_lock(&root->root_mtx[taskRTC]);
pthread_mutex_unlock(&root->root_mtx[taskTHREAD]);	#endif
	TAILQ_INSERT_TAIL(&root->root_rtc, TASK_ID(task), task_node);
pthread_attr_init(&attr);	#ifdef HAVE_LIBPTHREAD
pthread_attr_setdetachstate(&attr, detach ?	pthread_mutex_unlock(&root->root_mtx[taskRTC]);
PTHREAD_CREATE_DETACHED : PTHREAD_CREATE_JOINABLE);	#endif
if (pthread_create(&tid, &attr,
(void ()(void*)) task->task_func, task)) {
LOGERR;
pthread_mutex_lock(&root->root_mtx[taskTHREAD]);
TAILQ_REMOVE(&root->root_thread, TASK_ID(task), task_node);
pthread_mutex_unlock(&root->root_mtx[taskTHREAD]);
task = _sched_unuseTask(task);
} else
TASK_VAL(task) = (u_long) tid;
pthread_attr_destroy(&attr);
} else	} else
task = _sched_unuseTask(task);	task = sched_unuseTask(task);

return task;	return task;
	#else
	sched_SetErr(ENOTSUP, "Not supported realtime clock extensions");
	return NULL;
	#endif
}	}

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

Removed from v.1.12.4.1
changed lines
	Added in v.1.23