From 112a585f5d172592e5b1da895d3fd85b9b852e08 Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Tue, 27 Jun 2017 15:50:32 +0200 Subject: [PATCH] wayland: unique_ptr'd wayland_proxy Signed-off-by: Marcus Fritzsch --- src/wayland.cpp | 192 +++++++++++++++++++++++++++++--------------------------- src/wayland.hpp | 35 +++++------ 2 files changed, 117 insertions(+), 110 deletions(-) diff --git a/src/wayland.cpp b/src/wayland.cpp index c50a7be..baec1e3 100644 --- a/src/wayland.cpp +++ b/src/wayland.cpp @@ -64,7 +64,7 @@ constexpr struct wl_registry_listener registry_listener = { registry::registry(struct wl_display *d) : wayland_proxy(d == nullptr ? nullptr : wl_display_get_registry(d)) { if (this->proxy != nullptr) { - wl_registry_add_listener(this->proxy, ®istry_listener, this); + wl_registry_add_listener(this->proxy.get(), ®istry_listener, this); } } @@ -75,10 +75,10 @@ void registry::add_global_handler(char const *iface, binder bind) { void registry::global(uint32_t name, char const *iface, uint32_t v) { auto b = this->bindings.find(iface); if (b != this->bindings.end()) { - b->second(this->proxy, name, v); + b->second(this->proxy.get(), name, v); } - logdebug("wl::registry @ %p global n %u i %s v %u", this->proxy, name, iface, - v); + logdebug("wl::registry @ %p global n %u i %s v %u", this->proxy.get(), name, + iface, v); } void registry::global_remove(uint32_t /*name*/) {} @@ -118,7 +118,7 @@ constexpr struct wl_output_listener output_listener = { output::output(struct wl_registry *r, uint32_t name, uint32_t v) : wayland_proxy(wl_registry_bind(r, name, &wl_output_interface, v)) { - wl_output_add_listener(this->proxy, &output_listener, this); + wl_output_add_listener(this->proxy.get(), &output_listener, this); } void output::geometry(int32_t x, int32_t y, int32_t pw, int32_t ph, @@ -126,12 +126,12 @@ void output::geometry(int32_t x, int32_t y, int32_t pw, int32_t ph, int32_t tx) { logdebug( "wl::output %s @ %p x %i y %i w %i h %i spel %x make %s model %s tx %i", - __func__, this->proxy, x, y, pw, ph, subpel, make, model, tx); + __func__, this->proxy.get(), x, y, pw, ph, subpel, make, model, tx); } void output::mode(uint32_t flags, int32_t w, int32_t h, int32_t r) { - logdebug("wl::output %s @ %p f %x w %i h %i r %i", __func__, this->proxy, - flags, w, h, r); + logdebug("wl::output %s @ %p f %x w %i h %i r %i", __func__, + this->proxy.get(), flags, w, h, r); if ((flags & WL_OUTPUT_MODE_CURRENT) != 0u) { this->width = w; this->height = h; @@ -140,11 +140,11 @@ void output::mode(uint32_t flags, int32_t w, int32_t h, int32_t r) { } void output::done() { - logdebug("wl::output %s @ %p done", __func__, this->proxy); + logdebug("wl::output %s @ %p done", __func__, this->proxy.get()); } void output::scale(int32_t factor) { - logdebug("wl::output %s @ %p f %i", __func__, this->proxy, factor); + logdebug("wl::output %s @ %p f %i", __func__, this->proxy.get(), factor); } } // namespace wl @@ -206,7 +206,7 @@ controller::controller(struct wl_registry *r, uint32_t name, uint32_t version) screens{}, pending{}, output_size{} { - ivi_controller_add_listener(this->proxy, &listener, this); + ivi_controller_add_listener(this->proxy.get(), &listener, this); } void controller::layer_create(uint32_t id, int32_t w, int32_t h) { @@ -219,19 +219,20 @@ void controller::surface_create(uint32_t id) { void controller::controller_screen(uint32_t id, struct ivi_controller_screen *screen) { - logdebug("genivi::controller @ %p screen %u (%x) @ %p", this->proxy, id, id, - screen); + logdebug("genivi::controller @ %p screen %u (%x) @ %p", this->proxy.get(), + id, id, screen); this->screens[id] = std::make_unique(id, this, screen); } void controller::controller_layer(uint32_t id) { - logdebug("genivi::controller @ %p layer %u (%x)", this->proxy, id, id); + logdebug("genivi::controller @ %p layer %u (%x)", this->proxy.get(), id, id); auto &l = this->layers[id] = std::make_unique(id, this); l->clear_surfaces(); } void controller::controller_surface(uint32_t id) { - logdebug("genivi::controller @ %p surface %u (%x)", this->proxy, id, id); + logdebug("genivi::controller @ %p surface %u (%x)", this->proxy.get(), id, + id); this->surfaces[id] = std::make_unique(id, this); add_task("fullscreen surface", [id](struct controller *c) { @@ -246,8 +247,8 @@ void controller::controller_surface(uint32_t id) { void controller::controller_error(int32_t object_id, int32_t object_type, int32_t error_code, const char *error_text) { - logdebug("genivi::controller @ %p error o %i t %i c %i text %s", this->proxy, - object_id, object_type, error_code, error_text); + logdebug("genivi::controller @ %p error o %i t %i c %i text %s", + this->proxy.get(), object_id, object_type, error_code, error_text); } // _ @@ -323,7 +324,12 @@ constexpr struct ivi_controller_layer_listener layer_listener = { layer::layer(uint32_t i, struct controller *c) : layer(i, 0, 0, c) {} layer::layer(uint32_t i, int32_t w, int32_t h, struct controller *c) - : wayland_proxy(ivi_controller_layer_create(c->proxy, i, w, h)), + : wayland_proxy(ivi_controller_layer_create(c->proxy.get(), i, w, h), + [c, i](ivi_controller_layer *l) { + logdebug("~layer layer %i @ %p", i, l); + c->remove_proxy_to_id_mapping(l); + ivi_controller_layer_destroy(l, 1); + }), controller_child(c, i), dst_rect{}, src_rect{}, @@ -331,58 +337,52 @@ layer::layer(uint32_t i, int32_t w, int32_t h, struct controller *c) orientation{}, visibility{}, opacity{} { - this->parent->add_proxy_to_id_mapping(this->proxy, i); - ivi_controller_layer_add_listener(this->proxy, &layer_listener, this); -} - -layer::~layer() { - logdebug("%s layer %i @ %p", __func__, this->id, this->proxy); - this->parent->remove_proxy_to_id_mapping(this->proxy); - ivi_controller_layer_destroy(this->proxy, 1); - this->proxy = nullptr; + this->parent->add_proxy_to_id_mapping(this->proxy.get(), i); + ivi_controller_layer_add_listener(this->proxy.get(), &layer_listener, this); } void layer::set_visibility(uint32_t visibility) { - ivi_controller_layer_set_visibility(this->proxy, visibility); + ivi_controller_layer_set_visibility(this->proxy.get(), visibility); } void layer::set_opacity(wl_fixed_t opacity) { - ivi_controller_layer_set_opacity(this->proxy, opacity); + ivi_controller_layer_set_opacity(this->proxy.get(), opacity); } void layer::set_source_rectangle(int32_t x, int32_t y, int32_t width, int32_t height) { - ivi_controller_layer_set_source_rectangle(this->proxy, x, y, width, height); + ivi_controller_layer_set_source_rectangle(this->proxy.get(), x, y, width, + height); } void layer::set_destination_rectangle(int32_t x, int32_t y, int32_t width, int32_t height) { - ivi_controller_layer_set_destination_rectangle(this->proxy, x, y, width, - height); + ivi_controller_layer_set_destination_rectangle(this->proxy.get(), x, y, + width, height); } void layer::set_configuration(int32_t width, int32_t height) { - ivi_controller_layer_set_configuration(this->proxy, width, height); + ivi_controller_layer_set_configuration(this->proxy.get(), width, height); } void layer::set_orientation(int32_t orientation) { - ivi_controller_layer_set_orientation(this->proxy, orientation); + ivi_controller_layer_set_orientation(this->proxy.get(), orientation); } void layer::screenshot(const char *filename) { - ivi_controller_layer_screenshot(this->proxy, filename); + ivi_controller_layer_screenshot(this->proxy.get(), filename); } void layer::clear_surfaces() { - ivi_controller_layer_clear_surfaces(this->proxy); + ivi_controller_layer_clear_surfaces(this->proxy.get()); } void layer::add_surface(struct surface *surface) { - ivi_controller_layer_add_surface(this->proxy, surface->proxy); + ivi_controller_layer_add_surface(this->proxy.get(), surface->proxy.get()); } void layer::remove_surface(struct surface *surface) { - ivi_controller_layer_remove_surface(this->proxy, surface->proxy); + ivi_controller_layer_remove_surface(this->proxy.get(), surface->proxy.get()); } void layer::set_render_order(std::vector const &ro) { @@ -390,51 +390,53 @@ void layer::set_render_order(std::vector const &ro) { .size = ro.size() * sizeof(ro[0]), .alloc = ro.capacity() * sizeof(ro[0]), .data = const_cast(static_cast(ro.data())) }; - ivi_controller_layer_set_render_order(this->proxy, &wlro); + ivi_controller_layer_set_render_order(this->proxy.get(), &wlro); } void controller::layer_visibility(uint32_t id, int32_t visibility) { - logdebug("genivi::layer %s @ %p v %i", __func__, this->proxy, visibility); + logdebug("genivi::layer %s @ %p v %i", __func__, this->proxy.get(), + visibility); this->layers[id]->visibility = visibility; } void controller::layer_opacity(uint32_t id, float opacity) { - logdebug("genivi::layer %s @ %p o %f", __func__, this->proxy, opacity); + logdebug("genivi::layer %s @ %p o %f", __func__, this->proxy.get(), opacity); this->layers[id]->opacity = opacity; } void controller::layer_source_rectangle(uint32_t id, 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, - x, y, width, height); + logdebug("genivi::layer %s @ %p x %i y %i w %i h %i", __func__, + this->proxy.get(), x, y, width, height); this->layers[id]->src_rect = rect{uint32_t(width), uint32_t(height), x, y}; } void controller::layer_destination_rectangle(uint32_t id, 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, - x, y, width, height); + logdebug("genivi::layer %s @ %p x %i y %i w %i h %i", __func__, + this->proxy.get(), x, y, width, height); this->layers[id]->dst_rect = rect{uint32_t(width), uint32_t(height), x, y}; } void controller::layer_configuration(uint32_t id, int32_t width, int32_t height) { - logdebug("genivi::layer %s @ %p w %i h %i", __func__, this->proxy, width, - height); + logdebug("genivi::layer %s @ %p w %i h %i", __func__, this->proxy.get(), + width, height); this->layers[id]->size = size{uint32_t(width), uint32_t(height)}; } void controller::layer_orientation(uint32_t id, int32_t orientation) { - logdebug("genivi::layer %s @ %p o %i", __func__, this->proxy, orientation); + logdebug("genivi::layer %s @ %p o %i", __func__, this->proxy.get(), + orientation); this->layers[id]->orientation = orientation; } void controller::layer_screen(uint32_t /*id*/, struct wl_output *screen) { - logdebug("genivi::layer %s @ %p s %p", __func__, this->proxy, screen); + logdebug("genivi::layer %s @ %p s %p", __func__, this->proxy.get(), screen); } void controller::layer_destroyed(uint32_t id) { - logdebug("genivi::layer %s @ %p", __func__, this->proxy); + logdebug("genivi::layer %s @ %p", __func__, this->proxy.get()); add_task("remove layer", [id](struct controller *c) { c->layers.erase(id); }); } @@ -509,8 +511,8 @@ void surface_stats(void *data, uint32_t update_count, uint32_t pid, const char *process_name) { auto s = static_cast(data); - s->parent->surface_stats(s->id, redraw_count, frame_count, - update_count, pid, process_name); + s->parent->surface_stats(s->id, redraw_count, frame_count, update_count, pid, + process_name); } void surface_destroyed( @@ -542,7 +544,12 @@ constexpr struct ivi_controller_surface_listener surface_listener = { } // namespace surface::surface(uint32_t i, struct controller *c) - : wayland_proxy(ivi_controller_surface_create(c->proxy, i)), + : wayland_proxy(ivi_controller_surface_create(c->proxy.get(), i), + [c, i](ivi_controller_surface *s) { + logdebug("~surface surface %i @ %p", i, s); + c->remove_proxy_to_id_mapping(s); + ivi_controller_surface_destroy(s, 1); + }), controller_child(c, i), dst_rect{}, src_rect{}, @@ -550,69 +557,67 @@ surface::surface(uint32_t i, struct controller *c) orientation{}, visibility{}, opacity{1.f} { - this->parent->add_proxy_to_id_mapping(this->proxy, i); - ivi_controller_surface_add_listener(this->proxy, &surface_listener, this); -} - -surface::~surface() { - logdebug("%s surface %i @ %p", __func__, this->id, this->proxy); - this->parent->remove_proxy_to_id_mapping(this->proxy); - ivi_controller_surface_destroy(this->proxy, 1); - this->proxy = nullptr; + this->parent->add_proxy_to_id_mapping(this->proxy.get(), i); + ivi_controller_surface_add_listener(this->proxy.get(), &surface_listener, + this); } void surface::set_visibility(uint32_t visibility) { - ivi_controller_surface_set_visibility(this->proxy, visibility); + ivi_controller_surface_set_visibility(this->proxy.get(), visibility); } void surface::set_opacity(wl_fixed_t opacity) { - ivi_controller_surface_set_opacity(this->proxy, opacity); + ivi_controller_surface_set_opacity(this->proxy.get(), opacity); } void surface::set_source_rectangle(int32_t x, int32_t y, int32_t width, int32_t height) { - ivi_controller_surface_set_source_rectangle(this->proxy, x, y, width, + ivi_controller_surface_set_source_rectangle(this->proxy.get(), x, y, width, height); } void surface::set_destination_rectangle(int32_t x, int32_t y, int32_t width, int32_t height) { - ivi_controller_surface_set_destination_rectangle(this->proxy, x, y, width, - height); + ivi_controller_surface_set_destination_rectangle(this->proxy.get(), x, y, + width, height); } void surface::set_configuration(int32_t width, int32_t height) { - ivi_controller_surface_set_configuration(this->proxy, width, height); + ivi_controller_surface_set_configuration(this->proxy.get(), width, height); } void surface::set_orientation(int32_t orientation) { - ivi_controller_surface_set_orientation(this->proxy, orientation); + ivi_controller_surface_set_orientation(this->proxy.get(), orientation); } void surface::screenshot(const char *filename) { - ivi_controller_surface_screenshot(this->proxy, filename); + ivi_controller_surface_screenshot(this->proxy.get(), filename); } -void surface::send_stats() { ivi_controller_surface_send_stats(this->proxy); } +void surface::send_stats() { + ivi_controller_surface_send_stats(this->proxy.get()); +} void surface::destroy(int32_t destroy_scene_object) { - ivi_controller_surface_destroy(this->proxy, destroy_scene_object); + ivi_controller_surface_destroy(this->proxy.get(), destroy_scene_object); } void controller::surface_visibility(uint32_t id, int32_t visibility) { - logdebug("genivi::surface %s @ %p v %i", __func__, this->proxy, visibility); + logdebug("genivi::surface %s @ %p v %i", __func__, this->proxy.get(), + visibility); this->surfaces[id]->visibility = visibility; } void controller::surface_opacity(uint32_t id, float opacity) { - logdebug("genivi::surface %s @ %p o %f", __func__, this->proxy, opacity); + logdebug("genivi::surface %s @ %p o %f", __func__, this->proxy.get(), + opacity); this->surfaces[id]->opacity = opacity; } void controller::surface_source_rectangle(uint32_t id, 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, x, y, width, height); + this->proxy.get(), x, y, width, height); this->surfaces[id]->src_rect = rect{uint32_t(width), uint32_t(height), x, y}; } @@ -620,29 +625,31 @@ void controller::surface_destination_rectangle(uint32_t id, 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, x, y, width, height); + this->proxy.get(), x, y, width, height); this->surfaces[id]->dst_rect = rect{uint32_t(width), uint32_t(height), x, y}; } void controller::surface_configuration(uint32_t id, int32_t width, int32_t height) { - logdebug("genivi::surface %s @ %p w %i h %i", __func__, this->proxy, width, - height); + logdebug("genivi::surface %s @ %p w %i h %i", __func__, this->proxy.get(), + width, height); this->surfaces[id]->size = size{uint32_t(width), uint32_t(height)}; } void controller::surface_orientation(uint32_t id, int32_t orientation) { - logdebug("genivi::surface %s @ %p o %i", __func__, this->proxy, orientation); + logdebug("genivi::surface %s @ %p o %i", __func__, this->proxy.get(), + orientation); this->surfaces[id]->orientation = orientation; } void controller::surface_pixelformat(uint32_t /*id*/, int32_t pixelformat) { - logdebug("genivi::surface %s @ %p f %i", __func__, this->proxy, pixelformat); + logdebug("genivi::surface %s @ %p f %i", __func__, this->proxy.get(), + pixelformat); } void controller::surface_layer(uint32_t /*id*/, struct ivi_controller_layer *layer) { - logdebug("genivi::surface %s @ %p l %u @ %p", __func__, this->proxy, + logdebug("genivi::surface %s @ %p l %u @ %p", __func__, this->proxy.get(), this->layer_proxy_to_id[uintptr_t(layer)], layer); } @@ -650,17 +657,17 @@ void controller::surface_stats(uint32_t /*id*/, 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__, - this->proxy, redraw_count, frame_count, update_count, pid, + this->proxy.get(), redraw_count, frame_count, update_count, pid, process_name); } void controller::surface_destroyed(uint32_t id) { - logdebug("genivi::surface %s @ %p", __func__, this->proxy); + logdebug("genivi::surface %s @ %p", __func__, this->proxy.get()); this->surfaces.erase(id); } void controller::surface_content(uint32_t id, int32_t content_state) { - logdebug("genivi::surface %s @ %p s %i", __func__, this->proxy, + logdebug("genivi::surface %s @ %p s %i", __func__, this->proxy.get(), content_state); if (content_state == IVI_CONTROLLER_SURFACE_CONTENT_STATE_CONTENT_REMOVED) { add_task("remove surface", @@ -668,7 +675,8 @@ void controller::surface_content(uint32_t id, int32_t content_state) { } } -void controller::add_proxy_to_id_mapping(struct ivi_controller_surface *p, uint32_t id) { +void controller::add_proxy_to_id_mapping(struct ivi_controller_surface *p, + uint32_t id) { this->surface_proxy_to_id[uintptr_t(p)] = id; logdebug("Add surface proxy mapping for %p (%u)", p, id); } @@ -678,7 +686,8 @@ void controller::remove_proxy_to_id_mapping(struct ivi_controller_surface *p) { this->surface_proxy_to_id.erase(uintptr_t(p)); } -void controller::add_proxy_to_id_mapping(struct ivi_controller_layer *p, uint32_t id) { +void controller::add_proxy_to_id_mapping(struct ivi_controller_layer *p, + uint32_t id) { logdebug("Add layer proxy mapping for %p (%u)", p, id); this->layer_proxy_to_id[uintptr_t(p)] = id; } @@ -698,7 +707,8 @@ void controller::remove_proxy_to_id_mapping(struct wl_output *p) { this->screen_proxy_to_id.erase(uintptr_t(p)); } -void controller::add_task(char const *name, std::function &&f) { +void controller::add_task(char const *name, + std::function &&f) { this->pending.emplace_back(std::make_pair(name, f)); } @@ -709,7 +719,7 @@ void controller::execute_pending() { t.second(this); } this->pending.clear(); - ivi_controller_commit_changes(this->proxy); + ivi_controller_commit_changes(this->proxy.get()); // XXX: No flush here... } } @@ -726,10 +736,10 @@ screen::screen(uint32_t i, struct controller *c, logdebug("genivi::screen @ %p id %u", p, i); } -void screen::clear() { ivi_controller_screen_clear(this->proxy); } +void screen::clear() { ivi_controller_screen_clear(this->proxy.get()); } void screen::add_layer(layer *l) { - ivi_controller_screen_add_layer(this->proxy, l->proxy); + ivi_controller_screen_add_layer(this->proxy.get(), l->proxy.get()); } void screen::set_render_order(std::vector const &ro) { @@ -737,7 +747,7 @@ void screen::set_render_order(std::vector const &ro) { .size = ro.size() * sizeof(ro[0]), .alloc = ro.capacity() * sizeof(ro[0]), .data = const_cast(static_cast(ro.data())) }; - ivi_controller_screen_set_render_order(this->proxy, &wlro); + ivi_controller_screen_set_render_order(this->proxy.get(), &wlro); } } // namespace genivi diff --git a/src/wayland.hpp b/src/wayland.hpp index 40b18b0..2321fff 100644 --- a/src/wayland.hpp +++ b/src/wayland.hpp @@ -6,8 +6,8 @@ #include "util.h" #include -#include #include +#include #include // _ _ @@ -18,18 +18,14 @@ // |___/ |_____|_| |___/ template struct wayland_proxy { - ProxyT *proxy; - - wayland_proxy(void *p) : proxy(static_cast(p)) {} - - virtual ~wayland_proxy() { - // If this is the nullptr, then it means it already was destroyed by a - // custom wayland dtor - if (this->proxy) { - logdebug("%s %p @ %p", __func__, this, this->proxy); - wl_proxy_destroy(reinterpret_cast(this->proxy)); - } - } + std::unique_ptr> proxy; + wayland_proxy(void *p) + : wayland_proxy(p, [](ProxyT *p) { + wl_proxy_destroy(reinterpret_cast(p)); + }) {} + wayland_proxy(void *p, std::function p_del) + : proxy(std::unique_ptr>( + static_cast(p), p_del)) {} }; // _ @@ -146,15 +142,14 @@ struct surface : public wayland_proxy, float opacity; surface(uint32_t i, struct controller *c); - ~surface() override; // Requests void set_visibility(uint32_t visibility); void set_opacity(wl_fixed_t opacity); void set_source_rectangle(int32_t x, int32_t y, int32_t width, - int32_t height); + int32_t height); void set_destination_rectangle(int32_t x, int32_t y, int32_t width, - int32_t height); + int32_t height); void set_configuration(int32_t width, int32_t height); void set_orientation(int32_t orientation); void screenshot(const char *filename); @@ -179,7 +174,6 @@ struct layer : public wayland_proxy, layer(uint32_t i, struct controller *c); layer(uint32_t i, int32_t w, int32_t h, struct controller *c); - ~layer() override; // Requests void set_visibility(uint32_t visibility); @@ -239,13 +233,16 @@ struct controller : public wayland_proxy { void add_proxy_to_id_mapping(struct wl_output *p, uint32_t id); void remove_proxy_to_id_mapping(struct wl_output *p); - void add_task(char const *name, std::function &&f); + void add_task(char const *name, + std::function &&f); void execute_pending(); controller(struct wl_registry *r, uint32_t name, uint32_t version); // Requests - void commit_changes() const { ivi_controller_commit_changes(this->proxy); } + void commit_changes() const { + ivi_controller_commit_changes(this->proxy.get()); + } void layer_create(uint32_t id, int32_t w, int32_t h); void surface_create(uint32_t id); -- 2.16.6