Modify a ttrace macro name TRACE_BEGIN to TRACE_INPUT_BEGIN

Change-Id: I2559a8156056fcbd359008e0da59615ff7270c7d

diff --git a/src/evdev.c b/src/evdev.c
index 65329b3..8c7f744 100644 (file)
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1114,7 +1114,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 {
@@ -1127,7 +1127,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 501bf24..09a6dad 100644 (file)
--- a/src/libinput-private.h
+++ b/src/libinput-private.h
@@ -45,11 +45,11 @@
 #ifdef ENABLE_TTRACE
 #include <ttrace.h>
 
-#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 fe28c86..5ce9cac 100644 (file)
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -2480,7 +2480,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);
 
@@ -2493,7 +2493,7 @@ notify_added_device(struct libinput_device *device)
         * pretend to free it  */
        free(added_device_event);
 #endif
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2501,7 +2501,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);
 
@@ -2514,7 +2514,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
@@ -2567,10 +2567,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;
        }
 
@@ -2589,7 +2589,7 @@ keyboard_notify_key(struct libinput_device *device,
                          LIBINPUT_EVENT_KEYBOARD_KEY,
                          &key_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2600,10 +2600,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;
        }
        
@@ -2619,7 +2619,7 @@ pointer_notify_motion(struct libinput_device *device,
                          LIBINPUT_EVENT_POINTER_MOTION,
                          &motion_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2629,10 +2629,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;
        }
 
@@ -2647,7 +2647,7 @@ pointer_notify_motion_absolute(struct libinput_device *device,
                          LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE,
                          &motion_absolute_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2659,10 +2659,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;
        }
 
@@ -2683,7 +2683,7 @@ pointer_notify_button(struct libinput_device *device,
                          LIBINPUT_EVENT_POINTER_BUTTON,
                          &button_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2764,10 +2764,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;
        }
 
@@ -2786,7 +2786,7 @@ pointer_notify_axis_legacy_wheel(struct libinput_device *device,
                          LIBINPUT_EVENT_POINTER_AXIS,
                          &axis_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2831,10 +2831,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;
        }
 
@@ -2853,7 +2853,7 @@ touch_notify_touch_down(struct libinput_device *device,
                          LIBINPUT_EVENT_TOUCH_DOWN,
                          &touch_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2867,10 +2867,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;
        }
 
@@ -2889,7 +2889,7 @@ touch_notify_touch_motion(struct libinput_device *device,
                          LIBINPUT_EVENT_TOUCH_MOTION,
                          &touch_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2900,10 +2900,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;
        }
 
@@ -2919,7 +2919,7 @@ touch_notify_touch_up(struct libinput_device *device,
                          LIBINPUT_EVENT_TOUCH_UP,
                          &touch_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void