Skip to content

Commit 283853f

Browse files
1a1a11a1a1a11a
committed
refactor logging
Refactor logging levels by removing VVERBOSE and adjusting log level definitions. Update logging calls throughout the codebase to use VERBOSE instead of VVERBOSE for consistency and clarity.
1 parent 4d464da commit 283853f

15 files changed

Lines changed: 38 additions & 74 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ option(OPT_SUPPORT_ZSTD_TRACE "whether support zstd trace" ON)
2626
option(ENABLE_LRB "enable LRB" OFF)
2727
option(ENABLE_3L_CACHE "enable 3LCache" OFF)
2828
set(LOG_LEVEL NONE CACHE STRING "change the logging level")
29-
set_property(CACHE LOG_LEVEL PROPERTY STRINGS INFO WARN ERROR DEBUG VERBOSE VVERBOSE VVVERBOSE)
29+
set_property(CACHE LOG_LEVEL PROPERTY STRINGS VERBOSE DEBUG INFO WARN ERROR)
3030

3131
# Platform detection
3232
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -67,11 +67,7 @@ endif()
6767

6868
string(TOLOWER "${LOG_LEVEL}" LOG_LEVEL_LOWER)
6969

70-
if(LOG_LEVEL_LOWER STREQUAL "vvverbose")
71-
add_compile_definitions(LOGLEVEL=3)
72-
elseif(LOG_LEVEL_LOWER STREQUAL "vverbose")
73-
add_compile_definitions(LOGLEVEL=4)
74-
elseif(LOG_LEVEL_LOWER STREQUAL "verbose")
70+
if(LOG_LEVEL_LOWER STREQUAL "verbose")
7571
add_compile_definitions(LOGLEVEL=5)
7672
elseif(LOG_LEVEL_LOWER STREQUAL "debug")
7773
add_compile_definitions(LOGLEVEL=6)

‎libCacheSim/cache/admission/adaptsize/adaptsize.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ void Adaptsize::reconfigure() {
188188
total_obj_size += it->second.obj_size;
189189
++it;
190190
}
191-
VVERBOSE(
191+
VERBOSE(
192192
"Reconfiguring over %zu objects - log2 total size %f log2 statsize %f\n",
193193
longterm_metadata.size(), log2(total_obj_size), log2(stat_size));
194194
// END Prepare for reconf
@@ -249,10 +249,10 @@ void Adaptsize::reconfigure() {
249249
WARN("BUG: NaN h1:%f h2:%f\n", h1, h2);
250250
} else if (h1 > h2) {
251251
c_param = pow(2, x1);
252-
VVERBOSE("C = %f (log2: %f )\n", c_param, x1);
252+
VERBOSE("C = %f (log2: %f )\n", c_param, x1);
253253
} else {
254254
c_param = pow(2, x2);
255-
VVERBOSE("C = %f (log2: %f )\n", c_param, x2);
255+
VERBOSE("C = %f (log2: %f )\n", c_param, x2);
256256
}
257257
// END Check for result
258258
}

‎libCacheSim/cache/cache.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,10 @@ bool cache_get_base(cache_t *cache, const request_t *req) {
243243
}
244244

245245
if (hit) {
246-
VVERBOSE("req %ld, obj %ld --- cache hit\n", cache->n_req, req->obj_id);
246+
VERBOSE("req %ld, obj %ld --- cache hit\n", cache->n_req, req->obj_id);
247247
} else if (!cache->can_insert(cache, req)) {
248-
VVERBOSE("req %ld, obj %ld --- cache miss cannot insert\n", cache->n_req,
249-
req->obj_id);
248+
VERBOSE("req %ld, obj %ld --- cache miss cannot insert\n", cache->n_req,
249+
req->obj_id);
250250
} else {
251251
while (cache->get_occupied_byte(cache) + req->obj_size +
252252
cache->obj_md_size >

‎libCacheSim/cache/eviction/GLCache/GLCache.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ static cache_obj_t *GLCache_insert(cache_t *cache, const request_t *req) {
397397

398398
seg = allocate_new_seg(cache, bucket->bucket_id);
399399
append_seg_to_bucket(params, bucket, seg);
400-
VVERBOSE("%lu allocate new seg, %d in use seg\n", cache->n_req,
400+
VERBOSE("%lu allocate new seg, %d in use seg\n", cache->n_req,
401401
params->n_in_use_segs);
402402
}
403403

‎libCacheSim/cache/eviction/GLCache/eviction.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ void GLCache_merge_segs(cache_t *cache, bucket_t *bucket, segment_t **segs) {
141141
// called when there is no segment can be merged due to fragmentation
142142
// different from clean_one_seg because this function also updates cache state
143143
int evict_one_seg(cache_t *cache, segment_t *seg) {
144-
VVERBOSE("req %lu, evict one seg id %d occupied size %lu/%lu\n", cache->n_req,
144+
VERBOSE("req %lu, evict one seg id %d occupied size %lu/%lu\n", cache->n_req,
145145
seg->seg_id, cache->occupied_byte, cache->cache_size);
146146
GLCache_params_t *params = cache->eviction_params;
147147
bucket_t *bucket = &params->buckets[seg->bucket_id];

‎libCacheSim/cache/eviction/LFU.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ static cache_obj_t *LFU_find(cache_t *cache, const request_t *req,
192192
memset(new_node, 0, sizeof(freq_node_t));
193193
new_node->freq = cache_obj->lfu.freq;
194194
g_hash_table_insert(params->freq_map, new_key, new_node);
195-
VVVERBOSE("allocate new %ld %d %p %p\n", new_node->freq, new_node->n_obj,
195+
VERBOSE("allocate new %ld %d %p %p\n", new_node->freq, new_node->n_obj,
196196
new_node->first_obj, new_node->last_obj);
197197
} else {
198198
// it could be new_node is empty

‎libCacheSim/cache/eviction/LFUDA.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ static cache_obj_t *LFUDA_find(cache_t *cache, const request_t *req,
181181
memset(new_node, 0, sizeof(freq_node_t));
182182
new_node->freq = cache_obj->lfu.freq;
183183
g_hash_table_insert(params->freq_map, new_key, new_node);
184-
VVVERBOSE("allocate new %ld %d %p %p\n", new_node->freq, new_node->n_obj,
184+
VERBOSE("allocate new %ld %d %p %p\n", new_node->freq, new_node->n_obj,
185185
new_node->first_obj, new_node->last_obj);
186186
} else {
187187
// it could be new_node is empty

‎libCacheSim/cache/eviction/LeCaR.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ static cache_obj_t *LeCaR_find(cache_t *cache, const request_t *req,
288288
* when remove_obj_from_freq_node */
289289
if (cache_obj->LeCaR.freq < params->min_freq) {
290290
params->min_freq = cache_obj->LeCaR.freq;
291-
VVERBOSE("update min freq to %d\n", (int)params->min_freq);
291+
VERBOSE("update min freq to %d\n", (int)params->min_freq);
292292
}
293293
}
294294

@@ -312,7 +312,7 @@ static cache_obj_t *LeCaR_find(cache_t *cache, const request_t *req,
312312
cache_obj_t *LeCaR_insert(cache_t *cache, const request_t *req) {
313313
LeCaR_params_t *params = (LeCaR_params_t *)(cache->eviction_params);
314314

315-
VVERBOSE("insert object %lu into cache\n", (unsigned long)req->obj_id);
315+
VERBOSE("insert object %lu into cache\n", (unsigned long)req->obj_id);
316316

317317
// LRU and hash table insert
318318
cache_obj_t *cache_obj = cache_insert_base(cache, req);
@@ -652,7 +652,7 @@ static inline void update_LFU_min_freq(LeCaR_params_t *params) {
652652
break;
653653
}
654654
}
655-
VVERBOSE("update LFU min freq from %ld to %ld\n", old_min_freq,
655+
VERBOSE("update LFU min freq from %ld to %ld\n", old_min_freq,
656656
params->min_freq);
657657
// if the object is the only object in the cache, we may have min_freq == 1
658658
DEBUG_ASSERT(params->min_freq > old_min_freq ||
@@ -682,19 +682,19 @@ static inline void remove_obj_from_freq_node(LeCaR_params_t *params,
682682
DEBUG_ASSERT(freq_node != NULL);
683683
DEBUG_ASSERT(freq_node->freq == cache_obj->LeCaR.freq);
684684
DEBUG_ASSERT(freq_node->n_obj > 0);
685-
VVERBOSE("remove object from freq node %p (freq %ld, %u obj)\n", freq_node,
685+
VERBOSE("remove object from freq node %p (freq %ld, %u obj)\n", freq_node,
686686
freq_node->freq, freq_node->n_obj);
687687
freq_node->n_obj--;
688688

689689
if (cache_obj == freq_node->first_obj) {
690-
VVVERBOSE("remove object from freq node --- object is the first object\n");
690+
VERBOSE("remove object from freq node --- object is the first object\n");
691691
freq_node->first_obj = cache_obj->LeCaR.lfu_next;
692692
if (cache_obj->LeCaR.lfu_next != NULL)
693693
((cache_obj_t *)(cache_obj->LeCaR.lfu_next))->LeCaR.lfu_prev = NULL;
694694
}
695695

696696
if (cache_obj == freq_node->last_obj) {
697-
VVVERBOSE("remove object from freq node --- object is the last object\n");
697+
VERBOSE("remove object from freq node --- object is the last object\n");
698698
freq_node->last_obj = cache_obj->LeCaR.lfu_prev;
699699
if (cache_obj->LeCaR.lfu_prev != NULL)
700700
((cache_obj_t *)(cache_obj->LeCaR.lfu_prev))->LeCaR.lfu_next = NULL;
@@ -787,7 +787,7 @@ static void verify_ghost_lru_integrity(cache_t *cache, LeCaR_params_t *params) {
787787
cur = cur->queue.next;
788788
}
789789

790-
VVVERBOSE(
790+
VERBOSE(
791791
"ghost entry head %p tail %p, "
792792
"ghost_entry_size from scan = %ld,"
793793
"lru_g_occupied_byte = %ld\n ",

‎libCacheSim/include/libCacheSim/const.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,11 @@ extern "C" {
3939
#define MAGENTA "\x1B[35m"
4040
#define CYAN "\x1B[36m"
4141

42-
#define VVVERBOSE_LEVEL 3
43-
#define VVERBOSE_LEVEL 4
4442
#define VERBOSE_LEVEL 5
4543
#define DEBUG_LEVEL 6
4644
#define INFO_LEVEL 7
4745
#define WARN_LEVEL 8
48-
#define SEVERE_LEVEL 9
46+
#define ERROR_LEVEL 9
4947

5048
// this is correct, to change to this, need to update test
5149
#define KiB 1024LL

‎libCacheSim/include/libCacheSim/logging.h‎

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,6 @@ extern pthread_mutex_t log_mtx;
2828
pthread_mutex_unlock(&log_mtx); \
2929
} while (0)
3030

31-
#if LOGLEVEL <= VVVERBOSE_LEVEL
32-
#define VVVERBOSE(...) LOGGING(VVVERBOSE_LEVEL, __VA_ARGS__)
33-
#else
34-
#define VVVERBOSE(...) \
35-
do { \
36-
} while (0)
37-
#endif
38-
39-
#if LOGLEVEL <= VVERBOSE_LEVEL
40-
#define VVERBOSE(...) LOGGING(VVERBOSE_LEVEL, __VA_ARGS__)
41-
#else
42-
#define VVERBOSE(...) \
43-
do { \
44-
} while (0)
45-
#endif
46-
4731
#if LOGLEVEL <= VERBOSE_LEVEL
4832
#define VERBOSE(...) LOGGING(VERBOSE_LEVEL, __VA_ARGS__)
4933
#else
@@ -76,11 +60,11 @@ extern pthread_mutex_t log_mtx;
7660
} while (0)
7761
#endif
7862

79-
#if LOGLEVEL <= SEVERE_LEVEL
80-
#define ERROR(...) \
81-
{ \
82-
LOGGING(SEVERE_LEVEL, __VA_ARGS__); \
83-
abort(); \
63+
#if LOGLEVEL <= ERROR_LEVEL
64+
#define ERROR(...) \
65+
{ \
66+
LOGGING(ERROR_LEVEL, __VA_ARGS__); \
67+
abort(); \
8468
}
8569
#else
8670
#define ERROR(...)
@@ -119,12 +103,6 @@ extern pthread_mutex_t log_mtx;
119103
static inline void log_header(int level, const char *file, int line) {
120104
int n;
121105
switch (level) {
122-
case VVVERBOSE_LEVEL:
123-
n = fprintf(stderr, "%s[VVV] ", CYAN);
124-
break;
125-
case VVERBOSE_LEVEL:
126-
n = fprintf(stderr, "%s[VV] ", CYAN);
127-
break;
128106
case VERBOSE_LEVEL:
129107
n = fprintf(stderr, "%s[VERB] ", MAGENTA);
130108
break;
@@ -137,7 +115,7 @@ static inline void log_header(int level, const char *file, int line) {
137115
case WARN_LEVEL:
138116
n = fprintf(stderr, "%s[WARN] ", YELLOW);
139117
break;
140-
case SEVERE_LEVEL:
118+
case ERROR_LEVEL:
141119
n = fprintf(stderr, "%s[ERROR] ", RED);
142120
break;
143121
default:

0 commit comments

Comments
 (0)