Skip to content

Commit fd5388d

Browse files
committed
Ignore previous commit from git blame
1 parent 225b07e commit fd5388d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+83
-79
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ IndentGotoLabels: true
8787
IndentPPDirectives: None
8888
IndentWidth: 2
8989
IndentWrappedFunctionNames: false
90+
InsertNewlineAtEOF: true
9091
JavaScriptQuotes: Leave
9192
JavaScriptWrapImports: true
9293
KeepEmptyLinesAtTheStartOfBlocks: false

.git-blame-ignore-revs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
225b07e41f03d82358171a3d91ab3f210d0ae783 # ignore repository-wide reformat

example/cacheCluster/consistentHash.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,4 +216,4 @@ void ch_ring_destroy_ring(ring_t *ring) {
216216

217217
#ifdef __cplusplus
218218
}
219-
#endif
219+
#endif

example/cacheHierarchy/fkYAML/node.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15780,4 +15780,4 @@ struct hash<
1578015780

1578115781
} // namespace std
1578215782

15783-
#endif /* FK_YAML_NODE_HPP */
15783+
#endif /* FK_YAML_NODE_HPP */

example/cacheHierarchy/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ int main(int argc, char* argv[]) {
5454
config.l2_mrc_output_path);
5555

5656
return 0;
57-
}
57+
}

libCacheSim/bin/MRC/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ int main(int argc, char **argv) {
6666
fprintf(stderr, "Error: unknown algorithm type\n");
6767
return 1;
6868
}
69-
}
69+
}

libCacheSim/bin/MRC/mrc_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,4 @@ void parse_mini_cmd(int argc, char *argv[], struct MINI_arguments *args);
105105

106106
#ifdef __cplusplus
107107
}
108-
#endif
108+
#endif

libCacheSim/bin/customized/SOSP23/oneHit/cli_parser.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,4 +162,4 @@ void free_arg(struct arguments *args) { close_reader(args->reader); }
162162

163163
#ifdef __cplusplus
164164
}
165-
#endif
165+
#endif

libCacheSim/bin/customized/fast23/fast23.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ void cal_group_metric_over_time(std::string trace_path, std::string ofilepath,
5353
int group_size);
5454
void cal_group_metric_utility_over_time(std::string trace_path,
5555
std::string ofilepath, int group_size);
56-
} // namespace compareGroups
56+
} // namespace compareGroups

libCacheSim/bin/customized/traceWriter/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,4 @@ void convert_wiki16_trace(char *trace_path) {
116116
printf("%s trace time %lu hour\n", trace_path, req->clock_time / 3600);
117117

118118
fclose(ofile);
119-
}
119+
}

libCacheSim/bin/debug/aligned.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,4 +348,4 @@ int main(int argc, char* argv[]) {
348348
test_unaligned_read_struct(argv[1]);
349349

350350
return 0;
351-
}
351+
}

libCacheSim/bin/dep/cpp/tencent.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ static inline void parse_tencent_photo(std::string line,
6060
p = strtok(NULL, " ");
6161
p = strtok(NULL, " ");
6262
assert(p == NULL);
63-
}
63+
}

libCacheSim/bin/dep/traceOneHit/cli_parser.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,4 @@ void free_arg(struct arguments *args) { close_reader(args->reader); }
161161

162162
#ifdef __cplusplus
163163
}
164-
#endif
164+
#endif

libCacheSim/bin/dep/traceOneHit/oneHit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ void cal_one_hit(reader_t *reader, char *ofilepath) {
6363
printf("%s in total %ld elem %ld objects %.4lf %.4lf\n", reader->trace_path,
6464
one_hit_ratio_vec.size(), freq_map.size(), one_hit_ratio_vec[0],
6565
one_hit_ratio_vec[one_hit_ratio_vec.size() - 1]);
66-
}
66+
}

libCacheSim/bin/distUtil/cli.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,4 +193,4 @@ void parse_cmd(int argc, char *argv[], struct arguments *args) {
193193

194194
#ifdef __cplusplus
195195
}
196-
#endif
196+
#endif

libCacheSim/bin/mrcProfiler/cli_parser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,4 +473,4 @@ void free_arg(struct arguments *args) { close_reader(args->reader); }
473473

474474
#ifdef __cplusplus
475475
}
476-
#endif
476+
#endif

libCacheSim/bin/mrcProfiler/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ int main(int argc, char *argv[]) {
5555
close_reader(args.reader);
5656

5757
return 0;
58-
}
58+
}

libCacheSim/bin/traceAnalyzer/cli_parser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,4 +283,4 @@ void free_arg(struct arguments *args) { close_reader(args->reader); }
283283

284284
#ifdef __cplusplus
285285
}
286-
#endif
286+
#endif

libCacheSim/bin/traceAnalyzer/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ int main(int argc, char *argv[]) {
2626
close_reader(args.reader);
2727

2828
return 0;
29-
}
29+
}

libCacheSim/bin/traceUtils/traceConvLCS.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,4 +487,4 @@ static void _reverse_file(std::string ofilepath, lcs_trace_stat_t stat,
487487
INFO("trace conversion finished, output %s\n", ofilepath.c_str());
488488
}
489489

490-
} // namespace traceConv
490+
} // namespace traceConv

libCacheSim/bin/traceUtils/traceConvOracleGeneral.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,4 +193,4 @@ static void _reverse_file(std::string ofilepath, struct trace_stat stat,
193193
INFO("trace conversion finished, %ld requests %ld objects, output %s\n",
194194
(long)n_req, (long)stat.n_obj, ofilepath.c_str());
195195
}
196-
} // namespace traceConv
196+
} // namespace traceConv

libCacheSim/bin/traceUtils/utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ void *setup_mmap(const std::string &file_path, size_t *size) {
5050
return mapped_file;
5151
}
5252

53-
} // namespace utils
53+
} // namespace utils

libCacheSim/cache/admission/adaptsize/adaptsize.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,4 +345,4 @@ double Adaptsize::modelHitRate(double log2c) {
345345
weighted_hitratio_sum += aligned_obj_seen_times[i] * tmp;
346346
}
347347
return weighted_hitratio_sum;
348-
}
348+
}

libCacheSim/cache/cacheObj.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,4 +225,4 @@ void append_obj_to_tail(cache_obj_t **head, cache_obj_t **tail,
225225
}
226226

227227
*tail = cache_obj;
228-
}
228+
}

libCacheSim/cache/eviction/3LCache/cache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,4 @@ class Factory : public CacheFactory {
9494
};
9595
} // namespace webcachesim
9696

97-
#endif /* LRB_CACHE_H */
97+
#endif /* LRB_CACHE_H */

libCacheSim/cache/eviction/3LCache/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ inline void logMessage(std::string m, uint64_t x, uint64_t y, uint64_t z) {
5353
} while (0)
5454
#endif
5555

56-
#endif // WEBCACHESIM_COMMON_H
56+
#endif // WEBCACHESIM_COMMON_H

libCacheSim/cache/eviction/3LCache/utils.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ inline int get_n_fields(const std::string& filename) {
5757

5858
// #define LOG_SAMPLE_RATE 0.01
5959

60-
#endif // WEBCACHESIM_UTILS_H
60+
#endif // WEBCACHESIM_UTILS_H

libCacheSim/cache/eviction/CAR.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,4 +659,4 @@ static bool _CAR_get_debug(cache_t *cache, const request_t *req) {
659659
_CAR_sanity_check_full(cache, req);
660660

661661
return false;
662-
}
662+
}

libCacheSim/cache/eviction/GLCache/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,4 @@ void init_cache_state(cache_t *cache) {
9696
params->cache_state.miss_ratio = 0.5;
9797
params->cache_state.req_rate = 1;
9898
params->cache_state.write_rate = 1;
99-
}
99+
}

libCacheSim/cache/eviction/LRB/cache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,4 @@ class Factory : public CacheFactory {
9494
};
9595
} // namespace webcachesim
9696

97-
#endif /* LRB_CACHE_H */
97+
#endif /* LRB_CACHE_H */

libCacheSim/cache/eviction/LRB/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ inline void logMessage(std::string m, uint64_t x, uint64_t y, uint64_t z) {
5353
} while (0)
5454
#endif
5555

56-
#endif // WEBCACHESIM_COMMON_H
56+
#endif // WEBCACHESIM_COMMON_H

libCacheSim/cache/eviction/LRB/lrb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,4 +462,4 @@ class LRBCache : public Cache {
462462
// static Factory<LRBCache> factoryLRB("LRB");
463463

464464
} // namespace lrb
465-
#endif // WEBCACHESIM_LRB_H
465+
#endif // WEBCACHESIM_LRB_H

libCacheSim/cache/eviction/LRB/utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ inline int get_n_fields(const std::string& filename) {
5757

5858
// #define LOG_SAMPLE_RATE 0.01
5959

60-
#endif // WEBCACHESIM_UTILS_H
60+
#endif // WEBCACHESIM_UTILS_H

libCacheSim/cache/eviction/LRUv0.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,4 +273,4 @@ static bool LRUv0_remove(cache_t *cache, const obj_id_t obj_id) {
273273

274274
#ifdef __cplusplus
275275
}
276-
#endif
276+
#endif

libCacheSim/cache/eviction/S3FIFO.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,4 +475,4 @@ static void S3FIFO_parse_params(cache_t *cache,
475475

476476
#ifdef __cplusplus
477477
}
478-
#endif
478+
#endif

libCacheSim/cache/eviction/SLRU.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,4 +585,4 @@ bool SLRU_get_debug(cache_t *cache, const request_t *req) {
585585
#ifdef __cplusplus
586586
extern "C"
587587
}
588-
#endif
588+
#endif

libCacheSim/cache/eviction/fifo/LP_SFIFO.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,4 +450,4 @@ static inline int64_t LP_SFIFO_get_n_obj(const cache_t *cache) {
450450
#ifdef __cplusplus
451451
extern "C"
452452
}
453-
#endif
453+
#endif

libCacheSim/cache/eviction/fifo/SFIFO.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,4 +553,4 @@ bool SFIFO_get_debug(cache_t *cache, const request_t *req) {
553553
#ifdef __cplusplus
554554
extern "C"
555555
}
556-
#endif
556+
#endif

libCacheSim/cache/plugin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,4 @@ cache_t *create_cache(const char *const cache_alg_name,
106106

107107
#ifdef __cplusplus
108108
}
109-
#endif
109+
#endif

libCacheSim/cache/prefetch/OBL.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,4 @@ prefetcher_t *create_OBL_prefetcher(const char *init_params,
184184

185185
my_free(sizeof(OBL_init_params_t), OBL_init_params);
186186
return prefetcher;
187-
}
187+
}

libCacheSim/dataStructure/bloom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,4 +152,4 @@ int bloom_reset(struct bloom *bloom) {
152152
return 0;
153153
}
154154

155-
const char *bloom_version(void) { return MAKESTRING(BLOOM_VERSION); }
155+
const char *bloom_version(void) { return MAKESTRING(BLOOM_VERSION); }

libCacheSim/dataStructure/bloom.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,4 @@ const char* bloom_version(void);
161161
}
162162
#endif
163163

164-
#endif
164+
#endif

libCacheSim/dataStructure/hash/wyhash.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,4 +239,4 @@ static inline void make_secret(uint64_t seed, uint64_t *secret) {
239239
} while (!ok);
240240
}
241241
}
242-
#endif
242+
#endif

libCacheSim/dataStructure/hash/xxh3.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2757,4 +2757,4 @@ XXH128_hashFromCanonical(const XXH128_canonical_t* src) {
27572757

27582758
#endif /* XXH3_H_1397135465 */
27592759

2760-
// NOLINTEND
2760+
// NOLINTEND

libCacheSim/dataStructure/hash/xxhash.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2196,4 +2196,4 @@ XXH64_hashFromCanonical(const XXH64_canonical_t* src) {
21962196

21972197
#endif
21982198

2199-
// NOLINTEND
2199+
// NOLINTEND

libCacheSim/dataStructure/hashtable/chainedHashtable.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,4 +425,4 @@ void check_chained_hashtable_integrity2(hashtable_t *hashtable,
425425

426426
#ifdef __cplusplus
427427
}
428-
#endif
428+
#endif

libCacheSim/dataStructure/minimalIncrementCBF.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,4 +177,4 @@ int minimalIncrementCBF_decay(struct minimalIncrementCBF *CBF) {
177177
return 0;
178178
}
179179

180-
const char *minimalIncrementCBF_version(void) { return MAKESTRING(VERSION); }
180+
const char *minimalIncrementCBF_version(void) { return MAKESTRING(VERSION); }

libCacheSim/dataStructure/minimalIncrementCBF.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,4 +143,4 @@ const char* minimalIncrementCBF_version(void);
143143
}
144144
#endif
145145

146-
#endif
146+
#endif

libCacheSim/dataStructure/minvaluemap.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ class MinValueMap {
5353
private:
5454
};
5555

56-
#endif
56+
#endif

libCacheSim/dataStructure/pqueue.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141
extern "C" {
4242
#endif
4343

44+
#include <stddef.h>
45+
#include <stdio.h>
46+
4447
#include "../include/config.h"
4548

4649
/** priority data type */

libCacheSim/dataStructure/robin_hood.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,9 +1162,7 @@ class Table
11621162
// route k through. No need to disable this because it's just not used if not
11631163
// applicable.
11641164
ROBIN_HOOD(NODISCARD)
1165-
key_type const& getFirstConst(key_type const& k) const noexcept {
1166-
return k;
1167-
}
1165+
key_type const& getFirstConst(key_type const& k) const noexcept { return k; }
11681166

11691167
// in case we have non-void mapped_type, we have a standard robin_hood::pair
11701168
template <typename Q = mapped_type>
@@ -2628,4 +2626,4 @@ using unordered_set =
26282626

26292627
} // namespace robin_hood
26302628

2631-
#endif
2629+
#endif

libCacheSim/dataStructure/splaytree.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,4 +421,4 @@ void SplayTree<K, V>::getDOT(std::ostream &o) {
421421
o << "}" << std::endl;
422422
}
423423

424-
#endif
424+
#endif

libCacheSim/dataStructure/ut/uthash.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,11 @@ typedef unsigned char uint8_t;
145145
#endif
146146

147147
/* initial number of buckets */
148-
#define HASH_INITIAL_NUM_BUCKETS 32U /* initial number of buckets */
149-
#define HASH_INITIAL_NUM_BUCKETS_LOG2 5U /* lg2 of initial number of buckets \
150-
*/
151-
#define HASH_BKT_CAPACITY_THRESH 10U /* expand when bucket count reaches */
148+
#define HASH_INITIAL_NUM_BUCKETS 32U /* initial number of buckets */
149+
#define HASH_INITIAL_NUM_BUCKETS_LOG2 \
150+
5U /* lg2 of initial number of buckets \
151+
*/
152+
#define HASH_BKT_CAPACITY_THRESH 10U /* expand when bucket count reaches */
152153

153154
/* calculate the element whose hash handle address is hhp */
154155
#define ELMT_FROM_HH(tbl, hhp) ((void *)(((char *)(hhp)) - ((tbl)->hho)))

libCacheSim/include/libCacheSim/admissionAlgo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ static inline admissioner_t *create_admissioner(const char *admission_algo,
5757

5858
#ifdef __cplusplus
5959
}
60-
#endif
60+
#endif

0 commit comments

Comments
 (0)