+2001-04-02 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * gmain.c: Use the new GRealThread member "context" instead of a
+ GStaticPrivate to store the thread specific main loop context.
+
+ * gthread.c: Added "context" member to GRealThread and updated
+ g_thread_create, g_thread_self and g_thread_cleanup accordingly.
+
+ * gthread.c, gthread.h: Removed the functions
+ g_static_private_(get|set)_for_thread and adapted
+ g_static_private_(get|set) and g_static_private_free accordingly.
+
2001-03-30 Sven Neumann <sven@gimp.org>
* ghash.[ch]
+2001-04-02 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * gmain.c: Use the new GRealThread member "context" instead of a
+ GStaticPrivate to store the thread specific main loop context.
+
+ * gthread.c: Added "context" member to GRealThread and updated
+ g_thread_create, g_thread_self and g_thread_cleanup accordingly.
+
+ * gthread.c, gthread.h: Removed the functions
+ g_static_private_(get|set)_for_thread and adapted
+ g_static_private_(get|set) and g_static_private_free accordingly.
+
2001-03-30 Sven Neumann <sven@gimp.org>
* ghash.[ch]
+2001-04-02 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * gmain.c: Use the new GRealThread member "context" instead of a
+ GStaticPrivate to store the thread specific main loop context.
+
+ * gthread.c: Added "context" member to GRealThread and updated
+ g_thread_create, g_thread_self and g_thread_cleanup accordingly.
+
+ * gthread.c, gthread.h: Removed the functions
+ g_static_private_(get|set)_for_thread and adapted
+ g_static_private_(get|set) and g_static_private_free accordingly.
+
2001-03-30 Sven Neumann <sven@gimp.org>
* ghash.[ch]
+2001-04-02 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * gmain.c: Use the new GRealThread member "context" instead of a
+ GStaticPrivate to store the thread specific main loop context.
+
+ * gthread.c: Added "context" member to GRealThread and updated
+ g_thread_create, g_thread_self and g_thread_cleanup accordingly.
+
+ * gthread.c, gthread.h: Removed the functions
+ g_static_private_(get|set)_for_thread and adapted
+ g_static_private_(get|set) and g_static_private_free accordingly.
+
2001-03-30 Sven Neumann <sven@gimp.org>
* ghash.[ch]
+2001-04-02 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * gmain.c: Use the new GRealThread member "context" instead of a
+ GStaticPrivate to store the thread specific main loop context.
+
+ * gthread.c: Added "context" member to GRealThread and updated
+ g_thread_create, g_thread_self and g_thread_cleanup accordingly.
+
+ * gthread.c, gthread.h: Removed the functions
+ g_static_private_(get|set)_for_thread and adapted
+ g_static_private_(get|set) and g_static_private_free accordingly.
+
2001-03-30 Sven Neumann <sven@gimp.org>
* ghash.[ch]
+2001-04-02 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * gmain.c: Use the new GRealThread member "context" instead of a
+ GStaticPrivate to store the thread specific main loop context.
+
+ * gthread.c: Added "context" member to GRealThread and updated
+ g_thread_create, g_thread_self and g_thread_cleanup accordingly.
+
+ * gthread.c, gthread.h: Removed the functions
+ g_static_private_(get|set)_for_thread and adapted
+ g_static_private_(get|set) and g_static_private_free accordingly.
+
2001-03-30 Sven Neumann <sven@gimp.org>
* ghash.[ch]
+2001-04-02 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * gmain.c: Use the new GRealThread member "context" instead of a
+ GStaticPrivate to store the thread specific main loop context.
+
+ * gthread.c: Added "context" member to GRealThread and updated
+ g_thread_create, g_thread_self and g_thread_cleanup accordingly.
+
+ * gthread.c, gthread.h: Removed the functions
+ g_static_private_(get|set)_for_thread and adapted
+ g_static_private_(get|set) and g_static_private_free accordingly.
+
2001-03-30 Sven Neumann <sven@gimp.org>
* ghash.[ch]
+2001-04-02 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
+
+ * gmain.c: Use the new GRealThread member "context" instead of a
+ GStaticPrivate to store the thread specific main loop context.
+
+ * gthread.c: Added "context" member to GRealThread and updated
+ g_thread_create, g_thread_self and g_thread_cleanup accordingly.
+
+ * gthread.c, gthread.h: Removed the functions
+ g_static_private_(get|set)_for_thread and adapted
+ g_static_private_(get|set) and g_static_private_free accordingly.
+
2001-03-30 Sven Neumann <sven@gimp.org>
* ghash.[ch]
/* Called to clean up when a thread terminates
*/
-static void
+void
g_main_context_destroy (GMainContext *context)
{
GSource *source;
g_free (context);
}
+/* This is an imcomplete (only the members up till context) version of
+ * GRealThread from gthread.h. Keep them in sync */
+typedef struct _GRealThread GRealThread;
+struct _GRealThread
+{
+ GThread thread;
+ GThreadFunc func;
+ gpointer arg;
+ gpointer private_data;
+ GMainContext *context;
+};
+
/**
* g_main_context_get:
* @thread: a #GThread
GMainContext *
g_main_context_get (GThread *thread)
{
- static GStaticPrivate private_key = G_STATIC_PRIVATE_INIT;
+ GRealThread *real_thread = (GRealThread*)thread;
GMainContext *context;
g_return_val_if_fail (thread != NULL, NULL);
if (g_thread_supported ())
- context = g_static_private_get_for_thread (&private_key, thread);
+ context = real_thread->context;
else
context = default_main_context;
#endif
if (g_thread_supported ())
- g_static_private_set_for_thread (&private_key, thread,
- context,
- (GDestroyNotify)g_main_context_destroy);
+ real_thread->context = context;
else
default_main_context = context;
}
return quark;
}
+/* Keep this in sync with GRealThread in gmain.c! */
typedef struct _GRealThread GRealThread;
struct _GRealThread
{
GThreadFunc func;
gpointer arg;
gpointer private_data;
+ GMainContext *context;
GSystemThread system_thread;
#ifdef G_THREAD_USE_PID_SURROGATE
pid_t pid;
gpointer
g_static_private_get (GStaticPrivate *private_key)
{
- return g_static_private_get_for_thread (private_key, g_thread_self ());
-}
-
-gpointer
-g_static_private_get_for_thread (GStaticPrivate *private_key,
- GThread *thread)
-{
+ GRealThread *self = (GRealThread*) g_thread_self ();
GArray *array;
- GRealThread *self = (GRealThread*) thread;
-
- g_return_val_if_fail (thread, NULL);
array = self->private_data;
if (!array)
if (!private_key->index)
return NULL;
else if (private_key->index <= array->len)
- return g_array_index (array, GStaticPrivateNode, private_key->index - 1).data;
+ return g_array_index (array, GStaticPrivateNode,
+ private_key->index - 1).data;
else
return NULL;
}
gpointer data,
GDestroyNotify notify)
{
- g_static_private_set_for_thread (private_key, g_thread_self (),
- data, notify);
-}
-
-void
-g_static_private_set_for_thread (GStaticPrivate *private_key,
- GThread *thread,
- gpointer data,
- GDestroyNotify notify)
-{
+ GRealThread *self = (GRealThread*) g_thread_self ();
GArray *array;
- GRealThread *self =(GRealThread*) thread;
static guint next_index = 0;
GStaticPrivateNode *node;
- g_return_if_fail (thread);
-
array = self->private_data;
if (!array)
{
void
g_static_private_free (GStaticPrivate *private_key)
{
- GStaticPrivate copied_key;
+ guint index = private_key->index;
GSList *list;
- copied_key.index = private_key->index;
- private_key->index = 0;
-
- if (!copied_key.index)
+ if (!index)
return;
+
+ private_key->index = 0;
G_LOCK (g_thread);
list = g_thread_all_threads;
while (list)
{
- GThread *thread = list->data;
+ GRealThread *thread = list->data;
+ GArray *array = thread->private_data;
list = list->next;
-
- G_UNLOCK (g_thread);
- g_static_private_set_for_thread (&copied_key, thread, NULL, NULL);
- G_LOCK (g_thread);
+
+ if (array && index <= array->len)
+ {
+ GStaticPrivateNode *node = &g_array_index (array,
+ GStaticPrivateNode,
+ index - 1);
+ gpointer ddata = node->data;
+ GDestroyNotify ddestroy = node->destroy;
+
+ node->data = NULL;
+ node->destroy = NULL;
+
+ if (ddestroy)
+ {
+ G_UNLOCK (g_thread);
+ ddestroy (ddata);
+ G_LOCK (g_thread);
+ }
+ }
}
- g_thread_free_indeces =
- g_slist_prepend (g_thread_free_indeces,
- GUINT_TO_POINTER (copied_key.index));
+ g_thread_free_indeces = g_slist_prepend (g_thread_free_indeces,
+ GUINT_TO_POINTER (index));
G_UNLOCK (g_thread);
}
+void g_main_context_destroy (GMainContext *context);
+
static void
g_thread_cleanup (gpointer data)
{
}
g_array_free (array, TRUE);
}
+ if (thread->context)
+ g_main_context_destroy (thread->context);
+
/* We only free the thread structure, if it isn't joinable. If
it is, the structure is freed in g_thread_join */
if (!thread->thread.joinable)
result->func = thread_func;
result->arg = arg;
result->private_data = NULL;
+ result->context = NULL;
G_LOCK (g_thread);
G_THREAD_UF (thread_create, (g_thread_create_proxy, result,
stack_size, joinable, bound, priority,
thread->func = NULL;
thread->arg = NULL;
thread->private_data = NULL;
+ thread->context = NULL;
if (g_thread_supported ())
G_THREAD_UF (thread_self, (&thread->system_thread));
void g_static_private_set (GStaticPrivate *private_key,
gpointer data,
GDestroyNotify notify);
-gpointer g_static_private_get_for_thread (GStaticPrivate *private_key,
- GThread *thread);
-void g_static_private_set_for_thread (GStaticPrivate *private_key,
- GThread *thread,
- gpointer data,
- GDestroyNotify notify);
void g_static_private_free (GStaticPrivate *private_key);
typedef struct _GStaticRecMutex GStaticRecMutex;
/* Called to clean up when a thread terminates
*/
-static void
+void
g_main_context_destroy (GMainContext *context)
{
GSource *source;
g_free (context);
}
+/* This is an imcomplete (only the members up till context) version of
+ * GRealThread from gthread.h. Keep them in sync */
+typedef struct _GRealThread GRealThread;
+struct _GRealThread
+{
+ GThread thread;
+ GThreadFunc func;
+ gpointer arg;
+ gpointer private_data;
+ GMainContext *context;
+};
+
/**
* g_main_context_get:
* @thread: a #GThread
GMainContext *
g_main_context_get (GThread *thread)
{
- static GStaticPrivate private_key = G_STATIC_PRIVATE_INIT;
+ GRealThread *real_thread = (GRealThread*)thread;
GMainContext *context;
g_return_val_if_fail (thread != NULL, NULL);
if (g_thread_supported ())
- context = g_static_private_get_for_thread (&private_key, thread);
+ context = real_thread->context;
else
context = default_main_context;
#endif
if (g_thread_supported ())
- g_static_private_set_for_thread (&private_key, thread,
- context,
- (GDestroyNotify)g_main_context_destroy);
+ real_thread->context = context;
else
default_main_context = context;
}
return quark;
}
+/* Keep this in sync with GRealThread in gmain.c! */
typedef struct _GRealThread GRealThread;
struct _GRealThread
{
GThreadFunc func;
gpointer arg;
gpointer private_data;
+ GMainContext *context;
GSystemThread system_thread;
#ifdef G_THREAD_USE_PID_SURROGATE
pid_t pid;
gpointer
g_static_private_get (GStaticPrivate *private_key)
{
- return g_static_private_get_for_thread (private_key, g_thread_self ());
-}
-
-gpointer
-g_static_private_get_for_thread (GStaticPrivate *private_key,
- GThread *thread)
-{
+ GRealThread *self = (GRealThread*) g_thread_self ();
GArray *array;
- GRealThread *self = (GRealThread*) thread;
-
- g_return_val_if_fail (thread, NULL);
array = self->private_data;
if (!array)
if (!private_key->index)
return NULL;
else if (private_key->index <= array->len)
- return g_array_index (array, GStaticPrivateNode, private_key->index - 1).data;
+ return g_array_index (array, GStaticPrivateNode,
+ private_key->index - 1).data;
else
return NULL;
}
gpointer data,
GDestroyNotify notify)
{
- g_static_private_set_for_thread (private_key, g_thread_self (),
- data, notify);
-}
-
-void
-g_static_private_set_for_thread (GStaticPrivate *private_key,
- GThread *thread,
- gpointer data,
- GDestroyNotify notify)
-{
+ GRealThread *self = (GRealThread*) g_thread_self ();
GArray *array;
- GRealThread *self =(GRealThread*) thread;
static guint next_index = 0;
GStaticPrivateNode *node;
- g_return_if_fail (thread);
-
array = self->private_data;
if (!array)
{
void
g_static_private_free (GStaticPrivate *private_key)
{
- GStaticPrivate copied_key;
+ guint index = private_key->index;
GSList *list;
- copied_key.index = private_key->index;
- private_key->index = 0;
-
- if (!copied_key.index)
+ if (!index)
return;
+
+ private_key->index = 0;
G_LOCK (g_thread);
list = g_thread_all_threads;
while (list)
{
- GThread *thread = list->data;
+ GRealThread *thread = list->data;
+ GArray *array = thread->private_data;
list = list->next;
-
- G_UNLOCK (g_thread);
- g_static_private_set_for_thread (&copied_key, thread, NULL, NULL);
- G_LOCK (g_thread);
+
+ if (array && index <= array->len)
+ {
+ GStaticPrivateNode *node = &g_array_index (array,
+ GStaticPrivateNode,
+ index - 1);
+ gpointer ddata = node->data;
+ GDestroyNotify ddestroy = node->destroy;
+
+ node->data = NULL;
+ node->destroy = NULL;
+
+ if (ddestroy)
+ {
+ G_UNLOCK (g_thread);
+ ddestroy (ddata);
+ G_LOCK (g_thread);
+ }
+ }
}
- g_thread_free_indeces =
- g_slist_prepend (g_thread_free_indeces,
- GUINT_TO_POINTER (copied_key.index));
+ g_thread_free_indeces = g_slist_prepend (g_thread_free_indeces,
+ GUINT_TO_POINTER (index));
G_UNLOCK (g_thread);
}
+void g_main_context_destroy (GMainContext *context);
+
static void
g_thread_cleanup (gpointer data)
{
}
g_array_free (array, TRUE);
}
+ if (thread->context)
+ g_main_context_destroy (thread->context);
+
/* We only free the thread structure, if it isn't joinable. If
it is, the structure is freed in g_thread_join */
if (!thread->thread.joinable)
result->func = thread_func;
result->arg = arg;
result->private_data = NULL;
+ result->context = NULL;
G_LOCK (g_thread);
G_THREAD_UF (thread_create, (g_thread_create_proxy, result,
stack_size, joinable, bound, priority,
thread->func = NULL;
thread->arg = NULL;
thread->private_data = NULL;
+ thread->context = NULL;
if (g_thread_supported ())
G_THREAD_UF (thread_self, (&thread->system_thread));
void g_static_private_set (GStaticPrivate *private_key,
gpointer data,
GDestroyNotify notify);
-gpointer g_static_private_get_for_thread (GStaticPrivate *private_key,
- GThread *thread);
-void g_static_private_set_for_thread (GStaticPrivate *private_key,
- GThread *thread,
- gpointer data,
- GDestroyNotify notify);
void g_static_private_free (GStaticPrivate *private_key);
typedef struct _GStaticRecMutex GStaticRecMutex;
projects / platform / upstream / glib.git / commitdiff