Remove the batch insert thread

Removed the thread to reduce the media-scanner's memory usage.

Change-Id: I15640affc9047d746327377c78f1ab5fc7a2ad6b
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/lib/include/media-util-ipc.h b/lib/include/media-util-ipc.h
index 616f9a33957a67aa8d6dfeea2befcb8a6d473891..5f7212a2d24b25f38a019666b63411e1affa8f0a 100644 (file)
--- a/lib/include/media-util-ipc.h
+++ b/lib/include/media-util-ipc.h
@@ -38,13 +38,11 @@ typedef enum {
        MS_MSG_DB_UPDATE = 0,           /**< Media DB Update */
        MS_MSG_DIRECTORY_SCANNING,                      /**< Recursive Directory Scan and Media DB Update*/
        MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE,/**< Non recursive Directory Scan and Media DB Update*/
-       MS_MSG_BULK_INSERT,                                     /**< Request bulk insert */
        MS_MSG_STORAGE_ALL,
        MS_MSG_STORAGE_PARTIAL,
        MS_MSG_STORAGE_INVALID,
        MS_MSG_SCANNER_READY,                           /**< Ready from media scanner */
        MS_MSG_SCANNER_RESULT,                          /**< Result of directory scanning */
-       MS_MSG_SCANNER_BULK_RESULT,                     /**< Request bulk insert */
        MS_MSG_DIRECTORY_SCANNING_CANCEL,       /**< Request cancel directory scan*/
        MS_MSG_STORAGE_SCANNER_COMPLETE,        /**< Storage Scanner complete */
        MS_MSG_DIRECTORY_SCANNER_COMPLETE,      /**< Directory Scanner complete */

diff --git a/lib/include/media-util-register.h b/lib/include/media-util-register.h
index 1be4766872ca47a986b144836f429189c7a2633e..a1c76fe5ccaac78a730d8888f0461a47c20970ef 100644 (file)
--- a/lib/include/media-util-register.h
+++ b/lib/include/media-util-register.h
@@ -44,7 +44,6 @@ typedef struct {
 } media_request_result_s;
 
 typedef void (*scan_complete_cb)(media_request_result_s *, void *);
-typedef void (*insert_complete_cb)(media_request_result_s *, void *);
 
 int media_directory_scanning_async(const char *directory_path,
                                                                        const char *storage_id,
@@ -55,8 +54,6 @@ int media_directory_scanning_async(const char *directory_path,
 
 int media_directory_scanning_cancel(const char *directory_path, uid_t uid);
 
-int media_files_register(const char *list_path, insert_complete_cb user_callback, void *user_data, uid_t uid);
-
 /**
 * @}
 */

diff --git a/lib/media-util-register.c b/lib/media-util-register.c
index c10861cca717b4a5d61d614cd01b34fafb8a830d..67b7b3f144aef2a62bbcf2847cb1a91f7139a916 100644 (file)
--- a/lib/media-util-register.c
+++ b/lib/media-util-register.c
@@ -87,9 +87,6 @@ static gboolean __read_socket(GIOChannel *channel, GIOCondition condition, gpoin
        case MS_MSG_SCANNER_RESULT:
                req_result.request_type = MEDIA_DIRECTORY_SCAN;
                break;
-       case MS_MSG_SCANNER_BULK_RESULT:
-               req_result.request_type = MEDIA_FILES_REGISTER;
-               break;
        case MS_MSG_SCANNER_COMPLETE:
                req_result.request_type = MEDIA_REQUEST_SCAN_COMPLETE;
                break;
@@ -329,8 +326,3 @@ int media_directory_scanning_cancel(const char *directory_path, uid_t uid)
 {
        return __media_db_request_update_cancel(MS_MSG_DIRECTORY_SCANNING_CANCEL, directory_path);
 }
-
-int media_files_register(const char *list_path, insert_complete_cb user_callback, void *user_data, uid_t uid)
-{
-       return __media_db_request_update_async(MS_MSG_BULK_INSERT, NULL, list_path, user_callback, user_data, uid);
-}

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 7e46e7b87e97cebc0698e50342d7fe5f218af730..90b541fb24d5e5670a08d3961dc57585891acd33 100644 (file)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.6.17
+Version:    0.6.18
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/common/include/media-common-utils.h b/src/common/include/media-common-utils.h
index 30b73335177565b5827f466bd3f069448f04d5e8..a30245bc61c3b5842244c6d1cfffa9c384861924 100644 (file)
--- a/src/common/include/media-common-utils.h
+++ b/src/common/include/media-common-utils.h
@@ -34,7 +34,6 @@
 #define MS_SAFE_FREE(src)              { if (src) {free(src); src = NULL; } }
 
 bool ms_is_valid_symlink(const char *path);
-int ms_verify_all_parent_dirs(const char *full_path, uid_t uid);
 int ms_check_scan_ignore(char *path, uid_t uid);
 int ms_set_power_mode(ms_db_status_type_t status);
 void ms_trim_dir_path(char *dir_path);

diff --git a/src/common/media-common-utils.c b/src/common/media-common-utils.c
index 6908b87c73f8d74e301dc41e0b35f936847ee2f7..c9d55b8c323c66edd51fa111dce21ec25bb90c70 100644 (file)
--- a/src/common/media-common-utils.c
+++ b/src/common/media-common-utils.c
@@ -24,27 +24,6 @@
 #include "media-common-system.h"
 #include "media-common-utils.h"
 
-int ms_verify_all_parent_dirs(const char *full_path, uid_t uid)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-       char *dir_path = NULL;
-       char *next = NULL;
-       int next_pos = 1;
-
-       while ((next = strstr(full_path + next_pos, "/"))) {
-               next_pos = (next - full_path);
-               dir_path = g_strndup(full_path, next_pos);
-               next_pos++;
-
-               ret = ms_check_scan_ignore(dir_path, uid);
-               g_free(dir_path);
-               if (ret != MS_MEDIA_ERR_NONE)
-                       break;
-       }
-
-       return ret;
-}
-
 int ms_set_power_mode(ms_db_status_type_t status)
 {
        int res = MS_MEDIA_ERR_NONE;

diff --git a/src/scanner-v2/include/media-scanner-scan-v2.h b/src/scanner-v2/include/media-scanner-scan-v2.h
index 3c0456ae2bfba78e778e6246a282ead9bf8f411c..3cd825799e006c4f1df695af4d77a2283e22d9d1 100644 (file)
--- a/src/scanner-v2/include/media-scanner-scan-v2.h
+++ b/src/scanner-v2/include/media-scanner-scan-v2.h
@@ -28,12 +28,10 @@ typedef struct _s_scan_item {
 typedef enum {
        MS_SCAN_STORAGE = 0,
        MS_SCAN_DIRECTORY = 1,
-       MS_SCAN_REGISTER = 2,
        MS_SCAN_MAX,
 } ms_scan_type_e;
 
 gpointer msc_directory_scan_thread(gpointer data);
-gpointer msc_register_thread(gpointer data);
 gpointer msc_storage_scan_thread(gpointer data);
 
 int msc_set_cancel_scan_item(const char *path, int pid);

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index 89a836cc161f71c45a1e8c368991c3d33bcebb03..b2d3120edd59094cb006dd53c1236bdd59a26ecc 100644 (file)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -42,7 +42,6 @@
 
 GAsyncQueue *storage_queue2;
 static GAsyncQueue *scan_queue2;
-static GAsyncQueue *reg_queue2;
 static GMutex scan_req_mutex2;
 static GMutex blocked_mutex2;
 static GMutex storage_scan_mutex2;
@@ -1107,108 +1106,6 @@ _POWEROFF:
        return NULL;
 }
 
-static int __msc_make_file_list(const char *file_path, char ***path_list)
-{
-       char *buf = NULL;
-       GError *err = NULL;
-
-       if (!g_file_get_contents(file_path, &buf, NULL, &err)) {
-               MS_DBG_ERR("g_file_get_contents failed [%s]", err->message);
-               g_error_free(err);
-               return MS_MEDIA_ERR_INTERNAL;
-       }
-
-       *path_list = g_strsplit(buf, "\n", -1);
-       g_free(buf);
-
-       return MS_MEDIA_ERR_NONE;
-}
-
-static int __msc_batch_insert(int pid, const char *request_path, uid_t uid)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-       sqlite3 *handle = NULL;
-       char storage_id[MS_UUID_SIZE] = {0,};
-       int i = 0;
-       char **path_list = NULL;
-
-       MS_DBG_FENTER();
-
-       ret = __msc_make_file_list(request_path, &path_list);
-       MS_DBG_RETV_IF(ret != MS_MEDIA_ERR_NONE, ret);
-
-       ret = ms_connect_db(&handle, uid);
-       if (ret != MS_MEDIA_ERR_NONE) {
-               g_strfreev(path_list);
-               return MS_MEDIA_ERR_DB_INTERNAL;
-       }
-
-       ms_register_start(true, pid);
-
-       for (i = 0; path_list[i][0] != '\0'; i++) {
-               ret = ms_verify_all_parent_dirs(path_list[i], uid);
-               if (ret != MS_MEDIA_ERR_NONE) {
-                       MS_DBG_SERR("Invalid path : %s", path_list[i]);
-                       continue;
-               }
-
-               memset(storage_id, 0x0, MS_UUID_SIZE);
-               if (ms_get_storage_id(handle, path_list[i], storage_id, uid) != MS_MEDIA_ERR_NONE) {
-                       MS_DBG_ERR("There is no storage id in media db");
-                       continue;
-               }
-
-               ret = ms_insert_item_batch(handle, storage_id, path_list[i], uid);
-
-               if (_msc_is_power_off()) {
-                       ret = MS_MEDIA_ERR_SCANNER_FORCE_STOP;
-                       break;
-               }
-       }
-
-       ms_register_end(uid);
-       ms_disconnect_db(handle);
-
-       g_strfreev(path_list);
-
-       MS_DBG_FLEAVE();
-
-       return ret;
-}
-
-gpointer msc_register_thread(gpointer data)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-       ms_comm_msg_s *register_data = NULL;
-
-       while (1) {
-               register_data = g_async_queue_pop(reg_queue2);
-
-               if (register_data->pid == POWEROFF) {
-                       MS_DBG_ERR("power off");
-                       g_free(register_data);
-                       return NULL;
-               }
-
-               if (register_data->msg_type == MS_MSG_BULK_INSERT) {
-                       MS_DBG_SLOG("BULK REGISTER START [%.*s]", MAX_MSG_SIZE, register_data->msg);
-                       ret = __msc_batch_insert(register_data->pid, register_data->msg, register_data->uid);
-                       MS_DBG_WARN("BULK REGISTER END [%d]", ret);
-               } else {
-                       MS_DBG_ERR("invalid message type [%d]", register_data->msg_type);
-                       ret = MS_MEDIA_ERR_INVALID_PARAMETER;
-               }
-
-               /*Active flush */
-               malloc_trim(0);
-
-               msc_send_result(ret, register_data);
-               g_free(register_data);
-       }                       /*thread while*/
-
-       return NULL;
-}
-
 int msc_set_cancel_scan_item(const char* cancel_path, int pid)
 {
        int ret = -1;
@@ -1326,14 +1223,12 @@ static int __msc_check_remain_space(uid_t uid)
 void msc_init_scanner(void)
 {
        if (!scan_queue2) scan_queue2 = g_async_queue_new();
-       if (!reg_queue2) reg_queue2 = g_async_queue_new();
        if (!storage_queue2) storage_queue2 = g_async_queue_new();
 }
 
 void msc_deinit_scanner(void)
 {
        if (scan_queue2) g_async_queue_unref(scan_queue2);
-       if (reg_queue2) g_async_queue_unref(reg_queue2);
        if (storage_queue2) g_async_queue_unref(storage_queue2);
 }
 
@@ -1348,9 +1243,6 @@ int msc_push_scan_request(ms_scan_type_e scan_type, ms_comm_msg_s *recv_msg)
        case MS_SCAN_DIRECTORY:
                g_async_queue_push(scan_queue2, recv_msg);
                break;
-       case MS_SCAN_REGISTER:
-               g_async_queue_push(reg_queue2, recv_msg);
-               break;
        default:
                MS_DBG_ERR("invalid parameter");
                ret = MS_MEDIA_ERR_INVALID_PARAMETER;
@@ -1371,13 +1263,6 @@ void msc_send_power_off_request(void)
                msc_push_scan_request(MS_SCAN_DIRECTORY, data);
        }
 
-       if (reg_queue2) {
-               data = g_new0(ms_comm_msg_s, 1);
-
-               data->pid = POWEROFF;
-               msc_push_scan_request(MS_SCAN_REGISTER, data);
-       }
-
        if (storage_queue2) {
                data = g_new0(ms_comm_msg_s, 1);
 

diff --git a/src/scanner-v2/media-scanner-socket-v2.c b/src/scanner-v2/media-scanner-socket-v2.c
index 923f193f2fec4a25b383e8ffce2ca8bac10d622a..48f531819e913db4f6d143cd23aa30ce1b3e711d 100644 (file)
--- a/src/scanner-v2/media-scanner-socket-v2.c
+++ b/src/scanner-v2/media-scanner-socket-v2.c
@@ -65,9 +65,6 @@ gboolean msc_receive_request(GIOChannel *src, GIOCondition condition, gpointer d
        MS_DBG_SLOG("receive msg from [%d][%d] M[%.*s] S[%.*s]", recv_msg->pid, recv_msg->msg_type, MAX_MSG_SIZE, recv_msg->msg, MS_UUID_SIZE, recv_msg->storage_id);
 
        switch (recv_msg->msg_type) {
-       case MS_MSG_BULK_INSERT:
-               msc_push_scan_request(MS_SCAN_REGISTER, recv_msg);
-               break;
        case MS_MSG_DIRECTORY_SCANNING:
        case MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE:
                msc_push_scan_request(MS_SCAN_DIRECTORY, recv_msg);
@@ -140,7 +137,7 @@ int msc_send_result(int result, ms_comm_msg_s *res_data)
        else if (res_data->msg_type == MS_MSG_EXTRACTOR_COMPLETE)
                send_msg.msg_type = MS_MSG_EXTRACTOR_COMPLETE;
        else
-               send_msg.msg_type = MS_MSG_SCANNER_BULK_RESULT;
+               send_msg.msg_type = MS_MSG_SCANNER_RESULT;
        send_msg.pid = res_data->pid;
        send_msg.result = result;
        g_strlcpy(send_msg.msg, res_data->msg, sizeof(send_msg.msg));

diff --git a/src/scanner-v2/media-scanner-v2.c b/src/scanner-v2/media-scanner-v2.c
index 0c7c4c29809c1d9adce0ed3d545ad6a1701a1d88..8717eafecf1c434c54bf66bb85fd58c1c5234eef 100644 (file)
--- a/src/scanner-v2/media-scanner-v2.c
+++ b/src/scanner-v2/media-scanner-v2.c
@@ -77,7 +77,6 @@ int main(int argc, char **argv)
 {
        GThread *storage_scan_thread = NULL;
        GThread *scan_thread = NULL;
-       GThread *register_thread = NULL;
        GThread *storage_extract_thread = NULL;
        GThread *folder_extract_thread = NULL;
        GIOChannel *channel = NULL;
@@ -141,7 +140,6 @@ int main(int argc, char **argv)
        /*create each threads*/
        storage_scan_thread = g_thread_new("storage_scan_thread", msc_storage_scan_thread, NULL);
        scan_thread = g_thread_new("scanner_thread", msc_directory_scan_thread, NULL);
-       register_thread = g_thread_new("register_thread", msc_register_thread, NULL);
        storage_extract_thread = g_thread_new("storage_extract_thread", msc_storage_extract_thread, NULL);
        folder_extract_thread = g_thread_new("folder_extract_thread", msc_folder_extract_thread, NULL);
 
@@ -159,7 +157,6 @@ int main(int argc, char **argv)
        __msc_remove_event_receiver();
 
        g_thread_join(scan_thread);
-       g_thread_join(register_thread);
        g_thread_join(storage_scan_thread);
        g_thread_join(storage_extract_thread);
        g_thread_join(folder_extract_thread);

diff --git a/src/scanner/include/media-scanner-scan.h b/src/scanner/include/media-scanner-scan.h
index 9074b3d87eddba758e85c64d49bd3852e5c307d6..74bf25f19ef5813e8ef2d0af9bda0e597c74b0e7 100644 (file)
--- a/src/scanner/include/media-scanner-scan.h
+++ b/src/scanner/include/media-scanner-scan.h
@@ -25,12 +25,10 @@
 typedef enum {
        MS_SCAN_STORAGE = 0,
        MS_SCAN_DIRECTORY = 1,
-       MS_SCAN_REGISTER = 2,
        MS_SCAN_MAX,
 } ms_scan_type_e;
 
 gpointer msc_directory_scan_thread(gpointer data);
-gpointer msc_register_thread(gpointer data);
 gpointer msc_storage_scan_thread(gpointer data);
 void msc_init_scanner(void);
 void msc_deinit_scanner(void);

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index 1d8bad0a04d4c9b5eeb9d4cecb62ba1e9399eeaa..bd20e5d5389a858d3be964623a2760ae9df5eebd 100644 (file)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -30,7 +30,6 @@
 static bool power_off;
 static GAsyncQueue * storage_queue;
 static GAsyncQueue *scan_queue;
-static GAsyncQueue *reg_queue;
 
 static bool __msc_is_power_off(void)
 {
@@ -406,119 +405,15 @@ _POWEROFF:
        return NULL;
 }
 
-static int __msc_make_file_list(const char *file_path, char ***path_list)
-{
-       char *buf = NULL;
-       GError *err = NULL;
-
-       if (!g_file_get_contents(file_path, &buf, NULL, &err)) {
-               MS_DBG_ERR("g_file_get_contents failed [%s]", err->message);
-               g_error_free(err);
-               return MS_MEDIA_ERR_INTERNAL;
-       }
-
-       *path_list = g_strsplit(buf, "\n", -1);
-       g_free(buf);
-
-       return MS_MEDIA_ERR_NONE;
-}
-
-static int __msc_batch_insert(int pid, const char *request_path, uid_t uid)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-       sqlite3 *handle = NULL;
-       char storage_id[MS_UUID_SIZE] = {0,};
-       int i = 0;
-       char **path_list = NULL;
-
-       MS_DBG_FENTER();
-
-       ret = __msc_make_file_list(request_path, &path_list);
-       MS_DBG_RETV_IF(ret != MS_MEDIA_ERR_NONE, ret);
-
-       ret = ms_connect_db(&handle, uid);
-       if (ret != MS_MEDIA_ERR_NONE) {
-               g_strfreev(path_list);
-               return MS_MEDIA_ERR_DB_INTERNAL;
-       }
-
-       ms_register_start(true, pid);
-
-       for (i = 0; path_list[i][0] != '\0'; i++) {
-               ret = ms_verify_all_parent_dirs(path_list[i], uid);
-               if (ret != MS_MEDIA_ERR_NONE) {
-                       MS_DBG_SERR("Invalid path : %s", path_list[i]);
-                       continue;
-               }
-
-               memset(storage_id, 0x0, MS_UUID_SIZE);
-               if (ms_get_storage_id(handle, path_list[i], storage_id, uid) != MS_MEDIA_ERR_NONE) {
-                       MS_DBG_ERR("There is no storage id in media db");
-                       continue;
-               }
-
-               ret = ms_insert_item_batch(handle, storage_id, path_list[i], uid);
-
-               if (__msc_is_power_off()) {
-                       ret = MS_MEDIA_ERR_SCANNER_FORCE_STOP;
-                       break;
-               }
-       }
-
-       ms_register_end(uid);
-       ms_disconnect_db(handle);
-
-       g_strfreev(path_list);
-
-       MS_DBG_FLEAVE();
-
-       return ret;
-}
-
-gpointer msc_register_thread(gpointer data)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-       ms_comm_msg_s *register_data = NULL;
-
-       while (1) {
-               register_data = g_async_queue_pop(reg_queue);
-
-               if (register_data->pid == POWEROFF) {
-                       MS_DBG_ERR("power off");
-                       g_free(register_data);
-                       return NULL;
-               }
-
-               if (register_data->msg_type == MS_MSG_BULK_INSERT) {
-                       MS_DBG_SLOG("BULK REGISTER START [%.*s]", MAX_MSG_SIZE, register_data->msg);
-                       ret = __msc_batch_insert(register_data->pid, register_data->msg, register_data->uid);
-                       MS_DBG_WARN("BULK REGISTER END [%d]", ret);
-               } else {
-                       MS_DBG_ERR("invalid message type [%d]", register_data->msg_type);
-                       ret = MS_MEDIA_ERR_INVALID_PARAMETER;
-               }
-
-               /*Active flush */
-               malloc_trim(0);
-
-               msc_send_result(ret, register_data);
-               g_free(register_data);
-       }                       /*thread while*/
-
-       return NULL;
-}
-
 void msc_init_scanner(void)
 {
        if (!scan_queue) scan_queue = g_async_queue_new();
-       if (!reg_queue) reg_queue = g_async_queue_new();
        if (!storage_queue) storage_queue = g_async_queue_new();
 }
 
 void msc_deinit_scanner(void)
 {
        if (scan_queue) g_async_queue_unref(scan_queue);
-       if (reg_queue) g_async_queue_unref(reg_queue);
        if (storage_queue) g_async_queue_unref(storage_queue);
 }
 
@@ -533,9 +428,6 @@ int msc_push_scan_request(ms_scan_type_e scan_type, ms_comm_msg_s *recv_msg)
        case MS_SCAN_DIRECTORY:
                g_async_queue_push(scan_queue, recv_msg);
                break;
-       case MS_SCAN_REGISTER:
-               g_async_queue_push(reg_queue, recv_msg);
-               break;
        default:
                MS_DBG_ERR("invalid parameter");
                ret = MS_MEDIA_ERR_INVALID_PARAMETER;
@@ -559,14 +451,6 @@ void msc_send_power_off_request(void)
                msc_push_scan_request(MS_SCAN_DIRECTORY, data);
        }
 
-       if (reg_queue) {
-               /*notify to register thread*/
-               data = g_new0(ms_comm_msg_s, 1);
-
-               data->pid = POWEROFF;
-               msc_push_scan_request(MS_SCAN_REGISTER, data);
-       }
-
        if (storage_queue) {
                /*notify to register thread*/
                data = g_new0(ms_comm_msg_s, 1);

diff --git a/src/scanner/media-scanner-socket.c b/src/scanner/media-scanner-socket.c
index 5c942626e84e19115790b84372ad65dbfa58b757..14a5a03cf0af61632838deb49a4aeb7cb81a00df 100644 (file)
--- a/src/scanner/media-scanner-socket.c
+++ b/src/scanner/media-scanner-socket.c
@@ -62,9 +62,6 @@ gboolean msc_receive_request(GIOChannel *src, GIOCondition condition, gpointer d
        MS_DBG_SLOG("receive msg from [%d][%d] M[%.*s] S[%.*s]", recv_msg->pid, recv_msg->msg_type, MAX_MSG_SIZE, recv_msg->msg, MS_UUID_SIZE, recv_msg->storage_id);
 
        switch (recv_msg->msg_type) {
-       case MS_MSG_BULK_INSERT:
-               msc_push_scan_request(MS_SCAN_REGISTER, recv_msg);
-               break;
        case MS_MSG_DIRECTORY_SCANNING:
        case MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE:
                msc_push_scan_request(MS_SCAN_DIRECTORY, recv_msg);
@@ -125,7 +122,7 @@ int msc_send_result(int result, ms_comm_msg_s *res_data)
        MS_DBG_RETVM_IF(fd < 0, MS_MEDIA_ERR_INTERNAL, "fifo open failed");
 
        memset(&send_msg, 0x0, sizeof(ms_comm_msg_s));
-       send_msg.msg_type = MS_MSG_SCANNER_BULK_RESULT;
+       send_msg.msg_type = MS_MSG_SCANNER_RESULT;
        send_msg.pid = res_data->pid;
        send_msg.result = result;
        send_msg.uid = res_data->uid;

diff --git a/src/scanner/media-scanner.c b/src/scanner/media-scanner.c
index e77f54b279bf2043927487df21ba2007e00e85f3..f805409caf67b213dc98f8dc28229033cffab921 100644 (file)
--- a/src/scanner/media-scanner.c
+++ b/src/scanner/media-scanner.c
@@ -52,7 +52,6 @@ int main(int argc, char **argv)
 {
        GThread *storage_scan_thread = NULL;
        GThread *scan_thread = NULL;
-       GThread *register_thread = NULL;
        GIOChannel *channel = NULL;
        int err = -1;
        int fd = -1;
@@ -100,7 +99,6 @@ int main(int argc, char **argv)
        /*create each threads*/
        storage_scan_thread = g_thread_new("storage_scan_thread", msc_storage_scan_thread, NULL);
        scan_thread = g_thread_new("scanner_thread", msc_directory_scan_thread, NULL);
-       register_thread = g_thread_new("register_thread", msc_register_thread, NULL);
 
        MS_DBG_INFO("SCANNER is ready");
        msc_send_ready();
@@ -111,7 +109,6 @@ int main(int argc, char **argv)
        ms_sys_unset_poweroff_cb();
 
        g_thread_join(scan_thread);
-       g_thread_join(register_thread);
        g_thread_join(storage_scan_thread);
 
        msc_deinit_scanner();

diff --git a/src/server/media-server-on-demand.c b/src/server/media-server-on-demand.c
index 1a198d2bd912fb9b2567d6ffab4795649c7b19be..ea14d2de30ea376f0c0109d686bd3b7704a928f2 100644 (file)
--- a/src/server/media-server-on-demand.c
+++ b/src/server/media-server-on-demand.c
@@ -39,7 +39,6 @@
 
 #define MS_MAIN_TIMEOUT_SEC 300
 #define BOOT_CHECK_FILE     tzplatform_mkpath(TZ_SYS_TMP, "media_server_boot")
-#define SELECT_VALID_STORAGES "SELECT storage_id, storage_path FROM storage WHERE validity=1"
 
 extern GMainLoop *mainloop;
 
@@ -169,6 +168,7 @@ static void __ms_read_storage_list_from_db(void)
        sqlite3 *db_handle = NULL;
        sqlite3_stmt *sql_stmt = NULL;
        ms_block_info_s *block_info = NULL;
+       const char *q = "SELECT storage_id, storage_path FROM storage WHERE validity=1;";
 
        ret = ms_connect_db(&db_handle, ms_sys_get_uid());
        if (ret != MS_MEDIA_ERR_NONE) {
@@ -176,7 +176,7 @@ static void __ms_read_storage_list_from_db(void)
                return;
        }
 
-       ret = sqlite3_prepare_v2(db_handle, SELECT_VALID_STORAGES, strlen(SELECT_VALID_STORAGES), &sql_stmt, NULL);
+       ret = sqlite3_prepare_v2(db_handle, q, strlen(q), &sql_stmt, NULL);
        if (SQLITE_OK != ret) {
                MS_DBG_ERR("prepare error [%s]", sqlite3_errmsg(db_handle));
                ms_disconnect_db(db_handle);

diff --git a/src/server/media-server-socket.c b/src/server/media-server-socket.c
index f1e0d42c461af81e920f6f3067408b60e4fbeee9..fe42476de016868478e024aad26d2fe33c9d65dc 100644 (file)
--- a/src/server/media-server-socket.c
+++ b/src/server/media-server-socket.c
@@ -271,7 +271,6 @@ gboolean ms_read_scanner_dispatcher_socket_func(GIOChannel *src, GIOCondition co
        /* register file request media server inserts the meta data of one file into media db */
        switch (recv_msg.msg_type) {
        case MS_MSG_DIRECTORY_SCANNING:
-       case MS_MSG_BULK_INSERT:
        case MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE:
                ret = ms_send_scan_request(&recv_msg, client_sock);
                if (ret != MS_MEDIA_ERR_NONE)
@@ -311,9 +310,6 @@ ERROR:
        case MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE:
                res_msg.msg_type = MS_MSG_SCANNER_RESULT;
                break;
-       case MS_MSG_BULK_INSERT:
-               res_msg.msg_type = MS_MSG_SCANNER_BULK_RESULT;
-               break;
        case MS_MSG_MEDIA_DB_MALFORMED:
                res_msg.msg_type = MS_MSG_MEDIA_DB_MALFORMED;
                break;
@@ -456,7 +452,6 @@ gboolean ms_receive_message_from_scanner(GIOChannel *src, GIOCondition condition
 
        switch (recv_msg.msg_type) {
        case MS_MSG_SCANNER_RESULT:
-       case MS_MSG_SCANNER_BULK_RESULT:
        case MS_MSG_EXTRACTOR_COMPLETE:
                MS_DBG_WARN("DB UPDATING IS DONE[%d]", recv_msg.msg_type);
                __ms_dec_request_count();