From 3b6393094394cd19eee61b64e467b055a88033d4 Mon Sep 17 00:00:00 2001
From: David Madl <git@abanbytes.eu>
Date: Tue, 10 Nov 2015 14:01:05 +0000
Subject: [PATCH] move global Timer to Timer.h

Move ResetUserTime(), PrintUserTime(), GetUserTime() to Timer.h

Do not reset timer in StaticData.
---
 OnDiskPt/Main.cpp                             |  1 +
 contrib/mira/Decoder.cpp                      |  2 ++
 contrib/relent-filter/src/LatticeMBRGrid.cpp  |  2 ++
 contrib/relent-filter/src/Main.cpp            |  2 ++
 misc/prunePhraseTable.cpp                     |  2 ++
 moses-cmd/LatticeMBRGrid.cpp                  |  3 +++
 moses-cmd/MainVW.cpp                          |  1 +
 moses/ExportInterface.cpp                     |  2 ++
 moses/StaticData.cpp                          |  1 -
 moses/Syntax/F2S/HyperTreeLoader.cpp          |  1 +
 moses/Syntax/S2T/RuleTrieLoader.cpp           |  1 +
 moses/Timer.cpp                               | 20 +++++++++++++++++++
 moses/Timer.h                                 | 15 ++++++++++++++
 .../RuleTable/LoaderCompact.cpp               |  1 +
 moses/TranslationTask.cpp                     |  1 +
 moses/Util.cpp                                | 19 +-----------------
 moses/Util.h                                  |  5 -----
 17 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/OnDiskPt/Main.cpp b/OnDiskPt/Main.cpp
index c95310766..e9b7dcbd2 100644
--- a/OnDiskPt/Main.cpp
+++ b/OnDiskPt/Main.cpp
@@ -25,6 +25,7 @@
 #include <iterator>
 #include <cassert>
 #include "moses/InputFileStream.h"
+#include "moses/Timer.h"
 #include "moses/Util.h"
 #include "OnDiskWrapper.h"
 #include "SourcePhrase.h"
diff --git a/contrib/mira/Decoder.cpp b/contrib/mira/Decoder.cpp
index 7855536bb..d9fe8a9f9 100644
--- a/contrib/mira/Decoder.cpp
+++ b/contrib/mira/Decoder.cpp
@@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "Decoder.h"
 #include "moses/Manager.h"
+#include "moses/Timer.h"
 #include "moses/ChartManager.h"
 #include "moses/Sentence.h"
 #include "moses/InputType.h"
@@ -74,6 +75,7 @@ MosesDecoder::MosesDecoder(const string& inifile, int debuglevel, int argc, vect
     cerr << "Loading static data failed, exit." << endl;
     exit(1);
   }
+  ResetUserTime();
   StaticData::LoadDataStatic(params, "mira");
   for (int i = 0; i < BASE_ARGC; ++i) {
     delete[] mosesargv[i];
diff --git a/contrib/relent-filter/src/LatticeMBRGrid.cpp b/contrib/relent-filter/src/LatticeMBRGrid.cpp
index bbef5f938..9f1286456 100755
--- a/contrib/relent-filter/src/LatticeMBRGrid.cpp
+++ b/contrib/relent-filter/src/LatticeMBRGrid.cpp
@@ -49,6 +49,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "IOWrapper.h"
 #include "LatticeMBR.h"
 #include "Manager.h"
+#include "Timer.h"
 #include "StaticData.h"
 
 #include "util/exception.hh"
@@ -152,6 +153,7 @@ int main(int argc, char* argv[])
     params->Explain();
     exit(1);
   }
+  ResetUserTime();
   if (!StaticData::LoadDataStatic(params, argv[0])) {
     exit(1);
   }
diff --git a/contrib/relent-filter/src/Main.cpp b/contrib/relent-filter/src/Main.cpp
index 6a2bf4b01..070050d92 100755
--- a/contrib/relent-filter/src/Main.cpp
+++ b/contrib/relent-filter/src/Main.cpp
@@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include "IOWrapper.h"
 #include "StaticData.h"
 #include "Util.h"
+#include "Timer.h"
 #include "ThreadPool.h"
 #include "TranslationAnalysis.h"
 #include "OutputCollector.h"
@@ -191,6 +192,7 @@ int main(int argc, char** argv)
 
     // initialize all "global" variables, which are stored in StaticData
     // note: this also loads models such as the language model, etc.
+    ResetUserTime();
     if (!StaticData::LoadDataStatic(params, argv[0])) {
       exit(1);
     }
diff --git a/misc/prunePhraseTable.cpp b/misc/prunePhraseTable.cpp
index f8ab1084d..126d53c0f 100644
--- a/misc/prunePhraseTable.cpp
+++ b/misc/prunePhraseTable.cpp
@@ -38,6 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include "moses/InputPath.h"
 #include "moses/Parameter.h"
 #include "moses/TranslationModel/PhraseDictionary.h"
+#include "moses/Timer.h"
 #include "moses/StaticData.h"
 
 #include "util/file_piece.hh"
@@ -150,6 +151,7 @@ int main(int argc, char const** argv)
     exit(1);
   }
 
+  ResetUserTime();
   if (!StaticData::LoadDataStatic(params.get(),argv[0])) {
     exit(1);
   }
diff --git a/moses-cmd/LatticeMBRGrid.cpp b/moses-cmd/LatticeMBRGrid.cpp
index 638f31fc6..302db4204 100644
--- a/moses-cmd/LatticeMBRGrid.cpp
+++ b/moses-cmd/LatticeMBRGrid.cpp
@@ -49,6 +49,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "moses/IOWrapper.h"
 #include "moses/LatticeMBR.h"
 #include "moses/Manager.h"
+#include "moses/Timer.h"
 #include "moses/StaticData.h"
 #include "util/exception.hh"
 
@@ -155,6 +156,8 @@ int main(int argc, char const* argv[])
     params->Explain();
     exit(1);
   }
+
+  ResetUserTime();
   if (!StaticData::LoadDataStatic(params, argv[0])) {
     exit(1);
   }
diff --git a/moses-cmd/MainVW.cpp b/moses-cmd/MainVW.cpp
index dbe5b74d6..94eee66d9 100644
--- a/moses-cmd/MainVW.cpp
+++ b/moses-cmd/MainVW.cpp
@@ -103,6 +103,7 @@ int main(int argc, char const** argv)
 
     // initialize all "global" variables, which are stored in StaticData
     // note: this also loads models such as the language model, etc.
+    ResetUserTime();
     if (!StaticData::LoadDataStatic(&params, argv[0])) {
       exit(1);
     }
diff --git a/moses/ExportInterface.cpp b/moses/ExportInterface.cpp
index 0ac1eaed1..cf0ba1363 100644
--- a/moses/ExportInterface.cpp
+++ b/moses/ExportInterface.cpp
@@ -84,6 +84,7 @@ SimpleTranslationInterface::SimpleTranslationInterface(const string &mosesIni):
     cerr << "Error; Cannot load parameters at " << mosesIni<<endl;
     exit(1);
   }
+  ResetUserTime();
   if (!StaticData::LoadDataStatic(&m_params, mosesIni.c_str())) {
     cerr << "Error; Cannot load static data in file " << mosesIni<<endl;
     exit(1);
@@ -317,6 +318,7 @@ int decoder_main(int argc, char const** argv)
 
     // initialize all "global" variables, which are stored in StaticData
     // note: this also loads models such as the language model, etc.
+    ResetUserTime();
     if (!StaticData::LoadDataStatic(&params, argv[0]))
       exit(1);
 
diff --git a/moses/StaticData.cpp b/moses/StaticData.cpp
index 87198408f..e61d8265a 100644
--- a/moses/StaticData.cpp
+++ b/moses/StaticData.cpp
@@ -303,7 +303,6 @@ ini_zombie_options()
 
 bool StaticData::LoadData(Parameter *parameter)
 {
-  ResetUserTime();
   m_parameter = parameter;
 
   const PARAM_VEC *params;
diff --git a/moses/Syntax/F2S/HyperTreeLoader.cpp b/moses/Syntax/F2S/HyperTreeLoader.cpp
index c23594c54..d5ef65c5e 100644
--- a/moses/Syntax/F2S/HyperTreeLoader.cpp
+++ b/moses/Syntax/F2S/HyperTreeLoader.cpp
@@ -13,6 +13,7 @@
 #include "moses/FactorCollection.h"
 #include "moses/Word.h"
 #include "moses/Util.h"
+#include "moses/Timer.h"
 #include "moses/InputFileStream.h"
 #include "moses/StaticData.h"
 #include "moses/Range.h"
diff --git a/moses/Syntax/S2T/RuleTrieLoader.cpp b/moses/Syntax/S2T/RuleTrieLoader.cpp
index 4e3799253..12181f2a3 100644
--- a/moses/Syntax/S2T/RuleTrieLoader.cpp
+++ b/moses/Syntax/S2T/RuleTrieLoader.cpp
@@ -13,6 +13,7 @@
 #include "moses/FactorCollection.h"
 #include "moses/Word.h"
 #include "moses/Util.h"
+#include "moses/Timer.h"
 #include "moses/InputFileStream.h"
 #include "moses/StaticData.h"
 #include "moses/Range.h"
diff --git a/moses/Timer.cpp b/moses/Timer.cpp
index 6128ab885..a10e51606 100644
--- a/moses/Timer.cpp
+++ b/moses/Timer.cpp
@@ -9,6 +9,26 @@
 namespace Moses
 {
 
+//global variable
+Timer g_timer;
+
+
+void ResetUserTime()
+{
+  g_timer.start();
+};
+
+void PrintUserTime(const std::string &message)
+{
+  g_timer.check(message.c_str());
+}
+
+double GetUserTime()
+{
+  return g_timer.get_elapsed_time();
+}
+
+
 /***
  * Return the total wall time that the timer has been in the "running"
  * state since it was first "started".
diff --git a/moses/Timer.h b/moses/Timer.h
index 0471fafe1..fe6066788 100644
--- a/moses/Timer.h
+++ b/moses/Timer.h
@@ -9,6 +9,21 @@
 namespace Moses
 {
 
+// A couple of utilities to measure decoding time
+
+/** Start global timer. */
+void ResetUserTime();
+
+/** Print out an optional message followed by the current global timer timing. */
+void PrintUserTime(const std::string &message);
+
+/**
+ * Total wall time that the global timer has been in the "running"
+ * state since it was first "started".
+ */
+double GetUserTime();
+
+
 /** Wrapper around time_t to time how long things have been running
  *  according to walltime. We avoid CPU time since it is less reliable
  *  in a multi-threaded environment and can spuriously include clock cycles
diff --git a/moses/TranslationModel/RuleTable/LoaderCompact.cpp b/moses/TranslationModel/RuleTable/LoaderCompact.cpp
index 945a49bfc..49e469e4f 100644
--- a/moses/TranslationModel/RuleTable/LoaderCompact.cpp
+++ b/moses/TranslationModel/RuleTable/LoaderCompact.cpp
@@ -22,6 +22,7 @@
 #include "moses/AlignmentInfoCollection.h"
 #include "moses/InputFileStream.h"
 #include "moses/Util.h"
+#include "moses/Timer.h"
 #include "moses/Word.h"
 #include "Trie.h"
 
diff --git a/moses/TranslationTask.cpp b/moses/TranslationTask.cpp
index 5d8940be4..0375a1e70 100644
--- a/moses/TranslationTask.cpp
+++ b/moses/TranslationTask.cpp
@@ -5,6 +5,7 @@
 #include "moses/TranslationAnalysis.h"
 #include "moses/TypeDef.h"
 #include "moses/Util.h"
+#include "moses/Timer.h"
 #include "moses/InputType.h"
 #include "moses/OutputCollector.h"
 #include "moses/Incremental.h"
diff --git a/moses/Util.cpp b/moses/Util.cpp
index fd0538efd..07d340974 100644
--- a/moses/Util.cpp
+++ b/moses/Util.cpp
@@ -35,7 +35,7 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include "TypeDef.h"
 #include "Util.h"
-#include "Timer.h"
+//#include "Timer.h"
 #include "util/exception.hh"
 #include "util/file.hh"
 #include "moses/FF/StatelessFeatureFunction.h"
@@ -48,8 +48,6 @@ using namespace boost::algorithm;
 namespace Moses
 {
 
-//global variable
-Timer g_timer;
 
 string GetTempFolder()
 {
@@ -90,21 +88,6 @@ bool FileExists(const std::string& filePath)
   return !ifs.fail();
 }
 
-void ResetUserTime()
-{
-  g_timer.start();
-};
-
-void PrintUserTime(const std::string &message)
-{
-  g_timer.check(message.c_str());
-}
-
-double GetUserTime()
-{
-  return g_timer.get_elapsed_time();
-}
-
 std::vector< std::map<std::string, std::string> > ProcessAndStripDLT(std::string &line)
 {
   std::vector< std::map<std::string, std::string> > meta;
diff --git a/moses/Util.h b/moses/Util.h
index 926f5c32b..8a21a9b23 100644
--- a/moses/Util.h
+++ b/moses/Util.h
@@ -466,11 +466,6 @@ inline void ShrinkToFit(T& v)
 
 bool FileExists(const std::string& filePath);
 
-// A couple of utilities to measure decoding time
-void ResetUserTime();
-void PrintUserTime(const std::string &message);
-double GetUserTime();
-
 // dump SGML parser for <dlt> tags
 std::vector< std::map<std::string, std::string> > ProcessAndStripDLT(std::string &line);