From 78b162a4dcc9ee4ae4f031919c1d76e4372b096b Mon Sep 17 00:00:00 2001 From: Hyunil Date: Tue, 4 Apr 2017 15:54:29 +0900 Subject: Modify destroy func about mutex clear Change-Id: I464dbede0e2c5ac58a3d098845e26b01d4d789bc Signed-off-by: Hyunil --- LICENSE.APLv2 | 206 ------------------------------------- LICENSE.Apache-2.0 | 206 +++++++++++++++++++++++++++++++++++++ packaging/libmm-evas-renderer.spec | 4 +- src/mm_evas_renderer.c | 74 ++++++------- 4 files changed, 245 insertions(+), 245 deletions(-) delete mode 100755 LICENSE.APLv2 create mode 100755 LICENSE.Apache-2.0 diff --git a/LICENSE.APLv2 b/LICENSE.APLv2 deleted file mode 100755 index bbe9d02..0000000 --- a/LICENSE.APLv2 +++ /dev/null @@ -1,206 +0,0 @@ -Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/LICENSE.Apache-2.0 b/LICENSE.Apache-2.0 new file mode 100755 index 0000000..bbe9d02 --- /dev/null +++ b/LICENSE.Apache-2.0 @@ -0,0 +1,206 @@ +Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + diff --git a/packaging/libmm-evas-renderer.spec b/packaging/libmm-evas-renderer.spec index 905b396..7bdeb62 100644 --- a/packaging/libmm-evas-renderer.spec +++ b/packaging/libmm-evas-renderer.spec @@ -1,6 +1,6 @@ Name: libmm-evas-renderer Summary: Multimedia Framework Evas Renderer Library -Version: 0.0.17 +Version: 0.0.18 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 @@ -50,7 +50,7 @@ make %{?jobs:-j%jobs} %files %manifest %{name}.manifest -%license LICENSE.APLv2 +%license LICENSE.Apache-2.0 %defattr(-,root,root,-) %{_libdir}/*.so.* diff --git a/src/mm_evas_renderer.c b/src/mm_evas_renderer.c index 7bffc5a..f221d35 100755 --- a/src/mm_evas_renderer.c +++ b/src/mm_evas_renderer.c @@ -62,19 +62,19 @@ } \ } while (0) -#define SET_EVAS_OBJECT_EVENT_CALLBACK(x_evas_image_object, x_usr_data) \ +#define SET_EVAS_OBJECT_EVENT_CALLBACK(evas_image_object, usr_data) \ do { \ - if (x_evas_image_object) { \ + if (evas_image_object) { \ LOGD("object callback add"); \ - evas_object_event_callback_add(x_evas_image_object, EVAS_CALLBACK_RESIZE, _evas_resize_cb, x_usr_data); \ + evas_object_event_callback_add(evas_image_object, EVAS_CALLBACK_RESIZE, _evas_resize_cb, usr_data); \ } \ } while (0) -#define UNSET_EVAS_OBJECT_EVENT_CALLBACK(x_evas_image_object) \ +#define UNSET_EVAS_OBJECT_EVENT_CALLBACK(evas_image_object) \ do { \ - if (x_evas_image_object) { \ + if (evas_image_object) { \ LOGD("object callback del"); \ - evas_object_event_callback_del(x_evas_image_object, EVAS_CALLBACK_RESIZE, _evas_resize_cb); \ + evas_object_event_callback_del(evas_image_object, EVAS_CALLBACK_RESIZE, _evas_resize_cb); \ } \ } while (0) @@ -117,7 +117,7 @@ static int _flush_all_packets(mm_evas_info *evas_info); static int _mm_evas_renderer_create(mm_evas_info **evas_info); static int _mm_evas_renderer_destroy(mm_evas_info **evas_info); static int _mm_evas_renderer_set_info(mm_evas_info *evas_info, Evas_Object *eo); -static int _mm_evas_renderer_reset(mm_evas_info *evas_info); +static int _mm_evas_renderer_reset(mm_evas_info *evas_info, gboolean is_sub_thread); static void _mm_evas_renderer_update_geometry(mm_evas_info *evas_info); static int _mm_evas_renderer_retrieve_all_packets(mm_evas_info *evas_info, bool keep_screen); static int _mm_evas_renderer_make_flush_buffer(mm_evas_info *evas_info); @@ -131,8 +131,6 @@ static int _mm_evas_renderer_update_rendering_info(mm_evas_info *evas_info) { MMER_FENTER(); - int ret = MM_ERROR_NONE; - MMEVAS_RETURN_VAL_IF_FAIL(evas_info, MM_ERROR_EVASRENDER_NOT_INITIALIZED); MMEVAS_RETURN_VAL_IF_FAIL(evas_info->eo, MM_ERROR_EVASRENDER_NOT_INITIALIZED); @@ -158,7 +156,7 @@ static int _mm_evas_renderer_update_rendering_info(mm_evas_info *evas_info) evas_object_image_fill_set(evas_info->eo, evas_info->result.x, evas_info->result.y, evas_info->result.w, evas_info->result.h); MMER_FLEAVE(); - return ret; + return MM_ERROR_NONE; } static void _evas_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) @@ -344,7 +342,7 @@ static void _mm_evas_renderer_select_task(mm_evas_info *evas_info, update_info i break; case UPDATE_DESTROY: g_mutex_unlock(&evas_info->mp_lock); - if (_mm_evas_renderer_reset(evas_info) != MM_ERROR_NONE) + if (_mm_evas_renderer_reset(evas_info, TRUE) != MM_ERROR_NONE) LOGE("_mm_evas_renderer_reset is failed"); break; default: @@ -552,7 +550,7 @@ static int _find_empty_index(mm_evas_info *evas_info) } /* must be called after the null surface has been set. */ -static int _destory_all_packets(mm_evas_info *evas_info) +static int _destroy_all_packets(mm_evas_info *evas_info) { MMER_FENTER(); @@ -644,7 +642,7 @@ static int _flush_all_packets(mm_evas_info *evas_info) } LOGD("sent packet %d", evas_info->sent_buffer_cnt); - ret = _destory_all_packets(evas_info); + ret = _destroy_all_packets(evas_info); if (ret == MM_ERROR_NONE) { g_mutex_lock(&evas_info->evas_lock); @@ -747,9 +745,7 @@ static int _mm_evas_renderer_destroy(mm_evas_info **evas_info) int ret = MM_ERROR_NONE; pid_t pid = getpid(); pid_t tid = syscall(SYS_gettid); - gint64 end_time = g_get_monotonic_time() + SIGNAL_TIMEOUT * G_TIME_SPAN_SECOND; mm_evas_info *ptr = (mm_evas_info *)*evas_info; - MMEVAS_RETURN_VAL_IF_FAIL(ptr, MM_ERROR_EVASRENDER_NOT_INITIALIZED); LOGD("finalize evas_info %p", ptr); @@ -757,19 +753,30 @@ static int _mm_evas_renderer_destroy(mm_evas_info **evas_info) /* this API can be call by sub thread */ LOGD("pid [%d], tid [%d]", pid, tid); if (pid == tid) { /* API call by main thread */ - ret = _mm_evas_renderer_reset(ptr); + ret = _mm_evas_renderer_reset(ptr, FALSE); if (ret != MM_ERROR_NONE) LOGE("_mm_evas_renderer_reset is failed"); } else { - ret = _mm_evas_pipe_write(ptr, UPDATE_DESTROY); g_mutex_lock(&ptr->evas_lock); - if (!g_cond_wait_until(&ptr->evas_cond[COND_DESTROY], &ptr->evas_lock, end_time)) { - //timeout - LOGW("timeout: main thread is busy, App need to handle main thread well."); + ret = _mm_evas_pipe_write(ptr, UPDATE_DESTROY); + if ( ret == MM_ERROR_NONE) { + LOGD("Wait for g_cond_signal..."); + g_cond_wait(&ptr->evas_cond[COND_DESTROY], &ptr->evas_lock); + LOGD("get g_cond_signal"); } g_mutex_unlock(&ptr->evas_lock); } + g_mutex_clear(&ptr->mp_lock); + g_mutex_clear(&ptr->idx_lock); + g_mutex_clear(&ptr->write_lock); + g_mutex_clear(&ptr->evas_lock); + g_cond_clear(&ptr->evas_cond[COND_RETRIEVE]); + g_cond_clear(&ptr->evas_cond[COND_DESTROY]); + + g_free(ptr); + ptr = NULL; + MMER_FLEAVE(); return ret; @@ -817,11 +824,12 @@ static int _mm_evas_renderer_set_info(mm_evas_info *evas_info, Evas_Object *eo) return MM_ERROR_NONE; } -static int _mm_evas_renderer_reset(mm_evas_info *evas_info) +static int _mm_evas_renderer_reset(mm_evas_info *evas_info, gboolean is_sub_thread) { MMER_FENTER(); int ret = MM_ERROR_NONE; + MMEVAS_RETURN_VAL_IF_FAIL(evas_info, MM_ERROR_EVASRENDER_NOT_INITIALIZED); MMEVAS_RETURN_VAL_IF_FAIL(evas_info->eo, MM_ERROR_EVASRENDER_NOT_INITIALIZED); @@ -839,7 +847,7 @@ static int _mm_evas_renderer_reset(mm_evas_info *evas_info) _mm_evas_renderer_release_flush_buffer(evas_info); if (!evas_info->flush_all_packets) { - ret = _destory_all_packets(evas_info); + ret = _destroy_all_packets(evas_info); if (ret != MM_ERROR_NONE) { g_mutex_unlock(&evas_info->mp_lock); return MM_ERROR_EVASRENDER_INTERNAL; @@ -857,7 +865,7 @@ static int _mm_evas_renderer_reset(mm_evas_info *evas_info) evas_info->epipe = NULL; } - if (ret == MM_ERROR_NONE) { + if (is_sub_thread) { g_mutex_lock(&evas_info->evas_lock); LOGD("send signal[COND_DESTROY]"); g_cond_signal(&evas_info->evas_cond[COND_DESTROY]); @@ -866,16 +874,6 @@ static int _mm_evas_renderer_reset(mm_evas_info *evas_info) g_mutex_unlock(&evas_info->mp_lock); - g_mutex_clear(&evas_info->mp_lock); - g_mutex_clear(&evas_info->idx_lock); - g_mutex_clear(&evas_info->write_lock); - g_mutex_clear(&evas_info->evas_lock); - g_cond_clear(&evas_info->evas_cond[COND_RETRIEVE]); - g_cond_clear(&evas_info->evas_cond[COND_DESTROY]); - - g_free(evas_info); - evas_info = NULL; - MMER_FLEAVE(); return ret; @@ -1016,11 +1014,13 @@ static int _mm_evas_renderer_retrieve_all_packets(mm_evas_info *evas_info, bool g_mutex_unlock(&evas_info->mp_lock); } else { /* flush all packet */ - ret = _mm_evas_pipe_write(evas_info, UPDATE_FLUSH_BUFFER); g_mutex_lock(&evas_info->evas_lock); - if (!g_cond_wait_until(&evas_info->evas_cond[COND_RETRIEVE], &evas_info->evas_lock, end_time)) { - //timeout - LOGW("timeout: main thread is busy, App need to handle main thread well."); + ret = _mm_evas_pipe_write(evas_info, UPDATE_FLUSH_BUFFER); + if ( ret == MM_ERROR_NONE) { + if (!g_cond_wait_until(&evas_info->evas_cond[COND_RETRIEVE], &evas_info->evas_lock, end_time)) { + //timeout + LOGW("timeout: main thread is busy, App need to handle main thread well."); + } } g_mutex_unlock(&evas_info->evas_lock); } -- cgit v1.2.3