From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v2 5/8] trace-cmd: Move trace-cmd global variable "debug" to libtracecmd Date: Wed, 14 Aug 2019 11:47:05 +0300 Message-ID: <20190814084712.28188-6-tz.stoyanov@gmail.com> (raw) In-Reply-To: <20190814084712.28188-1-tz.stoyanov@gmail.com> A trace-cmd global variable "debug" is used from libtracecmd and should be defined there. A new library APIs are implemented to access it: void tracecmd_set_debug(bool debug); bool tracecmd_get_debug(void); Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> --- include/trace-cmd/trace-cmd.h | 3 +++ lib/trace-cmd/trace-msg.c | 4 ++-- lib/trace-cmd/trace-util.c | 21 +++++++++++++++++++++ tracecmd/include/trace-local.h | 2 -- tracecmd/trace-cmd.c | 2 -- tracecmd/trace-list.c | 2 +- tracecmd/trace-listen.c | 8 ++++---- tracecmd/trace-read.c | 8 ++++---- tracecmd/trace-record.c | 2 +- 9 files changed, 36 insertions(+), 16 deletions(-) diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h index 5ce8fb3..b96de04 100644 --- a/include/trace-cmd/trace-cmd.h +++ b/include/trace-cmd/trace-cmd.h @@ -51,6 +51,9 @@ void free_record(struct tep_record *record); void tracecmd_set_quiet(int quiet); int tracecmd_get_quiet(void); +void tracecmd_set_debug(bool debug); +bool tracecmd_get_debug(void); + struct tracecmd_input; struct tracecmd_output; diff --git a/lib/trace-cmd/trace-msg.c b/lib/trace-cmd/trace-msg.c index e2dd188..92562c7 100644 --- a/lib/trace-cmd/trace-msg.c +++ b/lib/trace-cmd/trace-msg.c @@ -32,7 +32,7 @@ static inline void dprint(const char *fmt, ...) { va_list ap; - if (!debug) + if (!tracecmd_get_debug()) return; va_start(ap, fmt); @@ -351,7 +351,7 @@ static int tracecmd_msg_recv_wait(int fd, struct tracecmd_msg *msg) pfd.fd = fd; pfd.events = POLLIN; - ret = poll(&pfd, 1, debug ? -1 : msg_wait_to); + ret = poll(&pfd, 1, tracecmd_get_debug() ? -1 : msg_wait_to); if (ret < 0) return -errno; else if (ret == 0) diff --git a/lib/trace-cmd/trace-util.c b/lib/trace-cmd/trace-util.c index 26b9a18..b5ce84f 100644 --- a/lib/trace-cmd/trace-util.c +++ b/lib/trace-cmd/trace-util.c @@ -29,6 +29,7 @@ int tracecmd_disable_sys_plugins; int tracecmd_disable_plugins; static int tracecmd_quiet; +static bool tracecmd_debug; static struct registered_plugin_options { struct registered_plugin_options *next; @@ -117,6 +118,26 @@ int tracecmd_get_quiet(void) return tracecmd_quiet; } +/** + * tracecmd_set_quiet - Set if to print output to the screen + * @quiet: If non zero, print no output to the screen + * + */ +void tracecmd_set_debug(bool debug) +{ + tracecmd_debug = debug; +} + +/** + * tracecmd_get_quiet - Get if to print output to the screen + * Returns non zero, if no output to the screen should be printed + * + */ +bool tracecmd_get_debug(void) +{ + return tracecmd_debug; +} + void trace_util_free_plugin_options_list(char **list) { tracecmd_free_list(list); diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h index 23a3a29..e2d5506 100644 --- a/tracecmd/include/trace-local.h +++ b/tracecmd/include/trace-local.h @@ -12,8 +12,6 @@ #include "trace-cmd.h" #include "event-utils.h" -extern int debug; - /* fix stupid glib guint64 typecasts and printf formats */ typedef unsigned long long u64; diff --git a/tracecmd/trace-cmd.c b/tracecmd/trace-cmd.c index 5283ba7..30691b6 100644 --- a/tracecmd/trace-cmd.c +++ b/tracecmd/trace-cmd.c @@ -16,8 +16,6 @@ int silence_warnings; int show_status; -int debug; - void warning(const char *fmt, ...) { va_list ap; diff --git a/tracecmd/trace-list.c b/tracecmd/trace-list.c index 00c6073..832540e 100644 --- a/tracecmd/trace-list.c +++ b/tracecmd/trace-list.c @@ -427,7 +427,7 @@ void trace_list(int argc, char **argv) break; case '-': if (strcmp(argv[i], "--debug") == 0) { - debug = true; + tracecmd_set_debug(true); break; } fprintf(stderr, "list: invalid option -- '%s'\n", diff --git a/tracecmd/trace-listen.c b/tracecmd/trace-listen.c index 3106022..3cbee67 100644 --- a/tracecmd/trace-listen.c +++ b/tracecmd/trace-listen.c @@ -717,7 +717,7 @@ static int do_fork(int cfd) pid_t pid; /* in debug mode, we do not fork off children */ - if (debug) + if (tracecmd_get_debug()) return 0; pid = fork(); @@ -769,7 +769,7 @@ static int do_connection(int cfd, struct sockaddr_storage *peer_addr, tracecmd_msg_handle_close(msg_handle); - if (!debug) + if (!tracecmd_get_debug()) exit(0); return 0; @@ -910,7 +910,7 @@ static void do_listen(char *port) struct addrinfo *result, *rp; int sfd, s; - if (!debug) + if (!tracecmd_get_debug()) signal_setup(SIGCHLD, sigstub); make_pid_file(); @@ -1009,7 +1009,7 @@ void trace_listen(int argc, char **argv) daemon = 1; break; case OPT_debug: - debug = 1; + tracecmd_set_debug(true); break; default: usage(argv); diff --git a/tracecmd/trace-read.c b/tracecmd/trace-read.c index d22c723..12b8b3d 100644 --- a/tracecmd/trace-read.c +++ b/tracecmd/trace-read.c @@ -782,10 +782,10 @@ void trace_show_data(struct tracecmd_input *handle, struct tep_record *record) cpu, record->missed_events); else if (record->missed_events < 0) trace_seq_printf(&s, "CPU:%d [EVENTS DROPPED]\n", cpu); - if (buffer_breaks || debug) { + if (buffer_breaks || tracecmd_get_debug()) { if (tracecmd_record_at_buffer_start(handle, record)) { trace_seq_printf(&s, "CPU:%d [SUBBUFFER START]", cpu); - if (debug) + if (tracecmd_get_debug()) trace_seq_printf(&s, " [%lld:0x%llx]", tracecmd_page_ts(handle, record), record->offset & ~(page_size - 1)); @@ -816,7 +816,7 @@ void trace_show_data(struct tracecmd_input *handle, struct tep_record *record) tep_print_event(pevent, &s, record, use_trace_clock); if (s.len && *(s.buffer + s.len - 1) == '\n') s.len--; - if (debug) { + if (tracecmd_get_debug()) { struct kbuffer *kbuf; struct kbuffer_raw_info info; void *page; @@ -1616,7 +1616,7 @@ void trace_report (int argc, char **argv) break; case OPT_debug: buffer_breaks = 1; - debug = 1; + tracecmd_set_debug(true); break; case OPT_profile: profile = 1; diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c index b25b659..32793b3 100644 --- a/tracecmd/trace-record.c +++ b/tracecmd/trace-record.c @@ -5143,7 +5143,7 @@ static void parse_record_options(int argc, no_filter = true; break; case OPT_debug: - debug = 1; + tracecmd_set_debug(true); break; case OPT_module: if (ctx->instance->filter_mod) -- 2.21.0
next prev parent reply index Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-14 8:47 [PATCH v2 0/8] Separate trace-cmd and libtracecmd code Tzvetomir Stoyanov (VMware) 2019-08-14 8:47 ` [PATCH v2 1/8] trace-cmd: Move trace-cmd-local.h from the application to the library Tzvetomir Stoyanov (VMware) 2019-08-14 8:47 ` [PATCH v2 2/8] trace-cmd: Move trace-output.c into the library code Tzvetomir Stoyanov (VMware) 2019-08-14 8:47 ` [PATCH v2 3/8] trace-cmd: Move trace-msg.c into the library Tzvetomir Stoyanov (VMware) 2019-08-14 8:47 ` [PATCH v2 4/8] trace-cmd: Move trace-cmd global variable "quiet" to libtracecmd Tzvetomir Stoyanov (VMware) 2019-08-28 19:59 ` Steven Rostedt 2019-08-29 11:39 ` Tzvetomir Stoyanov 2019-08-29 16:38 ` Steven Rostedt 2019-08-14 8:47 ` Tzvetomir Stoyanov (VMware) [this message] 2019-08-28 20:01 ` [PATCH v2 5/8] trace-cmd: Move trace-cmd global variable "debug" " Steven Rostedt 2019-08-14 8:47 ` [PATCH v2 6/8] trace-cmd: Move plog() function " Tzvetomir Stoyanov (VMware) 2019-08-28 20:15 ` Steven Rostedt 2019-08-14 8:47 ` [PATCH v2 7/8] trace-cmd: Move trace-cmd APIs from trace-cmd.h to trace-local.h Tzvetomir Stoyanov (VMware) 2019-08-28 20:17 ` Steven Rostedt 2019-08-14 8:47 ` [PATCH v2 8/8] trace-cmd: Move tracecmd_stack_tracer_status() function to libtracecmd Tzvetomir Stoyanov (VMware) 2019-08-28 20:21 ` Steven Rostedt 2019-09-03 12:24 ` Tzvetomir Stoyanov 2019-08-14 8:47 ` [PATCH v5 0/3] Add new trace-cmd record options: "--proc-map" Tzvetomir Stoyanov (VMware) 2019-08-27 23:28 ` Steven Rostedt 2019-08-14 8:47 ` [PATCH v5 1/3] trace-cmd: Extend ptrace logic to work with multiple filtered pids Tzvetomir Stoyanov (VMware) 2019-08-27 23:31 ` Steven Rostedt 2019-08-14 8:47 ` [PATCH v5 2/3] trace-cmd: Save the tracee address map into the trace.dat file Tzvetomir Stoyanov (VMware) 2019-08-14 8:47 ` [PATCH v5 3/3] trace-cmd: Add option to execute traced process as given user Tzvetomir Stoyanov (VMware) 2019-08-28 20:25 ` [PATCH v2 0/8] Separate trace-cmd and libtracecmd code Steven Rostedt
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190814084712.28188-6-tz.stoyanov@gmail.com \ --to=tz.stoyanov@gmail.com \ --cc=linux-trace-devel@vger.kernel.org \ --cc=rostedt@goodmis.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-Trace-Devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-trace-devel/0 linux-trace-devel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-trace-devel linux-trace-devel/ https://lore.kernel.org/linux-trace-devel \ linux-trace-devel@vger.kernel.org public-inbox-index linux-trace-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-trace-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git