From ae232fe9653612b64d63bfa5509cf1a73d43ae5b Mon Sep 17 00:00:00 2001 From: JengHyun Kang Date: Wed, 24 Feb 2016 14:03:27 +0900 Subject: [PATCH] Remove unnecessary ttrace and add ttrace logs to another point Change-Id: I21c3d60d357c46df968437e22f45dcf12455ff6c --- src/evdev.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index 0377687c..afd4d3da 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -340,14 +340,11 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time) .orientation = DEFAULT_TOUCH_ORIENTATION }; - TRACE_BEGIN(evdev_flush_pending_event); - slot = device->mt.slot; slot_data = &device->mt.slots[slot]; switch (device->pending_event) { case EVDEV_NONE: - TRACE_END(); return; case EVDEV_RELATIVE_MOTION: dx_unaccel = device->rel.dx / ((double) device->dpi / @@ -498,7 +495,6 @@ evdev_flush_pending_event(struct evdev_device *device, uint64_t time) } device->pending_event = EVDEV_NONE; - TRACE_END(); } static enum evdev_key_type @@ -571,18 +567,13 @@ evdev_process_key(struct evdev_device *device, { enum evdev_key_type type; - TRACE_BEGIN(evdev_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) evdev_process_touch_button(device, time, e->value); - TRACE_END(); return; } @@ -599,7 +590,6 @@ evdev_process_key(struct evdev_device *device, case EVDEV_KEY_TYPE_KEY: case EVDEV_KEY_TYPE_BUTTON: if (!hw_is_key_down(device, e->code)) { - TRACE_END(); return; } } @@ -632,7 +622,6 @@ evdev_process_key(struct evdev_device *device, LIBINPUT_BUTTON_STATE_RELEASED); break; } - TRACE_END(); } static void @@ -726,7 +715,6 @@ static inline void evdev_process_relative(struct evdev_device *device, struct input_event *e, uint64_t time) { - TRACE_BEGIN(evdev_process_relative); switch (e->code) { case REL_X: if (device->pending_event != EVDEV_RELATIVE_MOTION) @@ -765,7 +753,6 @@ evdev_process_relative(struct evdev_device *device, 0.0); break; } - TRACE_END(); } static inline void @@ -773,13 +760,11 @@ evdev_process_absolute(struct evdev_device *device, struct input_event *e, uint64_t time) { - TRACE_BEGIN(evdev_process_absolute); if (device->is_mt) { evdev_process_touch(device, e, time); } else { evdev_process_absolute_motion(device, e); } - TRACE_END(); } static inline bool @@ -1260,17 +1245,14 @@ evdev_process_event(struct evdev_device *device, struct input_event *e) struct evdev_dispatch *dispatch = device->dispatch; uint64_t time = e->time.tv_sec * 1000ULL + e->time.tv_usec / 1000; - 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 { @@ -1283,6 +1265,7 @@ evdev_device_dispatch_one(struct evdev_device *device, } } } + TRACE_END(); } static int -- 2.34.1