Refactor to reduce use of global variables

[Version] 0.3.21

Change-Id: Ibe89365ca42395f940f9c5fcecbf4e478e0b11b0
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/packaging/espp-service.spec b/packaging/espp-service.spec
index 324b96a390b68d97d96f4e46c0ec0a2eea0fa40e..d6b8c84a6b649e03e873d3841b7b278193ee1a91 100644 (file)
--- a/packaging/espp-service.spec
+++ b/packaging/espp-service.spec
@@ -5,7 +5,7 @@
 
 Name:       espp-service
 Summary:    ESPP service package which contains client lib. and daemon binary
-Version:    0.3.20
+Version:    0.3.21
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/project_def.prop b/project_def.prop
index a01b96a42c7e8a7310e25c93e6ee13b36594e4e8..72ca0445a5c442dd26348bf650872243ebd2cf80 100644 (file)
--- a/project_def.prop
+++ b/project_def.prop
@@ -5,13 +5,13 @@ APPNAME = espp-service
 type = app
 
 # Project Profile
-profile = mobile-7.0
+profile = tizen-8.0
 
 # Sources
 USER_SRCS = ./src/daemon/*.c ./src/common/*.c
 
 # User Defines
-USER_DEFS = USE_DLOG USE_SERVICE_APP ESPP_SERVICE_VERSION="0.3.20"
+USER_DEFS = USE_DLOG USE_SERVICE_APP ESPP_SERVICE_VERSION="0.3.21"
 
 # User Includes
 USER_INC_DIRS = ./src/daemon ./src/common ./inc ./inc/esplusplayer_capi

diff --git a/src/client/espp_service_client_event_handler.c b/src/client/espp_service_client_event_handler.c
index 47ce45ab7cf61e0e412f4fcf7be0085cb8436fb5..efc4ee2b968ea5ceefbb217ff517ed165e3d8a86 100644 (file)
--- a/src/client/espp_service_client_event_handler.c
+++ b/src/client/espp_service_client_event_handler.c
@@ -305,7 +305,7 @@ static void __func_handler(espp_s *espp, espp_service_data_from_server_s *data,
        ASSERT(data->event >= 0);
        ASSERT(data->event < ESPP_SERVICE_EVENT_CB_NUM);
 
-       LOG_WARNING("espp[%p] data[%p, event:%s]", espp, data, events[data->event].str);
+       LOG_WARNING("espp[%p] data[%p, event:%s]", espp, data, espp_service_common_get_events()[data->event].str);
 
        handlers[data->event](espp, data, result);
 }
@@ -341,7 +341,7 @@ gpointer espp_service_client_event_handler_thread_func(gpointer user_data)
 
                ASSERT(rx_data.event >= 0);
                ASSERT(rx_data.event < ESPP_SERVICE_EVENT_CB_NUM);
-               LOG_DEBUG("<<<<< from fd[%d]: event[%s]", espp->event_fd, events[rx_data.event].str);
+               LOG_DEBUG("<<<<< from fd[%d]: event[%s]", espp->event_fd, espp_service_common_get_events()[rx_data.event].str);
 
                memset(&tx_data, 0x00, write_len);
 

diff --git a/src/client/espp_service_client_msg.c b/src/client/espp_service_client_msg.c
index 6130cc280bd73b9d3c2dfb8bd17e7efa78183d06..b992479f08d2e4c2fa2d707b7937c7eec80bf207 100644 (file)
--- a/src/client/espp_service_client_msg.c
+++ b/src/client/espp_service_client_msg.c
@@ -26,7 +26,7 @@ int espp_service_client_msg_parse_params(const char *params, espp_service_event_
        ASSERT(event < ESPP_SERVICE_EVENT_CB_NUM);
 
        va_start(ap, event);
-       ret = espp_service_common_parse_json_structured_message(ap, params, events[event].param_formats);
+       ret = espp_service_common_parse_json_structured_message(ap, params, espp_service_common_get_events()[event].param_formats);
        va_end(ap);
 
        return ret;

diff --git a/src/client/espp_service_client_socket.c b/src/client/espp_service_client_socket.c
index 4f50c49a5f39d3ec5afb2704784d26a9d7e450de..9c76a3db413afac351e4121b065ef66fdef31049 100644 (file)
--- a/src/client/espp_service_client_socket.c
+++ b/src/client/espp_service_client_socket.c
@@ -23,7 +23,7 @@
 
 #define FILL_SOCKET_MSG_PARAMS(x_msg, x_request, ...) \
 do { \
-       gchar *params = espp_service_common_msg_params_new(requests[x_request].param_formats, ##__VA_ARGS__); \
+       gchar *params = espp_service_common_msg_params_new(espp_service_common_get_requests()[x_request].param_formats, ##__VA_ARGS__); \
        memset(&x_msg.params, 0x00, MAX_PARAMS_LEN); \
        if (!params) break; \
        STRNCPY(x_msg.params, params, MAX_PARAMS_LEN); \

diff --git a/src/client/project_def.prop b/src/client/project_def.prop
index 2a1475027ca6fc6e01d3e171762ecf89225d2a06..61f143145a532295059521a838a5aa73fc4af9be 100644 (file)
--- a/src/client/project_def.prop
+++ b/src/client/project_def.prop
@@ -5,13 +5,13 @@ APPNAME = espp-service-client
 type = sharedLib
 
 # Project Profile
-profile = mobile-7.0
+profile = tizen-8.0
 
 # Sources
 USER_SRCS = ../common/*.c ./*.c
 
 # User Defines
-USER_DEFS = USE_DLOG USE_SERVICE_APP ESPP_SERVICE_VERSION="0.3.20"
+USER_DEFS = USE_DLOG USE_SERVICE_APP ESPP_SERVICE_VERSION="0.3.21"
 
 # User Includes
 USER_INC_DIRS = ../common ./

diff --git a/src/common/espp_service_ipc.c b/src/common/espp_service_ipc.c
index 3645e4070e6bea22a5aefef86e7cfbe556d45aa8..e1ad63fb8c84eba9d7cb2add1c5e1bfd79c7726f 100644 (file)
--- a/src/common/espp_service_ipc.c
+++ b/src/common/espp_service_ipc.c
@@ -25,7 +25,7 @@
 #define LOG_TAG "ESPP_SERVICE_IPC"
 #endif
 
-espp_service_ipc_data_s requests[] = {
+static espp_service_ipc_data_s requests[] = {
        [ESPP_SERVICE_REQUEST_INIT_EVENT] = { "InitEvent", "i" },
        [ESPP_SERVICE_REQUEST_CREATE] = { "Create", "i" },
        [ESPP_SERVICE_REQUEST_DESTROY] = {"Destroy", NULL },
@@ -60,7 +60,7 @@ espp_service_ipc_data_s requests[] = {
        [ESPP_SERVICE_REQUEST_SET_CALLBACK] = { "SetCallback", "i" },
 };
 
-espp_service_ipc_data_s events[] = {
+static espp_service_ipc_data_s events[] = {
        [ESPP_SERVICE_EVENT_MSG] = { "Message", "s" },
        [ESPP_SERVICE_EVENT_CB_READY_TO_PREPARE] = { "ReadyToPrepareCB", "i" },
        [ESPP_SERVICE_EVENT_CB_PREPARE_ASYNC_DONE] = { "PrepareAsyncDoneCB", "b" },
@@ -125,6 +125,15 @@ static void __json_obj_foreach_func(JsonObject *object, const gchar *name, JsonN
        }
 }
 
+espp_service_ipc_data_s *espp_service_common_get_requests()
+{
+       return requests;
+}
+espp_service_ipc_data_s *espp_service_common_get_events()
+{
+       return events;
+}
+
 int espp_service_common_parse_json_structured_message(va_list ap, const char *message, const char *formats)
 {
        g_autoptr(JsonParser) parser = NULL;

diff --git a/src/common/espp_service_ipc.h b/src/common/espp_service_ipc.h
index bc41abba0eac17f38352ab61921e1eb2acc1fd54..c27062887d47db4d5b05d35bd8faf2f9e904cb32 100644 (file)
--- a/src/common/espp_service_ipc.h
+++ b/src/common/espp_service_ipc.h
@@ -111,10 +111,8 @@ typedef struct {
        const char *param_formats; /* 'b':bool, 'i':int, 'l':int64, 'u':uint, 'k':uint64, 'd':double, 's':string */
 } espp_service_ipc_data_s;
 
-extern espp_service_ipc_data_s requests[];
-extern espp_service_ipc_data_s events[];
-extern const char *data_type_strs[];
-
+espp_service_ipc_data_s *espp_service_common_get_requests();
+espp_service_ipc_data_s *espp_service_common_get_events();
 int espp_service_common_parse_json_structured_message(va_list ap, const char *message, const char *formats);
 JsonObject *espp_service_common_make_json_object_params(va_list ap, const char *formats, JsonObject *object);
 gchar *espp_service_common_get_string_from_json_object(JsonObject *object);

diff --git a/src/daemon/espp_service_handler.c b/src/daemon/espp_service_handler.c
index a903ac8d859bf4a9a42b4fac498b2f29446e7beb..78dafdb5ace43b35ffe232f80360833a23b02b85 100644 (file)
--- a/src/daemon/espp_service_handler.c
+++ b/src/daemon/espp_service_handler.c
@@ -1336,9 +1336,9 @@ void espp_service_func_handler(handler_userdata_s *hdata, espp_service_data_from
        ASSERT(data->request < ESPP_SERVICE_REQUEST_NUM);
 
        if (data->request == ESPP_SERVICE_REQUEST_SUBMIT_PACKET)
-               LOG_DEBUG("fd[%d] data[%p, request:%s]", hdata->fd, data, requests[data->request].str);
+               LOG_DEBUG("fd[%d] data[%p, request:%s]", hdata->fd, data, espp_service_common_get_requests()[data->request].str);
        else
-               LOG_WARNING("fd[%d] data[%p, request:%s]", hdata->fd, data, requests[data->request].str);
+               LOG_WARNING("fd[%d] data[%p, request:%s]", hdata->fd, data, espp_service_common_get_requests()[data->request].str);
 
        handlers[data->request](hdata, data, result);
 }

diff --git a/src/daemon/espp_service_msg.c b/src/daemon/espp_service_msg.c
index 3ca614457d261b1453b3e6aed62c9b558979c48d..c95759c3ee9ca62b105965ef7b9b10cfe52d35a5 100644 (file)
--- a/src/daemon/espp_service_msg.c
+++ b/src/daemon/espp_service_msg.c
@@ -25,7 +25,7 @@ int espp_service_msg_parse_params(const char *params, espp_service_request_e req
        ASSERT(request < ESPP_SERVICE_REQUEST_NUM);
 
        va_start(ap, request);
-       ret = espp_service_common_parse_json_structured_message(ap, params, requests[request].param_formats);
+       ret = espp_service_common_parse_json_structured_message(ap, params, espp_service_common_get_requests()[request].param_formats);
        va_end(ap);
 
        return ret;

diff --git a/src/daemon/espp_service_priv.h b/src/daemon/espp_service_priv.h
index 15d153a544d51d049a2a9fefa7046bbb5f8c7553..d633563206374e37e04cda0017dd8170df87c754 100644 (file)
--- a/src/daemon/espp_service_priv.h
+++ b/src/daemon/espp_service_priv.h
@@ -39,7 +39,7 @@ extern "C" {
 
 #define FILL_SOCKET_MSG_PARAMS(x_msg, x_event, ...) \
 do { \
-       gchar *params = espp_service_common_msg_params_new(events[x_event].param_formats, ##__VA_ARGS__); \
+       gchar *params = espp_service_common_msg_params_new(espp_service_common_get_events()[x_event].param_formats, ##__VA_ARGS__); \
        memset(&x_msg.params, 0x00, MAX_PARAMS_LEN); \
        if (!params) break; \
        STRNCPY(x_msg.params, params, MAX_PARAMS_LEN); \

diff --git a/src/daemon/espp_service_socket.c b/src/daemon/espp_service_socket.c
index bf36b63738c12cf920dfb6d8dc2b7cd29d30f728..7fc03866b25213983496eb2ffd7cc79367a461b0 100644 (file)
--- a/src/daemon/espp_service_socket.c
+++ b/src/daemon/espp_service_socket.c
@@ -106,7 +106,7 @@ static int __request_msg_handling(handler_userdata_s *hdata, bool *event_mode)
        }
 
        ASSERT(rx_data.request < ESPP_SERVICE_REQUEST_NUM);
-       LOG_DEBUG("<<<<< from fd[%d]: request[%s]", fd, requests[rx_data.request].str);
+       LOG_DEBUG("<<<<< from fd[%d]: request[%s]", fd, espp_service_common_get_requests()[rx_data.request].str);
 
        memset(&tx_data, 0x00, write_len);
        espp_service_func_handler(hdata, &rx_data, &tx_data);

diff --git a/tizen-manifest.xml b/tizen-manifest.xml
index b1b3a70f17f8a2170ee63595487beb79b4c3acd1..678c0a3683380ef1411d4fc39ff633c115304028 100644 (file)
--- a/tizen-manifest.xml
+++ b/tizen-manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="8.0" package="com.samsung.tizen.espp-service" version="0.3.20">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="8.0" package="com.samsung.tizen.espp-service" version="0.3.21">
     <profile name="mobile"/>
     <description>espp-service</description>
     <service-application appid="com.samsung.tizen.espp-service" auto-restart="false" exec="espp-service" multiple="false" nodisplay="false" on-boot="false" taskmanage="false" type="capp">