Use -fmacro-prefix-map to strip build path

Because meson does not provide a simple way to get the relative build
path, it is computed with a pair of foreach loops. As meson does not
have a simple way to compute string length (except via underscorify
and 63 split operations), the build script uses a shell command
instead.

If the compiler does not suppot -fmacro-prefix-map, then fall back
to passing in the relative path prefix, and use its length to offset
the uses of __FILE__ in log messages so that the build path is at
least still not included in the logs. This is significantly more
efficient than calling _sway_strip_path.

3 files changed, 48 insertions, 25 deletions

diff --git a/common/log.c b/common/log.c
index 669fd360..17648e44 100644
--- a/common/log.c
+++ b/common/log.c
@@ -93,20 +93,3 @@ void _sway_log(sway_log_importance_t verbosity, const char *fmt, ...) {
         sway_log_stderr(verbosity, fmt, args);
         va_end(args);
 }
-
-// strips the path prefix from filepath
-// will try to strip SWAY_SRC_DIR as well as a relative src dir
-// e.g. '/src/build/sway/util/log.c' and
-// '../util/log.c' will both be stripped to
-// 'util/log.c'
-const char *_sway_strip_path(const char *filepath) {
-        static int srclen = sizeof(SWAY_SRC_DIR);
-        if (strstr(filepath, SWAY_SRC_DIR) == filepath) {
-                filepath += srclen;
-        } else if (*filepath == '.') {
-                while (*filepath == '.' || *filepath == '/') {
-                        ++filepath;
-                }
-        }
-        return filepath;
-}
diff --git a/include/log.h b/include/log.h
index adf431ab..41399a9f 100644
--- a/include/log.h
+++ b/include/log.h
@@ -33,22 +33,26 @@ void _sway_vlog(sway_log_importance_t verbosity, const char *format, va_list arg
 void _sway_abort(const char *filename, ...) ATTRIB_PRINTF(1, 2);
 bool _sway_assert(bool condition, const char* format, ...) ATTRIB_PRINTF(2, 3);
 
-// TODO: get meson to precompute this, for better reproducibility/less overhead
-const char *_sway_strip_path(const char *filepath);
+#ifdef SWAY_REL_SRC_DIR
+// strip prefix from __FILE__, leaving the path relative to the project root
+#define _SWAY_FILENAME ((const char *)__FILE__ + sizeof(SWAY_REL_SRC_DIR) - 1)
+#else
+#define _SWAY_FILENAME __FILE__
+#endif
 
 #define sway_log(verb, fmt, ...) \
-        _sway_log(verb, "[%s:%d] " fmt, _sway_strip_path(__FILE__), __LINE__, ##__VA_ARGS__)
+        _sway_log(verb, "[%s:%d] " fmt, _SWAY_FILENAME, __LINE__, ##__VA_ARGS__)
 
 #define sway_vlog(verb, fmt, args) \
-        _sway_vlog(verb, "[%s:%d] " fmt, _sway_strip_path(__FILE__), __LINE__, args)
+        _sway_vlog(verb, "[%s:%d] " fmt, _SWAY_FILENAME, __LINE__, args)
 
 #define sway_log_errno(verb, fmt, ...) \
         sway_log(verb, fmt ": %s", ##__VA_ARGS__, strerror(errno))
 
 #define sway_abort(FMT, ...) \
-        _sway_abort("[%s:%d] " FMT, _sway_strip_path(__FILE__), __LINE__, ##__VA_ARGS__)
+        _sway_abort("[%s:%d] " FMT, _SWAY_FILENAME, __LINE__, ##__VA_ARGS__)
 
 #define sway_assert(COND, FMT, ...) \
-        _sway_assert(COND, "[%s:%d] %s:" FMT, _sway_strip_path(__FILE__), __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__)
+        _sway_assert(COND, "[%s:%d] %s:" FMT, _SWAY_FILENAME, __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__)
 
 #endif
diff --git a/meson.build b/meson.build
index f657f874..eb5039ee 100644
--- a/meson.build
+++ b/meson.build
@@ -13,8 +13,6 @@ project(
 
 add_project_arguments(
         [
-                '-DSWAY_SRC_DIR="@0@"'.format(meson.current_source_dir()),
-
                 '-DWL_HIDE_DEPRECATED',
                 '-DWLR_USE_UNSTABLE',
 
@@ -142,6 +140,44 @@ if git.found()
 endif
 add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c')
 
+# Compute the relative path used by compiler invocations.
+source_root = meson.current_source_dir().split('/')
+build_root = meson.build_root().split('/')
+relative_dir_parts = []
+i = 0
+in_prefix = true
+foreach p : build_root
+        if i >= source_root.length() or not in_prefix or p != source_root[i]
+                in_prefix = false
+                relative_dir_parts += '..'
+        endif
+        i += 1
+endforeach
+i = 0
+in_prefix = true
+foreach p : source_root
+        if i >= build_root.length() or not in_prefix or build_root[i] != p
+                in_prefix = false
+                relative_dir_parts += p
+        endif
+        i += 1
+endforeach
+relative_dir = join_paths(relative_dir_parts) + '/'
+
+# Strip relative path prefixes from the code if possible, otherwise hide them.
+if cc.has_argument('-fmacro-prefix-map=/prefix/to/hide=')
+        add_project_arguments(
+                '-fmacro-prefix-map=@0@='.format(relative_dir),
+                language: 'c',
+        )
+else
+        add_project_arguments(
+                '-DSWAY_REL_SRC_DIR="@0@"'.format(relative_dir),
+                language: 'c',
+        )
+endif
+
+
 sway_inc = include_directories('include')
 
 subdir('include')