perf util: Cleanup trace related files
Namhyung Kim
maintainercover perf util: Cleanup trace related files
Hi,
Here's a couple of cleanups of util/trace-event-* files that inspired by David Ahern's patchset. :) All look like leftovers from the old port of trace-cmd codes.
Thanks,
Namhyung
Namhyung Kim (6):
perf util: Remove unused trace_read_data function perf util: Remove unused struct definitions perf util: Remove unnecessary calc_data_size variable perf util: Remove unused macro definitions perf util: Remove duplicated page_size definition perf util: Change trace info output file name
tools/perf/util/trace-event-info.c | 31 +----- tools/perf/util/trace-event-read.c | 201 ------------------------------------- 2 files changed, 1 insertion(+), 231 deletions(-)
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerPATCH 1/6 perf util: Remove unused trace_read_data function
From: Namhyung Kim <[email protected]>
And functions that called only from the trace_read_data().
--- tools/perf/util/trace-event-read.c | 201 ------------------------------------- 1 file changed, 201 deletions(-)
tools/perf/util/trace-event-read.c +0 -201
@@ -41,8 +41,6 @@static int input_fd; -static int read_page; -int file_bigendian;int host_bigendian;static int long_size;
@@ -287,205 +285,6 @@ static void read_event_files(struct pevent *pevent) } } -struct cpu_data { -unsigned long long offset; -unsigned long long size; -unsigned long long timestamp; -struct pevent_record *next; -char *page; -int cpu; -int index; -int page_size; -}; - -static struct cpu_data *cpu_data; - -static void update_cpu_data_index (int cpu) -{ - cpu_data[cpu].offset += page_size; - cpu_data[cpu].size -= page_size; - cpu_data[cpu].index =0 ; -} - -static void get_next_page (int cpu) -{ -off_t save_seek; -off_t ret; - -if (!cpu_data[cpu].page) -return ; - -if (read_page) { -if (cpu_data[cpu].size <= page_size) { -free (cpu_data[cpu].page); - cpu_data[cpu].page =NULL ; -return ; - } - -update_cpu_data_index (cpu); - -/* other parts of the code may expect the pointer to not move */ - save_seek =lseek (input_fd,0 ,SEEK_CUR ); - - 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 */ -lseek (input_fd, save_seek,SEEK_SET ); - -return ; - } - -munmap (cpu_data[cpu].page, page_size); - cpu_data[cpu].page =NULL ; - -if (cpu_data[cpu].size <= page_size) -return ; - -update_cpu_data_index (cpu); - - cpu_data[cpu].page =mmap (NULL , page_size,PROT_READ ,MAP_PRIVATE , - input_fd, cpu_data[cpu].offset); -if (cpu_data[cpu].page ==MAP_FAILED ) -die ("failed to mmap cpu %d at offset 0x%llx" , - cpu, cpu_data[cpu].offset); -} - -static unsigned int type_len4host (unsigned int type_len_ts) -{ -if (file_bigendian) -return (type_len_ts >>27 ) & ((1 <<5 ) -1 ); -else -return type_len_ts & ((1 <<5 ) -1 ); -} - -static unsigned int ts4host (unsigned int type_len_ts) -{ -if (file_bigendian) -return type_len_ts & ((1 <<27 ) -1 ); -else -return type_len_ts >>5 ; -} - -static int calc_index (void *ptr,int cpu) -{ -return (unsigned long )ptr - (unsigned long )cpu_data[cpu].page; -} - -struct pevent_record *trace_peek_data (struct pevent *pevent,int cpu) -{ -struct pevent_record *data; -void *page = cpu_data[cpu].page; -int idx = cpu_data[cpu].index; -void *ptr = page + idx; -unsigned long long extend; -unsigned int type_len_ts; -unsigned int type_len; -unsigned int delta; -unsigned int length =0 ; - -if (cpu_data[cpu].next) -return cpu_data[cpu].next; - -if (!page) -return NULL ; - -if (!idx) { -/* FIXME: handle header page */ -if (header_page_ts_size !=8 ) -die ("expected a long long type for timestamp" ); - cpu_data[cpu].timestamp =data2host8 (pevent, ptr); - ptr +=8 ; -switch (header_page_size_size) { -case 4 : - cpu_data[cpu].page_size =data2host4 (pevent, ptr); - ptr +=4 ; -break ; -case 8 : - cpu_data[cpu].page_size =data2host8 (pevent, ptr); - ptr +=8 ; -break ; -default : -die ("bad long size" ); - } - ptr = cpu_data[cpu].page + header_page_data_offset; - } - -read_again: - idx =calc_index (ptr, cpu); - -if (idx >= cpu_data[cpu].page_size) { -get_next_page (cpu); -return trace_peek_data (pevent, cpu); - } - - type_len_ts =data2host4 (pevent, ptr); - ptr +=4 ; - - type_len =type_len4host (type_len_ts); - delta =ts4host (type_len_ts); - -switch (type_len) { -case RINGBUF_TYPE_PADDING : -if (!delta) -die ("error, hit unexpected end of page" ); - length =data2host4 (pevent, ptr); - ptr +=4 ; - length *=4 ; - ptr += length; - goto read_again; - -case RINGBUF_TYPE_TIME_EXTEND : - extend =data2host4 (pevent, ptr); - ptr +=4 ; - extend <<=TS_SHIFT ; - extend += delta; - cpu_data[cpu].timestamp += extend; - goto read_again; - -case RINGBUF_TYPE_TIME_STAMP : - ptr +=12 ; -break ; -case 0 : - length =data2host4 (pevent, ptr); - ptr +=4 ; -die ("here! length=%d" , length); -break ; -default : - length = type_len *4 ; -break ; - } - - cpu_data[cpu].timestamp += delta; - - data =malloc_or_die (sizeof (*data)); -memset (data,0 ,sizeof (*data)); - - data->ts = cpu_data[cpu].timestamp; - data->size = length; - data->data = ptr; - ptr += length; - - cpu_data[cpu].index =calc_index (ptr, cpu); - cpu_data[cpu].next = data; - -return data; -} - -struct pevent_record *trace_read_data (struct pevent *pevent,int cpu) -{ -struct pevent_record *data; - - data =trace_peek_data (pevent, cpu); - cpu_data[cpu].next =NULL ; - -return data; -} -ssize_t trace_report (int fd,struct pevent **ppevent,bool __repipe) {char buf[BUFSIZ ];
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Remove unused trace_read_data function
perf tools: Remove unused trace_read_data function
Commit-ID: f3ff40ec8d92b36e60ebbbdb604ffeb5cfe6545f Gitweb: http://git.kernel.org/tip/f3ff40ec8d92b36e60ebbbdb604ffeb5cfe6545f Author: Namhyung Kim <[email protected]> AuthorDate: Wed, 13 Mar 2013 20:19:40 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Mar 2013 13:06:08 -0300
perf tools: Remove unused trace_read_data function
And functions that called only from the trace_read_data().
--- tools/perf/util/trace-event-read.c | 201 ------------------------------------- 1 file changed, 201 deletions(-)
tools/perf/util/trace-event-read.c +0 -201
@@ -41,8 +41,6 @@static int input_fd; -static int read_page; -int file_bigendian;int host_bigendian;static int long_size;
@@ -287,205 +285,6 @@ static void read_event_files(struct pevent *pevent) } } -struct cpu_data { -unsigned long long offset; -unsigned long long size; -unsigned long long timestamp; -struct pevent_record *next; -char *page; -int cpu; -int index; -int page_size; -}; - -static struct cpu_data *cpu_data; - -static void update_cpu_data_index (int cpu) -{ - cpu_data[cpu].offset += page_size; - cpu_data[cpu].size -= page_size; - cpu_data[cpu].index =0 ; -} - -static void get_next_page (int cpu) -{ -off_t save_seek; -off_t ret; - -if (!cpu_data[cpu].page) -return ; - -if (read_page) { -if (cpu_data[cpu].size <= page_size) { -free (cpu_data[cpu].page); - cpu_data[cpu].page =NULL ; -return ; - } - -update_cpu_data_index (cpu); - -/* other parts of the code may expect the pointer to not move */ - save_seek =lseek (input_fd,0 ,SEEK_CUR ); - - 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 */ -lseek (input_fd, save_seek,SEEK_SET ); - -return ; - } - -munmap (cpu_data[cpu].page, page_size); - cpu_data[cpu].page =NULL ; - -if (cpu_data[cpu].size <= page_size) -return ; - -update_cpu_data_index (cpu); - - cpu_data[cpu].page =mmap (NULL , page_size,PROT_READ ,MAP_PRIVATE , - input_fd, cpu_data[cpu].offset); -if (cpu_data[cpu].page ==MAP_FAILED ) -die ("failed to mmap cpu %d at offset 0x%llx" , - cpu, cpu_data[cpu].offset); -} - -static unsigned int type_len4host (unsigned int type_len_ts) -{ -if (file_bigendian) -return (type_len_ts >>27 ) & ((1 <<5 ) -1 ); -else -return type_len_ts & ((1 <<5 ) -1 ); -} - -static unsigned int ts4host (unsigned int type_len_ts) -{ -if (file_bigendian) -return type_len_ts & ((1 <<27 ) -1 ); -else -return type_len_ts >>5 ; -} - -static int calc_index (void *ptr,int cpu) -{ -return (unsigned long )ptr - (unsigned long )cpu_data[cpu].page; -} - -struct pevent_record *trace_peek_data (struct pevent *pevent,int cpu) -{ -struct pevent_record *data; -void *page = cpu_data[cpu].page; -int idx = cpu_data[cpu].index; -void *ptr = page + idx; -unsigned long long extend; -unsigned int type_len_ts; -unsigned int type_len; -unsigned int delta; -unsigned int length =0 ; - -if (cpu_data[cpu].next) -return cpu_data[cpu].next; - -if (!page) -return NULL ; - -if (!idx) { -/* FIXME: handle header page */ -if (header_page_ts_size !=8 ) -die ("expected a long long type for timestamp" ); - cpu_data[cpu].timestamp =data2host8 (pevent, ptr); - ptr +=8 ; -switch (header_page_size_size) { -case 4 : - cpu_data[cpu].page_size =data2host4 (pevent, ptr); - ptr +=4 ; -break ; -case 8 : - cpu_data[cpu].page_size =data2host8 (pevent, ptr); - ptr +=8 ; -break ; -default : -die ("bad long size" ); - } - ptr = cpu_data[cpu].page + header_page_data_offset; - } - -read_again: - idx =calc_index (ptr, cpu); - -if (idx >= cpu_data[cpu].page_size) { -get_next_page (cpu); -return trace_peek_data (pevent, cpu); - } - - type_len_ts =data2host4 (pevent, ptr); - ptr +=4 ; - - type_len =type_len4host (type_len_ts); - delta =ts4host (type_len_ts); - -switch (type_len) { -case RINGBUF_TYPE_PADDING : -if (!delta) -die ("error, hit unexpected end of page" ); - length =data2host4 (pevent, ptr); - ptr +=4 ; - length *=4 ; - ptr += length; - goto read_again; - -case RINGBUF_TYPE_TIME_EXTEND : - extend =data2host4 (pevent, ptr); - ptr +=4 ; - extend <<=TS_SHIFT ; - extend += delta; - cpu_data[cpu].timestamp += extend; - goto read_again; - -case RINGBUF_TYPE_TIME_STAMP : - ptr +=12 ; -break ; -case 0 : - length =data2host4 (pevent, ptr); - ptr +=4 ; -die ("here! length=%d" , length); -break ; -default : - length = type_len *4 ; -break ; - } - - cpu_data[cpu].timestamp += delta; - - data =malloc_or_die (sizeof (*data)); -memset (data,0 ,sizeof (*data)); - - data->ts = cpu_data[cpu].timestamp; - data->size = length; - data->data = ptr; - ptr += length; - - cpu_data[cpu].index =calc_index (ptr, cpu); - cpu_data[cpu].next = data; - -return data; -} - -struct pevent_record *trace_read_data (struct pevent *pevent,int cpu) -{ -struct pevent_record *data; - - data =trace_peek_data (pevent, cpu); - cpu_data[cpu].next =NULL ; - -return data; -} -ssize_t trace_report (int fd,struct pevent **ppevent,bool __repipe) {char buf[BUFSIZ ];
Namhyung Kim
maintainerPATCH 2/6 perf util: Remove unused struct definitions
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
struct event_list and struct events are never used. Just get rid of them.
--- tools/perf/util/trace-event-info.c | 12 ------------ 1 file changed, 12 deletions(-)
tools/perf/util/trace-event-info.c +0 -12
@@ -55,18 +55,6 @@ unsigned int page_size;static const char *output_file ="trace.info" ;static int output_fd; -struct event_list { -struct event_list *next; -const char *event; -}; - -struct events { -struct events *sibling; -struct events *children; -struct events *next; -char *name; -}; -static void *malloc_or_die (unsigned int size) {
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Remove unused struct definitions
perf tools: Remove unused struct definitions
Commit-ID: d301de830d89454a47947e9a3851708e8f3a8822 Gitweb: http://git.kernel.org/tip/d301de830d89454a47947e9a3851708e8f3a8822 Author: Namhyung Kim <[email protected]> AuthorDate: Wed, 13 Mar 2013 20:19:41 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Mar 2013 13:06:09 -0300
perf tools: Remove unused struct definitions
struct event_list and struct events are never used.
Just get rid of them.
--- tools/perf/util/trace-event-info.c | 12 ------------ 1 file changed, 12 deletions(-)
tools/perf/util/trace-event-info.c +0 -12
@@ -55,18 +55,6 @@ unsigned int page_size;static const char *output_file ="trace.info" ;static int output_fd; -struct event_list { -struct event_list *next; -const char *event; -}; - -struct events { -struct events *sibling; -struct events *children; -struct events *next; -char *name; -}; -static void *malloc_or_die (unsigned int size) {
Namhyung Kim
maintainerPATCH 3/6 perf util: Remove unnecessary calc_data_size variable
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
It's not set from anywhere so no need to keep it. Looks like an unneeded copy of the same variable in trace-event-read.c
--- tools/perf/util/trace-event-info.c | 7 ------- 1 file changed, 7 deletions(-)
tools/perf/util/trace-event-info.c +0 -7
@@ -119,17 +119,10 @@ static void put_tracing_file(char *file)free (file); } -static ssize_t calc_data_size; -static ssize_t write_or_die (const void *buf,size_t len) {int ret; -if (calc_data_size) { - calc_data_size += len; -return len; - } - ret =write (output_fd, buf, len);if (ret <0 )die ("writing to '%s'" , output_file);
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Remove unnecessary calc_data_size variable
perf tools: Remove unnecessary calc_data_size variable
Commit-ID: 024b13082e9d4a50f2d39c5fe2d1179261e7aa22 Gitweb: http://git.kernel.org/tip/024b13082e9d4a50f2d39c5fe2d1179261e7aa22 Author: Namhyung Kim <[email protected]> AuthorDate: Wed, 13 Mar 2013 20:19:42 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Mar 2013 13:06:09 -0300
perf tools: Remove unnecessary calc_data_size variable
It's not set from anywhere so no need to keep it. Looks like an unneeded copy of the same variable in trace-event-read.c
--- tools/perf/util/trace-event-info.c | 7 ------- 1 file changed, 7 deletions(-)
tools/perf/util/trace-event-info.c +0 -7
@@ -119,17 +119,10 @@ static void put_tracing_file(char *file)free (file); } -static ssize_t calc_data_size; -static ssize_t write_or_die (const void *buf,size_t len) {int ret; -if (calc_data_size) { - calc_data_size += len; -return len; - } - ret =write (output_fd, buf, len);if (ret <0 )die ("writing to '%s'" , output_file);
Namhyung Kim
maintainerPATCH 4/6 perf util: Remove unused macro definitions
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
They're never used and looks like leftovers from the porting of trace-cmd code.
--- tools/perf/util/trace-event-info.c | 7 ------- 1 file changed, 7 deletions(-)
tools/perf/util/trace-event-info.c +0 -7
@@ -43,13 +43,6 @@#define VERSION "0.5" -#define TRACE_CTRL "tracing_on" -#define TRACE "trace" -#define AVAILABLE "available_tracers" -#define CURRENT "current_tracer" -#define ITER_CTRL "trace_options" -#define MAX_LATENCY "tracing_max_latency" -unsigned int page_size;static const char *output_file ="trace.info" ;
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Remove unused macro definitions
perf tools: Remove unused macro definitions
Commit-ID: e5f5e5ee78457198184abf3e43d95ea0fab21272 Gitweb: http://git.kernel.org/tip/e5f5e5ee78457198184abf3e43d95ea0fab21272 Author: Namhyung Kim <[email protected]> AuthorDate: Wed, 13 Mar 2013 20:19:43 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Mar 2013 13:06:09 -0300
perf tools: Remove unused macro definitions
They're never used and looks like leftovers from the porting of trace-cmd code.
--- tools/perf/util/trace-event-info.c | 7 ------- 1 file changed, 7 deletions(-)
tools/perf/util/trace-event-info.c +0 -7
@@ -43,13 +43,6 @@#define VERSION "0.5" -#define TRACE_CTRL "tracing_on" -#define TRACE "trace" -#define AVAILABLE "available_tracers" -#define CURRENT "current_tracer" -#define ITER_CTRL "trace_options" -#define MAX_LATENCY "tracing_max_latency" -unsigned int page_size;static const char *output_file ="trace.info" ;
Namhyung Kim
maintainerPATCH 5/6 perf util: Remove duplicated page_size definition
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
It's defined in util/util.c and gets set from the begining of perf run. No need to duplicate it.
--- tools/perf/util/trace-event-info.c | 3 --- 1 file changed, 3 deletions(-)
tools/perf/util/trace-event-info.c +0 -3
@@ -43,8 +43,6 @@#define VERSION "0.5" -unsigned int page_size; -static const char *output_file ="trace.info" ;static int output_fd;
@@ -431,7 +429,6 @@ static void tracing_data_header(void)write_or_die (buf,1 );/* save page_size */ - page_size =sysconf (_SC_PAGESIZE);write_or_die (&page_size,4 ); }
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Remove duplicated page_size definition
perf tools: Remove duplicated page_size definition
Commit-ID: 45fa534cffb246872de0cb8af207bea4a09aeb2f Gitweb: http://git.kernel.org/tip/45fa534cffb246872de0cb8af207bea4a09aeb2f Author: Namhyung Kim <[email protected]> AuthorDate: Wed, 13 Mar 2013 20:19:44 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Mar 2013 13:06:09 -0300
perf tools: Remove duplicated page_size definition
It's defined in util/util.c and gets set from the begining of perf run. No need to duplicate it.
--- tools/perf/util/trace-event-info.c | 3 --- 1 file changed, 3 deletions(-)
tools/perf/util/trace-event-info.c +0 -3
@@ -43,8 +43,6 @@#define VERSION "0.5" -unsigned int page_size; -static const char *output_file ="trace.info" ;static int output_fd;
@@ -431,7 +429,6 @@ static void tracing_data_header(void)write_or_die (buf,1 );/* save page_size */ - page_size =sysconf (_SC_PAGESIZE);write_or_die (&page_size,4 ); }
Namhyung Kim
maintainerPATCH 6/6 perf util: Change trace info output file name
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Not sure it's worth to trouble, but it's obviously has wrong name. Change it to the default "perf.data".
--- tools/perf/util/trace-event-info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/trace-event-info.c +1 -1
@@ -43,7 +43,7 @@#define VERSION "0.5" -static const char *output_file ="trace.info" ; +static const char *output_file ="perf.data" ;static int output_fd;
Signature · 1 line
1.7.11.7
Re: [PATCH 6/6] perf util: Change trace info output file name
tools/perf/util/trace-event-info.c line 47
Quoted 3 lines · Namhyung Kim
tools/perf/util/trace-event-info.c +1
-1-static const char *output_file ="trace.info" ; +static const char *output_file ="perf.data" ;static int output_fd;
Not really needed. Only use is a couple of die() calls. Since the file name is not used on the open the die message would be misleading.
David
Namhyung Kim
maintainerRe: [PATCH 6/6] perf util: Change trace info output file name
Hi David,
Quoted 7 lines · David Ahern
tools/perf/util/trace-event-info.c line 47
Quoted 3 lines · Namhyung Kim
tools/perf/util/trace-event-info.c +1
-1-static const char *output_file ="trace.info" ; +static const char *output_file ="perf.data" ;static int output_fd;Not really needed. Only use is a couple of
die()calls. Since the file name is not used on the open the die message would be misleading.
I know. But it just looked too ugly to me. :)
I'm fine with dropping this one. I think I'm going to get rid of these die() and something_or_die() calls soonish..
Thanks,
Namhyung