diff options
author | Minje Ahn <minje.ahn@samsung.com> | 2015-09-07 13:10:55 +0900 |
---|---|---|
committer | Minje Ahn <minje.ahn@samsung.com> | 2015-09-07 13:10:55 +0900 |
commit | e7bfe2daa994ee3eaacd53673ac5ff078a9399ec (patch) | |
tree | 78cc915ee3b71af1e2275406ddda160fb3897a0b /src/ipc/media-thumb-ipc.c | |
parent | 861a99ca9cc88fb8d54e70543e227c2c2e803fe7 (diff) | |
download | libmedia-thumbnail-e7bfe2daa994ee3eaacd53673ac5ff078a9399ec.tar.gz libmedia-thumbnail-e7bfe2daa994ee3eaacd53673ac5ff078a9399ec.tar.bz2 libmedia-thumbnail-e7bfe2daa994ee3eaacd53673ac5ff078a9399ec.zip |
Modify thumbnail creation and cancellation logictizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasesubmit/tizen_common/20151026.085049submit/tizen_common/20151023.083358submit/tizen_common/20151019.135620submit/tizen_common/20151015.190624submit/tizen/20150907.055530accepted/tizen/wearable/20150907.084937accepted/tizen/tv/20150907.084954accepted/tizen/mobile/20150907.084922tizen_3.0.m1_tvtizen_3.0.m1_mobile
Change-Id: I4bab6e37f9d943c719325f971ae9d3499a77f93f
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
Diffstat (limited to 'src/ipc/media-thumb-ipc.c')
-rwxr-xr-x | src/ipc/media-thumb-ipc.c | 619 |
1 files changed, 506 insertions, 113 deletions
diff --git a/src/ipc/media-thumb-ipc.c b/src/ipc/media-thumb-ipc.c index b10a5be..bf9e568 100755 --- a/src/ipc/media-thumb-ipc.c +++ b/src/ipc/media-thumb-ipc.c @@ -31,24 +31,39 @@ #include <grp.h> #include <pwd.h> -#define GLOBAL_USER 0 //#define tzplatform_getenv(TZ_GLOBAL) //TODO #define THUMB_SOCK_BLOCK_SIZE 512 -static __thread GQueue *g_request_queue = NULL; +static GQueue *g_request_queue = NULL; +static GQueue *g_manage_queue = NULL; +static GQueue *g_request_raw_queue = NULL; +static GQueue *g_manage_raw_queue = NULL; + + typedef struct { GIOChannel *channel; - char *path; + int msg_type; + bool isCanceled; int source_id; + uid_t uid; + char *path; thumbUserData *userData; } thumbReq; typedef struct { GIOChannel *channel; + int msg_type; + bool isCanceled; int request_id; int source_id; + int width; + int height; + uid_t uid; + char *path; thumbRawUserData *userData; } thumbRawReq; +int _media_thumb_send_request(); +int _media_thumb_raw_data_send_request(); int _media_thumb_get_error() @@ -57,7 +72,7 @@ int _media_thumb_get_error() thumb_err("Timeout. Can't try any more"); return MS_MEDIA_ERR_SOCKET_RECEIVE_TIMEOUT; } else { - thumb_err("recvfrom failed : %s", strerror(errno)); + thumb_stderror("recvfrom failed"); return MS_MEDIA_ERR_SOCKET_RECEIVE; } } @@ -66,7 +81,6 @@ int __media_thumb_pop_req_queue(const char *path, bool shutdown_channel) { int req_len = 0, i; - if (g_request_queue == NULL) return MS_MEDIA_ERR_INVALID_PARAMETER; req_len = g_queue_get_length(g_request_queue); if (req_len <= 0) { @@ -107,12 +121,66 @@ int __media_thumb_pop_req_queue(const char *path, bool shutdown_channel) return MS_MEDIA_ERR_NONE; } +int __media_thumb_check_req_queue_for_cancel(const char *path) +{ + int req_len = 0; + + req_len = g_queue_get_length(g_request_queue); + + if (req_len <= 0) { +// thumb_dbg("There is no request in the queue"); + } else { + thumbReq *req = NULL; + req = (thumbReq *)g_queue_peek_head(g_request_queue); + + if (req != NULL && strncmp(path, req->path, strlen(path)) == 0) { + req->isCanceled = true; + return MS_MEDIA_ERR_NONE; + } + } + + return MS_MEDIA_ERR_INTERNAL; +} + +int __media_thumb_pop_manage_queue(const char *path) +{ + int req_len = 0, i; + bool flag = false; + + req_len = g_queue_get_length(g_manage_queue); + + if (req_len < 0) { +// thumb_dbg("There is no request in the queue"); + } else { + for (i = 0; i < req_len; i++) { + thumbReq *req = NULL; + req = (thumbReq *)g_queue_peek_nth(g_manage_queue, i); + if (req == NULL) continue; + + if (strncmp(path, req->path, strlen(path)) == 0) { + g_queue_pop_nth(g_manage_queue, i); + + SAFE_FREE(req->path); + SAFE_FREE(req->userData); + SAFE_FREE(req); + flag = true; + break; + } + } + if(!flag) { + return __media_thumb_check_req_queue_for_cancel(path); + } + } + + return MS_MEDIA_ERR_NONE; +} + + int __media_thumb_pop_raw_data_req_queue(int request_id, bool shutdown_channel) { int req_len = 0, i; - if (g_request_queue == NULL) return MS_MEDIA_ERR_INVALID_PARAMETER; - req_len = g_queue_get_length(g_request_queue); + req_len = g_queue_get_length(g_request_raw_queue); if (req_len <= 0) { // thumb_dbg("There is no request in the queue"); @@ -120,7 +188,7 @@ int __media_thumb_pop_raw_data_req_queue(int request_id, bool shutdown_channel) for (i = 0; i < req_len; i++) { thumbRawReq *req = NULL; - req = (thumbRawReq *)g_queue_peek_nth(g_request_queue, i); + req = (thumbRawReq *)g_queue_peek_nth(g_request_raw_queue, i); if (req == NULL) continue; if (request_id == req->request_id) { @@ -135,7 +203,7 @@ int __media_thumb_pop_raw_data_req_queue(int request_id, bool shutdown_channel) g_io_channel_shutdown(req->channel, TRUE, NULL); g_io_channel_unref(req->channel); } - g_queue_pop_nth(g_request_queue, i); + g_queue_pop_nth(g_request_raw_queue, i); SAFE_FREE(req->userData); SAFE_FREE(req); @@ -151,6 +219,60 @@ int __media_thumb_pop_raw_data_req_queue(int request_id, bool shutdown_channel) return MS_MEDIA_ERR_NONE; } +int __media_thumb_check_raw_data_req_queue_for_cancel(int request_id) +{ + int req_len = 0; + + req_len = g_queue_get_length(g_request_raw_queue); + + if (req_len <= 0) { +// thumb_dbg("There is no request in the queue"); + } else { + thumbRawReq *req = NULL; + req = (thumbRawReq *)g_queue_peek_head(g_request_raw_queue); + + if (req != NULL && request_id == req->request_id) { + req->isCanceled = true; + return MS_MEDIA_ERR_NONE; + } + } + + return MS_MEDIA_ERR_INTERNAL; +} + +int __media_thumb_pop_raw_data_manage_queue(int request_id) +{ + int req_len = 0, i; + int flag = false; + + req_len = g_queue_get_length(g_manage_raw_queue); + + if (req_len < 0) { +// thumb_dbg("There is no request in the queue"); + } else { + + for (i = 0; i < req_len; i++) { + thumbRawReq *req = NULL; + req = (thumbRawReq *)g_queue_peek_nth(g_manage_raw_queue, i); + if (req == NULL) continue; + + if (request_id == req->request_id) { + g_queue_pop_nth(g_manage_raw_queue, i); + + SAFE_FREE(req->userData); + SAFE_FREE(req); + flag = true; + break; + } + } + if(!flag) { + return __media_thumb_check_raw_data_req_queue_for_cancel(request_id); + } + } + + return MS_MEDIA_ERR_NONE; +} + int __media_thumb_check_req_queue(const char *path) { int req_len = 0, i; @@ -181,6 +303,36 @@ int __media_thumb_check_req_queue(const char *path) return MS_MEDIA_ERR_NONE; } +bool __media_thumb_check_cancel(void) +{ + thumbReq *req = NULL; + req = (thumbReq *)g_queue_peek_head(g_request_queue); + + if (req == NULL) { + return false; + } else { + if(req->isCanceled) + return false; + else + return true; + } +} + +bool __media_thumb_check_cancel_for_raw(void) +{ + thumbRawReq *req = NULL; + req = (thumbRawReq *)g_queue_peek_head(g_request_raw_queue); + + if (req == NULL) { + return false; + } else { + if(req->isCanceled) + return false; + else + return true; + } +} + int _media_thumb_recv_msg(int sock, int header_size, thumbMsg *msg) { @@ -191,8 +343,8 @@ _media_thumb_recv_msg(int sock, int header_size, thumbMsg *msg) unsigned char *buf = NULL; unsigned char *block_buf = NULL; - buf = (unsigned char*)malloc(header_size * sizeof(unsigned char)); - block_buf = (unsigned char*)malloc(THUMB_SOCK_BLOCK_SIZE * sizeof(unsigned char)); + THUMB_MALLOC(buf, header_size); + THUMB_MALLOC(block_buf, THUMB_SOCK_BLOCK_SIZE); if (buf == NULL || block_buf == NULL) { thumb_err("memory allocation failed"); SAFE_FREE(buf); @@ -203,6 +355,7 @@ _media_thumb_recv_msg(int sock, int header_size, thumbMsg *msg) if ((recv_msg_len = recv(sock, buf, header_size, 0)) <= 0) { thumb_stderror("recv failed"); SAFE_FREE(buf); + SAFE_FREE(block_buf); return _media_thumb_get_error(); } @@ -210,17 +363,25 @@ _media_thumb_recv_msg(int sock, int header_size, thumbMsg *msg) //thumb_dbg("origin_path_size : %d, dest_path_size : %d, thumb_size : %d", msg->origin_path_size, msg->dest_path_size, msg->thumb_size); SAFE_FREE(buf); + if(msg->origin_path_size < 0 ||msg->dest_path_size < 0 || msg->thumb_size < 0) { + thumb_err("recv data is wrong"); + SAFE_FREE(block_buf); + return MS_MEDIA_ERR_SOCKET_RECEIVE; + } remain_size = msg->origin_path_size + msg->dest_path_size + msg->thumb_size; - buf = malloc(remain_size * sizeof(unsigned char)); - memset(buf, 0, remain_size * sizeof(unsigned char)); + THUMB_MALLOC(buf, remain_size); + if(buf == NULL) { + SAFE_FREE(block_buf); + return MS_MEDIA_ERR_OUT_OF_MEMORY; + } while(remain_size > 0) { if(remain_size < THUMB_SOCK_BLOCK_SIZE) { block_size = remain_size; } if ((recv_msg_len = recv(sock, block_buf, block_size, 0)) < 0) { - thumb_err("recv failed : %s", strerror(errno)); + thumb_stderror("recv failed"); SAFE_FREE(buf); SAFE_FREE(block_buf); return _media_thumb_get_error(); @@ -234,9 +395,17 @@ _media_thumb_recv_msg(int sock, int header_size, thumbMsg *msg) strncpy(msg->dst_path, (char *)buf + msg->origin_path_size, msg->dest_path_size); SAFE_FREE(msg->thumb_data); - msg->thumb_data = malloc(msg->thumb_size); - memset(msg->thumb_data, 0, msg->thumb_size); - memcpy(msg->thumb_data, buf + msg->origin_path_size + msg->dest_path_size, msg->thumb_size); + if(msg->thumb_size > 0) { + THUMB_MALLOC(msg->thumb_data, msg->thumb_size); + if(msg->thumb_data != NULL) { + memcpy(msg->thumb_data, buf + msg->origin_path_size + msg->dest_path_size, msg->thumb_size); + } else { + SAFE_FREE(buf); + SAFE_FREE(block_buf); + + return MS_MEDIA_ERR_OUT_OF_MEMORY; + } + } SAFE_FREE(buf); SAFE_FREE(block_buf); @@ -251,7 +420,11 @@ _media_thumb_recv_udp_msg(int sock, int header_size, thumbMsg *msg, struct socka unsigned int from_addr_size = sizeof(struct sockaddr_un); unsigned char *buf = NULL; - buf = (unsigned char*)malloc(sizeof(thumbMsg)); + THUMB_MALLOC(buf, sizeof(thumbMsg)); + if (buf == NULL) { + thumb_err("memory allocation failed"); + return MS_MEDIA_ERR_OUT_OF_MEMORY; + } if ((recv_msg_len = recvfrom(sock, buf, sizeof(thumbMsg), 0, (struct sockaddr *)from_addr, &from_addr_size)) < 0) { thumb_stderror("recvform failed"); @@ -304,8 +477,7 @@ _media_thumb_set_buffer(thumbMsg *req_msg, unsigned char **buf, int *buf_size) //thumb_dbg("Basic Size : %d, org_path : %s[%d], dst_path : %s[%d], thumb_data_len : %d", header_size, req_msg->org_path, org_path_len, req_msg->dst_path, dst_path_len, thumb_data_len); size = header_size + org_path_len + dst_path_len + thumb_data_len; - *buf = malloc(size); - + THUMB_MALLOC(*buf, size); if (*buf == NULL) { *buf_size = 0; return 0; @@ -332,7 +504,7 @@ _media_thumb_request(int msg_type, const char *origin_path, char *thumb_path, in int pid; sock_info.port = MS_THUMB_CREATOR_PORT; - err = ms_ipc_create_client_socket(MS_PROTOCOL_TCP, MS_TIMEOUT_SEC_10, &sock_info); + err = ms_ipc_create_client_socket(MS_PROTOCOL_TCP, MS_TIMEOUT_SEC_10, &sock_info); if (err != MS_MEDIA_ERR_NONE) { thumb_err("ms_ipc_create_client_socket failed"); return err; @@ -399,37 +571,38 @@ _media_thumb_request(int msg_type, const char *origin_path, char *thumb_path, in SAFE_FREE(buf); - if(msg_type != THUMB_REQUEST_CANCEL_ALL_RAW_DATA && msg_type != THUMB_REQUEST_CANCEL_ALL) { //No response.. - if ((err = _media_thumb_recv_msg(sock, header_size, &recv_msg)) < 0) { - thumb_err("_media_thumb_recv_msg failed "); - ms_ipc_delete_client_socket(&sock_info); - return err; - } - - recv_str_len = strlen(recv_msg.org_path); - thumb_dbg_slog("recv %s(%d) from thumb daemon is successful", recv_msg.org_path, recv_str_len); - + if ((err = _media_thumb_recv_msg(sock, header_size, &recv_msg)) < 0) { + thumb_err("_media_thumb_recv_msg failed "); ms_ipc_delete_client_socket(&sock_info); + return err; + } - if (recv_str_len > max_length) { - thumb_err("user buffer is too small. Output's length is %d", recv_str_len); - return MS_MEDIA_ERR_INVALID_PARAMETER; - } + recv_str_len = strlen(recv_msg.org_path); + thumb_dbg_slog("recv %s(%d) from thumb daemon is successful", recv_msg.org_path, recv_str_len); - if (recv_msg.status == THUMB_FAIL) { - thumb_err("Failed to make thumbnail"); - return MS_MEDIA_ERR_INVALID_PARAMETER; - } + ms_ipc_delete_client_socket(&sock_info); - if (msg_type != THUMB_REQUEST_SAVE_FILE) { - strncpy(thumb_path, recv_msg.dst_path, max_length); - } + if (recv_str_len > max_length) { + thumb_err("user buffer is too small. Output's length is %d", recv_str_len); + SAFE_FREE(recv_msg.thumb_data); + return MS_MEDIA_ERR_INVALID_PARAMETER; + } + + if (recv_msg.status == THUMB_FAIL) { + thumb_err("Failed to make thumbnail"); + SAFE_FREE(recv_msg.thumb_data); + return MS_MEDIA_ERR_INVALID_PARAMETER; + } - thumb_info->origin_width = recv_msg.origin_width; - thumb_info->origin_height = recv_msg.origin_height; - }else { - thumb_dbg("No response msg_type:[%d]", msg_type); + if (msg_type != THUMB_REQUEST_SAVE_FILE) { + strncpy(thumb_path, recv_msg.dst_path, max_length); } + + thumb_info->origin_width = recv_msg.origin_width; + thumb_info->origin_height = recv_msg.origin_height; + + SAFE_FREE(recv_msg.thumb_data); + return MS_MEDIA_ERR_NONE; } @@ -438,6 +611,7 @@ gboolean _media_thumb_write_socket(GIOChannel *src, GIOCondition condition, gpoi thumbMsg recv_msg; int header_size = 0; int sock = 0; + int len = -1; int err = MS_MEDIA_ERR_NONE; memset((void *)&recv_msg, 0, sizeof(thumbMsg)); @@ -467,15 +641,32 @@ gboolean _media_thumb_write_socket(GIOChannel *src, GIOCondition condition, gpoi err = MS_MEDIA_ERR_INTERNAL; } - if (data) { - thumbUserData* cb = (thumbUserData*)data; - if (cb->func != NULL) - cb->func(err, recv_msg.dst_path, cb->user_data); + if(__media_thumb_check_cancel()) { + if (data) { + thumbUserData* cb = (thumbUserData*)data; + if (cb->func != NULL) + cb->func(err, recv_msg.dst_path, cb->user_data); + } } __media_thumb_pop_req_queue(recv_msg.org_path, FALSE); thumb_dbg("Done"); + + SAFE_FREE(recv_msg.thumb_data); + + /* Check manage queue */ + if(g_manage_queue) { + len = g_queue_get_length(g_manage_queue); + + if(len > 0) { + _media_thumb_send_request(); + } else { + g_queue_free(g_manage_queue); + g_manage_queue = NULL; + } + } + return FALSE; } @@ -484,6 +675,7 @@ gboolean _media_thumb_raw_data_write_socket(GIOChannel *src, GIOCondition condit thumbMsg recv_msg; int header_size = 0; int sock = 0; + int len = -1; int err = MS_MEDIA_ERR_NONE; memset((void *)&recv_msg, 0, sizeof(thumbMsg)); @@ -512,10 +704,12 @@ gboolean _media_thumb_raw_data_write_socket(GIOChannel *src, GIOCondition condit err = MS_MEDIA_ERR_INTERNAL; } - if (data) { - thumbRawUserData* cb = (thumbRawUserData*)data; - if (cb->func != NULL) - cb->func(err, recv_msg.request_id, recv_msg.org_path, recv_msg.thumb_width, recv_msg.thumb_height, recv_msg.thumb_data, recv_msg.thumb_size, cb->user_data); + if(__media_thumb_check_cancel_for_raw()) { + if (data) { + thumbRawUserData* cb = (thumbRawUserData*)data; + if (cb->func != NULL) + cb->func(err, recv_msg.request_id, recv_msg.org_path, recv_msg.thumb_width, recv_msg.thumb_height, recv_msg.thumb_data, recv_msg.thumb_size, cb->user_data); + } } __media_thumb_pop_raw_data_req_queue(recv_msg.request_id, FALSE); @@ -524,22 +718,30 @@ gboolean _media_thumb_raw_data_write_socket(GIOChannel *src, GIOCondition condit SAFE_FREE(recv_msg.thumb_data); + /* Check manage queue */ + if(g_manage_raw_queue) { + len = g_queue_get_length(g_manage_raw_queue); + + if(len > 0) { + _media_thumb_raw_data_send_request(); + } else { + g_queue_free(g_manage_raw_queue); + g_manage_raw_queue = NULL; + } + } + return FALSE; } -int _media_thumb_request_async(int msg_type, const char *origin_path, thumbUserData *userData, uid_t uid) -{ +int _media_thumb_send_request() { int err = MS_MEDIA_ERR_NONE; int sock = -1; struct sockaddr_un serv_addr; ms_sock_info_s sock_info; + thumbReq *req_manager = NULL; int pid; sock_info.port = MS_THUMB_CREATOR_PORT; - if ((msg_type == THUMB_REQUEST_DB_INSERT) && (__media_thumb_check_req_queue(origin_path) < 0)) { - return MS_MEDIA_ERR_THUMB_DUPLICATED_REQUEST; - } - err = ms_ipc_create_client_socket(MS_PROTOCOL_TCP, MS_TIMEOUT_SEC_10, &sock_info); if(err != MS_MEDIA_ERR_NONE) { @@ -563,26 +765,22 @@ int _media_thumb_request_async(int msg_type, const char *origin_path, thumbUserD g_io_channel_unref(channel); return MS_MEDIA_ERR_SOCKET_CONN; } - - if (msg_type != THUMB_REQUEST_CANCEL_MEDIA) { - /* Create new channel to watch udp socket */ - GSource *source = NULL; - source = g_io_create_watch(channel, G_IO_IN); - - /* Set callback to be called when socket is readable */ - g_source_set_callback(source, (GSourceFunc)_media_thumb_write_socket, userData, NULL); - source_id = g_source_attach(source, g_main_context_get_thread_default()); - } + req_manager = (thumbReq *)g_queue_pop_head(g_manage_queue); + GSource *source = NULL; + source = g_io_create_watch(channel, G_IO_IN); + g_source_set_callback(source, (GSourceFunc)_media_thumb_write_socket, req_manager->userData, NULL); + source_id = g_source_attach(source, g_main_context_get_thread_default()); thumbMsg req_msg; + memset((void *)&req_msg, 0, sizeof(thumbMsg)); pid = getpid(); req_msg.pid = pid; - req_msg.msg_type = msg_type; - req_msg.uid = uid; - - strncpy(req_msg.org_path, origin_path, sizeof(req_msg.org_path)); + req_msg.msg_type = req_manager->msg_type; + req_msg.request_id = 0; + req_msg.uid = req_manager->uid; + strncpy(req_msg.org_path, req_manager->path, sizeof(req_msg.org_path)); req_msg.org_path[strlen(req_msg.org_path)] = '\0'; req_msg.dst_path[0] = '\0'; req_msg.origin_path_size = strlen(req_msg.org_path) + 1; @@ -614,38 +812,36 @@ int _media_thumb_request_async(int msg_type, const char *origin_path, thumbUserD SAFE_FREE(buf); thumb_dbg("Sending msg to thumbnail daemon is successful"); - if (msg_type == THUMB_REQUEST_CANCEL_MEDIA) { - g_io_channel_shutdown(channel, TRUE, NULL); - __media_thumb_pop_req_queue(origin_path, TRUE); - } else if (msg_type == THUMB_REQUEST_DB_INSERT) { + + if (req_manager->msg_type == THUMB_REQUEST_DB_INSERT) { if (g_request_queue == NULL) { - g_request_queue = g_queue_new(); + g_request_queue = g_queue_new(); } thumbReq *thumb_req = NULL; - thumb_req = calloc(1, sizeof(thumbReq)); + THUMB_MALLOC(thumb_req, sizeof(thumbReq)); if (thumb_req == NULL) { thumb_err("Failed to create request element"); return MS_MEDIA_ERR_INVALID_PARAMETER; } thumb_req->channel = channel; - thumb_req->path = strdup(origin_path); + thumb_req->path = strdup(req_manager->path); thumb_req->source_id = source_id; - thumb_req->userData = userData; + thumb_req->userData = req_manager->userData; g_queue_push_tail(g_request_queue, (gpointer)thumb_req); } - return MS_MEDIA_ERR_NONE; + return err; } -int _media_thumb_request_raw_data_async(int msg_type, int request_id, const char *origin_path, int width, int height, thumbRawUserData *userData, uid_t uid) -{ +int _media_thumb_raw_data_send_request() { int err = MS_MEDIA_ERR_NONE; int sock = -1; struct sockaddr_un serv_addr; ms_sock_info_s sock_info; + thumbRawReq *req_manager = NULL; int pid; sock_info.port = MS_THUMB_CREATOR_PORT; @@ -667,35 +863,30 @@ int _media_thumb_request_raw_data_async(int msg_type, int request_id, const char /* Connecting to the thumbnail server */ if (connect(sock, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) { - thumb_err("connect error : %s", strerror(errno)); + thumb_stderror("connect error"); g_io_channel_shutdown(channel, TRUE, NULL); g_io_channel_unref(channel); return MS_MEDIA_ERR_SOCKET_CONN; } - if (msg_type != THUMB_REQUEST_CANCEL_RAW_DATA) { - /* Create new channel to watch udp socket */ - GSource *source = NULL; - source = g_io_create_watch(channel, G_IO_IN); - - /* Set callback to be called when socket is readable */ - /*NEED UPDATE SOCKET FILE DELETE*/ - g_source_set_callback(source, (GSourceFunc)_media_thumb_raw_data_write_socket, userData, NULL); - source_id = g_source_attach(source, g_main_context_get_thread_default()); - } + req_manager = (thumbRawReq *)g_queue_pop_head(g_manage_raw_queue); + GSource *source = NULL; + source = g_io_create_watch(channel, G_IO_IN); + g_source_set_callback(source, (GSourceFunc)_media_thumb_raw_data_write_socket, req_manager->userData, NULL); + source_id = g_source_attach(source, g_main_context_get_thread_default()); thumbMsg req_msg; memset((void *)&req_msg, 0, sizeof(thumbMsg)); pid = getpid(); req_msg.pid = pid; - req_msg.msg_type = msg_type; - req_msg.request_id = request_id; - req_msg.thumb_width = width; - req_msg.thumb_height = height; - req_msg.uid = uid; + req_msg.msg_type = req_manager->msg_type; + req_msg.request_id = req_manager->request_id; + req_msg.thumb_width = req_manager->width; + req_msg.thumb_height = req_manager->height; + req_msg.uid = req_manager->uid; - strncpy(req_msg.org_path, origin_path, sizeof(req_msg.org_path)); + strncpy(req_msg.org_path, req_manager->path, sizeof(req_msg.org_path)); req_msg.org_path[strlen(req_msg.org_path)] = '\0'; req_msg.dst_path[0] = '\0'; @@ -724,27 +915,229 @@ int _media_thumb_request_raw_data_async(int msg_type, int request_id, const char } SAFE_FREE(buf); - thumb_dbg("Sending msg to thumbnail daemon is successful"); - if (msg_type == THUMB_REQUEST_CANCEL_RAW_DATA) { - g_io_channel_shutdown(channel, TRUE, NULL); - __media_thumb_pop_raw_data_req_queue(request_id, TRUE); - } else if (msg_type == THUMB_REQUEST_RAW_DATA) { - if (g_request_queue == NULL) { - g_request_queue = g_queue_new(); + if (req_manager->msg_type == THUMB_REQUEST_RAW_DATA) { + if (g_request_raw_queue == NULL) { + g_request_raw_queue = g_queue_new(); } thumbRawReq *thumb_req = NULL; - thumb_req = calloc(1, sizeof(thumbReq)); + THUMB_MALLOC(thumb_req, sizeof(thumbRawReq)); if (thumb_req == NULL) { thumb_err("Failed to create request element"); return MS_MEDIA_ERR_INVALID_PARAMETER; } thumb_req->channel = channel; - thumb_req->request_id = request_id; + thumb_req->request_id = req_manager->request_id; thumb_req->source_id = source_id; - thumb_req->userData = userData; + thumb_req->userData = req_manager->userData; - g_queue_push_tail(g_request_queue, (gpointer)thumb_req); + g_queue_push_tail(g_request_raw_queue, (gpointer)thumb_req); } return MS_MEDIA_ERR_NONE; } + +int _media_thumb_request_async(int msg_type, const char *origin_path, thumbUserData *userData, uid_t uid) +{ + int err = MS_MEDIA_ERR_NONE; + + if(g_manage_queue == NULL) { + if(msg_type == THUMB_REQUEST_CANCEL_MEDIA) + return MS_MEDIA_ERR_INTERNAL; + + g_manage_queue = g_queue_new(); + + thumbReq *thumb_req = NULL; + THUMB_MALLOC(thumb_req, sizeof(thumbReq)); + if (thumb_req == NULL) { + thumb_err("Failed to create request element"); + return MS_MEDIA_ERR_INVALID_PARAMETER; + } + + thumb_req->msg_type = msg_type; + thumb_req->path = strdup(origin_path); + thumb_req->userData = userData; + thumb_req->isCanceled = false; + thumb_req->uid = uid; + + g_queue_push_tail(g_manage_queue, (gpointer)thumb_req); + + /* directly request at first time */ + err = _media_thumb_send_request(); + + } else { + if(msg_type != THUMB_REQUEST_CANCEL_MEDIA) { + /* Enqueue */ + if ((msg_type == THUMB_REQUEST_DB_INSERT) && (__media_thumb_check_req_queue(origin_path) < 0)) { + thumb_err("duplicated request"); + return MS_MEDIA_ERR_THUMB_DUPLICATED_REQUEST; + } + + thumbReq *thumb_req = NULL; + THUMB_MALLOC(thumb_req, sizeof(thumbReq)); + if (thumb_req == NULL) { + thumb_err("Failed to create request element"); + return MS_MEDIA_ERR_INVALID_PARAMETER; + } + + thumb_req->msg_type = msg_type; + thumb_req->path = strdup(origin_path); + thumb_req->userData = userData; + thumb_req->isCanceled = false; + thumb_req->uid = uid; + + g_queue_push_tail(g_manage_queue, (gpointer)thumb_req); + } else { + /* Dequeue */ + err = __media_thumb_pop_manage_queue(origin_path); + } + } + + return err; +} + +int _media_thumb_request_raw_data_async(int msg_type, int request_id, const char *origin_path, int width, int height, thumbRawUserData *userData, uid_t uid) +{ + int err = MS_MEDIA_ERR_NONE; + + if(g_manage_raw_queue == NULL) { + if(msg_type == THUMB_REQUEST_CANCEL_RAW_DATA) + return MS_MEDIA_ERR_INTERNAL; + + g_manage_raw_queue = g_queue_new(); + + thumbRawReq *thumb_req = NULL; + THUMB_MALLOC(thumb_req, sizeof(thumbRawReq)); + if (thumb_req == NULL) { + thumb_err("Failed to create request element"); + return MS_MEDIA_ERR_INVALID_PARAMETER; + } + + thumb_req->msg_type = msg_type; + thumb_req->request_id = request_id; + thumb_req->path = strdup(origin_path); + thumb_req->width = width; + thumb_req->height= height; + thumb_req->userData = userData; + thumb_req->isCanceled = false; + thumb_req->uid = uid; + + g_queue_push_tail(g_manage_raw_queue, (gpointer)thumb_req); + + /* directly request at first time */ + err = _media_thumb_raw_data_send_request(); + + } else { + if(msg_type != THUMB_REQUEST_CANCEL_RAW_DATA) { + /* Enqueue */ + thumbRawReq *thumb_req = NULL; + THUMB_MALLOC(thumb_req, sizeof(thumbRawReq)); + if (thumb_req == NULL) { + thumb_err("Failed to create request element"); + return MS_MEDIA_ERR_INVALID_PARAMETER; + } + + thumb_req->msg_type = msg_type; + thumb_req->request_id = request_id; + thumb_req->path = strdup(origin_path); + thumb_req->width = width; + thumb_req->height= height; + thumb_req->userData = userData; + thumb_req->isCanceled = false; + thumb_req->uid = uid; + + g_queue_push_tail(g_manage_raw_queue, (gpointer)thumb_req); + + } else { + /* Dequeue */ + err = __media_thumb_pop_raw_data_manage_queue(request_id); + } + } + + return err; +} + +int _media_thumb_request_cancel_all(bool isRaw) { + int i; + int req_len = -1; + int len = 0; + + if(isRaw) { + thumbRawReq *tmp_raw_req = NULL; + if(g_manage_raw_queue == NULL) { + thumb_err("manage_queue is NULL"); + if(g_request_raw_queue != NULL) { + /* Check request queue */ + len = g_queue_get_length(g_request_raw_queue); + if(len > 0) { + tmp_raw_req = g_queue_peek_head(g_request_raw_queue); + if (tmp_raw_req != NULL) + tmp_raw_req->isCanceled = true; + return MS_MEDIA_ERR_NONE; + } + } + thumb_err("request_queue is NULL"); + return MS_MEDIA_ERR_INTERNAL; + } + req_len = g_queue_get_length(g_manage_raw_queue); + for(i=0;i<req_len;i++) { + tmp_raw_req = g_queue_pop_tail(g_manage_raw_queue); + if(tmp_raw_req) { + SAFE_FREE(tmp_raw_req->path); + SAFE_FREE(tmp_raw_req->userData); + SAFE_FREE(tmp_raw_req); + tmp_raw_req = NULL; + } + } + g_queue_free (g_manage_raw_queue); + g_manage_raw_queue = NULL; + if(g_request_raw_queue != NULL) { + /* Check request queue */ + len = g_queue_get_length(g_request_raw_queue); + if(len > 0) { + tmp_raw_req = g_queue_peek_head(g_request_raw_queue); + if (tmp_raw_req != NULL) + tmp_raw_req->isCanceled = true; + } + } + } else { + thumbReq *tmp_req = NULL; + if(g_manage_queue == NULL) { + thumb_err("manage_queue is NULL"); + if(g_request_queue != NULL) { + /* Check request queue */ + len = g_queue_get_length(g_request_queue); + if(len > 0) { + tmp_req = g_queue_peek_head(g_request_queue); + if (tmp_req != NULL) + tmp_req->isCanceled = true; + return MS_MEDIA_ERR_NONE; + } + } + thumb_err("request_queue is NULL"); + return MS_MEDIA_ERR_INTERNAL; + } + req_len = g_queue_get_length(g_manage_queue); + for(i=0;i<req_len;i++) { + tmp_req = g_queue_pop_tail(g_manage_queue); + if(tmp_req) { + SAFE_FREE(tmp_req->path); + SAFE_FREE(tmp_req->userData); + SAFE_FREE(tmp_req); + tmp_req = NULL; + } + } + g_queue_free (g_manage_queue); + g_manage_queue = NULL; + if(g_request_queue != NULL) { + /* Check request queue */ + len = g_queue_get_length(g_request_queue); + if(len > 0) { + tmp_req = g_queue_peek_head(g_request_queue); + if (tmp_req != NULL) + tmp_req->isCanceled = true; + } + } + } + + return MS_MEDIA_ERR_NONE; +}
\ No newline at end of file |