Fix race condition when accessing source info in action primitives (#…

…1251) Fixes #1250
p4lang · May 23, 2024 · 9979ce2 · 9979ce2
1 parent 8e183a3
commit 9979ce2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/include/bm/bm_sim/actions.h b/include/bm/bm_sim/actions.h
@@ -645,7 +645,7 @@ class ActionPrimitive_ {
   // (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60056).
   static thread_local Packet *pkt;
   static thread_local PHV *phv;
-  SourceInfo *call_source_info{nullptr};
+  static thread_local SourceInfo *call_source_info;
 
   P4Objects *get_p4objects() {
     return p4objects;

diff --git a/src/bm_sim/actions.cpp b/src/bm_sim/actions.cpp
@@ -20,13 +20,29 @@
  */
 
 #include <bm/bm_sim/actions.h>
+#include <bm/bm_sim/data.h>
 #include <bm/bm_sim/debugger.h>
+#include <bm/bm_sim/expressions.h>
 #include <bm/bm_sim/event_logger.h>
+#include <bm/bm_sim/header_unions.h>
+#include <bm/bm_sim/logger.h>
+#include <bm/bm_sim/named_p4object.h>
 #include <bm/bm_sim/P4Objects.h>
 #include <bm/bm_sim/packet.h>
-#include <bm/bm_sim/logger.h>
-
+#include <bm/bm_sim/phv.h>
+#include <bm/bm_sim/phv_forward.h>
+#include <bm/bm_sim/stateful.h>
+#include <bm/bm_sim/source_info.h>
+
+#include <cassert>
+#include <cstddef>
+#include <ios>
+#include <iostream>
+#include <istream>
+#include <memory>
+#include <ostream>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "utils.h"
@@ -480,6 +496,7 @@ ActionFnEntry::deserialize(std::istream *in, const P4Objects &objs) {
 
 thread_local Packet *ActionPrimitive_::pkt = nullptr;
 thread_local PHV *ActionPrimitive_::phv = nullptr;
+thread_local SourceInfo *ActionPrimitive_::call_source_info = nullptr;
 
 // TODO(antonin): should this be moved to core/ ?
 namespace core {