rpms/glib2/devel glib-2.7.5-atomic.patch,1.6,1.7

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/glib2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9351

Modified Files:
	glib-2.7.5-atomic.patch 
Log Message:
More fiddling


glib-2.7.5-atomic.patch:
 config.h.in         |    3 +++
 configure           |   10 ++++++++++
 configure.in        |    6 ++++++
 glib/gatomic.c      |   44 ++++++++++++++++++++++++++++++++++++++++++--
 tests/Makefile.in   |    2 +-
 tests/atomic-test.c |   23 +++++++++++++++++++++++
 6 files changed, 85 insertions(+), 3 deletions(-)

Index: glib-2.7.5-atomic.patch
===================================================================
RCS file: /cvs/dist/rpms/glib2/devel/glib-2.7.5-atomic.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- glib-2.7.5-atomic.patch	3 Aug 2005 15:13:29 -0000	1.6
+++ glib-2.7.5-atomic.patch	3 Aug 2005 16:44:38 -0000	1.7
@@ -1,5 +1,5 @@
---- glib-2.7.5/glib/gatomic.c.atomic	2005-08-02 15:20:05.000000000 -0400
-+++ glib-2.7.5/glib/gatomic.c	2005-08-02 15:20:19.000000000 -0400
+--- glib-2.7.5/glib/gatomic.c.atomic	2005-07-19 11:30:23.000000000 -0400
++++ glib-2.7.5/glib/gatomic.c	2005-08-03 12:29:26.000000000 -0400
 @@ -442,9 +442,49 @@
  }
  
@@ -52,8 +52,8 @@
  #else /* !__GNUC__ */
  # ifdef G_PLATFORM_WIN32
  #  define DEFINE_WITH_WIN32_INTERLOCKED
---- glib-2.7.5/tests/Makefile.in.atomic	2005-08-03 10:05:01.267644000 -0400
-+++ glib-2.7.5/tests/Makefile.in	2005-08-03 10:05:09.582320000 -0400
+--- glib-2.7.5/tests/Makefile.in.atomic	2005-08-02 11:21:18.000000000 -0400
++++ glib-2.7.5/tests/Makefile.in	2005-08-03 12:29:26.000000000 -0400
 @@ -236,7 +236,7 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
@@ -63,8 +63,51 @@
  
  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule $(GLIB_DEBUG_FLAGS)
  
---- glib-2.7.5/configure.in.atomic	2005-08-02 15:19:48.000000000 -0400
-+++ glib-2.7.5/configure.in	2005-08-02 15:20:19.000000000 -0400
+--- glib-2.7.5/tests/atomic-test.c.atomic	2005-08-03 12:35:57.000000000 -0400
++++ glib-2.7.5/tests/atomic-test.c	2005-08-03 12:44:03.000000000 -0400
+@@ -2,10 +2,16 @@
+ #undef G_LOG_DOMAIN
+ 
+ #include <glib.h>
++#include <glib-object.h>
+ 
+ /* Obviously we can't test that the operations are atomic, but we can
+  * at least test, that they do, what they ought to do */
+ 
++typedef union {
++  GClosure closure;
++  gint     vint;
++} ClosureInt;
++
+ int 
+ main (int   argc,
+       char *argv[])
+@@ -58,6 +64,23 @@
+   g_assert (g_atomic_pointer_compare_and_exchange (&atomic_pointer, 
+ 						   biggest_pointer, NULL));
+   g_assert (atomic_pointer == NULL);
++
++  {
++    ClosureInt *ci = g_new0 (ClosureInt, 1);
++
++    g_assert (ci->closure.ref_count == 0);
++    g_assert (ci->vint == 0);
++
++    g_print ("sizeof(GClosure) %d, sizeof(ClosureInt) %d\n",
++	     sizeof (GClosure), sizeof (ClosureInt));
++
++    g_print ("offset of marshal %d\n",
++	     G_STRUCT_OFFSET (GClosure, marshal));
++	     
++    ci->closure.ref_count = 1;
++    g_print ("refcount %d, int %d\n",
++             ci->closure.ref_count, ci->vint);
++  }
+   
+   return 0;
+ }
+--- glib-2.7.5/configure.in.atomic	2005-07-26 15:37:34.000000000 -0400
++++ glib-2.7.5/configure.in	2005-08-03 12:29:26.000000000 -0400
 @@ -1967,6 +1967,12 @@
  		   	 [ia64 atomic implementation])
        glib_memory_barrier_needed=yes
@@ -78,8 +121,8 @@
      *)
        AC_MSG_RESULT([none])
        glib_memory_barrier_needed=yes
---- glib-2.7.5/config.h.in.atomic	2005-08-02 15:19:56.000000000 -0400
-+++ glib-2.7.5/config.h.in	2005-08-02 15:20:39.000000000 -0400
+--- glib-2.7.5/config.h.in.atomic	2005-08-02 11:21:05.000000000 -0400
++++ glib-2.7.5/config.h.in	2005-08-03 12:29:26.000000000 -0400
 @@ -59,6 +59,9 @@
  /* powerpc atomic implementation */
  #undef G_ATOMIC_POWERPC
@@ -90,8 +133,8 @@
  /* sparcv9 atomic implementation */
  #undef G_ATOMIC_SPARCV9
  
---- glib-2.7.5/configure.atomic	2005-08-02 15:20:44.000000000 -0400
-+++ glib-2.7.5/configure	2005-08-02 15:21:11.000000000 -0400
+--- glib-2.7.5/configure.atomic	2005-08-02 11:21:21.000000000 -0400
++++ glib-2.7.5/configure	2005-08-03 12:29:26.000000000 -0400
 @@ -36529,6 +36529,16 @@
  
        glib_memory_barrier_needed=yes