luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

applied patch from J. Ali Harlow <ali@juiblex.co.uk> to fix g_child_watch

Browse Source 
2003-02-28  Hans Breuer  <hans@breuer.org>

	* tests/child-test.c  glib/gmain.c :
	applied patch from J. Ali Harlow <ali@juiblex.co.uk> to fix
	g_child_watch implementation on win32, bug #50296
This commit is contained in:
Hans Breuer
2004-02-28 13:04:24 +00:00
committed by Hans Breuer
parent 4d470362b2
commit 3922b356a9
1 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
tests/child-test.c
View File

@@ -27,19 +27,50 @@
#include "config.h" #include "config.h"
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif
#include <stdlib.h> #include <stdlib.h>
#include <glib.h> #include <glib.h>
#ifdef G_OS_WIN32
#include <windows.h>
#endif
GMainLoop *main_loop; GMainLoop *main_loop;
gint alive; gint alive;
gint #ifdef G_OS_WIN32
char *argv0;
#endif
GPid
get_a_child (gint ttl) get_a_child (gint ttl)
{ {
GPid pid; GPid pid;
#ifdef G_OS_WIN32
STARTUPINFO si;
PROCESS_INFORMATION pi;
gchar *cmdline;
memset (&si, 0, sizeof (si));
si.cb = sizeof (&si);
memset (&pi, 0, sizeof (pi));
cmdline = g_strdup_printf( "child-test -c%d", ttl);
if (!CreateProcess (argv0, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
exit (1);
g_free(cmdline);
CloseHandle (pi.hThread);
pid = pi.hProcess;
return pid;
#else
pid = fork (); pid = fork ();
if (pid < 0) if (pid < 0)
exit (1); exit (1);
@@ -49,12 +80,19 @@ get_a_child (gint ttl)
sleep (ttl); sleep (ttl);
_exit (0); _exit (0);
#endif /* G_OS_WIN32 */
} }
gboolean gboolean
child_watch_callback (GPid pid, gint status, gpointer data) child_watch_callback (GPid pid, gint status, gpointer data)
{ {
#ifndef G_OS_WIN32
g_print ("child %d exited, status %d\n", pid, status); g_print ("child %d exited, status %d\n", pid, status);
#else
g_print ("child %p exited, status %d\n", pid, status);
CloseHandle(pid);
#endif
if (--alive == 0) if (--alive == 0)
g_main_loop_quit (main_loop); g_main_loop_quit (main_loop);
@@ -78,7 +116,12 @@ test_thread (gpointer data)
g_source_attach (source, g_main_loop_get_context (new_main_loop)); g_source_attach (source, g_main_loop_get_context (new_main_loop));
g_source_unref (source); g_source_unref (source);
#ifdef G_OS_WIN32
g_print ("whee! created pid: %p\n", pid);
#else
g_print ("whee! created pid: %d\n", pid); g_print ("whee! created pid: %d\n", pid);
#endif
g_main_loop_run (new_main_loop); g_main_loop_run (new_main_loop);
} }
@@ -86,6 +129,15 @@ test_thread (gpointer data)
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
#ifdef G_OS_WIN32
argv0 = argv[0];
if (argc > 1 && argv[1][0] == '-' && argv[1][1] == 'c')
{
int ttl = atoi (argv[1] + 2);
Sleep (ttl * 1000);
exit (STILL_ACTIVE);
}
#endif
/* Only run the test, if threads are enabled and a default thread /* Only run the test, if threads are enabled and a default thread
implementation is available */ implementation is available */
#if defined(G_THREADS_ENABLED) && ! defined(G_THREADS_IMPL_NONE) #if defined(G_THREADS_ENABLED) && ! defined(G_THREADS_IMPL_NONE)