Remove unnecessary ttrace and add ttrace logs to another point

Change-Id: I21c3d60d357c46df968437e22f45dcf12455ff6c

diff --git a/src/evdev-fallback.c b/src/evdev-fallback.c
index cd1e1ca164335d9e7cccace97f2cf524a78eb6df..4ed17fd87b9bc7cc951c4e5a85f49cc8616d5030 100644 (file)
--- a/src/evdev-fallback.c
+++ b/src/evdev-fallback.c
@@ -168,12 +168,8 @@ fallback_flush_relative_motion(struct fallback_dispatch *dispatch,
        struct normalized_coords accel, unaccel;
        struct device_float_coords raw;
 
-       TRACE_BEGIN(fallback_flush_relative_motion);
-
-       if (!(device->seat_caps & EVDEV_DEVICE_POINTER)) {
-               TRACE_END();
+       if (!(device->seat_caps & EVDEV_DEVICE_POINTER))
                return;
-       }
 
        fallback_rotate_relative(dispatch, device);
 
@@ -184,10 +180,8 @@ fallback_flush_relative_motion(struct fallback_dispatch *dispatch,
        dispatch->rel.y = 0;
 
        /* Use unaccelerated deltas for pointing stick scroll */
-       if (post_trackpoint_scroll(device, unaccel, time)) {
-               TRACE_END();
+       if (post_trackpoint_scroll(device, unaccel, time))
                return;
-       }
 
        if (device->pointer.filter) {
                /* Apply pointer acceleration. */
@@ -201,13 +195,10 @@ fallback_flush_relative_motion(struct fallback_dispatch *dispatch,
                accel = unaccel;
        }
 
-       if (normalized_is_zero(accel) && normalized_is_zero(unaccel)) {
-               TRACE_END();
+       if (normalized_is_zero(accel) && normalized_is_zero(unaccel))
                return;
-       }
 
        pointer_notify_motion(base, time, &accel, &raw);
-       TRACE_END();
 }
 
 static void
@@ -544,13 +535,9 @@ fallback_process_key(struct fallback_dispatch *dispatch,
 {
        enum key_type type;
 
-       TRACE_BEGIN(fallbak_process_key);
-
        /* ignore kernel key repeat */
-       if (e->value == 2) {
-               TRACE_END();
+       if (e->value == 2)
                return;
-       }
 
        if (e->code == BTN_TOUCH) {
                if (!device->is_mt)
@@ -558,7 +545,6 @@ fallback_process_key(struct fallback_dispatch *dispatch,
                                                      device,
                                                      time,
                                                      e->value);
-               TRACE_END();
                return;
        }
 
@@ -574,7 +560,6 @@ fallback_process_key(struct fallback_dispatch *dispatch,
        case KEY_TYPE_BUTTON:
                if ((e->value && hw_is_key_down(dispatch, e->code)) ||
                    (e->value == 0 && !hw_is_key_down(dispatch, e->code))) {
-                   TRACE_END();
                        return;
                }
 
@@ -599,7 +584,6 @@ fallback_process_key(struct fallback_dispatch *dispatch,
        case KEY_TYPE_BUTTON:
                break;
        }
-       TRACE_END();
 }
 
 static void
@@ -858,12 +842,8 @@ fallback_process_relative(struct fallback_dispatch *dispatch,
                          struct evdev_device *device,
                          struct input_event *e, uint64_t time)
 {
-       TRACE_BEGIN(fallback_process_relative);
-
-       if (fallback_reject_relative(device, e, time)) {
-               TRACE_END();
+       if (fallback_reject_relative(device, e, time))
                return;
-       }
 
        switch (e->code) {
        case REL_X:
@@ -883,7 +863,6 @@ fallback_process_relative(struct fallback_dispatch *dispatch,
                dispatch->pending_event |= EVDEV_WHEEL;
                break;
        }
-       TRACE_END();
 }
 
 static inline void
@@ -892,13 +871,11 @@ fallback_process_absolute(struct fallback_dispatch *dispatch,
                          struct input_event *e,
                          uint64_t time)
 {
-       TRACE_BEGIN(fallback_process_absolute);
        if (device->is_mt) {
                fallback_process_touch(dispatch, device, e, time);
        } else {
                fallback_process_absolute_motion(dispatch, device, e);
        }
-       TRACE_END();
 }
 
 static inline bool

diff --git a/src/evdev.c b/src/evdev.c
index 16418d9c8216909ecef15db998fa4c79fc78c963..1f054d6aa5ab601ecb5c2e13c47d061baae2a306 100644 (file)
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1017,17 +1017,14 @@ evdev_process_event(struct evdev_device *device, struct input_event *e)
 
        libinput_timer_flush(evdev_libinput_context(device), time);
 
-       TRACE_BEGIN(evdev_process_event);
-
        dispatch->interface->process(dispatch, device, e, time);
-
-       TRACE_END();
 }
 
 static inline void
 evdev_device_dispatch_one(struct evdev_device *device,
                          struct input_event *ev)
 {
+       TRACE_BEGIN(evdev_device_dispatch_one);
        if (!device->mtdev) {
                evdev_process_event(device, ev);
        } else {
@@ -1040,6 +1037,7 @@ evdev_device_dispatch_one(struct evdev_device *device,
                        }
                }
        }
+       TRACE_END();
 }
 
 static int