From d2682a76b82abe1f7a525b8c39073c516b6788f2 Mon Sep 17 00:00:00 2001
From: JunSik Jeong <jjs9915@gmail.com>
Date: Tue, 29 Aug 2017 20:00:16 +0900
Subject: [PATCH] Fix some bugs of iotapi_evt_handler

---
 framework/src/iotbus/iotapi_evt_handler.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/framework/src/iotbus/iotapi_evt_handler.c b/framework/src/iotbus/iotapi_evt_handler.c
index 9fe1f90..229569d 100644
--- a/framework/src/iotbus/iotapi_evt_handler.c
+++ b/framework/src/iotbus/iotapi_evt_handler.c
@@ -32,6 +32,9 @@
 #define IOTAPI_LOG(x...)
 #endif
 
+#define IOTAPI_MESSAGE_QUEUE_EMPTY	0
+#define IOTAPI_MESSAGE_QUEUE_INSERT	1
+#define IOTAPI_MESSAGE_QUEUE_REMOVE	2
 
 struct _iotapi_msg_queue {
 	int type;					// 1 is insert, 2 is remove, 0 is empty
@@ -74,12 +77,12 @@ void *iotapi_handler(void *data)
 	char buf[3];
 
 	pthread_mutex_lock(&g_ia_lock);
-	if (g_ia_msg_queue[0].type == 1) {
+	if (g_ia_msg_queue[0].type == IOTAPI_MESSAGE_QUEUE_INSERT) {
 		g_ia_evt_queue[0].fd = g_ia_msg_queue[0].evt.fd;
 		g_ia_evt_queue[0].data = g_ia_msg_queue[0].evt.data;
 		g_ia_evt_queue[0].func = g_ia_msg_queue[0].evt.func;
 		g_ia_evt_size = 1;
-		g_ia_msg_queue[0].type = 0;
+		g_ia_msg_queue[0].type = IOTAPI_MESSAGE_QUEUE_EMPTY;
 	}
 	pthread_mutex_unlock(&g_ia_lock);
 
@@ -107,14 +110,20 @@ void *iotapi_handler(void *data)
 		}
 
 		if (g_ia_evtlist[0].revents & POLLIN) {
+			
+#ifdef CONFIG_IOTAPI_DEBUG
 			int readed;
 			readed = read(g_ia_evtlist[0].fd, buf, 3);
 			IOTAPI_LOG("[iotcom] receive command(%d)\n", readed);
+#else
+			read(g_ia_evtlist[0].fd, buf, 3);
+#endif
+			
 			if (buf[0] == 's' && buf[1] == 't')
 				break;
 
 			pthread_mutex_lock(&g_ia_lock);
-			if (g_ia_msg_queue[0].type == 1) {
+			if (g_ia_msg_queue[0].type == IOTAPI_MESSAGE_QUEUE_INSERT) {
 				g_ia_evt_size++;
 				int i = 0;
 				for (; i < IOTAPI_QUEUE_SIZE; i++) {
@@ -126,9 +135,9 @@ void *iotapi_handler(void *data)
 						break;
 					}
 				}
-				g_ia_msg_queue[0].type = 0;
+				g_ia_msg_queue[0].type = IOTAPI_MESSAGE_QUEUE_EMPTY;
 			}
-			if (g_ia_msg_queue[1].type == 2) {
+			if (g_ia_msg_queue[1].type == IOTAPI_MESSAGE_QUEUE_REMOVE) {
 				g_ia_evt_size--;
 				int i = 0;
 				for (; i < IOTAPI_QUEUE_SIZE; i++) {
@@ -138,7 +147,7 @@ void *iotapi_handler(void *data)
 						break;
 					}
 				}
-				g_ia_msg_queue[1].type = 0;
+				g_ia_msg_queue[1].type = IOTAPI_MESSAGE_QUEUE_EMPTY;
 			}
 
 			if (g_ia_evt_size == 0) {
@@ -197,6 +206,7 @@ int iotapi_handler_start(int fd)
 		IOTAPI_LOG("[iotcom] create iotapi handler fail(%d)\n", ret);
 		return -1;
 	}
+	pthread_detach(tid);
 	return 0;
 }
 
@@ -239,7 +249,7 @@ int iotapi_insert(iotapi_elem * item)
 	}
 	if (g_ia_evt_size == 0)
 		mode = 0;
-	g_ia_msg_queue[0].type = 1;
+	g_ia_msg_queue[0].type = IOTAPI_MESSAGE_QUEUE_INSERT;
 	g_ia_msg_queue[0].evt.fd = item->fd;
 	g_ia_msg_queue[0].evt.data = item->data;
 	g_ia_msg_queue[0].evt.func = item->func;
@@ -268,7 +278,7 @@ int iotapi_remove(iotapi_elem * item)
 		pthread_mutex_unlock(&g_ia_lock);
 		ret = -1;
 	}
-	g_ia_msg_queue[1].type = 2;
+	g_ia_msg_queue[1].type = IOTAPI_MESSAGE_QUEUE_REMOVE;
 	g_ia_msg_queue[1].evt.fd = item->fd;
 
 	pthread_mutex_unlock(&g_ia_lock);
-- 
2.7.4