Skip to content

Commit cb520e7

Browse files
committed
Formatting test code
1 parent 2788e11 commit cb520e7

18 files changed

Lines changed: 818 additions & 500 deletions

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request]
44

55
env:
66
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
7-
BUILD_TYPE: Debug
7+
BUILD_TYPE: Release
88

99
jobs:
1010
# macos:

libCacheSim/cache/eviction/LFUDA.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ static void free_list_node(void *list_node);
5858
*/
5959
cache_t *LFUDA_init(const common_cache_params_t ccache_params,
6060
const char *cache_specific_params) {
61-
cache_t *cache = cache_struct_init("LFUDA", ccache_params, cache_specific_params);
61+
cache_t *cache =
62+
cache_struct_init("LFUDA", ccache_params, cache_specific_params);
6263
cache->cache_init = LFUDA_init;
6364
cache->cache_free = LFUDA_free;
6465
cache->get = LFUDA_get;
@@ -217,7 +218,9 @@ static cache_obj_t *LFUDA_insert(cache_t *cache, const request_t *req) {
217218
memset(new_node, 0, sizeof(freq_node_t));
218219
new_node->freq = cache_obj->lfu.freq;
219220
g_hash_table_insert(params->freq_map, key, new_node);
220-
params->max_freq = params->max_freq < cache_obj->lfu.freq ? cache_obj->lfu.freq : params->max_freq;
221+
params->max_freq = params->max_freq < cache_obj->lfu.freq
222+
? cache_obj->lfu.freq
223+
: params->max_freq;
221224
} else {
222225
DEBUG_ASSERT(new_node->freq == cache_obj->lfu.freq);
223226
}
@@ -355,7 +358,7 @@ static void update_min_freq(LFUDA_params_t *params) {
355358
break;
356359
}
357360
}
358-
// If cache is empty, min_freq will be unchanged.
361+
// If cache is empty, min_freq will be unchanged.
359362
DEBUG_ASSERT(params->min_freq >= old_min_freq);
360363
}
361364

libCacheSim/cache/eviction/LIRS.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ static cache_obj_t *hit_RD_HIRinS(cache_t *cache, cache_obj_t *cache_obj_s,
574574
LIRS_params_t *params = (LIRS_params_t *)(cache->eviction_params);
575575

576576
if (cache_obj_q != NULL) {
577-
int64_t obj_size = cache_obj_q->obj_size;
577+
int64_t obj_size = cache_obj_q->obj_size;
578578
params->hirs_count -= obj_size;
579579
params->LRU_q->remove(params->LRU_q, cache_obj_q->obj_id);
580580
cache->occupied_byte -= obj_size;
@@ -637,7 +637,8 @@ static void evictLIR(cache_t *cache) {
637637
cache->n_obj -= 1;
638638

639639
if ((uint64_t)req_local_evictLIR->obj_size <= params->hirs_limit) {
640-
while ((uint64_t)params->hirs_count + req_local_evictLIR->obj_size > params->hirs_limit) {
640+
while ((uint64_t)params->hirs_count + req_local_evictLIR->obj_size >
641+
params->hirs_limit) {
641642
evictHIR(cache);
642643
}
643644
params->LRU_q->insert(params->LRU_q, req_local_evictLIR);

libCacheSim/cache/eviction/SLRU.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,8 +451,9 @@ static void SLRU_parse_params(cache_t *cache,
451451
params->n_seg = n_seg;
452452
params->lru_max_n_bytes = calloc(params->n_seg, sizeof(int64_t));
453453
for (int i = 0; i < n_seg; i++) {
454-
params->lru_max_n_bytes[i] = (int64_t)(
455-
(double)seg_size_array[i] / seg_size_sum * cache->cache_size);
454+
params->lru_max_n_bytes[i] =
455+
(int64_t)((double)seg_size_array[i] / seg_size_sum *
456+
cache->cache_size);
456457
}
457458
} else if (strcasecmp(key, "print") == 0) {
458459
printf("current parameters: %s\n", SLRU_current_params(cache, params));

libCacheSim/traceReader/reader.c

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ extern "C" {
3939
// ssize_t getline(char **lineptr, size_t *n, FILE *stream);
4040
// #endif
4141

42-
reader_t *setup_reader(const char *const trace_path, const trace_type_e trace_type,
42+
reader_t *setup_reader(const char *const trace_path,
43+
const trace_type_e trace_type,
4344
const reader_init_param_t *const init_params) {
4445
static bool _info_printed = false;
4546

@@ -84,7 +85,8 @@ reader_t *setup_reader(const char *const trace_path, const trace_type_e trace_ty
8485

8586
if (init_params != NULL) {
8687
memcpy(&reader->init_params, init_params, sizeof(reader_init_param_t));
87-
if (init_params->binary_fmt_str != NULL) reader->init_params.binary_fmt_str = strdup(init_params->binary_fmt_str);
88+
if (init_params->binary_fmt_str != NULL)
89+
reader->init_params.binary_fmt_str = strdup(init_params->binary_fmt_str);
8890

8991
reader->ignore_obj_size = init_params->ignore_obj_size;
9092
reader->ignore_size_zero_req = init_params->ignore_size_zero_req;
@@ -94,7 +96,8 @@ reader_t *setup_reader(const char *const trace_path, const trace_type_e trace_ty
9496
reader->mmap_offset = init_params->trace_start_offset;
9597
reader->cap_at_n_req = init_params->cap_at_n_req;
9698
reader->block_size = init_params->block_size;
97-
if (init_params->sampler != NULL) reader->sampler = init_params->sampler->clone(init_params->sampler);
99+
if (init_params->sampler != NULL)
100+
reader->sampler = init_params->sampler->clone(init_params->sampler);
98101
} else {
99102
memset(&reader->init_params, 0, sizeof(reader_init_param_t));
100103
}
@@ -114,7 +117,8 @@ reader_t *setup_reader(const char *const trace_path, const trace_type_e trace_ty
114117
}
115118
reader->file_size = st.st_size;
116119

117-
if (reader->trace_type == CSV_TRACE || reader->trace_type == PLAIN_TXT_TRACE) {
120+
if (reader->trace_type == CSV_TRACE ||
121+
reader->trace_type == PLAIN_TXT_TRACE) {
118122
reader->file = fopen(reader->trace_path, "rb");
119123
if (reader->file == 0) {
120124
ERROR("Failed to open %s: %s\n", reader->trace_path, strerror(errno));
@@ -137,7 +141,8 @@ reader_t *setup_reader(const char *const trace_path, const trace_type_e trace_ty
137141
if ((reader->mapped_file) == MAP_FAILED) {
138142
close(fd);
139143
reader->mapped_file = NULL;
140-
ERROR("Unable to allocate %llu bytes of memory, %s\n", (unsigned long long)st.st_size, strerror(errno));
144+
ERROR("Unable to allocate %llu bytes of memory, %s\n",
145+
(unsigned long long)st.st_size, strerror(errno));
141146
abort();
142147
}
143148
}
@@ -147,7 +152,8 @@ reader_t *setup_reader(const char *const trace_path, const trace_type_e trace_ty
147152
reader->trace_format = TXT_TRACE_FORMAT;
148153
csv_setup_reader(reader);
149154
if (!check_delimiter(reader, init_params->delimiter)) {
150-
ERROR("The trace does not use delimiter '%c', please check\n", init_params->delimiter);
155+
ERROR("The trace does not use delimiter '%c', please check\n",
156+
init_params->delimiter);
151157
}
152158
break;
153159
case PLAIN_TXT_TRACE:
@@ -194,7 +200,9 @@ reader_t *setup_reader(const char *const trace_path, const trace_type_e trace_ty
194200
WARN(
195201
"trace file size %lu - %lu is not multiple of item size %lu, mod "
196202
"%lu\n",
197-
(unsigned long)reader->file_size, (unsigned long)reader->trace_start_offset, (unsigned long)reader->item_size,
203+
(unsigned long)reader->file_size,
204+
(unsigned long)reader->trace_start_offset,
205+
(unsigned long)reader->item_size,
198206
(unsigned long)reader->file_size % reader->item_size);
199207
}
200208

@@ -227,14 +235,15 @@ reader_t *setup_reader(const char *const trace_path, const trace_type_e trace_ty
227235
*/
228236
int read_one_req(reader_t *const reader, request_t *const req) {
229237
if (reader->mmap_offset >= reader->file_size) {
230-
DEBUG("read_one_req: end of file, current mmap_offset %zu, file size %zu\n", reader->mmap_offset,
231-
reader->file_size);
238+
DEBUG("read_one_req: end of file, current mmap_offset %zu, file size %zu\n",
239+
reader->mmap_offset, reader->file_size);
232240
req->valid = false;
233241
return 1;
234242
}
235243

236244
if (reader->cap_at_n_req > 1 && reader->n_read_req >= reader->cap_at_n_req) {
237-
DEBUG("read_one_req: processed %ld requests capped by the user\n", (long)reader->n_read_req);
245+
DEBUG("read_one_req: processed %ld requests capped by the user\n",
246+
(long)reader->n_read_req);
238247
req->valid = false;
239248
return 1;
240249
}
@@ -305,8 +314,8 @@ int read_one_req(reader_t *const reader, request_t *const req) {
305314
sampler_t *sampler = reader->sampler;
306315
reader->sampler = NULL;
307316
while (!sampler->sample(sampler, req)) {
308-
VVERBOSE("skip one req: time %lu, obj_id %lu, size %lu at offset %zu\n", req->clock_time, req->obj_id,
309-
req->obj_size, offset_before_read);
317+
VVERBOSE("skip one req: time %lu, obj_id %lu, size %lu at offset %zu\n",
318+
req->clock_time, req->obj_id, req->obj_size, offset_before_read);
310319
if (reader->read_direction == READ_FORWARD) {
311320
status = read_one_req(reader, req);
312321
} else {
@@ -324,8 +333,8 @@ int read_one_req(reader_t *const reader, request_t *const req) {
324333
req->obj_size = 1;
325334
}
326335

327-
VVERBOSE("read one req: time %lu, obj_id %lu, size %lu at offset %zu\n", req->clock_time, req->obj_id, req->obj_size,
328-
offset_before_read);
336+
VVERBOSE("read one req: time %lu, obj_id %lu, size %lu at offset %zu\n",
337+
req->clock_time, req->obj_id, req->obj_size, offset_before_read);
329338

330339
return status;
331340
}
@@ -354,7 +363,8 @@ int go_back_one_req(reader_t *const reader) {
354363
seek_size = MIN(PER_SEEK_SIZE, max_seek_size - total_seek_size);
355364
total_seek_size += seek_size;
356365
fseek(reader->file, -seek_size, SEEK_CUR);
357-
ssize_t read_size = fread(reader->line_buf, 1, seek_size - 1, reader->file);
366+
ssize_t read_size =
367+
fread(reader->line_buf, 1, seek_size - 1, reader->file);
358368
reader->line_buf[read_size - 1] = 0;
359369
char *last_line_end = strrchr(reader->line_buf, '\n');
360370

@@ -385,7 +395,8 @@ int go_back_one_req(reader_t *const reader) {
385395
}
386396
break;
387397
case BINARY_TRACE_FORMAT:
388-
if (reader->mmap_offset >= reader->trace_start_offset + reader->item_size) {
398+
if (reader->mmap_offset >=
399+
reader->trace_start_offset + reader->item_size) {
389400
reader->mmap_offset -= (reader->item_size);
390401
return 0;
391402
} else {
@@ -523,7 +534,8 @@ int64_t get_num_of_req(reader_t *const reader) {
523534
}
524535

525536
reader_t *clone_reader(const reader_t *const reader_in) {
526-
reader_t *reader = setup_reader(reader_in->trace_path, reader_in->trace_type, &reader_in->init_params);
537+
reader_t *reader = setup_reader(reader_in->trace_path, reader_in->trace_type,
538+
&reader_in->init_params);
527539
reader->n_total_req = reader_in->n_total_req;
528540

529541
if (reader->trace_format != TXT_TRACE_FORMAT) {
@@ -638,7 +650,9 @@ void read_last_req(reader_t *reader, request_t *req) {
638650

639651
bool is_str_num(const char *str, size_t len) {
640652
for (size_t i = 0; i < len; i++) {
641-
if (!(isdigit(str[i]) || (str[i] >= 'a' && str[i] <= 'f') || (str[i] >= 'A' && str[i] <= 'F'))) return false;
653+
if (!(isdigit(str[i]) || (str[i] >= 'a' && str[i] <= 'f') ||
654+
(str[i] >= 'A' && str[i] <= 'F')))
655+
return false;
642656
}
643657
return true;
644658
}

test/test_3lcache.c

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
#define ThreeLCache_CACHE_SIZE (4 * GiB)
88
#define ThreeLCache_STEP_SIZE GiB
99

10-
static void _verify_profiler_results(const cache_stat_t *res, uint64_t num_of_sizes, uint64_t req_cnt_true,
10+
static void _verify_profiler_results(const cache_stat_t *res,
11+
uint64_t num_of_sizes,
12+
uint64_t req_cnt_true,
1113
const uint64_t *miss_cnt_true) {
1214
for (uint64_t i = 0; i < num_of_sizes; i++) {
1315
g_assert_cmpuint(req_cnt_true, ==, res[i].n_req);
@@ -22,10 +24,12 @@ static void _verify_profiler_results(const cache_stat_t *res, uint64_t num_of_si
2224
}
2325

2426
static void print_results(const cache_t *cache, const cache_stat_t *res) {
25-
for (uint64_t i = 0; i < ThreeLCache_CACHE_SIZE / ThreeLCache_STEP_SIZE; i++) {
26-
printf("%s cache size %8.4lf GB, req %" PRIu64 " miss %8" PRIu64 " req_bytes %" PRIu64 " miss_bytes %" PRIu64 "\n",
27-
cache->cache_name, (double)res[i].cache_size / (double)GiB, res[i].n_req, res[i].n_miss, res[i].n_req_byte,
28-
res[i].n_miss_byte);
27+
for (uint64_t i = 0; i < ThreeLCache_CACHE_SIZE / ThreeLCache_STEP_SIZE;
28+
i++) {
29+
printf("%s cache size %8.4lf GB, req %" PRIu64 " miss %8" PRIu64
30+
" req_bytes %" PRIu64 " miss_bytes %" PRIu64 "\n",
31+
cache->cache_name, (double)res[i].cache_size / (double)GiB,
32+
res[i].n_req, res[i].n_miss, res[i].n_req_byte, res[i].n_miss_byte);
2933
}
3034
}
3135

@@ -34,13 +38,18 @@ static void test_3LCache_OBJECT_MISS_RATIO(gconstpointer user_data) {
3438
uint64_t miss_cnt_true[] = {4779140, 4619176, 4099469, 4070435};
3539

3640
reader_t *reader = (reader_t *)user_data;
37-
common_cache_params_t cc_params = {.cache_size = ThreeLCache_CACHE_SIZE, .hashpower = 24, .default_ttl = DEFAULT_TTL};
41+
common_cache_params_t cc_params = {.cache_size = ThreeLCache_CACHE_SIZE,
42+
.hashpower = 24,
43+
.default_ttl = DEFAULT_TTL};
3844

39-
cache_t *cache = create_test_cache("3LCache-object-miss-ratio", cc_params, reader, NULL);
45+
cache_t *cache =
46+
create_test_cache("3LCache-object-miss-ratio", cc_params, reader, NULL);
4047
g_assert_true(cache != NULL);
41-
cache_stat_t *res = simulate_at_multi_sizes_with_step_size(reader, cache, ThreeLCache_STEP_SIZE, NULL, 0, 0, _n_cores(), false);
48+
cache_stat_t *res = simulate_at_multi_sizes_with_step_size(
49+
reader, cache, ThreeLCache_STEP_SIZE, NULL, 0, 0, _n_cores(), false);
4250
print_results(cache, res);
43-
_verify_profiler_results(res, ThreeLCache_CACHE_SIZE / ThreeLCache_STEP_SIZE, req_cnt_true, miss_cnt_true);
51+
_verify_profiler_results(res, ThreeLCache_CACHE_SIZE / ThreeLCache_STEP_SIZE,
52+
req_cnt_true, miss_cnt_true);
4453
cache->cache_free(cache);
4554
my_free(sizeof(cache_stat_t), res);
4655
}
@@ -51,14 +60,19 @@ static void test_3LCache_BYTE_MISS_RATIO(gconstpointer user_data) {
5160
uint64_t miss_cnt_true[] = {4821107, 4476524, 4374172, 4350448};
5261

5362
reader_t *reader = (reader_t *)user_data;
54-
common_cache_params_t cc_params = {.cache_size = ThreeLCache_CACHE_SIZE, .hashpower = 24, .default_ttl = DEFAULT_TTL};
63+
common_cache_params_t cc_params = {.cache_size = ThreeLCache_CACHE_SIZE,
64+
.hashpower = 24,
65+
.default_ttl = DEFAULT_TTL};
5566

56-
cache_t *cache = create_test_cache("3LCache-byte-miss-ratio", cc_params, reader, NULL);
67+
cache_t *cache =
68+
create_test_cache("3LCache-byte-miss-ratio", cc_params, reader, NULL);
5769
g_assert_true(cache != NULL);
58-
cache_stat_t *res = simulate_at_multi_sizes_with_step_size(reader, cache, ThreeLCache_STEP_SIZE, NULL, 0, 0, _n_cores(), false);
70+
cache_stat_t *res = simulate_at_multi_sizes_with_step_size(
71+
reader, cache, ThreeLCache_STEP_SIZE, NULL, 0, 0, _n_cores(), false);
5972

6073
print_results(cache, res);
61-
_verify_profiler_results(res, ThreeLCache_CACHE_SIZE / ThreeLCache_STEP_SIZE, req_cnt_true, miss_cnt_true);
74+
_verify_profiler_results(res, ThreeLCache_CACHE_SIZE / ThreeLCache_STEP_SIZE,
75+
req_cnt_true, miss_cnt_true);
6276
cache->cache_free(cache);
6377
my_free(sizeof(cache_stat_t), res);
6478
}
@@ -72,10 +86,13 @@ int main(int argc, char *argv[]) {
7286

7387
#if defined(ENABLE_3L_CACHE) && ENABLE_3L_CACHE == 1
7488
reader = setup_3LCacheTestData_reader();
75-
g_test_add_data_func("/libCacheSim/cacheAlgo_3LCache_OBJECT_MISS_RATIO", reader, test_3LCache_OBJECT_MISS_RATIO);
76-
g_test_add_data_func("/libCacheSim/cacheAlgo_3LCache_BYTE_MISS_RATIO", reader, test_3LCache_BYTE_MISS_RATIO);
89+
g_test_add_data_func("/libCacheSim/cacheAlgo_3LCache_OBJECT_MISS_RATIO",
90+
reader, test_3LCache_OBJECT_MISS_RATIO);
91+
g_test_add_data_func("/libCacheSim/cacheAlgo_3LCache_BYTE_MISS_RATIO", reader,
92+
test_3LCache_BYTE_MISS_RATIO);
7793

78-
g_test_add_data_func_full("/libCacheSim/empty", reader, empty_test, test_teardown);
94+
g_test_add_data_func_full("/libCacheSim/empty", reader, empty_test,
95+
test_teardown);
7996
#endif /* ENABLE_3L_CACHE */
8097

8198
return g_test_run();

0 commit comments

Comments
 (0)