ProvDB benchmark now formally disconnects from the provdb before destructor is called to ensure stats are written

ProvDB admin now dumps margo state when all clients have disconnected

Author: giltirn

app/provdb_admin.cpp

@@ -107,12 +107,17 @@ void client_stop_rpc(const tl::request& req) {
 
 margo_instance_id margo_id;
 
-void margo_dump_rpc(const tl::request& req) {
-  std::string fn = std::string("margo_dump.") + getDateTimeFileExt();
+void margo_dump(const std::string &stub){
+  std::string fn = stub + "." + getDateTimeFileExt();
   progressStream << "ProvDB Admin: margo dump to " << fn << std::endl;
   margo_state_dump(margo_id, fn.c_str(), 0, nullptr);
 }
 
+void margo_dump_rpc(const tl::request& req) {
+  const static std::string stub("margo_dump");
+  margo_dump(stub);
+}
+
 
 
 
@@ -291,6 +296,7 @@ int main(int argc, char** argv) {
 	       ( !committer_has_connected || (committer_has_connected && !committer_connected) )
 	       ){
 	      progressStream << "ProvDB Admin: detected all clients disconnected, shutting down" << std::endl;
+	      margo_dump("margo_dump_all_client_disconnected");
 	      break;
 	    }
 	  }
@@ -303,9 +309,11 @@ int main(int argc, char** argv) {
 	}
 
 	progressStream << "ProvDB Admin: ending admin scope" << std::endl;
+	margo_dump("margo_dump_end_admin_scope");
       }//admin scope
 
       progressStream << "ProvDB Admin: ending provider scope" << std::endl;
+      margo_dump("margo_dump_end_provide_scope");
     }//provider scope
 
     progressStream << "ProvDB Admin: shutting down server engine" << std::endl;

app/sonata_profile_parse.pl

@@ -21,7 +21,7 @@
 
 #cf https://xgitlab.cels.anl.gov/sds/margo/blob/master/doc/instrumentation.md#generating-a-profile-and-topology-graph
 #Generate profiles by setting env variable MARGO_ENABLE_PROFILING=1
-
+#NB :  Origin are clients and Target is the server
 $i=0;
 $nrpc;
 %rpcnames = ();

benchmark_suite/benchmark_provdb/benchmark_client.cpp

@@ -196,9 +196,12 @@ int main(int argc, char **argv){
     }      
   }//cycle loop
 
+  std::cout << "Rank " << rank << " disconnecting from server" << std::endl;
+  provdb_client.disconnect(); //ensure data is written to stats
   stats.write();  
 
   MPI_Finalize();
 
+  std::cout << "Rank " << rank << " done" << std::endl;
   return 0;
 }