Properly fix potentially inconsiderate naming

This commit is contained in:
Inari
2015-12-05 01:01:53 +01:00
parent 821a5a6462
commit 0e8a37bdee

View File

@@ -25,13 +25,13 @@ extension String {
// different non-shared strings that point to the same shared buffer.
enum ThreadID {
case Leader
case Follower
case Primary
case Replica
}
var barrierVar: UnsafeMutablePointer<_stdlib_pthread_barrier_t> = nil
var sharedString: String = ""
var followerString: String = ""
var replicaString: String = ""
func barrier() {
var ret = _stdlib_pthread_barrier_wait(barrierVar)
@@ -41,7 +41,7 @@ func barrier() {
func sliceConcurrentAppendThread(tid: ThreadID) {
for i in 0..<100 {
barrier()
if tid == .Leader {
if tid == .Primary {
// Get a fresh buffer.
sharedString = ""
sharedString.appendContentsOf("abc")
@@ -57,7 +57,7 @@ func sliceConcurrentAppendThread(tid: ThreadID) {
barrier()
// Append to the private string.
if tid == .Leader {
if tid == .Primary {
privateString.appendContentsOf("def")
} else {
privateString.appendContentsOf("ghi")
@@ -66,7 +66,7 @@ func sliceConcurrentAppendThread(tid: ThreadID) {
barrier()
// Verify that contents look good.
if tid == .Leader {
if tid == .Primary {
expectEqual("abcdef", privateString)
} else {
expectEqual("abcghi", privateString)
@@ -74,14 +74,14 @@ func sliceConcurrentAppendThread(tid: ThreadID) {
expectEqual("abc", sharedString)
// Verify that only one thread took ownership of the buffer.
if tid == .Follower {
followerString = privateString
if tid == .Replica {
replicaString = privateString
}
barrier()
if tid == .Leader {
if tid == .Primary {
expectTrue(
(privateString.bufferID == sharedString.bufferID) !=
(followerString.bufferID == sharedString.bufferID))
(replicaString.bufferID == sharedString.bufferID))
}
}
}
@@ -93,9 +93,9 @@ StringTestSuite.test("SliceConcurrentAppend") {
expectEqual(0, ret)
let (createRet1, tid1) = _stdlib_pthread_create_block(
nil, sliceConcurrentAppendThread, .Leader)
nil, sliceConcurrentAppendThread, .Primary)
let (createRet2, tid2) = _stdlib_pthread_create_block(
nil, sliceConcurrentAppendThread, .Follower)
nil, sliceConcurrentAppendThread, .Replica)
expectEqual(0, createRet1)
expectEqual(0, createRet2)