From 810c4d720b4b48c8adfaccb453e58bfa2c58ec70 Mon Sep 17 00:00:00 2001
From: JengHyun Kang <jhyuni.kang@samsung.com>
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-fallback.c | 33 +++++----------------------------
 src/evdev.c          |  6 ++----
 2 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/src/evdev-fallback.c b/src/evdev-fallback.c
index 688799ee..832b9f4e 100644
--- a/src/evdev-fallback.c
+++ b/src/evdev-fallback.c
@@ -173,12 +173,8 @@ fallback_flush_relative_motion(struct fallback_dispatch *dispatch,
 	struct libinput_device *base = &device->base;
 	struct normalized_coords accel;
 
-	TRACE_BEGIN(fallback_flush_relative_motion);
-
-	if (!(device->seat_caps & EVDEV_DEVICE_POINTER)) {
-		TRACE_END();
+	if (!(device->seat_caps & EVDEV_DEVICE_POINTER))
 		return;
-	}
 
 	struct device_float_coords raw = fallback_rotate_relative(dispatch, device);
 
@@ -186,10 +182,8 @@ fallback_flush_relative_motion(struct fallback_dispatch *dispatch,
 	dispatch->rel.y = 0;
 
 	/* Use unaccelerated deltas for pointing stick scroll */
-	if (post_button_scroll(device, raw, time)) {
-		TRACE_END();
+	if (post_button_scroll(device, raw, time))
 		return;
-	}
 
 	if (device->pointer.filter) {
 		/* Apply pointer acceleration. */
@@ -203,13 +197,10 @@ fallback_flush_relative_motion(struct fallback_dispatch *dispatch,
 		accel.x = accel.y = 0;
 	}
 
-	if (normalized_is_zero(accel)) {
-		TRACE_END();
+	if (normalized_is_zero(accel))
 		return;
-	}
 
 	pointer_notify_motion(base, time, &accel, &raw);
-	TRACE_END();
 }
 
 static void
@@ -489,13 +480,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)
@@ -503,7 +490,6 @@ fallback_process_key(struct fallback_dispatch *dispatch,
 						      device,
 						      time,
 						      e->value);
-		TRACE_END();
 		return;
 	}
 
@@ -519,7 +505,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;
 		}
 
@@ -544,7 +529,6 @@ fallback_process_key(struct fallback_dispatch *dispatch,
 	case KEY_TYPE_BUTTON:
 		break;
 	}
-	TRACE_END();
 }
 
 static void
@@ -803,12 +787,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:
@@ -822,7 +802,6 @@ fallback_process_relative(struct fallback_dispatch *dispatch,
 	}
 
 	fallback_wheel_process_relative(dispatch, device, e, time);
-	TRACE_END();
 }
 
 static inline void
@@ -831,13 +810,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 039a2880..ecd8662d 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1105,17 +1105,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 {
@@ -1128,6 +1125,7 @@ evdev_device_dispatch_one(struct evdev_device *device,
 			}
 		}
 	}
+	TRACE_END();
 }
 
 static int
-- 
2.34.1