Make sure all calls to g_node_validate_allocator are within

Tue Dec 15 10:40:09 1998  Owen Taylor  <otaylor@redhat.com>

	* gnode.c glist.c gslist.c: Make sure all
	calls to g_node_validate_allocator are within
	current_allocator lock, so we have consistency
	on that point. (Should not really matter,
	but this way we match the comments)

	* glist.c (g_list_free_1): Removed some lines
	that should never have been committed. (For
	debugging)

diff --git a/ChangeLog b/ChangeLog
index dc3ecadc7c7a8a7548098512a511f3b3b5ffd000..9f2478747415828097a4ea9f1e89bfe9cefa2d09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Tue Dec 15 10:40:09 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gnode.c glist.c gslist.c: Make sure all
+       calls to g_node_validate_allocator are within
+       current_allocator lock, so we have consistency
+       on that point. (Should not really matter,
+       but this way we match the comments)
+
+       * glist.c (g_list_free_1): Removed some lines
+       that should never have been committed. (For
+       debugging)
+
 1998-12-11  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread/gthread-nspr.c, configure.in: Added new default thread

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index dc3ecadc7c7a8a7548098512a511f3b3b5ffd000..9f2478747415828097a4ea9f1e89bfe9cefa2d09 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,15 @@
+Tue Dec 15 10:40:09 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gnode.c glist.c gslist.c: Make sure all
+       calls to g_node_validate_allocator are within
+       current_allocator lock, so we have consistency
+       on that point. (Should not really matter,
+       but this way we match the comments)
+
+       * glist.c (g_list_free_1): Removed some lines
+       that should never have been committed. (For
+       debugging)
+
 1998-12-11  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread/gthread-nspr.c, configure.in: Added new default thread

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index dc3ecadc7c7a8a7548098512a511f3b3b5ffd000..9f2478747415828097a4ea9f1e89bfe9cefa2d09 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+Tue Dec 15 10:40:09 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gnode.c glist.c gslist.c: Make sure all
+       calls to g_node_validate_allocator are within
+       current_allocator lock, so we have consistency
+       on that point. (Should not really matter,
+       but this way we match the comments)
+
+       * glist.c (g_list_free_1): Removed some lines
+       that should never have been committed. (For
+       debugging)
+
 1998-12-11  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread/gthread-nspr.c, configure.in: Added new default thread

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index dc3ecadc7c7a8a7548098512a511f3b3b5ffd000..9f2478747415828097a4ea9f1e89bfe9cefa2d09 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,15 @@
+Tue Dec 15 10:40:09 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gnode.c glist.c gslist.c: Make sure all
+       calls to g_node_validate_allocator are within
+       current_allocator lock, so we have consistency
+       on that point. (Should not really matter,
+       but this way we match the comments)
+
+       * glist.c (g_list_free_1): Removed some lines
+       that should never have been committed. (For
+       debugging)
+
 1998-12-11  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread/gthread-nspr.c, configure.in: Added new default thread

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index dc3ecadc7c7a8a7548098512a511f3b3b5ffd000..9f2478747415828097a4ea9f1e89bfe9cefa2d09 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+Tue Dec 15 10:40:09 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gnode.c glist.c gslist.c: Make sure all
+       calls to g_node_validate_allocator are within
+       current_allocator lock, so we have consistency
+       on that point. (Should not really matter,
+       but this way we match the comments)
+
+       * glist.c (g_list_free_1): Removed some lines
+       that should never have been committed. (For
+       debugging)
+
 1998-12-11  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread/gthread-nspr.c, configure.in: Added new default thread

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index dc3ecadc7c7a8a7548098512a511f3b3b5ffd000..9f2478747415828097a4ea9f1e89bfe9cefa2d09 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+Tue Dec 15 10:40:09 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gnode.c glist.c gslist.c: Make sure all
+       calls to g_node_validate_allocator are within
+       current_allocator lock, so we have consistency
+       on that point. (Should not really matter,
+       but this way we match the comments)
+
+       * glist.c (g_list_free_1): Removed some lines
+       that should never have been committed. (For
+       debugging)
+
 1998-12-11  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread/gthread-nspr.c, configure.in: Added new default thread

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index dc3ecadc7c7a8a7548098512a511f3b3b5ffd000..9f2478747415828097a4ea9f1e89bfe9cefa2d09 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+Tue Dec 15 10:40:09 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gnode.c glist.c gslist.c: Make sure all
+       calls to g_node_validate_allocator are within
+       current_allocator lock, so we have consistency
+       on that point. (Should not really matter,
+       but this way we match the comments)
+
+       * glist.c (g_list_free_1): Removed some lines
+       that should never have been committed. (For
+       debugging)
+
 1998-12-11  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread/gthread-nspr.c, configure.in: Added new default thread

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index dc3ecadc7c7a8a7548098512a511f3b3b5ffd000..9f2478747415828097a4ea9f1e89bfe9cefa2d09 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+Tue Dec 15 10:40:09 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gnode.c glist.c gslist.c: Make sure all
+       calls to g_node_validate_allocator are within
+       current_allocator lock, so we have consistency
+       on that point. (Should not really matter,
+       but this way we match the comments)
+
+       * glist.c (g_list_free_1): Removed some lines
+       that should never have been committed. (For
+       debugging)
+
 1998-12-11  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread/gthread-nspr.c, configure.in: Added new default thread

diff --git a/glib.m4 b/glib.m4
index f83a138399ee80d0f640f239bbc16bb9f1ee56bd..f26ccdc08324390d384979693650cb226cec4343 100644 (file)
--- a/glib.m4
+++ b/glib.m4
@@ -2,8 +2,8 @@
 # Owen Taylor     97-11-3
 
 dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" is specified
-dnl in MODULES, feature the glib-config gmodule option.
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
+dnl gthread is specified in MODULES, pass to glib-config
 dnl
 AC_DEFUN(AM_PATH_GLIB,
 [dnl 
@@ -29,9 +29,16 @@ AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and ru
      fi
   fi
 
-  case "$4" in
-  *gmodule*) glib_config_args="$glib_config_args gmodule";;
-  esac
+  for module in $4 ; do
+      case "$module" in
+         gmodule) 
+             glib_config_args="$glib_config_args gmodule"
+         ;;
+         gthread) 
+             glib_config_args="$glib_config_args gthread"
+         ;;
+      esac
+  done
 
   AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
   min_glib_version=ifelse([$1], ,0.99.7,$1)

diff --git a/glib/glist.c b/glib/glist.c
index e74dee8720d326f715e3542c5a244330a6daa245..d4ddc6ffdfca55bd0f59cc8a7972e1e9f9bb0539 100644 (file)
--- a/glib/glist.c
+++ b/glib/glist.c
@@ -70,8 +70,8 @@ g_list_validate_allocator (GAllocator *allocator)
 void
 g_list_push_allocator(GAllocator *allocator)
 {
-  g_list_validate_allocator ( allocator );
   g_lock (current_allocator);
+  g_list_validate_allocator ( allocator );
   allocator->last = current_allocator;
   current_allocator = allocator;
   g_unlock (current_allocator);
@@ -136,7 +136,6 @@ g_list_alloc (void)
 void
 g_list_free (GList *list)
 {
-#if 0
   if (list)
     {
       list->data = list->next;  
@@ -145,13 +144,11 @@ g_list_free (GList *list)
       current_allocator->free_lists = list;
       g_unlock (current_allocator);
     }
-#endif
 }
 
 void
 g_list_free_1 (GList *list)
 {
-#if 0  
   if (list)
     {
       list->data = NULL;  
@@ -160,7 +157,6 @@ g_list_free_1 (GList *list)
       current_allocator->free_lists = list;
       g_unlock (current_allocator);
     }
-#endif  
 }
 
 GList*

diff --git a/glib/gnode.c b/glib/gnode.c
index 089a4996db45fd8643fe4d6173f51c9eea1772ed..c9c135a8513c8e8544a24c32da2fdabf4103a9fc 100644 (file)
--- a/glib/gnode.c
+++ b/glib/gnode.c
@@ -74,8 +74,8 @@ g_node_validate_allocator (GAllocator *allocator)
 void
 g_node_push_allocator (GAllocator *allocator)
 {
-  g_node_validate_allocator ( allocator );
   g_lock (current_allocator);
+  g_node_validate_allocator ( allocator );
   allocator->last = current_allocator;
   current_allocator = allocator;
   g_unlock (current_allocator);

diff --git a/glib/gslist.c b/glib/gslist.c
index 1ed517ff6ad5f81996294a7e7865f30a95849389..ec59e6c7e44817b2ba3adfeddd26c66610174aba 100644 (file)
--- a/glib/gslist.c
+++ b/glib/gslist.c
@@ -70,8 +70,8 @@ g_slist_validate_allocator (GAllocator *allocator)
 void
 g_slist_push_allocator (GAllocator *allocator)
 {
-  g_slist_validate_allocator (allocator);
   g_lock (current_allocator);
+  g_slist_validate_allocator (allocator);
   allocator->last = current_allocator;
   current_allocator = allocator;
   g_unlock (current_allocator);

diff --git a/glist.c b/glist.c
index e74dee8720d326f715e3542c5a244330a6daa245..d4ddc6ffdfca55bd0f59cc8a7972e1e9f9bb0539 100644 (file)
--- a/glist.c
+++ b/glist.c
@@ -70,8 +70,8 @@ g_list_validate_allocator (GAllocator *allocator)
 void
 g_list_push_allocator(GAllocator *allocator)
 {
-  g_list_validate_allocator ( allocator );
   g_lock (current_allocator);
+  g_list_validate_allocator ( allocator );
   allocator->last = current_allocator;
   current_allocator = allocator;
   g_unlock (current_allocator);
@@ -136,7 +136,6 @@ g_list_alloc (void)
 void
 g_list_free (GList *list)
 {
-#if 0
   if (list)
     {
       list->data = list->next;  
@@ -145,13 +144,11 @@ g_list_free (GList *list)
       current_allocator->free_lists = list;
       g_unlock (current_allocator);
     }
-#endif
 }
 
 void
 g_list_free_1 (GList *list)
 {
-#if 0  
   if (list)
     {
       list->data = NULL;  
@@ -160,7 +157,6 @@ g_list_free_1 (GList *list)
       current_allocator->free_lists = list;
       g_unlock (current_allocator);
     }
-#endif  
 }
 
 GList*

diff --git a/gnode.c b/gnode.c
index 089a4996db45fd8643fe4d6173f51c9eea1772ed..c9c135a8513c8e8544a24c32da2fdabf4103a9fc 100644 (file)
--- a/gnode.c
+++ b/gnode.c
@@ -74,8 +74,8 @@ g_node_validate_allocator (GAllocator *allocator)
 void
 g_node_push_allocator (GAllocator *allocator)
 {
-  g_node_validate_allocator ( allocator );
   g_lock (current_allocator);
+  g_node_validate_allocator ( allocator );
   allocator->last = current_allocator;
   current_allocator = allocator;
   g_unlock (current_allocator);

diff --git a/gslist.c b/gslist.c
index 1ed517ff6ad5f81996294a7e7865f30a95849389..ec59e6c7e44817b2ba3adfeddd26c66610174aba 100644 (file)
--- a/gslist.c
+++ b/gslist.c
@@ -70,8 +70,8 @@ g_slist_validate_allocator (GAllocator *allocator)
 void
 g_slist_push_allocator (GAllocator *allocator)
 {
-  g_slist_validate_allocator (allocator);
   g_lock (current_allocator);
+  g_slist_validate_allocator (allocator);
   allocator->last = current_allocator;
   current_allocator = allocator;
   g_unlock (current_allocator);