From: Changyeon Lee Date: Mon, 12 Jun 2017 04:24:10 +0000 (+0900) Subject: e_plane: enhance trace_debug log X-Git-Tag: submit/tizen/20170628.060900~29 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0814372da4a32101c01b46fac94fc541926c495b;p=platform%2Fupstream%2Fenlightenment.git e_plane: enhance trace_debug log Change-Id: I09cb6886729b7b06f4f069f3651a90205460fab7 --- diff --git a/src/bin/e_plane.c b/src/bin/e_plane.c index 3c3ba19ec1..430f238139 100644 --- a/src/bin/e_plane.c +++ b/src/bin/e_plane.c @@ -33,35 +33,11 @@ _get_comp_wl_buffer(E_Client *ec) E_Comp_Wl_Client_Data *cdata = (E_Comp_Wl_Client_Data*)ec->comp_data; if (!cdata) return NULL; - E_Comp_Wl_Buffer_Ref *buffer_ref = &cdata ->buffer_ref; + E_Comp_Wl_Buffer_Ref *buffer_ref = &cdata->buffer_ref; return buffer_ref->buffer; } -static struct wl_resource * -_get_wl_buffer(E_Client *ec) -{ - E_Pixmap *pixmap = ec->pixmap; - E_Comp_Wl_Buffer *buffer = e_pixmap_resource_get(pixmap); - - if (!buffer) return NULL; - - return buffer->resource; -} - -static struct wl_resource * -_get_wl_buffer_ref(E_Client *ec) -{ - E_Comp_Wl_Client_Data *cdata = (E_Comp_Wl_Client_Data*)ec->comp_data; - if (!cdata) return NULL; - - E_Comp_Wl_Buffer_Ref *buffer_ref = &cdata ->buffer_ref; - - if (!buffer_ref->buffer) return NULL; - - return buffer_ref->buffer->resource; -} - static tbm_surface_queue_h _get_tbm_surface_queue(E_Comp *e_comp) { @@ -101,7 +77,7 @@ _e_plane_surface_unset(E_Plane *plane) tdm_error error; if (plane_trace_debug) - ELOGF("E_PLANE", "Unset Plane(%p)", NULL, NULL, plane); + ELOGF("E_PLANE", "Unset Plane(%p) zpos(%d)", NULL, NULL, plane, plane->zpos); error = tdm_layer_unset_buffer(tlayer); if (error != TDM_ERROR_NONE) @@ -280,9 +256,9 @@ _e_plane_surface_set(E_Plane *plane, tbm_surface_h tsurface) if (plane_trace_debug) { - ELOGF("E_PLANE", "Set Plane(%p) tsurface(%p) (%dx%d,[%d,%d,%d,%d]=>[%d,%d,%d,%d])", - NULL, NULL, plane, tsurface, - plane->info.src_config.size.h, plane->info.src_config.size.v, + ELOGF("E_PLANE", "Set Plane(%p) zpos(%d) tsurface(%p) (%dx%d,[%d,%d,%d,%d]=>[%d,%d,%d,%d])", + NULL, NULL, plane, plane->zpos, tsurface, + plane->info.src_config.size.h, plane->info.src_config.size.h, plane->info.src_config.pos.x, plane->info.src_config.pos.y, plane->info.src_config.pos.w, plane->info.src_config.pos.h, plane->info.dst_pos.x, plane->info.dst_pos.y, @@ -337,7 +313,8 @@ _e_plane_surface_from_client_acquire_reserved(E_Plane *plane) e_comp_object_hwc_update_set(ec->frame, EINA_FALSE); if (plane_trace_debug) - ELOGF("E_PLANE", "Plane:%p Display Client", ec->pixmap, ec, plane); + ELOGF("E_PLANE", "Display Plane(%p) zpos(%d) Client ec(%p, %s)", + ec->pixmap, ec, plane, plane->zpos, ec, e_client_util_name_get(ec)); /* acquire the surface from the client_queue */ tsurface = e_plane_renderer_client_surface_recieve(renderer_client); @@ -384,7 +361,8 @@ _e_plane_surface_from_client_acquire(E_Plane *plane) if (!e_comp_object_hwc_update_exists(ec->frame)) return NULL; if (plane_trace_debug) - ELOGF("E_PLANE", "Display Client Plane(%p)", ec->pixmap, ec, plane); + ELOGF("E_PLANE", "Display Plane(%p) zpos(%d) Client ec(%p, %s)", + ec->pixmap, ec, plane, plane->zpos, ec, e_client_util_name_get(ec)); e_comp_object_hwc_update_set(ec->frame, EINA_FALSE); @@ -418,7 +396,8 @@ _e_plane_cursor_surface_acquire(E_Plane *plane) if (!e_comp_object_hwc_update_exists(ec->frame)) return NULL; if (plane_trace_debug) - ELOGF("E_PLANE", "Display Cursor Client Plane(%p)", NULL, ec, plane); + ELOGF("E_PLANE", "Display Cursor Plane(%p) zpos(%d) ec(%p)", + NULL, ec, plane, plane->zpos, ec); e_comp_object_hwc_update_set(ec->frame, EINA_FALSE); @@ -481,7 +460,8 @@ _e_plane_surface_from_ecore_evas_acquire(E_Plane *plane) if (tsurface) { if (plane_trace_debug) - ELOGF("E_PLANE", "Display Canvas Plane(%p)", NULL, NULL, plane); + ELOGF("E_PLANE", "Display Plane(%p) zpos(%d) Canvas", + NULL, NULL, plane, plane->zpos); } return tsurface; @@ -935,8 +915,9 @@ e_plane_commit(E_Plane *plane) TRACE_DS_ASYNC_BEGIN((unsigned int)plane->tlayer, [PLANE:COMMIT~HANDLER]); if (plane_trace_debug) - ELOGF("E_PLANE", "Commit Plane(%p) tsurface(%p) tqueue(%p) data(%p)", - NULL, NULL, plane, data->tsurface, plane->renderer ? plane->renderer->tqueue : NULL, data); + ELOGF("E_PLANE", "Commit Plane(%p) zpos(%d) tsurface(%p) tqueue(%p) wl_buffer(%p) data(%p)", + NULL, NULL, plane, plane->zpos, data->tsurface, plane->renderer ? plane->renderer->tqueue : NULL, + data->buffer_ref.buffer ? data->buffer_ref.buffer->resource : NULL, data); error = tdm_layer_commit(plane->tlayer, _e_plane_commit_hanler, data); if (error != TDM_ERROR_NONE) @@ -1046,7 +1027,7 @@ e_plane_commit_data_release(E_Plane_Commit_Data *data) if (!tsurface) { if (plane_trace_debug) - ELOGF("E_PLANE", "Done Plane(%p) data(%p) ::Unset", NULL, NULL, plane, data); + ELOGF("E_PLANE", "Done Plane(%p) zpos(%d) data(%p)::Unset", NULL, NULL, plane, plane->zpos, data); e_comp_wl_buffer_reference(&plane->displaying_buffer_ref, NULL); if (plane->displaying_buffer_tsurface) @@ -1072,8 +1053,10 @@ e_plane_commit_data_release(E_Plane_Commit_Data *data) /* composite */ /* debug */ if (plane_trace_debug) - ELOGF("E_PLANE", "Done Plane(%p) tsurface(%p) tqueue(%p) data(%p)::Canvas", - NULL, NULL, plane, tsurface, renderer ? renderer->tqueue : NULL, data); + ELOGF("E_PLANE", "Done Plane(%p) zpos(%d) tsurface(%p) tqueue(%p) wl_buffer(%p) data(%p)::Canvas", + NULL, NULL, plane, plane->zpos, tsurface, renderer ? renderer->tqueue : NULL, + data->buffer_ref.buffer ? data->buffer_ref.buffer->resource : NULL, data); + if (plane->reserved_memory) { if (displaying_tsurface) @@ -1109,9 +1092,9 @@ e_plane_commit_data_release(E_Plane_Commit_Data *data) /* no composite */ /* debug */ if (plane_trace_debug) - ELOGF("E_PLANE", "Done Plane(%p) wl_buffer(%p) tsurface(%p) tqueue(%p) data(%p) wl_buffer_ref(%p) ::Client", - ec->pixmap, ec, plane, _get_wl_buffer(ec), tsurface, (renderer ? renderer->tqueue : NULL), - data, _get_wl_buffer_ref(ec)); + ELOGF("E_PLANE", "Done Plane(%p) zpos(%d) tsurface(%p) tqueue(%p) wl_buffer(%p) data(%p)::Client", + ec->pixmap, ec, plane, plane->zpos, tsurface, (renderer ? renderer->tqueue : NULL), + data->buffer_ref.buffer ? data->buffer_ref.buffer->resource : NULL, data); if (plane->role == E_PLANE_ROLE_OVERLAY) { @@ -1261,7 +1244,8 @@ e_plane_ec_set(E_Plane *plane, E_Client *ec) EINA_SAFETY_ON_NULL_RETURN_VAL(plane, EINA_FALSE); if (plane_trace_debug) - ELOGF("E_PLANE", "Request Plane(%p) ec Set", (ec ? ec->pixmap : NULL), ec, plane); + ELOGF("E_PLANE", "Request Plane(%p) zpos(%d) Set ec(%p, %s)", + (ec ? ec->pixmap : NULL), ec, plane, plane->zpos, ec, e_client_util_name_get(ec)); if (ec) { @@ -1360,7 +1344,8 @@ e_plane_ec_set(E_Plane *plane, E_Client *ec) plane->need_ev = EINA_TRUE; if (plane_trace_debug) - ELOGF("E_PLANE", "Plane(%p) ec Set", (ec ? ec->pixmap : NULL), ec, plane); + ELOGF("E_PLANE", "Plane(%p) zpos(%d) Set ec(%p, %s)", + (ec ? ec->pixmap : NULL), ec, plane, plane->zpos, ec, e_client_util_name_get(ec)); return EINA_TRUE; } diff --git a/src/bin/e_plane_renderer.c b/src/bin/e_plane_renderer.c index 7f4d2a222e..1477f5bc90 100644 --- a/src/bin/e_plane_renderer.c +++ b/src/bin/e_plane_renderer.c @@ -69,17 +69,6 @@ _get_comp_wl_buffer(E_Client *ec) static struct wl_resource * _get_wl_buffer(E_Client *ec) -{ - E_Pixmap *pixmap = ec->pixmap; - E_Comp_Wl_Buffer *buffer = e_pixmap_resource_get(pixmap); - - if (!buffer) return NULL; - - return buffer->resource; -} - -static struct wl_resource * -_get_wl_buffer_ref(E_Client *ec) { E_Comp_Wl_Client_Data *cdata = (E_Comp_Wl_Client_Data*)ec->comp_data; if (!cdata) return NULL; @@ -337,6 +326,10 @@ _e_plane_renderer_client_copied_surface_create(E_Plane_Renderer_Client *renderer tbm_surface_unmap(new_tsurface); tbm_surface_unmap(tsurface); + if (renderer_trace_debug) + ELOGF("E_PLANE_RENDERER", "Create backup buffer wl_buffer(%p) tsurface(%p) new_tsurface(%p)", + ec->pixmap, ec, _get_wl_buffer(ec), tsurface, new_tsurface); + return new_tsurface; } @@ -503,7 +496,7 @@ _e_plane_renderer_exported_surface_release(E_Plane_Renderer *renderer, tbm_surfa } if (renderer_trace_debug) - ELOGF("E_PLANE_RENDERER", "Release exported Renderer(%p) tsurface(%p) tqueue(%p)", + ELOGF("E_PLANE_RENDERER", "Import Renderer(%p) tsurface(%p) tqueue(%p)", NULL, NULL, renderer, tsurface, renderer->tqueue); } @@ -614,7 +607,7 @@ _e_plane_renderer_exported_surfaces_release(E_Plane_Renderer *renderer, Eina_Boo renderer->exported_surfaces = eina_list_remove_list(renderer->exported_surfaces, l_s); if (renderer_trace_debug) - ELOGF("E_PLANE_RENDERER", "Release exported Renderer(%p) tsurface(%p) tqueue(%p)", + ELOGF("E_PLANE_RENDERER", "Import Renderer(%p) tsurface(%p) tqueue(%p)", NULL, NULL, renderer, tsurface, renderer->tqueue); } @@ -751,7 +744,7 @@ _e_plane_renderer_exported_surface_dequeue_cb(struct wayland_tbm_client_queue *c renderer_buffer->dequeued = EINA_TRUE; if (renderer_trace_debug) - ELOGF("E_PLANE_RENDERER", "Client Renderer(%p) Dequeue tsurface(%p) tqueue(%p)", + ELOGF("E_PLANE_RENDERER", "Client Renderer(%p) tsurface(%p) tqueue(%p) Dequeued", NULL, NULL, renderer, tsurface, renderer->tqueue); } @@ -777,7 +770,7 @@ _e_plane_renderer_surface_exported_surface_destroy_cb(tbm_surface_h tsurface, vo EINA_SAFETY_ON_NULL_RETURN(renderer_buffer); if (renderer_trace_debug) - ELOGF("E_PLANE_RENDERER", "Destroy Renderer(%p) tsurface(%p) tqueue(%p)", + ELOGF("E_PLANE_RENDERER", "Destroy Renderer(%p) tsurface(%p) tqueue(%p)", NULL, NULL, renderer, tsurface, renderer->tqueue); if (renderer->state != E_PLANE_RENDERER_STATE_PENDING_DEACTIVATE) return; @@ -832,10 +825,14 @@ _e_plane_renderer_client_ec_buffer_change_cb(void *data, int type, void *event) renderer_buffer = _e_plane_renderer_client_renderer_buffer_get(renderer_client); if (!renderer_buffer) { - ERR("fail to get renderer buffer"); + WRN("fail to get renderer_bufrer"); if (!_e_plane_renderer_client_backup_buffer_set(renderer_client)) - ERR("fail to _e_comp_hwc_set_backup_buffer"); + ERR("fail to _e_comp_hwc_set_backup_buffer"); + + if (renderer_trace_debug) + ELOGF("E_PLANE_RENDERER", "Set backup buffer wl_buffer(%p)::buffer_change_exception", + ec->pixmap, ec, _get_wl_buffer(ec)); return ECORE_CALLBACK_PASS_ON; } @@ -845,11 +842,12 @@ _e_plane_renderer_client_ec_buffer_change_cb(void *data, int type, void *event) if ((renderer_client->state == E_PLANE_RENDERER_CLIENT_STATE_NONE) || (renderer_client->state == E_PLANE_RENDERER_CLIENT_STATE_PENDING_DEACTIVATED)) { - if (renderer_trace_debug) - ELOGF("E_PLANE_RENDERER", "Set Backup Buffer wl_buffer(%p):buffer_change", ec->pixmap, ec, _get_wl_buffer(ec)); - if (!_e_plane_renderer_client_backup_buffer_set(renderer_client)) - ERR("fail to _e_comp_hwc_set_backup_buffer"); + ERR("fail to _e_comp_hwc_set_backup_buffer"); + + if (renderer_trace_debug) + ELOGF("E_PLANE_RENDERER", "Set backup buffer wl_buffer(%p)::buffer_change", + ec->pixmap, ec, _get_wl_buffer(ec)); if (renderer_client->state == E_PLANE_RENDERER_CLIENT_STATE_PENDING_DEACTIVATED) { @@ -1626,7 +1624,8 @@ e_plane_renderer_reserved_deactivate(E_Plane_Renderer *renderer) } if (renderer_trace_debug) - ELOGF("E_PLANE_RENDERER", "Set Backup Buffer wl_buffer(%p):Deactivate", ec->pixmap, ec, _get_wl_buffer(ec)); + ELOGF("E_PLANE_RENDERER", "Set backup buffer wl_buffer(%p)::Deactivate", + ec->pixmap, ec, _get_wl_buffer(ec)); if (!_e_plane_renderer_client_backup_buffer_set(renderer_client)) ERR("fail to _e_comp_hwc_set_backup_buffer"); @@ -1793,13 +1792,9 @@ e_plane_renderer_client_surface_recieve(E_Plane_Renderer_Client *renderer_client flags = wayland_tbm_server_get_buffer_flags(wl_comp_data->tbm.server, buffer->resource); if (renderer_trace_debug) - { - E_Comp_Wl_Client_Data *cdata = (E_Comp_Wl_Client_Data*)ec->comp_data; - E_Comp_Wl_Buffer_Ref *buffer_ref = &cdata ->buffer_ref; + ELOGF("E_PLANE_RENDERER", "Receive Renderer(%p) tsurface(%p) tqueue(%p) wl_buffer(%p) flags(%d)", + ec->pixmap, ec, renderer, tsurface, renderer->tqueue, _get_wl_buffer(ec), flags); - ELOGF("E_PLANE_RENDERER", "Receive Renderer(%p) wl_buffer(%p) tsurface(%p) tqueue(%p) wl_buffer_ref(%p) flags(%d)", - ec->pixmap, ec, renderer, buffer->resource, tsurface, renderer->tqueue, buffer_ref->buffer->resource, flags); - } if (flags != E_PLANE_RENDERER_CLIENT_SURFACE_FLAGS_RESERVED) { ERR("the flags of the enqueuing surface is %d. need flags(%d).", flags, E_PLANE_RENDERER_CLIENT_SURFACE_FLAGS_RESERVED); @@ -1979,15 +1974,8 @@ e_plane_renderer_surface_queue_acquire(E_Plane_Renderer *renderer) /* debug */ if (renderer_trace_debug) - { - E_Client *ec = renderer->ec; - if (ec) - ELOGF("E_PLANE_RENDERER", "Acquire Renderer(%p) wl_buffer(%p) tsurface(%p) tqueue(%p) wl_buffer_ref(%p)", - ec->pixmap, ec, renderer, _get_wl_buffer(ec), tsurface, tqueue, _get_wl_buffer_ref(ec)); - else - ELOGF("E_PLANE_RENDERER", "Acquire Renderer(%p) tsurface(%p) tqueue(%p)", - NULL, NULL, renderer, tsurface, tqueue); - } + ELOGF("E_PLANE_RENDERER", "Acquire Renderer(%p) tsurface(%p) tqueue(%p)", + NULL, NULL, renderer, tsurface, tqueue); return tsurface; } @@ -2010,12 +1998,9 @@ e_plane_renderer_surface_queue_release(E_Plane_Renderer *renderer, tbm_surface_h if (renderer_trace_debug) { E_Client *ec = renderer->ec; - if (ec) - ELOGF("E_PLANE_RENDERER", "Release Renderer(%p) wl_buffer(%p) tsurface(%p) tqueue(%p) wl_buffer_ref(%p)", - ec->pixmap, ec, renderer, _get_wl_buffer(ec), tsurface, renderer->tqueue, _get_wl_buffer_ref(ec)); - else - ELOGF("E_PLANE_RENDERER", "Release Renderer(%p) tsurface(%p) tqueue(%p)", - NULL, NULL, renderer, tsurface, renderer->tqueue); + + ELOGF("E_PLANE_RENDERER", "Release Renderer(%p) tsurface(%p) tqueue(%p)", + ec ? ec->pixmap : NULL, ec, renderer, tsurface, renderer->tqueue); } tsq_err = tbm_surface_queue_release(tqueue, tsurface); @@ -2044,8 +2029,8 @@ e_plane_renderer_surface_queue_enqueue(E_Plane_Renderer *renderer, tbm_surface_h if (renderer_trace_debug) { E_Client *ec = renderer->ec; - ELOGF("E_PLANE_RENDERER", "Enqueue Renderer(%p) wl_buffer(%p) tsurface(%p) tqueue(%p) wl_buffer_ref(%p)", - ec->pixmap, ec, renderer, _get_wl_buffer(ec), tsurface, renderer->tqueue, _get_wl_buffer_ref(ec)); + ELOGF("E_PLANE_RENDERER", "Enqueue Renderer(%p) tsurface(%p) tqueue(%p) wl_buffer(%p) ", + ec->pixmap, ec, renderer, tsurface, renderer->tqueue, _get_wl_buffer(ec)); } tsq_err = tbm_surface_queue_enqueue(tqueue, tsurface); @@ -2105,13 +2090,10 @@ e_plane_renderer_surface_queue_dequeue(E_Plane_Renderer *renderer) /* debug */ if (renderer_trace_debug) { - E_Client *ec = renderer->ec; - if (ec) - ELOGF("E_PLANE_RENDERER", "Dequeue Renderer(%p) wl_buffer(%p) tsurface(%p) tqueue(%p) wl_buffer_ref(%p)", - ec->pixmap, ec, renderer, _get_wl_buffer(ec), tsurface, renderer->tqueue, _get_wl_buffer_ref(ec)); - else - ELOGF("E_PLANE_RENDERER", "Dequeue Renderer(%p) tsurface(%p) tqueue(%p)", - NULL, NULL, renderer, tsurface, renderer->tqueue); + E_Client *ec = renderer->ec; + + ELOGF("E_PLANE_RENDERER", "Dequeue Renderer(%p) tsurface(%p) tqueue(%p)", + ec ? ec->pixmap : NULL, ec, renderer, tsurface, renderer->tqueue); } return tsurface; @@ -2205,8 +2187,8 @@ e_plane_renderer_surface_send(E_Plane_Renderer *renderer, E_Client *ec, tbm_surf renderer_client->exported_surfaces = eina_list_append(renderer_client->exported_surfaces, tsurface); if (wl_buffer && renderer_trace_debug) - ELOGF("E_PLANE_RENDERER", "Export Renderer(%p) wl_buffer(%p) tsurface(%p) tqueue(%p)", - ec->pixmap, ec, renderer, wl_buffer, tsurface, renderer->tqueue); + ELOGF("E_PLANE_RENDERER", "Export Renderer(%p) tsurface(%p) tqueue(%p) wl_buffer(%p)", + ec->pixmap, ec, renderer, tsurface, renderer->tqueue, wl_buffer); } }