Merge pull request #800 from os-fpga/pln_added_logfile

pln: added logfile (split print to stdout and to logfile)

Author: serge-dsa

planning/src/RS/rsEnv.cpp

@@ -15,9 +15,14 @@ using std::cout;
 using std::endl;
 
 rsEnv::rsEnv() noexcept {
-  CStr ts = getenv("pln_trace_marker");
+  CStr ts = ::getenv("pln_trace_marker");
   if (ts) traceMarker_ = ts;
 
+  ts = ::getenv("pln_no_logfile");
+  if (not ts) {
+    open_pln_logfile("rs_planner.log");
+  }
+
   init();
 }
 
@@ -240,64 +245,64 @@ bool rsEnv::getPidExePath(int pid, std::string& out) noexcept { return true; }
     cout.setf(origF); }
 
 void rsEnv::listDevEnv() const noexcept {
-  lprintf("\n\t   PLN ver.  %s\n", shortVer_.c_str());
-  lprintf("\t compiled:  %s\n", compTimeCS());
+  printf("\n\t   PLN ver.  %s\n", shortVer_.c_str());
+  printf("\t compiled:  %s\n", compTimeCS());
 
   size_t cxxstd = __cplusplus;
-  lprintf("\n(compiler) -- c++std= %zu\n", cxxstd);
+  printf("\n(compiler) -- c++std= %zu\n", cxxstd);
 #ifdef __GNUC__
-  lprintf("\t  __GNUC__ \t\t %i\n", __GNUC__);
+  printf("\t  __GNUC__ \t\t %i\n", __GNUC__);
 #endif
 #ifdef __GNUC_MINOR__
-  lprintf("\t  __GNUC_MINOR__ \t %i\n", __GNUC_MINOR__);
+  printf("\t  __GNUC_MINOR__ \t %i\n", __GNUC_MINOR__);
 #endif
 #ifdef __VERSION__
-  lprintf("\t  __VERSION__ \t\t %s\n", __VERSION__);
+  printf("\t  __VERSION__ \t\t %s\n", __VERSION__);
 #endif
 #ifdef __OPTIMIZE__
-  lprintf("\t  __OPTIMIZE__ \t\t %i\n", __OPTIMIZE__);
+  printf("\t  __OPTIMIZE__ \t\t %i\n", __OPTIMIZE__);
 #else
-  lprintf("\t  __OPTIMIZE__  :\t NOT DEFINED  => deb binary\n");
+  printf("\t  __OPTIMIZE__  :\t NOT DEFINED  => deb binary\n");
 #endif
 #ifdef __NO_INLINE__
-  lprintf("\t  __NO_INLINE__ :\t (defined)\n");
+  printf("\t  __NO_INLINE__ :\t (defined)\n");
 #endif
 #ifdef NDEBUG
-  lprintf("\t  NDEBUG :  (defined)  => assert() is disabled\n");
+  printf("\t  NDEBUG :  (defined)  => assert() is disabled\n");
 #else
-  lprintf("\t  NDEBUG :  NOT DEFINED  => assert() is enabled\n");
+  printf("\t  NDEBUG :  NOT DEFINED  => assert() is enabled\n");
 #endif
 
-  lprintf("\n(modes)\n");
+  printf("\n(modes)\n");
 #ifdef NO_GRAPHICS
-  lprintf("\t  NO_GRAPHICS :  \t (defined)\n");
+  printf("\t  NO_GRAPHICS :  \t (defined)\n");
 #endif
 #ifdef RS_PC_MODE
-  lprintf("\t  RS_PC_MODE :\t (defined)\n");
+  printf("\t  RS_PC_MODE :\t (defined)\n");
 #endif
 #ifdef PINC_DEVEL_MODE
-  lprintf("\t  PINC_DEVEL_MODE :\t (defined)\n");
+  printf("\t  PINC_DEVEL_MODE :\t (defined)\n");
 #endif
 #ifdef NN_FAST_BUILD
-  lprintf("\t  NN_FAST_BUILD :\t (defined)\n");
+  printf("\t  NN_FAST_BUILD :\t (defined)\n");
 #endif
 #ifdef ENABLE_ANALYTIC_PLACE
-  lprintf("\t  ENABLE_ANALYTIC_PLACE :\t (defined)\n");
+  printf("\t  ENABLE_ANALYTIC_PLACE :\t (defined)\n");
 #endif
 
-  lputs();
+  cout << endl;
 
 #ifdef _PLN_VEC_BOUNDS_CHECK
-  lprintf("\t  _PLN_VEC_BOUNDS_CHECK :   ON  => stl_vector BC enabled\n");
+  printf("\t  _PLN_VEC_BOUNDS_CHECK :   ON  => stl_vector BC enabled\n");
 #else
-  lprintf("\t  _PLN_VEC_BOUNDS_CHECK :   OFF => std_vector BC disabled\n");
+  printf("\t  _PLN_VEC_BOUNDS_CHECK :   OFF => std_vector BC disabled\n");
 #endif
 
 #ifdef PLN_JEMALLOC
     LIST_DEC(PLN_JEMALLOC);
 #endif
 
-  pln::flush_out(true);
+  cout << endl;
 }
 
 }

planning/src/main.cpp

@@ -1,4 +1,4 @@
-static const char* _pln_VERSION_STR = "pln0314";
+static const char* _pln_VERSION_STR = "pln0315";
 
 #include "RS/rsEnv.h"
 #include "util/pln_log.h"
@@ -419,7 +419,7 @@ static void deal_help(const rsOpts& opts) {
     return;
   }
   if (opts.version_) {
-    lputs();
+    cout << endl;
     return;
   }
   if (opts.help_) {
@@ -459,11 +459,6 @@ int main(int argc, char** argv) {
 
   s_env.initVersions(_pln_VERSION_STR);
 
-  if (ltrace() >= 3) {
-    lprintf("\t %s\n", _pln_VERSION_STR);
-    lprintf("\t compiled:  %s\n", s_env.compTimeCS());
-  }
-
   s_env.parse(argc, argv);
 
   if (opts.trace_ >= 8 || ltrace() >= 9 || getenv("pln_trace_env")) {
@@ -472,11 +467,19 @@ int main(int argc, char** argv) {
   }
 
   if (opts.ver_or_help()) {
+    if (ltrace() >= 2) {
+      printf("\t %s\n", _pln_VERSION_STR);
+      printf("\t compiled:  %s\n", s_env.compTimeCS());
+    }
     deal_help(opts);
     pln::flush_out();
     std::quick_exit(0);
   }
 
+  if (ltrace() >= 2) {
+    lprintf("\t %s\n", _pln_VERSION_STR);
+    lprintf("\t compiled:  %s\n", s_env.compTimeCS());
+  }
   if (ltrace() >= 4) {
     lprintf("ltrace()= %u  cmd.argc= %i\n", ltrace(), argc);
   }