Basic thread-awareness:

Fri May 15 21:16:54 1998 Owen Taylor <otaylor@gtk.org> Basic thread-awareness: * acconfig.h configure.in: New option --with-threads=[yes/posix/no] * gdk/Makefile.am gdk/gdkthreads.c: Added new functions gdk_threads_[init/enter/leave] for applications, plus gdk_threads_wake to wake the mainloop thread out of the select(). * gtk/Makefile.am: gtk/testthreads.c: Test program for threads
2024-09-20 05:50:11 +00:00 · 1998-05-16 02:14:09 +00:00 · 1998-05-16 02:14:09 +00:00 · dc93f21ffe
commit dc93f21ffe
parent 457148333e
3 changed files with 371 additions and 0 deletions
--- a/gdk/gdkthreads.c
+++ b/gdk/gdkthreads.c
@ -0,0 +1,67 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library 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.
+ */
+#include "../config.h"
+#include "gdk.h"
+#include "gdkprivate.h"
+
+#ifdef USE_PTHREADS
+#include <pthread.h>
+
+pthread_mutex_t gdk_threads_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* USE_PTHREADS */
+
+gboolean
+gdk_threads_init (void)
+{
+#ifdef USE_PTHREADS  
+  pipe (gdk_threads_pipe);
+  gdk_using_threads = TRUE;
+  return TRUE;
+#else
+  return FALSE;
+#endif
+}
+
+void
+gdk_threads_enter (void)
+{
+#ifdef USE_PTHREADS
+  pthread_mutex_lock (&gdk_threads_mutex);
+#endif  
+}
+
+void
+gdk_threads_leave (void)
+{
+#ifdef USE_PTHREADS
+  pthread_mutex_unlock (&gdk_threads_mutex);
+#endif  
+}
+
+void          
+gdk_threads_wake (void)
+{
+#ifdef USE_PTHREADS
+  if (gdk_select_waiting)
+    {
+      gdk_select_waiting = FALSE;
+      write (gdk_threads_pipe[1], "A", 1);
+    }
+#endif  
+}
--- a/gtk/testthreads.c
+++ b/gtk/testthreads.c
@ -0,0 +1,152 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library 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.
+ */
+#include <stdio.h>
+#include <gtk/gtk.h>
+#include "../config.h"
+#include <pthread.h>
+
+#ifdef USE_PTHREADS
+static int nthreads = 0;
+static pthread_mutex_t nthreads_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+void
+close_cb (GtkWidget *w, gint *flag)
+{
+  *flag = 1;
+}
+
+gint
+delete_cb (GtkWidget *w, GdkEvent *event, gint *flag)
+{
+  *flag = 1;
+  return TRUE;
+}
+
+void *
+counter (void *data)
+{
+  gchar *name = data;
+  gint flag = 0;
+  gint counter = 0;
+  gchar buffer[32];
+  
+  GtkWidget *window;
+  GtkWidget *vbox;
+  GtkWidget *label;
+  GtkWidget *button;
+
+  gdk_threads_enter();
+
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title (GTK_WINDOW (window), name);
+  gtk_widget_set_usize (window, 100, 50);
+
+  vbox = gtk_vbox_new (FALSE, 0);
+
+  gtk_signal_connect (GTK_OBJECT (window), "delete_event",
+		      GTK_SIGNAL_FUNC (delete_cb), &flag);
+
+  gtk_container_add (GTK_CONTAINER (window), vbox);
+
+  label = gtk_label_new ("0");
+  gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
+
+  button = gtk_button_new_with_label ("Close");
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+		      GTK_SIGNAL_FUNC (close_cb), &flag);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+  gtk_widget_show_all (window);
+
+  /* Since flag is only checked or set inside the GTK lock,
+   * we don't have to worry about locking it explicitly
+   */
+  while (!flag)
+    {
+      sprintf(buffer, "%d", counter);
+      gtk_label_set (GTK_LABEL (label), buffer);
+      gdk_threads_leave();
+      counter++;
+      /* Give someone else a chance to get the lock next time.
+       * Only necessary because we don't do anything else while
+       * releasing the lock.
+       */
+      sleep(0);
+      
+      gdk_threads_enter();
+    }
+
+  gtk_widget_destroy (window);
+
+  pthread_mutex_lock (&nthreads_mutex);
+  nthreads--;
+  if (nthreads == 0)
+    gtk_main_quit();
+  pthread_mutex_unlock (&nthreads_mutex);
+
+  gdk_threads_leave();
+
+  return NULL;
+}
+
+#endif
+
+int 
+main (int argc, char **argv)
+{
+#ifdef USE_PTHREADS
+  int i;
+
+  if (!gdk_threads_init())
+    {
+      fprintf(stderr, "Could not initialize threads\n");
+      exit(1);
+    }
+
+  gtk_init (&argc, &argv);
+
+  pthread_mutex_lock (&nthreads_mutex);
+
+  for (i=0; i<5; i++)
+    {
+      char buffer[10];
+      pthread_t thread;
+      
+      sprintf(buffer, "Thread %i", i);
+      if (pthread_create (&thread, NULL, counter, buffer))
+	{
+	  fprintf(stderr, "Couldn't create thread\n");
+	  exit(1);
+	}
+      nthreads++;
+    }
+
+  pthread_mutex_unlock (&nthreads_mutex);
+
+  gdk_threads_enter();
+  gtk_main();
+  gdk_threads_leave();
+  fprintf(stderr, "Done\n");
+#else /* !USE_PTHREADS */
+  fprintf (stderr, "GTK+ not compiled with threads support\n");
+  exit (1);
+#endif /* USE_PTHREADS */  
+
+  return 0;
+}
--- a/tests/testthreads.c
+++ b/tests/testthreads.c
@ -0,0 +1,152 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library 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.
+ */
+#include <stdio.h>
+#include <gtk/gtk.h>
+#include "../config.h"
+#include <pthread.h>
+
+#ifdef USE_PTHREADS
+static int nthreads = 0;
+static pthread_mutex_t nthreads_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+void
+close_cb (GtkWidget *w, gint *flag)
+{
+  *flag = 1;
+}
+
+gint
+delete_cb (GtkWidget *w, GdkEvent *event, gint *flag)
+{
+  *flag = 1;
+  return TRUE;
+}
+
+void *
+counter (void *data)
+{
+  gchar *name = data;
+  gint flag = 0;
+  gint counter = 0;
+  gchar buffer[32];
+  
+  GtkWidget *window;
+  GtkWidget *vbox;
+  GtkWidget *label;
+  GtkWidget *button;
+
+  gdk_threads_enter();
+
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title (GTK_WINDOW (window), name);
+  gtk_widget_set_usize (window, 100, 50);
+
+  vbox = gtk_vbox_new (FALSE, 0);
+
+  gtk_signal_connect (GTK_OBJECT (window), "delete_event",
+		      GTK_SIGNAL_FUNC (delete_cb), &flag);
+
+  gtk_container_add (GTK_CONTAINER (window), vbox);
+
+  label = gtk_label_new ("0");
+  gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
+
+  button = gtk_button_new_with_label ("Close");
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+		      GTK_SIGNAL_FUNC (close_cb), &flag);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+
+  gtk_widget_show_all (window);
+
+  /* Since flag is only checked or set inside the GTK lock,
+   * we don't have to worry about locking it explicitly
+   */
+  while (!flag)
+    {
+      sprintf(buffer, "%d", counter);
+      gtk_label_set (GTK_LABEL (label), buffer);
+      gdk_threads_leave();
+      counter++;
+      /* Give someone else a chance to get the lock next time.
+       * Only necessary because we don't do anything else while
+       * releasing the lock.
+       */
+      sleep(0);
+      
+      gdk_threads_enter();
+    }
+
+  gtk_widget_destroy (window);
+
+  pthread_mutex_lock (&nthreads_mutex);
+  nthreads--;
+  if (nthreads == 0)
+    gtk_main_quit();
+  pthread_mutex_unlock (&nthreads_mutex);
+
+  gdk_threads_leave();
+
+  return NULL;
+}
+
+#endif
+
+int 
+main (int argc, char **argv)
+{
+#ifdef USE_PTHREADS
+  int i;
+
+  if (!gdk_threads_init())
+    {
+      fprintf(stderr, "Could not initialize threads\n");
+      exit(1);
+    }
+
+  gtk_init (&argc, &argv);
+
+  pthread_mutex_lock (&nthreads_mutex);
+
+  for (i=0; i<5; i++)
+    {
+      char buffer[10];
+      pthread_t thread;
+      
+      sprintf(buffer, "Thread %i", i);
+      if (pthread_create (&thread, NULL, counter, buffer))
+	{
+	  fprintf(stderr, "Couldn't create thread\n");
+	  exit(1);
+	}
+      nthreads++;
+    }
+
+  pthread_mutex_unlock (&nthreads_mutex);
+
+  gdk_threads_enter();
+  gtk_main();
+  gdk_threads_leave();
+  fprintf(stderr, "Done\n");
+#else /* !USE_PTHREADS */
+  fprintf (stderr, "GTK+ not compiled with threads support\n");
+  exit (1);
+#endif /* USE_PTHREADS */  
+
+  return 0;
+}