fix compile warning

Author: plavin

src/sst/elements/astra/astraNIC.cc

@@ -203,11 +203,11 @@ int AstraNIC::sim_recv(void* msg,
 
     auto it = msgMap_.find(mk);
     if (it != msgMap_.end()) {
-        //Send already completed
+        // Match Send already completed. Notify AstraSim that the recieve has completed.
         msg_handler(fun_arg);
         msgMap_.erase(it);
     } else{
-        //Send not yet completed
+        // Matching send not yet completed. Record that this recive has posted.
         msgMap_[mk] = CallbackHolder{msg_handler, fun_arg};
     }
     return 0;
@@ -226,8 +226,6 @@ void AstraNIC::sim_schedule(AstraSim::timespec_t delta,
 }
 
 void AstraNIC::sim_notify_finished() {
-    //TODO - can we be sure that all sends and recieves are done when this is called? Need to investigate why ns3 frontend has that tracker
-    assert(msgMap_.size() == 0);
     if (msgMap_.size() != 0) {
         out_->output(CALL_INFO, "WARNING: sim_notify_finished called with non-empty msgMap\n");
     }

src/sst/elements/astra/msgKey.h

@@ -4,32 +4,28 @@
 #include <functional>
 #include <string>
 
+using nid_t = int64_t;
+
 class MsgKey {
 public:
-    int src;
-    int dst;
+    nid_t src;
+    nid_t dst;
     int tag;
 
     MsgKey() = default;
 
-    MsgKey(int src_, int dst_, int tag_)
+    MsgKey(nid_t src_, nid_t dst_, nid_t tag_)
         : src(src_), dst(dst_), tag(tag_) {}
 
-    std::string to_string() const {
-        return "(" + std::to_string(src) + ", " +
-                     std::to_string(dst) + ", " +
-                     std::to_string(tag) + ")";
-    }
-
     bool operator==(const MsgKey& other) const noexcept {
         return src == other.src && dst == other.dst && tag == other.tag;
     }
 };
 
 struct MsgKeyHash {
     std::size_t operator()(const MsgKey& t) const noexcept {
-        std::size_t h1 = std::hash<int>{}(t.src);
-        std::size_t h2 = std::hash<int>{}(t.dst);
+        std::size_t h1 = std::hash<nid_t>{}(t.src);
+        std::size_t h2 = std::hash<nid_t>{}(t.dst);
         std::size_t h3 = std::hash<int>{}(t.tag);
         return h1 ^ (h2 << 1) ^ (h3 << 2);
     }