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 afd4d3daa9d87aa5acc8c0db8fd96390cd4d446a..1ba81ad86c2ffcb1b64fc7ffd1e1fc8d9963a439 100644 (file)
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1252,7 +1252,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 {
@@ -1265,7 +1265,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 863889d7a58e4a37c880a1b2f2a9249656664b0e..86cb894fa7b843a9f45ddbb4044977d391a337a3 100644 (file)
--- a/src/libinput-private.h
+++ b/src/libinput-private.h
@@ -33,11 +33,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 b9c3c82052bfd84f905eae8e47cb73fcd2d1f721..f9ae1ed53f8f6ccaa7b9472b41bb04ecc16f6ffe 100644 (file)
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -1167,11 +1167,11 @@ 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);
        if (!added_device_event) {
-               TRACE_END();
+               TRACE_INPUT_END();
                return;
        }
 
@@ -1179,7 +1179,7 @@ notify_added_device(struct libinput_device *device)
                        LIBINPUT_EVENT_DEVICE_ADDED,
                        &added_device_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -1187,11 +1187,11 @@ 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);
        if (!removed_device_event) {
-               TRACE_END();
+               TRACE_INPUT_END();
                return;
        }
 
@@ -1199,7 +1199,7 @@ notify_removed_device(struct libinput_device *device)
                        LIBINPUT_EVENT_DEVICE_REMOVED,
                        &removed_device_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -1211,11 +1211,11 @@ 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);
 
        key_event = zalloc(sizeof *key_event);
        if (!key_event) {
-               TRACE_END();
+               TRACE_INPUT_END();
                return;
        }
 
@@ -1232,7 +1232,7 @@ keyboard_notify_key(struct libinput_device *device,
                          LIBINPUT_EVENT_KEYBOARD_KEY,
                          &key_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -1245,11 +1245,11 @@ pointer_notify_motion(struct libinput_device *device,
 {
        struct libinput_event_pointer *motion_event;
 
-       TRACE_BEGIN(pointer_notify_motion);
+       TRACE_INPUT_BEGIN(pointer_notify_motion);
 
        motion_event = zalloc(sizeof *motion_event);
        if (!motion_event) {
-               TRACE_END();
+               TRACE_INPUT_END();
                return;
        }
 
@@ -1265,7 +1265,7 @@ pointer_notify_motion(struct libinput_device *device,
                          LIBINPUT_EVENT_POINTER_MOTION,
                          &motion_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -1276,11 +1276,11 @@ 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);
 
        motion_absolute_event = zalloc(sizeof *motion_absolute_event);
        if (!motion_absolute_event) {
-               TRACE_END();
+               TRACE_INPUT_END();
                return;
        }
 
@@ -1294,7 +1294,7 @@ pointer_notify_motion_absolute(struct libinput_device *device,
                          LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE,
                          &motion_absolute_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -1306,11 +1306,11 @@ 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);
 
        button_event = zalloc(sizeof *button_event);
        if (!button_event) {
-               TRACE_END();
+               TRACE_INPUT_END();
                return;
        }
 
@@ -1329,7 +1329,7 @@ pointer_notify_button(struct libinput_device *device,
                          LIBINPUT_EVENT_POINTER_BUTTON,
                          &button_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -1342,11 +1342,11 @@ pointer_notify_axis(struct libinput_device *device,
 {
        struct libinput_event_pointer *axis_event;
 
-       TRACE_BEGIN(pointer_notify_axis);
+       TRACE_INPUT_BEGIN(pointer_notify_axis);
 
        axis_event = zalloc(sizeof *axis_event);
        if (!axis_event) {
-               TRACE_END();
+               TRACE_INPUT_END();
                return;
        }
 
@@ -1364,7 +1364,7 @@ pointer_notify_axis(struct libinput_device *device,
                          LIBINPUT_EVENT_POINTER_AXIS,
                          &axis_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -1379,11 +1379,11 @@ 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);
 
        touch_event = zalloc(sizeof *touch_event);
        if (!touch_event) {
-               TRACE_END();
+               TRACE_INPUT_END();
                return;
        }
 
@@ -1401,7 +1401,7 @@ touch_notify_touch_down(struct libinput_device *device,
                          LIBINPUT_EVENT_TOUCH_DOWN,
                          &touch_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -1416,11 +1416,11 @@ 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);
 
        touch_event = zalloc(sizeof *touch_event);
        if (!touch_event) {
-               TRACE_END();
+               TRACE_INPUT_END();
                return;
        }
 
@@ -1438,7 +1438,7 @@ touch_notify_touch_motion(struct libinput_device *device,
                          LIBINPUT_EVENT_TOUCH_MOTION,
                          &touch_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -1449,11 +1449,11 @@ 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);
 
        touch_event = zalloc(sizeof *touch_event);
        if (!touch_event) {
-               TRACE_END();
+               TRACE_INPUT_END();
                return;
        }
 
@@ -1467,7 +1467,7 @@ touch_notify_touch_up(struct libinput_device *device,
                          LIBINPUT_EVENT_TOUCH_UP,
                          &touch_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 void
@@ -1476,11 +1476,11 @@ touch_notify_frame(struct libinput_device *device,
 {
        struct libinput_event_touch *touch_event;
 
-       TRACE_BEGIN(touch_notify_frame);
+       TRACE_INPUT_BEGIN(touch_notify_frame);
 
        touch_event = zalloc(sizeof *touch_event);
        if (!touch_event) {
-               TRACE_END();
+               TRACE_INPUT_END();
                return;
        }
 
@@ -1492,7 +1492,7 @@ touch_notify_frame(struct libinput_device *device,
                          LIBINPUT_EVENT_TOUCH_FRAME,
                          &touch_event->base);
 
-       TRACE_END();
+       TRACE_INPUT_END();
 }
 
 static void