logging: use filename for logging instead of FILE_DESCR

- remove FILE_DESCR macro and all uses
- log using `filename.c: ..." instead
- use `-fmacro-prefix-map` for removing the `../src/` start of the `__FILE__` macro
- nonportable for now

Author: ardera

CMakeLists.txt

@@ -381,6 +381,9 @@ endif()
 
 configure_file(config.h.in config.h @ONLY)
 
+# TODO: Make this portable
+target_compile_options(flutterpi_module PRIVATE "-fmacro-prefix-map=../src/=")
+
 # Actual flutter-pi executable.
 add_executable(
   flutter-pi

src/compositor_ng.c

@@ -50,8 +50,6 @@
     #include "vk_renderer.h"
 #endif
 
-FILE_DESCR("compositor-ng")
-
 /**
  * @brief A nicer, ref-counted version of the FlutterLayer's passed by the engine to the present layer callback.
  *

src/dmabuf_surface.c

@@ -47,8 +47,6 @@
 
 #include "config.h"
 
-FILE_DESCR("dmabuf surface")
-
 struct refcounted_dmabuf {
     refcount_t n_refs;
     struct dmabuf buf;

src/egl_gbm_render_surface.c

@@ -23,8 +23,6 @@
 #include "tracer.h"
 #include "util/collection.h"
 
-FILE_DESCR("EGL/GBM render surface")
-
 struct egl_gbm_render_surface;
 
 struct locked_fb {

src/event_loop.c

@@ -19,8 +19,6 @@ struct evloop {
     pthread_t owning_thread;
 };
 
-FILE_DESCR("event_loop.c")
-
 DEFINE_STATIC_LOCK_OPS(evloop, mutex)
 
 static int on_wakeup_event_loop(sd_event_source *s, int fd, uint32_t revents, void *userdata) {

src/filesystem_layout.c

@@ -19,8 +19,6 @@
 #include "flutter-pi.h"
 #include "util/collection.h"
 
-FILE_DESCR("fs layout")
-
 static bool path_exists(const char *path) {
     return access(path, R_OK) == 0;
 }

src/flutter-pi.c

@@ -76,8 +76,6 @@
     #include <mcheck.h>
 #endif
 
-FILE_DESCR("flutter-pi")
-
 #define PIXFMT_ARG_NAME(_name, _arg_name, ...) _arg_name ", "
 
 const char *const usage =

src/gl_renderer.c

@@ -19,8 +19,6 @@
 #include "tracer.h"
 #include "util/collection.h"
 
-FILE_DESCR("EGL/GL renderer")
-
 struct gl_renderer {
     refcount_t n_refs;
 

src/keyboard.c

@@ -22,8 +22,6 @@
 
 #include "util/collection.h"
 
-FILE_DESCR("keyboard")
-
 static int find_var_offset_in_string(const char *varname, const char *buffer, regmatch_t *match) {
     regmatch_t matches[2];
     char *pattern;

src/modesetting.c

@@ -21,8 +21,6 @@
 #include "util/list.h"
 #include "util/macros.h"
 
-FILE_DESCR("modesetting")
-
 struct drm_fb {
     struct list_head entry;
 

src/platformchannel.c

@@ -14,8 +14,6 @@
 #include "flutter-pi.h"
 #include "jsmn.h"
 
-FILE_DESCR("platform messages")
-
 struct platch_msg_resp_handler_data {
     enum platch_codec codec;
     platch_msg_resp_callback on_response;

src/pluginregistry.c

@@ -19,8 +19,6 @@
 #include "util/collection.h"
 #include "util/dynarray.h"
 
-FILE_DESCR("plugin registry")
-
 /**
  * @brief details of a plugin for flutter-pi.
  *

src/plugins/audioplayers/player.c

@@ -9,8 +9,6 @@
 #include "platformchannel.h"
 #include "plugins/audioplayers.h"
 
-FILE_DESCR("audioplayers player")
-
 struct audio_player {
     GstElement *playbin;
     GstBus *bus;

src/plugins/audioplayers/plugin.c

@@ -6,8 +6,6 @@
 #include "plugins/audioplayers.h"
 #include "util/collection.h"
 
-FILE_DESCR("audioplayers plugin")
-
 #define AUDIOPLAYERS_LOCAL_CHANNEL "xyz.luan/audioplayers"
 #define AUDIOPLAYERS_GLOBAL_CHANNEL "xyz.luan/audioplayers.global"
 

src/plugins/gstreamer_video_player/frame.c

@@ -14,11 +14,8 @@
 #include "texture_registry.h"
 
 // This will error if we don't have EGL / OpenGL ES support.
-#include "plugins/gstreamer_video_player.h"
-
 #include "gl_renderer.h"
-
-FILE_DESCR("gstreamer video_player")
+#include "plugins/gstreamer_video_player.h"
 
 #define MAX_N_PLANES 4
 
@@ -202,16 +199,16 @@ struct frame_interface *frame_interface_new(struct gl_renderer *renderer) {
     }
 
     if (gl_renderer_supports_egl_extension(renderer, "EGL_EXT_image_dma_buf_import_modifiers")) {
-        #ifdef EGL_EXT_image_dma_buf_import_modifiers
-            LOG_ERROR(
-                "EGL supports EGL_EXT_image_dma_buf_import_modifiers, "
-                "but EGL headers didn't contain definitions for EGL_EXT_image_dma_buf_import_modifiers."
-                "Extended imports and pixel format information will not be used.\n"
-            );
-            supports_extended_imports = false;
-        #else
-            supports_extended_imports = true;
-        #endif
+#ifdef EGL_EXT_image_dma_buf_import_modifiers
+        LOG_ERROR(
+            "EGL supports EGL_EXT_image_dma_buf_import_modifiers, "
+            "but EGL headers didn't contain definitions for EGL_EXT_image_dma_buf_import_modifiers."
+            "Extended imports and pixel format information will not be used.\n"
+        );
+        supports_extended_imports = false;
+#else
+        supports_extended_imports = true;
+#endif
     } else {
         supports_extended_imports = false;
     }
@@ -254,13 +251,15 @@ struct frame_interface *frame_interface_new(struct gl_renderer *renderer) {
     // These two are optional.
     // Might be useful in the future.
 #ifdef EGL_EXT_image_dma_buf_import_modifiers
-    PFNEGLQUERYDMABUFFORMATSEXTPROC egl_query_dmabuf_formats = (PFNEGLQUERYDMABUFFORMATSEXTPROC) gl_renderer_get_proc_address(renderer, "eglQueryDmaBufFormatsEXT");
+    PFNEGLQUERYDMABUFFORMATSEXTPROC egl_query_dmabuf_formats = (PFNEGLQUERYDMABUFFORMATSEXTPROC
+    ) gl_renderer_get_proc_address(renderer, "eglQueryDmaBufFormatsEXT");
     if (egl_query_dmabuf_formats == NULL && supports_extended_imports) {
         LOG_ERROR("Could not resolve eglQueryDmaBufFormatsEXT egl procedure, even though it is listed as supported.\n");
         supports_extended_imports = false;
     }
 
-    PFNEGLQUERYDMABUFMODIFIERSEXTPROC egl_query_dmabuf_modifiers = (PFNEGLQUERYDMABUFMODIFIERSEXTPROC) gl_renderer_get_proc_address(renderer, "eglQueryDmaBufModifiersEXT");
+    PFNEGLQUERYDMABUFMODIFIERSEXTPROC egl_query_dmabuf_modifiers = (PFNEGLQUERYDMABUFMODIFIERSEXTPROC
+    ) gl_renderer_get_proc_address(renderer, "eglQueryDmaBufModifiersEXT");
     if (egl_query_dmabuf_modifiers == NULL && supports_extended_imports) {
         LOG_ERROR("Could not resolve eglQueryDmaBufModifiersEXT egl procedure, even though it is listed as supported.\n");
         supports_extended_imports = false;
@@ -274,11 +273,11 @@ struct frame_interface *frame_interface_new(struct gl_renderer *renderer) {
     }
 
     if (supports_extended_imports) {
-        #ifdef EGL_EXT_image_dma_buf_import_modifiers
-            query_formats(display, egl_query_dmabuf_formats, egl_query_dmabuf_modifiers, &n_formats, &formats);
-        #else
-            UNREACHABLE();
-        #endif
+#ifdef EGL_EXT_image_dma_buf_import_modifiers
+        query_formats(display, egl_query_dmabuf_formats, egl_query_dmabuf_modifiers, &n_formats, &formats);
+#else
+        UNREACHABLE();
+#endif
     } else {
         n_formats = 0;
         formats = NULL;
@@ -899,9 +898,9 @@ struct video_frame *frame_new(struct frame_interface *interface, GstSample *samp
     // Start putting together the EGL attributes.
     attr_index = 0;
 
-    #ifndef EGL_EXT_image_dma_buf_import
-        #error "EGL header definitions for extension EGL_EXT_image_dma_buf_import are required."
-    #endif
+#ifndef EGL_EXT_image_dma_buf_import
+    #error "EGL header definitions for extension EGL_EXT_image_dma_buf_import are required."
+#endif
 
     // first, put some of our basic attributes like
     // frame size and format
@@ -935,12 +934,12 @@ struct video_frame *frame_new(struct frame_interface *interface, GstSample *samp
     PUT_ATTR(EGL_DMA_BUF_PLANE0_PITCH_EXT, planes[0].pitch);
     if (planes[0].has_modifier) {
         if (interface->supports_extended_imports) {
-            #ifdef EGL_EXT_image_dma_buf_import_modifiers
-                PUT_ATTR(EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT, uint32_to_int32(planes[0].modifier & 0xFFFFFFFFlu));
-                PUT_ATTR(EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT, uint32_to_int32(planes[0].modifier >> 32));
-            #else
-                UNREACHABLE();
-            #endif
+#ifdef EGL_EXT_image_dma_buf_import_modifiers
+            PUT_ATTR(EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT, uint32_to_int32(planes[0].modifier & 0xFFFFFFFFlu));
+            PUT_ATTR(EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT, uint32_to_int32(planes[0].modifier >> 32));
+#else
+            UNREACHABLE();
+#endif
         } else {
             LOG_ERROR(
                 "video frame buffer uses modified format but EGL doesn't support the EGL_EXT_image_dma_buf_import_modifiers extension.\n"
@@ -956,12 +955,12 @@ struct video_frame *frame_new(struct frame_interface *interface, GstSample *samp
         PUT_ATTR(EGL_DMA_BUF_PLANE1_PITCH_EXT, planes[1].pitch);
         if (planes[1].has_modifier) {
             if (interface->supports_extended_imports) {
-                #ifdef EGL_EXT_image_dma_buf_import_modifiers
-                    PUT_ATTR(EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT, uint32_to_int32(planes[1].modifier & 0xFFFFFFFFlu));
-                    PUT_ATTR(EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT, uint32_to_int32(planes[1].modifier >> 32));
-                #else
-                    UNREACHABLE();
-                #endif
+#ifdef EGL_EXT_image_dma_buf_import_modifiers
+                PUT_ATTR(EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT, uint32_to_int32(planes[1].modifier & 0xFFFFFFFFlu));
+                PUT_ATTR(EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT, uint32_to_int32(planes[1].modifier >> 32));
+#else
+                UNREACHABLE();
+#endif
             } else {
                 LOG_ERROR(
                     "video frame buffer uses modified format but EGL doesn't support the EGL_EXT_image_dma_buf_import_modifiers "
@@ -979,12 +978,12 @@ struct video_frame *frame_new(struct frame_interface *interface, GstSample *samp
         PUT_ATTR(EGL_DMA_BUF_PLANE2_PITCH_EXT, planes[2].pitch);
         if (planes[2].has_modifier) {
             if (interface->supports_extended_imports) {
-                #ifdef EGL_EXT_image_dma_buf_import_modifiers
-                    PUT_ATTR(EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT, uint32_to_int32(planes[2].modifier & 0xFFFFFFFFlu));
-                    PUT_ATTR(EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT, uint32_to_int32(planes[2].modifier >> 32));
-                #else
-                    UNREACHABLE();
-                #endif
+#ifdef EGL_EXT_image_dma_buf_import_modifiers
+                PUT_ATTR(EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT, uint32_to_int32(planes[2].modifier & 0xFFFFFFFFlu));
+                PUT_ATTR(EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT, uint32_to_int32(planes[2].modifier >> 32));
+#else
+                UNREACHABLE();
+#endif
             } else {
                 LOG_ERROR(
                     "video frame buffer uses modified format but EGL doesn't support the EGL_EXT_image_dma_buf_import_modifiers "
@@ -1005,17 +1004,17 @@ struct video_frame *frame_new(struct frame_interface *interface, GstSample *samp
             goto fail_release_planes;
         }
 
-        #ifdef EGL_EXT_image_dma_buf_import_modifiers
-            PUT_ATTR(EGL_DMA_BUF_PLANE3_FD_EXT, planes[3].fd);
-            PUT_ATTR(EGL_DMA_BUF_PLANE3_OFFSET_EXT, planes[3].offset);
-            PUT_ATTR(EGL_DMA_BUF_PLANE3_PITCH_EXT, planes[3].pitch);
-            if (planes[3].has_modifier) {
-                PUT_ATTR(EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT, uint32_to_int32(planes[3].modifier & 0xFFFFFFFFlu));
-                PUT_ATTR(EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT, uint32_to_int32(planes[3].modifier >> 32));
-            }
-        #else
-            UNREACHABLE();
-        #endif
+#ifdef EGL_EXT_image_dma_buf_import_modifiers
+        PUT_ATTR(EGL_DMA_BUF_PLANE3_FD_EXT, planes[3].fd);
+        PUT_ATTR(EGL_DMA_BUF_PLANE3_OFFSET_EXT, planes[3].offset);
+        PUT_ATTR(EGL_DMA_BUF_PLANE3_PITCH_EXT, planes[3].pitch);
+        if (planes[3].has_modifier) {
+            PUT_ATTR(EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT, uint32_to_int32(planes[3].modifier & 0xFFFFFFFFlu));
+            PUT_ATTR(EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT, uint32_to_int32(planes[3].modifier >> 32));
+        }
+#else
+        UNREACHABLE();
+#endif
     }
 
     assert(attr_index < ARRAY_SIZE(attributes));

src/plugins/gstreamer_video_player/player.c

@@ -23,8 +23,6 @@
 #include "texture_registry.h"
 #include "util/collection.h"
 
-FILE_DESCR("gstreamer video_player")
-
 #ifdef DEBUG
     #define DEBUG_TRACE_BEGIN(player, name) trace_begin(player, name)
     #define DEBUG_TRACE_END(player, name) trace_end(player, name)

src/plugins/gstreamer_video_player/plugin.c

@@ -18,8 +18,6 @@
 #include "texture_registry.h"
 #include "util/collection.h"
 
-FILE_DESCR("gstreamer video_player plugin")
-
 enum data_source_type { kDataSourceTypeAsset, kDataSourceTypeNetwork, kDataSourceTypeFile, kDataSourceTypeContentUri };
 
 struct gstplayer_meta {

src/render_surface.c

@@ -19,8 +19,6 @@
 #include "tracer.h"
 #include "util/collection.h"
 
-FILE_DESCR("flutter render surface")
-
 // just so we can be sure &render_surface->surface is the same as (struct surface*) render_surface
 COMPILE_ASSERT(offsetof(struct render_surface, surface) == 0);
 

src/surface.c

@@ -21,8 +21,6 @@
 #include "tracer.h"
 #include "util/collection.h"
 
-FILE_DESCR("rendering surfaces")
-
 void surface_deinit(struct surface *s);
 
 #ifdef DEBUG

src/texture_registry.c

@@ -11,8 +11,6 @@
 
 #include "flutter-pi.h"
 
-FILE_DESCR("texture registry")
-
 struct texture_registry {
     struct texture_registry_interface interface;
     void *userdata;

src/tracer.c

@@ -13,8 +13,6 @@
 
 #include "util/collection.h"
 
-FILE_DESCR("tracing")
-
 struct tracer {
     refcount_t n_refs;
     atomic_bool has_cbs;

src/user_input.c

@@ -19,8 +19,6 @@
 #include "keyboard.h"
 #include "util/collection.h"
 
-FILE_DESCR("user input")
-
 #define LIBINPUT_VER(major, minor, patch) ((((major) &0xFF) << 16) | (((minor) &0xFF) << 8) | ((patch) &0xFF))
 #define THIS_LIBINPUT_VER LIBINPUT_VER(LIBINPUT_VERSION_MAJOR, LIBINPUT_VERSION_MINOR, LIBINPUT_VERSION_PATCH)