wayland: debug log prints IDs instead of controller ptr

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>

1 files changed, 28 insertions, 29 deletions

diff --git a/src/wayland.cpp b/src/wayland.cpp
index 8e089c3..92e152d 100644
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -394,50 +394,49 @@ void layer::set_render_order(std::vector<uint32_t> const &ro) {
 }
 
 void controller::layer_visibility(struct layer *l, int32_t visibility) {
-   logdebug("genivi::layer %s @ %p v %i", __func__, this->proxy.get(),
-            visibility);
+   logdebug("genivi::layer %s @ %d v %i", __func__, l->id, visibility);
    this->lprops[l->id].visibility = visibility;
 }
 
 void controller::layer_opacity(struct layer *l, float opacity) {
-   logdebug("genivi::layer %s @ %p o %f", __func__, this->proxy.get(), opacity);
+   logdebug("genivi::layer %s @ %d o %f", __func__, l->id, opacity);
    this->lprops[l->id].opacity = opacity;
 }
 
 void controller::layer_source_rectangle(struct layer *l, int32_t x, int32_t y,
                                         int32_t width, int32_t height) {
-   logdebug("genivi::layer %s @ %p x %i y %i w %i h %i", __func__,
-            this->proxy.get(), x, y, width, height);
+   logdebug("genivi::layer %s @ %d x %i y %i w %i h %i", __func__,
+            l->id, x, y, width, height);
    this->lprops[l->id].src_rect = rect{width, height, x, y};
 }
 
 void controller::layer_destination_rectangle(struct layer *l, int32_t x,
                                              int32_t y, int32_t width,
                                              int32_t height) {
-   logdebug("genivi::layer %s @ %p x %i y %i w %i h %i", __func__,
-            this->proxy.get(), x, y, width, height);
+   logdebug("genivi::layer %s @ %d x %i y %i w %i h %i", __func__,
+            l->id, x, y, width, height);
    this->lprops[l->id].dst_rect = rect{width, height, x, y};
 }
 
 void controller::layer_configuration(struct layer *l, int32_t width,
                                      int32_t height) {
-   logdebug("genivi::layer %s @ %p w %i h %i", __func__, this->proxy.get(),
+   logdebug("genivi::layer %s @ %d w %i h %i", __func__, l->id,
             width, height);
    this->lprops[l->id].size = size{uint32_t(width), uint32_t(height)};
 }
 
 void controller::layer_orientation(struct layer *l, int32_t orientation) {
-   logdebug("genivi::layer %s @ %p o %i", __func__, this->proxy.get(),
+   logdebug("genivi::layer %s @ %d o %i", __func__, l->id,
             orientation);
    this->lprops[l->id].orientation = orientation;
 }
 
-void controller::layer_screen(struct layer * /*l*/, struct wl_output *screen) {
-   logdebug("genivi::layer %s @ %p s %p", __func__, this->proxy.get(), screen);
+void controller::layer_screen(struct layer *l, struct wl_output *screen) {
+   logdebug("genivi::layer %s @ %d s %p", __func__, l->id, screen);
 }
 
 void controller::layer_destroyed(struct layer *l) {
-   logdebug("genivi::layer %s @ %p", __func__, this->proxy.get());
+   logdebug("genivi::layer %s @ %d", __func__, l->id);
    this->lprops.erase(l->id);
    this->layers.erase(l->id);
 }
@@ -547,7 +546,7 @@ constexpr struct ivi_controller_surface_listener surface_listener = {
 surface::surface(uint32_t i, struct controller *c)
    : wayland_proxy(ivi_controller_surface_create(c->proxy.get(), i),
                    [c, i](ivi_controller_surface *s) {
-                      logdebug("~surface surface %i @ %p", i, s);
+                      logdebug("~surface surface %i @ %d", i, s);
                       c->remove_proxy_to_id_mapping(s);
                       ivi_controller_surface_destroy(s, 1);
                    }),
@@ -598,13 +597,13 @@ void surface::destroy(int32_t destroy_scene_object) {
 }
 
 void controller::surface_visibility(struct surface *s, int32_t visibility) {
-   logdebug("genivi::surface %s @ %p v %i", __func__, this->proxy.get(),
+   logdebug("genivi::surface %s @ %d v %i", __func__, s->id,
             visibility);
    this->sprops[s->id].visibility = visibility;
 }
 
 void controller::surface_opacity(struct surface *s, float opacity) {
-   logdebug("genivi::surface %s @ %p o %f", __func__, this->proxy.get(),
+   logdebug("genivi::surface %s @ %d o %f", __func__, s->id,
             opacity);
    this->sprops[s->id].opacity = opacity;
 }
@@ -612,54 +611,54 @@ void controller::surface_opacity(struct surface *s, float opacity) {
 void controller::surface_source_rectangle(struct surface *s, int32_t x,
                                           int32_t y, int32_t width,
                                           int32_t height) {
-   logdebug("genivi::surface %s @ %p x %i y %i w %i h %i", __func__,
-            this->proxy.get(), x, y, width, height);
+   logdebug("genivi::surface %s @ %d x %i y %i w %i h %i", __func__,
+            s->id, x, y, width, height);
    this->sprops[s->id].src_rect = rect{width, height, x, y};
 }
 
 void controller::surface_destination_rectangle(struct surface *s, int32_t x,
                                                int32_t y, int32_t width,
                                                int32_t height) {
-   logdebug("genivi::surface %s @ %p x %i y %i w %i h %i", __func__,
-            this->proxy.get(), x, y, width, height);
+   logdebug("genivi::surface %s @ %d x %i y %i w %i h %i", __func__,
+            s->id, x, y, width, height);
    this->sprops[s->id].dst_rect = rect{width, height, x, y};
 }
 
 void controller::surface_configuration(struct surface *s, int32_t width,
                                        int32_t height) {
-   logdebug("genivi::surface %s @ %p w %i h %i", __func__, this->proxy.get(),
+   logdebug("genivi::surface %s @ %d w %i h %i", __func__, s->id,
             width, height);
    this->sprops[s->id].size = size{uint32_t(width), uint32_t(height)};
 }
 
 void controller::surface_orientation(struct surface *s, int32_t orientation) {
-   logdebug("genivi::surface %s @ %p o %i", __func__, this->proxy.get(),
+   logdebug("genivi::surface %s @ %d o %i", __func__, s->id,
             orientation);
    this->sprops[s->id].orientation = orientation;
 }
 
-void controller::surface_pixelformat(struct surface * /*s*/,
+void controller::surface_pixelformat(struct surface * s,
                                      int32_t pixelformat) {
-   logdebug("genivi::surface %s @ %p f %i", __func__, this->proxy.get(),
+   logdebug("genivi::surface %s @ %d f %i", __func__, s->id,
             pixelformat);
 }
 
-void controller::surface_layer(struct surface * /*s*/,
+void controller::surface_layer(struct surface * s,
                                struct ivi_controller_layer *layer) {
-   logdebug("genivi::surface %s @ %p l %u @ %p", __func__, this->proxy.get(),
+   logdebug("genivi::surface %s @ %d l %u @ %p", __func__, s->id,
             this->layer_proxy_to_id[uintptr_t(layer)], layer);
 }
 
-void controller::surface_stats(struct surface * /*s*/, uint32_t redraw_count,
+void controller::surface_stats(struct surface *s, uint32_t redraw_count,
                                uint32_t frame_count, uint32_t update_count,
                                uint32_t pid, const char *process_name) {
-   logdebug("genivi::surface %s @ %p r %u f %u u %u pid %u p %s", __func__,
+   logdebug("genivi::surface %s @ %d r %u f %u u %u pid %u p %s", __func__,
             this->proxy.get(), redraw_count, frame_count, update_count, pid,
             process_name);
 }
 
 void controller::surface_destroyed(struct surface *s) {
-   logdebug("genivi::surface %s @ %p", __func__, this->proxy.get());
+   logdebug("genivi::surface %s @ %d", __func__, s->id);
    this->chooks->surface_removed(s->id);
    // XXX: do I need to actually remove the surface late, i.e. using add_task()?
    this->sprops.erase(s->id);
@@ -667,7 +666,7 @@ void controller::surface_destroyed(struct surface *s) {
 }
 
 void controller::surface_content(struct surface *s, int32_t content_state) {
-   logdebug("genivi::surface %s @ %p s %i", __func__, this->proxy.get(),
+   logdebug("genivi::surface %s @ %d s %i", __func__, s->id,
             content_state);
    if (content_state == IVI_CONTROLLER_SURFACE_CONTENT_STATE_CONTENT_REMOVED) {
       // XXX is this the right thing to do?