Skip to content

enforce readability over preference. #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

enforce readability over preference. #237

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dde323
enforce readability over preference.
clickbait Dec 5, 2015
678062b
fixed camelcase.
clickbait Dec 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions validation-test/stdlib/StringSlicesConcurrentAppend.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ extension String {
// different non-shared strings that point to the same shared buffer.

enum ThreadID {
case Leader
case Follower
case Master
case Slave
}

var barrierVar: UnsafeMutablePointer<_stdlib_pthread_barrier_t> = nil
var sharedString: String = ""
var followerString: String = ""
var slaveString: String = ""

func barrier() {
var ret = _stdlib_pthread_barrier_wait(barrierVar)
Expand All @@ -41,7 +41,7 @@ func barrier() {
func sliceConcurrentAppendThread(tid: ThreadID) {
for i in 0..<100 {
barrier()
if tid == .Leader {
if tid == .Master {
// Get a fresh buffer.
sharedString = ""
sharedString.appendContentsOf("abc")
Expand All @@ -57,7 +57,7 @@ func sliceConcurrentAppendThread(tid: ThreadID) {
barrier()

// Append to the private string.
if tid == .Leader {
if tid == .Master {
privateString.appendContentsOf("def")
} else {
privateString.appendContentsOf("ghi")
Expand All @@ -66,22 +66,22 @@ func sliceConcurrentAppendThread(tid: ThreadID) {
barrier()

// Verify that contents look good.
if tid == .Leader {
if tid == .Master {
expectEqual("abcdef", privateString)
} else {
expectEqual("abcghi", privateString)
}
expectEqual("abc", sharedString)

// Verify that only one thread took ownership of the buffer.
if tid == .Follower {
followerString = privateString
if tid == .Slave {
slaveString = privateString
}
barrier()
if tid == .Leader {
if tid == .Master {
expectTrue(
(privateString.bufferID == sharedString.bufferID) !=
(followerString.bufferID == sharedString.bufferID))
(slaveString.bufferID == sharedString.bufferID))
}
}
}
Expand All @@ -93,9 +93,9 @@ StringTestSuite.test("SliceConcurrentAppend") {
expectEqual(0, ret)

let (createRet1, tid1) = _stdlib_pthread_create_block(
nil, sliceConcurrentAppendThread, .Leader)
nil, sliceConcurrentAppendThread, .Master)
let (createRet2, tid2) = _stdlib_pthread_create_block(
nil, sliceConcurrentAppendThread, .Follower)
nil, sliceConcurrentAppendThread, .Slave)

expectEqual(0, createRet1)
expectEqual(0, createRet2)
Expand All @@ -114,4 +114,3 @@ StringTestSuite.test("SliceConcurrentAppend") {
}

runAllTests()