X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=glib%2Fgthread.h;h=3f026f6311443cdd225e5aa38e161fa4308a3ba8;hb=4454b815367831a71b1ae00b0182b5b389a78df2;hp=9cde985c2d2cf14087a8ee90c9c88e4f68fd7942;hpb=ad187e3a9b2efff3c773d361e78ec3acda36136e;p=platform%2Fupstream%2Fglib.git
diff --git a/glib/gthread.h b/glib/gthread.h
index 9cde985..3f026f6 100644
--- a/glib/gthread.h
+++ b/glib/gthread.h
@@ -1,20 +1,18 @@
/* GLIB - Library of useful routines for C programming
* 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 Lesser 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 free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * licence, 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
+ * 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser 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.
+ * License along with this library; if not, see .
*/
/*
@@ -24,24 +22,21 @@
* GLib at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only can be included directly."
-#endif
-
#ifndef __G_THREAD_H__
#define __G_THREAD_H__
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only can be included directly."
+#endif
+
+#include
#include
-#include /* for G_INLINE_FUNC */
-#include /* for g_atomic_pointer_get */
G_BEGIN_DECLS
-/* GLib Thread support
- */
-
-extern GQuark g_thread_error_quark (void);
#define G_THREAD_ERROR g_thread_error_quark ()
+GLIB_AVAILABLE_IN_ALL
+GQuark g_thread_error_quark (void);
typedef enum
{
@@ -52,228 +47,67 @@ typedef gpointer (*GThreadFunc) (gpointer data);
typedef struct _GThread GThread;
-typedef struct _GMutex GMutex;
+typedef union _GMutex GMutex;
typedef struct _GRecMutex GRecMutex;
typedef struct _GRWLock GRWLock;
typedef struct _GCond GCond;
typedef struct _GPrivate GPrivate;
-typedef struct _GStaticPrivate GStaticPrivate;
-
-#ifdef G_OS_WIN32
+typedef struct _GOnce GOnce;
-#define G_MUTEX_INIT { NULL }
-struct _GMutex
+union _GMutex
{
- gpointer impl;
-};
-
-#define G_RW_LOCK_INIT { NULL }
-struct _GRWLock
-{
- gpointer impl;
-};
-
-#define G_COND_INIT { NULL }
-struct _GCond
-{
- gpointer impl;
-};
-#else
-
-#include
-
-#define G_MUTEX_INIT { PTHREAD_MUTEX_INITIALIZER }
-struct _GMutex
-{
- pthread_mutex_t impl;
+ /*< private >*/
+ gpointer p;
+ guint i[2];
};
-#define G_RW_LOCK_INIT { PTHREAD_RWLOCK_INITIALIZER }
struct _GRWLock
{
- pthread_rwlock_t impl;
+ /*< private >*/
+ gpointer p;
+ guint i[2];
};
-#define G_COND_INIT { PTHREAD_COND_INITIALIZER }
struct _GCond
{
- pthread_cond_t impl;
+ /*< private >*/
+ gpointer p;
+ guint i[2];
};
-#endif
-
-#define G_REC_MUTEX_INIT { NULL }
struct _GRecMutex
{
- gpointer impl;
-};
-
-/* initializes the mutex/cond/private implementation for glib, might
- * only be called once, and must not be called directly or indirectly
- * from another glib-function, e.g. as a callback.
- */
-void g_thread_init (gpointer vtable);
-
-/* Checks if thread support is initialized. Identical to the
- * g_thread_supported macro but provided for language bindings.
- */
-gboolean g_thread_get_initialized (void);
-
-GLIB_VAR gboolean g_threads_got_initialized;
-
-/* internal function for fallback static mutex implementation */
-GMutex* g_static_mutex_get_mutex_impl (GMutex **mutex);
-
-#if defined(G_THREADS_MANDATORY)
-#define g_thread_supported() 1
-#else
-#define g_thread_supported() (g_threads_got_initialized)
-#endif
-
-GThread *g_thread_create (GThreadFunc func,
- gpointer data,
- gboolean joinable,
- GError **error);
-
-GThread *g_thread_create_with_stack_size (GThreadFunc func,
- gpointer data,
- gboolean joinable,
- gsize stack_size,
- GError **error);
-
-GThread* g_thread_self (void);
-void g_thread_exit (gpointer retval);
-gpointer g_thread_join (GThread *thread);
-void g_thread_yield (void);
-
-void g_thread_foreach (GFunc thread_func,
- gpointer user_data);
-
-#ifdef G_OS_WIN32
-typedef GMutex * GStaticMutex;
-#define G_STATIC_MUTEX_INIT NULL
-#define g_static_mutex_get_mutex g_static_mutex_get_mutex_impl
-#else /* G_OS_WIN32 */
-typedef struct {
- struct _GMutex *unused;
- GMutex mutex;
-} GStaticMutex;
-#define G_STATIC_MUTEX_INIT { NULL, G_MUTEX_INIT }
-#define g_static_mutex_get_mutex(s) (&(s)->mutex)
-#endif /* G_OS_WIN32 */
-
-#define g_static_mutex_lock(mutex) \
- g_mutex_lock (g_static_mutex_get_mutex (mutex))
-#define g_static_mutex_trylock(mutex) \
- g_mutex_trylock (g_static_mutex_get_mutex (mutex))
-#define g_static_mutex_unlock(mutex) \
- g_mutex_unlock (g_static_mutex_get_mutex (mutex))
-void g_static_mutex_init (GStaticMutex *mutex);
-void g_static_mutex_free (GStaticMutex *mutex);
-
-struct _GStaticPrivate
-{
/*< private >*/
- guint index;
-};
-#define G_STATIC_PRIVATE_INIT { 0 }
-void g_static_private_init (GStaticPrivate *private_key);
-gpointer g_static_private_get (GStaticPrivate *private_key);
-void g_static_private_set (GStaticPrivate *private_key,
- gpointer data,
- GDestroyNotify notify);
-void g_static_private_free (GStaticPrivate *private_key);
-
-typedef struct _GStaticRecMutex GStaticRecMutex;
-struct _GStaticRecMutex
-{
- /*< private >*/
- GStaticMutex mutex;
- guint depth;
- GSystemThread owner;
+ gpointer p;
+ guint i[2];
};
-#define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT, 0, {{0, 0, 0, 0}} }
-void g_static_rec_mutex_init (GStaticRecMutex *mutex);
-void g_static_rec_mutex_lock (GStaticRecMutex *mutex);
-gboolean g_static_rec_mutex_trylock (GStaticRecMutex *mutex);
-void g_static_rec_mutex_unlock (GStaticRecMutex *mutex);
-void g_static_rec_mutex_lock_full (GStaticRecMutex *mutex,
- guint depth);
-guint g_static_rec_mutex_unlock_full (GStaticRecMutex *mutex);
-void g_static_rec_mutex_free (GStaticRecMutex *mutex);
-
-typedef struct _GStaticRWLock GStaticRWLock;
-struct _GStaticRWLock
+#define G_PRIVATE_INIT(notify) { NULL, (notify), { NULL, NULL } }
+struct _GPrivate
{
/*< private >*/
- GStaticMutex mutex;
- GCond *read_cond;
- GCond *write_cond;
- guint read_counter;
- gboolean have_writer;
- guint want_to_read;
- guint want_to_write;
+ gpointer p;
+ GDestroyNotify notify;
+ gpointer future[2];
};
-#define G_STATIC_RW_LOCK_INIT { G_STATIC_MUTEX_INIT, NULL, NULL, 0, FALSE, 0, 0 }
-
-void g_static_rw_lock_init (GStaticRWLock* lock);
-void g_static_rw_lock_reader_lock (GStaticRWLock* lock);
-gboolean g_static_rw_lock_reader_trylock (GStaticRWLock* lock);
-void g_static_rw_lock_reader_unlock (GStaticRWLock* lock);
-void g_static_rw_lock_writer_lock (GStaticRWLock* lock);
-gboolean g_static_rw_lock_writer_trylock (GStaticRWLock* lock);
-void g_static_rw_lock_writer_unlock (GStaticRWLock* lock);
-void g_static_rw_lock_free (GStaticRWLock* lock);
-
typedef enum
{
G_ONCE_STATUS_NOTCALLED,
G_ONCE_STATUS_PROGRESS,
- G_ONCE_STATUS_READY
+ G_ONCE_STATUS_READY
} GOnceStatus;
-typedef struct _GOnce GOnce;
+#define G_ONCE_INIT { G_ONCE_STATUS_NOTCALLED, NULL }
struct _GOnce
{
volatile GOnceStatus status;
volatile gpointer retval;
};
-#define G_ONCE_INIT { G_ONCE_STATUS_NOTCALLED, NULL }
-
-gpointer g_once_impl (GOnce *once, GThreadFunc func, gpointer arg);
-
-#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
-# define g_once(once, func, arg) g_once_impl ((once), (func), (arg))
-#else /* !G_ATOMIC_OP_MEMORY_BARRIER_NEEDED*/
-# define g_once(once, func, arg) \
- (((once)->status == G_ONCE_STATUS_READY) ? \
- (once)->retval : \
- g_once_impl ((once), (func), (arg)))
-#endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
-
-/* initialize-once guards, keyed by value_location */
-G_INLINE_FUNC gboolean g_once_init_enter (volatile gsize *value_location);
-gboolean g_once_init_enter_impl (volatile gsize *value_location);
-void g_once_init_leave (volatile gsize *value_location,
- gsize initialization_value);
-#if defined (G_CAN_INLINE) || defined (__G_THREAD_C__)
-G_INLINE_FUNC gboolean
-g_once_init_enter (volatile gsize *value_location)
-{
- if G_LIKELY ((gpointer) g_atomic_pointer_get (value_location) != NULL)
- return FALSE;
- else
- return g_once_init_enter_impl (value_location);
-}
-#endif /* G_CAN_INLINE || __G_THREAD_C__ */
-
-#define G_LOCK_NAME(name) g__ ## name ## _lock
+#define G_LOCK_NAME(name) g__ ## name ## _lock
#define G_LOCK_DEFINE_STATIC(name) static G_LOCK_DEFINE (name)
-#define G_LOCK_DEFINE(name) \
- GMutex G_LOCK_NAME (name) = G_MUTEX_INIT
+#define G_LOCK_DEFINE(name) GMutex G_LOCK_NAME (name)
#define G_LOCK_EXTERN(name) extern GMutex G_LOCK_NAME (name)
#ifdef G_DEBUG_LOCKS
@@ -302,51 +136,135 @@ g_once_init_enter (volatile gsize *value_location)
# define G_TRYLOCK(name) g_mutex_trylock (&G_LOCK_NAME (name))
#endif /* !G_DEBUG_LOCKS */
+GLIB_AVAILABLE_IN_2_32
+GThread * g_thread_ref (GThread *thread);
+GLIB_AVAILABLE_IN_2_32
+void g_thread_unref (GThread *thread);
+GLIB_AVAILABLE_IN_2_32
+GThread * g_thread_new (const gchar *name,
+ GThreadFunc func,
+ gpointer data);
+GLIB_AVAILABLE_IN_2_32
+GThread * g_thread_try_new (const gchar *name,
+ GThreadFunc func,
+ gpointer data,
+ GError **error);
+GLIB_AVAILABLE_IN_ALL
+GThread * g_thread_self (void);
+GLIB_AVAILABLE_IN_ALL
+void g_thread_exit (gpointer retval);
+GLIB_AVAILABLE_IN_ALL
+gpointer g_thread_join (GThread *thread);
+GLIB_AVAILABLE_IN_ALL
+void g_thread_yield (void);
+
+
+GLIB_AVAILABLE_IN_2_32
+void g_mutex_init (GMutex *mutex);
+GLIB_AVAILABLE_IN_2_32
+void g_mutex_clear (GMutex *mutex);
+GLIB_AVAILABLE_IN_ALL
+void g_mutex_lock (GMutex *mutex);
+GLIB_AVAILABLE_IN_ALL
+gboolean g_mutex_trylock (GMutex *mutex);
+GLIB_AVAILABLE_IN_ALL
+void g_mutex_unlock (GMutex *mutex);
+
+GLIB_AVAILABLE_IN_2_32
+void g_rw_lock_init (GRWLock *rw_lock);
+GLIB_AVAILABLE_IN_2_32
+void g_rw_lock_clear (GRWLock *rw_lock);
+GLIB_AVAILABLE_IN_2_32
+void g_rw_lock_writer_lock (GRWLock *rw_lock);
+GLIB_AVAILABLE_IN_2_32
+gboolean g_rw_lock_writer_trylock (GRWLock *rw_lock);
+GLIB_AVAILABLE_IN_2_32
+void g_rw_lock_writer_unlock (GRWLock *rw_lock);
+GLIB_AVAILABLE_IN_2_32
+void g_rw_lock_reader_lock (GRWLock *rw_lock);
+GLIB_AVAILABLE_IN_2_32
+gboolean g_rw_lock_reader_trylock (GRWLock *rw_lock);
+GLIB_AVAILABLE_IN_2_32
+void g_rw_lock_reader_unlock (GRWLock *rw_lock);
+
+GLIB_AVAILABLE_IN_2_32
+void g_rec_mutex_init (GRecMutex *rec_mutex);
+GLIB_AVAILABLE_IN_2_32
+void g_rec_mutex_clear (GRecMutex *rec_mutex);
+GLIB_AVAILABLE_IN_2_32
+void g_rec_mutex_lock (GRecMutex *rec_mutex);
+GLIB_AVAILABLE_IN_2_32
+gboolean g_rec_mutex_trylock (GRecMutex *rec_mutex);
+GLIB_AVAILABLE_IN_2_32
+void g_rec_mutex_unlock (GRecMutex *rec_mutex);
+
+GLIB_AVAILABLE_IN_2_32
+void g_cond_init (GCond *cond);
+GLIB_AVAILABLE_IN_2_32
+void g_cond_clear (GCond *cond);
+GLIB_AVAILABLE_IN_ALL
+void g_cond_wait (GCond *cond,
+ GMutex *mutex);
+GLIB_AVAILABLE_IN_ALL
+void g_cond_signal (GCond *cond);
+GLIB_AVAILABLE_IN_ALL
+void g_cond_broadcast (GCond *cond);
+GLIB_AVAILABLE_IN_2_32
+gboolean g_cond_wait_until (GCond *cond,
+ GMutex *mutex,
+ gint64 end_time);
+
+GLIB_AVAILABLE_IN_ALL
+gpointer g_private_get (GPrivate *key);
+GLIB_AVAILABLE_IN_ALL
+void g_private_set (GPrivate *key,
+ gpointer value);
+GLIB_AVAILABLE_IN_2_32
+void g_private_replace (GPrivate *key,
+ gpointer value);
+
+GLIB_AVAILABLE_IN_ALL
+gpointer g_once_impl (GOnce *once,
+ GThreadFunc func,
+ gpointer arg);
+GLIB_AVAILABLE_IN_ALL
+gboolean g_once_init_enter (volatile void *location);
+GLIB_AVAILABLE_IN_ALL
+void g_once_init_leave (volatile void *location,
+ gsize result);
+
+#ifdef G_ATOMIC_OP_MEMORY_BARRIER_NEEDED
+# define g_once(once, func, arg) g_once_impl ((once), (func), (arg))
+#else /* !G_ATOMIC_OP_MEMORY_BARRIER_NEEDED*/
+# define g_once(once, func, arg) \
+ (((once)->status == G_ONCE_STATUS_READY) ? \
+ (once)->retval : \
+ g_once_impl ((once), (func), (arg)))
+#endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
+
+#ifdef __GNUC__
+# define g_once_init_enter(location) \
+ (G_GNUC_EXTENSION ({ \
+ G_STATIC_ASSERT (sizeof *(location) == sizeof (gpointer)); \
+ (void) (0 ? (gpointer) *(location) : 0); \
+ (!g_atomic_pointer_get (location) && \
+ g_once_init_enter (location)); \
+ }))
+# define g_once_init_leave(location, result) \
+ (G_GNUC_EXTENSION ({ \
+ G_STATIC_ASSERT (sizeof *(location) == sizeof (gpointer)); \
+ (void) (0 ? *(location) = (result) : 0); \
+ g_once_init_leave ((location), (gsize) (result)); \
+ }))
+#else
+# define g_once_init_enter(location) \
+ (g_once_init_enter((location)))
+# define g_once_init_leave(location, result) \
+ (g_once_init_leave((location), (gsize) (result)))
+#endif
-GMutex * g_mutex_new (void);
-void g_mutex_free (GMutex *mutex);
-void g_mutex_init (GMutex *mutex);
-void g_mutex_clear (GMutex *mutex);
-
-void g_mutex_lock (GMutex *mutex);
-void g_mutex_unlock (GMutex *mutex);
-gboolean g_mutex_trylock (GMutex *mutex);
-
-void g_rw_lock_init (GRWLock *lock);
-void g_rw_lock_clear (GRWLock *lock);
-void g_rw_lock_writer_lock (GRWLock *lock);
-gboolean g_rw_lock_writer_trylock (GRWLock *lock);
-void g_rw_lock_writer_unlock (GRWLock *lock);
-void g_rw_lock_reader_lock (GRWLock *lock);
-gboolean g_rw_lock_reader_trylock (GRWLock *lock);
-void g_rw_lock_reader_unlock (GRWLock *lock);
-
-void g_rec_mutex_init (GRecMutex *rec_mutex);
-void g_rec_mutex_clear (GRecMutex *rec_mutex);
-void g_rec_mutex_lock (GRecMutex *rec_mutex);
-gboolean g_rec_mutex_trylock (GRecMutex *rec_mutex);
-void g_rec_mutex_unlock (GRecMutex *rec_mutex);
-
-GCond * g_cond_new (void);
-void g_cond_free (GCond *cond);
-void g_cond_init (GCond *cond);
-void g_cond_clear (GCond *cond);
-
-void g_cond_wait (GCond *cond,
- GMutex *mutex);
-void g_cond_signal (GCond *cond);
-void g_cond_broadcast (GCond *cond);
-gboolean g_cond_timed_wait (GCond *cond,
- GMutex *mutex,
- GTimeVal *timeval);
-gboolean g_cond_timedwait (GCond *cond,
- GMutex *mutex,
- gint64 abs_time);
-
-GPrivate * g_private_new (GDestroyNotify notify);
-gpointer g_private_get (GPrivate *key);
-void g_private_set (GPrivate *key,
- gpointer value);
+GLIB_AVAILABLE_IN_2_36
+guint g_get_num_processors (void);
G_END_DECLS