luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-08 20:05:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finish killing off GSystemThread

Browse Source
This commit is contained in:
Ryan Lortie 2011-10-12 23:04:15 -04:00
parent e0c9757b9b
commit a5800ef336
4 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -3091,20 +3091,6 @@ _______EOF
#define G_THREADS_IMPL_$g_threads_impl_def #define G_THREADS_IMPL_$g_threads_impl_def
_______EOF _______EOF
cat >>$outfile <<_______EOF
/* This represents a system thread as used by the implementation. An
* alien implementaion, as loaded by g_thread_init can only count on
* "sizeof (gpointer)" bytes to store their info. We however need more
* for some of our native implementations. */
typedef union _GSystemThread GSystemThread;
union _GSystemThread
{
char data[[$g_system_thread_sizeof]];
double dummy_double;
void *dummy_pointer;
long dummy_long;
};
_______EOF
if test x"$g_memory_barrier_needed" != xno; then if test x"$g_memory_barrier_needed" != xno; then
echo >>$outfile echo >>$outfile
echo "#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1" >>$outfile echo "#define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1" >>$outfile

13
glib/deprecated/gthread.h
View File

@ -153,10 +153,19 @@ struct _GStaticRecMutex
/*< private >*/ /*< private >*/
GStaticMutex mutex; GStaticMutex mutex;
guint depth; guint depth;
GSystemThread owner;
/* ABI compat only */
union {
#ifdef G_OS_WIN32
void *owner;
#else
pthread_t owner;
#endif
gdouble dummy;
};
}; };
#define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT, 0, {{0, 0, 0, 0}} } #define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT }
GLIB_DEPRECATED_FOR(g_rec_mutex_init) GLIB_DEPRECATED_FOR(g_rec_mutex_init)
void g_static_rec_mutex_init (GStaticRecMutex *mutex); void g_static_rec_mutex_init (GStaticRecMutex *mutex);

16
glib/glibconfig.h.win32.in
View File

@ -206,22 +206,6 @@ typedef unsigned __int64 guintptr;
#define G_THREADS_ENABLED #define G_THREADS_ENABLED
#define G_THREADS_IMPL_WIN32 #define G_THREADS_IMPL_WIN32
/* This represents a system thread as used by the implementation. An
* alien implementaion, as loaded by g_thread_init can only count on
* "sizeof (gpointer)" bytes to store their info. We however need more
* for some of our native implementations. */
typedef union _GSystemThread GSystemThread;
union _GSystemThread
{
#ifndef _WIN64
char data[4];
#else
char data[8];
#endif
double dummy_double;
void *dummy_pointer;
long dummy_long;
};
#define GINT16_TO_LE(val) ((gint16) (val)) #define GINT16_TO_LE(val) ((gint16) (val))
#define GUINT16_TO_LE(val) ((guint16) (val)) #define GUINT16_TO_LE(val) ((guint16) (val))

1
glib/gthreadprivate.h
View File

@ -61,7 +61,6 @@ struct _GRealThread
GThread thread; GThread thread;
const gchar *name; const gchar *name;
gpointer retval; gpointer retval;
GSystemThread system_thread;
}; };
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32