zig

commit 0a3ae9dc6e79e595bc7a78da564f46f6b466abd0 (tree)
parent 647fd0f4f1f99bc5bb7783cfc293e026974207c5
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Mon,  6 Aug 2018 16:48:49 -0400

fix std.os.Thread.getCurrentId for linux

Diffstat:
M
std/os/index.zig
 | 
16
+++++++---------
M
std/os/linux/index.zig
 | 
4
++++
M
std/os/test.zig
 | 
14
+++++++-------

3 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/std/os/index.zig b/std/os/index.zig
@@ -160,7 +160,7 @@ test "os.getRandomBytes" {
     try getRandomBytes(buf_b[0..]);
 
     // Check if random (not 100% conclusive)
-    assert( !mem.eql(u8, buf_a, buf_b) );
+    assert(!mem.eql(u8, buf_a, buf_b));
 }
 
 /// Raises a signal in the current kernel thread, ending its execution.
@@ -2547,22 +2547,20 @@ pub const Thread = struct {
     };
 
     /// Returns the ID of the calling thread.
-    pub fn currentId() Thread.Id {
-        // TODO: As-is, this function is potentially expensive (making a
-        // syscall on every call).  Once we have support for thread-local
-        // storage (https://github.com/ziglang/zig/issues/924), we could
-        // memoize it.
+    /// Makes a syscall every time the function is called.
+    pub fn getCurrentId() Thread.Id {
         if (use_pthreads) {
             return c.pthread_self();
-        } else return switch (builtin.os) {
-            builtin.Os.linux => linux.getpid(),
+        } else
+            return switch (builtin.os) {
+            builtin.Os.linux => linux.gettid(),
             builtin.Os.windows => windows.GetCurrentThread(),
             else => @compileError("Unsupported OS"),
         };
     }
 
     /// Returns the ID of this thread.
-    pub fn id(self: *const Thread) Thread.Id {
+    pub fn id(self: Thread) Thread.Id {
         return self.data.handle;
     }
 
diff --git a/std/os/linux/index.zig b/std/os/linux/index.zig
@@ -947,6 +947,10 @@ pub fn getpid() i32 {
     return @bitCast(i32, @truncate(u32, syscall0(SYS_getpid)));
 }
 
+pub fn gettid() i32 {
+    return @bitCast(i32, @truncate(u32, syscall0(SYS_gettid)));
+}
+
 pub fn sigprocmask(flags: u32, noalias set: *const sigset_t, noalias oldset: ?*sigset_t) usize {
     return syscall4(SYS_rt_sigprocmask, flags, @ptrToInt(set), @ptrToInt(oldset), NSIG / 8);
 }
diff --git a/std/os/test.zig b/std/os/test.zig
@@ -34,16 +34,16 @@ test "access file" {
     try os.deleteTree(a, "os_test_tmp");
 }
 
-fn testThreadIdFn(threadId: *os.Thread.Id) void {
-    threadId.* = os.Thread.currentId();
+fn testThreadIdFn(thread_id: *os.Thread.Id) void {
+    thread_id.* = os.Thread.getCurrentId();
 }
 
-test "std.os.Thread.currentId" {
-    var threadCurrentId: os.Thread.Id = undefined;
-    const thread = try os.spawnThread(&threadCurrentId, testThreadIdFn);
-    const threadId = thread.id();
+test "std.os.Thread.getCurrentId" {
+    var thread_current_id: os.Thread.Id = undefined;
+    const thread = try os.spawnThread(&thread_current_id, testThreadIdFn);
+    const thread_id = thread.id();
     thread.wait();
-    assert(threadCurrentId == threadId);
+    assert(thread_current_id == thread_id);
 }
 
 test "spawn threads" {