Skip to content

Fix inconsiderate naming #165

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.

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

Merged
merged 1 commit into from
Dec 4, 2015
Merged
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions validation-test/stdlib/StringSlicesConcurrentAppend.swift
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 Master
case Slave
case Leader
case Follower
}

var barrierVar: UnsafeMutablePointer<_stdlib_pthread_barrier_t> = nil
var sharedString: String = ""
var slaveString: String = ""
var followerString: 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 == .Master {
if tid == .Leader {
// 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 == .Master {
if tid == .Leader {
privateString.appendContentsOf("def")
} else {
privateString.appendContentsOf("ghi")
Expand All @@ -74,14 +74,14 @@ func sliceConcurrentAppendThread(tid: ThreadID) {
expectEqual("abc", sharedString)

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

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

expectEqual(0, createRet1)
expectEqual(0, createRet2)
Expand Down