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 2f92d842cd79c0a91b94bf6416a2538250b8ab31..1d853913cef32ab8dd7bc1250804a0d39e9291ed 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 c2e080b8faedfce58791556b11c242152c55cc58..a0dbada519ac9790efe00800ec10254e01a5e3fc 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 4605e042e3396cfe04d83c03d0d8c81e129abb75..e308e38f5d13404d1e655ef86302dea60f38cd1a 100644 (file)
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -2395,7 +2395,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);
 
@@ -2408,7 +2408,7 @@ notify_added_device(struct libinput_device *device)
         * pretend to free it  */
        free(added_device_event);
 #endif
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2416,7 +2416,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);
 
@@ -2429,7 +2429,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
@@ -2482,10 +2482,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;
        }
 
@@ -2504,7 +2504,7 @@ keyboard_notify_key(struct libinput_device *device,
                          LIBINPUT_EVENT_KEYBOARD_KEY,
                          &key_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2515,10 +2515,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;
        }
        
@@ -2534,7 +2534,7 @@ pointer_notify_motion(struct libinput_device *device,
                          LIBINPUT_EVENT_POINTER_MOTION,
                          &motion_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2544,10 +2544,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;
        }
 
@@ -2562,7 +2562,7 @@ pointer_notify_motion_absolute(struct libinput_device *device,
                          LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE,
                          &motion_absolute_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2574,10 +2574,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;
        }
 
@@ -2598,7 +2598,7 @@ pointer_notify_button(struct libinput_device *device,
                          LIBINPUT_EVENT_POINTER_BUTTON,
                          &button_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2611,10 +2611,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;
        }
 
@@ -2632,7 +2632,7 @@ pointer_notify_axis(struct libinput_device *device,
                          LIBINPUT_EVENT_POINTER_AXIS,
                          &axis_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2646,10 +2646,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;
        }
 
@@ -2668,7 +2668,7 @@ touch_notify_touch_down(struct libinput_device *device,
                          LIBINPUT_EVENT_TOUCH_DOWN,
                          &touch_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2682,10 +2682,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;
        }
 
@@ -2704,7 +2704,7 @@ touch_notify_touch_motion(struct libinput_device *device,
                          LIBINPUT_EVENT_TOUCH_MOTION,
                          &touch_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -2715,10 +2715,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;
        }
 
@@ -2734,7 +2734,7 @@ touch_notify_touch_up(struct libinput_device *device,
                          LIBINPUT_EVENT_TOUCH_UP,
                          &touch_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void