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

Try to fix mapping-test

Browse Source 
The mapping-test is failing under gnome-continuous. I suspect this
is simply due to running many tests in parallel, and mapping-test
being racy. Replace the blind sleep by signals, to avoid the
races.
This commit is contained in:
Matthias Clasen 2014-05-22 17:22:56 -04:00
parent 2a27b72522
commit 922dd548d5
1 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tests/mapping-test.c
View File

@ -30,6 +30,8 @@ static gchar *dir, *filename, *displayname, *childname;
static gboolean stop = FALSE; static gboolean stop = FALSE;
static gint parent_pid;
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
static void static void
@ -92,26 +94,38 @@ map_or_die (const gchar *filename,
return map; return map;
} }
static gboolean
signal_parent (gpointer data)
{
#ifndef G_OS_WIN32
kill (parent_pid, SIGUSR1);
#endif
return G_SOURCE_REMOVE;
}
static int static int
child_main (int argc, char *argv[]) child_main (int argc, char *argv[])
{ {
GMappedFile *map; GMappedFile *map;
GMainLoop *loop; GMainLoop *loop;
parent_pid = atoi (argv[2]);
map = map_or_die (filename, FALSE); map = map_or_die (filename, FALSE);
loop = g_main_loop_new (NULL, FALSE);
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
signal (SIGUSR1, handle_usr1); signal (SIGUSR1, handle_usr1);
#endif #endif
loop = g_main_loop_new (NULL, FALSE);
g_idle_add (check_stop, loop); g_idle_add (check_stop, loop);
g_idle_add (signal_parent, NULL);
g_main_loop_run (loop); g_main_loop_run (loop);
write_or_die (childname, write_or_die (childname,
g_mapped_file_get_contents (map), g_mapped_file_get_contents (map),
g_mapped_file_get_length (map)); g_mapped_file_get_length (map));
signal_parent (NULL);
return 0; return 0;
} }
@ -168,8 +182,10 @@ test_child_private (gchar *argv0)
GMappedFile *map; GMappedFile *map;
gchar *buffer; gchar *buffer;
gsize len; gsize len;
gchar *child_argv[3]; gchar *child_argv[4];
GPid child_pid; GPid child_pid;
GMainLoop *loop;
gchar pid[100];
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
g_remove ("STOP"); g_remove ("STOP");
@ -179,9 +195,15 @@ test_child_private (gchar *argv0)
write_or_die (filename, "ABC", -1); write_or_die (filename, "ABC", -1);
map = map_or_die (filename, TRUE); map = map_or_die (filename, TRUE);
#ifndef G_OS_WIN32
signal (SIGUSR1, handle_usr1);
#endif
g_snprintf (pid, sizeof(pid), "%d", getpid ());
child_argv[0] = argv0; child_argv[0] = argv0;
child_argv[1] = "mapchild"; child_argv[1] = "mapchild";
child_argv[2] = NULL; child_argv[2] = pid;
child_argv[3] = NULL;
if (!g_spawn_async (dir, child_argv, NULL, if (!g_spawn_async (dir, child_argv, NULL,
0, NULL, NULL, &child_pid, &error)) 0, NULL, NULL, &child_pid, &error))
{ {
@ -190,8 +212,14 @@ test_child_private (gchar *argv0)
exit (1); exit (1);
} }
/* give the child some time to set up its mapping */ #ifndef G_OS_WIN32
loop = g_main_loop_new (NULL, FALSE);
g_idle_add (check_stop, loop);
g_main_loop_run (loop);
stop = FALSE;
#else
g_usleep (2000000); g_usleep (2000000);
#endif
buffer = (gchar *)g_mapped_file_get_contents (map); buffer = (gchar *)g_mapped_file_get_contents (map);
buffer[0] = '1'; buffer[0] = '1';
@ -205,8 +233,12 @@ test_child_private (gchar *argv0)
g_file_set_contents ("STOP", "Hey there\n", -1, NULL); g_file_set_contents ("STOP", "Hey there\n", -1, NULL);
#endif #endif
/* give the child some time to write the file */ #ifndef G_OS_WIN32
g_idle_add (check_stop, loop);
g_main_loop_run (loop);
#else
g_usleep (2000000); g_usleep (2000000);
#endif
if (!g_file_get_contents (childname, &buffer, &len, &error)) if (!g_file_get_contents (childname, &buffer, &len, &error))
{ {