Changeset 72:d0276f64c6d0 in finroc_plugins_network_transport

Timestamp:

15.04.2021 08:39:40 (2 years ago)

Author:

Max Reichardt <max.reichardt@…>

Branch:

17.03

Children:

73:217a300eb4ec, 74:cdad292a2caa

Phase:

public

Message:

Replaces thread-local variable with ScopedContext from finroc_plugins_data_ports

Location:

generic_protocol

Files:

• tNetworkPortInfo.cpp (modified) (2 diffs)
• tNetworkPortInfo.h (modified) (2 diffs)
• tRemoteRuntime.cpp (modified) (2 diffs)

generic_protocol/tNetworkPortInfo.cpp

@@ -66 +66 @@
 // Const values
 //----------------------------------------------------------------------
-__thread tNetworkPortInfo* tNetworkPortInfo::current_publishing_network_port = nullptr;
 
 //----------------------------------------------------------------------
@@ -127 +126 @@
 }
 
+bool tNetworkPortInfo::tNetworkPortPublishingContext::Is(const std::type_info& info)
+{
+  return info == typeid(tNetworkPortInfo::tNetworkPortPublishingContext);
+}
+
 //----------------------------------------------------------------------
 // End of namespace declaration

generic_protocol/tNetworkPortInfo.h

@@ -163 +163 @@
   void OnPortChange(data_ports::tPortDataPointer<const rrlib::rtti::tGenericObject>& value, data_ports::tChangeContext& change_context)
   {
+    auto root_context = data_ports::common::tScopedContext::RootContext();
+
     //FINROC_LOG_PRINT(DEBUG, "Port Changed ", port.GetWrapped()->GetQualifiedName(), " ", rrlib::serialization::Serialize(*value));
-    if (strategy > 0 && (!(current_publishing_network_port && current_publishing_network_port->connection_handle == connection_handle && (&current_publishing_network_port->remote_runtime == &remote_runtime))))
+    if (strategy > 0 && (!(root_context && typeid(*root_context) == typeid(tNetworkPortPublishingContext) && static_cast<tNetworkPortPublishingContext*>(root_context)->current_publishing_network_port.connection_handle == connection_handle && (&static_cast<tNetworkPortPublishingContext*>(root_context)->current_publishing_network_port.remote_runtime == &remote_runtime))))
     {
       remote_runtime.GetLocalRuntimeInfo().OnPortChange(value, this, change_context);
@@ -322 +324 @@
   std::unique_ptr<tNetworkPortInfoClient> client_info;
 
-  /*! Network port that currently publishes data using the current thread (null if current thread does not publish data from the net) */
-  static __thread tNetworkPortInfo* current_publishing_network_port;
+  class tNetworkPortPublishingContext : public data_ports::common::tScopedContext
+  {
+  public:
+
+    tNetworkPortPublishingContext(tNetworkPortInfo& current_publishing_network_port) :
+      current_publishing_network_port(current_publishing_network_port)
+    {
+      assert(tScopedContext::RootContext() == this);
+    }
+
+    /*! Network port that currently publishes data using the current thread (null if current thread does not publish data from the net) */
+    tNetworkPortInfo& current_publishing_network_port;
+
+    virtual bool Is(const std::type_info& info) override;
+  };
 
 

generic_protocol/tRemoteRuntime.cpp

@@ -302 +302 @@
     if (port.first && port.first->IsReady() && data_ports::IsDataFlowType(port.first->GetDataType()))
     {
-      tNetworkPortInfo::current_publishing_network_port = port.second;
+      tNetworkPortInfo::tNetworkPortPublishingContext scoped_context(*port.second);
       data_ports::tGenericPort generic_port = data_ports::tGenericPort::Wrap(*port.first);
 
@@ -347 +347 @@
       while (another_value);
 
-      tNetworkPortInfo::current_publishing_network_port = nullptr;
       message.FinishDeserialize(stream);
       connection.received_data_after_last_connect = true;