From 531f83a566fe29a5d83be2d7aeebb16f14653180 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Sun, 17 Oct 1999 16:01:48 +0000 Subject: [PATCH] remove g_dataset_global_lock around destroy() notification here as well. Sun Oct 17 18:11:40 1999 Tim Janik * gdataset.c (g_data_set_internal): remove g_dataset_global_lock around destroy() notification here as well. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdataset.c | 8 +++++++- glib/gdataset.c | 8 +++++++- 10 files changed, 54 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16314a6ad..fa7a6017d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Oct 17 18:11:40 1999 Tim Janik + + * gdataset.c (g_data_set_internal): remove g_dataset_global_lock around + destroy() notification here as well. + 1999-10-15 Sebastian Wilhelmi * gdataset.c (g_datalist_clear_i): Avoid Freezing, when g_datalist diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 16314a6ad..fa7a6017d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sun Oct 17 18:11:40 1999 Tim Janik + + * gdataset.c (g_data_set_internal): remove g_dataset_global_lock around + destroy() notification here as well. + 1999-10-15 Sebastian Wilhelmi * gdataset.c (g_datalist_clear_i): Avoid Freezing, when g_datalist diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 16314a6ad..fa7a6017d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Oct 17 18:11:40 1999 Tim Janik + + * gdataset.c (g_data_set_internal): remove g_dataset_global_lock around + destroy() notification here as well. + 1999-10-15 Sebastian Wilhelmi * gdataset.c (g_datalist_clear_i): Avoid Freezing, when g_datalist diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 16314a6ad..fa7a6017d 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Sun Oct 17 18:11:40 1999 Tim Janik + + * gdataset.c (g_data_set_internal): remove g_dataset_global_lock around + destroy() notification here as well. + 1999-10-15 Sebastian Wilhelmi * gdataset.c (g_datalist_clear_i): Avoid Freezing, when g_datalist diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 16314a6ad..fa7a6017d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sun Oct 17 18:11:40 1999 Tim Janik + + * gdataset.c (g_data_set_internal): remove g_dataset_global_lock around + destroy() notification here as well. + 1999-10-15 Sebastian Wilhelmi * gdataset.c (g_datalist_clear_i): Avoid Freezing, when g_datalist diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 16314a6ad..fa7a6017d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Oct 17 18:11:40 1999 Tim Janik + + * gdataset.c (g_data_set_internal): remove g_dataset_global_lock around + destroy() notification here as well. + 1999-10-15 Sebastian Wilhelmi * gdataset.c (g_datalist_clear_i): Avoid Freezing, when g_datalist diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 16314a6ad..fa7a6017d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Oct 17 18:11:40 1999 Tim Janik + + * gdataset.c (g_data_set_internal): remove g_dataset_global_lock around + destroy() notification here as well. + 1999-10-15 Sebastian Wilhelmi * gdataset.c (g_datalist_clear_i): Avoid Freezing, when g_datalist diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 16314a6ad..fa7a6017d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Oct 17 18:11:40 1999 Tim Janik + + * gdataset.c (g_data_set_internal): remove g_dataset_global_lock around + destroy() notification here as well. + 1999-10-15 Sebastian Wilhelmi * gdataset.c (g_datalist_clear_i): Avoid Freezing, when g_datalist diff --git a/gdataset.c b/gdataset.c index 5fbccbd47..2aa4032ab 100644 --- a/gdataset.c +++ b/gdataset.c @@ -237,7 +237,11 @@ g_data_set_internal (GData **datalist, * data without destroy notification */ if (list->destroy_func && !destroy_func) - list->destroy_func (list->data); + { + G_UNLOCK (g_dataset_global); + list->destroy_func (list->data); + G_LOCK (g_dataset_global); + } if (g_data_cache_length < G_DATA_CACHE_MAX) { @@ -279,7 +283,9 @@ g_data_set_internal (GData **datalist, /* we need to have updated all structures prior to * invokation of the destroy function */ + G_UNLOCK (g_dataset_global); dfunc (ddata); + G_LOCK (g_dataset_global); } return; diff --git a/glib/gdataset.c b/glib/gdataset.c index 5fbccbd47..2aa4032ab 100644 --- a/glib/gdataset.c +++ b/glib/gdataset.c @@ -237,7 +237,11 @@ g_data_set_internal (GData **datalist, * data without destroy notification */ if (list->destroy_func && !destroy_func) - list->destroy_func (list->data); + { + G_UNLOCK (g_dataset_global); + list->destroy_func (list->data); + G_LOCK (g_dataset_global); + } if (g_data_cache_length < G_DATA_CACHE_MAX) { @@ -279,7 +283,9 @@ g_data_set_internal (GData **datalist, /* we need to have updated all structures prior to * invokation of the destroy function */ + G_UNLOCK (g_dataset_global); dfunc (ddata); + G_LOCK (g_dataset_global); } return;