Added ttrace

Change-Id: I6218c1143e7af85385dd953f52f9d2beff1a72a2

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 4dee1f3..fd2a706 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -2086,7 +2086,13 @@ _e_client_eval(E_Client *ec)
         return;
      }
 
-   if (!_e_client_hook_call(E_CLIENT_HOOK_EVAL_PRE_NEW_CLIENT, ec)) return;
+   TRACE_DS_BEGIN(CLIENT:EVAL);
+
+   if (!_e_client_hook_call(E_CLIENT_HOOK_EVAL_PRE_NEW_CLIENT, ec))
+     {
+        TRACE_DS_END();
+        return;
+     }
 
    if ((ec->new_client) && (!e_client_util_ignored_get(ec)) && (ec->zone))
      {
@@ -2317,7 +2323,11 @@ _e_client_eval(E_Client *ec)
         }
      }
 
-   if (!_e_client_hook_call(E_CLIENT_HOOK_EVAL_POST_NEW_CLIENT, ec)) return;
+   if (!_e_client_hook_call(E_CLIENT_HOOK_EVAL_POST_NEW_CLIENT, ec))
+     {
+        TRACE_DS_END();
+        return;
+     }
 
    /* effect changes to the window border itself */
    if ((ec->changes.shading))
@@ -2653,6 +2663,8 @@ _e_client_eval(E_Client *ec)
 #endif
 
    _e_client_hook_call(E_CLIENT_HOOK_EVAL_END, ec);
+
+   TRACE_DS_END();
 }
 
 static void
@@ -2805,6 +2817,8 @@ _e_client_visibility_zone_calculate(E_Zone *zone)
 
    if (!zone) return;
 
+   TRACE_DS_BEGIN(CLIENT:VISIBILITY CALCULATE);
+
    t = eina_tiler_new(zone->w + edge, zone->h + edge);
    eina_tiler_tile_size_set(t, 1, 1);
 
@@ -2938,6 +2952,8 @@ _e_client_visibility_zone_calculate(E_Zone *zone)
              evas_object_focus_set(focus_ec->frame, 1);
           }
      }
+
+   TRACE_DS_END();
 }
 
 E_API void
@@ -2961,6 +2977,7 @@ e_client_idler_before(void)
 
    if ((!eina_hash_population(clients_hash[0])) && (!eina_hash_population(clients_hash[1]))) return;
 
+   TRACE_DS_BEGIN(CLIENT:IDLE BEFORE);
 
    EINA_LIST_FOREACH(e_comp->clients, l, ec)
      {
@@ -3046,6 +3063,8 @@ e_client_idler_before(void)
              ec->changed = ec->changes.visible;
           }
      }
+
+   TRACE_DS_END();
 }
 
 
@@ -4128,10 +4147,20 @@ e_client_focus_set_with_pointer(E_Client *ec)
        (!ec->icccm.take_focus)) return;
    if (ec->lock_focus_out) return;
    if (ec == focused) return;
+
+   TRACE_DS_BEGIN(CLIENT:FOCUS SET WITH POINTER);
    evas_object_focus_set(ec->frame, 1);
 
-   if (e_config->focus_policy == E_FOCUS_CLICK) return;
-   if (!ec->visible) return;
+   if (e_config->focus_policy == E_FOCUS_CLICK)
+     {
+        TRACE_DS_END();
+        return;
+     }
+   if (!ec->visible)
+     {
+        TRACE_DS_END();
+        return;
+     }
 
    if (e_config->focus_policy == E_FOCUS_SLOPPY)
      {
@@ -4147,6 +4176,8 @@ e_client_focus_set_with_pointer(E_Client *ec)
         if (e_config->pointer_slide)
           e_client_pointer_warp_to_center(ec);
      }
+
+   TRACE_DS_END();
 }
 
 EINTERN void
@@ -4156,6 +4187,9 @@ e_client_focused_set(E_Client *ec)
    Eina_List *l, *ll;
 
    if (ec == focused) return;
+
+   TRACE_DS_BEGIN(CLIENT:FOCUSED SET);
+
    ELOG("CLIENT FOCUS_SET", NULL, ec);
    focused = ec;
    if ((ec) && (ec->zone))
@@ -4229,7 +4263,11 @@ e_client_focused_set(E_Client *ec)
           }
         break;
      }
-   if (!ec) return;
+   if (!ec)
+     {
+        TRACE_DS_END();
+        return;
+     }
 
    _e_client_hook_call(E_CLIENT_HOOK_FOCUS_SET, ec);
    e_focus_event_focus_in(ec);
@@ -4241,6 +4279,8 @@ e_client_focused_set(E_Client *ec)
    _e_client_event_simple(ec, E_EVENT_CLIENT_FOCUS_IN);
    if (ec->sticky && ec->desk && (!ec->desk->visible))
      e_client_desk_set(ec, e_desk_current_get(ec->zone));
+
+   TRACE_DS_END();
 }
 
 E_API void
@@ -4248,6 +4288,9 @@ e_client_activate(E_Client *ec, Eina_Bool just_do_it)
 {
    E_OBJECT_CHECK(ec);
    E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE);
+
+   TRACE_DS_BEGIN(CLIENT:ACTIVATE);
+
    if ((e_config->focus_setting == E_FOCUS_NEW_WINDOW) ||
        ((ec->parent) &&
         ((e_config->focus_setting == E_FOCUS_NEW_DIALOG) ||
@@ -4294,6 +4337,8 @@ e_client_activate(E_Client *ec, Eina_Bool just_do_it)
              evas_object_focus_set(ec->frame, 1);
           }
      }
+
+   TRACE_DS_END();
 }
 
 E_API E_Client *
@@ -4722,7 +4767,7 @@ e_client_iconify(E_Client *ec)
    if (!ec->zone) return;
    if (ec->shading || ec->iconic) return;
 
-   TRACE_DS_BEGIN(ICONIC:e_client_iconify);
+   TRACE_DS_BEGIN(CLIENT:ICONIFY);
 
    ec->iconic = 1;
    ec->want_focus = ec->take_focus = 0;
@@ -4771,7 +4816,7 @@ e_client_uniconify(E_Client *ec)
    if (!ec->zone) return;
    if (ec->shading || (!ec->iconic)) return;
 
-   TRACE_DS_BEGIN(ICONIC:e_client_uniconify);
+   TRACE_DS_BEGIN(CLIENT:UNICONIFY);
 
    desk = e_desk_current_get(ec->desk->zone);
    e_client_desk_set(ec, desk);

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 82bb8b9..aeebbcf 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -383,6 +383,9 @@ _e_comp_cb_update(void)
    //   static int doframeinfo = -1;
 
    if (!e_comp) return EINA_FALSE;
+
+   TRACE_DS_BEGIN(COMP:UPDATE CB);
+
    if (e_comp->update_job)
      e_comp->update_job = NULL;
    else
@@ -565,6 +568,8 @@ nocomp:
    else
      _e_comp_nocomp_end();
 
+   TRACE_DS_END();
+
    return ECORE_CALLBACK_RENEW;
 }
 

diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c
index 516ce58..f37ce67 100644 (file)
--- a/src/bin/e_comp_canvas.c
+++ b/src/bin/e_comp_canvas.c
@@ -240,6 +240,8 @@ e_comp_canvas_init(int w, int h)
    Evas_Object *o;
    Eina_List *screens;
 
+   TRACE_DS_BEGIN(COMP_CANVAS:INIT);
+
    e_comp->evas = ecore_evas_get(e_comp->ee);
    e_comp->w = w;
    e_comp->h = h;
@@ -295,6 +297,7 @@ e_comp_canvas_init(int w, int h)
    ecore_evas_callback_resize_set(e_comp->ee, _e_comp_canvas_resize);
    ecore_evas_resize(e_comp->ee, w, h);
 
+   TRACE_DS_END();
    return EINA_TRUE;
 }
 

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 31830b1..50f88e9 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -1457,7 +1457,10 @@ _e_comp_intercept_stack_above(void *data, Evas_Object *obj, Evas_Object *above)
 {
    EINA_SAFETY_ON_TRUE_RETURN(obj == above);
    if (evas_object_below_get(obj) == above) return;
+
+   TRACE_DS_BEGIN(COMP:INTERCEPT STACK ABOVE);
    _e_comp_intercept_stack_helper(data, above, evas_object_stack_above);
+   TRACE_DS_END();
 }
 
 static void
@@ -1465,7 +1468,10 @@ _e_comp_intercept_stack_below(void *data, Evas_Object *obj, Evas_Object *below)
 {
    EINA_SAFETY_ON_TRUE_RETURN(obj == below);
    if (evas_object_above_get(obj) == below) return;
+
+   TRACE_DS_BEGIN(COMP:INTERCEPT STACK BELOW);
    _e_comp_intercept_stack_helper(data, below, evas_object_stack_below);
+   TRACE_DS_END();
 }
 
 static void
@@ -1474,24 +1480,29 @@ _e_comp_intercept_lower(void *data, Evas_Object *obj)
    E_Comp_Object *cw = data;
    Evas_Object *o;
 
+   TRACE_DS_BEGIN(COMP:INTERCEPT LOWER);
+
    if (cw->ec->layer_block)
      {
         evas_object_lower(obj);
-        return;
+        goto end;
      }
-   if (!EINA_INLIST_GET(cw->ec)->prev) return; //already lowest on layer
+   if (!EINA_INLIST_GET(cw->ec)->prev) goto end; //already lowest on layer
    o = evas_object_below_get(obj);
    _e_comp_object_layers_remove(cw);
    /* prepend to client list since this client should be the first item now */
    _e_comp_object_layers_add(cw, NULL, NULL, 1);
-   if (evas_object_layer_get(o) != evas_object_layer_get(obj)) return; //already at bottom!
-   if (obj == e_comp->layers[cw->layer].obj) return; //never lower a layer marker!
+   if (evas_object_layer_get(o) != evas_object_layer_get(obj)) goto end; //already at bottom!
+   if (obj == e_comp->layers[cw->layer].obj) goto end; //never lower a layer marker!
    evas_object_data_set(obj, "client_restack", (void*)1);
    evas_object_lower(obj);
    evas_object_data_del(obj, "client_restack");
-   if (!cw->visible) return;
+   if (!cw->visible) goto end;
    e_comp_render_queue();
    e_comp_shape_queue();
+
+end:
+   TRACE_DS_END();
 }
 
 static void
@@ -1500,19 +1511,21 @@ _e_comp_intercept_raise(void *data, Evas_Object *obj)
    E_Comp_Object *cw = data;
    Evas_Object *o;
 
+   TRACE_DS_BEGIN(COMP:INTERCEPT RAISE);
+
    if (cw->ec->layer_block)
      {
         evas_object_raise(obj);
-        return;
+        goto end;
      }
-   if (!EINA_INLIST_GET(cw->ec)->next) return;//already highest on layer
+   if (!EINA_INLIST_GET(cw->ec)->next) goto end;//already highest on layer
    o = evas_object_above_get(obj);
    {
       E_Client *ecabove = e_client_above_get(cw->ec);
       if (ecabove && (ecabove->frame == e_comp->layers[cw->layer].obj) &&
-          (ecabove->frame == o)) return; //highest below marker
+          (ecabove->frame == o)) goto end; //highest below marker
    }
-   if (evas_object_layer_get(o) != evas_object_layer_get(obj)) return; //already at top!
+   if (evas_object_layer_get(o) != evas_object_layer_get(obj)) goto end; //already at top!
    if (obj == e_comp->layers[cw->layer].obj) //never raise a non-layer marker!
      evas_object_raise(obj);
    else
@@ -1533,9 +1546,12 @@ _e_comp_intercept_raise(void *data, Evas_Object *obj)
         if (e_client_focus_track_enabled())
           e_client_raise_latest_set(cw->ec); //modify raise list if necessary
      }
-   if (!cw->visible) return;
+   if (!cw->visible) goto end;
    e_comp_render_queue();
    e_comp_shape_queue();
+
+end:
+   TRACE_DS_END();
 }
 
 static void
@@ -2281,6 +2297,8 @@ _e_comp_smart_clip_unset(Evas_Object *obj)
 static void
 _e_comp_smart_hide(Evas_Object *obj)
 {
+   TRACE_DS_BEGIN(COMP:SMART HIDE);
+
    INTERNAL_ENTRY;
    cw->visible = 0;
    evas_object_hide(cw->clip);
@@ -2298,9 +2316,17 @@ _e_comp_smart_hide(Evas_Object *obj)
              evas_object_event_callback_del_full(o, EVAS_CALLBACK_DEL, _e_comp_object_cb_mirror_del, cw);
              evas_object_del(o);
           }
-        if (!_e_comp_object_animating_end(cw)) return;
+        if (!_e_comp_object_animating_end(cw))
+          {
+             TRACE_DS_END();
+             return;
+          }
+     }
+   if (stopping)
+     {
+        TRACE_DS_END();
+        return;
      }
-   if (stopping) return;
    if (!cw->ec->input_only)
      {
         edje_object_freeze(cw->effect_obj);
@@ -2314,6 +2340,8 @@ _e_comp_smart_hide(Evas_Object *obj)
      evas_object_focus_set(cw->ec->frame, 0);
    e_comp_render_queue(); //force nocomp recheck
    e_comp_shape_queue();
+
+   TRACE_DS_END();
 }
 
 static void
@@ -2330,6 +2358,8 @@ _e_comp_smart_show(Evas_Object *obj)
 
    //INF("SMART SHOW: %p EC(%dx%d) CW(%dx%d)", cw->ec, cw->ec->w, cw->ec->h, cw->w, cw->h);
 
+   TRACE_DS_BEGIN(COMP:SMART SHOW);
+
    EINA_LIST_FOREACH(cw->ec->e.state.video_child, l, tmp)
      evas_object_show(tmp->frame);
 
@@ -2351,6 +2381,7 @@ _e_comp_smart_show(Evas_Object *obj)
    if (cw->ec->input_only)
      {
         e_comp_shape_queue();
+        TRACE_DS_END();
         return;
      }
    if (cw->ec->iconic && (!cw->ec->new_client))
@@ -2360,7 +2391,11 @@ _e_comp_smart_show(Evas_Object *obj)
         e_comp_object_signal_emit(cw->smart_obj, "e,state,visible", "e");
         _e_comp_object_animating_begin(cw);
         cw->showing = 1;
-        if (!_e_comp_object_effect_visibility_start(cw, 1)) return;
+        if (!_e_comp_object_effect_visibility_start(cw, 1))
+          {
+             TRACE_DS_END();
+             return;
+          }
      }
    /* ensure some random effect doesn't lock the client offscreen */
    if (!cw->animating)
@@ -2369,6 +2404,8 @@ _e_comp_smart_show(Evas_Object *obj)
         e_comp_object_effect_set(obj, NULL);
         e_comp_shape_queue();
      }
+
+   TRACE_DS_END();
 }
 
 static void
@@ -2449,6 +2486,9 @@ _e_comp_smart_resize(Evas_Object *obj, int w, int h)
 
    //INF("RSZ(%p): %dx%d -> %dx%d", cw->ec, cw->w, cw->h, w, h);
    if (!cw->effect_obj) CRI("ACK!");
+
+   TRACE_DS_BEGIN(COMP:SMART RESIZE);
+
    first = ((cw->w < 1) || (cw->h < 1));
    cw->w = w, cw->h = h;
    if ((!cw->ec->shading) && (!cw->ec->shaded))
@@ -2497,10 +2537,16 @@ _e_comp_smart_resize(Evas_Object *obj, int w, int h)
      {
         evas_object_resize(cw->effect_obj, w, h);
      }
-   if (!cw->visible) return;
+   if (!cw->visible)
+     {
+        TRACE_DS_END();
+        return;
+     }
    e_comp_render_queue();
    if (!cw->animating)
      e_comp_shape_queue();
+
+   TRACE_DS_END();
 }
 
 static void

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 623585c..da3b30c 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2786,12 +2786,15 @@ _e_comp_wl_compositor_cb_surface_create(struct wl_client *client, struct wl_reso
 
    DBG("Compositor Cb Surface Create: %d", id);
 
+   TRACE_DS_BEGIN(COMP_WL:SURFACE CREATE CB);
+
    /* try to create an internal surface */
    if (!(res = wl_resource_create(client, &wl_surface_interface,
                                   wl_resource_get_version(resource), id)))
      {
         ERR("Could not create compositor surface");
         wl_client_post_no_memory(client);
+        TRACE_DS_END();
         return;
      }
 
@@ -2826,6 +2829,7 @@ _e_comp_wl_compositor_cb_surface_create(struct wl_client *client, struct wl_reso
              ERR("Could not create new pixmap");
              wl_resource_destroy(res);
              wl_client_post_no_memory(client);
+             TRACE_DS_END();
              return;
           }
 
@@ -2864,6 +2868,8 @@ _e_comp_wl_compositor_cb_surface_create(struct wl_client *client, struct wl_reso
 #endif
    /* emit surface create signal */
    wl_signal_emit(&e_comp_wl->signals.surface.create, res);
+
+   TRACE_DS_END();
 }
 
 static void
@@ -3737,6 +3743,8 @@ _e_comp_wl_client_cb_new(void *data EINA_UNUSED, E_Client *ec)
    /* make sure this is a wayland client */
    if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
 
+   TRACE_DS_BEGIN(COMP_WL:CLIENT NEW HOOK);
+
    /* get window id from pixmap */
    win = e_pixmap_window_get(ec->pixmap);
 
@@ -3745,12 +3753,14 @@ _e_comp_wl_client_cb_new(void *data EINA_UNUSED, E_Client *ec)
      {
         e_comp_ignore_win_add(E_PIXMAP_TYPE_WL, win);
         e_object_del(E_OBJECT(ec));
+        TRACE_DS_END();
         return;
      }
 
    if (!(ec->comp_data = E_NEW(E_Comp_Client_Data, 1)))
      {
         ERR("Could not allocate new client data structure");
+        TRACE_DS_END();
         return;
      }
 
@@ -3797,6 +3807,8 @@ _e_comp_wl_client_cb_new(void *data EINA_UNUSED, E_Client *ec)
    e_hints_client_list_set();
 
    e_pixmap_cdata_set(ec->pixmap, ec->comp_data);
+
+   TRACE_DS_END();
 }
 
 static void
@@ -3809,6 +3821,8 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec)
    /* make sure this is a wayland client */
    if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
 
+   TRACE_DS_BEGIN(COMP_WL:CLIENT DEL CB);
+
    if ((!ec->already_unparented) && (ec->comp_data->reparented))
      _e_comp_wl_focus_down_set(ec);
 
@@ -3884,6 +3898,8 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec)
    E_FREE(ec->comp_data);
 
    _e_comp_wl_focus_check();
+
+   TRACE_DS_END();
 }
 
 #if 0
@@ -4504,6 +4520,8 @@ _e_comp_wl_gl_shutdown(void)
 E_API Eina_Bool
 e_comp_wl_init(void)
 {
+   TRACE_DS_BEGIN(COMP_WL:INIT);
+
    /* set gl available if we have ecore_evas support */
    if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_EGL) ||
        ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_DRM))
@@ -4513,6 +4531,7 @@ e_comp_wl_init(void)
    if (!_e_comp_wl_compositor_create())
      {
         e_error_message_show(_("Enlightenment cannot create a Wayland Compositor!\n"));
+        TRACE_DS_END();
         return EINA_FALSE;
      }
 
@@ -4574,6 +4593,7 @@ e_comp_wl_init(void)
 
    _last_event_time = ecore_loop_time_get();
 
+   TRACE_DS_END();
    return EINA_TRUE;
 }
 

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 0956850..e6ae73e 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -215,15 +215,19 @@ _e_main_subsystem_defer(void *data EINA_UNUSED)
    int argc;
    char **argv;
 
-   TRACE_DS_BEGIN(MAIN:_e_main_subsystem_defer);
+   TRACE_DS_BEGIN(MAIN:SUBSYSTEMS DEFER);
 
    ecore_app_args_get(&argc, &argv);
 
    /* try to init delayed subsystems */
+
+   TRACE_DS_BEGIN(MAIN:DEFFERED EFL INIT);
+
    TS("[DEFERRED] Elementary Init");
    if (!elm_init(argc, argv))
      {
         e_error_message_show(_("Enlightenment cannot initialize Elementary!\n"));
+        TRACE_DS_END();
         _e_main_shutdown(-1);
      }
    TS("[DEFERRED] Elementary Init Done");
@@ -232,6 +236,7 @@ _e_main_subsystem_defer(void *data EINA_UNUSED)
    if (!edje_init())
      {
         e_error_message_show(_("Enlightenment cannot initialize Edje!\n"));
+        TRACE_DS_END();
         _e_main_shutdown(-1);
      }
    TS("[DEFERRED] Edje Init Done");
@@ -243,15 +248,20 @@ _e_main_subsystem_defer(void *data EINA_UNUSED)
         e_error_message_show(_("Enlightenment cannot initialize the FDO desktop system.\n"
                                "Perhaps you lack permissions on ~/.cache/efreet or are\n"
                                "out of memory or disk space?"));
+        TRACE_DS_END();
         _e_main_shutdown(-1);
      }
    TS("[DEFERRED] Efreet Init Done");
    _e_main_shutdown_push(efreet_shutdown);
 
+   TRACE_DS_END();
+   TRACE_DS_BEGIN(MAIN:DEFERRED INTERNAL SUBSYSTEMS INIT);
+
    TS("[DEFERRED] Screens Init: win");
    if (!e_win_init())
      {
         e_error_message_show(_("Enlightenment cannot setup elementary trap!\n"));
+        TRACE_DS_END();
         _e_main_shutdown(-1);
      }
    TS("[DEFERRED] Screens Init: win Done");
@@ -260,6 +270,7 @@ _e_main_subsystem_defer(void *data EINA_UNUSED)
    if (!e_pointer_init())
      {
         e_error_message_show(_("Enlightenment cannot set up its pointer system.\n"));
+        TRACE_DS_END();
         _e_main_shutdown(-1);
      }
 
@@ -270,6 +281,7 @@ _e_main_subsystem_defer(void *data EINA_UNUSED)
    if (!e_scale_init())
      {
         e_error_message_show(_("Enlightenment cannot set up its scale system.\n"));
+        TRACE_DS_END();
         _e_main_shutdown(-1);
      }
    TS("[DEFERRED E_Scale Init Done");
@@ -289,16 +301,23 @@ _e_main_subsystem_defer(void *data EINA_UNUSED)
    _e_main_shutdown_push(e_info_server_shutdown);
    TS("[DEFERRED] E_INFO_SERVER Done");
 
+   TRACE_DS_END();
+   TRACE_DS_BEGIN(MAIN:DEFERRED COMP JOB);
+
    /* try to do deferred job of any subsystems*/
    TS("[DEFERRED] Compositor's deferred job");
    e_comp_deferred_job();
    TS("[DEFERRED] Compositor's deferred job Done");
 
+   TRACE_DS_END();
+   TRACE_DS_BEGIN(MAIN:DEFERRED MODULE JOB);
+
    TS("[DEFERRED] E_Module's deferred job");
    e_module_deferred_job();
    TS("[DEFERRED] E_Module's deferred job Done");
 
    TRACE_DS_END();
+   TRACE_DS_END();
 
    return ECORE_CALLBACK_DONE;
 }
@@ -333,7 +352,7 @@ main(int argc, char **argv)
 #ifdef TS_DO
    t0 = t1 = t2 = ecore_time_unix_get();
 #endif
-   TRACE_DS_BEGIN(MAIN:Begin_Startup);
+   TRACE_DS_BEGIN(MAIN:BEGIN STARTUP);
    TS("Begin Startup");
 
    /* trap deadly bug signals and allow some form of sane recovery */
@@ -819,7 +838,7 @@ main(int argc, char **argv)
    if (e_config->show_splash)
      e_init_status_set(_("Setup Screens"));
 
-   TRACE_DS_BEGIN(MAIN:SCREEN_INIT);
+   TRACE_DS_BEGIN(MAIN:SCREEN INIT);
    TS("Screens Init");
    if (!_e_main_screens_init())
      {
@@ -1331,7 +1350,7 @@ main(int argc, char **argv)
    if (e_config->show_splash)
      e_init_status_set(_("Setup Screens"));
 
-   TRACE_DS_BEGIN(MAIN:SCREEN_INIT);
+   TRACE_DS_BEGIN(MAIN:SCREEN INIT);
    TS("Screens Init");
    if (!_e_main_screens_init())
      {

diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index d7cb374..ea60842 100644 (file)
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -286,8 +286,14 @@ e_module_all_load(void)
    E_Config_Module *em;
    char buf[128];
 
+   TRACE_DS_BEGIN(MODULE:ALL LOAD);
+
    _e_modules_initting = EINA_TRUE;
-   if (_e_module_path_lists) return;
+   if (_e_module_path_lists)
+     {
+        TRACE_DS_END();
+        return;
+     }
 
    e_config->modules =
      eina_list_sort(e_config->modules, 0, _e_module_sort_priority);
@@ -335,6 +341,8 @@ e_module_all_load(void)
      }
 
    unsetenv("E_MODULE_LOAD");
+
+   TRACE_DS_END();
 }
 
 E_API Eina_Bool
@@ -927,6 +935,7 @@ _e_module_cb_dialog_disable(void *data, E_Dialog *dia)
 static Eina_Bool
 _e_module_cb_idler(void *data EINA_UNUSED)
 {
+   TRACE_DS_BEGIN(MODULE:DELAYER MODULES);
    while (_e_modules_delayed)
      {
         const char *name;
@@ -957,6 +966,7 @@ _e_module_cb_idler(void *data EINA_UNUSED)
    if (_e_modules_delayed)
      {
         e_util_wakeup();
+        TRACE_DS_END();
         return ECORE_CALLBACK_RENEW;
      }
 
@@ -966,6 +976,7 @@ _e_module_cb_idler(void *data EINA_UNUSED)
    _e_module_whitelist_check();
 
    _e_module_idler = NULL;
+   TRACE_DS_END();
    return ECORE_CALLBACK_CANCEL;
 }
 

diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c
index 6a2f72b..36ea66a 100644 (file)
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -767,6 +767,8 @@ _e_xdg_shell_surface_cb_move(struct wl_client *client EINA_UNUSED, struct wl_res
 
    if ((ec->maximized) || (ec->fullscreen)) return;
 
+   TRACE_DS_BEGIN(SHELL:SURFACE MOVE REQUEST CB);
+
    switch (e_comp_wl->ptr.button)
      {
       case BTN_LEFT:
@@ -789,6 +791,8 @@ _e_xdg_shell_surface_cb_move(struct wl_client *client EINA_UNUSED, struct wl_res
                                    &ev.canvas.x, &ev.canvas.y);
 
    _e_shell_surface_mouse_down_helper(ec, &ev, EINA_TRUE);
+
+   TRACE_DS_END();
 }
 
 static void
@@ -814,6 +818,8 @@ _e_xdg_shell_surface_cb_resize(struct wl_client *client EINA_UNUSED, struct wl_r
 
    if ((ec->maximized) || (ec->fullscreen)) return;
 
+   TRACE_DS_BEGIN(SHELL:SURFACE RESIZE REQUEST CB);
+
    e_comp_wl->resize.resource = resource;
    e_comp_wl->resize.edges = edges;
    e_comp_wl->ptr.grab_x = e_comp_wl->ptr.x - wl_fixed_from_int(ec->client.x);
@@ -841,6 +847,8 @@ _e_xdg_shell_surface_cb_resize(struct wl_client *client EINA_UNUSED, struct wl_r
                                    &ev.canvas.x, &ev.canvas.y);
 
    _e_shell_surface_mouse_down_helper(ec, &ev, EINA_FALSE);
+
+   TRACE_DS_END();
 }
 
 static void
@@ -1056,12 +1064,15 @@ _e_xdg_shell_surface_map(struct wl_resource *resource)
 
    /* DBG("XDG_SHELL: Map Surface: %d", wl_resource_get_id(resource)); */
 
+   TRACE_DS_BEGIN(SHELL:MAP);
+
    /* get the client for this resource */
    if (!(ec = wl_resource_get_user_data(resource)))
      {
         wl_resource_post_error(resource,
                                WL_DISPLAY_ERROR_INVALID_OBJECT,
                                "No Client For Shell Surface");
+        TRACE_DS_END();
         return;
      }
 
@@ -1077,6 +1088,8 @@ _e_xdg_shell_surface_map(struct wl_resource *resource)
         /* if (ec->netwm.type == E_WINDOW_TYPE_POPUP_MENU) */
         /*   e_client_raise_latest_set(ec); */
      }
+
+   TRACE_DS_END();
 }
 
 static void
@@ -1086,12 +1099,15 @@ _e_xdg_shell_surface_unmap(struct wl_resource *resource)
 
    /* DBG("XDG_SHELL: Unmap Surface: %d", wl_resource_get_id(resource)); */
 
+   TRACE_DS_BEGIN(SHELL:UNMAP);
+
    /* get the client for this resource */
    if (!(ec = wl_resource_get_user_data(resource)))
      {
         wl_resource_post_error(resource,
                                WL_DISPLAY_ERROR_INVALID_OBJECT,
                                "No Client For Shell Surface");
+        TRACE_DS_END();
         return;
      }
 
@@ -1101,6 +1117,8 @@ _e_xdg_shell_surface_unmap(struct wl_resource *resource)
         evas_object_hide(ec->frame);
         ec->comp_data->mapped = EINA_FALSE;
      }
+
+   TRACE_DS_END();
 }
 
 static void

diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c
index c701c1b..7c0e900 100644 (file)
--- a/src/modules/wl_drm/e_mod_main.c
+++ b/src/modules/wl_drm/e_mod_main.c
@@ -779,10 +779,16 @@ e_modapi_init(E_Module *m)
 
    printf("LOAD WL_DRM MODULE\n");
 
+   TRACE_DS_BEGIN(WL_DRM:INIT);
+
    if (!(comp = e_comp))
      {
         comp = e_comp_new();
-        EINA_SAFETY_ON_NULL_RETURN_VAL(comp, NULL);
+        if (!comp)
+          {
+             TRACE_DS_END();
+             EINA_SAFETY_ON_NULL_RETURN_VAL(comp, NULL);
+          }
 
         comp->comp_type = E_PIXMAP_TYPE_WL;
      }
@@ -871,6 +877,7 @@ e_modapi_init(E_Module *m)
         else
           {
              fprintf(stderr, "Could not create ecore_evas_drm canvas");
+             TRACE_DS_END();
              return NULL;
           }
      }
@@ -891,8 +898,16 @@ e_modapi_init(E_Module *m)
 
    e_comp->screen = &drmiface;
 
-   if (!e_comp_wl_init()) return NULL;
-   if (!e_comp_canvas_init(w, h)) return NULL;
+   if (!e_comp_wl_init())
+     {
+        TRACE_DS_END();
+        return NULL;
+     }
+   if (!e_comp_canvas_init(w, h))
+     {
+        TRACE_DS_END();
+        return NULL;
+     }
 
    e_comp_wl->screenshooter.read_pixels = _drm_read_pixels;
 
@@ -929,6 +944,8 @@ e_modapi_init(E_Module *m)
    E_LIST_HANDLER_APPEND(event_handlers, ECORE_DRM_EVENT_INPUT_DEVICE_DEL,
                          _e_mod_drm_cb_input_device_del, comp);
 
+   TRACE_DS_END();
+
    return m;
 }