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.13.2.3

version 1.12.4.1, 2012/08/21 11:07:16	version 1.13.2.3, 2012/08/22 23:43:36
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
	*
	* @root = root task
	* return: NULL error or !=NULL prepared task
	*/
inline sched_task_t *	inline sched_task_t *
_sched_useTask(sched_root_task_t * __restrict root)	sched_useTask(sched_root_task_t * __restrict root)
{	{
sched_task_t task, tmp;	sched_task_t task, tmp;

Line 79 _sched_useTask(sched_root_task_t * __restrict root)	Line 83 _sched_useTask(sched_root_task_t * __restrict root)
return task;	return task;
}	}

	/*
	* sched_unuseTask() - Unlock and put task to unuse queue
	*
	* @task = task
	* return: always is NULL
	*/
inline sched_task_t *	inline sched_task_t *
_sched_unuseTask(sched_task_t * __restrict task)	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)

	void *
	_sched_threadJoin(sched_task_t *task)
	{
	void *ret = NULL;

	if (!task)
	return NULL;

	#ifdef HAVE_LIBPTHREAD
	if (pthread_kill((pthread_t) TASK_VAL(task), 0)) {
	pthread_join((pthread_t) TASK_VAL(task), &ret);
	TASK_ROOT(task)->root_ret = ret;
	} else {
	usleep(10000);
	schedTaskSelf(task);
	}
	#endif

	return NULL;
	}

#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
	*/
	inline 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;

	#ifdef HAVE_LIBPTHREAD
	if (TASK_TYPE(task) == taskTHREAD) {
	if (TASK_FLAG(task) == PTHREAD_CREATE_JOINABLE) /* joinable thread */
	schedTask(TASK_ROOT(task), _sched_threadJoin, TASK_ARG(task),
	TASK_VAL(task), TASK_DATA(task), TASK_DATLEN(task));
	sched_unuseTask(task);
	pthread_exit((void*) retcode);
	}
	#endif

	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 185 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 212 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 239 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 266 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 229 schedNode(sched_root_task_t * __restrict root, sched_t	Line 293 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 320 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;
}	}
Line 283 schedProc(sched_root_task_t * __restrict root, sched_t	Line 347 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 374 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;
}	}
Line 341 schedUser(sched_root_task_t * __restrict root, sched_t	Line 405 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 432 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
Line 396 schedSignal(sched_root_task_t * __restrict root, sched	Line 460 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 487 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;
}	}
Line 450 schedAlarm(sched_root_task_t * __restrict root, sched_	Line 514 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 541 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;
}	}
Line 505 schedAIO(sched_root_task_t * __restrict root, sched_ta	Line 569 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 596 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;
}	}
Line 668 schedLIO(sched_root_task_t * __restrict root, sched_ta	Line 732 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 759 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;
}	}
Line 869 schedTimer(sched_root_task_t * __restrict root, sched_	Line 933 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 982 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 1009 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 1036 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 1064 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 1097 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 1124 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 1151 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 1178 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 1193 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 1154 schedThread(sched_root_task_t * __restrict root, sched	Line 1218 schedThread(sched_root_task_t * __restrict root, sched
#endif	#endif
sched_task_t *task;	sched_task_t *task;
void *ptr;	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;
Line 1169 schedThread(sched_root_task_t * __restrict root, sched	Line 1232 schedThread(sched_root_task_t * __restrict root, sched
TASK_ROOT(task) = root;	TASK_ROOT(task) = root;

TASK_ARG(task) = arg;	TASK_ARG(task) = arg;
	TASK_FLAG(task) = detach ? PTHREAD_CREATE_DETACHED : PTHREAD_CREATE_JOINABLE;

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, TASK_FLAG(task));
if (root->root_hooks.hook_add.thread)	if (root->root_hooks.hook_add.thread)
ptr = root->root_hooks.hook_add.thread(task, NULL);	ptr = root->root_hooks.hook_add.thread(task, &attr);
else	else
ptr = NULL;	ptr = NULL;
	pthread_attr_destroy(&attr);

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

pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, detach ?
PTHREAD_CREATE_DETACHED : PTHREAD_CREATE_JOINABLE);
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;
}	}

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

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