X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Ftests%2Fgdbus-non-socket.c;h=c0eae5ec7c5d0ffe588b2f1f7dc66f7f3caa89c1;hb=015db2d2af3d5a3f31909c7ffb5307e5141d8fbd;hp=cf8853f8a83347c882ce85966db6cc1d9a7cc3a6;hpb=7d6a6ca57b5a5dc1ad55a785dfd79fa98d7e4093;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/tests/gdbus-non-socket.c b/gio/tests/gdbus-non-socket.c
index cf8853f..c0eae5e 100644
--- a/gio/tests/gdbus-non-socket.c
+++ b/gio/tests/gdbus-non-socket.c
@@ -13,9 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see .
*
* Author: David Zeuthen
*/
@@ -39,95 +37,8 @@ static GMainLoop *loop = NULL;
/* ---------------------------------------------------------------------------------------------------- */
#ifdef G_OS_UNIX
-#define MY_TYPE_IO_STREAM (my_io_stream_get_type ())
-#define MY_IO_STREAM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MY_TYPE_IO_STREAM, MyIOStream))
-#define MY_IS_IO_STREAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MY_TYPE_IO_STREAM))
-
-typedef struct
-{
- GIOStream parent_instance;
- GInputStream *input_stream;
- GOutputStream *output_stream;
-} MyIOStream;
-
-typedef struct
-{
- GIOStreamClass parent_class;
-} MyIOStreamClass;
-
-static GType my_io_stream_get_type (void) G_GNUC_CONST;
-
-G_DEFINE_TYPE (MyIOStream, my_io_stream, G_TYPE_IO_STREAM);
-
-static void
-my_io_stream_finalize (GObject *object)
-{
- MyIOStream *stream = MY_IO_STREAM (object);
- g_object_unref (stream->input_stream);
- g_object_unref (stream->output_stream);
- G_OBJECT_CLASS (my_io_stream_parent_class)->finalize (object);
-}
-
-static void
-my_io_stream_init (MyIOStream *stream)
-{
-}
-
-static GInputStream *
-my_io_stream_get_input_stream (GIOStream *_stream)
-{
- MyIOStream *stream = MY_IO_STREAM (_stream);
- return stream->input_stream;
-}
-
-static GOutputStream *
-my_io_stream_get_output_stream (GIOStream *_stream)
-{
- MyIOStream *stream = MY_IO_STREAM (_stream);
- return stream->output_stream;
-}
-
-static void
-my_io_stream_class_init (MyIOStreamClass *klass)
-{
- GObjectClass *gobject_class;
- GIOStreamClass *giostream_class;
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = my_io_stream_finalize;
-
- giostream_class = G_IO_STREAM_CLASS (klass);
- giostream_class->get_input_stream = my_io_stream_get_input_stream;
- giostream_class->get_output_stream = my_io_stream_get_output_stream;
-}
-
-static GIOStream *
-my_io_stream_new (GInputStream *input_stream,
- GOutputStream *output_stream)
-{
- MyIOStream *stream;
- g_return_val_if_fail (G_IS_INPUT_STREAM (input_stream), NULL);
- g_return_val_if_fail (G_IS_OUTPUT_STREAM (output_stream), NULL);
- stream = MY_IO_STREAM (g_object_new (MY_TYPE_IO_STREAM, NULL));
- stream->input_stream = g_object_ref (input_stream);
- stream->output_stream = g_object_ref (output_stream);
- return G_IO_STREAM (stream);
-}
-
-static GIOStream *
-my_io_stream_new_for_fds (gint fd_in, gint fd_out)
-{
- GIOStream *stream;
- GInputStream *input_stream;
- GOutputStream *output_stream;
-
- input_stream = g_unix_input_stream_new (fd_in, TRUE);
- output_stream = g_unix_output_stream_new (fd_out, TRUE);
- stream = my_io_stream_new (input_stream, output_stream);
- g_object_unref (input_stream);
- g_object_unref (output_stream);
- return stream;
-}
+#include "test-pipe-unix.h"
+#include "test-io-stream.h"
/* ---------------------------------------------------------------------------------------------------- */
@@ -193,7 +104,7 @@ pokee_method_call (GDBusConnection *connection,
g_assert_cmpstr (method_name, ==, "Poke");
g_variant_get (parameters, "(&s)", &str);
- ret = g_strdup_printf ("You poked me with: `%s'", str);
+ ret = g_strdup_printf ("You poked me with: '%s'", str);
g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", ret));
g_free (ret);
}
@@ -204,37 +115,59 @@ static const GDBusInterfaceVTable pokee_vtable = {
NULL /* set_property */
};
+/* Processes:
+ *
+ * parent
+ * \- first child (via fork()) is the pokee
+ * \- second child (via g_test_trap_fork()) is the poker
+ *
+ * The second child only exists to avoid sharing a main context between several
+ * second-children if we run a test resembling this one multiple times.
+ * See https://bugzilla.gnome.org/show_bug.cgi?id=658999 for why that's bad.
+ */
static void
test_non_socket (void)
{
- gint in_pipes[2];
- gint out_pipes[2];
- GIOStream *stream;
+ GIOStream *streams[2];
GDBusConnection *connection;
GError *error;
gchar *guid;
- pid_t child;
- gint read_fd;
- gint write_fd;
+ pid_t first_child;
GVariant *ret;
const gchar *str;
+ gboolean ok;
- g_assert_cmpint (pipe (in_pipes), ==, 0);
- g_assert_cmpint (pipe (out_pipes), ==, 0);
+ error = NULL;
- switch ((child = fork ()))
+ ok = test_bidi_pipe (&streams[0], &streams[1], &error);
+ g_assert_no_error (error);
+ g_assert (ok);
+ g_assert (G_IS_IO_STREAM (streams[0]));
+ g_assert (G_IS_INPUT_STREAM (g_io_stream_get_input_stream (streams[0])));
+ g_assert (G_IS_OUTPUT_STREAM (g_io_stream_get_output_stream (streams[0])));
+ g_assert (G_IS_IO_STREAM (streams[1]));
+ g_assert (G_IS_INPUT_STREAM (g_io_stream_get_input_stream (streams[1])));
+ g_assert (G_IS_OUTPUT_STREAM (g_io_stream_get_output_stream (streams[1])));
+
+ switch ((first_child = fork ()))
{
case -1:
g_assert_not_reached ();
break;
case 0:
- /* child */
- read_fd = in_pipes[0];
- write_fd = out_pipes[1];
- g_assert_cmpint (close ( in_pipes[1]), ==, 0); /* close unused write end */
- g_assert_cmpint (close (out_pipes[0]), ==, 0); /* close unused read end */
- stream = my_io_stream_new_for_fds (read_fd, write_fd);
+ /* first child */
+
+ /* we shouldn't do this in the parent, because we shouldn't use a
+ * GMainContext both before and after fork
+ */
+ loop = g_main_loop_new (NULL, FALSE);
+
+ ok = g_io_stream_close (streams[1], NULL, &error);
+ g_assert_no_error (error);
+ g_assert (ok);
+ g_object_unref (streams[1]);
+
guid = g_dbus_generate_guid ();
error = NULL;
/* We need to delay message processing to avoid the race
@@ -245,9 +178,9 @@ test_non_socket (void)
* This is because (early) dispatching is done on the IO thread
* (method_call() isn't called until we're in the right thread
* though) so in rare cases the parent sends the message before
- * we (the child) register the object
+ * we (the first child) register the object
*/
- connection = g_dbus_connection_new_sync (stream,
+ connection = g_dbus_connection_new_sync (streams[0],
guid,
G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER |
G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING,
@@ -256,7 +189,7 @@ test_non_socket (void)
&error);
g_free (guid);
g_assert_no_error (error);
- g_object_unref (stream);
+ g_object_unref (streams[0]);
/* make sure we exit along with the parent */
g_dbus_connection_set_exit_on_close (connection, TRUE);
@@ -284,23 +217,42 @@ test_non_socket (void)
break;
}
- /* parent */
- read_fd = out_pipes[0];
- write_fd = in_pipes[1];
- g_assert_cmpint (close (out_pipes[1]), ==, 0); /* close unused write end */
- g_assert_cmpint (close ( in_pipes[0]), ==, 0); /* close unused read end */
- stream = my_io_stream_new_for_fds (read_fd, write_fd);
- error = NULL;
- connection = g_dbus_connection_new_sync (stream,
+ /* This is #ifdef G_OS_UNIX anyway, so just use g_test_trap_fork() */
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+ if (!g_test_trap_fork (0, 0))
+ {
+ /* parent */
+ g_object_unref (streams[0]);
+ g_object_unref (streams[1]);
+
+ g_test_trap_assert_passed ();
+ g_assert_cmpint (kill (first_child, SIGTERM), ==, 0);
+ return;
+ }
+ G_GNUC_END_IGNORE_DEPRECATIONS;
+
+ /* second child */
+
+ /* we shouldn't do this in the parent, because we shouldn't use a
+ * GMainContext both before and after fork
+ */
+ loop = g_main_loop_new (NULL, FALSE);
+
+ ok = g_io_stream_close (streams[0], NULL, &error);
+ g_assert_no_error (error);
+ g_assert (ok);
+ g_object_unref (streams[0]);
+
+ connection = g_dbus_connection_new_sync (streams[1],
NULL, /* guid */
G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT,
NULL, /* GDBusAuthObserver */
NULL,
&error);
g_assert_no_error (error);
- g_object_unref (stream);
+ g_object_unref (streams[1]);
- /* poke the child */
+ /* poke the first child */
error = NULL;
ret = g_dbus_connection_call_sync (connection,
NULL, /* name */
@@ -315,12 +267,12 @@ test_non_socket (void)
&error);
g_assert_no_error (error);
g_variant_get (ret, "(&s)", &str);
- g_assert_cmpstr (str, ==, "You poked me with: `I am the POKER!'");
+ g_assert_cmpstr (str, ==, "You poked me with: 'I am the POKER!'");
g_variant_unref (ret);
g_object_unref (connection);
-
- g_assert_cmpint (kill (child, SIGTERM), ==, 0);
+ g_main_loop_unref (loop);
+ exit (0);
}
#else /* G_OS_UNIX */
@@ -340,18 +292,11 @@ main (int argc,
{
gint ret;
- g_type_init ();
- g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
- /* all the tests rely on a shared main loop */
- loop = g_main_loop_new (NULL, FALSE);
-
g_test_add_func ("/gdbus/non-socket", test_non_socket);
ret = g_test_run();
- g_main_loop_unref (loop);
-
return ret;
}