luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-15 04:05:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move some things to deprecated/gthread.h

Browse Source
This commit is contained in:
Ryan Lortie 2011-09-19 01:11:11 -04:00
parent 97972fbb3a
commit ae2ac9e809
5 changed files with 118 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib/Makefile.am
View File

@ -114,7 +114,8 @@ uninstall-ms-lib:
deprecated_sources = \ deprecated_sources = \
deprecated/gallocator.c \ deprecated/gallocator.c \
deprecated/gcompletion.c \ deprecated/gcompletion.c \
deprecated/grel.c deprecated/grel.c \
deprecated/gthread.h
libglib_2_0_la_SOURCES = \ libglib_2_0_la_SOURCES = \
$(deprecated_sources) \ $(deprecated_sources) \

112
glib/deprecated/gthread.h Normal file
View File

@ -0,0 +1,112 @@
/* 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 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.
*/
/*
* Modified by the GLib Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GLib Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GLib at ftp://ftp.gtk.org/pub/gtk/.
*/
#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
#error "Only <glib.h> can be included directly."
#endif
#ifndef __G_DEPRECATED_THREAD_H__
#define __G_DEPRECATED_THREAD_H__
#include <glib/gthread.h>
G_BEGIN_DECLS
typedef enum
{
G_THREAD_PRIORITY_LOW,
G_THREAD_PRIORITY_NORMAL,
G_THREAD_PRIORITY_HIGH,
G_THREAD_PRIORITY_URGENT
} GThreadPriority;
struct _GThread
{
/*< private >*/
GThreadFunc func;
gpointer data;
gboolean joinable;
GThreadPriority priority;
};
typedef struct _GThreadFunctions GThreadFunctions;
struct _GThreadFunctions
{
GMutex* (*mutex_new) (void);
void (*mutex_lock) (GMutex *mutex);
gboolean (*mutex_trylock) (GMutex *mutex);
void (*mutex_unlock) (GMutex *mutex);
void (*mutex_free) (GMutex *mutex);
GCond* (*cond_new) (void);
void (*cond_signal) (GCond *cond);
void (*cond_broadcast) (GCond *cond);
void (*cond_wait) (GCond *cond,
GMutex *mutex);
gboolean (*cond_timed_wait) (GCond *cond,
GMutex *mutex,
GTimeVal *end_time);
void (*cond_free) (GCond *cond);
GPrivate* (*private_new) (GDestroyNotify destructor);
gpointer (*private_get) (GPrivate *private_key);
void (*private_set) (GPrivate *private_key,
gpointer data);
void (*thread_create) (GThreadFunc func,
gpointer data,
gulong stack_size,
gboolean joinable,
gboolean bound,
GThreadPriority priority,
gpointer thread,
GError **error);
void (*thread_yield) (void);
void (*thread_join) (gpointer thread);
void (*thread_exit) (void);
void (*thread_set_priority)(gpointer thread,
GThreadPriority priority);
void (*thread_self) (gpointer thread);
gboolean (*thread_equal) (gpointer thread1,
gpointer thread2);
};
GLIB_VAR GThreadFunctions g_thread_functions_for_glib_use;
GLIB_VAR gboolean g_thread_use_default_impl;
GLIB_VAR guint64 (*g_thread_gettime) (void);
/* internal function for fallback static mutex implementation */
GMutex* g_static_mutex_get_mutex_impl (GMutex **mutex);
GThread* g_thread_create_full (GThreadFunc func,
gpointer data,
gulong stack_size,
gboolean joinable,
gboolean bound,
GThreadPriority priority,
GError **error);
G_END_DECLS
#endif /* __G_DEPRECATED_THREAD_H__ */

1
glib/glib.h
View File

@ -97,6 +97,7 @@
#include <glib/deprecated/gallocator.h> #include <glib/deprecated/gallocator.h>
#include <glib/deprecated/gcompletion.h> #include <glib/deprecated/gcompletion.h>
#include <glib/deprecated/grel.h> #include <glib/deprecated/grel.h>
#include <glib/deprecated/gthread.h>
#endif #endif
#undef __GLIB_H_INSIDE__ #undef __GLIB_H_INSIDE__

2
glib/gthread.c
View File

@ -40,7 +40,7 @@
#include "config.h" #include "config.h"
#include "gthread.h" #include "deprecated/gthread.h"
#include "gthreadprivate.h" #include "gthreadprivate.h"
#include "gslice.h" #include "gslice.h"
#include "gmain.h" #include "gmain.h"

83
glib/gthread.h
View File

@ -50,26 +50,7 @@ typedef enum
typedef gpointer (*GThreadFunc) (gpointer data); typedef gpointer (*GThreadFunc) (gpointer data);
/* This is "deprecated", but we can't actually remove it since
* g_thread_create_full takes it.
*/
typedef enum
{
G_THREAD_PRIORITY_LOW,
G_THREAD_PRIORITY_NORMAL,
G_THREAD_PRIORITY_HIGH,
G_THREAD_PRIORITY_URGENT
} GThreadPriority;
typedef struct _GThread GThread; typedef struct _GThread GThread;
struct _GThread
{
/*< private >*/
GThreadFunc func;
gpointer data;
gboolean joinable;
GThreadPriority priority;
};
typedef struct _GMutex GMutex; typedef struct _GMutex GMutex;
typedef struct _GCond GCond; typedef struct _GCond GCond;
@ -107,53 +88,6 @@ struct _GCond
#endif #endif
typedef struct _GThreadFunctions GThreadFunctions;
struct _GThreadFunctions
{
GMutex* (*mutex_new) (void);
void (*mutex_lock) (GMutex *mutex);
gboolean (*mutex_trylock) (GMutex *mutex);
void (*mutex_unlock) (GMutex *mutex);
void (*mutex_free) (GMutex *mutex);
GCond* (*cond_new) (void);
void (*cond_signal) (GCond *cond);
void (*cond_broadcast) (GCond *cond);
void (*cond_wait) (GCond *cond,
GMutex *mutex);
gboolean (*cond_timed_wait) (GCond *cond,
GMutex *mutex,
GTimeVal *end_time);
void (*cond_free) (GCond *cond);
GPrivate* (*private_new) (GDestroyNotify destructor);
gpointer (*private_get) (GPrivate *private_key);
void (*private_set) (GPrivate *private_key,
gpointer data);
void (*thread_create) (GThreadFunc func,
gpointer data,
gulong stack_size,
gboolean joinable,
gboolean bound,
GThreadPriority priority,
gpointer thread,
GError **error);
void (*thread_yield) (void);
void (*thread_join) (gpointer thread);
void (*thread_exit) (void);
void (*thread_set_priority)(gpointer thread,
GThreadPriority priority);
void (*thread_self) (gpointer thread);
gboolean (*thread_equal) (gpointer thread1,
gpointer thread2);
};
GLIB_VAR GThreadFunctions g_thread_functions_for_glib_use;
GLIB_VAR gboolean g_thread_use_default_impl;
GLIB_VAR gboolean g_threads_got_initialized;
#ifndef G_DISABLE_DEPRECATED
GLIB_VAR guint64 (*g_thread_gettime) (void);
#endif
/* initializes the mutex/cond/private implementation for glib, might /* initializes the mutex/cond/private implementation for glib, might
* only be called once, and must not be called directly or indirectly * only be called once, and must not be called directly or indirectly
* from another glib-function, e.g. as a callback. * from another glib-function, e.g. as a callback.
@ -165,6 +99,8 @@ void g_thread_init (gpointer vtable);
*/ */
gboolean g_thread_get_initialized (void); gboolean g_thread_get_initialized (void);
GLIB_VAR gboolean g_threads_got_initialized;
/* internal function for fallback static mutex implementation */ /* internal function for fallback static mutex implementation */
GMutex* g_static_mutex_get_mutex_impl (GMutex **mutex); GMutex* g_static_mutex_get_mutex_impl (GMutex **mutex);
@ -174,16 +110,6 @@ GMutex* g_static_mutex_get_mutex_impl (GMutex **mutex);
#define g_thread_supported() (g_threads_got_initialized) #define g_thread_supported() (g_threads_got_initialized)
#endif #endif
#ifndef G_DISABLE_DEPRECATED
GThread* g_thread_create_full (GThreadFunc func,
gpointer data,
gulong stack_size,
gboolean joinable,
gboolean bound,
GThreadPriority priority,
GError **error);
#endif
GThread * g_thread_create (GThreadFunc func, GThread * g_thread_create (GThreadFunc func,
gpointer data, gpointer data,
gboolean joinable, gboolean joinable,
@ -200,11 +126,6 @@ void g_thread_exit (gpointer retval);
gpointer g_thread_join (GThread *thread); gpointer g_thread_join (GThread *thread);
void g_thread_yield (void); void g_thread_yield (void);
#ifndef G_DISABLE_DEPRECATED
void g_thread_set_priority (GThread *thread,
GThreadPriority priority);
#endif
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
typedef GMutex * GStaticMutex; typedef GMutex * GStaticMutex;
#define G_STATIC_MUTEX_INIT NULL #define G_STATIC_MUTEX_INIT NULL