diff options
author | Rico Tzschichholz <ricotz@t-online.de> | 2013-01-04 20:25:46 +0100 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2013-01-04 20:25:46 +0100 |
commit | efa7b5f1e7d28e10d2c4413fc1626305f46706f5 (patch) | |
tree | 90956da98cc35aa16ed1d515d650d42ec0503bc4 /gobject/tests/threadtests.c | |
parent | e478b65ea5fe20ea714a4e78be051a8aa7583ece (diff) | |
download | glib-efa7b5f1e7d28e10d2c4413fc1626305f46706f5.tar.gz |
Revert "gtype: disallow adding interfaces after the fact"
This reverts commit d6a075b0d8dfe4e4a41f6624ad7032d2163d420c.
Diffstat (limited to 'gobject/tests/threadtests.c')
-rw-r--r-- | gobject/tests/threadtests.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/gobject/tests/threadtests.c b/gobject/tests/threadtests.c index 37b6b70e5..fd3322207 100644 --- a/gobject/tests/threadtests.c +++ b/gobject/tests/threadtests.c @@ -25,8 +25,6 @@ static volatile int mtsafe_call_counter = 0; /* multi thread safe call counter */ static int unsafe_call_counter = 0; /* single-threaded call counter */ -static GCond sync_cond; -static GMutex sync_mutex; #define NUM_COUNTER_INCREMENTS 100000 @@ -54,6 +52,10 @@ typedef GTypeInterface MyFace1Interface; static GType my_face1_get_type (void); G_DEFINE_INTERFACE (MyFace1, my_face1, G_TYPE_OBJECT); static void my_face1_default_init (MyFace1Interface *iface) { call_counter_init (iface); } +typedef GTypeInterface MyFace2Interface; +static GType my_face2_get_type (void); +G_DEFINE_INTERFACE (MyFace2, my_face2, G_TYPE_OBJECT); +static void my_face2_default_init (MyFace2Interface *iface) { call_counter_init (iface); } /* define 3 test objects, adding interfaces 0 & 1, and adding interface 2 after class initialization */ typedef GObject MyTester0; @@ -67,14 +69,6 @@ static void my_tester0_init (MyTester0*t) {} static void my_tester0_class_init (MyTester0Class*c) { call_counter_init (c); } typedef GObject MyTester1; typedef GObjectClass MyTester1Class; - -/* Disabled for now (see https://bugzilla.gnome.org/show_bug.cgi?id=687659) */ -#if 0 -typedef GTypeInterface MyFace2Interface; -static GType my_face2_get_type (void); -G_DEFINE_INTERFACE (MyFace2, my_face2, G_TYPE_OBJECT); -static void my_face2_default_init (MyFace2Interface *iface) { call_counter_init (iface); } - static GType my_tester1_get_type (void); G_DEFINE_TYPE_WITH_CODE (MyTester1, my_tester1, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (my_face0_get_type(), interface_per_class_init); @@ -92,6 +86,9 @@ G_DEFINE_TYPE_WITH_CODE (MyTester2, my_tester2, G_TYPE_OBJECT, static void my_tester2_init (MyTester2*t) {} static void my_tester2_class_init (MyTester2Class*c) { call_counter_init (c); } +static GCond sync_cond; +static GMutex sync_mutex; + static gpointer tester_init_thread (gpointer data) { @@ -143,7 +140,6 @@ test_threaded_class_init (void) /* ensure non-corrupted counter updates */ g_assert_cmpint (g_atomic_int_get (&mtsafe_call_counter), ==, unsafe_call_counter); } -#endif typedef struct { GObject parent; @@ -341,7 +337,7 @@ main (int argc, { g_test_init (&argc, &argv, NULL); - /* g_test_add_func ("/GObject/threaded-class-init", test_threaded_class_init); */ + g_test_add_func ("/GObject/threaded-class-init", test_threaded_class_init); g_test_add_func ("/GObject/threaded-object-init", test_threaded_object_init); g_test_add_func ("/GObject/threaded-weak-ref", test_threaded_weak_ref); |