Event order update (#1549)

* Change event delivery ordering to be based on the order registerLink() is called in a component, rather than on the alphabetization of link names.

* Updates to doxygen comments

* No need to write a new order to ConfigLink in postCreationCleanup()

* Update dangling and unused link error checks

Author: feldergast

src/sst/core/baseComponent.cc

@@ -686,6 +686,7 @@ BaseComponent::configureLink_impl(const std::string& name, SimTime_t timebase, E
             }
         }
         tmp->setDefaultTimeBase(timebase);
+        tmp->setTag(getNextLinkOrder());
 #ifdef __SST_DEBUG_EVENT_TRACKING__
         tmp->setSendingComponentInfo(my_info_->getName(), my_info_->getType(), name);
 #endif
@@ -843,6 +844,12 @@ BaseComponent::pushValidParams(Params& params, const std::string& type)
     params.pushAllowedKeys(Factory::getFactory()->getParamNames(type));
 }
 
+uint32_t
+BaseComponent::getNextLinkOrder()
+{
+    return getParentComponent()->getNextLinkOrder();
+}
+
 
 void
 BaseComponent::vfatal(

src/sst/core/baseComponent.h

@@ -596,6 +596,12 @@ class BaseComponent : public SST::Core::Serialization::serializable_base
     void serialize_order(SST::Core::Serialization::serializer& ser) override;
 
 
+    /**
+       Gets the next value or the order field of the link.  The ordering of events based on links will be based on
+       the order that configureLink() is called.
+    */
+    virtual uint32_t getNextLinkOrder();
+
     /**
        Handles the profile points, default timebase, handler tracking and checkpointing.
 

src/sst/core/component.h

@@ -16,6 +16,7 @@
 #include "sst/core/eli/elementinfo.h"
 #include "sst/core/sst_types.h"
 
+#include <cstdint>
 #include <map>
 
 using namespace SST::Statistics;
@@ -58,6 +59,12 @@ class Component : public BaseComponent
 protected:
     friend class SubComponent;
     Component() = default; // For Serialization only
+
+private:
+
+    uint32_t getNextLinkOrder() override { return next_event_order_++; }
+
+    uint32_t next_event_order_ = 1;
 };
 
 } // namespace SST

src/sst/core/componentExtension.h

@@ -37,7 +37,7 @@ class ComponentExtension : public BaseComponent
     ComponentExtension() = default; // For serialization only
 
     void serialize_order(SST::Core::Serialization::serializer& ser) override;
-    ImplementSerializable(SST::ComponentExtension)
+    ImplementSerializable(SST::ComponentExtension);
 };
 
 } // namespace SST

src/sst/core/event.h

@@ -210,9 +210,9 @@ class Event : public Activity
        local links, delivery_info contains the delivery functor.
        @return void
      */
-    inline void setDeliveryInfo(LinkId_t tag, uintptr_t delivery_info)
+    inline void setDeliveryInfo(uint32_t order_tag, uintptr_t delivery_info)
     {
-        setOrderTag(tag);
+        setOrderTag(order_tag);
         this->delivery_info = delivery_info;
     }
 
@@ -228,9 +228,6 @@ class Event : public Activity
     /** Gets the link id used for delivery.  For use by SST Core only */
     inline Link* getDeliveryLink() { return reinterpret_cast<Link*>(delivery_info); }
 
-    /** Gets the link id associated with this event.  For use by SST Core only */
-    inline LinkId_t getTag() const { return getOrderTag(); }
-
 
     /** Holds the delivery information.  This is stored as a
       uintptr_t, but is actually a pointer converted using

src/sst/core/link.cc

@@ -499,7 +499,7 @@ Link::Link() :
     current_time(Simulation_impl::getSimulation()->currentSimCycle),
     type(UNINITIALIZED),
     mode(INIT),
-    tag(-1),
+    tag(type_max<uint32_t>),
     attached_tools(nullptr)
 {}