--- libaitsched/src/tasks.c	2013/08/26 14:29:20	1.20.2.1
+++ libaitsched/src/tasks.c	2013/08/26 18:42:32	1.20.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: tasks.c,v 1.20.2.1 2013/08/26 14:29:20 misho Exp $
+* $Id: tasks.c,v 1.20.2.2 2013/08/26 18:42:32 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -115,32 +115,27 @@ _sched_threadCleanup(sched_task_t *t)
 	if (!t || !TASK_ROOT(t))
 		return;
 
-	if (TASK_FLAG(t) == PTHREAD_CREATE_JOINABLE)
-		pthread_detach(pthread_self());
+	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;
-	sem_t *s = NULL;
 
-	if (!t || !TASK_ROOT(t) || !TASK_RET(t))
-		pthread_exit(ret);
-	else
-		s = (sem_t*) TASK_RET(t);
-
 	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);
+	*/
 
-	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);
-
 	/* notify parent, thread is ready for execution */
-	sem_post(s);
 	pthread_testcancel();
 
 	ret = TASK_FUNC(t)(t);
@@ -1245,14 +1240,13 @@ schedCallOnce(sched_root_task_t * __restrict root, sch
  * @root = root task
  * @func = task execution function
  * @arg = 1st func argument
- * @detach = Detach thread from scheduler, if !=0
  * @ss = stack size
  * @opt_data = Optional data
  * @opt_dlen = Optional data length
  * return: NULL error or !=NULL new queued task
  */
 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, 
 		size_t ss, void *opt_data, size_t opt_dlen)
 {
 #ifndef HAVE_LIBPTHREAD
@@ -1260,33 +1254,13 @@ schedThread(sched_root_task_t * __restrict root, sched
 	return NULL;
 #endif
 	sched_task_t *task;
-	void *ptr;
 	pthread_attr_t attr;
-	sem_t *s = NULL;
 
 	if (!root || !func)
 		return NULL;
-	else {
-		/* normalizing stack size & detach state */
-		if (ss)
-			ss &= 0x7FFFFFFF;
-		detach = detach ? PTHREAD_CREATE_DETACHED : PTHREAD_CREATE_JOINABLE;
-	}
 
-	if (!(s = (sem_t*) malloc(sizeof(sem_t)))) {
-		LOGERR;
-		return NULL;
-	}
-	if (sem_init(s, 0, 1)) {
-		LOGERR;
-		free(s);
-		return NULL;
-	}
-
 	/* get new task */
 	if (!(task = sched_useTask(root))) {
-		sem_destroy(s);
-		free(s);
 
 		return NULL;
 	}
@@ -1296,34 +1270,26 @@ schedThread(sched_root_task_t * __restrict root, sched
 	TASK_ROOT(task) = root;
 
 	TASK_ARG(task) = arg;
-	TASK_FLAG(task) = detach;
-	TASK_RET(task) = (intptr_t) s;
 
 	TASK_DATA(task) = opt_data;
 	TASK_DATLEN(task) = opt_dlen;
 
 	pthread_attr_init(&attr);
-	pthread_attr_setdetachstate(&attr, detach);
+	pthread_attr_setdetachstate(&attr, PTHREAD_DETACHED);
 	if (ss && (errno = pthread_attr_setstacksize(&attr, ss))) {
 		LOGERR;
 		pthread_attr_destroy(&attr);
-		sem_destroy(s);
-		free(s);
 		return sched_unuseTask(task);
 	}
 	if ((errno = pthread_attr_getstacksize(&attr, &ss))) {
 		LOGERR;
 		pthread_attr_destroy(&attr);
-		sem_destroy(s);
-		free(s);
 		return sched_unuseTask(task);
 	} else
-		TASK_FLAG(task) |= (ss << 1);
+		TASK_FLAG(task) = ss;
 	if ((errno = pthread_attr_setguardsize(&attr, ss))) {
 		LOGERR;
 		pthread_attr_destroy(&attr);
-		sem_destroy(s);
-		free(s);
 		return sched_unuseTask(task);
 	}
 #ifdef SCHED_RR
@@ -1331,24 +1297,17 @@ schedThread(sched_root_task_t * __restrict root, sched
 #else
 	pthread_attr_setschedpolicy(&attr, SCHED_OTHER);
 #endif
-	if (root->root_hooks.hook_add.thread)
-		ptr = root->root_hooks.hook_add.thread(task, &attr);
-	else
-		ptr = NULL;
-	pthread_attr_destroy(&attr);
 
-	if (!ptr) {
-		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]);
+	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]);
 
-		/* wait for init thread actions */
-		sem_wait(s);
-	} else
-		task = sched_unuseTask(task);
-
-	sem_destroy(s);
-	free(s);
+	if (root->root_hooks.hook_add.thread)
+		if (root->root_hooks.hook_add.thread(task, &attr)) {
+			schedCancel(task);
+			task = NULL;
+		}
+	pthread_attr_destroy(&attr);
 	return task;
 }