Updated benchmark_suite/zmq_worker_client client code to fix compile errors and updated chimbuko_config

Makefile of benchmark_suite/zmq_worker_client now automatically determines chimbuko install path

Author: giltirn

benchmark_suite/zmq_worker_client/Makefile

@@ -1,9 +1,13 @@
+SHELL := /bin/bash
+INSTALL := $(shell which provdb_admin | sed 's/provdb_admin//')
+INSTALL := ${INSTALL}../
+
 all: server client
 
 server: server.cpp
-	tau_cxx.sh -std=c++17 -O3 -g -D_USE_ZMQNET -D_PERF_METRIC -I/opt/chimbuko/ad/include -I/opt/chimbuko/ad/include/chimbuko/3rdparty -L/opt/chimbuko/ad/lib server.cpp -o server -lchimbuko  -lstdc++fs
+	tau_cxx.sh -std=c++17 -O3 -g -D_USE_ZMQNET -D_PERF_METRIC -I${INSTALL}/include -I${INSTALL}/include/chimbuko/3rdparty -L${INSTALL}/lib server.cpp -o server -lchimbuko  -lstdc++fs
 client: client.cpp
-	tau_cxx.sh -std=c++17 -O3 -g -D_USE_ZMQNET -D_PERF_METRIC -I/opt/chimbuko/ad/include -I/opt/chimbuko/ad/include/chimbuko/3rdparty -L/opt/chimbuko/ad/lib client.cpp -o client -lchimbuko  -lstdc++fs
+	tau_cxx.sh -std=c++17 -O3 -g -D_USE_ZMQNET -D_PERF_METRIC -I${INSTALL}/include -I${INSTALL}/include/chimbuko/3rdparty -L${INSTALL}/lib client.cpp -o client -lchimbuko  -lstdc++fs
 
 clean:
 	rm -f client server

benchmark_suite/zmq_worker_client/chimbuko_config.sh

@@ -18,6 +18,7 @@ export C_FORCE_ROOT=1 #required only for docker runs, allows celery to execute p
 #General options for Chimbuko backend (pserver, ad, provdb)
 ############################################################
 backend_root="infer"  #The root install directory of the PerformanceAnalysis libraries. If set to "infer" it will be inferred from the path of the executables
+chimbuko_services="infer" #The location of the Chimbuko service script. If set to "infer" it will be inferred from backend_root
 
 ####################################
 #Options for the provenance database
@@ -29,6 +30,7 @@ provdb_engine="ofi+tcp;ofi_rxm"  #the OFI libfabric provider used for the Mochi
 provdb_port=5000 #the port of the provenance database
 provdb_nthreads=4 #number of worker threads; should be >= the number of shards
 provdb_writedir=chimbuko/provdb #the directory in which the provenance database is written. Chimbuko creates chimbuko/provdb which can be used as a default
+provdb_commit_freq=10000   #frequency ms at which the provenance database is committed to disk. If set to 0 it will commit only at the end
 
 #With "verbs" provider (used for infiniband, iWarp, etc) we need to also specify the domain, which can be found by running fi_info (on a compute node)
 provdb_domain=mlx5_0 #only needed for verbs provider   <------------ ***SET ME (if using verbs)***
@@ -86,9 +88,6 @@ TAU_ADIOS2_FILE_PREFIX=tau-metrics  #the prefix of tau adios2 files; full filena
 
 
 
-
-
-
 ###########################################################################
 # NON-USER VARIABLES BELOW  = DON'T MODIFY THESE!!
 ###########################################################################
@@ -97,10 +96,13 @@ export TAU_ADIOS2_FILENAME="${TAU_ADIOS2_PATH}/${TAU_ADIOS2_FILE_PREFIX}"
 
 if [[ ${backend_root} == "infer" ]]; then
     backend_root=$( readlink -f $(which provdb_admin | sed 's/provdb_admin//')/../ )
+fi
 
-    #Check run script exists
-    if [ ! -f "${backend_root}/scripts/launch/run_services.sh" ]; then
-	echo "Could not infer backend root directory: service script does not exist!"
+if [[ ${chimbuko_services} == "infer" ]]; then
+    chimbuko_services="${backend_root}/scripts/launch/run_services.sh"
+    if [ ! -f "${chimbuko_services}" ]; then
+	echo "Could not infer service script location: service script does not exist at ${chimbuko_services}!"
 	exit 1
     fi
 fi
+    

benchmark_suite/zmq_worker_client/client.cpp

@@ -16,11 +16,11 @@ void clientWait(int wait_ms){
   std::this_thread::sleep_for(std::chrono::milliseconds(wait_ms));
 }
 
-void rpcWaitAndRespond(ADNetClient &client, int wait_ms){
-  Message msg;
-  msg.set_info(0,0,  REQ_CMD, DEFAULT);
-  msg.set_msg(std::to_string(wait_ms));
-  client.send_and_receive(msg); //ignore return
+void rpcWaitAndRespond(ADThreadNetClient &client, int wait_ms){
+  Message send, recv;
+  send.set_info(0,0,  REQ_CMD, DEFAULT);
+  send.set_msg(std::to_string(wait_ms));
+  client.send_and_receive(recv,send); //ignore return
 }
 
 int main(int argc, char** argv){ 
@@ -34,7 +34,7 @@ int main(int argc, char** argv){
   Log << "Client executing with parameters:  cycles=" << cycles << " cycle_time=" << cycle_time << "ms anom_freq=" << anom_freq << " anom_mult=" << anom_mult << std::endl;
 
   Log << "connecting to server with address " << server_addr << std::endl;
-  ADNetClient client;
+  ADThreadNetClient client;
   client.connect_ps(0,0,server_addr);
 
   for(int i=0;i<cycles;i++){

benchmark_suite/zmq_worker_client/run.sh

@@ -2,14 +2,13 @@
 set -e
 
 rm -rf chimbuko
-rm -f provider.address
 
 export CHIMBUKO_CONFIG=chimbuko_config.sh
 source ${CHIMBUKO_CONFIG}
 
 if (( 1 )); then
     echo "Running services"
-    ${backend_root}/scripts/launch/run_services.sh 2>&1 | tee services.log &
+    ${chimbuko_services} 2>&1 | tee services.log &
     echo "Waiting"
     while [ ! -f chimbuko/vars/chimbuko_ad_cmdline.var ]; do sleep 1; done
     ad_opts=$(cat chimbuko/vars/chimbuko_ad_opts.var)