luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-09 18:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove support for Solaris threads. (#136971, Sebastian Wilhelmi, patch by

Browse Source 
2005-12-02  Matthias Clasen  <mclasen@redhat.com>

	* glib/gspawn.c:
	* configure.in: Remove support for Solaris threads.
	(#136971, Sebastian Wilhelmi, patch by Andrew Paprocki)
This commit is contained in:
Matthias Clasen
2005-12-02 21:37:25 +00:00
committed by Matthias Clasen
parent 745229d452
commit f42f6da6d5
11 changed files with 36 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,8 +1,16 @@
2005-12-02 Matthias Clasen <mclasen@redhat.com>
* glib/gspawn.c:
* configure.in: Remove support for Solaris threads.
(#136971, Sebastian Wilhelmi, patch by Andrew Paprocki)
2005-12-02 Matthias Clasen <mclasen@redhat.com> 2005-12-02 Matthias Clasen <mclasen@redhat.com>
* configure.in: Define G_GUINT64_CONSTANT in analogy to * configure.in: Define G_GUINT64_CONSTANT in analogy to
G_GINT64_CONSTANT. (#322568, Andrew Paprocki) G_GINT64_CONSTANT. (#322568, Andrew Paprocki)
2005-12-02 Matthias Clasen <mclasen@redhat.com>
* glib/gslice.c: Win32 portability fixes and C99ism removal, * glib/gslice.c: Win32 portability fixes and C99ism removal,
pointed out by Kazuki Iwamoto. (#323052) pointed out by Kazuki Iwamoto. (#323052)

8
ChangeLog.pre-2-10
View File

@@ -1,8 +1,16 @@
2005-12-02 Matthias Clasen <mclasen@redhat.com>
* glib/gspawn.c:
* configure.in: Remove support for Solaris threads.
(#136971, Sebastian Wilhelmi, patch by Andrew Paprocki)
2005-12-02 Matthias Clasen <mclasen@redhat.com> 2005-12-02 Matthias Clasen <mclasen@redhat.com>
* configure.in: Define G_GUINT64_CONSTANT in analogy to * configure.in: Define G_GUINT64_CONSTANT in analogy to
G_GINT64_CONSTANT. (#322568, Andrew Paprocki) G_GINT64_CONSTANT. (#322568, Andrew Paprocki)
2005-12-02 Matthias Clasen <mclasen@redhat.com>
* glib/gslice.c: Win32 portability fixes and C99ism removal, * glib/gslice.c: Win32 portability fixes and C99ism removal,
pointed out by Kazuki Iwamoto. (#323052) pointed out by Kazuki Iwamoto. (#323052)

8
ChangeLog.pre-2-12
View File

@@ -1,8 +1,16 @@
2005-12-02 Matthias Clasen <mclasen@redhat.com>
* glib/gspawn.c:
* configure.in: Remove support for Solaris threads.
(#136971, Sebastian Wilhelmi, patch by Andrew Paprocki)
2005-12-02 Matthias Clasen <mclasen@redhat.com> 2005-12-02 Matthias Clasen <mclasen@redhat.com>
* configure.in: Define G_GUINT64_CONSTANT in analogy to * configure.in: Define G_GUINT64_CONSTANT in analogy to
G_GINT64_CONSTANT. (#322568, Andrew Paprocki) G_GINT64_CONSTANT. (#322568, Andrew Paprocki)
2005-12-02 Matthias Clasen <mclasen@redhat.com>
* glib/gslice.c: Win32 portability fixes and C99ism removal, * glib/gslice.c: Win32 portability fixes and C99ism removal,
pointed out by Kazuki Iwamoto. (#323052) pointed out by Kazuki Iwamoto. (#323052)

28
configure.in
View File

@@ -1366,7 +1366,7 @@ dnl *** g_thread checks ***
dnl *********************** dnl ***********************
AC_ARG_WITH(threads, AC_ARG_WITH(threads,
[AC_HELP_STRING([--with-threads=@<:@none/posix/dce/solaris/win32@:>@], [AC_HELP_STRING([--with-threads=@<:@none/posix/dce/win32@:>@],
[specify a thread implementation to use])], [specify a thread implementation to use])],
[if test "x$with_threads" = x; then [if test "x$with_threads" = x; then
want_threads=yes want_threads=yes
@@ -1428,13 +1428,6 @@ dnl ***************************************
# have_threads=none means no default thread implementation # have_threads=none means no default thread implementation
have_threads=no have_threads=no
if test "x$want_threads" = xyes || test "x$want_threads" = xsolaris; then
case $host in
*-*-solaris*)
AC_CHECK_LIB(thread, cond_init, have_threads=solaris)
;;
esac
fi
if test "x$want_threads" = xyes || test "x$want_threads" = xposix \ if test "x$want_threads" = xyes || test "x$want_threads" = xposix \
|| test "x$want_threads" = xdce; then || test "x$want_threads" = xdce; then
# -D_POSIX4_DRAFT_SOURCE -D_POSIX4A_DRAFT10_SOURCE is for DG/UX # -D_POSIX4_DRAFT_SOURCE -D_POSIX4A_DRAFT10_SOURCE is for DG/UX
@@ -1580,16 +1573,6 @@ if test x"$have_threads" != xno; then
G_THREAD_CFLAGS="-threads" G_THREAD_CFLAGS="-threads"
G_THREAD_LIBS=$G_THREAD_CFLAGS G_THREAD_LIBS=$G_THREAD_CFLAGS
;; ;;
*-solaris*)
if test x"$GCC" = xyes; then
# We are using solaris threads. posix threads are
# already catched above.
G_THREAD_CFLAGS="-threads"
else
G_THREAD_CFLAGS="-mt"
fi
G_THREAD_LIBS=$G_THREAD_CFLAGS
;;
*-sysv5uw7*) # UnixWare 7 *-sysv5uw7*) # UnixWare 7
# We are not using gcc with -pthread. Catched above. # We are not using gcc with -pthread. Catched above.
G_THREAD_CFLAGS="-Kthread" G_THREAD_CFLAGS="-Kthread"
@@ -1727,13 +1710,6 @@ case $have_threads in
AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES) AC_SUBST(GTHREAD_COMPILE_IMPL_DEFINES)
CPPFLAGS="$glib_save_CPPFLAGS" CPPFLAGS="$glib_save_CPPFLAGS"
;; ;;
solaris)
mutex_has_default=yes
mutex_default_type='mutex_t'
mutex_default_init="DEFAULTMUTEX"
mutex_header_file='thread.h'
g_threads_impl="SOLARIS"
;;
win32) win32)
g_threads_impl="WIN32" g_threads_impl="WIN32"
;; ;;
@@ -1884,8 +1860,6 @@ int main () {
elif test x"$have_threads" = xwin32; then elif test x"$have_threads" = xwin32; then
# It's a pointer to a private struct # It's a pointer to a private struct
GLIB_SIZEOF(,struct _GThreadData *, system_thread) GLIB_SIZEOF(,struct _GThreadData *, system_thread)
elif test x"$have_threads" = xsolaris; then
GLIB_SIZEOF([#include <thread.h>], thread_t, system_thread)
fi fi
LIBS="$glib_save_LIBS" LIBS="$glib_save_LIBS"

4
docs/reference/ChangeLog
View File

@@ -1,5 +1,9 @@
2005-12-02 Matthias Clasen <mclasen@redhat.com> 2005-12-02 Matthias Clasen <mclasen@redhat.com>
* glib/building.sgml:
* glib/tmpl/threads.sgml:
* glib/glib-sections.txt: Remove G_THREADS_IMPL_SOLARIS
* glib/tmpl/types.sgml: Document G_GUINT64_CONSTANT. * glib/tmpl/types.sgml: Document G_GUINT64_CONSTANT.
2005-11-27 Matthias Clasen <mclasen@redhat.com> 2005-11-27 Matthias Clasen <mclasen@redhat.com>

6
docs/reference/glib/building.sgml
View File

@@ -175,7 +175,7 @@ How to compile GLib itself
<arg>--enable-threads</arg> <arg>--enable-threads</arg>
</group> </group>
<group> <group>
<arg>--with-threads=[none|posix|dce|solaris|win32]</arg> <arg>--with-threads=[none|posix|dce|win32]</arg>
</group> </group>
<group> <group>
<arg>--disable-included-printf</arg> <arg>--disable-included-printf</arg>
@@ -303,10 +303,6 @@ How to compile GLib itself
one is installed. one is installed.
</para></listitem> </para></listitem>
<listitem><para>
'solaris' uses the native Solaris thread implementation.
</para></listitem>
<listitem><para> <listitem><para>
'none' means that GLib will be thread safe, 'none' means that GLib will be thread safe,
but does not have a default thread but does not have a default thread

1
docs/reference/glib/glib-sections.txt
View File

@@ -499,7 +499,6 @@ g_child_watch_funcs
<SUBSECTION> <SUBSECTION>
G_THREADS_ENABLED G_THREADS_ENABLED
G_THREADS_IMPL_POSIX G_THREADS_IMPL_POSIX
G_THREADS_IMPL_SOLARIS
G_THREADS_IMPL_NONE G_THREADS_IMPL_NONE
<SUBSECTION> <SUBSECTION>

8
docs/reference/glib/tmpl/threads.sgml
View File

@@ -83,14 +83,6 @@ This macro is defined, if POSIX style threads are used.
<!-- ##### MACRO G_THREADS_IMPL_SOLARIS ##### -->
<para>
This macro is defined, if the Solaris thread system is used.
</para>
<!-- ##### MACRO G_THREADS_IMPL_NONE ##### --> <!-- ##### MACRO G_THREADS_IMPL_NONE ##### -->
<para> <para>

15
glib/gspawn.c
View File

@@ -40,17 +40,6 @@
#include "glibintl.h" #include "glibintl.h"
/* With solaris threads, fork() duplicates all threads, which
* a) could cause unexpected side-effects, and b) is expensive.
* Once we remove support for solaris threads, the FORK1 #define
* should be removedl
*/
#ifdef G_THREADS_IMPL_SOLARIS
#define FORK1() fork1()
#else
#define FORK1() fork()
#endif
static gint g_execute (const gchar *file, static gint g_execute (const gchar *file,
gchar **argv, gchar **argv,
gchar **envp, gchar **envp,
@@ -1094,7 +1083,7 @@ fork_exec_with_pipes (gboolean intermediate_child,
if (standard_error && !make_pipe (stderr_pipe, error)) if (standard_error && !make_pipe (stderr_pipe, error))
goto cleanup_and_fail; goto cleanup_and_fail;
pid = FORK1 (); pid = fork ();
if (pid < 0) if (pid < 0)
{ {
@@ -1136,7 +1125,7 @@ fork_exec_with_pipes (gboolean intermediate_child,
*/ */
GPid grandchild_pid; GPid grandchild_pid;
grandchild_pid = FORK1 (); grandchild_pid = fork ();
if (grandchild_pid < 0) if (grandchild_pid < 0)
{ {

4
gthread/ChangeLog
View File

@@ -1,3 +1,7 @@
2005-12-02 Matthias Clasen <mclasen@redhat.com>
* Makefile.am: Remove gthread-solaris.c
2005-11-17 Matthias Clasen <mclasen@redhat.com> 2005-11-17 Matthias Clasen <mclasen@redhat.com>
* === Released 2.9.0 === * === Released 2.9.0 ===

1
gthread/Makefile.am
View File

@@ -7,7 +7,6 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gthread \
EXTRA_DIST = \ EXTRA_DIST = \
makefile.msc.in \ makefile.msc.in \
gthread-posix.c \ gthread-posix.c \
gthread-solaris.c \
gthread-win32.c \ gthread-win32.c \
gthread-none.c \ gthread-none.c \
gthread.def \ gthread.def \