From: SeokYeon Hwang Date: Fri, 31 Jul 2015 07:51:02 +0000 (+0900) Subject: sdb: removed redundant inbound funtion calls X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~40^2~237 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d39298464a55dbbc05dabe648bcccd2c75e1522d;p=sdk%2Femulator%2Fqemu.git sdb: removed redundant inbound funtion calls Change-Id: I0b92232270167bf0aa30a8e5ff4f679b3641d465 Signed-off-by: SeokYeon Hwang --- diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c index 764f1bffa8..ab70685f39 100644 --- a/tizen/src/emulator.c +++ b/tizen/src/emulator.c @@ -221,8 +221,7 @@ void prepare_maru_after_device_init(void) set_qemu_input_mode(); maru_device_hotplug_init(); start_ecs(); - start_sdb_noti_server(get_emul_vm_base_port() + SDB_UDP_SENSOR_INDEX); - sdb_setup(); + sdb_setup(get_emul_vm_base_port() + SDB_UDP_SENSOR_INDEX); // only for intent logging of essential information get_vm_name(); diff --git a/tizen/src/util/sdb.c b/tizen/src/util/sdb.c index 25f1bb3811..1b4a70bfc8 100644 --- a/tizen/src/util/sdb.c +++ b/tizen/src/util/sdb.c @@ -195,8 +195,11 @@ void set_base_port(void) set_emul_vm_base_port(base_port); } -void sdb_setup(void) +static void start_sdb_noti_server(int server_port); +void sdb_setup(int server_port) { + start_sdb_noti_server(server_port); + if (is_netclient_tap_attached()) { return; } @@ -514,7 +517,6 @@ static gboolean sdb_noti_read(GIOChannel *channel, GIOCondition cond, void *opaq memset(&readbuf, 0, sizeof(readbuf)); - recv_cnt = recvfrom(server->server_fd, readbuf, RECV_BUF_SIZE, 0, (struct sockaddr*) &client_addr, &client_len); @@ -590,7 +592,7 @@ static void sdb_noti_server_notify_exit(Notifier *notifier, void *data) static Notifier sdb_noti_server_exit = { .notify = sdb_noti_server_notify_exit }; -void start_sdb_noti_server(int server_port) +static void start_sdb_noti_server(int server_port) { SDB_Noti_Server *server; int ret; diff --git a/tizen/src/util/sdb.h b/tizen/src/util/sdb.h index 8e10918055..49cbcb0cf1 100644 --- a/tizen/src/util/sdb.h +++ b/tizen/src/util/sdb.h @@ -52,13 +52,12 @@ #define SDB_TCP_OPENGL_INDEX 3 /* opengl server port */ #define SDB_UDP_SENSOR_INDEX 3 /* sensor server port */ -void sdb_setup(void); +void sdb_setup(int server_port); void set_base_port(void); int inet_strtoip(const char* str, uint32_t *ip); int socket_send(int fd, const void* buf, int buflen); void socket_close(int fd); int check_port_bind_listen(uint32_t port); -void start_sdb_noti_server(int server_port); #define STATE_RUNNING 0 #define STATE_SUSPEND 1