Merge pull request #807 from TheCodez/implement-nsthread-name

Author: swift-ci

CoreFoundation/Base.subproj/CFPlatform.c

@@ -1310,6 +1310,23 @@ _CFThreadRef _CFThreadCreate(const _CFThreadAttributes attrs, void *_Nullable (*
     return thread;
 }
 
+CF_SWIFT_EXPORT void _CFThreadSetName(const char *_Nullable name) {
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
+    pthread_setname_np(name);
+#elif DEPLOYMENT_TARGET_LINUX
+    pthread_setname_np(pthread_self(), name);
+#endif
+}
+
+CF_SWIFT_EXPORT int _CFThreadGetName(char *buf, int length) {
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
+    return pthread_getname_np(pthread_self(), buf, length);
+#elif DEPLOYMENT_TARGET_LINUX
+    return pthread_getname_np(pthread_self(), buf, length);
+#endif
+    return -1;
+}
+
 CF_EXPORT char **_CFEnviron(void) {
 #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
     return *_NSGetEnviron();

CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h

@@ -298,6 +298,9 @@ typedef pthread_t _CFThreadRef;
 
 CF_EXPORT _CFThreadRef _CFThreadCreate(const _CFThreadAttributes attrs, void *_Nullable (* _Nonnull startfn)(void *_Nullable), void *restrict _Nullable context);
 
+CF_SWIFT_EXPORT void _CFThreadSetName(const char *_Nullable name);
+CF_SWIFT_EXPORT int _CFThreadGetName(char *buf, int length);
+
 CF_EXPORT Boolean _CFCharacterSetIsLongCharacterMember(CFCharacterSetRef theSet, UTF32Char theChar);
 CF_EXPORT CFCharacterSetRef _CFCharacterSetCreateCopy(CFAllocatorRef alloc, CFCharacterSetRef theSet);
 CF_EXPORT CFMutableCharacterSetRef _CFCharacterSetCreateMutableCopy(CFAllocatorRef alloc, CFCharacterSetRef theSet);

Foundation/NSThread.swift

@@ -143,6 +143,7 @@ open class Thread : NSObject {
 #endif
     internal var _status = _NSThreadStatus.initialized
     internal var _cancelled = false
+    internal var _name: String?
     /// - Note: this differs from the Darwin implementation in that the keys must be Strings
     open var threadDictionary = [String : Any]()
 
@@ -191,7 +192,16 @@ open class Thread : NSObject {
     }
 
     open var name: String? {
-        NSUnimplemented()
+        get {
+            return _name
+        }
+        set {
+            _name = newValue
+
+            if _thread == Thread.current._thread {
+                _CFThreadSetName(_name)
+            }
+        }
     }
 
     open var stackSize: Int {

TestFoundation/TestNSThread.swift

@@ -16,12 +16,14 @@
     import SwiftXCTest
 #endif
 
+import CoreFoundation
 
 class TestNSThread : XCTestCase {
     static var allTests: [(String, (TestNSThread) -> () throws -> Void)] {
         return [
             ("test_currentThread", test_currentThread ),
             ("test_threadStart", test_threadStart),
+            ("test_threadName", test_threadName),
         ]
     }
 
@@ -51,4 +53,35 @@ class TestNSThread : XCTestCase {
         condition.unlock()
         XCTAssertTrue(started)
     }
+    
+    func test_threadName() {
+        let thread = Thread()
+        XCTAssertNil(thread.name)
+
+        func getPThreadName() -> String? {
+            var buf = [Int8](repeating: 0, count: 16)
+            let r = _CFThreadGetName(&buf, Int32(buf.count))
+
+            guard r == 0 else {
+                return nil
+            }
+            return String(cString: buf)
+        }
+
+        let thread2 = Thread() {
+            Thread.current.name = "Thread2"
+            XCTAssertEqual(Thread.current.name, "Thread2")
+            XCTAssertEqual(Thread.current.name, getPThreadName())
+        }
+
+        thread2.start()
+
+        Thread.current.name = "CurrentThread"
+        XCTAssertEqual(Thread.current.name, getPThreadName())
+
+        let thread3 = Thread()
+        thread3.name = "Thread3"
+        XCTAssertEqual(thread3.name, "Thread3")
+        XCTAssertNotEqual(thread3.name, getPThreadName())
+    }
 }