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 a1d4dfd020a5c7d3d50fb53650ba06e4cb77e125..253a701c3c25e692f052be0824a4ccee72a3f114 100644 (file)
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1024,7 +1024,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 {
@@ -1037,7 +1037,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 3431ba988f23cd28f8f4a5d6a0b1ed075cec3c34..6e571d0ec36110b61d843c3a3cc93b903db82c2b 100644 (file)
--- a/src/libinput-private.h
+++ b/src/libinput-private.h
@@ -44,11 +44,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 d46b73a8fc1c26ebffc7da5707f9ae3e8aeeb22b..5a60722493ec31c44c1684e72ff8e209357ba2c9 100644 (file)
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -2386,7 +2386,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);
 
@@ -2399,7 +2399,7 @@ notify_added_device(struct libinput_device *device)
         * pretend to free it  */
        free(added_device_event);
 #endif
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2407,7 +2407,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);
 
@@ -2420,7 +2420,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
@@ -2473,10 +2473,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;
        }
 
@@ -2495,7 +2495,7 @@ keyboard_notify_key(struct libinput_device *device,
                          LIBINPUT_EVENT_KEYBOARD_KEY,
                          &key_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2506,10 +2506,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;
        }
        
@@ -2525,7 +2525,7 @@ pointer_notify_motion(struct libinput_device *device,
                          LIBINPUT_EVENT_POINTER_MOTION,
                          &motion_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2535,10 +2535,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;
        }
 
@@ -2553,7 +2553,7 @@ pointer_notify_motion_absolute(struct libinput_device *device,
                          LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE,
                          &motion_absolute_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2565,10 +2565,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;
        }
 
@@ -2589,7 +2589,7 @@ pointer_notify_button(struct libinput_device *device,
                          LIBINPUT_EVENT_POINTER_BUTTON,
                          &button_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2602,10 +2602,10 @@ pointer_notify_axis(struct libinput_device *device,
 {
        struct libinput_event_pointer *axis_event;
 
-       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;
        }
 
@@ -2623,7 +2623,7 @@ pointer_notify_axis(struct libinput_device *device,
                          LIBINPUT_EVENT_POINTER_AXIS,
                          &axis_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2637,10 +2637,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;
        }
 
@@ -2659,7 +2659,7 @@ touch_notify_touch_down(struct libinput_device *device,
                          LIBINPUT_EVENT_TOUCH_DOWN,
                          &touch_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2673,10 +2673,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;
        }
 
@@ -2695,7 +2695,7 @@ touch_notify_touch_motion(struct libinput_device *device,
                          LIBINPUT_EVENT_TOUCH_MOTION,
                          &touch_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2706,10 +2706,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;
        }
 
@@ -2725,7 +2725,7 @@ touch_notify_touch_up(struct libinput_device *device,
                          LIBINPUT_EVENT_TOUCH_UP,
                          &touch_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void