Merge pull request #1511 from cloudflare/kenton/no-kj-threadlocal

Change KJ_THREADLOCAL_PTR to thread_local.
cloudflare · Dec 27, 2023 · fd57d72 · fd57d72
2 parents ac11af5 + 161f1ea
commit fd57d72
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/workerd/io/io-context.c++ b/src/workerd/io/io-context.c++
@@ -5,7 +5,6 @@
 #include "io-context.h"
 #include <workerd/io/io-gate.h>
 #include <workerd/io/worker.h>
-#include <kj/threadlocal.h>
 #include <kj/debug.h>
 #include <workerd/jsg/jsg.h>
 #include <workerd/util/sentry.h>
@@ -14,8 +13,8 @@
 
 namespace workerd {
 
-KJ_THREADLOCAL_PTR(IoContext) threadLocalRequest = nullptr;
-KJ_THREADLOCAL_PTR(void) threadId = nullptr;
+static thread_local IoContext* threadLocalRequest = nullptr;
+static thread_local void* threadId = nullptr;
 
 static void* getThreadId() {
   if (threadId == nullptr) threadId = new int;