From 8afe01e2ad5359b69ba0fafa7439ee9dc2869393 Mon Sep 17 00:00:00 2001 From: JengHyun Kang Date: Fri, 26 Feb 2016 17:40:45 +0900 Subject: [PATCH] Modify a ttrace macro name TRACE_BEGIN to TRACE_INPUT_BEGIN Change-Id: I2559a8156056fcbd359008e0da59615ff7270c7d --- src/evdev.c | 4 +-- src/libinput-private.h | 8 +++--- src/libinput.c | 56 +++++++++++++++++++++--------------------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index 8f898c08..2b4d0231 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1113,7 +1113,7 @@ static inline void evdev_device_dispatch_one(struct evdev_device *device, struct input_event *ev) { - TRACE_BEGIN(evdev_device_dispatch_one); + TRACE_INPUT_BEGIN(evdev_device_dispatch_one); if (!device->mtdev) { evdev_process_event(device, ev); } else { @@ -1126,7 +1126,7 @@ evdev_device_dispatch_one(struct evdev_device *device, } } } - TRACE_END(); + TRACE_INPUT_END(); } static int diff --git a/src/libinput-private.h b/src/libinput-private.h index 19cec18b..5de145fe 100644 --- a/src/libinput-private.h +++ b/src/libinput-private.h @@ -45,11 +45,11 @@ #ifdef ENABLE_TTRACE #include -#define TRACE_BEGIN(NAME) traceBegin(TTRACE_TAG_INPUT, "INPUT:LIBINPUT:"#NAME) -#define TRACE_END() traceEnd(TTRACE_TAG_INPUT) +#define TRACE_INPUT_BEGIN(NAME) traceBegin(TTRACE_TAG_INPUT, "INPUT:LIBINPUT:"#NAME) +#define TRACE_INPUT_END() traceEnd(TTRACE_TAG_INPUT) #else -#define TRACE_BEGIN(NAME) -#define TRACE_END() +#define TRACE_INPUT_BEGIN(NAME) +#define TRACE_INPUT_END() #endif struct libinput_source; diff --git a/src/libinput.c b/src/libinput.c index 640ef0ee..28188596 100644 --- a/src/libinput.c +++ b/src/libinput.c @@ -2481,7 +2481,7 @@ notify_added_device(struct libinput_device *device) { struct libinput_event_device_notify *added_device_event; - TRACE_BEGIN(notify_added_device); + TRACE_INPUT_BEGIN(notify_added_device); added_device_event = zalloc(sizeof *added_device_event); @@ -2494,7 +2494,7 @@ notify_added_device(struct libinput_device *device) * pretend to free it */ free(added_device_event); #endif - TRACE_END(); + TRACE_INPUT_END(); } void @@ -2502,7 +2502,7 @@ notify_removed_device(struct libinput_device *device) { struct libinput_event_device_notify *removed_device_event; - TRACE_BEGIN(notify_removed_device); + TRACE_INPUT_BEGIN(notify_removed_device); removed_device_event = zalloc(sizeof *removed_device_event); @@ -2515,7 +2515,7 @@ notify_removed_device(struct libinput_device *device) * pretend to free it */ free(removed_device_event); #endif - TRACE_END(); + TRACE_INPUT_END(); } static inline bool @@ -2568,10 +2568,10 @@ keyboard_notify_key(struct libinput_device *device, struct libinput_event_keyboard *key_event; uint32_t seat_key_count; - TRACE_BEGIN(keyboard_notify_key); + TRACE_INPUT_BEGIN(keyboard_notify_key); if (!device_has_cap(device, LIBINPUT_DEVICE_CAP_KEYBOARD)) { - TRACE_END(); + TRACE_INPUT_END(); return; } @@ -2590,7 +2590,7 @@ keyboard_notify_key(struct libinput_device *device, LIBINPUT_EVENT_KEYBOARD_KEY, &key_event->base); - TRACE_END(); + TRACE_INPUT_END(); } void @@ -2601,10 +2601,10 @@ pointer_notify_motion(struct libinput_device *device, { struct libinput_event_pointer *motion_event; - TRACE_BEGIN(pointer_notify_motion); + TRACE_INPUT_BEGIN(pointer_notify_motion); if (!device_has_cap(device, LIBINPUT_DEVICE_CAP_POINTER)) { - TRACE_END(); + TRACE_INPUT_END(); return; } @@ -2620,7 +2620,7 @@ pointer_notify_motion(struct libinput_device *device, LIBINPUT_EVENT_POINTER_MOTION, &motion_event->base); - TRACE_END(); + TRACE_INPUT_END(); } void @@ -2630,10 +2630,10 @@ pointer_notify_motion_absolute(struct libinput_device *device, { struct libinput_event_pointer *motion_absolute_event; - TRACE_BEGIN(pointer_notify_motion_absolute); + TRACE_INPUT_BEGIN(pointer_notify_motion_absolute); if (!device_has_cap(device, LIBINPUT_DEVICE_CAP_POINTER)) { - TRACE_END(); + TRACE_INPUT_END(); return; } @@ -2648,7 +2648,7 @@ pointer_notify_motion_absolute(struct libinput_device *device, LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE, &motion_absolute_event->base); - TRACE_END(); + TRACE_INPUT_END(); } void @@ -2660,10 +2660,10 @@ pointer_notify_button(struct libinput_device *device, struct libinput_event_pointer *button_event; int32_t seat_button_count; - TRACE_BEGIN(pointer_notify_button); + TRACE_INPUT_BEGIN(pointer_notify_button); if (!device_has_cap(device, LIBINPUT_DEVICE_CAP_POINTER)) { - TRACE_END(); + TRACE_INPUT_END(); return; } @@ -2684,7 +2684,7 @@ pointer_notify_button(struct libinput_device *device, LIBINPUT_EVENT_POINTER_BUTTON, &button_event->base); - TRACE_END(); + TRACE_INPUT_END(); } void @@ -2765,10 +2765,10 @@ pointer_notify_axis_legacy_wheel(struct libinput_device *device, struct libinput_event_pointer *axis_event; const struct wheel_v120 zero_v120 = {0}; - TRACE_BEGIN(pointer_notify_axis); + TRACE_INPUT_BEGIN(pointer_notify_axis); if (!device_has_cap(device, LIBINPUT_DEVICE_CAP_POINTER)) { - TRACE_END(); + TRACE_INPUT_END(); return; } @@ -2787,7 +2787,7 @@ pointer_notify_axis_legacy_wheel(struct libinput_device *device, LIBINPUT_EVENT_POINTER_AXIS, &axis_event->base); - TRACE_END(); + TRACE_INPUT_END(); } void @@ -2832,10 +2832,10 @@ touch_notify_touch_down(struct libinput_device *device, { struct libinput_event_touch *touch_event; - TRACE_BEGIN(touch_notify_touch_down); + TRACE_INPUT_BEGIN(touch_notify_touch_down); if (!device_has_cap(device, LIBINPUT_DEVICE_CAP_TOUCH)) { - TRACE_END(); + TRACE_INPUT_END(); return; } @@ -2854,7 +2854,7 @@ touch_notify_touch_down(struct libinput_device *device, LIBINPUT_EVENT_TOUCH_DOWN, &touch_event->base); - TRACE_END(); + TRACE_INPUT_END(); } void @@ -2868,10 +2868,10 @@ touch_notify_touch_motion(struct libinput_device *device, { struct libinput_event_touch *touch_event; - TRACE_BEGIN(touch_notify_touch_motion); + TRACE_INPUT_BEGIN(touch_notify_touch_motion); if (!device_has_cap(device, LIBINPUT_DEVICE_CAP_TOUCH)) { - TRACE_END(); + TRACE_INPUT_END(); return; } @@ -2890,7 +2890,7 @@ touch_notify_touch_motion(struct libinput_device *device, LIBINPUT_EVENT_TOUCH_MOTION, &touch_event->base); - TRACE_END(); + TRACE_INPUT_END(); } void @@ -2901,10 +2901,10 @@ touch_notify_touch_up(struct libinput_device *device, { struct libinput_event_touch *touch_event; - TRACE_BEGIN(touch_notify_touch_up); + TRACE_INPUT_BEGIN(touch_notify_touch_up); if (!device_has_cap(device, LIBINPUT_DEVICE_CAP_TOUCH)) { - TRACE_END(); + TRACE_INPUT_END(); return; } @@ -2920,7 +2920,7 @@ touch_notify_touch_up(struct libinput_device *device, LIBINPUT_EVENT_TOUCH_UP, &touch_event->base); - TRACE_END(); + TRACE_INPUT_END(); } void -- 2.34.1