glib r6452 - in trunk/gobject: . tests
- From: timj svn gnome org
- To: svn-commits-list gnome org
- Subject: glib r6452 - in trunk/gobject: . tests
- Date: Tue, 5 Feb 2008 17:42:09 +0000 (GMT)
Author: timj
Date: Tue Feb 5 17:42:09 2008
New Revision: 6452
URL: http://svn.gnome.org/viewvc/glib?rev=6452&view=rev
Log:
2008-02-05 18:41:22 Tim Janik <timj imendio com>
* Makefile.am: integrate tests/.
* tests/: new directory for libgobject tests.
* tests/Makefile.am: build and run threadtests.
* tests/threadtests.c: test multi-threaded initializers for
object classes and interfaces.
Added:
trunk/gobject/tests/
trunk/gobject/tests/Makefile.am
trunk/gobject/tests/threadtests.c
Modified:
trunk/gobject/ChangeLog
trunk/gobject/Makefile.am
Modified: trunk/gobject/Makefile.am
==============================================================================
--- trunk/gobject/Makefile.am (original)
+++ trunk/gobject/Makefile.am Tue Feb 5 17:42:09 2008
@@ -4,6 +4,8 @@
## Process this file with automake to produce Makefile.in
include $(top_srcdir)/Makefile.decl
+SUBDIRS = . tests
+
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"GLib-GObject\" \
-I$(top_srcdir) \
Added: trunk/gobject/tests/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/gobject/tests/Makefile.am Tue Feb 5 17:42:09 2008
@@ -0,0 +1,10 @@
+include $(top_srcdir)/Makefile.decl
+
+INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/glib $(GLIB_DEBUG_FLAGS)
+
+noinst_PROGRAMS = $(TEST_PROGS)
+libgobject_LDADD = ../libgobject-2.0.la $(top_builddir)/gthread/libgthread-2.0.la $(top_builddir)/glib/libglib-2.0.la
+
+TEST_PROGS += threadtests
+threadtests_SOURCES = threadtests.c
+threadtests_LDADD = $(libgobject_LDADD)
Added: trunk/gobject/tests/threadtests.c
==============================================================================
--- (empty file)
+++ trunk/gobject/tests/threadtests.c Tue Feb 5 17:42:09 2008
@@ -0,0 +1,172 @@
+/* GLib testing framework examples and tests
+ * Copyright (C) 2008 Imendio AB
+ * Authors: Tim Janik
+ *
+ * This work is provided "as is"; redistribution and modification
+ * in whole or in part, in any medium, physical or electronic is
+ * permitted without restriction.
+ *
+ * This work is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * In no event shall the authors or contributors be liable for any
+ * direct, indirect, incidental, special, exemplary, or consequential
+ * damages (including, but not limited to, procurement of substitute
+ * goods or services; loss of use, data, or profits; or business
+ * interruption) however caused and on any theory of liability, whether
+ * in contract, strict liability, or tort (including negligence or
+ * otherwise) arising in any way out of the use of this software, even
+ * if advised of the possibility of such damage.
+ */
+#include <glib.h>
+#include <glib-object.h>
+
+#define G_DEFINE_INTERFACE(TN, t_n, T_P) G_DEFINE_INTERFACE_WITH_CODE(TN, t_n, T_P, ;)
+#define G_DEFINE_INTERFACE_WITH_CODE(TN, t_n, T_P, _C_) _G_DEFINE_INTERFACE_EXTENDED_BEGIN(TN, t_n, T_P) {_C_;} _G_DEFINE_INTERFACE_EXTENDED_END()
+/* _default_init, ##Interface, if(TYPE_PREREQ); */
+#define _G_DEFINE_INTERFACE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PREREQ) \
+static void type_name##_default_init (TypeName##Interface *klass); \
+GType \
+type_name##_get_type (void) \
+{ \
+ static volatile gsize g_define_type_id__volatile = 0; \
+ if (g_once_init_enter (&g_define_type_id__volatile)) \
+ { \
+ GType g_define_type_id = \
+ g_type_register_static_simple (G_TYPE_INTERFACE, \
+ g_intern_static_string (#TypeName), \
+ sizeof (TypeName##Interface), \
+ (GClassInitFunc) type_name##_default_init, \
+ 0, \
+ (GInstanceInitFunc) NULL, \
+ (GTypeFlags) 0); \
+ if (TYPE_PREREQ) \
+ g_type_interface_add_prerequisite (g_define_type_id, TYPE_PREREQ); \
+ { /* custom code follows */
+#define _G_DEFINE_INTERFACE_EXTENDED_END() \
+ /* following custom code */ \
+ } \
+ g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
+ } \
+ return g_define_type_id__volatile; \
+} /* closes type_name##_get_type() */
+
+static volatile int mtsafe_call_counter = 0; /* multi thread safe call counter */
+static int unsafe_call_counter = 0; /* single-threaded call counter */
+
+#define NUM_COUNTER_INCREMENTS 100000
+
+static void
+call_counter_init (gpointer tclass)
+{
+ int i;
+ for (i = 0; i < NUM_COUNTER_INCREMENTS; i++)
+ {
+ int saved_unsafe_call_counter = unsafe_call_counter;
+ g_atomic_int_add (&mtsafe_call_counter, 1); // real call count update
+ g_thread_yield(); // let concurrent threads corrupt the unsafe_call_counter state
+ unsafe_call_counter = 1 + saved_unsafe_call_counter; // non-atomic counter update
+ }
+}
+
+static void interface_per_class_init () { call_counter_init (NULL); }
+
+/* define 3 test interfaces */
+typedef GTypeInterface MyFace0Interface;
+G_DEFINE_INTERFACE (MyFace0, my_face0, G_TYPE_OBJECT);
+static void my_face0_default_init (MyFace0Interface *iface) { call_counter_init (iface); }
+typedef GTypeInterface MyFace1Interface;
+G_DEFINE_INTERFACE (MyFace1, my_face1, G_TYPE_OBJECT);
+static void my_face1_default_init (MyFace1Interface *iface) { call_counter_init (iface); }
+typedef GTypeInterface MyFace2Interface;
+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;
+typedef GObjectClass MyTester0Class;
+G_DEFINE_TYPE_WITH_CODE (MyTester0, my_tester0, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (my_face0_get_type(), interface_per_class_init);
+ G_IMPLEMENT_INTERFACE (my_face1_get_type(), interface_per_class_init);
+ );
+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;
+G_DEFINE_TYPE_WITH_CODE (MyTester1, my_tester1, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (my_face0_get_type(), interface_per_class_init);
+ G_IMPLEMENT_INTERFACE (my_face1_get_type(), interface_per_class_init);
+ );
+static void my_tester1_init (MyTester1*t) {}
+static void my_tester1_class_init (MyTester1Class*c) { call_counter_init (c); }
+typedef GObject MyTester2;
+typedef GObjectClass MyTester2Class;
+G_DEFINE_TYPE_WITH_CODE (MyTester2, my_tester2, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (my_face0_get_type(), interface_per_class_init);
+ G_IMPLEMENT_INTERFACE (my_face1_get_type(), interface_per_class_init);
+ );
+static void my_tester2_init (MyTester2*t) {}
+static void my_tester2_class_init (MyTester2Class*c) { call_counter_init (c); }
+
+static GMutex *sync_mutex = NULL;
+
+static gpointer
+tester_init_thread (gpointer data)
+{
+ const GInterfaceInfo face2_interface_info = { (GInterfaceInitFunc) interface_per_class_init, NULL, NULL };
+ gpointer klass;
+ /* first, syncronize with other threads,
+ * then run interface and class initializers,
+ * using unsafe_call_counter concurrently
+ */
+ g_mutex_lock (sync_mutex);
+ g_mutex_unlock (sync_mutex);
+ /* test default interface initialization for face0 */
+ g_type_default_interface_unref (g_type_default_interface_ref (my_face0_get_type()));
+ /* test class initialization, face0 per-class initializer, face1 default and per-class initializer */
+ klass = g_type_class_ref ((GType) data);
+ /* test face2 default and per-class initializer, after class_init */
+ g_type_add_interface_static (G_TYPE_FROM_CLASS (klass), my_face2_get_type(), &face2_interface_info);
+ /* cleanups */
+ g_type_class_unref (klass);
+ return NULL;
+}
+
+static void
+test_threaded_class_init (void)
+{
+ GThread *threads[3] = { NULL, };
+ /* pause newly created threads */
+ sync_mutex = g_mutex_new();
+ g_mutex_lock (sync_mutex);
+ /* create threads */
+ threads[0] = g_thread_create (tester_init_thread, (gpointer) my_tester0_get_type(), TRUE, NULL);
+ threads[1] = g_thread_create (tester_init_thread, (gpointer) my_tester1_get_type(), TRUE, NULL);
+ threads[2] = g_thread_create (tester_init_thread, (gpointer) my_tester2_get_type(), TRUE, NULL);
+ /* execute threads */
+ g_mutex_unlock (sync_mutex);
+ while (g_atomic_int_get (&mtsafe_call_counter) < (3 + 3 + 3 * 3) * NUM_COUNTER_INCREMENTS)
+ {
+ if (g_test_verbose())
+ g_print ("Initializers counted: %u\n", g_atomic_int_get (&mtsafe_call_counter));
+ g_usleep (50 * 1000); /* wait for threads to complete */
+ }
+ if (g_test_verbose())
+ g_print ("Total initializers: %u\n", g_atomic_int_get (&mtsafe_call_counter));
+ /* ensure non-corrupted counter updates */
+ g_assert_cmpint (g_atomic_int_get (&mtsafe_call_counter), ==, unsafe_call_counter);
+}
+
+int
+main (int argc,
+ char *argv[])
+{
+ g_thread_init (NULL);
+ g_test_init (&argc, &argv, NULL);
+ g_type_init ();
+
+ g_test_add_func ("/GObject/threaded-class-init", test_threaded_class_init);
+
+ return g_test_run();
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]