From: Sung-jae Park <nicesj.park@samsung.com>
Date: Fri, 21 Dec 2012 16:22:02 +0000 (+0900)
Subject: Remove code of the deprecated feature
X-Git-Tag: 2.1b_release~6^2~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=535efc873a15373f5e61256346afcee98792adff;p=platform%2Fframework%2Fweb%2Fdata-provider-slave.git

Remove code of the deprecated feature

Change-Id: I77dbe7fc276b71f37685e56f4369e5f4cf1e1d56
---

diff --git a/include/conf.h b/include/conf.h
index ae3b7f4..85acd34 100644
--- a/include/conf.h
+++ b/include/conf.h
@@ -71,9 +71,6 @@ struct conf {
 
 	double ping_time;
 
-	char *vconf_sys_cluster;
-	int max_pended_ctx_events;
-
 	int use_sw_backend;
 	char *provider_method;
 	int debug_mode;
@@ -141,9 +138,6 @@ extern int conf_loader(void);
 #define DEFAULT_CLUSTER	"user,created"
 #define MINIMUM_REACTIVATION_TIME	10
 
-#define SYS_CLUSTER_KEY		g_conf.vconf_sys_cluster
-
-#define MAX_PENDED_CTX_EVENTS	g_conf.max_pended_ctx_events
 #define HAPI __attribute__((visibility("hidden")))
 
 /* Set language */
diff --git a/packaging/org.tizen.data-provider-slave.spec b/packaging/org.tizen.data-provider-slave.spec
index 6de4d27..cf06e35 100644
--- a/packaging/org.tizen.data-provider-slave.spec
+++ b/packaging/org.tizen.data-provider-slave.spec
@@ -1,6 +1,6 @@
 Name: org.tizen.data-provider-slave
 Summary: Slave data provider
-Version: 0.8.13
+Version: 0.8.16
 Release: 1
 Group: main/app
 License: Flora License
diff --git a/src/conf.c b/src/conf.c
index 1a1fccd..849d55a 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -78,8 +78,6 @@ HAPI struct conf g_conf = {
 
 	.ping_time = 240.0f,
 	.slave_max_load = 30,
-	.vconf_sys_cluster = "file/private/org.tizen.data-provider-master/cluster",
-	.max_pended_ctx_events = 256,
 
 	.use_sw_backend = 0,
 	.provider_method = "pixmap",
@@ -292,21 +290,6 @@ static void slave_max_loader(char *buffer)
 	DbgPrint("Max load: %d\n", g_conf.slave_max_load);
 }
 
-static void vconf_sys_cluster_handler(char *buffer)
-{
-	g_conf.vconf_sys_cluster = strdup(buffer);
-	if (!g_conf.vconf_sys_cluster)
-		ErrPrint("Heap %s\n", strerror(errno));
-	DbgPrint("System cluster vconf key: %s\n", g_conf.vconf_sys_cluster);
-}
-
-static void max_pended_ctx_event_handler(char *buffer)
-{
-	if (sscanf(buffer, "%d", &g_conf.max_pended_ctx_events) != 1)
-		ErrPrint("Failed to parse the max_pended_ctx_events\n");
-	DbgPrint("Maximum pended event: %d\n", g_conf.max_pended_ctx_events);
-}
-
 HAPI int conf_loader(void)
 {
 	FILE *fp;
@@ -419,14 +402,6 @@ HAPI int conf_loader(void)
 			.handler = slave_max_loader,
 		},
 		{
-			.name = "vconf_sys_cluster",
-			.handler = vconf_sys_cluster_handler,
-		},
-		{
-			.name = "max_pended_ctx_event",
-			.handler = max_pended_ctx_event_handler,
-		},
-		{
 			.name = "use_sw_backend",
 			.handler = use_sw_backend_handler,
 		},
diff --git a/src/lb.c b/src/lb.c
index 56bc478..565591f 100644
--- a/src/lb.c
+++ b/src/lb.c
@@ -175,7 +175,7 @@ cleanout:
 	return ECORE_CALLBACK_CANCEL;
 }
 
-static inline int activate_pending_consumer(void)
+static inline __attribute__((always_inline)) int activate_pending_consumer(void)
 {
 	if (s_info.pending_timer)
 		return 0;
@@ -219,7 +219,7 @@ static inline void deactivate_pd_open_pending_consumer(void)
 	DbgPrint("Clear the open_pd_pending timer\n");
 }
 
-static inline int activate_pd_open_pending_consumer(void)
+static inline int __attribute__((always_inline)) activate_pd_open_pending_consumer(void)
 {
 	if (s_info.pd_open_pending_timer)
 		return 0;
@@ -346,6 +346,9 @@ static inline void timer_freeze(struct item *item)
 	struct timeval tv;
 	ecore_timer_freeze(item->timer);
 
+	if (ecore_timer_interval_get(item->timer) <= 1.0f)
+		return;
+
 	gettimeofday(&tv, NULL);
 	item->sleep_at = (double)tv.tv_sec + (double)tv.tv_usec / 1000000.0f;
 }
diff --git a/src/util.c b/src/util.c
index c0ea002..415f980 100644
--- a/src/util.c
+++ b/src/util.c
@@ -138,6 +138,11 @@ static inline void compensate_timer(Ecore_Timer *timer)
 	double delay;
 	double pending;
 
+	if (ecore_timer_interval_get(timer) <= 1.0f) {
+		DbgPrint("Doesn't need to sync the timer to start from ZERO sec\n");
+		return;
+	}
+
 	if (gettimeofday(&tv, NULL) < 0) {
 		ErrPrint("Error: %s\n", strerror(errno));
 		return;