Enlightenment CVS committal Author : onefang Project : e17 Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore Modified Files: Ecore.h ecore_events.c ecore_exe.c ecore_signal.c Log Message: More ecore_exe naming break'n'fix. Should be all done now. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/Ecore.h,v retrieving revision 1.42 retrieving revision 1.43 diff -u -3 -r1.42 -r1.43 --- Ecore.h 13 Jan 2006 13:18:36 -0000 1.42 +++ Ecore.h 15 Jan 2006 11:27:19 -0000 1.43 @@ -108,34 +108,17 @@ typedef void Ecore_Event; /**< A handle for an event */ typedef void Ecore_Animator; /**< A handle for animators */ #endif - typedef struct _Ecore_Exe_Event_Add Ecore_Exe_Event_Add; /**< Spawned Exe add event */ - typedef struct _Ecore_Event_Exe_Exit Ecore_Event_Exe_Exit; /**< Spawned Exe exit event */ typedef struct _Ecore_Event_Signal_User Ecore_Event_Signal_User; /**< User signal event */ typedef struct _Ecore_Event_Signal_Hup Ecore_Event_Signal_Hup; /**< Hup signal event */ typedef struct _Ecore_Event_Signal_Exit Ecore_Event_Signal_Exit; /**< Exit signal event */ typedef struct _Ecore_Event_Signal_Power Ecore_Event_Signal_Power; /**< Power signal event */ typedef struct _Ecore_Event_Signal_Realtime Ecore_Event_Signal_Realtime; /**< Realtime signal event */ - typedef struct _Ecore_Event_Exe_Data_Line Ecore_Event_Exe_Data_Line; /**< Lines from a child process */ - typedef struct _Ecore_Event_Exe_Data Ecore_Event_Exe_Data; /**< Data from a child process */ + typedef struct _Ecore_Exe_Event_Add Ecore_Exe_Event_Add; /**< Spawned Exe add event */ + typedef struct _Ecore_Exe_Event_Del Ecore_Exe_Event_Del; /**< Spawned Exe exit event */ + typedef struct _Ecore_Exe_Event_Data_Line Ecore_Exe_Event_Data_Line; /**< Lines from a child process */ + typedef struct _Ecore_Exe_Event_Data Ecore_Exe_Event_Data; /**< Data from a child process */ #ifndef WIN32 - struct _Ecore_Exe_Event_Add /** Process add event */ - { - Ecore_Exe *exe; /**< The handle to the added process */ - void *ext_data; /**< Extension data - not used */ - }; - - struct _Ecore_Event_Exe_Exit /** Process exit event */ - { - pid_t pid; /**< The process ID of the process that exited */ - int exit_code; /**< The exit code of the process */ - Ecore_Exe *exe; /**< The handle to the exited process, or NULL if not found */ - int exit_signal; /** < The signal that caused the process to exit */ - char exited : 1; /** < set to 1 if the process exited of its own accord */ - char signalled : 1; /** < set to 1 id the process exited due to uncaught signal */ - void *ext_data; /**< Extension data - not used */ - siginfo_t data; /**< Signal info */ - }; #endif struct _Ecore_Event_Signal_User /** User signal event */ @@ -188,18 +171,36 @@ }; #ifndef WIN32 - struct _Ecore_Event_Exe_Data_Line /**< Lines from a child process */ + struct _Ecore_Exe_Event_Add /** Process add event */ + { + Ecore_Exe *exe; /**< The handle to the added process */ + void *ext_data; /**< Extension data - not used */ + }; + + struct _Ecore_Exe_Event_Del /** Process exit event */ + { + pid_t pid; /**< The process ID of the process that exited */ + int exit_code; /**< The exit code of the process */ + Ecore_Exe *exe; /**< The handle to the exited process, or NULL if not found */ + int exit_signal; /** < The signal that caused the process to exit */ + char exited : 1; /** < set to 1 if the process exited of its own accord */ + char signalled : 1; /** < set to 1 id the process exited due to uncaught signal */ + void *ext_data; /**< Extension data - not used */ + siginfo_t data; /**< Signal info */ + }; + + struct _Ecore_Exe_Event_Data_Line /**< Lines from a child process */ { char *line; int size; }; - struct _Ecore_Event_Exe_Data /** Data from a child process event */ + struct _Ecore_Exe_Event_Data /** Data from a child process event */ { Ecore_Exe *exe; /**< The handle to the process */ void *data; /**< the raw binary data from the child process that was recieved */ int size; /**< the size of this data in bytes */ - Ecore_Event_Exe_Data_Line *lines; /**< a NULL terminated array of line data if line buffered */ + Ecore_Exe_Event_Data_Line *lines; /**< a NULL terminated array of line data if line buffered */ }; #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_events.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- ecore_events.c 6 Jan 2006 17:58:12 -0000 1.20 +++ ecore_events.c 15 Jan 2006 11:27:19 -0000 1.21 @@ -459,16 +459,16 @@ void * _ecore_event_exe_exit_new(void) { - Ecore_Event_Exe_Exit *e; + Ecore_Exe_Event_Del *e; - e = calloc(1, sizeof(Ecore_Event_Exe_Exit)); + e = calloc(1, sizeof(Ecore_Exe_Event_Del)); return e; } void _ecore_event_exe_exit_free(void *data __UNUSED__, void *ev) { - Ecore_Event_Exe_Exit *e; + Ecore_Exe_Event_Del *e; e = ev; if (e->exe) _ecore_exe_free(e->exe); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_exe.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -3 -r1.42 -r1.43 --- ecore_exe.c 13 Jan 2006 13:18:36 -0000 1.42 +++ ecore_exe.c 15 Jan 2006 11:27:19 -0000 1.43 @@ -1034,9 +1034,9 @@ { /* No more data to read. */ if (inbuf) { - Ecore_Event_Exe_Data *e; + Ecore_Exe_Event_Data *e; - e = calloc(1, sizeof(Ecore_Event_Exe_Data)); + e = calloc(1, sizeof(Ecore_Exe_Event_Data)); if (e) { e->exe = exe; @@ -1060,7 +1060,7 @@ { /* In testing, the lines seem to arrive in batches of 500 to 1000 lines at most, roughly speaking. */ max += 10; /* FIXME: Maybe keep track of the largest number of lines ever sent, and add half that many instead of 10. */ - e->lines = realloc(e->lines, sizeof(Ecore_Event_Exe_Data_Line) * (max + 1)); /* Allow room for the NULL termination. */ + e->lines = realloc(e->lines, sizeof(Ecore_Exe_Event_Data_Line) * (max + 1)); /* Allow room for the NULL termination. */ } /* raster said to leave the line endings as line endings, however - * This is line buffered mode, we are not dealing with binary here, but lines. @@ -1224,7 +1224,7 @@ static void _ecore_exe_event_exe_data_free(void *data __UNUSED__, void *ev) { - Ecore_Event_Exe_Data *e; + Ecore_Exe_Event_Data *e; e = ev; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_signal.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- ecore_signal.c 13 Jan 2006 06:38:44 -0000 1.27 +++ ecore_signal.c 15 Jan 2006 11:27:19 -0000 1.28 @@ -162,7 +162,7 @@ while ((pid = waitpid(-1, &status, WNOHANG)) > 0) { - Ecore_Event_Exe_Exit *e; + Ecore_Exe_Event_Del *e; /* FIXME: If this process is set respawn, respawn with a suitable backoff * period for those that need too much respawning. @@ -498,7 +498,7 @@ static int _ecore_signal_exe_exit_delay(void *data) { - Ecore_Event_Exe_Exit *e; + Ecore_Exe_Event_Del *e; e = data; if (e) ------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs