1 files changed, 79 insertions, 102 deletions

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/flit_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/flit_d.hh
index ec2774a94..bde8618ee 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/flit_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/flit_d.hh
@@ -28,118 +28,95 @@
  * Authors: Niket Agarwal
  */
 
-#ifndef FLIT_D_H
-#define FLIT_D_H
+#ifndef __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_FLIT_D_HH__
+#define __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_FLIT_D_HH__
 
 #include <iostream>
 
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/slicc_interface/Message.hh"
 
-class flit_d {
-public:
-        flit_d(int id, int vc, int vnet, int size, MsgPtr msg_ptr);
-        flit_d(int vc, bool is_free_signal);
-        void set_outport(int port) { m_outport = port; }
-        int get_outport() {return m_outport; }
-        void print(std::ostream& out) const;
-        bool is_free_signal()
-        {
-                return m_is_free_signal;
-        }
+class flit_d
+{
+  public:
+    flit_d(int id, int vc, int vnet, int size, MsgPtr msg_ptr);
+    flit_d(int vc, bool is_free_signal);
+    void set_outport(int port) { m_outport = port; }
+    int get_outport() {return m_outport; }
+    void print(std::ostream& out) const;
+    bool is_free_signal() { return m_is_free_signal; }
+    int get_size() { return m_size; }
+    Time get_enqueue_time() { return m_enqueue_time; }
+    int get_id() { return m_id; }
+    Time get_time() { return m_time; }
+    void set_time(Time time) { m_time = time; }
+    int get_vnet() { return m_vnet; }
+    int get_vc() { return m_vc; }
+    void set_vc(int vc) { m_vc = vc; }
+    MsgPtr& get_msg_ptr() { return m_msg_ptr; }
+    flit_type get_type() { return m_type; }
 
-        inline int get_size()
-        {
-                return m_size;
-        }
-        inline Time get_enqueue_time()
-        {
-                return m_enqueue_time;
-        }
-        inline int get_id()
-        {
-                return m_id;
-        }
-        inline Time get_time()
-        {
-                return m_time;
-        }
-        inline void set_time(Time time)
-        {
-                m_time = time;
-        }
-        inline int get_vnet()
-        {
-                return m_vnet;
-        }
-        inline int get_vc()
-        {
-                return m_vc;
-        }
-        inline void set_vc(int vc)
-        {
-                m_vc = vc;
-        }
-        inline MsgPtr& get_msg_ptr()
-        {
-                return m_msg_ptr;
-        }
-        inline flit_type get_type()
-        {
-                return m_type;
-        }
-        inline bool is_stage(flit_stage t_stage)
-        {
-                return ((m_stage.first == t_stage) && (g_eventQueue_ptr->getTime() >= m_stage.second));
-        }
-        inline bool is_next_stage(flit_stage t_stage)
-        {
-                return ((m_stage.first == t_stage) && ((g_eventQueue_ptr->getTime()+1) >= m_stage.second));
-        }
-        inline void advance_stage(flit_stage t_stage)
-        {
-                m_stage.first = t_stage;
-                m_stage.second = g_eventQueue_ptr->getTime() + 1;
-        }
-        inline std::pair<flit_stage, Time> get_stage()
-        {
-                return m_stage;
-        }
-        inline void set_delay(int delay)
-        {
-                src_delay = delay;
-        }
+    bool
+    is_stage(flit_stage t_stage)
+    {
+        return (m_stage.first == t_stage &&
+                g_eventQueue_ptr->getTime() >= m_stage.second);
+    }
 
-        inline int get_delay()
-        {
-                return src_delay;
-        }
+    bool
+    is_next_stage(flit_stage t_stage)
+    {
+        return (m_stage.first == t_stage &&
+                (g_eventQueue_ptr->getTime() + 1) >= m_stage.second);
+    }
 
-        static bool
-        greater(flit_d* n1, flit_d* n2)
-        {
-            if (n1->get_time() == n2->get_time()) {
-                //ASSERT(n1->flit_id != n2->flit_id);
-                return (n1->get_id() > n2->get_id());
-            } else {
-                return (n1->get_time() > n2->get_time());
-            }
-        }
+    void
+    advance_stage(flit_stage t_stage)
+    {
+        m_stage.first = t_stage;
+        m_stage.second = g_eventQueue_ptr->getTime() + 1;
+    }
+    std::pair<flit_stage, Time>
+    get_stage()
+    {
+        return m_stage;
+    }
+
+    void
+    set_delay(int delay)
+    {
+        src_delay = delay;
+    }
+
+    int
+    get_delay()
+    {
+        return src_delay;
+    }
 
-private:
-        /************Data Members*************/
-        int m_id;
-        int m_vnet;
-        int m_vc;
-        int m_size;
-        bool m_is_free_signal;
-        Time m_enqueue_time, m_time;
-        flit_type m_type;
-        MsgPtr m_msg_ptr;
-        int m_outport;
-        int src_delay;
-        std::pair<flit_stage, Time> m_stage;
+    static bool
+    greater(flit_d* n1, flit_d* n2)
+    {
+        if (n1->get_time() == n2->get_time()) {
+            //ASSERT(n1->flit_id != n2->flit_id);
+            return (n1->get_id() > n2->get_id());
+        } else {
+            return (n1->get_time() > n2->get_time());
+        }
+    }
 
+  private:
+    int m_id;
+    int m_vnet;
+    int m_vc;
+    int m_size;
+    bool m_is_free_signal;
+    Time m_enqueue_time, m_time;
+    flit_type m_type;
+    MsgPtr m_msg_ptr;
+    int m_outport;
+    int src_delay;
+    std::pair<flit_stage, Time> m_stage;
 };
 
 inline std::ostream&
@@ -150,4 +127,4 @@ operator<<(std::ostream& out, const flit_d& obj)
     return out;
 }
 
-#endif
+#endif // __MEM_RUBY_NETWORK_GARNET_FIXED_PIPELINE_FLIT_D_HH__