NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix thread complaints in examples

This commit is contained in:
Carsten Haitzler 2014-02-17 16:59:50 +09:00
parent b48010fb59
commit 8d2c55df46
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
legacy/elementary/src/examples/efl_thread_4.c
View File

@ -83,6 +83,17 @@ down(void *data, Evas *e, Evas_Object *obj, void *event_info)
pthread_mutex_unlock(&th_lock);
}
// on window delete - cancel thread then delete window and exit mainloop
static void
del(void *data, Evas_Object *obj, void *event_info)
{
pthread_mutex_lock(&th_lock);
th_exit = 1;
pthread_mutex_unlock(&th_lock);
evas_object_del(obj);
elm_exit();
}
EAPI_MAIN int
elm_main(int argc, char **argv)
{
@ -91,8 +102,8 @@ elm_main(int argc, char **argv)
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
win = elm_win_util_standard_add("efl-thread-4", "EFL Thread 4");
elm_win_autodel_set(win, EINA_TRUE);
evas_object_smart_callback_add(win, "delete,request", del, NULL);
o = evas_object_rectangle_add(evas_object_evas_get(win));
evas_object_color_set(o, 50, 80, 180, 255);
evas_object_resize(o, 100, 100);
@ -109,6 +120,9 @@ elm_main(int argc, char **argv)
evas_object_show(win);
elm_run();
pthread_mutex_lock(&th_lock);
th_exit = 1;
pthread_mutex_unlock(&th_lock);
elm_shutdown();
return 0;

17
legacy/elementary/src/examples/efl_thread_5.c
View File

@ -60,7 +60,18 @@ static void th_cancel(void *data, Ecore_Thread *th) { printf("thread cancelled\n
static void
down(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
ecore_thread_cancel(thr);
if (thr) ecore_thread_cancel(thr);
thr = NULL;
}
// on window delete - cancel thread then delete window and exit mainloop
static void
del(void *data, Evas_Object *obj, void *event_info)
{
if (thr) ecore_thread_cancel(thr);
thr = NULL;
evas_object_del(obj);
elm_exit();
}
EAPI_MAIN int
@ -71,7 +82,7 @@ elm_main(int argc, char **argv)
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
win = elm_win_util_standard_add("efl-thread-5", "EFL Thread 5");
elm_win_autodel_set(win, EINA_TRUE);
evas_object_smart_callback_add(win, "delete,request", del, NULL);
o = evas_object_rectangle_add(evas_object_evas_get(win));
evas_object_color_set(o, 50, 80, 180, 255);
@ -94,7 +105,7 @@ elm_main(int argc, char **argv)
evas_object_show(win);
elm_run();
ecore_thread_cancel(thr);
if (thr) ecore_thread_cancel(thr);
elm_shutdown();
return 0;