Merge branch 'dev'

1 files changed, 42 insertions, 41 deletions

diff --git a/src/gpuwattch/sharedcache.h b/src/gpuwattch/sharedcache.h
index 3041137..c5aba19 100644
--- a/src/gpuwattch/sharedcache.h
+++ b/src/gpuwattch/sharedcache.h
@@ -31,58 +31,59 @@
 
 #ifndef SHAREDCACHE_H_
 #define SHAREDCACHE_H_
+#include <vector>
 #include "XML_Parse.h"
+#include "array.h"
+#include "basic_components.h"
 #include "cacti/area.h"
 #include "cacti/parameter.h"
-#include "array.h"
 #include "logic.h"
-#include <vector>
-#include "basic_components.h"
 
-class SharedCache :public Component{
-  public:
-    ParseXML * XML;
-    int ithCache;
-	InputParameter interface_ip;
-	enum cache_level cacheL;
-    DataCache unicache;//Shared cache
-    CacheDynParam cachep;
-    statsDef   homenode_tdp_stats;
-    statsDef   homenode_rtp_stats;
-    statsDef   homenode_stats_t;
-    double	   dir_overhead;
-    //	cache_processor llCache,directory, directory1, inv_dir;
+class SharedCache : public Component {
+ public:
+  ParseXML* XML;
+  int ithCache;
+  InputParameter interface_ip;
+  enum cache_level cacheL;
+  DataCache unicache;  // Shared cache
+  CacheDynParam cachep;
+  statsDef homenode_tdp_stats;
+  statsDef homenode_rtp_stats;
+  statsDef homenode_stats_t;
+  double dir_overhead;
+  //	cache_processor llCache,directory, directory1, inv_dir;
 
-    //pipeline pipeLogicCache, pipeLogicDirectory;
-    //clock_network				clockNetwork;
-    double scktRatio, executionTime;
-    //   Component L2Tot, cc, cc1, ccTot;
+  // pipeline pipeLogicCache, pipeLogicDirectory;
+  // clock_network				clockNetwork;
+  double scktRatio, executionTime;
+  //   Component L2Tot, cc, cc1, ccTot;
 
-    SharedCache(ParseXML *XML_interface, int ithCache_, InputParameter* interface_ip_,enum cache_level cacheL_ =L2);
-    void set_cache_param();
-	void computeEnergy(bool is_tdp=true);
-    void displayEnergy(uint32_t indent = 0,bool is_tdp=true);
-    ~SharedCache(){};
+  SharedCache(ParseXML* XML_interface, int ithCache_,
+              InputParameter* interface_ip_, enum cache_level cacheL_ = L2);
+  void set_cache_param();
+  void computeEnergy(bool is_tdp = true);
+  void displayEnergy(uint32_t indent = 0, bool is_tdp = true);
+  ~SharedCache(){};
 };
 
-class CCdir :public Component{
-  public:
-    ParseXML * XML;
-    int ithCache;
-	InputParameter interface_ip;
-    DataCache dc;//Shared cache
-    ArrayST * shadow_dir;
-//	cache_processor llCache,directory, directory1, inv_dir;
+class CCdir : public Component {
+ public:
+  ParseXML* XML;
+  int ithCache;
+  InputParameter interface_ip;
+  DataCache dc;  // Shared cache
+  ArrayST* shadow_dir;
+  //	cache_processor llCache,directory, directory1, inv_dir;
 
-    //pipeline pipeLogicCache, pipeLogicDirectory;
-    //clock_network				clockNetwork;
-    double scktRatio, clockRate, executionTime;
-    Component L2Tot, cc, cc1, ccTot;
+  // pipeline pipeLogicCache, pipeLogicDirectory;
+  // clock_network				clockNetwork;
+  double scktRatio, clockRate, executionTime;
+  Component L2Tot, cc, cc1, ccTot;
 
-    CCdir(ParseXML *XML_interface, int ithCache_, InputParameter* interface_ip_);
-    void computeEnergy(bool is_tdp=true);
-    void displayEnergy(uint32_t indent = 0,bool is_tdp=true);
-    ~CCdir();
+  CCdir(ParseXML* XML_interface, int ithCache_, InputParameter* interface_ip_);
+  void computeEnergy(bool is_tdp = true);
+  void displayEnergy(uint32_t indent = 0, bool is_tdp = true);
+  ~CCdir();
 };
 
 #endif /* SHAREDCACHE_H_ */