gthread.h: a bunch of pointless whitespace changes

Make it look pretty.
This commit is contained in:
Ryan Lortie 2011-10-04 20:31:33 -04:00
parent 674543d091
commit 08a6d81231

View File

@ -1,20 +1,20 @@
/* GLIB - Library of useful routines for C programming /* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or modify
* modify it under the terms of the GNU Lesser General Public * it under the terms of the GNU Lesser General Public License as
* License as published by the Free Software Foundation; either * published by the Free Software Foundation; either version 2 of the
* version 2 of the License, or (at your option) any later version. * licence, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful, but
* but WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the Free Software
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* Boston, MA 02111-1307, USA. * USA.
*/ */
/* /*
@ -31,17 +31,13 @@
#ifndef __G_THREAD_H__ #ifndef __G_THREAD_H__
#define __G_THREAD_H__ #define __G_THREAD_H__
#include <glib/gatomic.h>
#include <glib/gerror.h> #include <glib/gerror.h>
#include <glib/gutils.h> /* for G_INLINE_FUNC */
#include <glib/gatomic.h> /* for g_atomic_pointer_get */
G_BEGIN_DECLS G_BEGIN_DECLS
/* GLib Thread support
*/
extern GQuark g_thread_error_quark (void);
#define G_THREAD_ERROR g_thread_error_quark () #define G_THREAD_ERROR g_thread_error_quark ()
GQuark g_thread_error_quark (void);
typedef enum typedef enum
{ {
@ -57,6 +53,7 @@ typedef struct _GRecMutex GRecMutex;
typedef struct _GRWLock GRWLock; typedef struct _GRWLock GRWLock;
typedef struct _GCond GCond; typedef struct _GCond GCond;
typedef struct _GPrivate GPrivate; typedef struct _GPrivate GPrivate;
typedef struct _GOnce GOnce;
union _GMutex union _GMutex
{ {
@ -94,24 +91,6 @@ struct _GPrivate
gpointer future[2]; gpointer future[2];
}; };
GThread *g_thread_new (const gchar *name,
GThreadFunc func,
gpointer data,
gboolean joinable,
GError **error);
GThread *g_thread_new_full (const gchar *name,
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);
typedef enum typedef enum
{ {
G_ONCE_STATUS_NOTCALLED, G_ONCE_STATUS_NOTCALLED,
@ -119,53 +98,14 @@ typedef enum
G_ONCE_STATUS_READY G_ONCE_STATUS_READY
} GOnceStatus; } GOnceStatus;
typedef struct _GOnce GOnce; #define G_ONCE_INIT { G_ONCE_STATUS_NOTCALLED, NULL }
struct _GOnce struct _GOnce
{ {
volatile GOnceStatus status; volatile GOnceStatus status;
volatile gpointer retval; volatile gpointer retval;
}; };
#define G_ONCE_INIT { G_ONCE_STATUS_NOTCALLED, NULL } #define G_LOCK_NAME(name) g__ ## name ## _lock
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 location */
gboolean g_once_init_enter (volatile void *location);
void g_once_init_leave (volatile void *location,
gsize result);
#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
#define G_LOCK_NAME(name) g__ ## name ## _lock
#define G_LOCK_DEFINE_STATIC(name) static G_LOCK_DEFINE (name) #define G_LOCK_DEFINE_STATIC(name) static G_LOCK_DEFINE (name)
#define G_LOCK_DEFINE(name) GMutex G_LOCK_NAME (name) #define G_LOCK_DEFINE(name) GMutex G_LOCK_NAME (name)
#define G_LOCK_EXTERN(name) extern GMutex G_LOCK_NAME (name) #define G_LOCK_EXTERN(name) extern GMutex G_LOCK_NAME (name)
@ -196,48 +136,99 @@ void g_once_init_leave (volatile void *location,
# define G_TRYLOCK(name) g_mutex_trylock (&G_LOCK_NAME (name)) # define G_TRYLOCK(name) g_mutex_trylock (&G_LOCK_NAME (name))
#endif /* !G_DEBUG_LOCKS */ #endif /* !G_DEBUG_LOCKS */
GThread * g_thread_new (const gchar *name,
GThreadFunc func,
gpointer data,
gboolean joinable,
GError **error);
GThread * g_thread_new_full (const gchar *name,
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_mutex_init (GMutex *mutex);
void g_mutex_clear (GMutex *mutex);
void g_mutex_lock (GMutex *mutex); void g_mutex_init (GMutex *mutex);
void g_mutex_unlock (GMutex *mutex); void g_mutex_clear (GMutex *mutex);
gboolean g_mutex_trylock (GMutex *mutex); void g_mutex_lock (GMutex *mutex);
gboolean g_mutex_trylock (GMutex *mutex);
void g_mutex_unlock (GMutex *mutex);
void g_rw_lock_init (GRWLock *rw_lock); void g_rw_lock_init (GRWLock *rw_lock);
void g_rw_lock_clear (GRWLock *rw_lock); void g_rw_lock_clear (GRWLock *rw_lock);
void g_rw_lock_writer_lock (GRWLock *rw_lock); void g_rw_lock_writer_lock (GRWLock *rw_lock);
gboolean g_rw_lock_writer_trylock (GRWLock *rw_lock); gboolean g_rw_lock_writer_trylock (GRWLock *rw_lock);
void g_rw_lock_writer_unlock (GRWLock *rw_lock); void g_rw_lock_writer_unlock (GRWLock *rw_lock);
void g_rw_lock_reader_lock (GRWLock *rw_lock); void g_rw_lock_reader_lock (GRWLock *rw_lock);
gboolean g_rw_lock_reader_trylock (GRWLock *rw_lock); gboolean g_rw_lock_reader_trylock (GRWLock *rw_lock);
void g_rw_lock_reader_unlock (GRWLock *rw_lock); void g_rw_lock_reader_unlock (GRWLock *rw_lock);
void g_rec_mutex_init (GRecMutex *rec_mutex); void g_rec_mutex_init (GRecMutex *rec_mutex);
void g_rec_mutex_clear (GRecMutex *rec_mutex); void g_rec_mutex_clear (GRecMutex *rec_mutex);
void g_rec_mutex_lock (GRecMutex *rec_mutex); void g_rec_mutex_lock (GRecMutex *rec_mutex);
gboolean g_rec_mutex_trylock (GRecMutex *rec_mutex); gboolean g_rec_mutex_trylock (GRecMutex *rec_mutex);
void g_rec_mutex_unlock (GRecMutex *rec_mutex); void g_rec_mutex_unlock (GRecMutex *rec_mutex);
void g_cond_init (GCond *cond); void g_cond_init (GCond *cond);
void g_cond_clear (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);
void g_cond_wait (GCond *cond, gpointer g_private_get (GPrivate *key);
GMutex *mutex); void g_private_set (GPrivate *key,
void g_cond_signal (GCond *cond); gpointer value);
void g_cond_broadcast (GCond *cond); void g_private_replace (GPrivate *key,
gboolean g_cond_timed_wait (GCond *cond, gpointer value);
GMutex *mutex,
GTimeVal *timeval);
gboolean g_cond_timedwait (GCond *cond,
GMutex *mutex,
gint64 abs_time);
gpointer g_private_get (GPrivate *key); gpointer g_once_impl (GOnce *once,
void g_private_set (GPrivate *key, GThreadFunc func,
gpointer value); gpointer arg);
void g_private_replace (GPrivate *key, gboolean g_once_init_enter (volatile void *location);
gpointer value); 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
G_END_DECLS G_END_DECLS