fixed cycle dependency

Author: sandeepmittal

include/chimbuko/ad/ADLocalFuncStatistics.hpp

@@ -5,7 +5,7 @@
 #include <chimbuko/ad/AnomalyData.hpp>
 #include <chimbuko/util/Anomalies.hpp>
 #include "chimbuko/util/PerfStats.hpp"
-#include "chimbuko/chimbuko.hpp"
+//#include "chimbuko/chimbuko.hpp"
 
 namespace chimbuko{
 

include/chimbuko/ad/ADNetClient.hpp

@@ -234,7 +234,7 @@ namespace chimbuko{
               if(nwork > 0) fatal_error("Worker was shut down before emptying its queue!");
               std::cout << "Worker received shutdown request" << std::endl;
             }else{
-              std::this_thread::sleep_for(std::chrono::milliseconds(10));
+              std::this_thread::sleep_for(std::chrono::milliseconds(20));
             }  
           }
         });

test/unit_tests/ad/ADLocalCounterStatistics.cpp

@@ -86,8 +86,8 @@ TEST(ADLocalCounterStatisticsTest, GlobalCounterStatsWorks){
 
 
 struct ADLocalCounterStatisticsWrapper: public ADLocalCounterStatistics{
-  static std::pair<size_t, size_t> updateGlobalStatisticsTest(ADNetClient &net_client, const std::string &l_stats, int step){
-    return ADLocalCounterStatistics::updateGlobalStatistics(net_client, l_stats, step);
+  static std::pair<size_t, size_t> updateGlobalStatisticsTest(ADNetClient &net_client, const std::string &l_stats, int step, int rank, std::string pserver_addr){
+    return ADLocalCounterStatistics::updateGlobalStatistics(net_client, l_stats, step, rank, pserver_addr);
   }
 };
 
@@ -125,7 +125,7 @@ TEST(ADLocalCounterStatisticsTest, UpdateGlobalStatisticsWithMockPS){
 			  net_client.connect_ps(0, 0, sname);
 			  barrier2.wait();
 			  std::cout << "AD thread updating local stats" << std::endl;
-			  ADLocalCounterStatisticsWrapper::updateGlobalStatisticsTest(net_client, "test",0);
+			  ADLocalCounterStatisticsWrapper::updateGlobalStatisticsTest(net_client, "test",0,0,sname);
 			  barrier2.wait();			  
 			  std::cout << "AD thread terminating connection" << std::endl;
 			  net_client.disconnect_ps();
@@ -187,9 +187,9 @@ TEST(ADLocalCounterStatisticsTest, UpdateGlobalStatisticsWithRealPS){
 			  net_client.connect_ps(0, 0, sname);
 
 			  cs.setStats(nm, a);
-			  cs.updateGlobalStatistics(net_client);
+			  cs.updateGlobalStatistics(net_client, 0, sname);
 			  cs.setStats(nm, b);
-			  cs.updateGlobalStatistics(net_client);
+			  cs.updateGlobalStatistics(net_client, 0, sname);
 
 			  std::cout << "AD thread terminating connection" << std::endl;
 			  net_client.disconnect_ps();

test/unit_tests/ad/ADLocalFuncStatistics.cpp

@@ -8,8 +8,8 @@
 using namespace chimbuko;
 
 struct ADLocalFuncStatisticsTest: public ADLocalFuncStatistics{
-  static std::pair<size_t, size_t> updateGlobalStatisticsTest(ADNetClient &net_client, const std::string &l_stats, int step){
-    return ADLocalFuncStatistics::updateGlobalStatistics(net_client, l_stats, step);
+  static std::pair<size_t, size_t> updateGlobalStatisticsTest(ADNetClient &net_client, const std::string &l_stats, int step, int rank, std::string pserver_addr){
+    return ADLocalFuncStatistics::updateGlobalStatistics(net_client, l_stats, step, rank, pserver_addr);
   }
 };
 
@@ -76,7 +76,7 @@ TEST(ADLocalFuncStatisticsTestUpdateGlobalStatisticsWithPS, Works){
 	ADNetClient net_client;
 	net_client.connect_ps(0, 0, sname);
 	std::cout << "AD thread updating local stats" << std::endl;
-	loc.updateGlobalStatistics(net_client);
+	loc.updateGlobalStatistics(net_client, 0, sname);
 	std::cout << "AD thread terminating connection" << std::endl;
 	net_client.disconnect_ps();
       }catch(const std::exception &e){