Revert "Fix format specifiers (#188)" (#199)

This reverts commit 783d575.

Author: 1a1a11a

libCacheSim/bin/MRC/SHARDS.c

@@ -99,7 +99,7 @@ void generate_shards_mrc(struct PARAM *params, char *path) {
   params->reader->init_params.sampler->sampling_ratio = 1.0;
   params->reader->sampler->sampling_ratio = 1.0;
   uint64_t n_req = get_num_of_req(params->reader);
-  printf("n_req: %" PRIu64 "\n", n_req);
+  printf("n_req: %lu\n", n_req);
   params->reader->init_params.sampler->sampling_ratio = params->rate;
   params->reader->sampler->sampling_ratio = params->rate;
 

libCacheSim/bin/MRC/main.c

@@ -4,24 +4,20 @@
 #include <assert.h>
 #include <libgen.h>
 #include <unistd.h>
-
 #include "../../include/libCacheSim/sampling.h"
 #include "../cachesim/internal.h"
 #include "mrc_internal.h"
 
 int main(int argc, char **argv) {
   if (argc < 5) {
-    fprintf(stderr,
-            "Usage:\n"
+    fprintf(stderr, "Usage:\n"
             "  For SHARDS:\n"
-            "    %s SHARDS <output_file> <trace_file> <trace_type> <rate> "
-            "[--size SIZE] [other options]\n\n"
+            "    %s SHARDS <output_file> <trace_file> <trace_type> <rate> [--size SIZE] [other options]\n\n"
             "  For MINI:\n"
-            "    %s MINI <trace_file> <trace_type> <eviction_algo> "
-            "<cache_sizes> <rate> <output_file> [other options]\n",
+            "    %s MINI <trace_file> <trace_type> <eviction_algo> <cache_sizes> <rate> <output_file> [other options]\n",
             argv[0], argv[0]);
     return 1;
-  }
+}
 
   // printf("Received Arguments:\n");
   // for (int i = 0; i < argc; i++) {
@@ -31,7 +27,7 @@ int main(int argc, char **argv) {
   char *algorithm_type = argv[1];
   printf("Algorithm type: %s\n", algorithm_type);
   if (strcmp(algorithm_type, "MINI") == 0) {
-    char *path = argv[7];
+    char* path=argv[7];
     struct MINI_arguments arguments;
     parse_mini_cmd(argc, argv, &arguments);
     cache_stat_t *return_value = generate_mini_mrc(&arguments);
@@ -43,16 +39,11 @@ int main(int argc, char **argv) {
     }
 
     fprintf(output_file, "Cache Size,Miss Ratio, Miss Ratio Byte\n");
-    for (int i = 0; i < arguments.n_cache_size * arguments.n_eviction_algo;
-         i++) {
-      uint64_t cache_size = (uint64_t)((float)return_value[i].cache_size /
-                                       return_value[i].sampler_ratio);
-      double miss_ratio =
-          (double)return_value[i].n_miss / (double)return_value[i].n_req;
-      double miss_ratio_byte = (double)return_value[i].n_miss_byte /
-                               (double)return_value[i].n_req_byte;
-      fprintf(output_file, "%" PRId64 ",%f, %f\n", cache_size, miss_ratio,
-              miss_ratio_byte);
+    for (int i = 0; i < arguments.n_cache_size * arguments.n_eviction_algo; i++) {
+      uint64_t cache_size = (uint64_t)((float)return_value[i].cache_size / return_value[i].sampler_ratio);
+      double miss_ratio = (double)return_value[i].n_miss / (double)return_value[i].n_req;
+      double miss_ratio_byte = (double)return_value[i].n_miss_byte / (double)return_value[i].n_req_byte;
+      fprintf(output_file, "%ld,%f, %f\n", cache_size, miss_ratio, miss_ratio_byte);
     }
 
     fclose(output_file);
@@ -66,4 +57,4 @@ int main(int argc, char **argv) {
     fprintf(stderr, "Error: unknown algorithm type\n");
     return 1;
   }
-}
+}

libCacheSim/bin/cachesim/sim.c

@@ -93,7 +93,7 @@ void simulate(reader_t *reader, cache_t *cache, int report_interval, int warmup_
             (double)req_cnt / 1000000.0 / runtime);
   } else {
     snprintf(output_str, 1024,
-             "%s %s cache size %8" PRId64 ", %16lu req, miss ratio %.4lf, throughput "
+             "%s %s cache size %8ld, %16lu req, miss ratio %.4lf, throughput "
              "%.2lf MQPS\n",
             reader->trace_path, detailed_cache_name, cache->cache_size,
             (unsigned long)req_cnt, (double)miss_cnt / (double)req_cnt,

libCacheSim/bin/debug/aligned.c

@@ -142,7 +142,7 @@ void test_unaligned_read_mmap(char* filepath) {
   printf("uint16_t unaligned read time: %.4f sec\n", time_read_uint16_unaligned);
   printf("uint8_t    aligned read time: %.4f sec\n", time_read_uint8_aligned);
   printf("uint8_t  unaligned read time: %.4f sec\n", time_read_uint8_unaligned);
-  printf("s: %" PRId64 "\n", s);
+  printf("s: %ld\n", s);
 
   close(fd);
 }
@@ -264,7 +264,7 @@ void test_unaligned_read_mmap_struct(char* filepath) {
   printf("struct   aligned read time: %.4f sec\n", time_read_struct_aligned);
   printf("struct unaligned read time: %.4f sec\n", time_read_struct_unaligned);
 
-  printf("s: %" PRId64 "\n", s);
+  printf("s: %ld\n", s);
   close(fd);
 }
 
@@ -314,7 +314,7 @@ void test_unaligned_read_struct(char* filepath) {
   printf("struct   aligned read time: %.4f sec\n", time_read_struct_aligned);
   printf("struct unaligned read time: %.4f sec\n", time_read_struct_unaligned);
 
-  printf("s: %" PRId64 "\n", s);
+  printf("s: %ld\n", s);
 }
 
 int main(int argc, char* argv[]) {

libCacheSim/bin/mrcProfiler/main.cpp

@@ -19,7 +19,7 @@ void print_args(struct arguments *args) {
   printf("trace_type: %d\n", args->trace_type);
   printf("trace_type_params: %s\n", args->trace_type_params);
   printf("ofilepath: %s\n", args->ofilepath);
-  printf("n_req: %" PRId64 "\n", args->n_req);
+  printf("n_req: %ld\n", args->n_req);
   printf("verbose: %d\n", args->verbose);
   printf("cache_algorithm_str: %s\n", args->cache_algorithm_str);
   printf("mrc_size_str: %s\n", args->mrc_size_str);