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)
This commit is contained in:
Owen Taylor 1998-12-15 15:40:01 +00:00 committed by Owen Taylor
parent 931ea95265
commit dcd0c664b7
15 changed files with 114 additions and 19 deletions

View File

@ -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> 1998-12-11 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gthread/gthread-nspr.c, configure.in: Added new default thread * gthread/gthread-nspr.c, configure.in: Added new default thread

View File

@ -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> 1998-12-11 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gthread/gthread-nspr.c, configure.in: Added new default thread * gthread/gthread-nspr.c, configure.in: Added new default thread

View File

@ -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> 1998-12-11 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gthread/gthread-nspr.c, configure.in: Added new default thread * gthread/gthread-nspr.c, configure.in: Added new default thread

View File

@ -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> 1998-12-11 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gthread/gthread-nspr.c, configure.in: Added new default thread * gthread/gthread-nspr.c, configure.in: Added new default thread

View File

@ -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> 1998-12-11 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gthread/gthread-nspr.c, configure.in: Added new default thread * gthread/gthread-nspr.c, configure.in: Added new default thread

View File

@ -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> 1998-12-11 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gthread/gthread-nspr.c, configure.in: Added new default thread * gthread/gthread-nspr.c, configure.in: Added new default thread

View File

@ -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> 1998-12-11 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gthread/gthread-nspr.c, configure.in: Added new default thread * gthread/gthread-nspr.c, configure.in: Added new default thread

View File

@ -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> 1998-12-11 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gthread/gthread-nspr.c, configure.in: Added new default thread * gthread/gthread-nspr.c, configure.in: Added new default thread

17
glib.m4
View File

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

View File

@ -70,8 +70,8 @@ g_list_validate_allocator (GAllocator *allocator)
void void
g_list_push_allocator(GAllocator *allocator) g_list_push_allocator(GAllocator *allocator)
{ {
g_list_validate_allocator ( allocator );
g_lock (current_allocator); g_lock (current_allocator);
g_list_validate_allocator ( allocator );
allocator->last = current_allocator; allocator->last = current_allocator;
current_allocator = allocator; current_allocator = allocator;
g_unlock (current_allocator); g_unlock (current_allocator);
@ -136,7 +136,6 @@ g_list_alloc (void)
void void
g_list_free (GList *list) g_list_free (GList *list)
{ {
#if 0
if (list) if (list)
{ {
list->data = list->next; list->data = list->next;
@ -145,13 +144,11 @@ g_list_free (GList *list)
current_allocator->free_lists = list; current_allocator->free_lists = list;
g_unlock (current_allocator); g_unlock (current_allocator);
} }
#endif
} }
void void
g_list_free_1 (GList *list) g_list_free_1 (GList *list)
{ {
#if 0
if (list) if (list)
{ {
list->data = NULL; list->data = NULL;
@ -160,7 +157,6 @@ g_list_free_1 (GList *list)
current_allocator->free_lists = list; current_allocator->free_lists = list;
g_unlock (current_allocator); g_unlock (current_allocator);
} }
#endif
} }
GList* GList*

View File

@ -74,8 +74,8 @@ g_node_validate_allocator (GAllocator *allocator)
void void
g_node_push_allocator (GAllocator *allocator) g_node_push_allocator (GAllocator *allocator)
{ {
g_node_validate_allocator ( allocator );
g_lock (current_allocator); g_lock (current_allocator);
g_node_validate_allocator ( allocator );
allocator->last = current_allocator; allocator->last = current_allocator;
current_allocator = allocator; current_allocator = allocator;
g_unlock (current_allocator); g_unlock (current_allocator);

View File

@ -70,8 +70,8 @@ g_slist_validate_allocator (GAllocator *allocator)
void void
g_slist_push_allocator (GAllocator *allocator) g_slist_push_allocator (GAllocator *allocator)
{ {
g_slist_validate_allocator (allocator);
g_lock (current_allocator); g_lock (current_allocator);
g_slist_validate_allocator (allocator);
allocator->last = current_allocator; allocator->last = current_allocator;
current_allocator = allocator; current_allocator = allocator;
g_unlock (current_allocator); g_unlock (current_allocator);

View File

@ -70,8 +70,8 @@ g_list_validate_allocator (GAllocator *allocator)
void void
g_list_push_allocator(GAllocator *allocator) g_list_push_allocator(GAllocator *allocator)
{ {
g_list_validate_allocator ( allocator );
g_lock (current_allocator); g_lock (current_allocator);
g_list_validate_allocator ( allocator );
allocator->last = current_allocator; allocator->last = current_allocator;
current_allocator = allocator; current_allocator = allocator;
g_unlock (current_allocator); g_unlock (current_allocator);
@ -136,7 +136,6 @@ g_list_alloc (void)
void void
g_list_free (GList *list) g_list_free (GList *list)
{ {
#if 0
if (list) if (list)
{ {
list->data = list->next; list->data = list->next;
@ -145,13 +144,11 @@ g_list_free (GList *list)
current_allocator->free_lists = list; current_allocator->free_lists = list;
g_unlock (current_allocator); g_unlock (current_allocator);
} }
#endif
} }
void void
g_list_free_1 (GList *list) g_list_free_1 (GList *list)
{ {
#if 0
if (list) if (list)
{ {
list->data = NULL; list->data = NULL;
@ -160,7 +157,6 @@ g_list_free_1 (GList *list)
current_allocator->free_lists = list; current_allocator->free_lists = list;
g_unlock (current_allocator); g_unlock (current_allocator);
} }
#endif
} }
GList* GList*

View File

@ -74,8 +74,8 @@ g_node_validate_allocator (GAllocator *allocator)
void void
g_node_push_allocator (GAllocator *allocator) g_node_push_allocator (GAllocator *allocator)
{ {
g_node_validate_allocator ( allocator );
g_lock (current_allocator); g_lock (current_allocator);
g_node_validate_allocator ( allocator );
allocator->last = current_allocator; allocator->last = current_allocator;
current_allocator = allocator; current_allocator = allocator;
g_unlock (current_allocator); g_unlock (current_allocator);

View File

@ -70,8 +70,8 @@ g_slist_validate_allocator (GAllocator *allocator)
void void
g_slist_push_allocator (GAllocator *allocator) g_slist_push_allocator (GAllocator *allocator)
{ {
g_slist_validate_allocator (allocator);
g_lock (current_allocator); g_lock (current_allocator);
g_slist_validate_allocator (allocator);
allocator->last = current_allocator; allocator->last = current_allocator;
current_allocator = allocator; current_allocator = allocator;
g_unlock (current_allocator); g_unlock (current_allocator);