From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v2 3/6] trace-cmd library: Renamed tracecmd_fatal() to tracecmd_critical()
Date: Mon, 17 May 2021 16:40:02 +0300 [thread overview]
Message-ID: <20210517134005.611251-4-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20210517134005.611251-1-tz.stoyanov@gmail.com>
The trace-cmd library function for pritning critical logs is renamed
from tracecmd_fatal() to tracecmd_critical() to be consistent with the
names of the log levels.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
lib/trace-cmd/include/trace-cmd-local.h | 2 +-
lib/trace-cmd/trace-input.c | 12 ++++++------
lib/trace-cmd/trace-util.c | 5 ++---
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/lib/trace-cmd/include/trace-cmd-local.h b/lib/trace-cmd/include/trace-cmd-local.h
index cd868f60..821b5cdb 100644
--- a/lib/trace-cmd/include/trace-cmd-local.h
+++ b/lib/trace-cmd/include/trace-cmd-local.h
@@ -11,7 +11,7 @@
/* Can be overridden */
void tracecmd_warning(const char *fmt, ...);
-void tracecmd_fatal(const char *fmt, ...);
+void tracecmd_critical(const char *fmt, ...);
void tracecmd_info(const char *fmt, ...);
/* trace.dat file format version */
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index 2e519752..5ee69b14 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -1105,7 +1105,7 @@ static void __free_page(struct tracecmd_input *handle, struct page *page)
int index;
if (!page->ref_count) {
- tracecmd_fatal("Page ref count is zero!\n");
+ tracecmd_critical("Page ref count is zero!\n");
return;
}
@@ -1166,7 +1166,7 @@ void tracecmd_free_record(struct tep_record *record)
return;
if (!record->ref_count) {
- tracecmd_fatal("record ref count is zero!");
+ tracecmd_critical("record ref count is zero!");
return;
}
@@ -1176,7 +1176,7 @@ void tracecmd_free_record(struct tep_record *record)
return;
if (record->locked) {
- tracecmd_fatal("freeing record when it is locked!");
+ tracecmd_critical("freeing record when it is locked!");
return;
}
@@ -1375,7 +1375,7 @@ static int get_page(struct tracecmd_input *handle, int cpu,
if (offset & (handle->page_size - 1)) {
errno = -EINVAL;
- tracecmd_fatal("bad page offset %llx", offset);
+ tracecmd_critical("bad page offset %llx", offset);
return -1;
}
@@ -1383,7 +1383,7 @@ static int get_page(struct tracecmd_input *handle, int cpu,
offset > handle->cpu_data[cpu].file_offset +
handle->cpu_data[cpu].file_size) {
errno = -EINVAL;
- tracecmd_fatal("bad page offset %llx", offset);
+ tracecmd_critical("bad page offset %llx", offset);
return -1;
}
@@ -1949,7 +1949,7 @@ tracecmd_peek_data(struct tracecmd_input *handle, int cpu)
record = handle->cpu_data[cpu].next;
if (!record->data) {
- tracecmd_fatal("Something freed the record");
+ tracecmd_critical("Something freed the record");
return NULL;
}
diff --git a/lib/trace-cmd/trace-util.c b/lib/trace-cmd/trace-util.c
index 6db754e4..be9fcf0e 100644
--- a/lib/trace-cmd/trace-util.c
+++ b/lib/trace-cmd/trace-util.c
@@ -390,8 +390,7 @@ void __weak tracecmd_info(const char *fmt, ...)
va_end(ap);
}
-
-void __weak tracecmd_fatal(const char *fmt, ...)
+void __weak tracecmd_critical(const char *fmt, ...)
{
int ret;
va_list ap;
@@ -560,7 +559,7 @@ int tracecmd_count_cpus(void)
fp = fopen("/proc/cpuinfo", "r");
if (!fp) {
- tracecmd_fatal("Can not read cpuinfo");
+ tracecmd_critical("Can not read cpuinfo");
return 0;
}
--
2.31.1
next prev parent reply other threads:[~2021-05-17 13:40 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-17 13:39 [PATCH v2 0/6] Changes to trace-cmd logs Tzvetomir Stoyanov (VMware)
2021-05-17 13:40 ` [PATCH v2 1/6] trace-cmd library: Add log levels Tzvetomir Stoyanov (VMware)
2021-05-17 13:40 ` [PATCH v2 2/6] trace-cmd library: Document the API for " Tzvetomir Stoyanov (VMware)
2021-05-17 13:40 ` Tzvetomir Stoyanov (VMware) [this message]
2021-05-17 13:40 ` [PATCH v2 4/6] trace-cmd library: Set debug log level in debug mode Tzvetomir Stoyanov (VMware)
2021-05-17 13:40 ` [PATCH v2 5/6] trace-cmd report: Set the log level with -V and -q options Tzvetomir Stoyanov (VMware)
2021-05-17 13:40 ` [PATCH v2 6/6] trace-cmd: Add new function to set log level Tzvetomir Stoyanov (VMware)
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=20210517134005.611251-4-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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).