perf tools: using O_LARGEFILE to open perf data file
PATCH 1/1 perf tools: using O_LARGEFILE to open perf data file
Open perf data file with O_LARGEFILE flag since its size is easy larger that 2G.
For example:
# rm -rf perf.data # ./perf kmem record sleep 300
[ perf record: Woken up 0 times to write data ]
[ perf record: Captured and wrote 3142.147 MB perf.data (~137282513 samples) ]
# ll -h perf.data -rw------- 1 root root 3.1G .....
--- tools/perf/builtin-record.c | 5 ++++- tools/perf/util/header.c | 22 +++++++++++++--------- tools/perf/util/session.c | 5 ++++- tools/perf/util/trace-event-read.c | 4 ++-- 4 files changed, 23 insertions(+), 13 deletions(-)
tools/perf/builtin-record.c +4 -1
@@ -5,6 +5,9 @@* (or a CPU, or a PID) into the perf.data output file - for * later analysis via perf report. */ +#define _LARGEFILE64_SOURCE +#define _FILE_OFFSET_BITS 64 +#include "builtin.h" #include "perf.h"
@@ -451,7 +454,7 @@ static int __cmd_record(int argc, const char **argv) append_file =0 ; } - flags =O_CREAT |O_RDWR ; + flags =O_CREAT |O_RDWR |O_LARGEFILE ;if (append_file) file_new =0 ;else
tools/perf/util/header.c +13 -9
@@ -1,3 +1,6 @@ +#define _LARGEFILE64_SOURCE +#define _FILE_OFFSET_BITS 64 +#include <sys/types.h> #include <byteswap.h> #include <unistd.h>
@@ -382,7 +385,7 @@ static int perf_header__adds_write(struct perf_header *self, int fd) sec_size =sizeof (*feat_sec) * nr_sections; sec_start = self->data_offset + self->data_size; -lseek (fd, sec_start + sec_size,SEEK_SET ); +lseek64 (fd, sec_start + sec_size,SEEK_SET );if (perf_header__has_feat (self,HEADER_TRACE_INFO )) {struct perf_file_section *trace_sec;
@@ -390,9 +393,9 @@ static int perf_header__adds_write(struct perf_header *self, int fd) trace_sec = &feat_sec[idx++];/* Write trace info */ - trace_sec->offset =lseek (fd,0 ,SEEK_CUR ); + trace_sec->offset =lseek64 (fd,0 ,SEEK_CUR );read_tracing_data (fd, attrs, nr_counters); - trace_sec->size =lseek (fd,0 ,SEEK_CUR ) - trace_sec->offset; + trace_sec->size =lseek64 (fd,0 ,SEEK_CUR ) - trace_sec->offset; }
@@ -402,17 +405,18 @@ static int perf_header__adds_write(struct perf_header *self, int fd) buildid_sec = &feat_sec[idx++];/* Write build-ids */ - buildid_sec->offset =lseek (fd,0 ,SEEK_CUR ); + buildid_sec->offset =lseek64 (fd,0 ,SEEK_CUR ); err =dsos__write_buildid_table (fd);if (err <0 ) {pr_debug ("failed to write buildid table\n" ); goto out_free; } - buildid_sec->size =lseek (fd,0 ,SEEK_CUR ) - buildid_sec->offset; + buildid_sec->size =lseek64 (fd,0 ,SEEK_CUR ) - + buildid_sec->offset;dsos__cache_build_ids (); } -lseek (fd, sec_start,SEEK_SET ); +lseek64 (fd, sec_start,SEEK_SET ); err =do_write (fd, feat_sec, sec_size);if (err <0 )pr_debug ("failed to write feature section\n" );
@@ -506,7 +510,7 @@ int perf_header__write(struct perf_header *self, int fd, bool at_exit)pr_debug ("failed to write perf header\n" );return err; } -lseek (fd, self->data_offset + self->data_size,SEEK_SET ); +lseek64 (fd, self->data_offset + self->data_size,SEEK_SET ); self->frozen =1 ;return 0 ;
@@ -560,7 +564,7 @@ int perf_header__process_sections(struct perf_header *self, int fd, sec_size =sizeof (*feat_sec) * nr_sections; -lseek (fd, self->data_offset + self->data_size,SEEK_SET ); +lseek64 (fd, self->data_offset + self->data_size,SEEK_SET );if (perf_header__getbuffer64 (self, fd, feat_sec, sec_size)) goto out_free;
@@ -634,7 +638,7 @@ static int perf_file_section__process(struct perf_file_section *self, struct perf_header *ph, int feat, int fd) { - if (lseek(fd, self->offset, SEEK_SET) < 0) { + if (lseek64(fd, self->offset, SEEK_SET) < 0) { pr_debug("Failed to lseek to %Ld offset for feature %d, " "continuing...\n", self->offset, feat);return 0 ;
tools/perf/util/session.c +4 -1
@@ -1,3 +1,6 @@ +#define _LARGEFILE64_SOURCE +#define _FILE_OFFSET_BITS 64 +#include <linux/kernel.h> #include <byteswap.h>
@@ -12,7 +15,7 @@ static int perf_session__open(struct perf_session *self, bool force) {struct stat input_stat; - self->fd =open (self->filename,O_RDONLY ); + self->fd =open (self->filename,O_RDONLY |O_LARGEFILE );if (self->fd <0 ) {pr_err ("failed to open file: %s" , self->filename);if (!strcmp (self->filename,"perf.data" ))
tools/perf/util/trace-event-read.c +2 -2
@@ -83,7 +83,7 @@ static char *read_string(void)char *str =NULL ;int size =0 ;int i; -int r; +s64 r;for (;;) { r =read (input_fd, buf,BUFSIZ );
@@ -117,7 +117,7 @@ static char *read_string(void) i++;/* move the file descriptor to the end of the string */ - r =lseek (input_fd, -(r - i),SEEK_CUR ); + r =lseek64 (input_fd, -(r - i),SEEK_CUR );if (r <0 )die ("lseek" );
Signature · 1 line
1.6.1.2
[tip:perf/core] perf tools: Use O_LARGEFILE to open perf data file
Commit-ID: b8f46c5a34fa64fd456295388d18f50ae69d9f37 Gitweb: http://git.kernel.org/tip/b8f46c5a34fa64fd456295388d18f50ae69d9f37 Author: Xiao Guangrong <[email protected]> AuthorDate: Wed, 3 Feb 2010 11:53:14 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 3 Feb 2010 09:03:59 +0100
perf tools: Use O_LARGEFILE to open perf data file
Open perf data file with O_LARGEFILE flag since its size is easily larger that 2G.
For example:
# rm -rf perf.data # ./perf kmem record sleep 300
[ perf record: Woken up 0 times to write data ] [ perf record: Captured and wrote 3142.147 MB perf.data (~137282513 samples) ]
# ll -h perf.data -rw------- 1 root root 3.1G .....
LKML-Reference: <[email protected]>
--- tools/perf/builtin-record.c | 5 ++++- tools/perf/util/header.c | 22 +++++++++++++--------- tools/perf/util/session.c | 5 ++++- tools/perf/util/trace-event-read.c | 4 ++-- 4 files changed, 23 insertions(+), 13 deletions(-)
tools/perf/builtin-record.c +4 -1
@@ -5,6 +5,9 @@* (or a CPU, or a PID) into the perf.data output file - for * later analysis via perf report. */ +#define _LARGEFILE64_SOURCE +#define _FILE_OFFSET_BITS 64 +#include "builtin.h" #include "perf.h"
@@ -451,7 +454,7 @@ static int __cmd_record(int argc, const char **argv) append_file =0 ; } - flags =O_CREAT |O_RDWR ; + flags =O_CREAT |O_RDWR |O_LARGEFILE ;if (append_file) file_new =0 ;else
tools/perf/util/header.c +13 -9
@@ -1,3 +1,6 @@ +#define _LARGEFILE64_SOURCE +#define _FILE_OFFSET_BITS 64 +#include <sys/types.h> #include <byteswap.h> #include <unistd.h>
@@ -382,7 +385,7 @@ static int perf_header__adds_write(struct perf_header *self, int fd) sec_size =sizeof (*feat_sec) * nr_sections; sec_start = self->data_offset + self->data_size; -lseek (fd, sec_start + sec_size,SEEK_SET ); +lseek64 (fd, sec_start + sec_size,SEEK_SET );if (perf_header__has_feat (self,HEADER_TRACE_INFO )) {struct perf_file_section *trace_sec;
@@ -390,9 +393,9 @@ static int perf_header__adds_write(struct perf_header *self, int fd) trace_sec = &feat_sec[idx++];/* Write trace info */ - trace_sec->offset =lseek (fd,0 ,SEEK_CUR ); + trace_sec->offset =lseek64 (fd,0 ,SEEK_CUR );read_tracing_data (fd, attrs, nr_counters); - trace_sec->size =lseek (fd,0 ,SEEK_CUR ) - trace_sec->offset; + trace_sec->size =lseek64 (fd,0 ,SEEK_CUR ) - trace_sec->offset; }
@@ -402,17 +405,18 @@ static int perf_header__adds_write(struct perf_header *self, int fd) buildid_sec = &feat_sec[idx++];/* Write build-ids */ - buildid_sec->offset =lseek (fd,0 ,SEEK_CUR ); + buildid_sec->offset =lseek64 (fd,0 ,SEEK_CUR ); err =dsos__write_buildid_table (fd);if (err <0 ) {pr_debug ("failed to write buildid table\n" ); goto out_free; } - buildid_sec->size =lseek (fd,0 ,SEEK_CUR ) - buildid_sec->offset; + buildid_sec->size =lseek64 (fd,0 ,SEEK_CUR ) - + buildid_sec->offset;dsos__cache_build_ids (); } -lseek (fd, sec_start,SEEK_SET ); +lseek64 (fd, sec_start,SEEK_SET ); err =do_write (fd, feat_sec, sec_size);if (err <0 )pr_debug ("failed to write feature section\n" );
@@ -506,7 +510,7 @@ int perf_header__write(struct perf_header *self, int fd, bool at_exit)pr_debug ("failed to write perf header\n" );return err; } -lseek (fd, self->data_offset + self->data_size,SEEK_SET ); +lseek64 (fd, self->data_offset + self->data_size,SEEK_SET ); self->frozen =1 ;return 0 ;
@@ -560,7 +564,7 @@ int perf_header__process_sections(struct perf_header *self, int fd, sec_size =sizeof (*feat_sec) * nr_sections; -lseek (fd, self->data_offset + self->data_size,SEEK_SET ); +lseek64 (fd, self->data_offset + self->data_size,SEEK_SET );if (perf_header__getbuffer64 (self, fd, feat_sec, sec_size)) goto out_free;
@@ -634,7 +638,7 @@ static int perf_file_section__process(struct perf_file_section *self, struct perf_header *ph, int feat, int fd) { - if (lseek(fd, self->offset, SEEK_SET) < 0) { + if (lseek64(fd, self->offset, SEEK_SET) < 0) { pr_debug("Failed to lseek to %Ld offset for feature %d, " "continuing...\n", self->offset, feat);return 0 ;
tools/perf/util/session.c +4 -1
@@ -1,3 +1,6 @@ +#define _LARGEFILE64_SOURCE +#define _FILE_OFFSET_BITS 64 +#include <linux/kernel.h> #include <byteswap.h>
@@ -12,7 +15,7 @@ static int perf_session__open(struct perf_session *self, bool force) {struct stat input_stat; - self->fd =open (self->filename,O_RDONLY ); + self->fd =open (self->filename,O_RDONLY |O_LARGEFILE );if (self->fd <0 ) {pr_err ("failed to open file: %s" , self->filename);if (!strcmp (self->filename,"perf.data" ))
tools/perf/util/trace-event-read.c +2 -2
@@ -83,7 +83,7 @@ static char *read_string(void)char *str =NULL ;int size =0 ;int i; -int r; +s64 r;for (;;) { r =read (input_fd, buf,BUFSIZ );
@@ -117,7 +117,7 @@ static char *read_string(void) i++;/* move the file descriptor to the end of the string */ - r =lseek (input_fd, -(r - i),SEEK_CUR ); + r =lseek64 (input_fd, -(r - i),SEEK_CUR );if (r <0 )die ("lseek" );
Re: [tip:perf/core] perf tools: Use O_LARGEFILE to open perf data file
Quoted 33 lines · tip-bot for Xiao Guangrong
perf tools: Use
O_LARGEFILEto open perf data fileOpen perf data file with
O_LARGEFILEflag since its size is easily larger that 2G.tools/perf/builtin-record.c +4
-1+#define _LARGEFILE64_SOURCE +#define _FILE_OFFSET_BITS 64 +#include "builtin.h" #include "perf.h" @@ -451,7 +454,7 @@ static int __cmd_record(int argc, const char **argv) append_file =0 ; } - flags =O_CREAT |O_RDWR ; + flags =O_CREAT |O_RDWR |O_LARGEFILE ;if (append_file) file_new =0 ;else tools/perf/util/header.c +3
-0@@ -1,3 +1,6 @@ +#define _LARGEFILE64_SOURCE +#define _FILE_OFFSET_BITS 64 +#include <sys/types.h> #include <byteswap.h> #include <unistd.h>
tools/perf/util/header.c static int perf_header__adds_write(struct perf_header *self, int fd) · line 389
Quoted 6 lines
tools/perf/util/header.c +1
-1@@ -382,7 +385,7 @@ static int perf_header__adds_write(struct perf_header *self, int fd) sec_size =sizeof (*feat_sec) * nr_sections; sec_start = self->data_offset + self->data_size; -lseek (fd, sec_start + sec_size,SEEK_SET ); +lseek64 (fd, sec_start + sec_size,SEEK_SET );
Setting _FILE_OFFSET_BITS *and* using O_LARGEFILE, lseek64, etc, is redundant...
-hpa
Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center I work for Intel. I don't speak on their behalf.
Re: [tip:perf/core] perf tools: Use O_LARGEFILE to open perf data file
Quoted 4 lines · H. Peter Anvin
Setting
_FILE_OFFSET_BITS*and* usingO_LARGEFILE, lseek64, etc, is redundant...
Ah, i forgot this, i'll send a patch to fix it soon. Thanks Peter!
- Xiao
PATCH 1/1 perf tools: using O_LARGEFILE to open perf data file - fix
In reply to Xiao GuangrongSetting _FILE_OFFSET_BITS and using O_LARGEFILE, lseek64, etc, is redundant. Thanks H. Peter Anvin for point out
--- tools/perf/builtin-record.c | 3 +-- tools/perf/util/header.c | 21 ++++++++++----------- tools/perf/util/session.c | 3 +-- tools/perf/util/trace-event-read.c | 14 +++++++------- 4 files changed, 19 insertions(+), 22 deletions(-)
tools/perf/builtin-record.c +1 -2
@@ -5,7 +5,6 @@* (or a CPU, or a PID) into the perf.data output file - for * later analysis via perf report. */ -#define _LARGEFILE64_SOURCE#define _FILE_OFFSET_BITS 64#include "builtin.h"
@@ -454,7 +453,7 @@ static int __cmd_record(int argc, const char **argv) append_file =0 ; } - flags =O_CREAT |O_RDWR |O_LARGEFILE ; + flags =O_CREAT |O_RDWR ;if (append_file) file_new =0 ;else
tools/perf/util/header.c +10 -11
@@ -1,4 +1,3 @@ -#define _LARGEFILE64_SOURCE#define _FILE_OFFSET_BITS 64#include <sys/types.h>
@@ -385,7 +384,7 @@ static int perf_header__adds_write(struct perf_header *self, int fd) sec_size =sizeof (*feat_sec) * nr_sections; sec_start = self->data_offset + self->data_size; -lseek64 (fd, sec_start + sec_size,SEEK_SET ); +lseek (fd, sec_start + sec_size,SEEK_SET );if (perf_header__has_feat (self,HEADER_TRACE_INFO )) {struct perf_file_section *trace_sec;
@@ -393,9 +392,9 @@ static int perf_header__adds_write(struct perf_header *self, int fd) trace_sec = &feat_sec[idx++];/* Write trace info */ - trace_sec->offset =lseek64 (fd,0 ,SEEK_CUR ); + trace_sec->offset =lseek (fd,0 ,SEEK_CUR );read_tracing_data (fd, attrs, nr_counters); - trace_sec->size =lseek64 (fd,0 ,SEEK_CUR ) - trace_sec->offset; + trace_sec->size =lseek (fd,0 ,SEEK_CUR ) - trace_sec->offset; }
@@ -405,18 +404,18 @@ static int perf_header__adds_write(struct perf_header *self, int fd) buildid_sec = &feat_sec[idx++];/* Write build-ids */ - buildid_sec->offset =lseek64 (fd,0 ,SEEK_CUR ); + buildid_sec->offset =lseek (fd,0 ,SEEK_CUR ); err =dsos__write_buildid_table (fd);if (err <0 ) {pr_debug ("failed to write buildid table\n" ); goto out_free; } - buildid_sec->size =lseek64 (fd,0 ,SEEK_CUR ) - - buildid_sec->offset; + buildid_sec->size =lseek (fd,0 ,SEEK_CUR ) - + buildid_sec->offset;dsos__cache_build_ids (); } -lseek64 (fd, sec_start,SEEK_SET ); +lseek (fd, sec_start,SEEK_SET ); err =do_write (fd, feat_sec, sec_size);if (err <0 )pr_debug ("failed to write feature section\n" );
@@ -510,7 +509,7 @@ int perf_header__write(struct perf_header *self, int fd, bool at_exit)pr_debug ("failed to write perf header\n" );return err; } -lseek64 (fd, self->data_offset + self->data_size,SEEK_SET ); +lseek (fd, self->data_offset + self->data_size,SEEK_SET ); self->frozen =1 ;return 0 ;
@@ -564,7 +563,7 @@ int perf_header__process_sections(struct perf_header *self, int fd, sec_size =sizeof (*feat_sec) * nr_sections; -lseek64 (fd, self->data_offset + self->data_size,SEEK_SET ); +lseek (fd, self->data_offset + self->data_size,SEEK_SET );if (perf_header__getbuffer64 (self, fd, feat_sec, sec_size)) goto out_free;
@@ -638,7 +637,7 @@ static int perf_file_section__process(struct perf_file_section *self, struct perf_header *ph, int feat, int fd) { - if (lseek64(fd, self->offset, SEEK_SET) < 0) { + if (lseek(fd, self->offset, SEEK_SET) < 0) { pr_debug("Failed to lseek to %Ld offset for feature %d, " "continuing...\n", self->offset, feat);return 0 ;
tools/perf/util/session.c +1 -2
@@ -1,4 +1,3 @@ -#define _LARGEFILE64_SOURCE#define _FILE_OFFSET_BITS 64#include <linux/kernel.h>
@@ -15,7 +14,7 @@ static int perf_session__open(struct perf_session *self, bool force) {struct stat input_stat; - self->fd =open (self->filename,O_RDONLY |O_LARGEFILE ); + self->fd =open (self->filename,O_RDONLY );if (self->fd <0 ) {pr_err ("failed to open file: %s" , self->filename);if (!strcmp (self->filename,"perf.data" ))
tools/perf/util/trace-event-read.c +7 -7
@@ -18,7 +18,7 @@* * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#define _LARGEFILE64_SOURCE +#define _FILE_OFFSET_BITS 64#include <dirent.h> #include <stdio.h>
@@ -117,7 +117,7 @@ static char *read_string(void) i++;/* move the file descriptor to the end of the string */ - r =lseek64 (input_fd, -(r - i),SEEK_CUR ); + r =lseek (input_fd, -(r - i),SEEK_CUR );if (r <0 )die ("lseek" );
@@ -282,8 +282,8 @@ static void update_cpu_data_index(int cpu)static void get_next_page (int cpu) { -off64_t save_seek; -off64_t ret; +s64 save_seek; +s64 ret;if (!cpu_data[cpu].page)return ;
@@ -298,9 +298,9 @@ static void get_next_page(int cpu)update_cpu_data_index (cpu);/* other parts of the code may expect the pointer to not move */ - save_seek =lseek64 (input_fd,0 ,SEEK_CUR ); + save_seek =lseek (input_fd,0 ,SEEK_CUR ); - ret =lseek64 (input_fd, cpu_data[cpu].offset,SEEK_SET ); + ret =lseek (input_fd, cpu_data[cpu].offset,SEEK_SET );if (ret <0 )die ("failed to lseek" ); ret =read (input_fd, cpu_data[cpu].page, page_size);
@@ -308,7 +308,7 @@ static void get_next_page(int cpu)die ("failed to read page" );/* reset the file pointer back */ -lseek64 (input_fd, save_seek,SEEK_SET ); +lseek (input_fd, save_seek,SEEK_SET );return ; }
Signature · 1 line
1.6.1.2
Re: [PATCH] perf tools: using O_LARGEFILE to open perf data file - fix
Quoted 10 lines · Xiao Guangrong
Setting
_FILE_OFFSET_BITSand usingO_LARGEFILE, lseek64, etc, is redundant. Thanks H. Peter Anvin for point outSigned-off-by Xiao Guangrong <[email protected]>--- tools/perf/builtin-record.c | 3 +-- tools/perf/util/header.c | 21 ++++++++++----------- tools/perf/util/session.c | 3 +-- tools/perf/util/trace-event-read.c | 14 +++++++------- 4 files changed, 19 insertions(+), 22 deletions(-)
i already applied the v1 patch - mind sending a delta patch that removes the redundant definitions?
Thanks,
Ingo
Re: [PATCH] perf tools: using O_LARGEFILE to open perf data file - fix
Quoted 13 lines · Ingo Molnar
Quoted 10 lines · Xiao Guangrong
Setting
_FILE_OFFSET_BITSand usingO_LARGEFILE, lseek64, etc, is redundant. Thanks H. Peter Anvin for point outSigned-off-by Xiao Guangrong <[email protected]>--- tools/perf/builtin-record.c | 3 +-- tools/perf/util/header.c | 21 ++++++++++----------- tools/perf/util/session.c | 3 +-- tools/perf/util/trace-event-read.c | 14 +++++++------- 4 files changed, 19 insertions(+), 22 deletions(-)
Quoted 3 lines
i already applied the v1 patch - mind sending a delta patch that removes the redundant definitions?
Hi Ingo,
This patch is the delta patch, i used the _FILE_OFFSET_BITS defining and removed O_LARGEFILE/lseek64 to keep code clean.
I'll integrate Peter's comments and send the new version.
Thanks,
Xiao
Re: [PATCH] perf tools: using O_LARGEFILE to open perf data file - fix
In reply to Xiao Guangrongtools/perf/util/trace-event-read.c static void update_cpu_data_index(int cpu) · line 286
Quoted 6 lines · Xiao Guangrong
static void
get_next_page(int cpu)
{tools/perf/util/trace-event-read.c +2
-2-off64_t save_seek; -off64_t ret; +s64 save_seek; +s64 ret;
Should be off_t (which is 64 bits with _FILE_OFFSET_BITS=64.)
Quoted 4 lines
tools/perf/util/trace-event-read.c +0
-0if (!cpu_data[cpu].page)return ;
tools/perf/util/trace-event-read.c static void get_next_page(int cpu) · line 305
Quoted 10 lines
tools/perf/util/trace-event-read.c +2
-2@@ -298,9 +298,9 @@ static void get_next_page(int cpu)update_cpu_data_index (cpu);/* other parts of the code may expect the pointer to not move */ - save_seek =lseek64 (input_fd,0 ,SEEK_CUR ); + save_seek =lseek (input_fd,0 ,SEEK_CUR ); - ret =lseek64 (input_fd, cpu_data[cpu].offset,SEEK_SET ); + ret =lseek (input_fd, cpu_data[cpu].offset,SEEK_SET );if (ret <0 )die ("failed to lseek" );
Compare for equality against (off_t)-1 here.
-hpa
Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center I work for Intel. I don't speak on their behalf.
PATCH v2 1/1 perf tools: using O_LARGEFILE to open perf data file - fix
Setting _FILE_OFFSET_BITS and using O_LARGEFILE, lseek64, etc, is redundant. Thanks H. Peter Anvin for point out
So, this patch remove O_LARGEFILE, lseek64, etc
--- tools/perf/builtin-record.c | 3 +-- tools/perf/util/header.c | 21 ++++++++++----------- tools/perf/util/session.c | 3 +-- tools/perf/util/trace-event-read.c | 20 ++++++++++---------- 4 files changed, 22 insertions(+), 25 deletions(-)
tools/perf/builtin-record.c +1 -2
@@ -5,7 +5,6 @@* (or a CPU, or a PID) into the perf.data output file - for * later analysis via perf report. */ -#define _LARGEFILE64_SOURCE#define _FILE_OFFSET_BITS 64#include "builtin.h"
@@ -454,7 +453,7 @@ static int __cmd_record(int argc, const char **argv) append_file =0 ; } - flags =O_CREAT |O_RDWR |O_LARGEFILE ; + flags =O_CREAT |O_RDWR ;if (append_file) file_new =0 ;else
tools/perf/util/header.c +10 -11
@@ -1,4 +1,3 @@ -#define _LARGEFILE64_SOURCE#define _FILE_OFFSET_BITS 64#include <sys/types.h>
@@ -385,7 +384,7 @@ static int perf_header__adds_write(struct perf_header *self, int fd) sec_size =sizeof (*feat_sec) * nr_sections; sec_start = self->data_offset + self->data_size; -lseek64 (fd, sec_start + sec_size,SEEK_SET ); +lseek (fd, sec_start + sec_size,SEEK_SET );if (perf_header__has_feat (self,HEADER_TRACE_INFO )) {struct perf_file_section *trace_sec;
@@ -393,9 +392,9 @@ static int perf_header__adds_write(struct perf_header *self, int fd) trace_sec = &feat_sec[idx++];/* Write trace info */ - trace_sec->offset =lseek64 (fd,0 ,SEEK_CUR ); + trace_sec->offset =lseek (fd,0 ,SEEK_CUR );read_tracing_data (fd, attrs, nr_counters); - trace_sec->size =lseek64 (fd,0 ,SEEK_CUR ) - trace_sec->offset; + trace_sec->size =lseek (fd,0 ,SEEK_CUR ) - trace_sec->offset; }
@@ -405,18 +404,18 @@ static int perf_header__adds_write(struct perf_header *self, int fd) buildid_sec = &feat_sec[idx++];/* Write build-ids */ - buildid_sec->offset =lseek64 (fd,0 ,SEEK_CUR ); + buildid_sec->offset =lseek (fd,0 ,SEEK_CUR ); err =dsos__write_buildid_table (fd);if (err <0 ) {pr_debug ("failed to write buildid table\n" ); goto out_free; } - buildid_sec->size =lseek64 (fd,0 ,SEEK_CUR ) - - buildid_sec->offset; + buildid_sec->size =lseek (fd,0 ,SEEK_CUR ) - + buildid_sec->offset;dsos__cache_build_ids (); } -lseek64 (fd, sec_start,SEEK_SET ); +lseek (fd, sec_start,SEEK_SET ); err =do_write (fd, feat_sec, sec_size);if (err <0 )pr_debug ("failed to write feature section\n" );
@@ -510,7 +509,7 @@ int perf_header__write(struct perf_header *self, int fd, bool at_exit)pr_debug ("failed to write perf header\n" );return err; } -lseek64 (fd, self->data_offset + self->data_size,SEEK_SET ); +lseek (fd, self->data_offset + self->data_size,SEEK_SET ); self->frozen =1 ;return 0 ;
@@ -564,7 +563,7 @@ int perf_header__process_sections(struct perf_header *self, int fd, sec_size =sizeof (*feat_sec) * nr_sections; -lseek64 (fd, self->data_offset + self->data_size,SEEK_SET ); +lseek (fd, self->data_offset + self->data_size,SEEK_SET );if (perf_header__getbuffer64 (self, fd, feat_sec, sec_size)) goto out_free;
@@ -638,7 +637,7 @@ static int perf_file_section__process(struct perf_file_section *self, struct perf_header *ph, int feat, int fd) { - if (lseek64(fd, self->offset, SEEK_SET) < 0) { + if (lseek(fd, self->offset, SEEK_SET) == (off_t)-1) { pr_debug("Failed to lseek to %Ld offset for feature %d, " "continuing...\n", self->offset, feat);return 0 ;
tools/perf/util/session.c +1 -2
@@ -1,4 +1,3 @@ -#define _LARGEFILE64_SOURCE#define _FILE_OFFSET_BITS 64#include <linux/kernel.h>
@@ -15,7 +14,7 @@ static int perf_session__open(struct perf_session *self, bool force) {struct stat input_stat; - self->fd =open (self->filename,O_RDONLY |O_LARGEFILE ); + self->fd =open (self->filename,O_RDONLY );if (self->fd <0 ) {pr_err ("failed to open file: %s" , self->filename);if (!strcmp (self->filename,"perf.data" ))
tools/perf/util/trace-event-read.c +10 -10
@@ -18,7 +18,7 @@* * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#define _LARGEFILE64_SOURCE +#define _FILE_OFFSET_BITS 64#include <dirent.h> #include <stdio.h>
@@ -83,7 +83,7 @@ static char *read_string(void)char *str =NULL ;int size =0 ;int i; -s64 r; +off_t r;for (;;) { r =read (input_fd, buf,BUFSIZ );
@@ -117,8 +117,8 @@ static char *read_string(void) i++;/* move the file descriptor to the end of the string */ - r =lseek64 (input_fd, -(r - i),SEEK_CUR ); -if (r <0 ) + r =lseek (input_fd, -(r - i),SEEK_CUR ); +if (r == (off_t)-1 )die ("lseek" );if (str) {
@@ -282,8 +282,8 @@ static void update_cpu_data_index(int cpu)static void get_next_page (int cpu) { -off64_t save_seek; -off64_t ret; +off_t save_seek; +off_t ret;if (!cpu_data[cpu].page)return ;
@@ -298,17 +298,17 @@ static void get_next_page(int cpu)update_cpu_data_index (cpu);/* other parts of the code may expect the pointer to not move */ - save_seek =lseek64 (input_fd,0 ,SEEK_CUR ); + save_seek =lseek (input_fd,0 ,SEEK_CUR ); - ret =lseek64 (input_fd, cpu_data[cpu].offset,SEEK_SET ); -if (ret <0 ) + ret =lseek (input_fd, cpu_data[cpu].offset,SEEK_SET ); +if (ret == (off_t)-1 )die ("failed to lseek" ); ret =read (input_fd, cpu_data[cpu].page, page_size);if (ret <0 )die ("failed to read page" );/* reset the file pointer back */ -lseek64 (input_fd, save_seek,SEEK_SET ); +lseek (input_fd, save_seek,SEEK_SET );return ; }
Signature · 1 line
1.6.1.2
[tip:perf/core] perf tools: Clean up O_LARGEFILE et al usage
Commit-ID: f887f3019e56389a73617f4e70f512e82cc89adb Gitweb: http://git.kernel.org/tip/f887f3019e56389a73617f4e70f512e82cc89adb Author: Xiao Guangrong <[email protected]> AuthorDate: Thu, 4 Feb 2010 16:46:42 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 4 Feb 2010 10:03:03 +0100
perf tools: Clean up O_LARGEFILE et al usage
Setting _FILE_OFFSET_BITS and using O_LARGEFILE, lseek64, etc, is redundant. Thanks H. Peter Anvin for pointing it out.
So, this patch removes O_LARGEFILE, lseek64, etc.
LKML-Reference: <[email protected]>
--- tools/perf/builtin-record.c | 3 +-- tools/perf/util/header.c | 21 ++++++++++----------- tools/perf/util/session.c | 3 +-- tools/perf/util/trace-event-read.c | 20 ++++++++++---------- 4 files changed, 22 insertions(+), 25 deletions(-)
tools/perf/builtin-record.c +1 -2
@@ -5,7 +5,6 @@* (or a CPU, or a PID) into the perf.data output file - for * later analysis via perf report. */ -#define _LARGEFILE64_SOURCE#define _FILE_OFFSET_BITS 64#include "builtin.h"
@@ -451,7 +450,7 @@ static int __cmd_record(int argc, const char **argv) append_file =0 ; } - flags =O_CREAT |O_RDWR |O_LARGEFILE ; + flags =O_CREAT |O_RDWR ;if (append_file) file_new =0 ;else
tools/perf/util/header.c +10 -11
@@ -1,4 +1,3 @@ -#define _LARGEFILE64_SOURCE#define _FILE_OFFSET_BITS 64#include <sys/types.h>
@@ -388,7 +387,7 @@ static int perf_header__adds_write(struct perf_header *self, int fd) sec_size =sizeof (*feat_sec) * nr_sections; sec_start = self->data_offset + self->data_size; -lseek64 (fd, sec_start + sec_size,SEEK_SET ); +lseek (fd, sec_start + sec_size,SEEK_SET );if (perf_header__has_feat (self,HEADER_TRACE_INFO )) {struct perf_file_section *trace_sec;
@@ -396,9 +395,9 @@ static int perf_header__adds_write(struct perf_header *self, int fd) trace_sec = &feat_sec[idx++];/* Write trace info */ - trace_sec->offset =lseek64 (fd,0 ,SEEK_CUR ); + trace_sec->offset =lseek (fd,0 ,SEEK_CUR );read_tracing_data (fd, attrs, nr_counters); - trace_sec->size =lseek64 (fd,0 ,SEEK_CUR ) - trace_sec->offset; + trace_sec->size =lseek (fd,0 ,SEEK_CUR ) - trace_sec->offset; }
@@ -408,18 +407,18 @@ static int perf_header__adds_write(struct perf_header *self, int fd) buildid_sec = &feat_sec[idx++];/* Write build-ids */ - buildid_sec->offset =lseek64 (fd,0 ,SEEK_CUR ); + buildid_sec->offset =lseek (fd,0 ,SEEK_CUR ); err =dsos__write_buildid_table (fd);if (err <0 ) {pr_debug ("failed to write buildid table\n" ); goto out_free; } - buildid_sec->size =lseek64 (fd,0 ,SEEK_CUR ) - - buildid_sec->offset; + buildid_sec->size =lseek (fd,0 ,SEEK_CUR ) - + buildid_sec->offset;dsos__cache_build_ids (); } -lseek64 (fd, sec_start,SEEK_SET ); +lseek (fd, sec_start,SEEK_SET ); err =do_write (fd, feat_sec, sec_size);if (err <0 )pr_debug ("failed to write feature section\n" );
@@ -513,7 +512,7 @@ int perf_header__write(struct perf_header *self, int fd, bool at_exit)pr_debug ("failed to write perf header\n" );return err; } -lseek64 (fd, self->data_offset + self->data_size,SEEK_SET ); +lseek (fd, self->data_offset + self->data_size,SEEK_SET ); self->frozen =1 ;return 0 ;
@@ -567,7 +566,7 @@ int perf_header__process_sections(struct perf_header *self, int fd, sec_size =sizeof (*feat_sec) * nr_sections; -lseek64 (fd, self->data_offset + self->data_size,SEEK_SET ); +lseek (fd, self->data_offset + self->data_size,SEEK_SET );if (perf_header__getbuffer64 (self, fd, feat_sec, sec_size)) goto out_free;
@@ -641,7 +640,7 @@ static int perf_file_section__process(struct perf_file_section *self, struct perf_header *ph, int feat, int fd) { - if (lseek64(fd, self->offset, SEEK_SET) < 0) { + if (lseek(fd, self->offset, SEEK_SET) == (off_t)-1) { pr_debug("Failed to lseek to %Ld offset for feature %d, " "continuing...\n", self->offset, feat);return 0 ;
tools/perf/util/session.c +1 -2
@@ -1,4 +1,3 @@ -#define _LARGEFILE64_SOURCE#define _FILE_OFFSET_BITS 64#include <linux/kernel.h>
@@ -15,7 +14,7 @@ static int perf_session__open(struct perf_session *self, bool force) {struct stat input_stat; - self->fd =open (self->filename,O_RDONLY |O_LARGEFILE ); + self->fd =open (self->filename,O_RDONLY );if (self->fd <0 ) {pr_err ("failed to open file: %s" , self->filename);if (!strcmp (self->filename,"perf.data" ))
tools/perf/util/trace-event-read.c +10 -10
@@ -18,7 +18,7 @@* * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#define _LARGEFILE64_SOURCE +#define _FILE_OFFSET_BITS 64#include <dirent.h> #include <stdio.h>
@@ -83,7 +83,7 @@ static char *read_string(void)char *str =NULL ;int size =0 ;int i; -s64 r; +off_t r;for (;;) { r =read (input_fd, buf,BUFSIZ );
@@ -117,8 +117,8 @@ static char *read_string(void) i++;/* move the file descriptor to the end of the string */ - r =lseek64 (input_fd, -(r - i),SEEK_CUR ); -if (r <0 ) + r =lseek (input_fd, -(r - i),SEEK_CUR ); +if (r == (off_t)-1 )die ("lseek" );if (str) {
@@ -282,8 +282,8 @@ static void update_cpu_data_index(int cpu)static void get_next_page (int cpu) { -off64_t save_seek; -off64_t ret; +off_t save_seek; +off_t ret;if (!cpu_data[cpu].page)return ;
@@ -298,17 +298,17 @@ static void get_next_page(int cpu)update_cpu_data_index (cpu);/* other parts of the code may expect the pointer to not move */ - save_seek =lseek64 (input_fd,0 ,SEEK_CUR ); + save_seek =lseek (input_fd,0 ,SEEK_CUR ); - ret =lseek64 (input_fd, cpu_data[cpu].offset,SEEK_SET ); -if (ret <0 ) + ret =lseek (input_fd, cpu_data[cpu].offset,SEEK_SET ); +if (ret == (off_t)-1 )die ("failed to lseek" ); ret =read (input_fd, cpu_data[cpu].page, page_size);if (ret <0 )die ("failed to read page" );/* reset the file pointer back */ -lseek64 (input_fd, save_seek,SEEK_SET ); +lseek (input_fd, save_seek,SEEK_SET );return ; }