refactor file util (#166)

Author: ckrause

src/Makefile

@@ -16,10 +16,10 @@ loda: external/jute.h external/jute.cpp $(OBJS)
 	du -sh loda
 
 external/jute.h:
-	mkdir -p external && curl -sS -o external/jute.h https://raw.githubusercontent.com/amir-s/jute/master/jute.h
+	mkdir -p external && curl -sS -o external/jute.h https://raw.githubusercontent.com/ckrause/jute/master/jute.h
 
 external/jute.cpp:
-	mkdir -p external && curl -sS -o external/jute.cpp https://raw.githubusercontent.com/amir-s/jute/master/jute.cpp
+	mkdir -p external && curl -sS -o external/jute.cpp https://raw.githubusercontent.com/ckrause/jute/master/jute.cpp
 
 clean:
 	rm -R -f $(OBJS) loda ../loda external

src/boinc.cpp

@@ -83,30 +83,3 @@ void Boinc::run() {
   Miner miner(settings, &progress_monitor);
   miner.mine();
 }
-
-std::map<std::string, std::string> Boinc::readXML(const std::string& path) {
-  std::map<std::string, std::string> result;
-  std::ifstream in(path);
-  std::string line, key, value;
-  while (std::getline(in, line)) {
-    auto b = line.find('<');
-    if (b == std::string::npos) {
-      continue;
-    }
-    line = line.substr(b + 1);
-    b = line.find('>');
-    if (b == std::string::npos) {
-      continue;
-    }
-    key = line.substr(0, b);
-    line = line.substr(b + 1);
-    b = line.find("</");
-    if (b == std::string::npos) {
-      continue;
-    }
-    value = line.substr(0, b);
-    result[key] = value;
-    Log::get().debug("read xml tag: " + key + "=" + value);
-  }
-  return result;
-}

src/config.cpp

@@ -1,33 +1,11 @@
 #include "config.hpp"
 
 #include "file.hpp"
-#include "jute.h"
 #include "log.hpp"
 #include "setup.hpp"
 
 bool ConfigLoader::MAINTAINANCE_MODE = false;
 
-int64_t get_jint(jute::jValue &v, const std::string &key, int64_t def) {
-  if (v[key].get_type() == jute::jType::JNUMBER) {
-    return v[key].as_int();
-  }
-  return def;
-}
-
-double get_jdouble(jute::jValue &v, const std::string &key, double def) {
-  if (v[key].get_type() == jute::jType::JNUMBER) {
-    return v[key].as_double();
-  }
-  return def;
-}
-
-bool get_jbool(jute::jValue &v, const std::string &key, bool def) {
-  if (v[key].get_type() == jute::jType::JBOOLEAN) {
-    return v[key].as_bool();
-  }
-  return def;
-}
-
 std::string get_template(std::string t) {
   static const std::string h(
       "$LODA_HOME/programs/");  // TODO: use proper variable replacing
@@ -52,15 +30,15 @@ std::vector<Generator::Config> loadGeneratorConfigs(
       continue;
     }
     Generator::Config c;
-    c.version = get_jint(g, "version", 1);
+    c.version = getJInt(g, "version", 1);
     c.miner = miner;
-    c.length = get_jint(g, "length", 20);
-    c.max_constant = get_jint(g, "maxConstant", 4);
-    c.max_index = get_jint(g, "maxIndex", 4);
-    c.mutation_rate = get_jdouble(g, "mutationRate", 0.3);
-    c.loops = get_jbool(g, "loops", true);
-    c.calls = get_jbool(g, "calls", true);
-    c.indirect_access = get_jbool(g, "indirectAccess", false);
+    c.length = getJInt(g, "length", 20);
+    c.max_constant = getJInt(g, "maxConstant", 4);
+    c.max_index = getJInt(g, "maxIndex", 4);
+    c.mutation_rate = getJDouble(g, "mutationRate", 0.3);
+    c.loops = getJBool(g, "loops", true);
+    c.calls = getJBool(g, "calls", true);
+    c.indirect_access = getJBool(g, "indirectAccess", false);
     auto t = g["template"].get_type();
     switch (t) {
       case jute::jType::JSTRING: {
@@ -140,7 +118,7 @@ Miner::Config ConfigLoader::load(const Settings &settings) {
       }
 
       // load matcher configs
-      bool backoff = get_jbool(m, "backoff", true);
+      bool backoff = getJBool(m, "backoff", true);
       auto matchers = m["matchers"];
       for (int j = 0; j < matchers.size(); j++) {
         Matcher::Config mc;

src/file.cpp

@@ -21,6 +21,7 @@
 #ifdef _WIN64
 #include <io.h>
 #include <psapi.h>
+#include <windows.h>
 #else
 #include <sys/file.h>
 #include <sys/stat.h>
@@ -295,6 +296,7 @@ int64_t getFileAgeInDays(const std::string &path) {
   return -1;
 }
 
+// TODO: move this to process.hpp
 size_t getMemUsage() {
   size_t mem_usage = 0;
 #if __linux__
@@ -325,6 +327,54 @@ size_t getMemUsage() {
   return mem_usage;
 }
 
+std::map<std::string, std::string> readXML(const std::string &path) {
+  std::map<std::string, std::string> result;
+  std::ifstream in(path);
+  std::string line, key, value;
+  while (std::getline(in, line)) {
+    auto b = line.find('<');
+    if (b == std::string::npos) {
+      continue;
+    }
+    line = line.substr(b + 1);
+    b = line.find('>');
+    if (b == std::string::npos) {
+      continue;
+    }
+    key = line.substr(0, b);
+    line = line.substr(b + 1);
+    b = line.find("</");
+    if (b == std::string::npos) {
+      continue;
+    }
+    value = line.substr(0, b);
+    result[key] = value;
+    Log::get().debug("read xml tag: " + key + "=" + value);
+  }
+  return result;
+}
+
+int64_t getJInt(jute::jValue &v, const std::string &key, int64_t def) {
+  if (v[key].get_type() == jute::jType::JNUMBER) {
+    return v[key].as_int();
+  }
+  return def;
+}
+
+double getJDouble(jute::jValue &v, const std::string &key, double def) {
+  if (v[key].get_type() == jute::jType::JNUMBER) {
+    return v[key].as_double();
+  }
+  return def;
+}
+
+bool getJBool(jute::jValue &v, const std::string &key, bool def) {
+  if (v[key].get_type() == jute::jType::JBOOLEAN) {
+    return v[key].as_bool();
+  }
+  return def;
+}
+
 FolderLock::FolderLock(std::string folder) {
   // obtain lock
   ensureTrailingFileSep(folder);

src/include/boinc.hpp

@@ -8,8 +8,6 @@ class Boinc {
 
   void run();
 
-  std::map<std::string, std::string> readXML(const std::string& path);
-
  private:
   Settings settings;
 };

src/include/file.hpp

@@ -1,8 +1,11 @@
 #pragma once
 
 #include <filesystem>
+#include <map>
 #include <string>
 
+#include "jute.h"
+
 #ifdef _WIN64
 static constexpr char FILE_SEP = '\\';
 #else
@@ -50,6 +53,14 @@ int64_t getFileAgeInDays(const std::string &path);
 
 size_t getMemUsage();
 
+std::map<std::string, std::string> readXML(const std::string &path);
+
+int64_t getJInt(jute::jValue &v, const std::string &key, int64_t def);
+
+double getJDouble(jute::jValue &v, const std::string &key, double def);
+
+bool getJBool(jute::jValue &v, const std::string &key, bool def);
+
 class FolderLock {
  public:
   FolderLock(std::string folder);