--- mqtt/src/daemon.c 2012/04/11 16:37:17 1.2.2.6 +++ mqtt/src/daemon.c 2012/04/15 23:45:34 1.2.2.8 @@ -47,6 +47,7 @@ initSession(int sock, ait_val_t * __restrict v) return NULL; } + /* init server actor */ sess->sess_srv = mqtt_srv_Init(sock, sess->sess_buf); if (!sess->sess_srv) { ioDEBUG(3, "Error:: in srv_Init #%d - %s", mqtt_GetErrno(), mqtt_GetError()); @@ -284,6 +285,7 @@ startSession(sched_task_t *task) assert(task); if (!TASK_DATA(task)) { + /* flow from accept new clients */ sess = initSession(TASK_FD(task), TASK_ARG(task)); if (!sess) { io_freeVar(TASK_ARG(task)); @@ -395,10 +397,11 @@ static void * thrSched(void *arg __unused) { struct tagSession *sess; - struct timespec pl = { 0, 10000000 }; + struct timespec pl = { 0, 100000000 }; ioTRACE(1); + /* start scheduler loop */ schedPolling(root, &pl, NULL); schedRun(root, &Kill); @@ -421,6 +424,7 @@ Run(int sock) ioTRACE(1); + /* start alternative thread for scheduler */ if (pthread_create(&tid, NULL, thrSched, NULL)) { ioSYSERR(0); return -1; @@ -433,6 +437,7 @@ Run(int sock) return -1; } + /* state machine - accept new connections */ while (!Kill) { if ((cli = accept(sock, &sa.sa, &sslen)) == -1) { if (!Kill) @@ -442,11 +447,12 @@ Run(int sock) } v = io_allocVar(); if (!v) { - ioLIBERR(mqtt); + 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));