Add simple progress percentage display

src/phase1.hpp

@@ -45,6 +45,7 @@
 #include "sort_manager.hpp"
 #include "threading.hpp"
 #include "util.hpp"
+#include "progress.hpp"
 
 struct THREADDATA {
     int index;
@@ -742,6 +743,7 @@ std::vector<uint64_t> RunPhase1(
 
         prevtableentries = globals.right_writer_count;
         table_timer.PrintElapsed("Forward propagation table time:");
+        progress(1, table_index, 6);
     }
     table_sizes[0] = 0;
     globals.R_sort_manager.reset();

src/phase2.hpp

@@ -20,6 +20,7 @@
 #include "sort_manager.hpp"
 #include "bitfield.hpp"
 #include "bitfield_index.hpp"
+#include "progress.hpp"
 
 struct Phase2Results
 {
@@ -237,6 +238,7 @@ Phase2Results RunPhase2(
         if (table_index != 7) {
             tmp_1_disks[table_index].Truncate(0);
         }
+        progress(2, 8 - table_index, 6);
     }
 
     // lazy-compact table 1 based on current_bitfield

src/phase3.hpp

@@ -20,6 +20,7 @@
 #include "exceptions.hpp"
 #include "pos_constants.hpp"
 #include "sort_manager.hpp"
+#include "progress.hpp"
 
 // Results of phase 3. These are passed into Phase 4, so the checkpoint tables
 // can be properly built.
@@ -488,6 +489,7 @@ Phase3Results RunPhase3(
 
         left_disk.FreeMemory();
         right_disk.FreeMemory();
+        progress(3, table_index, 6);
     }
 
     L_sort_manager->FreeMemory();

src/phase4.hpp

@@ -21,6 +21,7 @@
 #include "phase3.hpp"
 #include "pos_constants.hpp"
 #include "util.hpp"
+#include "progress.hpp"
 
 // Writes the checkpoint tables. The purpose of these tables, is to store a list of ~2^k values
 // of size k (the proof of space outputs from table 7), in a way where they can be looked up for
@@ -79,6 +80,8 @@ void RunPhase4(uint8_t k, uint8_t pos_size, FileDisk &tmp2_disk, Phase3Results &
     std::cout << "\tStarting to write C1 and C3 tables" << std::endl;
 
     ParkBits to_write_p7;
+    const int max_phase4_progress_updates = 16;
+    const int progress_update_increment = res.final_entries_written / max_phase4_progress_updates;
 
     // We read each table7 entry, which is sorted by f7, but we don't need f7 anymore. Instead,
     // we will just store pos6, and the deltas in table C3, and checkpoints in tables C1 and C2.
@@ -133,6 +136,9 @@ void RunPhase4(uint8_t k, uint8_t pos_size, FileDisk &tmp2_disk, Phase3Results &
             }
             prev_y = entry_y;
         }
+        if (f7_position % progress_update_increment == 0) {
+            progress(4, f7_position, res.final_entries_written);
+        }
     }
     Encoding::ANSFree(kC3R);
     res.table7_sm.reset();
@@ -194,5 +200,7 @@ void RunPhase4(uint8_t k, uint8_t pos_size, FileDisk &tmp2_disk, Phase3Results &
         std::cout << ": 0x" << res.final_table_begin_pointers[i] << std::endl;
     }
     std::cout << std::dec;
+    progress(4, res.final_entries_written, res.final_entries_written);
+
 }
 #endif  // SRC_CPP_PHASE4_HPP

src/progress.hpp

@@ -0,0 +1,11 @@
+#ifndef SRC_CPP_PROGRESS_HPP_
+#define SRC_CPP_PROGRESS_HPP_
+
+#include <iostream>
+
+void progress(int phase, int n, int max_n) {
+    float p = (100.0 / 4) * ((phase - 1.0) + (1.0 * n / max_n));
+    std::cout << "Progress: " << p << std::endl;
+}
+
+#endif  // SRC_CPP_PROGRESS_HPP