--- mqtt/src/daemon.c	2012/04/15 23:45:34	1.2.2.8
+++ mqtt/src/daemon.c	2012/04/24 13:54:50	1.2.2.9
@@ -21,7 +21,7 @@ initSession(int sock, ait_val_t * __restrict v)
 
 	sess = malloc(sizeof(struct tagSession));
 	if (!sess) {
-		ioDEBUG(3, "Error:: in malloc #%d - %s", errno, strerror(errno));
+		ioSYSERR(0);
 		io_freeVar(v);
 		return NULL;
 	} else
@@ -29,9 +29,7 @@ initSession(int sock, ait_val_t * __restrict v)
 
 	pthread_mutex_init(&sess->sess_mtx, NULL);
 
-	SLIST_INIT(&sess->sess_txque[MQTT_QOS_ONCE]);
-	SLIST_INIT(&sess->sess_txque[MQTT_QOS_ACK]);
-	SLIST_INIT(&sess->sess_txque[MQTT_QOS_EXACTLY]);
+	SLIST_INIT(&sess->sess_subscr);
 
 	str = cfg_getAttribute(&cfg, "mqttd", "retry");
 	if (!str)
@@ -39,9 +37,17 @@ initSession(int sock, ait_val_t * __restrict v)
 	else
 		sess->sess_retry = strtol(str, NULL, 0);
 
+	if (!(sess->sess_root = schedBegin())) {
+		ioLIBERR(sched);
+		free(sess);
+		io_freeVar(v);
+		return NULL;
+	}
+
 	sess->sess_buf = mqtt_msgAlloc(USHRT_MAX);
 	if (!sess->sess_buf) {
-		ioDEBUG(3, "Error:: in msgAlloc #%d - %s", mqtt_GetErrno(), mqtt_GetError());
+		ioLIBERR(mqtt);
+		schedEnd(&sess->sess_root);
 		free(sess);
 		io_freeVar(v);
 		return NULL;
@@ -52,6 +58,7 @@ initSession(int sock, ait_val_t * __restrict v)
 	if (!sess->sess_srv) {
 		ioDEBUG(3, "Error:: in srv_Init #%d - %s", mqtt_GetErrno(), mqtt_GetError());
 		mqtt_msgFree(&sess->sess_buf, 42);
+		schedEnd(&sess->sess_root);
 		free(sess);
 		io_freeVar(v);
 		return NULL;
@@ -72,10 +79,9 @@ initSession(int sock, ait_val_t * __restrict v)
 }
 
 static void
-finiSession(struct tagSession *sess, int preservSock)
+finiSession(struct tagSession *sess)
 {
 	struct tagStore *store;
-	register int i;
 
 	ioTRACE(5);
 
@@ -86,26 +92,28 @@ finiSession(struct tagSession *sess, int preservSock)
 		call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
 
 	SESS_ELEM_LOCK(sess);
-	for (i = 0; i < MQTT_QOS_RESERVED; i++)
-		while ((store = SLIST_FIRST(&sess->sess_txque[i]))) {
-			SLIST_REMOVE_HEAD(&sess->sess_txque[i], st_node);
 
-			if (store->st_subscr.sub_topic.msg_base)
-				free(store->st_subscr.sub_topic.msg_base);
-			if (store->st_subscr.sub_value.msg_base)
-				free(store->st_subscr.sub_value.msg_base);
+	while ((store = SLIST_FIRST(&sess->sess_subscr))) {
+		SLIST_REMOVE_HEAD(&sess->sess_subscr, st_node);
 
-			free(store);
-		}
+		if (store->st_subscr.sub_topic.msg_base)
+			free(store->st_subscr.sub_topic.msg_base);
+		if (store->st_subscr.sub_value.msg_base)
+			free(store->st_subscr.sub_value.msg_base);
+
+		free(store);
+	}
 	SESS_ELEM_UNLOCK(sess);
 	pthread_mutex_destroy(&sess->sess_mtx);
 
+	schedEnd(&sess->sess_root);
+
 	if (sess->sess_will.msg)
 		free(sess->sess_will.msg);
 	if (sess->sess_will.topic)
 		free(sess->sess_will.topic);
 
-	if (sess->sess_sock > STDERR_FILENO && !preservSock)
+	if (sess->sess_sock > STDERR_FILENO)
 		srv_Close(sess->sess_sock);
 
 	mqtt_srv_Fini(&sess->sess_srv);
@@ -129,16 +137,11 @@ stopSession(struct tagSession *sess)
 	SESS_UNLOCK;
 
 	ret = mqtt_msgDISCONNECT(&msg);
-	if ((ret = send(sess->sess_sock, msg.msg_base, ret, 0)) == -1)
-		ioDEBUG(3, "Error:: send(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
-	else {
-		ioDEBUG(5, "Sended %d bytes for disconnect", ret);
-		free(msg.msg_base);
-		memset(&msg, 0, sizeof msg);
-	}
+	send(sess->sess_sock, msg.msg_base, ret, MSG_NOSIGNAL);
+	free(msg.msg_base);
 
 	ioDEBUG(1, "Close socket=%d", sess->sess_sock);
-	finiSession(sess, 0);
+	finiSession(sess);
 
 	call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
 			sess->sess_addr, sess->sess_user);
@@ -157,7 +160,7 @@ KASession(struct tagSession *sess)
 
 	/* ping request */
 	ret = mqtt_msgPINGREQ(&msg);
-	if ((ret = send(sess->sess_sock, msg.msg_base, ret, 0)) == -1) {
+	if ((ret = send(sess->sess_sock, msg.msg_base, ret, MSG_NOSIGNAL)) == -1) {
 		ioDEBUG(3, "Error:: send(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
 		return -1;
 	} else {
@@ -239,7 +242,7 @@ thrSession(struct tagSession *sess)
 				continue;
 			case MQTT_TYPE_DISCONNECT:
 				ioDEBUG(5, "Exec DISCONNECT session");
-				finiSession(sess, 0);
+				finiSession(sess);
 				locKill ^= locKill;
 				continue;
 			case MQTT_TYPE_PUBLISH:
@@ -296,7 +299,7 @@ startSession(sched_task_t *task)
 		/* receive & decode packet */
 		if (recv(sess->sess_sock, buf.msg_base, buf.msg_len, 0) == -1) {
 			ioDEBUG(3, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
-			finiSession(sess, 0);
+			finiSession(sess);
 			return NULL;
 		}
 	} else {
@@ -354,7 +357,7 @@ startSession(sched_task_t *task)
 	ret = mqtt_msgCONNACK(&msg, ret);
 	if ((ret = send(sess->sess_sock, msg.msg_base, ret, 0)) == -1) {
 		ioDEBUG(3, "Error:: send(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
-		finiSession(sess, 0);
+		finiSession(sess);
 		return NULL;
 	} else {
 		ioDEBUG(5, "Sended %d bytes", ret);
@@ -387,82 +390,84 @@ end:	/* close client connection */
 	}
 
 	ioDEBUG(1, "Close client %s with socket=%d", sess->sess_addr, sess->sess_sock);
-	finiSession(sess, 0);
+	finiSession(sess);
 	return NULL;
 }
 
-/* ----------------------------------------------------------------------- */
-
 static void *
-thrSched(void *arg __unused)
+acceptClient(sched_task_t *task)
 {
-	struct tagSession *sess;
-	struct timespec pl = { 0, 100000000 };
+	int cli;
+	io_sockaddr_t sa;
+	socklen_t sslen = sizeof sa.ss;
+	ait_val_t *v;
+	char str[STRSIZ];
 
-	ioTRACE(1);
+	ioTRACE(4);
 
-	/* start scheduler loop */
-	schedPolling(root, &pl, NULL);
-	schedRun(root, &Kill);
+	assert(task);
 
-	TAILQ_FOREACH(sess, &Sessions, sess_node)
-		if (sess->sess_tid)
-			pthread_cancel(sess->sess_tid);
-	ioDEBUG(5, "EXIT from Scheduler thread !!!");
-	pthread_exit(NULL);
+	if ((cli = accept(TASK_FD(task), &sa.sa, &sslen)) == -1)
+		goto end;
+	else
+		fcntl(TASK_FD(task), F_SETFL, fcntl(TASK_FD(task), F_GETFL, 0) | O_NONBLOCK);
+
+	v = io_allocVar();
+	if (!v) {
+		ioLIBERR(io);
+		close(cli);
+		goto end;
+	} else {
+		memset(str, 0, sizeof str);
+		snprintf(str, sizeof str, "%s:%hu", io_n2addr(&sa, v), io_n2port(&sa));
+		AIT_SET_STR(v, str);
+	}
+	ioDEBUG(1, "Connected client with socket=%d from %s", cli, AIT_GET_STR(v));
+
+	if (!schedRead(root, startSession, v, cli, NULL, 0)) {
+		io_freeVar(v);
+		close(cli);
+		ioDEBUG(1, "Terminated client with socket=%d", cli);
+	}
+end:
+	schedRead(TASK_ROOT(task), acceptClient, NULL, TASK_FD(task), NULL, 0);
+	return NULL;
 }
 
+/* ----------------------------------------------------------------------- */
+
 int
 Run(int sock)
 {
-	io_sockaddr_t sa;
-	socklen_t sslen = sizeof sa.ss;
-	int cli;
-	pthread_t tid;
-	ait_val_t *v;
-	char str[STRSIZ];
+	struct tagPub *pub;
+	struct timespec pl = { 0, 100000000 };
 
 	ioTRACE(1);
 
-	/* start alternative thread for scheduler */
-	if (pthread_create(&tid, NULL, thrSched, NULL)) {
+	if (listen(sock, SOMAXCONN) == -1) {
 		ioSYSERR(0);
 		return -1;
 	} else
-		pthread_detach(tid);
-	ioDEBUG(2, "Run scheduler management thread");
+		fcntl(sock, F_SETFL, fcntl(sock, F_GETFL, 0) | O_NONBLOCK);
 
-	if (listen(sock, SOMAXCONN) == -1) {
-		ioSYSERR(0);
+	/* state machine - accept new connections */
+	if (!schedRead(root, acceptClient, NULL, sock, NULL, 0)) {
+		ioLIBERR(sched);
 		return -1;
 	}
 
-	/* state machine - accept new connections */
-	while (!Kill) {
-		if ((cli = accept(sock, &sa.sa, &sslen)) == -1) {
-			if (!Kill)
-				continue;
-			ioSYSERR(0);
-			break;
-		}
-		v = io_allocVar();
-		if (!v) {
-			ioLIBERR(io);
-			break;
-		} else {
-			memset(str, 0, sizeof str);
-			snprintf(str, sizeof str, "%s:%hu", io_n2addr(&sa, v), io_n2port(&sa));
-			AIT_FREE_VAL(v);
-			AIT_SET_STR(v, str);
-		}
-		ioDEBUG(1, "Connected client with socket=%d from %s", cli, AIT_GET_STR(v));
+	schedPolling(root, &pl, NULL);
+	schedRun(root, &Kill);
 
-		if (!schedRead(root, startSession, v, cli, NULL, 0)) {
-			io_freeVar(v);
-			close(cli);
-			ioDEBUG(1, "Terminated client with socket=%d", cli);
-		}
-	}
+	/* free all undeleted elements into lists */
+	PUBS_LOCK;
+	TAILQ_FOREACH(pub, &Pubs, pub_node) {
+		TAILQ_REMOVE(&Pubs, pub, pub_node);
 
+		AIT_FREE_VAL(&pub->pub_name);
+		if (pub->pub_packet.msg_base)
+			free(pub->pub_packet.msg_base);
+	}
+	PUBS_UNLOCK;
 	return 0;
 }