Handle a couple crashes better

citp · Mar 15, 2018 · faef367 · faef367
1 parent 2565016
commit faef367
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/clustering/src/clusterer/main.cpp b/clustering/src/clusterer/main.cpp
@@ -42,6 +42,15 @@ std::vector<std::pair<Address, Address>> process_transaction(const Transaction &
 template <typename Job>
 void segmentWork(uint32_t start, uint32_t end, uint32_t segmentCount, Job job) {
     uint32_t total = end - start;
+
+    // Don't partition over threads if there are less items than segment count
+    if (total < segmentCount) {
+        for (uint32_t i = start; i < end; ++i) {
+            job(i);
+        }
+        return;
+    }
+
     auto segmentSize = total / segmentCount;
     auto segmentsRemaining = total % segmentCount;
     std::vector<std::pair<uint32_t, uint32_t>> segments;

diff --git a/src/blocksci/util/data_configuration.cpp b/src/blocksci/util/data_configuration.cpp
@@ -39,6 +39,10 @@ namespace blocksci {
             if (versionNum != dataVersion) {
                 throw std::runtime_error("Error, parser data is not in the correct format. To fix you must delete the data file and rerun the parser");
             }
+        } else {
+            std::stringstream ss;
+            ss << "Error, data directory does not contain config.ini. Are you sure " << dataDirectory << "was the output directory of blocksci_parser?";
+            throw std::runtime_error(ss.str());
         }
 
         auto dataDirectoryString = dataDirectory.native();