[libdispatch-changes] [210] branches/Lion/src

source_changes at macosforge.org source_changes at macosforge.org
Wed Aug 24 19:44:34 PDT 2011


Revision: 210
          http://trac.macosforge.org/projects/libdispatch/changeset/210
Author:   dsteffen at apple.com
Date:     2011-08-24 19:44:34 -0700 (Wed, 24 Aug 2011)
Log Message:
-----------
r208 followup: move these to a more appropriate spot

Revision Links:
--------------
    http://trac.macosforge.org/projects/libdispatch/changeset/208

Modified Paths:
--------------
    branches/Lion/src/init.c
    branches/Lion/src/queue.c
    branches/Lion/src/shims/tsd.h

Modified: branches/Lion/src/init.c
===================================================================
--- branches/Lion/src/init.c	2011-08-24 02:51:12 UTC (rev 209)
+++ branches/Lion/src/init.c	2011-08-25 02:44:34 UTC (rev 210)
@@ -80,6 +80,17 @@
 void (*_dispatch_end_NSAutoReleasePool)(void *) = (void *)dummy_function;
 #endif
 
+#if !DISPATCH_USE_DIRECT_TSD
+pthread_key_t dispatch_queue_key;
+pthread_key_t dispatch_sema4_key;
+pthread_key_t dispatch_cache_key;
+pthread_key_t dispatch_io_key;
+pthread_key_t dispatch_apply_key;
+#if DISPATCH_PERF_MON
+pthread_key_t dispatch_bcounter_key;
+#endif
+#endif // !DISPATCH_USE_DIRECT_TSD
+
 struct _dispatch_hw_config_s _dispatch_hw_config;
 bool _dispatch_safe_fork = true;
 

Modified: branches/Lion/src/queue.c
===================================================================
--- branches/Lion/src/queue.c	2011-08-24 02:51:12 UTC (rev 209)
+++ branches/Lion/src/queue.c	2011-08-25 02:44:34 UTC (rev 210)
@@ -443,17 +443,6 @@
 
 }
 
-#if !DISPATCH_USE_DIRECT_TSD
-pthread_key_t dispatch_queue_key;
-pthread_key_t dispatch_sema4_key;
-pthread_key_t dispatch_cache_key;
-pthread_key_t dispatch_io_key;
-pthread_key_t dispatch_apply_key;
-#if DISPATCH_PERF_MON
-pthread_key_t dispatch_bcounter_key;
-#endif
-#endif // !DISPATCH_USE_DIRECT_TSD
-
 #define countof(x) (sizeof(x) / sizeof(x[0]))
 
 DISPATCH_EXPORT DISPATCH_NOTHROW

Modified: branches/Lion/src/shims/tsd.h
===================================================================
--- branches/Lion/src/shims/tsd.h	2011-08-24 02:51:12 UTC (rev 209)
+++ branches/Lion/src/shims/tsd.h	2011-08-25 02:44:34 UTC (rev 210)
@@ -45,7 +45,6 @@
 static const unsigned long dispatch_io_key			= __PTK_LIBDISPATCH_KEY3;
 static const unsigned long dispatch_apply_key		= __PTK_LIBDISPATCH_KEY4;
 static const unsigned long dispatch_bcounter_key	= __PTK_LIBDISPATCH_KEY5;
-//__PTK_LIBDISPATCH_KEY5
 
 DISPATCH_TSD_INLINE
 static inline void
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/libdispatch-changes/attachments/20110824/7748148e/attachment.html>


More information about the libdispatch-changes mailing list