Mercurial > dwindows

diff gtk/dw.c @ 1510:218c85939040

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ported fixes in previous commit from GTK2 to GTK3... Also dw_main_sleep() and dW_main_iteration() needed more complicated locking code on Linux... Due to Linux's use of fast mutexes double locking will deadlock, and calling dw_main_*() from a DW API function or callback before starting dw_main() might cause a double lock... We need to only lock the mutex if it isn't already locked by this thread.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Wed, 28 Dec 2011 14:46:57 +0000
parents 02bfae9fd3e7
children 9d342b67eed5
line wrap: on
line diff
--- a/gtk/dw.c	Wed Dec 28 13:12:12 2011 +0000
+++ b/gtk/dw.c	Wed Dec 28 14:46:57 2011 +0000
@@ -2227,19 +2227,30 @@
 
       while(((tv.tv_sec - start.tv_sec)*1000) + ((tv.tv_usec - start.tv_usec)/1000) <= milliseconds)
       {
+         int _locked_by_me = FALSE;
+         
          if(orig == (pthread_t)-1)
          {
-            gdk_threads_enter();
+            if(!pthread_getspecific(_dw_mutex_key))
+            {
+               gdk_threads_enter();
+               pthread_setspecific(_dw_mutex_key, (void *)1);
+               _locked_by_me = TRUE;
+            }
             _dw_thread = curr;
          }
-         if(gtk_events_pending())
+         if(curr == _dw_thread && gtk_events_pending())
             gtk_main_iteration();
          else
             _dw_msleep(1);
          if(orig == (pthread_t)-1)
          {
             _dw_thread = orig;
-            gdk_threads_leave();
+            if(_locked_by_me)
+            {
+               pthread_setspecific(_dw_mutex_key, NULL);
+               gdk_threads_leave();
+            }
          }
          gettimeofday(&tv, NULL);
       }
@@ -2255,24 +2266,30 @@
 {
    pthread_t orig = _dw_thread;
    pthread_t curr = pthread_self();
+   int _locked_by_me = FALSE;
    
    if(_dw_thread == (pthread_t)-1)
    {
+      if(!pthread_getspecific(_dw_mutex_key))
+      {
+         gdk_threads_enter();
+         pthread_setspecific(_dw_mutex_key, (void *)1);
+         _locked_by_me = TRUE;
+      }
       _dw_thread = curr;
-      gdk_threads_enter();
    }
    if(curr == _dw_thread && gtk_events_pending())
       gtk_main_iteration();
    else
-#ifdef __sun__
       sched_yield();
-#else   
-      pthread_yield();
-#endif
    if(orig == (pthread_t)-1)
    {
-      _dw_thread = (pthread_t)-1;
-      gdk_threads_leave();
+      _dw_thread = orig;
+      if(_locked_by_me)
+      {
+         pthread_setspecific(_dw_mutex_key, NULL);
+         gdk_threads_leave();
+      }
    }
 }
 
@@ -10154,7 +10171,7 @@
 
 union extents_union { guchar **gu_extents; unsigned long **extents; };
 static GdkAtom extents_atom = 0;
-static time_t extents_time;
+static time_t extents_time = 0;
 
 static gboolean _dw_property_notify(GtkWidget *window, GdkEventProperty* event, GdkWindow *gdkwindow)
 {