From: David Sharp <dhsharp@google.com>
To: rostedt@goodmis.org
Cc: mrubin@google.com, linux-kernel@vger.kernel.org,
David Sharp <dhsharp@google.com>
Subject: [PATCH] trace-cmd: Use lseek64 and off64_t in tracecmd_append_cpu_data().
Date: Fri, 10 Sep 2010 18:24:18 -0700 [thread overview]
Message-ID: <1284168258-24287-1-git-send-email-dhsharp@google.com> (raw)
lseek64 returns 64-bit, but was being truncated to int. Large offsets would
cause the subsequent error checking to fail spuriously, leaving behind a bad
trace.dat and a collection of trace.dat.cpuX files.
---
trace-output.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/trace-output.c b/trace-output.c
index 89b3954..0730a1e 100644
--- a/trace-output.c
+++ b/trace-output.c
@@ -705,9 +705,9 @@ out_free:
int tracecmd_append_cpu_data(struct tracecmd_output *handle,
int cpus, char * const *cpu_data_files)
{
- unsigned long long *offsets = NULL;
+ off64_t *offsets = NULL;
unsigned long long *sizes = NULL;
- unsigned long long offset;
+ off64_t offset;
unsigned long long endian8;
off64_t check_size;
char *file;
@@ -733,7 +733,7 @@ int tracecmd_append_cpu_data(struct tracecmd_output *handle,
if (!sizes)
goto out_free;
- offset = lseek(handle->fd, 0, SEEK_CUR);
+ offset = lseek64(handle->fd, 0, SEEK_CUR);
/* hold any extra data for data */
offset += cpus * (16);
@@ -761,8 +761,8 @@ int tracecmd_append_cpu_data(struct tracecmd_output *handle,
for (i = 0; i < cpus; i++) {
fprintf(stderr, "offset=%llx\n", offsets[i]);
- ret = lseek64(handle->fd, offsets[i], SEEK_SET);
- if (ret < 0) {
+ offset = lseek64(handle->fd, offsets[i], SEEK_SET);
+ if (offset == (off64_t)-1) {
warning("could not seek to %lld\n", offsets[i]);
goto out_free;
}
--
1.7.1
next reply other threads:[~2010-09-11 1:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-11 1:24 David Sharp [this message]
2010-09-13 16:10 ` [PATCH] trace-cmd: Use lseek64 and off64_t in tracecmd_append_cpu_data() Steven Rostedt
2010-09-13 20:54 ` David Sharp
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=1284168258-24287-1-git-send-email-dhsharp@google.com \
--to=dhsharp@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mrubin@google.com \
--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 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.