From 864089d2f64c6624aac3f52ece2c31dff6a8f59f Mon Sep 17 00:00:00 2001 From: Markus Metzger Date: Mon, 30 Sep 2013 15:00:16 +0200 Subject: [PATCH] btrace: uppercase btrace_read_type 2014-01-16 Markus Metzger * common/btrace-common.h (btrace_read_type) : Change to ... (btrace_read_type) : ... this. Update users. (btrace_read_type) : Change to ... (btrace_read_type) : ... this. Update users. --- gdb/ChangeLog | 8 ++++++++ gdb/btrace.c | 2 +- gdb/common/btrace-common.h | 4 ++-- gdb/common/linux-btrace.c | 2 +- gdb/gdbserver/server.c | 4 ++-- gdb/remote.c | 4 ++-- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e1e6c74..153c508 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2014-01-16 Markus Metzger + * common/btrace-common.h (btrace_read_type) : + Change to ... + (btrace_read_type) : ... this. Update users. + (btrace_read_type) : Change to ... + (btrace_read_type) : ... this. Update users. + +2014-01-16 Markus Metzger + * common/linux-btrace.c (linux_read_btrace): Free trace from previous iteration. diff --git a/gdb/btrace.c b/gdb/btrace.c index 7f26e1e..df62da8 100644 --- a/gdb/btrace.c +++ b/gdb/btrace.c @@ -401,7 +401,7 @@ btrace_fetch (struct thread_info *tp) if (btinfo->target == NULL) return; - btrace = target_read_btrace (btinfo->target, btrace_read_new); + btrace = target_read_btrace (btinfo->target, BTRACE_READ_NEW); if (VEC_empty (btrace_block_s, btrace)) return; diff --git a/gdb/common/btrace-common.h b/gdb/common/btrace-common.h index c7d8116..1d389af 100644 --- a/gdb/common/btrace-common.h +++ b/gdb/common/btrace-common.h @@ -64,10 +64,10 @@ struct btrace_target_info; enum btrace_read_type { /* Send all available trace. */ - btrace_read_all, + BTRACE_READ_ALL, /* Send all available trace, if it changed. */ - btrace_read_new + BTRACE_READ_NEW }; #endif /* BTRACE_COMMON_H */ diff --git a/gdb/common/linux-btrace.c b/gdb/common/linux-btrace.c index 0d36ea5..5474049 100644 --- a/gdb/common/linux-btrace.c +++ b/gdb/common/linux-btrace.c @@ -509,7 +509,7 @@ linux_read_btrace (struct btrace_target_info *tinfo, unsigned long data_head, retries = 5; size_t buffer_size; - if (type == btrace_read_new && !linux_btrace_has_changed (tinfo)) + if (type == BTRACE_READ_NEW && !linux_btrace_has_changed (tinfo)) return NULL; header = perf_event_header (tinfo); diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index c9d9eec..9ae28f8 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -1377,9 +1377,9 @@ handle_qxfer_btrace (const char *annex, } if (strcmp (annex, "all") == 0) - type = btrace_read_all; + type = BTRACE_READ_ALL; else if (strcmp (annex, "new") == 0) - type = btrace_read_new; + type = BTRACE_READ_NEW; else { strcpy (own_buf, "E.Bad annex."); diff --git a/gdb/remote.c b/gdb/remote.c index 563f7b7..fca2250 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -11505,10 +11505,10 @@ remote_read_btrace (struct btrace_target_info *tinfo, switch (type) { - case btrace_read_all: + case BTRACE_READ_ALL: annex = "all"; break; - case btrace_read_new: + case BTRACE_READ_NEW: annex = "new"; break; default: -- 2.7.4