merge darwin/darwin-002

Author: das

PATCHES

@@ -1,14 +1,21 @@
 The libdispatch project exists in a parallel open source repository at:
-  http://svn.macosforge.org/repository/libdispatch/trunk
+  http://github.com/apple/swift-corelibs-libdispatch
+
+Externally contributed changes are synchronized back to the internal repository
+via pull request of the result of `git am` of the contributed patch series.
 
-Externally committed revisions are periodically synchronized back to the
-internal repository (this repository).
+Internal changes are synchronized from the internal darwin/trunk branch to the
+external repository via `gi am` on the github darwin/trunk branch and merge to
+github master.
 
 Key:
   APPLIED: change set was applied to internal repository.
   INTERNAL: change set originated internally (i.e. already applied).
   SKIPPED: change set was skipped.
 
+svn revisions until r218 from legacy open source repository at
+  http://svn.macosforge.org/repository/libdispatch/trunk
+
 [   1] SKIPPED
 [   2] SKIPPED
 [   3] INTERNAL rdar://problem/7148356
@@ -192,3 +199,45 @@ Key:
 [ 181]
 [ 182]
 [ 183] INTERNAL rdar://problem/7581831
+[ 202] INTERNAL libdispatch-187.5
+[ 212] INTERNAL libdispatch-228.18
+[ 213] INTERNAL rdar://problem/11754320
+[ 216] INTERNAL libdispatch-339.1.9
+[ 217] INTERNAL libdispatch-442.1.4
+[ 218] INTERNAL libdispatch-500.1.5
+
+github commits starting with 29bdc2f from
+
+  http://github.com/apple/swift-corelibs-libdispatch
+
+[29bdc2f] INTERNAL libdispatch-500.1.5
+[a60acd6] APPLIED rdar://23661056
+[39ac720] APPLIED rdar://23705483
+[acd56f6] APPLIED rdar://23754944
+[394d9a1] APPLIED rdar://23772602
+[3691f26] APPLIED rdar://23868354
+[8904f45] APPLIED rdar://23868354
+[6dbebd6] APPLIED rdar://23868354
+[b2ccfeb] APPLIED rdar://23868354
+[e7ca00f] APPLIED rdar://23868354
+[35eb408] APPLIED rdar://25159995
+[32411c2] APPLIED rdar://25159995
+[31586d5] APPLIED rdar://25159995
+[50faff5] APPLIED rdar://25159995
+[3ce4e3d] APPLIED rdar://25159995
+[b647aee] APPLIED rdar://25159995
+[ab7e16c] APPLIED rdar://25159995
+[cef2960] APPLIED rdar://25159995
+[dfa43cd] APPLIED rdar://25159995
+[8b9c3a9] APPLIED rdar://25159995
+[fefb6cf] APPLIED rdar://25159995
+[1a9c57f] APPLIED rdar://25159995
+[c04488a] APPLIED rdar://25159995
+[f1d58d1] APPLIED rdar://25159995
+[be83e85] APPLIED rdar://25159995
+[79fbb13] APPLIED rdar://25159995
+[6ead519] APPLIED rdar://25159995
+[1fa1513] APPLIED rdar://25159995
+[4a6ec51] APPLIED rdar://25159995
+[bc16cc9] APPLIED rdar://25159995
+[954ace4] APPLIED rdar://25159995

config/config.h

@@ -21,6 +21,10 @@
    don't. */
 #define HAVE_DECL_NOTE_REAP 1
 
+/* Define to 1 if you have the declaration of `NOTE_REVOKE', and to 0 if you
+   don't. */
+#define HAVE_DECL_NOTE_REVOKE 1
+
 /* Define to 1 if you have the declaration of `NOTE_SIGNAL', and to 0 if you
    don't. */
 #define HAVE_DECL_NOTE_SIGNAL 1

configure.ac

@@ -273,7 +273,7 @@ AM_CONDITIONAL(USE_MIG, $have_mach)
 #
 AC_CHECK_DECLS([CLOCK_UPTIME, CLOCK_MONOTONIC], [], [],
   [[#include <time.h>]])
-AC_CHECK_DECLS([NOTE_NONE, NOTE_REAP, NOTE_SIGNAL], [], [],
+AC_CHECK_DECLS([NOTE_NONE, NOTE_REAP, NOTE_REVOKE, NOTE_SIGNAL], [], [],
   [[#include <sys/event.h>]])
 AC_CHECK_DECLS([FD_COPY], [], [], [[#include <sys/select.h>]])
 AC_CHECK_DECLS([SIGEMT], [], [], [[#include <signal.h>]])

dispatch/Makefile.am

@@ -26,4 +26,3 @@ dispatch_HEADERS=	\
 if HAVE_SWIFT
 dispatch_HEADERS+=module.map
 endif
-

dispatch/dispatch.h

@@ -34,6 +34,10 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#if defined(__linux__) && defined(__DISPATCH_BUILDING_SWIFT_MODULE__)
+#include <stdio.h> // for off_t
+#endif
+
 #ifndef __OSX_AVAILABLE_STARTING
 #define __OSX_AVAILABLE_STARTING(x, y)
 #endif

os/linux_base.h

@@ -1,19 +1,13 @@
 /*
- * @APPLE_APACHE_LICENSE_HEADER_START@
+ * This source file is part of the Swift.org open source project
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Copyright (c) 2015 Apple Inc. and the Swift project authors
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under Apache License v2.0 with Runtime Library Exception
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See http://swift.org/LICENSE.txt for license information
+ * See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
  *
- * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 
 #ifndef __OS_LINUX_BASE__
@@ -23,7 +17,7 @@
 #include <sys/user.h>
 
 // marker for hacks we have made to make progress
-#define __LINUX_PORT_HDD__ 1 
+#define __LINUX_PORT_HDD__ 1
 
 /*
  * Stub out defines for some mach types and related macros
@@ -120,8 +114,8 @@ struct voucher_offsets_s {
 #endif
 #define OS_EXPORT
 
-#ifdef OS_WARN_RESULT_NEEDS_RELEASE 
-#undef OS_WARN_RESULT_NEEDS_RELEASE  
+#ifdef OS_WARN_RESULT_NEEDS_RELEASE
+#undef OS_WARN_RESULT_NEEDS_RELEASE
 #endif
 
 #ifdef OS_WARN_RESULT
@@ -138,7 +132,7 @@ struct voucher_offsets_s {
 // These and similar macros come from Availabilty.h on OS X
 // Need a better way to do this long term.
 #define __OSX_AVAILABLE_BUT_DEPRECATED(a,b,c,d) //
-#define __OSX_AVAILABLE_BUT_DEPRECATED_MSG(a,b,c,d,msg) // 
+#define __OSX_AVAILABLE_BUT_DEPRECATED_MSG(a,b,c,d,msg) //
 
 
 

private/voucher_private.h

@@ -427,7 +427,7 @@ OS_VOUCHER_EXPORT OS_OBJECT_RETURNS_RETAINED OS_WARN_RESULT OS_NOTHROW
 voucher_t
 voucher_create_with_mach_msg(mach_msg_header_t *msg);
 
-#endif
+#endif // __APPLE__
 __END_DECLS
 
 #endif // __OS_VOUCHER_PRIVATE__

src/init.c

@@ -268,6 +268,14 @@ extern struct dispatch_queue_attr_s _dispatch_queue_attr_concurrent
 	__attribute__((__alias__("_dispatch_queue_attrs")));
 #endif
 
+// _dispatch_queue_attr_concurrent is aliased using libdispatch.aliases
+// and the -alias_list linker option on Darwin but needs to be done manually
+// for other platforms.
+#ifndef __APPLE__
+extern struct dispatch_queue_attr_s _dispatch_queue_attr_concurrent
+	__attribute__((__alias__("_dispatch_queue_attrs")));
+#endif
+
 #pragma mark -
 #pragma mark dispatch_vtables
 
@@ -359,7 +367,7 @@ DISPATCH_VTABLE_INSTANCE(mach_msg,
 	.do_invoke = _dispatch_mach_msg_invoke,
 	.do_debug = _dispatch_mach_msg_debug,
 );
-#endif
+#endif // HAVE_MACH
 
 #if !USE_OBJC
 DISPATCH_VTABLE_INSTANCE(data,
@@ -817,7 +825,7 @@ _dispatch_client_callout4(void *ctxt, dispatch_mach_reason_t reason,
 	_dispatch_free_unwind_tsd();
 	_dispatch_set_unwind_tsd(u);
 }
-#endif
+#endif // HAVE_MACH
 
 #endif // DISPATCH_USE_CLIENT_CALLOUT
 
@@ -1172,7 +1180,7 @@ const struct dispatch_source_type_s _dispatch_source_type_vnode = {
 	.mask = NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_LINK|
 			NOTE_RENAME
 #if HAVE_DECL_NOTE_REVOKE
-	                |NOTE_REVOKE
+			|NOTE_REVOKE
 #endif
 #if HAVE_DECL_NOTE_NONE
 			|NOTE_NONE

src/inline_internal.h

@@ -43,7 +43,7 @@ DISPATCH_NOTHROW void
 _dispatch_client_callout4(void *ctxt, dispatch_mach_reason_t reason,
 		dispatch_mach_msg_t dmsg, mach_error_t error,
 		dispatch_mach_handler_function_t f);
-#endif
+#endif // HAVE_MACH
 
 #else // !DISPATCH_USE_CLIENT_CALLOUT
 
@@ -70,7 +70,7 @@ _dispatch_client_callout4(void *ctxt, dispatch_mach_reason_t reason,
 {
 	return f(ctxt, reason, dmsg, error);
 }
-#endif
+#endif // HAVE_MACH
 
 #endif // !DISPATCH_USE_CLIENT_CALLOUT
 

src/internal.h

@@ -345,7 +345,7 @@ DISPATCH_NOINLINE
 void _dispatch_bug_client(const char* msg);
 DISPATCH_NOINLINE
 void _dispatch_bug_mach_client(const char *msg, mach_msg_return_t kr);
-#endif
+#endif // HAVE_MACH
 DISPATCH_NOINLINE
 void _dispatch_bug_kevent_client(const char* msg, const char* filter,
 		const char *operation, int err);
@@ -549,7 +549,7 @@ void _dispatch_vtable_init(void);
 char *_dispatch_get_build(void);
 
 uint64_t _dispatch_timeout(dispatch_time_t when);
-uint64_t _dispatch_time_to_nanoseconds(dispatch_time_t when);
+uint64_t _dispatch_time_nanoseconds_since_epoch(dispatch_time_t when);
 
 extern bool _dispatch_safe_fork, _dispatch_child_of_unsafe_fork;
 

src/io.c

@@ -390,7 +390,7 @@ dispatch_io_create_with_path(dispatch_io_type_t type, const char *path,
 			(path_data->oflag & O_NOFOLLOW) == O_NOFOLLOW
 #ifndef __linux__
 					|| (path_data->oflag & O_SYMLINK) == O_SYMLINK
-#endif						  
+#endif
 					? lstat(path_data->path, &st) : stat(path_data->path, &st),
 			case 0:
 				err = _dispatch_io_validate_type(channel, st.st_mode);
@@ -1601,7 +1601,8 @@ _dispatch_disk_init(dispatch_fd_entry_t fd_entry, dev_t dev)
 	TAILQ_INIT(&disk->operations);
 	disk->cur_rq = TAILQ_FIRST(&disk->operations);
 	char label[45];
-	snprintf(label, sizeof(label), "com.apple.libdispatch-io.deviceq.%d", (int)dev);
+	snprintf(label, sizeof(label), "com.apple.libdispatch-io.deviceq.%d",
+			(int)dev);
 	disk->pick_queue = dispatch_queue_create(label, NULL);
 	TAILQ_INSERT_TAIL(&_dispatch_io_devs[hash], disk, disk_list);
 out:
@@ -2107,7 +2108,7 @@ _dispatch_operation_advise(dispatch_operation_t op, size_t chunk_size)
 		// TODO: set disk status on error
 		default: (void)dispatch_assume_zero(err); break;
 	);
-#endif	
+#endif
 }
 
 static int
@@ -2398,10 +2399,11 @@ _dispatch_operation_debug_attr(dispatch_operation_t op, char* buf,
 			"write", op->fd_entry ? op->fd_entry->fd : -1, op->fd_entry,
 			op->channel, op->op_q, oqtarget && oqtarget->dq_label ?
 			oqtarget->dq_label : "", oqtarget, target && target->dq_label ?
-			target->dq_label : "", target, (long long)op->offset, op->length, op->total,
-			op->undelivered + op->buf_len, op->flags, op->err, op->params.low,
-			op->params.high, op->params.interval_flags &
-			DISPATCH_IO_STRICT_INTERVAL ? "(strict)" : "", (unsigned long long)op->params.interval);
+			target->dq_label : "", target, (long long)op->offset, op->length,
+			op->total, op->undelivered + op->buf_len, op->flags, op->err,
+			op->params.low, op->params.high, op->params.interval_flags &
+			DISPATCH_IO_STRICT_INTERVAL ? "(strict)" : "",
+			(unsigned long long)op->params.interval);
 }
 
 size_t

src/object.m

@@ -538,7 +538,7 @@ - (NSString *)debugDescription {
 		objc_terminate();
 	}
 }
-#endif
+#endif // HAVE_MACH
 
 #endif // DISPATCH_USE_CLIENT_CALLOUT
 

src/queue.c

@@ -867,7 +867,7 @@ _dispatch_root_queue_init_pthread_pool(dispatch_root_queue_context_t qc,
 				&pqc->dpq_thread_attr, qc->dgq_qos, 0));
 #endif
 	}
-#endif
+#endif // HAVE_PTHREAD_WORKQUEUES
 #if USE_MACH_SEM
 	// override the default FIFO behavior for the pool semaphores
 	kern_return_t kr = semaphore_create(mach_task_self(),
@@ -1477,7 +1477,7 @@ static const int _dispatch_mgr_sched_qos2prio[] = {
 	[_DISPATCH_QOS_CLASS_USER_INITIATED] = 37,
 	[_DISPATCH_QOS_CLASS_USER_INTERACTIVE] = 47,
 };
-#endif
+#endif // HAVE_PTHREAD_WORKQUEUE_QOS
 
 static void
 _dispatch_mgr_sched_init(void *ctxt DISPATCH_UNUSED)

src/semaphore.c

@@ -368,7 +368,7 @@ _dispatch_semaphore_wait_slow(dispatch_semaphore_t dsema,
 		}
 #elif USE_POSIX_SEM
 		do {
-			uint64_t nsec = _dispatch_time_to_nanoseconds(timeout);
+			uint64_t nsec = _dispatch_time_nanoseconds_since_epoch(timeout);
 			_timeout.tv_sec = (typeof(_timeout.tv_sec))(nsec / NSEC_PER_SEC);
 			_timeout.tv_nsec = (typeof(_timeout.tv_nsec))(nsec % NSEC_PER_SEC);
 			ret = slowpath(sem_timedwait(&dsema->dsema_sem, &_timeout));
@@ -378,19 +378,6 @@ _dispatch_semaphore_wait_slow(dispatch_semaphore_t dsema,
 			DISPATCH_SEMAPHORE_VERIFY_RET(ret);
 			break;
 		}
-#elif USE_FUTEX_SEM
-		do {
-			uint64_t nsec = _dispatch_timeout(timeout);
-			_timeout.tv_sec = (typeof(_timeout.tv_sec))(nsec / NSEC_PER_SEC);
-			_timeout.tv_nsec = (typeof(_timeout.tv_nsec))(nsec % NSEC_PER_SEC);
-			pthread_workqueue_signal_np();
-			ret = slowpath(_dispatch_futex_wait(&dsema->dsema_futex, &_timeout));
-		} while (ret == false && errno == EINTR);
-
-		if (!(ret == false && errno == ETIMEDOUT)) {
-			DISPATCH_SEMAPHORE_VERIFY_RET(ret);
-			break;
-		}
 #elif USE_WIN32_SEM
 		nsec = _dispatch_timeout(timeout);
 		msec = (DWORD)(nsec / (uint64_t)1000000);
@@ -635,7 +622,7 @@ _dispatch_group_wait_slow(dispatch_semaphore_t dsema, dispatch_time_t timeout)
 		}
 #elif USE_POSIX_SEM
 		do {
-			uint64_t nsec = _dispatch_time_to_nanoseconds(timeout);
+			uint64_t nsec = _dispatch_time_nanoseconds_since_epoch(timeout);
 			_timeout.tv_sec = (typeof(_timeout.tv_sec))(nsec / NSEC_PER_SEC);
 			_timeout.tv_nsec = (typeof(_timeout.tv_nsec))(nsec % NSEC_PER_SEC);
 			ret = slowpath(sem_timedwait(&dsema->dsema_sem, &_timeout));
@@ -784,14 +771,10 @@ _dispatch_thread_semaphore_create(void)
 	}
 	return s4;
 #elif USE_POSIX_SEM
-	sem_t* s4 = malloc(sizeof(sem_t));
+	sem_t *s4 = _dispatch_calloc(1ul, sizeof(sem_t));
 	int ret = sem_init(s4, 0, 0);
 	DISPATCH_SEMAPHORE_VERIFY_RET(ret);
 	return (_dispatch_thread_semaphore_t)s4;
-#elif USE_FUTEX_SEM
-	dispatch_futex_t ftx = (typeof(ftx))_dispatch_continuation_alloc();
-	*ftx = DISPATCH_FUTEX_INIT;
-	return (_dispatch_thread_semaphore_t)ftx;
 #elif USE_WIN32_SEM
 	HANDLE tmp;
 	while (!dispatch_assume(tmp = CreateSemaphore(NULL, 0, LONG_MAX, NULL))) {
@@ -814,7 +797,7 @@ _dispatch_thread_semaphore_dispose(_dispatch_thread_semaphore_t sema)
 	DISPATCH_VERIFY_MIG(kr);
 	DISPATCH_SEMAPHORE_VERIFY_KR(kr);
 #elif USE_POSIX_SEM
-	sem_t *s4 = (sem_t*)sema;
+	sem_t *s4 = (sem_t *)sema;
 	int ret = sem_destroy(s4);
 	free(s4);
 	DISPATCH_SEMAPHORE_VERIFY_RET(ret);
@@ -841,7 +824,7 @@ _dispatch_thread_semaphore_signal(_dispatch_thread_semaphore_t sema)
 	kern_return_t kr = semaphore_signal(s4);
 	DISPATCH_SEMAPHORE_VERIFY_KR(kr);
 #elif USE_POSIX_SEM
-	sem_t *s4 = (sem_t*)sema;
+	sem_t *s4 = (sem_t *)sema;
 	int ret = sem_post(s4);
 	DISPATCH_SEMAPHORE_VERIFY_RET(ret);
 #elif USE_FUTEX_SEM
@@ -870,7 +853,7 @@ _dispatch_thread_semaphore_wait(_dispatch_thread_semaphore_t sema)
 	} while (slowpath(kr == KERN_ABORTED));
 	DISPATCH_SEMAPHORE_VERIFY_KR(kr);
 #elif USE_POSIX_SEM
-	sem_t *s4 = (sem_t*)sema;
+	sem_t *s4 = (sem_t *)sema;
 	int ret;
 	do {
 		ret = sem_wait(s4);