X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fslave_life.c;h=4e1f97b62dd3ba30377334b95c3e4a699f9bbde3;hb=f4536685328b428bfa8816032a372c176ab1e166;hp=3eb4ae54568dcff5a58c3db6466b00202d76aa12;hpb=7847ba08056208eb59bfa2fd19f0f2fd960f5320;p=platform%2Fframework%2Fweb%2Fdata-provider-master.git

diff --git a/src/slave_life.c b/src/slave_life.c
index 3eb4ae5..4e1f97b 100644
--- a/src/slave_life.c
+++ b/src/slave_life.c
@@ -84,9 +84,10 @@ struct slave_node {
 
 	Eina_List *data_list;
 
-	Ecore_Timer *ttl_timer; /* Time to live */
-	Ecore_Timer *activate_timer; /* Waiting hello packet for this time */
-	Ecore_Timer *relaunch_timer; /* Try to relaunch service app */
+	Ecore_Timer *ttl_timer; /*!< Time to live */
+	Ecore_Timer *activate_timer; /*!< Waiting hello packet for this time */
+	Ecore_Timer *relaunch_timer; /*!< Try to relaunch service app */
+	Ecore_Timer *terminate_timer; /*!< Waiting this timer before terminate the service provider */
 	int relaunch_count;
 
 #if defined(_USE_ECORE_TIME_GET)
@@ -131,7 +132,7 @@ static Eina_Bool slave_ttl_cb(void *data)
 	slave_set_reactivation(slave, 0);
 	slave_set_reactivate_instances(slave, 1);
 
-	slave = slave_deactivate(slave);
+	slave = slave_deactivate(slave, 1);
 	if (!slave) {
 		DbgPrint("Slave is deleted\n");
 	}
@@ -542,7 +543,11 @@ HAPI int slave_activate(struct slave_node *slave)
 	 * about it is alive? or not.
 	 */
 	if (slave_pid(slave) != (pid_t)-1) {
-		if (slave_state(slave) == SLAVE_REQUEST_TO_TERMINATE) {
+		if (slave->terminate_timer) {
+			DbgPrint("Clear terminate timer. to reuse (%d)\n", slave->pid);
+			ecore_timer_del(slave->terminate_timer);
+			slave->terminate_timer = NULL;
+		} else if (slave_state(slave) == SLAVE_REQUEST_TO_TERMINATE) {
 			slave_set_reactivation(slave, 1);
 		}
 		return LB_STATUS_ERROR_ALREADY;
@@ -735,7 +740,29 @@ static inline int invoke_deactivate_cb(struct slave_node *slave)
 	return reactivate;
 }
 
-HAPI struct slave_node *slave_deactivate(struct slave_node *slave)
+static Eina_Bool terminate_timer_cb(void *data)
+{
+	struct slave_node *slave = data;
+	int ret;
+
+	/*!
+	 * \todo
+	 * check the return value of the aul_terminate_pid
+	 */
+	slave->state = SLAVE_REQUEST_TO_TERMINATE;
+	slave->terminate_timer = NULL;
+
+	DbgPrint("Terminate slave: %d (%s)\n", slave_pid(slave), slave_name(slave));
+	ret = aul_terminate_pid(slave->pid);
+	if (ret < 0) {
+		ErrPrint("Terminate slave(%s) failed. pid %d (%d)\n", slave_name(slave), slave_pid(slave), ret);
+		slave = slave_deactivated(slave);
+	}
+
+	return ECORE_CALLBACK_CANCEL;
+}
+
+HAPI struct slave_node *slave_deactivate(struct slave_node *slave, int direct)
 {
 	int ret;
 
@@ -752,18 +779,46 @@ HAPI struct slave_node *slave_deactivate(struct slave_node *slave)
 		return slave;
 	}
 
-	/*!
-	 * \todo
-	 * check the return value of the aul_terminate_pid
-	 */
-	slave->state = SLAVE_REQUEST_TO_TERMINATE;
-
 	if (slave_pid(slave) > 0) {
-		DbgPrint("Terminate slave: %d (%s)\n", slave_pid(slave), slave_name(slave));
-		ret = aul_terminate_pid(slave->pid);
-		if (ret < 0) {
-			ErrPrint("Terminate slave(%s) failed. pid %d (%d)\n", slave_name(slave), slave_pid(slave), ret);
-			slave = slave_deactivated(slave);
+		if (slave->terminate_timer) {
+			ErrPrint("Terminate timer is already fired (%d)\n", slave->pid);
+		} else if (!direct) {
+			DbgPrint("Fire the terminate timer: %d\n", slave->pid);
+			slave->terminate_timer = ecore_timer_add(SLAVE_ACTIVATE_TIME, terminate_timer_cb, slave);
+			if (!slave->terminate_timer) {
+				/*!
+				 * \note
+				 * Normally, Call the terminate_timer_cb directly from here
+				 * But in this case. if the aul_terminate_pid failed, Call the slave_deactivated function directly.
+				 * Then the "slave" pointer can be changed. To trace it, Copy the body of terminate_timer_cb to here.
+				 */
+				ErrPrint("Failed to add a new timer for terminating\n");
+				DbgPrint("Terminate slave: %d (%s)\n", slave_pid(slave), slave_name(slave));
+				/*!
+				 * \todo
+				 * check the return value of the aul_terminate_pid
+				 */
+				slave->state = SLAVE_REQUEST_TO_TERMINATE;
+
+				ret = aul_terminate_pid(slave->pid);
+				if (ret < 0) {
+					ErrPrint("Terminate slave(%s) failed. pid %d (%d)\n", slave_name(slave), slave_pid(slave), ret);
+					slave = slave_deactivated(slave);
+				}
+			}
+		} else {
+			/*!
+			 * \todo
+			 * check the return value of the aul_terminate_pid
+			 */
+			slave->state = SLAVE_REQUEST_TO_TERMINATE;
+
+			DbgPrint("Terminate slave: %d (%s)\n", slave_pid(slave), slave_name(slave));
+			ret = aul_terminate_pid(slave->pid);
+			if (ret < 0) {
+				ErrPrint("Terminate slave(%s) failed. pid %d (%d)\n", slave_name(slave), slave_pid(slave), ret);
+				slave = slave_deactivated(slave);
+			}
 		}
 	}
 
@@ -792,6 +847,11 @@ HAPI struct slave_node *slave_deactivated(struct slave_node *slave)
 		slave->relaunch_timer = NULL;
 	}
 
+	if (slave->terminate_timer) {
+		ecore_timer_del(slave->terminate_timer);
+		slave->terminate_timer = NULL;
+	}
+
 	reactivate = invoke_deactivate_cb(slave);
 
 	slave = slave_unref(slave);
@@ -1286,7 +1346,7 @@ HAPI struct slave_node *slave_unload_instance(struct slave_node *slave)
 		slave_set_reactivation(slave, 0);
 		slave_set_reactivate_instances(slave, 0);
 
-		slave = slave_deactivate(slave);
+		slave = slave_deactivate(slave, 0);
 	}
 
 	return slave;
@@ -1570,7 +1630,7 @@ HAPI int slave_deactivate_all(int reactivate, int reactivate_instances)
 		slave_set_reactivate_instances(slave, reactivate_instances);
 		slave_set_reactivation(slave, reactivate);
 
-		if (!slave_deactivate(slave)) {
+		if (!slave_deactivate(slave, 0)) {
 			s_info.slave_list = eina_list_remove(s_info.slave_list, slave);
 		}