Fix core download retry logic, Only add client executable directory t…

…o lib path on Windows, Retry WU if core crashes. #127

CHANGELOG.md

@@ -1,6 +1,11 @@
 Folding@home Client Changelog
 =============================
 
+## v8.1.16
+ - Fix core download retry logic.
+ - Only add client executable directory to lib path on Windows.
+ - Retry WU if core crashes.  #127
+
 ## v8.1.15
  - Fix CUDA/OpenCL driver mixup from v8.1.14.
  - Improved OpenCL PCI info detection.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fah-client",
-  "version": "8.1.15",
+  "version": "8.1.16",
   "bin": {
     "fah-client": "./fah-client"
   },

src/fah/client/Core.cpp

@@ -55,9 +55,9 @@ Core::Core(App &app, const JSON::ValuePtr &data) :
 }
 
 
-string Core::getURL() const {return data->getString("url");}
+string   Core::getURL()  const {return data->getString("url");}
 uint32_t Core::getType() const {return data->getU32("type");}
-string Core::getPath() const {return data->getString("path");}
+string   Core::getPath() const {return data->getString("path");}
 
 
 void Core::addProgressCallback(progress_cb_t cb) {

src/fah/client/Core.h

@@ -63,12 +63,12 @@ namespace FAH {
     public:
       Core(App &app, const cb::JSON::ValuePtr &data);
 
-      CoreState getState() const {return state;}
-      bool isReady() const {return state == CORE_READY;}
-      bool isInvalid() const {return state == CORE_INVALID;}
+      CoreState getState()  const {return state;}
+      bool      isReady()   const {return state == CORE_READY;}
+      bool      isInvalid() const {return state == CORE_INVALID;}
 
-      std::string getURL() const;
-      uint32_t getType() const;
+      std::string getURL()  const;
+      uint32_t    getType() const;
       std::string getPath() const;
 
       void addProgressCallback(progress_cb_t cb);

src/fah/client/Unit.cpp

@@ -551,8 +551,6 @@ void Unit::getCore() {
 
       if (core->isInvalid()) {
         LOG_INFO(1, "Failed to download core");
-        data.release();
-        setState(UNIT_ASSIGN);
         retry();
 
       } else if (core->isReady()) {
@@ -590,8 +588,10 @@ void Unit::run() {
 
   // Set environment library paths
   vector<string> paths;
+#ifdef _WIN32
   string execPath = SystemUtilities::getExecutablePath();
   paths.push_back(SystemUtilities::dirname(execPath));
+#endif
   string corePath = SystemUtilities::absolute(core->getPath());
   paths.push_back(SystemUtilities::dirname(corePath));
   const string &ldPath = SystemUtilities::library_path;
@@ -758,13 +758,6 @@ void Unit::finalizeRun() {
   LOG(CBANG_LOG_DOMAIN, ok ? LOG_INFO_LEVEL(1) : Logger::LEVEL_WARNING,
       "Core returned " << code << " (" << (unsigned)code << ')');
 
-#ifdef _WIN32
-  if (0xc000000 <= code)
-    LOG_WARNING("Core exited with Windows unhandled exception code "
-                << String::printf("0x%08x", (unsigned)code)
-                << ".  See https://bit.ly/2CXgWkZ for more information.");
-#endif
-
   // Notify parent
   units->triggerUpdate();
 
@@ -784,6 +777,19 @@ void Unit::finalizeRun() {
     data->insert("data", Base64().encode(resultData));
     setState(UNIT_UPLOAD);
 
+  } else if (!code.isValid()) {
+#ifdef _WIN32
+    if (0xc0000000 <= (unsigned)code)
+      LOG_WARNING("Core exited with Windows unhandled exception code "
+                  << String::printf("0x%08x", (unsigned)code)
+                  << ".  See https://bit.ly/2CXgWkZ for more information.");
+    else
+#endif
+      LOG_WARNING("Core exited with an unknown error code " << (unsigned)code
+                  << " which probably indicates that it crashed");
+
+    retry();
+
   } else setState(UNIT_DUMP);
 
   triggerNext();