update logging

1a1a11a · Oct 15, 2023 · 4a9b24c · 4a9b24c
1 parent 051f89a
commit 4a9b24c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/libCacheSim/traceAnalyzer/utils/include/utilsPrint.h b/libCacheSim/traceAnalyzer/utils/include/utilsPrint.h
@@ -29,8 +29,8 @@ static inline void print_progress(double perc) {
         return;
     }
     if (last_perc != 0)
-        fprintf(stderr, "\033[A\033[2K\r");
-    fprintf(stderr, "%.2f%%\n", perc);
+        fprintf(stdout, "\033[A\033[2K\r");
+    fprintf(stdout, "%.2f%%\n", perc);
     last_perc = perc;
     last_print_time = cur_time;
 }

diff --git a/libCacheSim/utils/logging.c b/libCacheSim/utils/logging.c
@@ -34,8 +34,8 @@ void print_progress(double perc) {
     sleep(2);
     return;
   }
-  if (last_perc != 0) fprintf(stderr, "\033[A\033[2K\r");
-  fprintf(stderr, "%.2f%%...\n", perc);
+  if (last_perc != 0) fprintf(stdout, "\033[A\033[2K\r");
+  fprintf(stdout, "%.2f%%...\n", perc);
   last_perc = perc;
   last_print_time = cur_time;
 }
diff --git a/scripts/plot_mrc_size.py b/scripts/plot_mrc_size.py
@@ -65,14 +65,16 @@ def run_cachesim_size(
     logger.debug('running "{}"'.format(" ".join(run_args)))
 
     p = subprocess.run(run_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    if p.returncode != 0:
+        logger.warning("cachesim may have crashed with segfault")
 
     stderr_str = p.stderr.decode("utf-8")
     if stderr_str != "":
         logger.warning(stderr_str)
 
     stdout_str = p.stdout.decode("utf-8")
     for line in stdout_str.split("\n"):
-        logger.info(line)
+        logger.info("cachesim log: " + line)
 
         if "[INFO]" in line[:16]:
             continue
@@ -251,6 +253,10 @@ def run():
         ap.num_thread,
     )
 
+    if len(mrc_dict) == 0:
+        logger.error("fail to compute mrc")
+        sys.exit(1)
+
     with open("/tmp/{}.mrc.pickle".format(dataname), "wb") as f:
         pickle.dump(mrc_dict, f)
 

diff --git a/scripts/plot_mrc_time.py b/scripts/plot_mrc_time.py
@@ -72,14 +72,16 @@ def run_cachesim_time(
     logger.debug('running "{}"'.format(" ".join(run_args)))
 
     p = subprocess.run(run_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    if p.returncode != 0:
+        logger.warning("cachesim may have crashed with segfault")
 
     stderr_str = p.stderr.decode("utf-8")
     if stderr_str != "":
         logger.warning(stderr_str)
 
     stdout_str = p.stdout.decode("utf-8")
     for line in stdout_str.split("\n"):
-        logger.debug(line)
+        logger.debug("cachesim log: " + line)
 
         if "[INFO]" in line[:16]:
             m = re.search(REGEX, line)
@@ -217,4 +219,8 @@ def run():
             ap.num_thread,
         )
 
+    if len(mrc_dict) == 0:
+        logger.error("fail to compute mrc")
+        sys.exit(1)
+
     plot_mrc_time(mrc_dict, "{}_{}".format(dataname, ap.size))