diff mbox

[13/17] wctablet: drop DPRINTF, add trace events instead

Message ID 1483692945-9866-14-git-send-email-kraxel@redhat.com
State New
Headers show

Commit Message

Gerd Hoffmann Jan. 6, 2017, 8:55 a.m. UTC 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 Makefile.objs         |  1 +
 backends/trace-events |  8 ++++++++
 backends/wctablet.c   | 18 +++++++-----------
 3 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 backends/trace-events

Comments

Eric Blake Jan. 6, 2017, 1:19 p.m. UTC | #1 
On 01/06/2017 02:55 AM, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  Makefile.objs         |  1 +
>  backends/trace-events |  8 ++++++++
>  backends/wctablet.c   | 18 +++++++-----------
>  3 files changed, 16 insertions(+), 11 deletions(-)
>  create mode 100644 backends/trace-events

Is this worth squashing into 1/17? It would be less churn, but then
diverges more from the original author's patch.


>  
> -#define DEBUG_WCTABLET_MOUSE
> -
> -#ifdef DEBUG_WCTABLET_MOUSE
> -#define DPRINTF(fmt, ...) \
> -do { fprintf(stderr, fmt , ## __VA_ARGS__); } while (0)
> -#else
> -#define DPRINTF(fmt, ...) \
> -do {} while (0)
> -#endif

I ask because I wonder if we should even (if only temporarily) have this
poor style of DPRINTF in the tree, compared to a version not prone to
bitrot (see my comments on patch 1).
diff mbox

Patch

diff --git a/Makefile.objs b/Makefile.objs
index 51c36a4..df7d0cb 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -124,6 +124,7 @@  trace-events-y += crypto/trace-events
 trace-events-y += io/trace-events
 trace-events-y += migration/trace-events
 trace-events-y += block/trace-events
+trace-events-y += backends/trace-events
 trace-events-y += hw/block/trace-events
 trace-events-y += hw/char/trace-events
 trace-events-y += hw/intc/trace-events
diff --git a/backends/trace-events b/backends/trace-events
new file mode 100644
index 0000000..f8a2e2b
--- /dev/null
+++ b/backends/trace-events
@@ -0,0 +1,8 @@ 
+# See docs/tracing.txt for syntax documentation.
+
+# backends/wctablet.c
+wct_init(void) ""
+wct_cmd_re(void) ""
+wct_cmd_ts(int input) "0x%02x"
+wct_cmd_other(const char *cmd) "%s"
+wct_speed(int speed) "%d"
diff --git a/backends/wctablet.c b/backends/wctablet.c
index 28daf26..07d2a7e 100644
--- a/backends/wctablet.c
+++ b/backends/wctablet.c
@@ -31,18 +31,9 @@ 
 #include "sysemu/char.h"
 #include "ui/console.h"
 #include "ui/input.h"
+#include "trace.h"
 
 
-#define DEBUG_WCTABLET_MOUSE
-
-#ifdef DEBUG_WCTABLET_MOUSE
-#define DPRINTF(fmt, ...) \
-do { fprintf(stderr, fmt , ## __VA_ARGS__); } while (0)
-#else
-#define DPRINTF(fmt, ...) \
-do {} while (0)
-#endif
-
 #define WC_BUSY_STATE 1
 #define WC_BUSY_WITH_CODES 3
 #define WC_WAITING_STATE 2
@@ -127,7 +118,6 @@  static void wctablet_event(void *opaque, int x,
         return;
     }
 
-    DPRINTF("x= %d; y= %d; buttons=%x\n", x, y, buttons_state);
     int newX = x * 0.1537;
     int nexY = y * 0.1152;
 
@@ -192,6 +182,7 @@  static int wctablet_chr_write(struct CharDriverState *s,
 
     if (strncmp((char *)tablet->query, "~#", 2) == 0) {
         /* init / detect sequence */
+        trace_wct_init();
         wctablet_shift_input(tablet, 2);
         wctablet_queue_output(tablet, WC_MODEL_STRING,
                               WC_MODEL_STRING_LENGTH);
@@ -211,6 +202,7 @@  static int wctablet_chr_write(struct CharDriverState *s,
     /* process commands */
     if (strncmp((char *)tablet->query, "RE", 2) == 0 &&
         clen == 2) {
+        trace_wct_cmd_re();
         wctablet_shift_input(tablet, 3);
         wctablet_queue_output(tablet, WC_CONFIG_STRING,
                               WC_CONFIG_STRING_LENGTH);
@@ -227,10 +219,13 @@  static int wctablet_chr_write(struct CharDriverState *s,
             0x7f,
             0x00,
         };
+        trace_wct_cmd_ts(input);
         wctablet_shift_input(tablet, 4);
         wctablet_queue_output(tablet, codes, 7);
 
     } else {
+        tablet->query[clen] = 0; /* terminate line for printing */
+        trace_wct_cmd_other((char *)tablet->query);
         wctablet_shift_input(tablet, clen + 1);
 
     }
@@ -247,6 +242,7 @@  static int wctablet_chr_ioctl(CharDriverState *s, int cmd, void *arg)
     case CHR_IOCTL_SERIAL_SET_PARAMS:
         ssp = arg;
         if (tablet->line_speed != ssp->speed) {
+            trace_wct_speed(ssp->speed);
             wctablet_reset(tablet);
             tablet->line_speed = ssp->speed;
         }