From c144b09b635b1ae3edc5d1b3a4aae3044afd0f01 Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Tue, 2 Dec 2014 15:51:58 +0900 Subject: [PATCH] emulator: did not expose unnecessary functions Change-Id: I4f5b2e24820f5416c0fc6544ad893afc24a89237 Signed-off-by: SeokYeon Hwang --- tizen/src/ecs/ecs.c | 2 ++ tizen/src/emulator.c | 11 +------ tizen/src/util/osutil-darwin.c | 5 ++- tizen/src/util/osutil-linux.c | 4 ++- tizen/src/util/osutil-win32.c | 4 ++- tizen/src/util/osutil.h | 1 - tizen/src/util/sdb.c | 60 ++++++++++++++++++---------------- tizen/src/util/sdb.h | 4 +-- 8 files changed, 45 insertions(+), 46 deletions(-) diff --git a/tizen/src/ecs/ecs.c b/tizen/src/ecs/ecs.c index 85cf5b4761..51a9a6a6de 100644 --- a/tizen/src/ecs/ecs.c +++ b/tizen/src/ecs/ecs.c @@ -757,6 +757,8 @@ static void ecs_notify_exit(Notifier *notifier, void *data) { static Notifier ecs_exit = { .notify = ecs_notify_exit }; int start_ecs(void) { + qemu_add_opts(&qemu_ecs_opts); + qemu_thread_create(&ecs_thread_id, "ecs", ecs_initialize, NULL, QEMU_THREAD_JOINABLE); emulator_add_exit_notifier(&ecs_exit); diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c index 1b7fb56c35..70257a5984 100644 --- a/tizen/src/emulator.c +++ b/tizen/src/emulator.c @@ -113,11 +113,6 @@ static void set_bin_path(char const *const exec_argv) set_bin_path_os(exec_argv); } -static void check_vm_lock(void) -{ - check_vm_lock_os(); -} - static void make_vm_lock(void) { make_vm_lock_os(); @@ -211,17 +206,13 @@ static void prepare_basic_features(gchar * const kernel_cmdline) clean_websocket_port(SIGKILL); #endif - check_vm_lock(); make_vm_lock(); maru_device_hotplug_init(); - qemu_add_opts(&qemu_ecs_opts); start_ecs(); - start_sdb_noti_server(get_device_serial_number() + SDB_UDP_SENSOR_INDEX); - - sdb_setup(); + sdb_setup(get_device_serial_number() + SDB_UDP_SENSOR_INDEX); get_host_proxy(http_proxy, https_proxy, ftp_proxy, socks_proxy); diff --git a/tizen/src/util/osutil-darwin.c b/tizen/src/util/osutil-darwin.c index 9c86f1efb5..39560a8d5a 100644 --- a/tizen/src/util/osutil-darwin.c +++ b/tizen/src/util/osutil-darwin.c @@ -81,7 +81,7 @@ static int cfnumber_to_int(CFNumberRef num) { return value; } -void check_vm_lock_os(void) +static void check_vm_lock_os(void) { /* TODO: */ } @@ -90,6 +90,9 @@ void make_vm_lock_os(void) { char *shared_memory; int base_port; + + check_vm_lock_os(); + base_port = get_emul_vm_base_port(); g_shmid = shmget((key_t)base_port, getpagesize(), 0666|IPC_CREAT); if (g_shmid == -1) { diff --git a/tizen/src/util/osutil-linux.c b/tizen/src/util/osutil-linux.c index 9708af802f..3c253fed01 100644 --- a/tizen/src/util/osutil-linux.c +++ b/tizen/src/util/osutil-linux.c @@ -80,7 +80,7 @@ static const char* gproxycmds[][2] = { { "gconftool-2 -g /system/proxy/socks_port", "gsettings get org.gnome.system.proxy.socks port" }, }; -void check_vm_lock_os(void) +static void check_vm_lock_os(void) { int shm_id; void *shm_addr; @@ -124,6 +124,8 @@ void make_vm_lock_os(void) { int base_port; + check_vm_lock_os(); + base_port = get_emul_vm_base_port(); g_shmid = shmget((key_t)base_port, getpagesize(), 0666|IPC_CREAT); diff --git a/tizen/src/util/osutil-win32.c b/tizen/src/util/osutil-win32.c index 9efef47fd5..96e5cc4b5e 100644 --- a/tizen/src/util/osutil-win32.c +++ b/tizen/src/util/osutil-win32.c @@ -59,7 +59,7 @@ static char g_sdcard[256] = {0,}; static const char *pactempfile = ".autoproxy"; -void check_vm_lock_os(void) +static void check_vm_lock_os(void) { uint32_t port; char *base_port = NULL; @@ -103,6 +103,8 @@ void make_vm_lock_os(void) char *shared_memory; int base_port; + check_vm_lock_os(); + base_port = get_emul_vm_base_port(); shared_memory = g_strdup_printf("%s", tizen_target_img_path); port_in_use = g_strdup_printf("%d", base_port); diff --git a/tizen/src/util/osutil.h b/tizen/src/util/osutil.h index 75982d408e..e75dc9439c 100644 --- a/tizen/src/util/osutil.h +++ b/tizen/src/util/osutil.h @@ -65,7 +65,6 @@ extern const char *pac_tempfile; -void check_vm_lock_os(void); void make_vm_lock_os(void); void remove_vm_lock_os(void); bool make_sdcard_lock_os(char *sdcard); diff --git a/tizen/src/util/sdb.c b/tizen/src/util/sdb.c index 44a7b311df..e4036699ea 100644 --- a/tizen/src/util/sdb.c +++ b/tizen/src/util/sdb.c @@ -192,34 +192,6 @@ void set_base_port(void) set_emul_vm_base_port(base_port); } -void sdb_setup(void) -{ - int tries = 10; - int success = 0; - char buf[64] = {0,}; - int number; - - number = get_device_serial_number(); - - for ( ; tries > 0; tries--, number += 10 ) { - sprintf(buf, "tcp:%d::%d", number, number); - if(net_slirp_redir((char*)buf) < 0) - continue; - - INFO( "SDBD established on port %d\n", number); - success = 1; - break; - } - - INFO("redirect [%s] success\n", buf); - if (!success) { - INFO( "it seems too many emulator instances are running on this machine. Aborting\n" ); - exit(1); - } - - INFO( "Port(%d/tcp) listen for SDB\n", number); -} - int sdb_loopback_client(int port, int type) { struct sockaddr_in addr; @@ -600,7 +572,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; @@ -632,3 +604,33 @@ void start_sdb_noti_server(int server_port) emulator_add_exit_notifier(&sdb_noti_server_exit); } +void sdb_setup(int server_port) +{ + int tries = 10; + int success = 0; + char buf[64] = {0,}; + int number; + + start_sdb_noti_server(server_port); + + number = get_device_serial_number(); + + for ( ; tries > 0; tries--, number += 10 ) { + sprintf(buf, "tcp:%d::%d", number, number); + if(net_slirp_redir((char*)buf) < 0) + continue; + + INFO( "SDBD established on port %d\n", number); + success = 1; + break; + } + + INFO("redirect [%s] success\n", buf); + if (!success) { + INFO( "it seems too many emulator instances are running on this machine. Aborting\n" ); + exit(1); + } + + INFO( "Port(%d/tcp) listen for SDB\n", number); +} + diff --git a/tizen/src/util/sdb.h b/tizen/src/util/sdb.h index 98ec33d3b5..db976f2ae0 100644 --- a/tizen/src/util/sdb.h +++ b/tizen/src/util/sdb.h @@ -52,7 +52,7 @@ #define SDB_TCP_OPENGL_INDEX 3 /* opengl server port */ #define SDB_UDP_SENSOR_INDEX 2 /* 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); @@ -60,8 +60,6 @@ void socket_close(int fd); int check_port_bind_listen(uint32_t port); int sdb_loopback_client(int port, int type); -void start_sdb_noti_server(int server_port); - #define STATE_RUNNING 0 #define STATE_SUSPEND 1 void notify_all_sdb_clients(int state); -- 2.34.1