diff --git a/Graphics/UI/Gtk/General/hsgthread.c b/Graphics/UI/Gtk/General/hsgthread.c new file mode 100644 --- /dev/null +++ b/Graphics/UI/Gtk/General/hsgthread.c @@ -0,0 +1,201 @@ +/* We would use the g_thread_supported macro here, but unfortunately on + * windows GHCi's dynamic linker cannot cope with references to global + * variables imported from dlls. + * + * So instead of asking glib if we (or indeed) anyone else has initialised + * the glib gthread system, we keep track of it ourselves. We still have to + * do it in C land so the state survives :reload in GHCi. So there is the + * danger in a mixed language program, of someone else initialising the + * glib thread system and us not being aware of it. :-( + * + * Besides the interaction with ghci, we provide a variant of g_object_unref + * that is used in all objects of Gtk+ and those libraries that build on Gtk+. + * This variant enqueues the object to be finalized and adds an idle handler + * into the main loop of Gtk+ that will call the actual finalizers on the + * enqueued objects. The aim is to ensure that finalizers for objects that + * may hold Xlib or Win32 resources are only run from the thread that runs the + * main Gtk+ loop. If this is not ensured then bad things happen at least on + * Win32 since that API is making use of thread-local storage that is not + * present if the finalizers, that are run by the GC in a different thread, + * call back into Win32 without this thread-local storage. + * + * Also g_static_mutex_lock and g_static_mutex_unlock cause linking problems + * in ghci on Windows 7 (namely: HSgtk-0.10.5.o: unknown symbol + * `__imp__g_threads_got_initialized'), so we use a Win32 critical section + * instead. + */ + +#define DEFINED_LPTYPELIB +#define DEFINDE_LPTYPEINFO +#define DEFINED_LPTYPECOMP +#define DEFINE_LPCREATETYPEINFO +#define DEFINED_LPDISPATCH + +#include +#include +#include "hsgthread.h" + +#if defined( WIN32 ) +#include +#include +#include +#endif + +#undef DEBUG + +static int threads_initialised = 0; +#if defined( WIN32 ) +static CRITICAL_SECTION gtk2hs_finalizer_mutex; +#else +static GStaticMutex gtk2hs_finalizer_mutex; +#endif +static GSource* gtk2hs_finalizer_source; +static guint gtk2hs_finalizer_id; +static GArray* gtk2hs_finalizers; + +gboolean gtk2hs_run_finalizers(gpointer data); + +/* Initialize the default _fmode on WIN32. */ +void gtk2hs_initialise (void) { +#if defined( WIN32 ) && defined( GTK2HS_SET_FMODE_BINARY ) + /* Some Windows GTK binraries (current Fedora MinGW ones) do */ + /* not open files in binary mode. This is a work around. */ + _fmode = _O_BINARY; +#endif +} + +/* Initialize the threads system of Gdk and Gtk. */ +void gtk2hs_threads_initialise (void) { + +#ifdef DEBUG + printf("gtk2hs_threads_initialise: threads_initialised=%i, g_thread_get_initialized=%i\n", + threads_initialised, g_thread_get_initialized()); +#endif + + if (!threads_initialised) { + threads_initialised = 1; +#if defined( WIN32 ) + InitializeCriticalSection(>k2hs_finalizer_mutex); +#else + g_static_mutex_init(>k2hs_finalizer_mutex); +#endif + g_thread_init(NULL); + gdk_threads_init(); + + /* from here onwards, the Gdk lock is held */ + gdk_threads_enter(); + + } +} + +/* Free an object within the Gtk2Hs lock. */ +void gtk2hs_g_object_unref_from_mainloop(gpointer object) { + + int mutex_locked = 0; + if (threads_initialised) { +#ifdef DEBUG + printf("acquiring lock to add a %s object at %lx\n", + g_type_name(G_OBJECT_TYPE(object)), (unsigned long) object); + printf("value of lock function is %lx\n", + (unsigned long) g_thread_functions_for_glib_use.mutex_lock); +#endif +#if defined( WIN32 ) + EnterCriticalSection(>k2hs_finalizer_mutex); +#else + g_static_mutex_lock(>k2hs_finalizer_mutex); +#endif + mutex_locked = 1; + } + +#ifdef DEBUG + if (mutex_locked) printf("within mutex: "); + printf("adding finalizer to a %s object!\n", g_type_name(G_OBJECT_TYPE(object))); +#endif + + /* Ensure that the idle handler is still installed and that + the array of objects that are to be finalized exists. */ + if (gtk2hs_finalizer_id==0) { + + if (gtk2hs_finalizers == NULL) + gtk2hs_finalizers = g_array_new(0, 0, sizeof(gpointer)); +#ifdef DEBUG + printf("creating finalizer list.\n"); +#endif + + if (gtk2hs_finalizer_source != NULL) { +#ifdef DEBUG + printf("re-initializing finalizer source.\n"); +#endif + g_source_destroy(gtk2hs_finalizer_source); + g_source_unref(gtk2hs_finalizer_source); + }; + + gtk2hs_finalizer_source = g_idle_source_new(); + g_source_set_callback(gtk2hs_finalizer_source, >k2hs_run_finalizers, 0, 0); + gtk2hs_finalizer_id = g_source_attach(gtk2hs_finalizer_source, NULL); + + }; + + /* Add the object to the list. */ + g_array_append_val(gtk2hs_finalizers, object); + + if (mutex_locked) { +#ifdef DEBUG + printf("releasing lock to add a %s object at %lx\n", + g_type_name(G_OBJECT_TYPE(object)), (unsigned long) object); +#endif +#if defined( WIN32 ) + LeaveCriticalSection(>k2hs_finalizer_mutex); +#else + g_static_mutex_unlock(>k2hs_finalizer_mutex); +#endif + } +} + +/* Run the finalizers that have been accumulated. */ +gboolean gtk2hs_run_finalizers(gpointer data) { + gint index; + g_assert(gtk2hs_finalizers!=NULL); + + gdk_threads_enter(); + + int mutex_locked = 0; + if (threads_initialised) { +#ifdef DEBUG + printf("acquiring lock to kill objects\n"); +#endif +#if defined( WIN32 ) + EnterCriticalSection(>k2hs_finalizer_mutex); +#else + g_static_mutex_lock(>k2hs_finalizer_mutex); +#endif + mutex_locked = 1; + } + +#ifdef DEBUG + printf("running %i finalizers!\n", gtk2hs_finalizers->len); +#endif + + for (index = 0; index < gtk2hs_finalizers->len; index++) + g_object_unref(g_array_index (gtk2hs_finalizers, GObject*, index)); + + g_array_set_size(gtk2hs_finalizers, 0); + + gtk2hs_finalizer_id = 0; + + if (mutex_locked) { +#ifdef DEBUG + printf("releasing lock to kill objects\n"); +#endif +#if defined( WIN32 ) + LeaveCriticalSection(>k2hs_finalizer_mutex); +#else + g_static_mutex_unlock(>k2hs_finalizer_mutex); +#endif + } + + gdk_threads_leave(); + + return FALSE; +} + diff --git a/Graphics/UI/Gtk/General/hsgthread.cpp b/Graphics/UI/Gtk/General/hsgthread.cpp deleted file mode 100644 --- a/Graphics/UI/Gtk/General/hsgthread.cpp +++ /dev/null @@ -1,204 +0,0 @@ -/* We would use the g_thread_supported macro here, but unfortunately on - * windows GHCi's dynamic linker cannot cope with references to global - * variables imported from dlls. - * - * So instead of asking glib if we (or indeed) anyone else has initialised - * the glib gthread system, we keep track of it ourselves. We still have to - * do it in C land so the state survives :reload in GHCi. So there is the - * danger in a mixed language program, of someone else initialising the - * glib thread system and us not being aware of it. :-( - * - * Besides the interaction with ghci, we provide a variant of g_object_unref - * that is used in all objects of Gtk+ and those libraries that build on Gtk+. - * This variant enqueues the object to be finalized and adds an idle handler - * into the main loop of Gtk+ that will call the actual finalizers on the - * enqueued objects. The aim is to ensure that finalizers for objects that - * may hold Xlib or Win32 resources are only run from the thread that runs the - * main Gtk+ loop. If this is not ensured then bad things happen at least on - * Win32 since that API is making use of thread-local storage that is not - * present if the finalizers, that are run by the GC in a different thread, - * call back into Win32 without this thread-local storage. - * - * Also g_static_mutex_lock and g_static_mutex_unlock cause linking problems - * in ghci on Windows 7 (namely: HSgtk-0.10.5.o: unknown symbol - * `__imp__g_threads_got_initialized'), so we use a Win32 critical section - * instead. - */ - -extern "C" { - -#define DEFINED_LPTYPELIB -#define DEFINDE_LPTYPEINFO -#define DEFINED_LPTYPECOMP -#define DEFINE_LPCREATETYPEINFO -#define DEFINED_LPDISPATCH - -#include -#include -#include "hsgthread.h" - -#if defined( WIN32 ) -#include -#include -#include -#endif - -#undef DEBUG - -static int threads_initialised = 0; -#if defined( WIN32 ) -static CRITICAL_SECTION gtk2hs_finalizer_mutex; -#else -static GStaticMutex gtk2hs_finalizer_mutex; -#endif -static GSource* gtk2hs_finalizer_source; -static guint gtk2hs_finalizer_id; -static GArray* gtk2hs_finalizers; - -gboolean gtk2hs_run_finalizers(gpointer data); - -/* Initialize the default _fmode on WIN32. */ -void gtk2hs_initialise (void) { -#if defined( WIN32 ) && defined( GTK2HS_SET_FMODE_BINARY ) - /* Some Windows GTK binraries (current Fedora MinGW ones) do */ - /* not open files in binary mode. This is a work around. */ - _fmode = _O_BINARY; -#endif -} - -/* Initialize the threads system of Gdk and Gtk. */ -void gtk2hs_threads_initialise (void) { - -#ifdef DEBUG - printf("gtk2hs_threads_initialise: threads_initialised=%i, g_thread_get_initialized=%i\n", - threads_initialised, g_thread_get_initialized()); -#endif - - if (!threads_initialised) { - threads_initialised = 1; -#if defined( WIN32 ) - InitializeCriticalSection(>k2hs_finalizer_mutex); -#else - g_static_mutex_init(>k2hs_finalizer_mutex); -#endif - g_thread_init(NULL); - gdk_threads_init(); - - /* from here onwards, the Gdk lock is held */ - gdk_threads_enter(); - - } -} - -/* Free an object within the Gtk2Hs lock. */ -void gtk2hs_g_object_unref_from_mainloop(gpointer object) { - - int mutex_locked = 0; - if (threads_initialised) { -#ifdef DEBUG - printf("acquiring lock to add a %s object at %lx\n", - g_type_name(G_OBJECT_TYPE(object)), (unsigned long) object); - printf("value of lock function is %lx\n", - (unsigned long) g_thread_functions_for_glib_use.mutex_lock); -#endif -#if defined( WIN32 ) - EnterCriticalSection(>k2hs_finalizer_mutex); -#else - g_static_mutex_lock(>k2hs_finalizer_mutex); -#endif - mutex_locked = 1; - } - -#ifdef DEBUG - if (mutex_locked) printf("within mutex: "); - printf("adding finalizer to a %s object!\n", g_type_name(G_OBJECT_TYPE(object))); -#endif - - /* Ensure that the idle handler is still installed and that - the array of objects that are to be finalized exists. */ - if (gtk2hs_finalizer_id==0) { - - if (gtk2hs_finalizers == NULL) - gtk2hs_finalizers = g_array_new(0, 0, sizeof(gpointer)); -#ifdef DEBUG - printf("creating finalizer list.\n"); -#endif - - if (gtk2hs_finalizer_source != NULL) { -#ifdef DEBUG - printf("re-initializing finalizer source.\n"); -#endif - g_source_destroy(gtk2hs_finalizer_source); - g_source_unref(gtk2hs_finalizer_source); - }; - - gtk2hs_finalizer_source = g_idle_source_new(); - g_source_set_callback(gtk2hs_finalizer_source, >k2hs_run_finalizers, 0, 0); - gtk2hs_finalizer_id = g_source_attach(gtk2hs_finalizer_source, NULL); - - }; - - /* Add the object to the list. */ - g_array_append_val(gtk2hs_finalizers, object); - - if (mutex_locked) { -#ifdef DEBUG - printf("releasing lock to add a %s object at %lx\n", - g_type_name(G_OBJECT_TYPE(object)), (unsigned long) object); -#endif -#if defined( WIN32 ) - LeaveCriticalSection(>k2hs_finalizer_mutex); -#else - g_static_mutex_unlock(>k2hs_finalizer_mutex); -#endif - } -} - -/* Run the finalizers that have been accumulated. */ -gboolean gtk2hs_run_finalizers(gpointer data) { - gint index; - g_assert(gtk2hs_finalizers!=NULL); - - gdk_threads_enter(); - - int mutex_locked = 0; - if (threads_initialised) { -#ifdef DEBUG - printf("acquiring lock to kill objects\n"); -#endif -#if defined( WIN32 ) - EnterCriticalSection(>k2hs_finalizer_mutex); -#else - g_static_mutex_lock(>k2hs_finalizer_mutex); -#endif - mutex_locked = 1; - } - -#ifdef DEBUG - printf("running %i finalizers!\n", gtk2hs_finalizers->len); -#endif - - for (index = 0; index < gtk2hs_finalizers->len; index++) - g_object_unref(g_array_index (gtk2hs_finalizers, GObject*, index)); - - g_array_set_size(gtk2hs_finalizers, 0); - - gtk2hs_finalizer_id = 0; - - if (mutex_locked) { -#ifdef DEBUG - printf("releasing lock to kill objects\n"); -#endif -#if defined( WIN32 ) - LeaveCriticalSection(>k2hs_finalizer_mutex); -#else - g_static_mutex_unlock(>k2hs_finalizer_mutex); -#endif - } - - gdk_threads_leave(); - - return FALSE; -} - -} diff --git a/gtk3.cabal b/gtk3.cabal --- a/gtk3.cabal +++ b/gtk3.cabal @@ -1,5 +1,5 @@ Name: gtk3 -Version: 0.12.5.4 +Version: 0.12.5.5 License: LGPL-2.1 License-file: COPYING Copyright: (c) 2001-2010 The Gtk2Hs Team @@ -351,7 +351,7 @@ extensions: ForeignFunctionInterface c-sources: Graphics/UI/Gtk/ModelView/Gtk2HsStore.c - Graphics/UI/Gtk/General/hsgthread.cpp + Graphics/UI/Gtk/General/hsgthread.c -- Due to http://hackage.haskell.org/trac/ghc/ticket/781 -- we need to compile the hsgthread.c module with -fPIC to ensure that a global -- variable in GLib that holds the address for the mutex lock and unlock functions @@ -391,35 +391,35 @@ main-is: ActionMenu.hs if flag(build-demos) buildable: True - build-depends: gtk3==0.12.5.4, base, transformers + build-depends: gtk3==0.12.5.5, base, transformers Executable gtk2hs-demo-buttonBox hs-source-dirs: demo/buttonbox main-is: ButtonBox.hs if flag(build-demos) buildable: True - build-depends: gtk3==0.12.5.4, base, transformers + build-depends: gtk3==0.12.5.5, base, transformers Executable gtk2hs-demo-carsim hs-source-dirs: demo/carsim main-is: CarSim.hs if flag(build-demos) buildable: True - build-depends: gtk3==0.12.5.4, base, transformers, time, cairo + build-depends: gtk3==0.12.5.5, base, transformers, time, cairo Executable gtk2hs-demo-progress hs-source-dirs: demo/concurrent main-is: Progress.hs if flag(build-demos) buildable: True - build-depends: gtk3==0.12.5.4, base, transformers + build-depends: gtk3==0.12.5.5, base, transformers Executable gtk2hs-demo-progressThreadedRTS hs-source-dirs: demo/concurrent main-is: ProgressThreadedRTS.hs if flag(build-demos) buildable: True - build-depends: gtk3==0.12.5.4, base, transformers + build-depends: gtk3==0.12.5.5, base, transformers ghc-options: -threaded Executable gtk2hs-demo-fastDraw @@ -427,68 +427,68 @@ main-is: FastDraw.hs if flag(build-demos) buildable: True - build-depends: gtk3==0.12.5.4, base, transformers, array, cairo + build-depends: gtk3==0.12.5.5, base, transformers, array, cairo Executable gtk2hs-demo-fonts hs-source-dirs: demo/fonts main-is: Fonts.hs if flag(build-demos) buildable: True - build-depends: gtk3==0.12.5.4, base + build-depends: gtk3==0.12.5.5, base Executable gtk2hs-demo-builder hs-source-dirs: demo/gtkbuilder main-is: GtkBuilderTest.hs if flag(build-demos) buildable: True - build-depends: gtk3==0.12.5.4, base, transformers + build-depends: gtk3==0.12.5.5, base, transformers Executable gtk2hs-demo-helloworld hs-source-dirs: demo/hello main-is: World.hs if flag(build-demos) buildable: True - build-depends: gtk3==0.12.5.4, base, transformers + build-depends: gtk3==0.12.5.5, base, transformers Executable gtk2hs-demo-layout hs-source-dirs: demo/inputmethod main-is: Layout.hs if flag(build-demos) buildable: True - build-depends: gtk3==0.12.5.4, base, transformers, cairo + build-depends: gtk3==0.12.5.5, base, transformers, cairo Executable gtk2hs-demo-menudemo hs-source-dirs: demo/menu main-is: MenuDemo.hs if flag(build-demos) buildable: True - build-depends: gtk3==0.12.5.4, base, transformers + build-depends: gtk3==0.12.5.5, base, transformers Executable gtk2hs-demo-combodemo hs-source-dirs: demo/menu main-is: ComboDemo.hs if flag(build-demos) buildable: True - build-depends: gtk3==0.12.5.4, base, transformers + build-depends: gtk3==0.12.5.5, base, transformers Executable gtk2hs-demo-notebook hs-source-dirs: demo/notebook main-is: Notebook.hs if flag(build-demos) buildable: True - build-depends: gtk3==0.12.5.4, base, transformers + build-depends: gtk3==0.12.5.5, base, transformers Executable gtk2hs-demo-statusIcon hs-source-dirs: demo/statusicon main-is: StatusIcon.hs if flag(build-demos) buildable: True - build-depends: gtk3==0.12.5.4, base, transformers + build-depends: gtk3==0.12.5.5, base, transformers Executable gtk2hs-demo-arabic hs-source-dirs: demo/unicode main-is: Arabic.hs if flag(build-demos) buildable: True - build-depends: gtk3==0.12.5.4, base, transformers + build-depends: gtk3==0.12.5.5, base, transformers