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

Ecore con: Fix compilation on windows. 

Hopefully. I don't have a winodws box to test it on. Go Jenkins go.
This commit is contained in:
Tom Hacohen 2014-08-26 14:53:23 +01:00
parent 0f55fdc1bb
commit 00b3996ee1
1 changed files with 81 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
src/lib/ecore_con/ecore_con_local_win32.c
View File

@ -35,13 +35,12 @@ ecore_con_local_shutdown(void)
static Eina_Bool static Eina_Bool
_ecore_con_local_win32_server_read_client_handler(void *data, Ecore_Win32_Handler *wh) _ecore_con_local_win32_server_read_client_handler(void *data, Ecore_Win32_Handler *wh)
{ {
Ecore_Con_Client *cl; Ecore_Con_Client *obj = data;
Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS);
void *buf; void *buf;
DWORD n; DWORD n;
Eina_Bool broken_pipe = EINA_FALSE; Eina_Bool broken_pipe = EINA_FALSE;
cl = (Ecore_Con_Client *)data;
if (!ResetEvent(cl->host_server->event_read)) if (!ResetEvent(cl->host_server->event_read))
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
@ -88,13 +87,12 @@ _ecore_con_local_win32_server_read_client_handler(void *data, Ecore_Win32_Handle
static Eina_Bool static Eina_Bool
_ecore_con_local_win32_server_peek_client_handler(void *data, Ecore_Win32_Handler *wh) _ecore_con_local_win32_server_peek_client_handler(void *data, Ecore_Win32_Handler *wh)
{ {
Ecore_Con_Client *cl; Ecore_Con_Client *obj = data;
Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS);
#if 0 #if 0
char *msg; char *msg;
#endif #endif
cl = (Ecore_Con_Client *)data;
if (!ResetEvent(cl->host_server->event_peek)) if (!ResetEvent(cl->host_server->event_peek))
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
@ -117,13 +115,11 @@ _ecore_con_local_win32_server_peek_client_handler(void *data, Ecore_Win32_Handle
static Eina_Bool static Eina_Bool
_ecore_con_local_win32_client_peek_server_handler(void *data, Ecore_Win32_Handler *wh) _ecore_con_local_win32_client_peek_server_handler(void *data, Ecore_Win32_Handler *wh)
{ {
Ecore_Con_Server *svr; Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS);
#if 0 #if 0
char *msg; char *msg;
#endif #endif
svr = (Ecore_Con_Server *)data;
if (!ResetEvent(svr->event_peek)) if (!ResetEvent(svr->event_peek))
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
#if 0 #if 0
@ -134,7 +130,7 @@ _ecore_con_local_win32_client_peek_server_handler(void *data, Ecore_Win32_Handle
free(msg); free(msg);
} }
#endif #endif
_ecore_con_server_kill(svr); _ecore_con_server_kill(obj);
return ECORE_CALLBACK_CANCEL; return ECORE_CALLBACK_CANCEL;
ecore_main_win32_handler_del(wh); ecore_main_win32_handler_del(wh);
@ -145,13 +141,11 @@ _ecore_con_local_win32_client_peek_server_handler(void *data, Ecore_Win32_Handle
static Eina_Bool static Eina_Bool
_ecore_con_local_win32_client_read_server_handler(void *data, Ecore_Win32_Handler *wh) _ecore_con_local_win32_client_read_server_handler(void *data, Ecore_Win32_Handler *wh)
{ {
Ecore_Con_Server *svr; Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS);
void *buf; void *buf;
DWORD n; DWORD n;
Eina_Bool broken_pipe = EINA_FALSE; Eina_Bool broken_pipe = EINA_FALSE;
svr = (Ecore_Con_Server *)data;
if (!ResetEvent(svr->event_read)) if (!ResetEvent(svr->event_read))
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
@ -162,7 +156,7 @@ _ecore_con_local_win32_client_read_server_handler(void *data, Ecore_Win32_Handle
if (ReadFile(svr->pipe, buf, svr->nbr_bytes, &n, NULL)) if (ReadFile(svr->pipe, buf, svr->nbr_bytes, &n, NULL))
{ {
if (!svr->delete_me) if (!svr->delete_me)
ecore_con_event_server_data(svr, buf, svr->nbr_bytes, EINA_FALSE); ecore_con_event_server_data(obj, buf, svr->nbr_bytes, EINA_FALSE);
svr->want_write = 1; svr->want_write = 1;
} }
else else
@ -183,12 +177,12 @@ _ecore_con_local_win32_client_read_server_handler(void *data, Ecore_Win32_Handle
free(msg); free(msg);
} }
#endif #endif
_ecore_con_server_kill(svr); _ecore_con_server_kill(obj);
return ECORE_CALLBACK_CANCEL; return ECORE_CALLBACK_CANCEL;
} }
if (svr->want_write) if (svr->want_write)
ecore_con_local_win32_server_flush(svr); ecore_con_local_win32_server_flush(obj);
ecore_main_win32_handler_del(wh); ecore_main_win32_handler_del(wh);
@ -199,11 +193,9 @@ _ecore_con_local_win32_client_read_server_handler(void *data, Ecore_Win32_Handle
static unsigned int __stdcall static unsigned int __stdcall
_ecore_con_local_win32_client_read_server_thread(void *data) _ecore_con_local_win32_client_read_server_thread(void *data)
{ {
Ecore_Con_Server *svr; Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS);
DWORD nbr_bytes = 0; DWORD nbr_bytes = 0;
svr = (Ecore_Con_Server *)data;
svr->read_stopped = EINA_FALSE; svr->read_stopped = EINA_FALSE;
while (!svr->read_stop) while (!svr->read_stop)
@ -238,11 +230,10 @@ _ecore_con_local_win32_client_read_server_thread(void *data)
static unsigned int __stdcall static unsigned int __stdcall
_ecore_con_local_win32_server_read_client_thread(void *data) _ecore_con_local_win32_server_read_client_thread(void *data)
{ {
Ecore_Con_Client *cl; Ecore_Con_Client *obj = data;
Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS);
DWORD nbr_bytes = 0; DWORD nbr_bytes = 0;
cl = (Ecore_Con_Client *)data;
cl->host_server->read_stopped = EINA_FALSE; cl->host_server->read_stopped = EINA_FALSE;
while (!cl->host_server->read_stop) while (!cl->host_server->read_stop)
@ -277,12 +268,11 @@ static Eina_Bool
_ecore_con_local_win32_client_add(void *data, Ecore_Win32_Handler *wh) _ecore_con_local_win32_client_add(void *data, Ecore_Win32_Handler *wh)
{ {
Ecore_Con_Client *cl = NULL; Ecore_Con_Client *cl = NULL;
Ecore_Con_Server *svr; Ecore_Con_Server *obj = data;
Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS);
Ecore_Win32_Handler *handler_read; Ecore_Win32_Handler *handler_read;
Ecore_Win32_Handler *handler_peek; Ecore_Win32_Handler *handler_peek;
svr = (Ecore_Con_Server *)data;
if (!svr->pipe) if (!svr->pipe)
return ECORE_CALLBACK_CANCEL; return ECORE_CALLBACK_CANCEL;
@ -293,75 +283,75 @@ _ecore_con_local_win32_client_add(void *data, Ecore_Win32_Handler *wh)
(svr->client_count >= (unsigned int)svr->client_limit)) (svr->client_count >= (unsigned int)svr->client_limit))
return ECORE_CALLBACK_CANCEL; return ECORE_CALLBACK_CANCEL;
cl = calloc(1, sizeof(Ecore_Con_Client)); cl_obj = eo_add(ECORE_CON_CLIENT_CLASS, NULL);
Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS);
if (!cl) if (!cl)
{ {
ERR("allocation failed"); ERR("allocation failed");
return ECORE_CALLBACK_CANCEL; return ECORE_CALLBACK_CANCEL;
} }
cl->host_server = svr; cl->host_server = obj;
ECORE_MAGIC_SET(cl, ECORE_MAGIC_CON_CLIENT);
cl->host_server->event_read = CreateEvent(NULL, TRUE, FALSE, NULL); svr->event_read = CreateEvent(NULL, TRUE, FALSE, NULL);
if (!cl->host_server->event_read) if (!svr->event_read)
{ {
ERR("Can not create event read"); ERR("Can not create event read");
goto free_cl; goto free_cl;
} }
handler_read = ecore_main_win32_handler_add(cl->host_server->event_read, handler_read = ecore_main_win32_handler_add(svr->event_read,
_ecore_con_local_win32_server_read_client_handler, _ecore_con_local_win32_server_read_client_handler,
cl); obj);
if (!handler_read) if (!handler_read)
{ {
ERR("Can not create handler read"); ERR("Can not create handler read");
goto close_event_read; goto close_event_read;
} }
cl->host_server->event_peek = CreateEvent(NULL, TRUE, FALSE, NULL); svr->event_peek = CreateEvent(NULL, TRUE, FALSE, NULL);
if (!cl->host_server->event_peek) if (!svr->event_peek)
{ {
ERR("Can not create event peek"); ERR("Can not create event peek");
goto del_handler_read; goto del_handler_read;
} }
handler_peek = ecore_main_win32_handler_add(cl->host_server->event_peek, handler_peek = ecore_main_win32_handler_add(svr->event_peek,
_ecore_con_local_win32_server_peek_client_handler, _ecore_con_local_win32_server_peek_client_handler,
cl); obj);
if (!handler_peek) if (!handler_peek)
{ {
ERR("Can not create handler peek"); ERR("Can not create handler peek");
goto close_event_peek; goto close_event_peek;
} }
cl->host_server->read_stopped = EINA_TRUE; svr->read_stopped = EINA_TRUE;
cl->host_server->thread_read = (HANDLE)_beginthreadex(NULL, 0, _ecore_con_local_win32_server_read_client_thread, cl, CREATE_SUSPENDED, NULL); svr->thread_read = (HANDLE)_beginthreadex(NULL, 0, _ecore_con_local_win32_server_read_client_thread, cl, CREATE_SUSPENDED, NULL);
if (!cl->host_server->thread_read) if (!svr->thread_read)
{ {
ERR("Can not launch thread"); ERR("Can not launch thread");
goto del_handler_peek; goto del_handler_peek;
} }
svr->clients = eina_list_append(svr->clients, cl); svr->clients = eina_list_append(svr->clients, obj);
svr->client_count++; svr->client_count++;
if (!cl->delete_me) if (!cl->delete_me)
ecore_con_event_client_add(cl); ecore_con_event_client_add(obj);
ecore_main_win32_handler_del(wh); ecore_main_win32_handler_del(wh);
ResumeThread(cl->host_server->thread_read); ResumeThread(svr->thread_read);
return ECORE_CALLBACK_DONE; return ECORE_CALLBACK_DONE;
del_handler_peek: del_handler_peek:
ecore_main_win32_handler_del(handler_peek); ecore_main_win32_handler_del(handler_peek);
close_event_peek: close_event_peek:
CloseHandle(cl->host_server->event_peek); CloseHandle(svr->event_peek);
del_handler_read: del_handler_read:
ecore_main_win32_handler_del(handler_read); ecore_main_win32_handler_del(handler_read);
close_event_read: close_event_read:
CloseHandle(cl->host_server->event_read); r CloseHandle(svr->event_read);
free_cl: free_cl:
free(cl); free(cl);
@ -371,11 +361,10 @@ free_cl:
static unsigned int __stdcall static unsigned int __stdcall
_ecore_con_local_win32_listening(void *data) _ecore_con_local_win32_listening(void *data)
{ {
Ecore_Con_Server *svr; Ecore_Con_Server *obj = data;
Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS);
BOOL res; BOOL res;
svr = (Ecore_Con_Server *)data;
while (1) while (1)
{ {
res = ConnectNamedPipe(svr->pipe, NULL); res = ConnectNamedPipe(svr->pipe, NULL);
@ -396,8 +385,9 @@ _ecore_con_local_win32_listening(void *data)
} }
Eina_Bool Eina_Bool
ecore_con_local_listen(Ecore_Con_Server *svr) ecore_con_local_listen(Ecore_Con_Server *obj)
{ {
Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS);
char buf[256]; char buf[256];
HANDLE thread_listening; HANDLE thread_listening;
Ecore_Win32_Handler *handler; Ecore_Win32_Handler *handler;
@ -449,7 +439,7 @@ ecore_con_local_listen(Ecore_Con_Server *svr)
* As the function is blocking, to let the main loop continuing * As the function is blocking, to let the main loop continuing
* its iterations, we call ConnectNamedPipe() in a thread * its iterations, we call ConnectNamedPipe() in a thread
*/ */
thread_listening = (HANDLE)_beginthreadex(NULL, 0, _ecore_con_local_win32_listening, svr, CREATE_SUSPENDED, NULL); thread_listening = (HANDLE)_beginthreadex(NULL, 0, _ecore_con_local_win32_listening, obj, CREATE_SUSPENDED, NULL);
if (!thread_listening) if (!thread_listening)
{ {
ERR("Creation of the listening thread failed"); ERR("Creation of the listening thread failed");
@ -458,7 +448,7 @@ ecore_con_local_listen(Ecore_Con_Server *svr)
handler = ecore_main_win32_handler_add(thread_listening, handler = ecore_main_win32_handler_add(thread_listening,
_ecore_con_local_win32_client_add, _ecore_con_local_win32_client_add,
svr); obj);
if (!handler) if (!handler)
{ {
ERR("Creation of the client add handler failed"); ERR("Creation of the client add handler failed");
@ -482,8 +472,9 @@ free_path:
} }
void void
ecore_con_local_win32_server_del(Ecore_Con_Server *svr) ecore_con_local_win32_server_del(Ecore_Con_Server *obj)
{ {
Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS);
if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_ABSTRACT) if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_ABSTRACT)
return; return;
@ -509,38 +500,42 @@ ecore_con_local_win32_server_del(Ecore_Con_Server *svr)
} }
void void
ecore_con_local_win32_client_del(Ecore_Con_Client *cl) ecore_con_local_win32_client_del(Ecore_Con_Client *obj)
{ {
if ((cl->host_server->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_ABSTRACT) Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS);
Ecore_Con_Server_Data *host_svr = eo_data_scope_get(cl->host_server, ECORE_CON_CLIENT_CLASS);
if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_LOCAL_ABSTRACT)
return; return;
if (((cl->host_server->type & ECORE_CON_TYPE) != ECORE_CON_LOCAL_USER) && if (((svr->type & ECORE_CON_TYPE) != ECORE_CON_LOCAL_USER) &&
((cl->host_server->type & ECORE_CON_TYPE) != ECORE_CON_LOCAL_SYSTEM)) ((svr->type & ECORE_CON_TYPE) != ECORE_CON_LOCAL_SYSTEM))
return; return;
cl->host_server->read_stop = 1; svr->read_stop = 1;
while (!cl->host_server->read_stopped) while (!svr->read_stopped)
Sleep(100); Sleep(100);
if (cl->host_server->event_peek) if (svr->event_peek)
CloseHandle(cl->host_server->event_peek); CloseHandle(svr->event_peek);
cl->host_server->event_peek = NULL; svr->event_peek = NULL;
if (cl->host_server->event_read) if (svr->event_read)
CloseHandle(cl->host_server->event_read); CloseHandle(svr->event_read);
cl->host_server->event_read = NULL; svr->event_read = NULL;
free(cl->host_server->path); free(svr->path);
cl->host_server->path = NULL; svr->path = NULL;
if (cl->host_server->pipe) if (svr->pipe)
CloseHandle(cl->host_server->pipe); CloseHandle(svr->pipe);
cl->host_server->pipe = NULL; svr->pipe = NULL;
} }
Eina_Bool Eina_Bool
ecore_con_local_connect(Ecore_Con_Server *svr, ecore_con_local_connect(Ecore_Con_Server *obj,
Eina_Bool (*cb_done)(void *data, Eina_Bool (*cb_done)(void *data,
Ecore_Fd_Handler *fd_handler)) Ecore_Fd_Handler *fd_handler))
{ {
#warning "I am pretty sure cb_done should be used." #warning "I am pretty sure cb_done should be used."
Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS);
char buf[256]; char buf[256];
Ecore_Win32_Handler *handler_read; Ecore_Win32_Handler *handler_read;
Ecore_Win32_Handler *handler_peek; Ecore_Win32_Handler *handler_peek;
@ -604,7 +599,7 @@ ecore_con_local_connect(Ecore_Con_Server *svr,
handler_read = ecore_main_win32_handler_add(svr->event_read, handler_read = ecore_main_win32_handler_add(svr->event_read,
_ecore_con_local_win32_client_read_server_handler, _ecore_con_local_win32_client_read_server_handler,
svr); obj);
if (!handler_read) if (!handler_read)
{ {
ERR("Can not create handler read"); ERR("Can not create handler read");
@ -620,21 +615,21 @@ ecore_con_local_connect(Ecore_Con_Server *svr,
handler_peek = ecore_main_win32_handler_add(svr->event_peek, handler_peek = ecore_main_win32_handler_add(svr->event_peek,
_ecore_con_local_win32_client_peek_server_handler, _ecore_con_local_win32_client_peek_server_handler,
svr); obj);
if (!handler_peek) if (!handler_peek)
{ {
ERR("Can not create handler peek"); ERR("Can not create handler peek");
goto close_event_peek; goto close_event_peek;
} }
svr->thread_read = (HANDLE)_beginthreadex(NULL, 0, _ecore_con_local_win32_client_read_server_thread, svr, CREATE_SUSPENDED, NULL); svr->thread_read = (HANDLE)_beginthreadex(NULL, 0, _ecore_con_local_win32_client_read_server_thread, obj, CREATE_SUSPENDED, NULL);
if (!svr->thread_read) if (!svr->thread_read)
{ {
ERR("Can not launch thread"); ERR("Can not launch thread");
goto del_handler_peek; goto del_handler_peek;
} }
if (!svr->delete_me) ecore_con_event_server_add(svr); if (!svr->delete_me) ecore_con_event_server_add(obj);
ResumeThread(svr->thread_read); ResumeThread(svr->thread_read);
@ -658,8 +653,9 @@ close_pipe:
} }
Eina_Bool Eina_Bool
ecore_con_local_win32_server_flush(Ecore_Con_Server *svr) ecore_con_local_win32_server_flush(Ecore_Con_Server *obj)
{ {
Ecore_Con_Server_Data *svr = eo_data_scope_get(obj, ECORE_CON_SERVER_CLASS);
size_t num; size_t num;
BOOL res; BOOL res;
DWORD written; DWORD written;
@ -683,10 +679,10 @@ ecore_con_local_win32_server_flush(Ecore_Con_Server *svr)
msg = evil_last_error_get(); msg = evil_last_error_get();
if (msg) if (msg)
{ {
ecore_con_event_server_error(svr, msg); ecore_con_event_server_error(obj, msg);
free(msg); free(msg);
} }
_ecore_con_server_kill(svr); _ecore_con_server_kill(obj);
} }
svr->write_buf_offset += written; svr->write_buf_offset += written;
@ -704,14 +700,16 @@ ecore_con_local_win32_server_flush(Ecore_Con_Server *svr)
} }
Eina_Bool Eina_Bool
ecore_con_local_win32_client_flush(Ecore_Con_Client *cl) ecore_con_local_win32_client_flush(Ecore_Con_Client *obj)
{ {
Ecore_Con_Client_Data *cl = eo_data_scope_get(obj, ECORE_CON_CLIENT_CLASS);
Ecore_Con_Type type; Ecore_Con_Type type;
size_t num; size_t num;
BOOL res; BOOL res;
DWORD written; DWORD written;
Ecore_Con_Server_Data *host_svr = eo_data_scope_get(cl->host_server, ECORE_CON_CLIENT_CLASS);
type = cl->host_server->type & ECORE_CON_TYPE; type = svr->type & ECORE_CON_TYPE;
/* This check should never be true */ /* This check should never be true */
if (type == ECORE_CON_LOCAL_ABSTRACT) if (type == ECORE_CON_LOCAL_ABSTRACT)
@ -724,7 +722,7 @@ ecore_con_local_win32_client_flush(Ecore_Con_Client *cl)
num = eina_binbuf_length_get(cl->buf) - cl->buf_offset; num = eina_binbuf_length_get(cl->buf) - cl->buf_offset;
if (num <= 0) return EINA_TRUE; if (num <= 0) return EINA_TRUE;
res = WriteFile(cl->host_server->pipe, eina_binbuf_string_get(cl->buf) + cl->buf_offset, num, &written, NULL); res = WriteFile(svr->pipe, eina_binbuf_string_get(cl->buf) + cl->buf_offset, num, &written, NULL);
if (!res) if (!res)
{ {
char *msg; char *msg;
@ -732,10 +730,10 @@ ecore_con_local_win32_client_flush(Ecore_Con_Client *cl)
msg = evil_last_error_get(); msg = evil_last_error_get();
if (msg) if (msg)
{ {
ecore_con_event_client_error(cl, msg); ecore_con_event_client_error(obj, msg);
free(msg); free(msg);
} }
_ecore_con_client_kill(cl); _ecore_con_client_kill(obj);
} }
cl->buf_offset += written; cl->buf_offset += written;
@ -744,10 +742,10 @@ ecore_con_local_win32_client_flush(Ecore_Con_Client *cl)
cl->buf_offset = 0; cl->buf_offset = 0;
eina_binbuf_free(cl->buf); eina_binbuf_free(cl->buf);
cl->buf = NULL; cl->buf = NULL;
cl->host_server->want_write = 0; svr->want_write = 0;
} }
else if (written < (DWORD)num) else if (written < (DWORD)num)
cl->host_server->want_write = 1; svr->want_write = 1;
return EINA_TRUE; return EINA_TRUE;
} }