enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 11 Pull Requests 2 Projects Releases Wiki Activity

* redirection of stdout and stderr (with libc or win32 apps) is working 

* there is though a problem in the win32 select function: the _del
   callback is always sent before _data or _error callback


SVN revision: 48897
This commit is contained in:
Vincent Torri 2010-05-15 18:38:01 +00:00
parent af2471c7bc
commit 3185c6d8a0
1 changed files with 207 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

426
legacy/ecore/src/lib/ecore/ecore_exe_win32.c
View File

@ -14,11 +14,6 @@
# include <config.h> # include <config.h>
#endif #endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#include <process.h>
#ifdef HAVE_EVIL #ifdef HAVE_EVIL
# include <Evil.h> # include <Evil.h>
#endif #endif
@ -26,6 +21,11 @@
#include "Ecore.h" #include "Ecore.h"
#include "ecore_private.h" #include "ecore_private.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#include <process.h>
#define ECORE_EXE_WIN32_TIMEOUT 3000 #define ECORE_EXE_WIN32_TIMEOUT 3000
typedef enum typedef enum
@ -43,7 +43,7 @@ struct _Ecore_Exe
HANDLE process2; HANDLE process2;
HANDLE process; /* CloseHandle */ HANDLE process; /* CloseHandle */
HANDLE thread; HANDLE process_thread;
DWORD process_id; DWORD process_id;
DWORD thread_id; DWORD thread_id;
void *data; void *data;
@ -56,11 +56,10 @@ struct _Ecore_Exe
{ {
HANDLE child_pipe; HANDLE child_pipe;
HANDLE child_pipe_x; HANDLE child_pipe_x;
Ecore_Pipe *p;
HANDLE thread; HANDLE thread;
Ecore_Win32_Handler *h;
void *data_buf; void *data_buf;
int data_size; int data_size;
int pending;
} pipe_read; } pipe_read;
struct struct
{ {
@ -68,16 +67,17 @@ struct _Ecore_Exe
HANDLE child_pipe_x; HANDLE child_pipe_x;
HANDLE thread; HANDLE thread;
Ecore_Win32_Handler *h; Ecore_Win32_Handler *h;
void *data_buf;
int data_size;
} pipe_write; } pipe_write;
struct struct
{ {
HANDLE child_pipe; HANDLE child_pipe;
HANDLE child_pipe_x; HANDLE child_pipe_x;
Ecore_Pipe *p;
HANDLE thread; HANDLE thread;
Ecore_Win32_Handler *h;
void *data_buf; void *data_buf;
int data_size; int data_size;
int pending;
} pipe_error; } pipe_error;
Eina_Bool close_stdin : 1; Eina_Bool close_stdin : 1;
Eina_Bool is_suspended : 1; Eina_Bool is_suspended : 1;
@ -95,10 +95,13 @@ static void _ecore_exe_event_add_free(void *data, void *ev);
static void _ecore_exe_event_del_free(void *data, void *ev); static void _ecore_exe_event_del_free(void *data, void *ev);
static void _ecore_exe_event_exe_data_free(void *data, static void _ecore_exe_event_exe_data_free(void *data,
void *ev); void *ev);
static int _ecore_exe_win32_pipe_thread_generic_cb(void *data, Ecore_Exe_Flags flags);
static DWORD WINAPI _ecore_exe_win32_pipe_thread_read_cb(void *data);
static DWORD WINAPI _ecore_exe_win32_pipe_thread_error_cb(void *data);
static int _ecore_exe_close_cb(void *data, Ecore_Win32_Handler *wh); static int _ecore_exe_close_cb(void *data, Ecore_Win32_Handler *wh);
static int _ecore_exe_pipe_read_cb(void *data, Ecore_Win32_Handler *wh); static void _ecore_exe_pipe_read_cb(void *data, void *buf, unsigned int size);
static int _ecore_exe_pipe_write_cb(void *data, Ecore_Win32_Handler *wh); static int _ecore_exe_pipe_write_cb(void *data, Ecore_Win32_Handler *wh);
static int _ecore_exe_pipe_error_cb(void *data, Ecore_Win32_Handler *wh); static void _ecore_exe_pipe_error_cb(void *data, void *buf, unsigned int size);
EAPI int ECORE_EXE_EVENT_ADD = 0; EAPI int ECORE_EXE_EVENT_ADD = 0;
EAPI int ECORE_EXE_EVENT_DEL = 0; EAPI int ECORE_EXE_EVENT_DEL = 0;
@ -241,12 +244,12 @@ ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data)
/* be sure that the child process is running */ /* be sure that the child process is running */
/* FIXME: This does not work if the child is an EFL-based app */ /* FIXME: This does not work if the child is an EFL-based app */
/* if (WaitForInputIdle(pi.hProcess, INFINITE) != 0) */ /* if (WaitForInputIdle(pi.hProcess, INFINITE) == WAIT_FAILED) */
/* goto free_exe_cmd; */ /* goto free_exe_cmd; */
ECORE_MAGIC_SET(exe, ECORE_MAGIC_EXE); ECORE_MAGIC_SET(exe, ECORE_MAGIC_EXE);
exe->process = pi.hProcess; exe->process = pi.hProcess;
exe->thread = pi.hThread; exe->process_thread = pi.hThread;
exe->process_id = pi.dwProcessId; exe->process_id = pi.dwProcessId;
exe->thread_id = pi.dwThreadId; exe->thread_id = pi.dwThreadId;
exe->data = (void *)data; exe->data = (void *)data;
@ -255,12 +258,12 @@ ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data)
EINA_FALSE, pi.dwProcessId))) EINA_FALSE, pi.dwProcessId)))
goto close_thread; goto close_thread;
if (ResumeThread(exe->thread) == ((DWORD)-1))
goto close_process2;
exe->h_close = ecore_main_win32_handler_add(exe->process2, _ecore_exe_close_cb, exe); exe->h_close = ecore_main_win32_handler_add(exe->process2, _ecore_exe_close_cb, exe);
if (!exe->h_close) goto close_process2; if (!exe->h_close) goto close_process2;
if (ResumeThread(exe->process_thread) == ((DWORD)-1))
goto close_process2;
exes = (Ecore_Exe *)eina_inlist_append(EINA_INLIST_GET(exes), EINA_INLIST_GET(exe)); exes = (Ecore_Exe *)eina_inlist_append(EINA_INLIST_GET(exes), EINA_INLIST_GET(exe));
e = (Ecore_Exe_Event_Add *)calloc(1, sizeof(Ecore_Exe_Event_Add)); e = (Ecore_Exe_Event_Add *)calloc(1, sizeof(Ecore_Exe_Event_Add));
@ -277,7 +280,7 @@ ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data)
close_process2: close_process2:
CloseHandle(exe->process2); CloseHandle(exe->process2);
close_thread: close_thread:
CloseHandle(exe->thread); CloseHandle(exe->process_thread);
CloseHandle(exe->process); CloseHandle(exe->process);
free_exe_cmd: free_exe_cmd:
free(exe->cmd); free(exe->cmd);
@ -293,9 +296,9 @@ ecore_exe_callback_pre_free_set(Ecore_Exe *exe, void (*func)(void *data, const E
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE,
"ecore_exe_callback_pre_free_set"); "ecore_exe_callback_pre_free_set");
return; return;
} }
exe->pre_free_cb = func; exe->pre_free_cb = func;
} }
@ -303,6 +306,39 @@ ecore_exe_callback_pre_free_set(Ecore_Exe *exe, void (*func)(void *data, const E
EAPI Eina_Bool EAPI Eina_Bool
ecore_exe_send(Ecore_Exe *exe, const void *data, int size) ecore_exe_send(Ecore_Exe *exe, const void *data, int size)
{ {
void *buf;
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_send");
return 0;
}
if (exe->close_stdin)
{
ERR("Ecore_Exe %p stdin is closed! Cannot send %d bytes from %p",
exe, size, data);
return 0;
}
if (!exe->pipe_write.child_pipe)
{
ERR("Ecore_Exe %p created without ECORE_EXE_PIPE_WRITE! "
"Cannot send %d bytes from %p", exe, size, data);
return 0;
}
buf = realloc(exe->pipe_write.data_buf, exe->pipe_write.data_size + size);
if (buf == NULL) return 0;
exe->pipe_write.data_buf = buf;
memcpy((char *)exe->pipe_write.data_buf + exe->pipe_write.data_size, data, size);
exe->pipe_write.data_size += size;
/* if (exe->pipe_write.) */
/* ecore_main_fd_handler_active_set(exe->pipe_write.h, ECORE_FD_WRITE); */
return 1;
} }
EAPI void EAPI void
@ -310,8 +346,8 @@ ecore_exe_close_stdin(Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_close_stdin"); ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_close_stdin");
return; return;
} }
exe->close_stdin = 1; exe->close_stdin = 1;
} }
@ -331,33 +367,33 @@ ecore_exe_event_data_get(Ecore_Exe *exe, Ecore_Exe_Flags flags)
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_event_data_get"); ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_event_data_get");
return NULL; return NULL;
} }
/* Sort out what sort of event we are, */ /* Sort out what sort of event we are, */
/* And get the data. */ /* And get the data. */
if (flags & ECORE_EXE_PIPE_READ) if (flags & ECORE_EXE_PIPE_READ)
{ {
inbuf = exe->pipe_read.data_buf; inbuf = exe->pipe_read.data_buf;
inbuf_num = exe->pipe_read.data_size; inbuf_num = exe->pipe_read.data_size;
exe->pipe_read.data_buf = NULL; exe->pipe_read.data_buf = NULL;
exe->pipe_read.data_size = 0; exe->pipe_read.data_size = 0;
} }
else else
{ {
inbuf = exe->pipe_error.data_buf; inbuf = exe->pipe_error.data_buf;
inbuf_num = exe->pipe_error.data_size; inbuf_num = exe->pipe_error.data_size;
exe->pipe_error.data_buf = NULL; exe->pipe_error.data_buf = NULL;
exe->pipe_error.data_size = 0; exe->pipe_error.data_size = 0;
} }
e = calloc(1, sizeof(Ecore_Exe_Event_Data)); e = calloc(1, sizeof(Ecore_Exe_Event_Data));
if (e) if (e)
{ {
e->exe = exe; e->exe = exe;
e->data = inbuf; e->data = inbuf;
e->size = inbuf_num; e->size = inbuf_num;
} }
return e; return e;
@ -379,8 +415,8 @@ ecore_exe_free(Ecore_Exe *exe)
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_free"); ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_free");
return NULL; return NULL;
} }
data = exe->data; data = exe->data;
@ -388,9 +424,8 @@ ecore_exe_free(Ecore_Exe *exe)
if (exe->pre_free_cb) if (exe->pre_free_cb)
exe->pre_free_cb(data, exe); exe->pre_free_cb(data, exe);
ecore_main_win32_handler_del(exe->h_close);
CloseHandle(exe->process2); CloseHandle(exe->process2);
CloseHandle(exe->thread); CloseHandle(exe->process_thread);
CloseHandle(exe->process); CloseHandle(exe->process);
free(exe->cmd); free(exe->cmd);
_ecore_exe_win32_pipes_close(exe); _ecore_exe_win32_pipes_close(exe);
@ -407,8 +442,8 @@ ecore_exe_pid_get(const Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_pid_get"); ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_pid_get");
return -1; return -1;
} }
return exe->process_id; return exe->process_id;
} }
@ -418,8 +453,8 @@ ecore_exe_tag_set(Ecore_Exe *exe, const char *tag)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_tag_set"); ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_tag_set");
return; return;
} }
IF_FREE(exe->tag); IF_FREE(exe->tag);
if (tag) if (tag)
@ -431,8 +466,8 @@ ecore_exe_tag_get(const Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_tag_get"); ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_tag_get");
return NULL; return NULL;
} }
return exe->tag; return exe->tag;
} }
@ -442,8 +477,8 @@ ecore_exe_cmd_get(const Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_cmd_get"); ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_cmd_get");
return NULL; return NULL;
} }
return exe->cmd; return exe->cmd;
} }
@ -453,8 +488,8 @@ ecore_exe_data_get(const Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_data_get"); ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_data_get");
return NULL; return NULL;
} }
return exe->data; return exe->data;
} }
@ -464,8 +499,8 @@ ecore_exe_flags_get(const Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_data_get"); ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_data_get");
return 0; return 0;
} }
return exe->flags; return exe->flags;
} }
@ -475,14 +510,14 @@ ecore_exe_pause(Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_pause"); ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_pause");
return; return;
} }
if (exe->is_suspended) if (exe->is_suspended)
return; return;
if (SuspendThread(exe->thread) != (DWORD)-1) if (SuspendThread(exe->process_thread) != (DWORD)-1)
exe->is_suspended = 1; exe->is_suspended = 1;
} }
@ -491,14 +526,14 @@ ecore_exe_continue(Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_continue"); ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_continue");
return; return;
} }
if (!exe->is_suspended) if (!exe->is_suspended)
return; return;
if (ResumeThread(exe->thread) != (DWORD)-1) if (ResumeThread(exe->process_thread) != (DWORD)-1)
exe->is_suspended = 0; exe->is_suspended = 0;
} }
@ -507,11 +542,11 @@ ecore_exe_interrupt(Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_interrupt"); ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_interrupt");
return; return;
} }
CloseHandle(exe->thread); CloseHandle(exe->process_thread);
CloseHandle(exe->process); CloseHandle(exe->process);
exe->sig = ECORE_EXE_WIN32_SIGINT; exe->sig = ECORE_EXE_WIN32_SIGINT;
while (EnumWindows(_ecore_exe_enum_windows_procedure, (LPARAM)exe)); while (EnumWindows(_ecore_exe_enum_windows_procedure, (LPARAM)exe));
@ -522,11 +557,11 @@ ecore_exe_quit(Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_quit"); ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_quit");
return; return;
} }
CloseHandle(exe->thread); CloseHandle(exe->process_thread);
CloseHandle(exe->process); CloseHandle(exe->process);
exe->sig = ECORE_EXE_WIN32_SIGQUIT; exe->sig = ECORE_EXE_WIN32_SIGQUIT;
while (EnumWindows(_ecore_exe_enum_windows_procedure, (LPARAM)exe)); while (EnumWindows(_ecore_exe_enum_windows_procedure, (LPARAM)exe));
@ -537,8 +572,8 @@ ecore_exe_terminate(Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_terminate"); ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_terminate");
return; return;
} }
/* CloseHandle(exe->thread); */ /* CloseHandle(exe->thread); */
@ -552,11 +587,11 @@ ecore_exe_kill(Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_kill"); ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_kill");
return; return;
} }
CloseHandle(exe->thread); CloseHandle(exe->process_thread);
CloseHandle(exe->process); CloseHandle(exe->process);
exe->sig = ECORE_EXE_WIN32_SIGKILL; exe->sig = ECORE_EXE_WIN32_SIGKILL;
while (EnumWindows(_ecore_exe_enum_windows_procedure, (LPARAM)exe)); while (EnumWindows(_ecore_exe_enum_windows_procedure, (LPARAM)exe));
@ -567,8 +602,8 @@ ecore_exe_signal(Ecore_Exe *exe, int num __UNUSED__)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_signal"); ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_signal");
return; return;
} }
/* does nothing */ /* does nothing */
@ -579,105 +614,103 @@ ecore_exe_hup(Ecore_Exe *exe)
{ {
if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
{ {
ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_hup"); ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_hup");
return; return;
} }
/* does nothing */ /* does nothing */
} }
/* FIXME: manage error mode */ /* FIXME: manage error mode */
DWORD WINAPI _ecore_exe_win32_pipe_thread_cb(void *data) static int
_ecore_exe_win32_pipe_thread_generic_cb(void *data, Ecore_Exe_Flags flags)
{ {
#define BUFSIZE 256 #define BUFSIZE 2
char buf[BUFSIZE]; char buf[BUFSIZE];
Ecore_Exe *exe; Ecore_Exe *exe;
char *current_buf = NULL; char *current_buf = NULL;
HANDLE child_pipe; HANDLE child_pipe;
DWORD size; Ecore_Pipe *ecore_pipe;
DWORD current_size = 0; Ecore_Exe_Event_Data *event;
DWORD size;
DWORD current_size = 0;
BOOL res;
exe = (Ecore_Exe *)data; exe = (Ecore_Exe *)data;
/* Sort out what sort of handler we are. */ /* Sort out what sort of handler we are. */
/* And get any left over data from last time. */ /* And get any left over data from last time. */
if (exe->flags & ECORE_EXE_PIPE_READ) if ((exe->flags & ECORE_EXE_PIPE_READ) && (flags == ECORE_EXE_PIPE_READ))
{ {
child_pipe = exe->pipe_read.child_pipe; child_pipe = exe->pipe_read.child_pipe;
ecore_pipe = exe->pipe_read.p;
flags = ECORE_EXE_PIPE_READ;
}
else if ((exe->flags & ECORE_EXE_PIPE_ERROR) && (flags == ECORE_EXE_PIPE_ERROR))
{
child_pipe = exe->pipe_error.child_pipe;
ecore_pipe = exe->pipe_error.p;
flags = ECORE_EXE_PIPE_ERROR;
} }
else else
{ return 0;
child_pipe = exe->pipe_error.child_pipe;
}
while (1) while (1)
{ {
BOOL res; if (!PeekNamedPipe(child_pipe, buf, 1, &size, &current_size, NULL))
continue;
res = ReadFile(child_pipe, buf, sizeof(buf), &size, NULL); if (size == 0)
if (res) continue;
current_buf = (char *)malloc(current_size);
if (!current_buf)
continue;
res = ReadFile(child_pipe, current_buf, current_size, &size, NULL);
if (!res || (size == 0))
{ {
exe->pipe_read.pending = -123; free(current_buf);
if (!buf) current_buf = NULL;
{ continue;
current_size += size; }
current_buf = (char *)malloc(current_size); if (current_size != size)
memcpy(current_buf, buf, current_size); {
} free(current_buf);
else current_buf = NULL;
{ continue;
current_buf = realloc(current_buf, current_size + size); }
memcpy(current_buf + current_size, buf, size); current_size = size;
current_size += size;
} if (flags == ECORE_EXE_PIPE_READ)
break; {
exe->pipe_read.data_buf = current_buf;
exe->pipe_read.data_size = current_size;
} }
else else
{ {
DWORD res; exe->pipe_error.data_buf = current_buf;
res = GetLastError();
if (res == ERROR_IO_PENDING)
{
exe->pipe_read.pending = res;
break;
}
if (res == ERROR_BROKEN_PIPE)
{
exe->pipe_read.pending = res;
break;
}
if (res == ERROR_MORE_DATA)
{
exe->pipe_error.pending = -456;
continue;
}
}
}
if (exe->flags & ECORE_EXE_PIPE_READ)
{
if (exe->pipe_read.data_buf) free(exe->pipe_read.data_buf);
exe->pipe_read.data_size = 0;
exe->pipe_read.data_buf = malloc(current_size);
if (exe->pipe_read.data_buf)
{
memcpy(exe->pipe_read.data_buf, current_buf, current_size);
exe->pipe_read.data_size = current_size;
}
}
else
{
if (exe->pipe_error.data_buf) free(exe->pipe_error.data_buf);
exe->pipe_error.data_size = 0;
exe->pipe_error.data_buf = malloc(current_size);
if (exe->pipe_error.data_buf)
{
memcpy(exe->pipe_error.data_buf, current_buf, current_size);
exe->pipe_error.data_size = current_size; exe->pipe_error.data_size = current_size;
} }
event = ecore_exe_event_data_get(exe, flags);
if (event)
ecore_pipe_write(ecore_pipe, &event, sizeof(event));
current_buf = NULL;
current_size = 0;
} }
return 0; return 1;
}
static DWORD WINAPI
_ecore_exe_win32_pipe_thread_read_cb(void *data)
{
return _ecore_exe_win32_pipe_thread_generic_cb(data, ECORE_EXE_PIPE_READ);
}
static DWORD WINAPI
_ecore_exe_win32_pipe_thread_error_cb(void *data)
{
return _ecore_exe_win32_pipe_thread_generic_cb(data, ECORE_EXE_PIPE_ERROR);
} }
static int static int
@ -708,10 +741,10 @@ _ecore_exe_win32_pipes_set(Ecore_Exe *exe)
{ {
exe->pipe_read.child_pipe = child_pipe; exe->pipe_read.child_pipe = child_pipe;
exe->pipe_read.child_pipe_x = child_pipe_x; exe->pipe_read.child_pipe_x = child_pipe_x;
exe->pipe_read.p = ecore_pipe_add(_ecore_exe_pipe_read_cb, exe);
exe->pipe_read.thread = CreateThread(NULL, 0, exe->pipe_read.thread = CreateThread(NULL, 0,
_ecore_exe_win32_pipe_thread_cb, _ecore_exe_win32_pipe_thread_read_cb,
exe, 0, NULL); exe, 0, NULL);
exe->pipe_read.h = ecore_main_win32_handler_add(exe->pipe_read.thread, _ecore_exe_pipe_read_cb, exe);
} }
else if (exe->flags & ECORE_EXE_PIPE_WRITE) else if (exe->flags & ECORE_EXE_PIPE_WRITE)
{ {
@ -725,10 +758,10 @@ _ecore_exe_win32_pipes_set(Ecore_Exe *exe)
{ {
exe->pipe_error.child_pipe = child_pipe; exe->pipe_error.child_pipe = child_pipe;
exe->pipe_error.child_pipe_x = child_pipe_x; exe->pipe_error.child_pipe_x = child_pipe_x;
exe->pipe_error.p = ecore_pipe_add(_ecore_exe_pipe_error_cb, exe);
exe->pipe_error.thread = CreateThread(NULL, 0, exe->pipe_error.thread = CreateThread(NULL, 0,
_ecore_exe_win32_pipe_thread_cb, _ecore_exe_win32_pipe_thread_error_cb,
exe, 0, NULL); exe, 0, NULL);
exe->pipe_error.h = ecore_main_win32_handler_add(exe->pipe_error.thread, _ecore_exe_pipe_error_cb, exe);
} }
return 1; return 1;
@ -917,76 +950,22 @@ _ecore_exe_close_cb(void *data, Ecore_Win32_Handler *wh __UNUSED__)
e->pid = exe->process_id; e->pid = exe->process_id;
e->exe = exe; e->exe = exe;
_ecore_event_add(ECORE_EXE_EVENT_DEL, e, ecore_event_add(ECORE_EXE_EVENT_DEL, e,
_ecore_exe_event_del_free, NULL); _ecore_exe_event_del_free, NULL);
return 1;
}
static int
_ecore_exe_generic_cb(void *data, Ecore_Win32_Handler *wh)
{
Ecore_Exe *exe;
Ecore_Exe_Event_Data *e;
Ecore_Win32_Handler *h;
HANDLE thread;
int event_type;
Ecore_Exe_Flags flags;
if (!wh)
return 1;
exe = (Ecore_Exe *)data;
printf ("%s : **%d** **%d**\n", __FUNCTION__, exe->pipe_read.pending, exe->pipe_error.pending);
/* Sort out what sort of handler we are. */
/* And get any left over data from last time. */
if (exe->flags & ECORE_EXE_PIPE_READ)
{
flags = ECORE_EXE_PIPE_READ;
event_type = ECORE_EXE_EVENT_DATA;
thread = exe->pipe_read.thread;
h = exe->pipe_read.h;
}
else
{
flags = ECORE_EXE_PIPE_ERROR;
event_type = ECORE_EXE_EVENT_ERROR;
thread = exe->pipe_error.thread;
h = exe->pipe_error.h;
}
e = ecore_exe_event_data_get(exe, flags);
if (e)
ecore_event_add(event_type, e,
_ecore_exe_event_exe_data_free,
NULL);
if (thread)
CloseHandle(thread);
if (exe->pipe_read.h)
ecore_main_win32_handler_del(h);
thread = CreateThread(NULL, 0,
_ecore_exe_win32_pipe_thread_cb,
exe, 0, NULL);
if (exe->flags & ECORE_EXE_PIPE_READ)
{
exe->pipe_read.thread = thread;
}
else
{
exe->pipe_error.thread = thread;
}
/* exe->pipe_read.h = ecore_main_win32_handler_add(exe->pipe_read.thread, _ecore_exe_pipe_read_cb, exe); */
return 0; return 0;
} }
static int static void
_ecore_exe_pipe_read_cb(void *data, Ecore_Win32_Handler *wh) _ecore_exe_pipe_read_cb(void *data, void *buf, unsigned int size)
{ {
return _ecore_exe_generic_cb(data, wh); Ecore_Exe_Event_Data *e;
e = *((Ecore_Exe_Event_Data **)buf);
if (e)
ecore_event_add(ECORE_EXE_EVENT_DATA, e,
_ecore_exe_event_exe_data_free,
NULL);
} }
static int static int
@ -1008,7 +987,10 @@ _ecore_exe_pipe_write_cb(void *data, Ecore_Win32_Handler *wh __UNUSED__)
if (exe->close_stdin == 1) if (exe->close_stdin == 1)
{ {
if (exe->pipe_write.h) if (exe->pipe_write.h)
ecore_main_win32_handler_del(exe->pipe_write.h); {
ecore_main_win32_handler_del(exe->pipe_write.h);
exe->pipe_write.h = NULL;
}
exe->pipe_write.h = NULL; exe->pipe_write.h = NULL;
CloseHandle(exe->pipe_write.child_pipe); CloseHandle(exe->pipe_write.child_pipe);
exe->pipe_write.child_pipe = NULL; exe->pipe_write.child_pipe = NULL;
@ -1017,8 +999,14 @@ _ecore_exe_pipe_write_cb(void *data, Ecore_Win32_Handler *wh __UNUSED__)
return 1; return 1;
} }
static int static void
_ecore_exe_pipe_error_cb(void *data, Ecore_Win32_Handler *wh) _ecore_exe_pipe_error_cb(void *data, void *buf, unsigned int size)
{ {
return _ecore_exe_generic_cb(data, wh); Ecore_Exe_Event_Data *e;
e = *((Ecore_Exe_Event_Data **)buf);
if (e)
ecore_event_add(ECORE_EXE_EVENT_ERROR, e,
_ecore_exe_event_exe_data_free,
NULL);
} }