Tweaks

Author: darrylmasson

Options.cc

@@ -396,25 +396,21 @@ void Options::UpdateDAC(std::map<int, std::map<std::string, std::vector<double>>
   return;
 }
 
-void Options::SaveBenchmarks(std::map<std::string, std::map<int, long>>& counters, long bytes,
-    std::string sid, std::map<std::string, double>& times) {
+void Options::SaveBenchmarks(std::map<std::string, std::map<int, long>>& counters,
+    long bytes, std::string sid, std::map<std::string, double>& times) {
   using namespace bsoncxx::builder::stream;
-  int level = GetInt("benchmark_level", 2);
+  int level = GetInt("benchmark_level", 1);
   if (level == 0) return;
-  int run_id = -1;
-  try{
-    run_id = std::stoi(GetString("run_identifier", "latest"));
-  } catch (...) {
-  }
+  int run_id = GetInt("number", -1);
   std::map<std::string, std::map<int, long>> _counters;
-  if (level == 2) {
+  if (level == 1) {
     for (const auto& p : counters)
       for (const auto& pp : p.second)
         if (pp.first != 0)
-          _counters[p.first][int(std::floor(std::log2(pp.first)))] += pp.second;
+          _counters[p.first][int(std::log2(pp.first))] += pp.second;
         else
           _counters[p.first][-1] += pp.second;
-  } else if (level == 3) {
+  } else if (level == 2) {
     _counters = counters;
   }
 

StraxFormatter.cc

@@ -291,9 +291,9 @@ void StraxFormatter::Process() {
   std::stringstream ss;
   ss<<fHostname<<'_'<<fThreadId;
   fFullHostname = ss.str();
-  fActive = fRunning = true;
+  fActive = true;
   std::unique_ptr<data_packet> dp;
-  while (fActive == true) {
+  while (fActive == true || fBuffer.size() > 0) {
     std::unique_lock<std::mutex> lk(fBufferMutex);
     fCV.wait(lk, [&]{return fBuffer.size() > 0 || fActive == false;});
     if (fBuffer.size() > 0) {
@@ -308,9 +308,6 @@ void StraxFormatter::Process() {
   }
   if (fBytesProcessed > 0)
     End();
-  fRunning = false;
-  if (fBuffer.size() > 0)
-    fLog->Entry(MongoLog::Warning, "%i DPs unprocessed", fBuffer.size());
 }
 
 // Can tune here as needed, these are defaults from the LZ4 examples
@@ -326,7 +323,7 @@ void StraxFormatter::WriteOutChunk(int chunk_i){
   struct timespec comp_start, comp_end;
   clock_gettime(CLOCK_THREAD_CPUTIME_ID, &comp_start);
 
-  std::vector<std::list<std::string>*> buffers = {&fChunks[chunk_i], &fOverlaps[chunk_i]};
+  std::vector<std::list<std::string>*> buffers{{&fChunks[chunk_i], &fOverlaps[chunk_i]}};
   std::vector<long> uncompressed_size(3, 0);
   std::string uncompressed;
   std::vector<std::shared_ptr<std::string>> out_buffer(3);

StraxFormatter.hh

@@ -91,7 +91,7 @@ private:
   std::string fOutputPath, fHostname, fFullHostname;
   std::shared_ptr<Options> fOptions;
   std::shared_ptr<MongoLog> fLog;
-  std::atomic_bool fActive, fRunning;
+  std::atomic_bool fActive;
   std::string fCompressor;
   std::map<int, std::list<std::string>> fChunks, fOverlaps;
   std::map<int, int> fFailCounter;