averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

stdlib: rename _stdlib_PTHREAD_BARRIER_SERIAL_THREAD -> _stdlib_THREAD_BARRIER_SERIAL_THREAD

Browse Source
This commit is contained in:
Saleem Abdulrasool
2018-11-25 11:18:08 -08:00
parent 7b06586fe1
commit 65bdce00b6
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stdlib/private/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift
View File

@@ -134,7 +134,7 @@ public class _stdlib_Barrier {
public func wait() { public func wait() {
let ret = _stdlib_thread_barrier_wait(_pthreadBarrierPtr) let ret = _stdlib_thread_barrier_wait(_pthreadBarrierPtr)
if !(ret == 0 || ret == _stdlib_PTHREAD_BARRIER_SERIAL_THREAD) { if !(ret == 0 || ret == _stdlib_THREAD_BARRIER_SERIAL_THREAD) {
fatalError("_stdlib_thread_barrier_wait() failed") fatalError("_stdlib_thread_barrier_wait() failed")
} }
} }

4
stdlib/private/SwiftPrivateThreadExtras/ThreadBarriers.swift
View File

@@ -24,7 +24,7 @@ import MSVCRT
// (OS X does not implement them.) // (OS X does not implement them.)
// //
public var _stdlib_PTHREAD_BARRIER_SERIAL_THREAD: CInt { public var _stdlib_THREAD_BARRIER_SERIAL_THREAD: CInt {
return 1 return 1
} }
@@ -116,6 +116,6 @@ public func _stdlib_thread_barrier_wait(
if pthread_mutex_unlock(barrier.pointee.mutex!) != 0 { if pthread_mutex_unlock(barrier.pointee.mutex!) != 0 {
return -1 return -1
} }
return _stdlib_PTHREAD_BARRIER_SERIAL_THREAD return _stdlib_THREAD_BARRIER_SERIAL_THREAD
} }
} }

2
validation-test/stdlib/StringSlicesConcurrentAppend.swift
View File

@@ -41,7 +41,7 @@ var secondaryString: String = ""
func barrier() { func barrier() {
var ret = _stdlib_thread_barrier_wait(barrierVar!) var ret = _stdlib_thread_barrier_wait(barrierVar!)
expectTrue(ret == 0 || ret == _stdlib_PTHREAD_BARRIER_SERIAL_THREAD) expectTrue(ret == 0 || ret == _stdlib_THREAD_BARRIER_SERIAL_THREAD)
} }
func sliceConcurrentAppendThread(_ tid: ThreadID) { func sliceConcurrentAppendThread(_ tid: ThreadID) {