From 2f44dada688ace9c24f085a8422b3054c3edb72e Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Wed, 19 Aug 2015 10:02:01 -0500
Subject: ruby: reverts to changeset: bf82f1f7b040

---
 .../garnet/flexible-pipeline/NetworkInterface.cc   |  2 +-
 .../ruby/network/garnet/flexible-pipeline/flit.cc  | 80 +++++++++++++++++++++-
 .../ruby/network/garnet/flexible-pipeline/flit.hh  | 33 +++++----
 3 files changed, 95 insertions(+), 20 deletions(-)

(limited to 'src/mem/ruby/network/garnet/flexible-pipeline')

diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc
index f72cea5a8..d834ea1a3 100644
--- a/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.cc
@@ -281,7 +281,7 @@ NetworkInterface::wakeup()
 
         int vnet = t_flit->get_vnet();
         m_net_ptr->increment_received_flits(vnet);
-        Cycles network_delay = curCycle() - t_flit->get_creation_time();
+        Cycles network_delay = curCycle() - t_flit->get_enqueue_time();
         Cycles queueing_delay = t_flit->get_delay();
 
         m_net_ptr->increment_network_latency(network_delay, vnet);
diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/flit.cc b/src/mem/ruby/network/garnet/flexible-pipeline/flit.cc
index aaf19b3b5..7cf68560f 100644
--- a/src/mem/ruby/network/garnet/flexible-pipeline/flit.cc
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/flit.cc
@@ -31,10 +31,14 @@
 #include "mem/ruby/network/garnet/flexible-pipeline/flit.hh"
 
 flit::flit(int id, int  vc, int vnet, int size, MsgPtr msg_ptr, Cycles curTime)
-    : m_id(id), m_vnet(vnet), m_vc(vc), m_size(size), m_creation_time(curTime)
 {
+    m_size = size;
     m_msg_ptr = msg_ptr;
+    m_enqueue_time = curTime;
     m_time = curTime;
+    m_id = id;
+    m_vnet = vnet;
+    m_vc = vc;
 
     if (size == 1) {
         m_type = HEAD_TAIL_;
@@ -48,6 +52,78 @@ flit::flit(int id, int  vc, int vnet, int size, MsgPtr msg_ptr, Cycles curTime)
         m_type = BODY_;
 }
 
+int
+flit::get_size()
+{
+    return m_size;
+}
+
+int
+flit::get_id()
+{
+    return m_id;
+}
+
+Cycles
+flit::get_time()
+{
+    return m_time;
+}
+
+Cycles
+flit::get_enqueue_time()
+{
+    return m_enqueue_time;
+}
+
+void
+flit::set_time(Cycles time)
+{
+    m_time = time;
+}
+
+int
+flit::get_vnet()
+{
+    return m_vnet;
+}
+
+int
+flit::get_vc()
+{
+    return m_vc;
+}
+
+void
+flit::set_vc(int vc)
+{
+    m_vc = vc;
+}
+
+MsgPtr&
+flit::get_msg_ptr()
+{
+    return m_msg_ptr;
+}
+
+flit_type
+flit::get_type()
+{
+    return m_type;
+}
+
+void
+flit::set_delay(Cycles delay)
+{
+    src_delay = delay;
+}
+
+Cycles
+flit::get_delay()
+{
+    return src_delay;
+}
+
 void
 flit::print(std::ostream& out) const
 {
@@ -56,7 +132,7 @@ flit::print(std::ostream& out) const
     out << "Type=" << m_type << " ";
     out << "Vnet=" << m_vnet << " ";
     out << "VC=" << m_vc << " ";
-    out << "Creation Time=" << m_creation_time << " ";
+    out << "Enqueue Time=" << m_enqueue_time << " ";
     out << "]";
 }
 
diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/flit.hh b/src/mem/ruby/network/garnet/flexible-pipeline/flit.hh
index 4049a9212..ff4afbc08 100644
--- a/src/mem/ruby/network/garnet/flexible-pipeline/flit.hh
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/flit.hh
@@ -43,18 +43,18 @@ class flit
   public:
     flit(int id, int vc, int vnet, int size, MsgPtr msg_ptr, Cycles curTime);
 
-    int get_size() const { return m_size; }
-    int get_id() const { return m_id; }
-    Cycles get_time() const { return m_time; }
-    Cycles get_creation_time() const { return m_creation_time; }
-    void set_time(Cycles time) { m_time = time; }
-    int get_vnet() const { return m_vnet; }
-    int get_vc() const { return m_vc; }
-    void set_vc(int vc) { m_vc = vc; }
-    MsgPtr& get_msg_ptr() { return m_msg_ptr; }
-    flit_type get_type() const { return m_type; }
-    void set_delay(Cycles delay) { src_delay = delay; }
-    Cycles get_delay() const { return src_delay; }
+    int get_size();
+    int get_id();
+    Cycles get_time();
+    Cycles get_enqueue_time();
+    void set_time(Cycles time);
+    int get_vnet();
+    int get_vc();
+    void set_vc(int vc);
+    MsgPtr& get_msg_ptr();
+    flit_type get_type();
+    void set_delay(Cycles delay);
+    Cycles get_delay();
     void print(std::ostream& out) const;
 
     static bool
@@ -71,12 +71,11 @@ class flit
     bool functionalWrite(Packet *pkt);
 
   private:
-    const int m_id;
-    const int m_vnet;
+    int m_id;
+    int m_vnet;
     int m_vc;
-    const int m_size;
-    const Cycles m_creation_time;
-    Cycles m_time;
+    int m_size;
+    Cycles m_enqueue_time, m_time;
     flit_type m_type;
     MsgPtr m_msg_ptr;
     Cycles src_delay;
-- 
cgit v1.2.3