enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

* ecore: fix long run thread, now that I have a nice user. 

SVN revision: 49994
This commit is contained in:
Cedric BAIL 2010-07-02 11:15:20 +00:00
parent 977221953e
commit 062f4c3920
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
legacy/ecore/src/lib/ecore/Ecore.h
View File

@ -335,16 +335,21 @@ extern "C" {
EAPI void ecore_pipe_write_close(Ecore_Pipe *p);
EAPI void ecore_pipe_read_close(Ecore_Pipe *p);
EAPI Ecore_Thread *ecore_thread_run(void (*func_heavy)(void *data), void (*func_end)(void *data), void (*func_cancel)(void *data), const void *data);
EAPI Ecore_Thread *ecore_long_run(void (*func_heavy)(Ecore_Thread *thread, void *data),
void (*func_notify)(Ecore_Thread *thread, void *data),
EAPI Ecore_Thread *ecore_thread_run(void (*func_heavy)(void *data),
void (*func_end)(void *data),
void (*func_cancel)(void *data),
const void *data);
EAPI Ecore_Thread *ecore_long_run(void (*func_heavy)(Ecore_Thread *thread,
void *data),
void (*func_notify)(Ecore_Thread *thread,
void *msg_data, void *data),
void (*func_end)(void *data),
void (*func_cancel)(void *data),
const void *data,
Eina_Bool try_no_queue);
EAPI Eina_Bool ecore_thread_cancel(Ecore_Thread *thread);
EAPI Eina_Bool ecore_thread_check(Ecore_Thread *thread);
EAPI Eina_Bool ecore_thread_notify(Ecore_Thread *thread, void *data);
EAPI Eina_Bool ecore_thread_notify(Ecore_Thread *thread, void *msg_data);
EAPI double ecore_time_get(void);
EAPI double ecore_loop_time_get(void);

17
legacy/ecore/src/lib/ecore/ecore_thread.c
View File

@ -24,7 +24,7 @@ struct _Ecore_Pthread_Worker
} short_run;
struct {
void (*func_heavy)(Ecore_Thread *thread, void *data);
void (*func_notify)(Ecore_Thread *thread, void *data);
void (*func_notify)(Ecore_Thread *thread, void *msg_data, void *data);
Ecore_Pipe *notify;
@ -119,16 +119,17 @@ _ecore_thread_handler(void *data __UNUSED__, void *buffer, unsigned int nbyte)
}
static void
_ecore_notify_handler(void *data __UNUSED__, void *buffer, unsigned int nbyte)
_ecore_notify_handler(void *data, void *buffer, unsigned int nbyte)
{
Ecore_Pthread_Worker *work;
Ecore_Pthread_Worker *work = data;
void *user_data;
if (nbyte != sizeof (Ecore_Pthread_Worker*)) return ;
work = *(Ecore_Pthread_Worker**)buffer;
user_data = *(void**)buffer;
if (work->u.long_run.func_notify)
work->u.long_run.func_notify((Ecore_Thread *) work, (void*) work->data);
work->u.long_run.func_notify((Ecore_Thread *) work, user_data, (void*) work->data);
}
static void
@ -466,7 +467,7 @@ ecore_thread_check(Ecore_Thread *thread)
EAPI Ecore_Thread *
ecore_long_run(void (*func_heavy)(Ecore_Thread *thread, void *data),
void (*func_notify)(Ecore_Thread *thread, void *data),
void (*func_notify)(Ecore_Thread *thread, void *msg_data, void *data),
void (*func_end)(void *data),
void (*func_cancel)(void *data),
const void *data,
@ -490,7 +491,7 @@ ecore_long_run(void (*func_heavy)(Ecore_Thread *thread, void *data),
worker->cancel = EINA_FALSE;
worker->long_run = EINA_TRUE;
worker->u.long_run.notify = ecore_pipe_add(_ecore_notify_handler, NULL);
worker->u.long_run.notify = ecore_pipe_add(_ecore_notify_handler, worker);
if (!try_no_queue)
{
@ -577,7 +578,7 @@ ecore_thread_notify(Ecore_Thread *thread, void *data)
#ifdef EFL_HAVE_PTHREAD
if (worker->u.long_run.self != pthread_self()) return EINA_FALSE;
ecore_pipe_write(worker->u.long_run.notify, data, sizeof (void*));
ecore_pipe_write(worker->u.long_run.notify, &data, sizeof (void*));
return EINA_TRUE;
#else