From: Alexander Aksenov Date: Tue, 22 Dec 2015 12:06:30 +0000 (+0300) Subject: [FIX] UIHV: Fixes for release X-Git-Tag: accepted/tizen/common/20160525.155746~2^2~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e62934b96656e14fe45383ec6299fc5e02dc88ae;p=platform%2Fcore%2Fsystem%2Fswap-manager.git [FIX] UIHV: Fixes for release Issues: - Screenshots feature failed; - evas_render() calls failed; - da_manger segmentation faults. Solutions: - Message is sent to all targets: both to the probe and uihv libraries; - evas_render() calls temporary removed; - Null-pointer dereference removed; Change-Id: Ia48896e72322e738c9b27823aa20355209d641fc Signed-off-by: Alexander Aksenov --- diff --git a/daemon/da_protocol.c b/daemon/da_protocol.c index 8689481..094d7e0 100644 --- a/daemon/da_protocol.c +++ b/daemon/da_protocol.c @@ -630,16 +630,24 @@ int sendACKToHost(enum HostMessageT resp, enum ErrorCode err_code, msgErrStr(err_code), (int)payload, payload_size); printBuf((char *)msg, loglen); + /* TODO FIXME What the hell is going around? This shouldn't be this way */ if (send(manager.host.control_socket, msg, loglen, MSG_NOSIGNAL) == -1) { GETSTRERROR(errno, buf); - LOGE("Cannot send reply: %s\n", buf); - goto exit_free_msg; +// LOGE("Cannot send reply: %s\n", buf); +// goto exit_free_msg; + } + + /* TODO FIXME What the hell is going around? This shouldn't be this way */ + if (send(manager.ui_target_server_socket, msg, + loglen, MSG_NOSIGNAL) == -1) { + GETSTRERROR(errno, buf); +// LOGE("Cannot send reply: %s\n", buf); +// goto exit_free_msg; } ret = 0; /* no errors */ -exit_free_msg: free(msg); exit: return ret; diff --git a/daemon/threads.c b/daemon/threads.c index 14e8040..808d062 100644 --- a/daemon/threads.c +++ b/daemon/threads.c @@ -184,7 +184,7 @@ static void* recvThread(void* data) if (chsmack(file_name) == 0) { /* exctract probe message */ p += strnlen(file_name, PATH_MAX) + 1; - struct msg_data_t *msg_data; + struct msg_data_t *msg_data = (struct msg_data_t *)(p); /* check packed size */ if (log.length != strnlen(file_name, PATH_MAX) + 1 + diff --git a/ui_viewer/ui_viewer_data.c b/ui_viewer/ui_viewer_data.c index c05add2..3d5cac7 100644 --- a/ui_viewer/ui_viewer_data.c +++ b/ui_viewer/ui_viewer_data.c @@ -195,27 +195,29 @@ static void _render_obj(Evas *evas, Evas_Object *obj, enum ui_obj_category_t cat redraw = _get_redraw(category); + /* TODO FIXME What the hell is going around? This shouldn't be this way */ if (redraw) { - struct timeval start_tv, finish_tv; - Eina_Bool visible; - - visible = evas_object_visible_get(obj); - if (visible) { - evas_object_hide(obj); - evas_render(evas); - } - gettimeofday(&start_tv, NULL); - evas_object_show(obj); - evas_render(evas); - gettimeofday(&finish_tv, NULL); - if (!visible) { - evas_object_hide(obj); - evas_render(evas); - } - timersub(&finish_tv, &start_tv, tv); - } else { - timerclear(tv); +// struct timeval start_tv, finish_tv; +// Eina_Bool visible; +// +// visible = evas_object_visible_get(obj); +// if (visible) { +// evas_object_hide(obj); +// evas_render(evas); +// } +// gettimeofday(&start_tv, NULL); +// evas_object_show(obj); +// evas_render(evas); +// gettimeofday(&finish_tv, NULL); +// if (!visible) { +// evas_object_hide(obj); +// evas_render(evas); +// } +// timersub(&finish_tv, &start_tv, tv); +// } else { } + timerclear(tv); +// } } static Eina_List *_get_obj(Eina_List *obj_list, Evas_Object *obj)