Remove workaround for Chromium's lack of thread_local.

Chromium is allowing thread_local, so this is no longer necessary. Bug: chromium:1416710 PiperOrigin-RevId: 513534394
google · Mar 2, 2023 · 6e7791f · 6e7791f
1 parent 63ed857
commit 6e7791f
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 62 deletions.
diff --git a/build/source_list.bzl b/build/source_list.bzl
@@ -41,7 +41,6 @@ quiche_core_hdrs = [
     "common/platform/api/quiche_stack_trace.h",
     "common/platform/api/quiche_testvalue.h",
     "common/platform/api/quiche_thread.h",
-    "common/platform/api/quiche_thread_local.h",
     "common/platform/api/quiche_time_utils.h",
     "common/platform/api/quiche_url_utils.h",
     "common/print_elements.h",
@@ -1396,7 +1395,6 @@ default_platform_impl_hdrs = [
     "common/platform/default/quiche_platform_impl/quiche_server_stats_impl.h",
     "common/platform/default/quiche_platform_impl/quiche_stack_trace_impl.h",
     "common/platform/default/quiche_platform_impl/quiche_testvalue_impl.h",
-    "common/platform/default/quiche_platform_impl/quiche_thread_local_impl.h",
     "common/platform/default/quiche_platform_impl/quiche_time_utils_impl.h",
     "common/platform/default/quiche_platform_impl/quiche_udp_socket_platform_impl.h",
     "common/platform/default/quiche_platform_impl/quiche_url_utils_impl.h",

diff --git a/build/source_list.gni b/build/source_list.gni
@@ -41,7 +41,6 @@ quiche_core_hdrs = [
     "src/quiche/common/platform/api/quiche_stack_trace.h",
     "src/quiche/common/platform/api/quiche_testvalue.h",
     "src/quiche/common/platform/api/quiche_thread.h",
-    "src/quiche/common/platform/api/quiche_thread_local.h",
     "src/quiche/common/platform/api/quiche_time_utils.h",
     "src/quiche/common/platform/api/quiche_url_utils.h",
     "src/quiche/common/print_elements.h",
@@ -1396,7 +1395,6 @@ default_platform_impl_hdrs = [
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_server_stats_impl.h",
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_stack_trace_impl.h",
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_testvalue_impl.h",
-    "src/quiche/common/platform/default/quiche_platform_impl/quiche_thread_local_impl.h",
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_time_utils_impl.h",
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_udp_socket_platform_impl.h",
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_url_utils_impl.h",

diff --git a/build/source_list.json b/build/source_list.json
@@ -40,7 +40,6 @@
     "quiche/common/platform/api/quiche_stack_trace.h",
     "quiche/common/platform/api/quiche_testvalue.h",
     "quiche/common/platform/api/quiche_thread.h",
-    "quiche/common/platform/api/quiche_thread_local.h",
     "quiche/common/platform/api/quiche_time_utils.h",
     "quiche/common/platform/api/quiche_url_utils.h",
     "quiche/common/print_elements.h",
@@ -1395,7 +1394,6 @@
     "quiche/common/platform/default/quiche_platform_impl/quiche_server_stats_impl.h",
     "quiche/common/platform/default/quiche_platform_impl/quiche_stack_trace_impl.h",
     "quiche/common/platform/default/quiche_platform_impl/quiche_testvalue_impl.h",
-    "quiche/common/platform/default/quiche_platform_impl/quiche_thread_local_impl.h",
     "quiche/common/platform/default/quiche_platform_impl/quiche_time_utils_impl.h",
     "quiche/common/platform/default/quiche_platform_impl/quiche_udp_socket_platform_impl.h",
     "quiche/common/platform/default/quiche_platform_impl/quiche_url_utils_impl.h"

diff --git a/quiche/common/platform/api/quiche_thread_local.h b/quiche/common/platform/api/quiche_thread_local.h
diff --git a/quiche/common/platform/default/quiche_platform_impl/quiche_thread_local_impl.h b/quiche/common/platform/default/quiche_platform_impl/quiche_thread_local_impl.h
diff --git a/quiche/quic/core/quic_connection_context.cc b/quiche/quic/core/quic_connection_context.cc
@@ -4,12 +4,12 @@
 
 #include "quiche/quic/core/quic_connection_context.h"
 
-#include "quiche/common/platform/api/quiche_thread_local.h"
+#include "absl/base/attributes.h"
 #include "quiche/common/quiche_text_utils.h"
 
 namespace quic {
 namespace {
-DEFINE_QUICHE_THREAD_LOCAL_POINTER(CurrentContext, QuicConnectionContext);
+ABSL_CONST_INIT thread_local QuicConnectionContext* current_context = nullptr;
 }  // namespace
 
 std::string QuicConnectionProcessPacketContext::DebugString() const {
@@ -25,13 +25,13 @@ std::string QuicConnectionProcessPacketContext::DebugString() const {
 
 // static
 QuicConnectionContext* QuicConnectionContext::Current() {
-  return GET_QUICHE_THREAD_LOCAL_POINTER(CurrentContext);
+  return current_context;
 }
 
 QuicConnectionContextSwitcher::QuicConnectionContextSwitcher(
     QuicConnectionContext* new_context)
     : old_context_(QuicConnectionContext::Current()) {
-  SET_QUICHE_THREAD_LOCAL_POINTER(CurrentContext, new_context);
+  current_context = new_context;
   if (new_context && new_context->tracer) {
     new_context->tracer->Activate();
   }
@@ -42,7 +42,7 @@ QuicConnectionContextSwitcher::~QuicConnectionContextSwitcher() {
   if (current && current->tracer) {
     current->tracer->Deactivate();
   }
-  SET_QUICHE_THREAD_LOCAL_POINTER(CurrentContext, old_context_);
+  current_context = old_context_;
 }
 
 }  // namespace quic