lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf tools: Clean up O_LARGEFILE et al usage

Browse Source 
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.

Suggested-by: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <4B6A8972.3070605@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Xiao Guangrong
2010-02-04 16:46:42 +08:00
committed by Ingo Molnar
parent 447a194b39
commit f887f3019e
4 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/perf/builtin-record.c
View File

@@ -5,7 +5,6 @@
* (or a CPU, or a PID) into the perf.data output file - for * (or a CPU, or a PID) into the perf.data output file - for
* later analysis via perf report. * later analysis via perf report.
*/ */
#define _LARGEFILE64_SOURCE
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
#include "builtin.h" #include "builtin.h"
@@ -451,7 +450,7 @@ static int __cmd_record(int argc, const char **argv)
append_file = 0; append_file = 0;
} }
flags = O_CREAT|O_RDWR|O_LARGEFILE; flags = O_CREAT|O_RDWR;
if (append_file) if (append_file)
file_new = 0; file_new = 0;
else else

19
tools/perf/util/header.c
View File

@@ -1,4 +1,3 @@
#define _LARGEFILE64_SOURCE
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
#include <sys/types.h> #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_size = sizeof(*feat_sec) * nr_sections;
sec_start = self->data_offset + self->data_size; 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)) { if (perf_header__has_feat(self, HEADER_TRACE_INFO)) {
struct perf_file_section *trace_sec; 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++]; trace_sec = &feat_sec[idx++];
/* Write trace info */ /* 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); 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++]; buildid_sec = &feat_sec[idx++];
/* Write build-ids */ /* 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); err = dsos__write_buildid_table(fd);
if (err < 0) { if (err < 0) {
pr_debug("failed to write buildid table\n"); pr_debug("failed to write buildid table\n");
goto out_free; goto out_free;
} }
buildid_sec->size = lseek64(fd, 0, SEEK_CUR) - buildid_sec->size = lseek(fd, 0, SEEK_CUR) -
buildid_sec->offset; buildid_sec->offset;
dsos__cache_build_ids(); dsos__cache_build_ids();
} }
lseek64(fd, sec_start, SEEK_SET); lseek(fd, sec_start, SEEK_SET);
err = do_write(fd, feat_sec, sec_size); err = do_write(fd, feat_sec, sec_size);
if (err < 0) if (err < 0)
pr_debug("failed to write feature section\n"); 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"); pr_debug("failed to write perf header\n");
return err; 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; self->frozen = 1;
return 0; return 0;
@@ -567,7 +566,7 @@ int perf_header__process_sections(struct perf_header *self, int fd,
sec_size = sizeof(*feat_sec) * nr_sections; 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)) if (perf_header__getbuffer64(self, fd, feat_sec, sec_size))
goto out_free; goto out_free;
@@ -641,7 +640,7 @@ static int perf_file_section__process(struct perf_file_section *self,
struct perf_header *ph, struct perf_header *ph,
int feat, int fd) 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, " pr_debug("Failed to lseek to %Ld offset for feature %d, "
"continuing...\n", self->offset, feat); "continuing...\n", self->offset, feat);
return 0; return 0;

3
tools/perf/util/session.c
View File

@@ -1,4 +1,3 @@
#define _LARGEFILE64_SOURCE
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
#include <linux/kernel.h> #include <linux/kernel.h>
@@ -15,7 +14,7 @@ static int perf_session__open(struct perf_session *self, bool force)
{ {
struct stat input_stat; struct stat input_stat;
self->fd = open(self->filename, O_RDONLY|O_LARGEFILE); self->fd = open(self->filename, O_RDONLY);
if (self->fd < 0) { if (self->fd < 0) {
pr_err("failed to open file: %s", self->filename); pr_err("failed to open file: %s", self->filename);
if (!strcmp(self->filename, "perf.data")) if (!strcmp(self->filename, "perf.data"))

20
tools/perf/util/trace-event-read.c
View File

@@ -18,7 +18,7 @@
* *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/ */
#define _LARGEFILE64_SOURCE #define _FILE_OFFSET_BITS 64
#include <dirent.h> #include <dirent.h>
#include <stdio.h> #include <stdio.h>
@@ -83,7 +83,7 @@ static char *read_string(void)
char *str = NULL; char *str = NULL;
int size = 0; int size = 0;
int i; int i;
s64 r; off_t r;
for (;;) { for (;;) {
r = read(input_fd, buf, BUFSIZ); r = read(input_fd, buf, BUFSIZ);
@@ -117,8 +117,8 @@ static char *read_string(void)
i++; i++;
/* move the file descriptor to the end of the string */ /* 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) if (r == (off_t)-1)
die("lseek"); die("lseek");
if (str) { if (str) {
@@ -282,8 +282,8 @@ static void update_cpu_data_index(int cpu)
static void get_next_page(int cpu) static void get_next_page(int cpu)
{ {
off64_t save_seek; off_t save_seek;
off64_t ret; off_t ret;
if (!cpu_data[cpu].page) if (!cpu_data[cpu].page)
return; return;
@@ -298,17 +298,17 @@ static void get_next_page(int cpu)
update_cpu_data_index(cpu); update_cpu_data_index(cpu);
/* other parts of the code may expect the pointer to not move */ /* 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) if (ret == (off_t)-1)
die("failed to lseek"); die("failed to lseek");
ret = read(input_fd, cpu_data[cpu].page, page_size); ret = read(input_fd, cpu_data[cpu].page, page_size);
if (ret < 0) if (ret < 0)
die("failed to read page"); die("failed to read page");
/* reset the file pointer back */ /* reset the file pointer back */
lseek64(input_fd, save_seek, SEEK_SET); lseek(input_fd, save_seek, SEEK_SET);
return; return;
} }