* [PATCH v2] perf tools: Add error handling
@ 2015-06-09 7:49 Firo Yang
2015-06-09 8:05 ` Julia Lawall
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Firo Yang @ 2015-06-09 7:49 UTC (permalink / raw)
To: kernel-janitors
Add error handling code for snprintf and rename in check_backup.
Signed-off-by: Firo Yang <firogm@gmail.com>
---
Since there is no suitable error code snprintf, I just return the
value returned by snprintf.
tools/perf/util/data.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
index 1921942..26ab45a 100644
--- a/tools/perf/util/data.c
+++ b/tools/perf/util/data.c
@@ -32,15 +32,26 @@ static bool check_pipe(struct perf_data_file *file)
static int check_backup(struct perf_data_file *file)
{
+ int ret;
struct stat st;
if (!stat(file->path, &st) && st.st_size) {
- /* TODO check errors properly */
char oldname[PATH_MAX];
- snprintf(oldname, sizeof(oldname), "%s.old",
+ ret = snprintf(oldname, sizeof(oldname), "%s.old",
file->path);
+ if (ret < 0) {
+ pr_err("failed to make name %s.old\n", file->path);
+ return ret;
+ }
+
unlink(oldname);
- rename(file->path, oldname);
+
+ ret = rename(file->path, oldname);
+ if (ret < 0) {
+ pr_err("failed to rename %s to %s\n", file->path,
+ oldname);
+ return -errno;
+ }
}
return 0;
--
2.4.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] perf tools: Add error handling
2015-06-09 7:49 [PATCH v2] perf tools: Add error handling Firo Yang
@ 2015-06-09 8:05 ` Julia Lawall
2015-06-09 8:25 ` Firo Yang
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Julia Lawall @ 2015-06-09 8:05 UTC (permalink / raw)
To: kernel-janitors
On Tue, 9 Jun 2015, Firo Yang wrote:
> Add error handling code for snprintf and rename in check_backup.
>
> Signed-off-by: Firo Yang <firogm@gmail.com>
> ---
> Since there is no suitable error code snprintf, I just return the
> value returned by snprintf.
>
> tools/perf/util/data.c | 17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
> index 1921942..26ab45a 100644
> --- a/tools/perf/util/data.c
> +++ b/tools/perf/util/data.c
> @@ -32,15 +32,26 @@ static bool check_pipe(struct perf_data_file *file)
>
> static int check_backup(struct perf_data_file *file)
> {
> + int ret;
> struct stat st;
>
> if (!stat(file->path, &st) && st.st_size) {
> - /* TODO check errors properly */
> char oldname[PATH_MAX];
> - snprintf(oldname, sizeof(oldname), "%s.old",
> + ret = snprintf(oldname, sizeof(oldname), "%s.old",
> file->path);
> + if (ret < 0) {
Can it ever return a negative value anyway? It seems clear that it can
return a positive value. That value might not be an appropriate result
for this function.
julia
> + pr_err("failed to make name %s.old\n", file->path);
> + return ret;
> + }
> +
> unlink(oldname);
> - rename(file->path, oldname);
> +
> + ret = rename(file->path, oldname);
> + if (ret < 0) {
> + pr_err("failed to rename %s to %s\n", file->path,
> + oldname);
> + return -errno;
What is
> + }
> }
>
> return 0;
> --
> 2.4.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] perf tools: Add error handling
2015-06-09 7:49 [PATCH v2] perf tools: Add error handling Firo Yang
2015-06-09 8:05 ` Julia Lawall
@ 2015-06-09 8:25 ` Firo Yang
2015-06-09 8:35 ` Julia Lawall
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Firo Yang @ 2015-06-09 8:25 UTC (permalink / raw)
To: kernel-janitors
On Tue, Jun 09, 2015 at 10:05:24AM +0200, Julia Lawall wrote:
>On Tue, 9 Jun 2015, Firo Yang wrote:
>
>> Add error handling code for snprintf and rename in check_backup.
>>
>> Signed-off-by: Firo Yang <firogm@gmail.com>
>> ---
>> Since there is no suitable error code snprintf, I just return the
>> value returned by snprintf.
>>
>> tools/perf/util/data.c | 17 ++++++++++++++---
>> 1 file changed, 14 insertions(+), 3 deletions(-)
>>
>> diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
>> index 1921942..26ab45a 100644
>> --- a/tools/perf/util/data.c
>> +++ b/tools/perf/util/data.c
>> @@ -32,15 +32,26 @@ static bool check_pipe(struct perf_data_file *file)
>>
>> static int check_backup(struct perf_data_file *file)
>> {
>> + int ret;
>> struct stat st;
>>
>> if (!stat(file->path, &st) && st.st_size) {
>> - /* TODO check errors properly */
>> char oldname[PATH_MAX];
>> - snprintf(oldname, sizeof(oldname), "%s.old",
>> + ret = snprintf(oldname, sizeof(oldname), "%s.old",
>> file->path);
>> + if (ret < 0) {
>
>Can it ever return a negative value anyway? It seems clear that it can
I misunderstand the content in man 3 snprintf:
If an output error is encountered, a negative value is returned.
It should be nothing related to snprintf.
>return a positive value. That value might not be an appropriate result
>for this function.
>
>julia
>
>> + pr_err("failed to make name %s.old\n", file->path);
>> + return ret;
>> + }
>> +
>> unlink(oldname);
>> - rename(file->path, oldname);
>> +
>> + ret = rename(file->path, oldname);
>> + if (ret < 0) {
>> + pr_err("failed to rename %s to %s\n", file->path,
>> + oldname);
>> + return -errno;
>
>What is
If rename failed, it would set the errno to the corresponding error
number. You can find it in other function in the same file.
>
>> + }
>> }
>>
>> return 0;
>> --
>> 2.4.2
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
--
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] perf tools: Add error handling
2015-06-09 7:49 [PATCH v2] perf tools: Add error handling Firo Yang
2015-06-09 8:05 ` Julia Lawall
2015-06-09 8:25 ` Firo Yang
@ 2015-06-09 8:35 ` Julia Lawall
2015-06-09 8:54 ` Firo Yang
2015-06-09 12:37 ` walter harms
4 siblings, 0 replies; 6+ messages in thread
From: Julia Lawall @ 2015-06-09 8:35 UTC (permalink / raw)
To: kernel-janitors
On Tue, 9 Jun 2015, Firo Yang wrote:
> On Tue, Jun 09, 2015 at 10:05:24AM +0200, Julia Lawall wrote:
> >On Tue, 9 Jun 2015, Firo Yang wrote:
> >
> >> Add error handling code for snprintf and rename in check_backup.
> >>
> >> Signed-off-by: Firo Yang <firogm@gmail.com>
> >> ---
> >> Since there is no suitable error code snprintf, I just return the
> >> value returned by snprintf.
> >>
> >> tools/perf/util/data.c | 17 ++++++++++++++---
> >> 1 file changed, 14 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
> >> index 1921942..26ab45a 100644
> >> --- a/tools/perf/util/data.c
> >> +++ b/tools/perf/util/data.c
> >> @@ -32,15 +32,26 @@ static bool check_pipe(struct perf_data_file *file)
> >>
> >> static int check_backup(struct perf_data_file *file)
> >> {
> >> + int ret;
> >> struct stat st;
> >>
> >> if (!stat(file->path, &st) && st.st_size) {
> >> - /* TODO check errors properly */
> >> char oldname[PATH_MAX];
> >> - snprintf(oldname, sizeof(oldname), "%s.old",
> >> + ret = snprintf(oldname, sizeof(oldname), "%s.old",
> >> file->path);
> >> + if (ret < 0) {
> >
> >Can it ever return a negative value anyway? It seems clear that it can
> I misunderstand the content in man 3 snprintf:
> If an output error is encountered, a negative value is returned.
It does say that, but I didn't see it in the code. Snprintf just returns
the value of vsnprintf. This can return 0 or str-buf. If str-buf can be
negative, the value would not seem to be very meaningful. But probably it
cannot be.
>
> It should be nothing related to snprintf.
>
> >return a positive value. That value might not be an appropriate result
> >for this function.
Sorry, this latter comment was nonsense :)
julia
> >julia
> >
> >> + pr_err("failed to make name %s.old\n", file->path);
> >> + return ret;
> >> + }
> >> +
> >> unlink(oldname);
> >> - rename(file->path, oldname);
> >> +
> >> + ret = rename(file->path, oldname);
> >> + if (ret < 0) {
> >> + pr_err("failed to rename %s to %s\n", file->path,
> >> + oldname);
> >> + return -errno;
> >
> >What is
> If rename failed, it would set the errno to the corresponding error
> number. You can find it in other function in the same file.
> >
> >> + }
> >> }
> >>
> >> return 0;
> >> --
> >> 2.4.2
> >>
> >> --
> >> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> >> the body of a message to majordomo@vger.kernel.org
> >> More majordomo info at http://vger.kernel.org/majordomo-info.html
> >>
>
> --
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] perf tools: Add error handling
2015-06-09 7:49 [PATCH v2] perf tools: Add error handling Firo Yang
` (2 preceding siblings ...)
2015-06-09 8:35 ` Julia Lawall
@ 2015-06-09 8:54 ` Firo Yang
2015-06-09 12:37 ` walter harms
4 siblings, 0 replies; 6+ messages in thread
From: Firo Yang @ 2015-06-09 8:54 UTC (permalink / raw)
To: kernel-janitors
On Tue, Jun 09, 2015 at 10:35:38AM +0200, Julia Lawall wrote:
>
>
>On Tue, 9 Jun 2015, Firo Yang wrote:
>
>> On Tue, Jun 09, 2015 at 10:05:24AM +0200, Julia Lawall wrote:
>> >On Tue, 9 Jun 2015, Firo Yang wrote:
>> >
>> >> Add error handling code for snprintf and rename in check_backup.
>> >>
>> >> Signed-off-by: Firo Yang <firogm@gmail.com>
>> >> ---
>> >> Since there is no suitable error code snprintf, I just return the
>> >> value returned by snprintf.
>> >>
>> >> tools/perf/util/data.c | 17 ++++++++++++++---
>> >> 1 file changed, 14 insertions(+), 3 deletions(-)
>> >>
>> >> diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
>> >> index 1921942..26ab45a 100644
>> >> --- a/tools/perf/util/data.c
>> >> +++ b/tools/perf/util/data.c
>> >> @@ -32,15 +32,26 @@ static bool check_pipe(struct perf_data_file *file)
>> >>
>> >> static int check_backup(struct perf_data_file *file)
>> >> {
>> >> + int ret;
>> >> struct stat st;
>> >>
>> >> if (!stat(file->path, &st) && st.st_size) {
>> >> - /* TODO check errors properly */
>> >> char oldname[PATH_MAX];
>> >> - snprintf(oldname, sizeof(oldname), "%s.old",
>> >> + ret = snprintf(oldname, sizeof(oldname), "%s.old",
>> >> file->path);
>> >> + if (ret < 0) {
>> >
>> >Can it ever return a negative value anyway? It seems clear that it can
>> I misunderstand the content in man 3 snprintf:
>> If an output error is encountered, a negative value is returned.
>
>It does say that, but I didn't see it in the code. Snprintf just returns
>the value of vsnprintf. This can return 0 or str-buf. If str-buf can be
>negative, the value would not seem to be very meaningful. But probably it
>cannot be.
I got it. Thanks.
>
>>
>> It should be nothing related to snprintf.
>>
>> >return a positive value. That value might not be an appropriate result
>> >for this function.
>
>Sorry, this latter comment was nonsense :)
>
>julia
>
>> >julia
>> >
>> >> + pr_err("failed to make name %s.old\n", file->path);
>> >> + return ret;
>> >> + }
>> >> +
>> >> unlink(oldname);
>> >> - rename(file->path, oldname);
>> >> +
>> >> + ret = rename(file->path, oldname);
>> >> + if (ret < 0) {
>> >> + pr_err("failed to rename %s to %s\n", file->path,
>> >> + oldname);
>> >> + return -errno;
>> >
>> >What is
>> If rename failed, it would set the errno to the corresponding error
>> number. You can find it in other function in the same file.
>> >
>> >> + }
>> >> }
>> >>
>> >> return 0;
>> >> --
>> >> 2.4.2
>> >>
>> >> --
>> >> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
>> >> the body of a message to majordomo@vger.kernel.org
>> >> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> >>
>>
>> --
>> --
>> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
--
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] perf tools: Add error handling
2015-06-09 7:49 [PATCH v2] perf tools: Add error handling Firo Yang
` (3 preceding siblings ...)
2015-06-09 8:54 ` Firo Yang
@ 2015-06-09 12:37 ` walter harms
4 siblings, 0 replies; 6+ messages in thread
From: walter harms @ 2015-06-09 12:37 UTC (permalink / raw)
To: kernel-janitors
Am 09.06.2015 09:49, schrieb Firo Yang:
> Add error handling code for snprintf and rename in check_backup.
>
> Signed-off-by: Firo Yang <firogm@gmail.com>
> ---
> Since there is no suitable error code snprintf, I just return the
> value returned by snprintf.
>
> tools/perf/util/data.c | 17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
> index 1921942..26ab45a 100644
> --- a/tools/perf/util/data.c
> +++ b/tools/perf/util/data.c
> @@ -32,15 +32,26 @@ static bool check_pipe(struct perf_data_file *file)
>
> static int check_backup(struct perf_data_file *file)
> {
> + int ret;
> struct stat st;
>
> if (!stat(file->path, &st) && st.st_size) {
> - /* TODO check errors properly */
> char oldname[PATH_MAX];
> - snprintf(oldname, sizeof(oldname), "%s.old",
> + ret = snprintf(oldname, sizeof(oldname), "%s.old",
> file->path);
i am a big fan of asprintf() since that allows you to have just the right size.
Just do not forget to free the allocated buffer.
> + if (ret < 0) {
> + pr_err("failed to make name %s.old\n", file->path);
> + return ret;
> + }
> +
> unlink(oldname);
> - rename(file->path, oldname);
> +
> + ret = rename(file->path, oldname);
> + if (ret < 0) {
> + pr_err("failed to rename %s to %s\n", file->path,
> + oldname);
> + return -errno;
> + }
short: it does not work this way. rename will return EXDEV if source
and destination are on two file systems. (See man 2 rename)
perfect recoverable.
(on the other side: can this happen ? i do not know)
just my 2 cents
re,
wh
> }
>
> return 0;
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-06-09 12:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-09 7:49 [PATCH v2] perf tools: Add error handling Firo Yang
2015-06-09 8:05 ` Julia Lawall
2015-06-09 8:25 ` Firo Yang
2015-06-09 8:35 ` Julia Lawall
2015-06-09 8:54 ` Firo Yang
2015-06-09 12:37 ` walter harms
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.