update trace name and fix tests (#45)

1a1a11a · Jan 1, 2024 · 290101d · 290101d
1 parent db6bd31
commit 290101d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/data/cloudphyicsIO.csv → data/cloudPhysicsIO.csv b/data/cloudphyicsIO.csv → data/cloudPhysicsIO.csv
diff --git a/data/cloudphyicsIO.oracleGeneral.bin → data/cloudPhysicsIO.oracleGeneral.bin b/data/cloudphyicsIO.oracleGeneral.bin → data/cloudPhysicsIO.oracleGeneral.bin
diff --git a/data/cloudphyicsIO.txt → data/cloudPhysicsIO.txt b/data/cloudphyicsIO.txt → data/cloudPhysicsIO.txt
diff --git a/data/cloudphyicsIO.vscsi → data/cloudPhysicsIO.vscsi b/data/cloudphyicsIO.vscsi → data/cloudPhysicsIO.vscsi
diff --git a/scripts/install_dependency.sh b/scripts/install_dependency.sh
@@ -55,7 +55,6 @@ setup_zstd() {
     sudo make install
 }
 
-
 CURR_DIR=$(pwd)
 
 if [  -n "$(uname -a | grep Ubuntu)" ]; then
@@ -66,10 +65,11 @@ else
 	setup_centos
 fi  
 
+setup_zstd
+
 if [[ ! $GITHUB_ACTIONS == "true" ]]; then
 	setup_xgboost
 	setup_lightgbm
 fi
-setup_zstd
 
 cd $CURR_DIR
diff --git a/test/common.h b/test/common.h
@@ -60,7 +60,7 @@ static void _detect_data_path(char *data_path, char *data_name) {
 
 static reader_t *setup_oracleGeneralBin_reader(void) {
   char data_path[1024];
-  _detect_data_path(data_path, "trace.oracleGeneral.bin");
+  _detect_data_path(data_path, "cloudPhysicsIO.oracleGeneral.bin");
   reader_t *reader_oracle = setup_reader(data_path, ORACLE_GENERAL_TRACE, NULL);
   return reader_oracle;
 }
@@ -86,22 +86,22 @@ static reader_t *setup_vscsi_reader_with_ignored_obj_size(void) {
   char data_path[1024];
   reader_init_param_t *init_params = g_new0(reader_init_param_t, 1);
   init_params->ignore_obj_size = true;
-  _detect_data_path(data_path, "trace.vscsi");
+  _detect_data_path(data_path, "cloudPhysicsIO.vscsi");
   reader_t *reader_vscsi = setup_reader(data_path, VSCSI_TRACE, init_params);
   g_free(init_params);
   return reader_vscsi;
 }
 
 static reader_t *setup_vscsi_reader(void) {
   char data_path[1024];
-  _detect_data_path(data_path, "trace.vscsi");
+  _detect_data_path(data_path, "cloudPhysicsIO.vscsi");
   reader_t *reader_vscsi = setup_reader(data_path, VSCSI_TRACE, NULL);
   return reader_vscsi;
 }
 
 static reader_t *setup_binary_reader(void) {
   char data_path[1024];
-  _detect_data_path(data_path, "trace.vscsi");
+  _detect_data_path(data_path, "cloudPhysicsIO.vscsi");
   reader_init_param_t *init_params_bin = g_new0(reader_init_param_t, 1);
   init_params_bin->binary_fmt_str = "<IIIHHQQ";
   init_params_bin->obj_size_field = 2;
@@ -115,7 +115,7 @@ static reader_t *setup_binary_reader(void) {
 
 static reader_t *setup_csv_reader_obj_str(void) {
   char data_path[1024];
-  _detect_data_path(data_path, "trace.csv");
+  _detect_data_path(data_path, "cloudPhysicsIO.csv");
   reader_init_param_t *init_params_csv = g_new0(reader_init_param_t, 1);
   init_params_csv->delimiter = ',';
   init_params_csv->time_field = 2;
@@ -130,7 +130,7 @@ static reader_t *setup_csv_reader_obj_str(void) {
 
 static reader_t *setup_csv_reader_obj_num(void) {
   char data_path[1024];
-  _detect_data_path(data_path, "trace.csv");
+  _detect_data_path(data_path, "cloudPhysicsIO.csv");
   reader_init_param_t *init_params_csv = g_new0(reader_init_param_t, 1);
   init_params_csv->delimiter = ',';
   init_params_csv->time_field = 2;
@@ -145,14 +145,14 @@ static reader_t *setup_csv_reader_obj_num(void) {
 
 static reader_t *setup_plaintxt_reader_num(void) {
   char data_path[1024];
-  _detect_data_path(data_path, "trace.txt");
+  _detect_data_path(data_path, "cloudPhysicsIO.txt");
   reader_init_param_t init_params = {.obj_id_is_num = true};
   return setup_reader(data_path, PLAIN_TXT_TRACE, &init_params);
 }
 
 static reader_t *setup_plaintxt_reader_str(void) {
   char data_path[1024];
-  _detect_data_path(data_path, "trace.txt");
+  _detect_data_path(data_path, "cloudPhysicsIO.txt");
   reader_init_param_t init_params = {.obj_id_is_num = false};
   return setup_reader(data_path, PLAIN_TXT_TRACE, &init_params);
 }