added cleanup primitive

include/veloc.h

@@ -65,6 +65,13 @@ int VELOC_Mem_unprotect(int id);
 // can be used to manually read/write checkpointing data without registering memory regions
 int VELOC_Route_file(const char *original, char *routed);
 
+/**************************
+* Cleanup
+*************************/
+
+// remove all checkpoints in "scratch" corresponding to name
+int VELOC_Cleanup(const char *name);
+
 /**************************
  * Checkpoint routines
  *************************/

include/veloc.hpp

@@ -39,6 +39,7 @@ class client_t {
     }
 
     virtual std::string route_file(const std::string &original) = 0;
+    virtual bool cleanup(const std::string &name) = 0;
 
     virtual bool checkpoint(const std::string &name, int version) = 0;
     virtual bool checkpoint_begin(const std::string &name, int version) = 0;

src/lib/client.cpp

@@ -85,6 +85,13 @@ client_impl_t::~client_impl_t() {
     DBG("VELOC finalized");
 }
 
+bool client_impl_t::cleanup(const std::string &name) {
+    parse_dir(cfg.get("scratch"), name, [](const std::string &fname, int, int) {
+        remove(fname.c_str());
+    });
+    return true;
+}
+
 bool client_impl_t::checkpoint_wait() {
     if (checkpoint_in_progress) {
 	ERROR("need to finalize local checkpoint first by calling checkpoint_end()");

src/lib/client.hpp

@@ -32,6 +32,7 @@ class client_impl_t : public veloc::client_t {
     client_impl_t(MPI_Comm comm, const std::string &cfg_file);
 
     virtual std::string route_file(const std::string &original);
+    virtual bool cleanup(const std::string &name);
 
     virtual bool checkpoint(const std::string &name, int version);
     virtual bool checkpoint_begin(const std::string &name, int version);

src/lib/veloc.cpp

@@ -67,7 +67,7 @@ extern "C" int VELOC_Checkpoint_wait() {
 }
 
 extern "C" int VELOC_Checkpoint_finished() {
-    if (veloc_client == NULL) 
+    if (veloc_client == NULL)
         return -1;
     return veloc_client->checkpoint_finished();
 }
@@ -86,6 +86,10 @@ extern "C" int VELOC_Route_file(const char *original, char *routed) {
     return routed[0] != 0 ? VELOC_SUCCESS : VELOC_FAILURE;
 }
 
+extern "C" int VELOC_Cleanup(const char *name) {
+    return CLIENT_CALL(veloc_client->cleanup(std::string(name)));
+}
+
 extern "C" int VELOC_Restart_begin(const char *name, int version) {
     return CLIENT_CALL(veloc_client->restart_begin(std::string(name), version));
 }

test/heatdis_fault.cpp

@@ -150,7 +150,9 @@ int main(int argc, char *argv[]) {
 
     free(h);
     free(g);
-    VELOC_Finalize(1); // wait for checkpoints to finish
+    VELOC_Checkpoint_wait();
+    VELOC_Cleanup("heatdis");
+    VELOC_Finalize(1);
     MPI_Finalize();
     return 0;
 }