hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 12:55:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make logging ninja friendly

Browse source 
When building with ninja instead of make __FILE__ will be relative
and logging therefore break. This moves stripping the path
from __FILE__ to runtime and handles a relative filepath as
well as a full one.
This commit is contained in:
nyorain 2017-06-19 20:01:35 +02:00
parent 325a331425
commit acbc0a019a
2 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
common/log.c
View file

@ -58,3 +58,29 @@ void _wlr_log(log_importance_t verbosity, const char *fmt, ...) {
log_callback(verbosity, fmt, args);
va_end(args);
}
// strips the path prefix from filepath
// will try to strip WLR_SRC_DIR as well as a relative src dir
// e.g. '/src/build/wlroots/backend/wayland/backend.c' and
// '../backend/wayland/backend.c' will both be stripped to
// 'backend/wayland/backend.c'
const char *_strip_path(const char *filepath) {
const char *srcit = WLR_SRC_DIR;
const char *fileit = filepath;
// remove WLR_SRC_DIR prefix
while(*fileit != '\0' && *srcit != '\0' && *fileit == *srcit) {
++fileit;
++srcit;
}
if(fileit != filepath) {
++fileit;
}
// remove relative prefix
while(*fileit == '.' || *fileit == '/') {
++fileit;
}
return fileit;
}

5
include/common/log.h
View file

@ -13,12 +13,13 @@
void _wlr_log(log_importance_t verbosity, const char *format, ...) ATTRIB_PRINTF(2, 3);
void _wlr_vlog(log_importance_t verbosity, const char *format, va_list args) ATTRIB_PRINTF(2, 0);
const char *_strip_path(const char *filepath);
#define wlr_log(verb, fmt, ...) \
_wlr_log(verb, "[%s:%d] " fmt, __FILE__ + strlen(WLR_SRC_DIR) + 1, __LINE__, ##__VA_ARGS__)
_wlr_log(verb, "[%s:%d] " fmt, _strip_path(__FILE__), __LINE__, ##__VA_ARGS__)
#define wlr_vlog(verb, fmt, args) \
_wlr_vlog(verb, "[%s:%d] " fmt, __FILE__ + strlen(WLR_SRC_DIR) + 1, __LINE__, args)
_wlr_vlog(verb, "[%s:%d] " fmt, _strip_path(__FILE__), __LINE__, args)
#define wlr_log_errno(verb, fmt, ...) \
wlr_log(verb, fmt ": %s", ##__VA_ARGS__, strerror(errno))