From: "Vladislav Valtchev (VMware)" <vladislav.valtchev@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org, linux-kernel@vger.kernel.org,
y.karadz@gmail.com,
"Vladislav Valtchev (VMware)" <vladislav.valtchev@gmail.com>
Subject: [PATCH v4 2/3] trace-cmd: Remove the die() call from read_proc()
Date: Tue, 16 Jan 2018 21:53:42 +0200 [thread overview]
Message-ID: <20180116195343.12800-3-vladislav.valtchev@gmail.com> (raw)
In-Reply-To: <20180116195343.12800-1-vladislav.valtchev@gmail.com>
As trace-stack.c's read_proc() function is going to be used by trace-cmd stat,
we don't want it to make the program die in case something went wrong.
Therefore, this simple patch makes read_proc() to just return -1 in case the
proc file was empty or read() failed with an error, instead of using die().
Signed-off-by: Vladislav Valtchev (VMware) <vladislav.valtchev@gmail.com>
---
trace-stack.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/trace-stack.c b/trace-stack.c
index fada62d..3e1e41b 100644
--- a/trace-stack.c
+++ b/trace-stack.c
@@ -79,7 +79,7 @@ static int read_proc(int *status)
close(fd);
if (n <= 0)
- die("error reading %s", PROC_FILE);
+ return -1;
if (n >= sizeof(buf))
return -1;
@@ -101,6 +101,7 @@ static void change_stack_tracer_status(unsigned new_status)
{
char buf[1];
int status;
+ int ret;
int fd;
int n;
@@ -109,7 +110,11 @@ static void change_stack_tracer_status(unsigned new_status)
return;
}
- if (read_proc(&status) > 0 && status == new_status)
+ ret = read_proc(&status);
+ if (ret < 0)
+ die("error reading %s", PROC_FILE);
+
+ if (ret > 0 && status == new_status)
return; /* nothing to do */
fd = open(PROC_FILE, O_WRONLY);
--
2.14.1
next prev parent reply other threads:[~2018-01-16 19:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-16 19:53 [PATCH v4 0/3] Integrate stack tracer status in 'stat' Vladislav Valtchev (VMware)
2018-01-16 19:53 ` [PATCH v4 1/3] trace-cmd: Make read_proc() to return int status via OUT arg Vladislav Valtchev (VMware)
2018-01-19 21:58 ` Steven Rostedt
2018-01-19 22:02 ` Steven Rostedt
2018-01-22 9:03 ` Vladislav K. Valtchev
2018-01-16 19:53 ` Vladislav Valtchev (VMware) [this message]
2018-01-16 19:53 ` [PATCH v4 3/3] trace-cmd: Making stat to report when the stack tracer is ON Vladislav Valtchev (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=20180116195343.12800-3-vladislav.valtchev@gmail.com \
--to=vladislav.valtchev@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=y.karadz@gmail.com \
/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).