perf record: process can disappear while reading its /proc/pid/tasks
PATCH 1/3 perf record: process can disappear while reading its /proc/pid/tasks
--- tools/perf/builtin-record.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
tools/perf/builtin-record.c +4 -0
@@ -206,6 +206,7 @@ static pid_t pid_synthesize_comm_event(pid_t pid, int full) fp =fopen (filename,"r" );if (fp ==NULL ) { +out_race:/* * We raced with a task exiting - just return: */
@@ -247,6 +248,9 @@ static pid_t pid_synthesize_comm_event(pid_t pid, int full)snprintf (filename,sizeof (filename),"/proc/%d/task" , pid); tasks =opendir (filename); +if (tasks ==NULL ) + goto out_race; +while (!readdir_r (tasks, &dirent, &next) && next) {char *end; pid =strtol (dirent.d_name, &end,10 );
Signature · 1 line
1.5.5.1
PATCH 2/3 perf tools: Generalize event synthesizing routines
Because we will need it in 'perf top' to support userspace symbols for existing threads.
Now we pass a callback that will receive the synthesized event and then write it to the output file in 'perf record' and in the upcoming patch for 'perf top' we will just immediatelly create the in memory representation of threads and maps.
--- tools/perf/Makefile | 1 + tools/perf/builtin-record.c | 181 +++---------------------------------------- tools/perf/util/event.c | 177 ++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/event.h | 3 + 4 files changed, 191 insertions(+), 171 deletions(-) create mode 100644 tools/perf/util/event.c
tools/perf/Makefile +1 -0
@@ -380,6 +380,7 @@ LIB_OBJS += util/alias.o LIB_OBJS += util/config.o LIB_OBJS += util/ctype.o LIB_OBJS += util/environment.o +LIB_OBJS += util/event.o LIB_OBJS += util/exec_cmd.o LIB_OBJS += util/help.o LIB_OBJS += util/levenshtein.o
tools/perf/builtin-record.c +10 -171
199 lines not on this page · raw message
tools/perf/util/event.c new file +177 -0
177 lines not on this page · raw message
tools/perf/util/event.h +3 -0
@@ -111,4 +111,7 @@ struct map *map__clone(struct map *self);int map__overlap (struct map *l,struct map *r);size_t map__fprintf (struct map *self,FILE *fp); +int event__synthesize_thread (pid_t pid,int (*process)(event_t *event)); +void event__synthesize_threads (int (*process)(event_t *event)); +#endif /* __PERF_RECORD_H */
Signature · 1 line
1.5.5.1
PATCH 3/3 perf top: Support userspace symbols too
Example:
Compiling the kernel with 'make -k 22 allyesconfig'
[root@emilia linux-2.6-tip]# perf top -r 90
------------------------------------------------------------------------------
PerfTop: 3669 irqs/sec kernel:59.9% [1000Hz cycles], (all, 8 CPUs)
------------------------------------------------------------------------------
samples pcnt function DSO
_______ _____ ________________________________ ________________
3062.00 6.5% clear_page_c [kernel]
2233.00 4.8% _int_malloc /lib64/libc-2.5.so
2100.00 4.5% yylex /home/acme/git/build/allyesconfig/scripts/genksyms/genksyms
2029.00 4.3% memset /lib64/libc-2.5.so
1224.00 2.6% page_fault [kernel]
1075.00 2.3% __GI_strlen /lib64/libc-2.5.so
863.00 1.8% sub_preempt_count [kernel]
822.00 1.8% __GI_memcpy /lib64/libc-2.5.so
810.00 1.7% __GI_vfprintf /lib64/libc-2.5.so
786.00 1.7% _int_free /lib64/libc-2.5.so
775.00 1.7% __GI_strcmp /lib64/libc-2.5.so
748.00 1.6% _spin_lock [kernel]
699.00 1.5% main /home/acme/git/build/allyesconfig/scripts/basic/fixdep
659.00 1.4% add_preempt_count [kernel]
649.00 1.4% yyparse /home/acme/git/build/allyesconfig/scripts/genksyms/genksyms
645.00 1.4% preempt_trace [kernel]
635.00 1.4% __GI___libc_free /lib64/libc-2.5.so
597.00 1.3% trace_preempt_on [kernel]
551.00 1.2% __GI___libc_malloc /lib64/libc-2.5.so
516.00 1.1% _spin_lock_irqsave [kernel]
481.00 1.0% copy_user_generic_string [kernel]
479.00 1.0% unmap_vmas [kernel]
429.00 0.9% _IO_file_xsputn_internal /lib64/libc-2.5.so
425.00 0.9% __GI_strncpy /lib64/libc-2.5.so
416.00 0.9% get_page_from_freelist [kernel]
414.00 0.9% malloc_consolidate /lib64/libc-2.5.so
406.00 0.9% get_parent_ip [kernel]
362.00 0.8% __rmqueue [kernel]
347.00 0.7% in_lock_functions [kernel]
316.00 0.7% __d_lookup [kernel][root@emilia linux-2.6-tip]#
More polishing is needed to print just DSO basename when not --verbose, etc.
Supporting a 'comm' column requires some more reworking of 'perf top' internals as we will need to use something like the hist entries 'perf report' uses and will be done in another patch.
--- tools/perf/builtin-top.c | 143 ++++++++++++++++++++++++++++++++------------- 1 files changed, 101 insertions(+), 42 deletions(-)
tools/perf/builtin-top.c +101 -42
@@ -318,7 +318,7 @@ static void show_details(struct sym_entry *syme) }/* -* Symbols will be added here in record_ip and will get out +* Symbols will be added here in event__process_sample and will get out * after decayed. */ static LIST_HEAD (active_symbols);
@@ -459,18 +459,18 @@ static void print_sym_table(void) }if (nr_counters ==1 ) -printf (" samples pcnt" ); +printf (" samples pcnt" );else -printf (" weight samples pcnt" ); +printf (" weight samples pcnt" );if (verbose)printf (" RIP " ); -printf (" kernel function\n" ); -printf (" %s _______ _____" , +printf (" function DSO\n" ); +printf (" %s _______ _____" , nr_counters ==1 ?" " :"______" );if (verbose) -printf (" ________________" ); -printf (" _______________\n\n" ); +printf (" ________________" ); +printf (" ________________________________ ________________\n\n" );for (nd =rb_first (&tmp); nd; nd =rb_next (nd)) {struct symbol *sym;
@@ -486,16 +486,15 @@ static void print_sym_table(void) sum_ksamples));if (nr_counters ==1 || !display_weighted) -printf ("%20.2f - " , syme->weight); +printf ("%20.2f " , syme->weight);else -printf ("%9.1f %10ld - " , syme->weight, syme->snap_count); +printf ("%9.1f %10ld " , syme->weight, syme->snap_count);percent_color_fprintf (stdout,"%4.1f%%" , pcnt);if (verbose) -printf (" - %016llx" , sym->start); -printf (" : %s" , sym->name); -if (syme->map->dso->name[0 ] =='[' ) -printf (" \t%s" , syme->map->dso->name); +printf (" %016llx" , sym->start); +printf (" %-32s" , sym->name); +printf (" %s" , syme->map->dso->short_name);printf ("\n" ); } }
@@ -818,41 +817,97 @@ static int parse_symbols(void)return 0 ; } -/* -* Binary search in the histogram table and record the hit: -*/ -static void record_ip (u64 ip,int counter) +static void event__process_sample (const event_t *self,int counter) { +u64 ip = self->ip.ip;struct map *map; -struct symbol *sym =kernel_maps__find_symbol (ip, &map); - -if (sym !=NULL ) { -struct sym_entry *syme =dso__sym_priv (map->dso, sym); - -if (!syme->skip) { - syme->count[counter]++; -record_precise_ip (syme, counter, ip); -pthread_mutex_lock (&active_symbols_lock); -if (list_empty (&syme->node) || !syme->node.next) -__list_insert_active_sym (syme); -pthread_mutex_unlock (&active_symbols_lock); +struct sym_entry *syme; +struct symbol *sym; + +switch (self->header.misc &PERF_RECORD_MISC_CPUMODE_MASK ) { +case PERF_RECORD_MISC_USER : { +struct thread *thread =threads__findnew (self->ip.pid); + +if (thread ==NULL )return ; + + map =thread__find_map (thread, ip); +if (map !=NULL ) { + ip = map->map_ip (map, ip); + sym = map->dso->find_symbol (map->dso, ip); +if (sym ==NULL ) +return ; + userspace_samples++; +break ; } } +/* +* If this is outside of all known maps, +* and is a negative address, try to look it +* up in the kernel dso, as it might be a +* vsyscall or vdso (which executes in user-mode). +*/ +if ((long long )ip >=0 ) +return ; +/* Fall thru */ +case PERF_RECORD_MISC_KERNEL : + sym =kernel_maps__find_symbol (ip, &map); +if (sym ==NULL ) +return ; +break ; +default : +return ; + } + + syme =dso__sym_priv (map->dso, sym); - samples--; +if (!syme->skip) { + syme->count[counter]++; +record_precise_ip (syme, counter, ip); +pthread_mutex_lock (&active_symbols_lock); +if (list_empty (&syme->node) || !syme->node.next) +__list_insert_active_sym (syme); +pthread_mutex_unlock (&active_symbols_lock); + ++samples; +return ; + } } -static void process_event (u64 ip,int counter,int user) +static void event__process_mmap (event_t *self) { - samples++; +struct thread *thread =threads__findnew (self->mmap.pid); + +if (thread !=NULL ) { +struct map *map =map__new (&self->mmap,NULL ,0 , +sizeof (struct sym_entry ), + symbol_filter); +if (map !=NULL ) +thread__insert_map (thread, map); + } +} -if (user) { - userspace_samples++; -return ; +static void event__process_comm (event_t *self) +{ +struct thread *thread =threads__findnew (self->comm.pid); + +if (thread !=NULL ) +thread__set_comm (thread, self->comm.comm); +} + +static int event__process (event_t *event) +{ +switch (event->header.type) { +case PERF_RECORD_COMM : +event__process_comm (event); +break ; +case PERF_RECORD_MMAP : +event__process_mmap (event); +break ; +default : +break ; } -record_ip (ip, counter); +return 0 ; }struct mmap_data {
@@ -925,13 +980,11 @@ static void mmap_read_counter(struct mmap_data *md) event = &event_copy; } +if (event->header.type ==PERF_RECORD_SAMPLE ) +event__process_sample (event, md->counter); +else +event__process (event); old += size; - -if (event->header.type ==PERF_RECORD_SAMPLE ) { -int user = - (event->header.misc &PERF_RECORD_MISC_CPUMODE_MASK ) ==PERF_RECORD_MISC_USER ; -process_event (event->ip.ip, md->counter, user); - } } md->prev = old;
@@ -973,6 +1026,7 @@ static void start_counter(int i, int counter) } attr->inherit = (cpu <0 ) && inherit; + attr->mmap =1 ; try_again: fd[i][counter] =sys_perf_event_open (attr, target_pid, cpu, group_fd,0 );
@@ -1031,6 +1085,11 @@ static int __cmd_top(void)int i, counter;int ret; +if (target_pid !=-1 ) +event__synthesize_thread (target_pid, event__process); +else +event__synthesize_threads (event__process); +for (i =0 ; i < nr_cpus; i++) { group_fd =-1 ;for (counter =0 ; counter < nr_counters; counter++)
Signature · 1 line
1.5.5.1
Re: [PATCH 3/3] perf top: Support userspace symbols too
Quoted 43 lines · Arnaldo Carvalho de Melo
Example:
Compiling the kernel with 'make -k 22 allyesconfig'
[root@emilia linux-2.6-tip]# perf top -r 90
------------------------------------------------------------------------------
PerfTop: 3669 irqs/sec kernel:59.9% [1000Hz cycles], (all, 8 CPUs)
------------------------------------------------------------------------------samples pcnt function DSO _______ _____ ________________________________ ________________ 3062.00 6.5% clear_page_c [kernel] 2233.00 4.8% _int_malloc /lib64/libc-2.5.so 2100.00 4.5% yylex /home/acme/git/build/allyesconfig/scripts/genksyms/genksyms 2029.00 4.3% memset /lib64/libc-2.5.so 1224.00 2.6% page_fault [kernel] 1075.00 2.3% __GI_strlen /lib64/libc-2.5.so 863.00 1.8% sub_preempt_count [kernel] 822.00 1.8% __GI_memcpy /lib64/libc-2.5.so 810.00 1.7% __GI_vfprintf /lib64/libc-2.5.so 786.00 1.7% _int_free /lib64/libc-2.5.so 775.00 1.7% __GI_strcmp /lib64/libc-2.5.so 748.00 1.6% _spin_lock [kernel] 699.00 1.5% main /home/acme/git/build/allyesconfig/scripts/basic/fixdep 659.00 1.4% add_preempt_count [kernel] 649.00 1.4% yyparse /home/acme/git/build/allyesconfig/scripts/genksyms/genksyms 645.00 1.4% preempt_trace [kernel] 635.00 1.4% __GI___libc_free /lib64/libc-2.5.so 597.00 1.3% trace_preempt_on [kernel] 551.00 1.2% __GI___libc_malloc /lib64/libc-2.5.so 516.00 1.1% _spin_lock_irqsave [kernel] 481.00 1.0% copy_user_generic_string [kernel] 479.00 1.0% unmap_vmas [kernel] 429.00 0.9% _IO_file_xsputn_internal /lib64/libc-2.5.so 425.00 0.9% __GI_strncpy /lib64/libc-2.5.so 416.00 0.9% get_page_from_freelist [kernel] 414.00 0.9% malloc_consolidate /lib64/libc-2.5.so 406.00 0.9% get_parent_ip [kernel] 362.00 0.8% __rmqueue [kernel] 347.00 0.7% in_lock_functions [kernel] 316.00 0.7% __d_lookup [kernel]
Quoted 1 line
[root@emilia linux-2.6-tip]#
That's a really nice feature! I tried it and works well here too.
Ingo
[tip:perf/core] perf top: Support userspace symbols too
In reply to Arnaldo Carvalho de MeloCommit-ID: 5b2bb75a0d4b08cd16bc35ecd674f957fc3b0eb7 Gitweb: http://git.kernel.org/tip/5b2bb75a0d4b08cd16bc35ecd674f957fc3b0eb7 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 26 Oct 2009 19:23:19 -0200 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 27 Oct 2009 13:51:54 +0100
perf top: Support userspace symbols too
Example:
Compiling the kernel with 'make -k 22 allyesconfig'
[root@emilia linux-2.6-tip]# perf top -r 90
------------------------------------------------------------------------------
PerfTop: 3669 irqs/sec kernel:59.9% [1000Hz cycles], (all, 8 CPUs)
------------------------------------------------------------------------------
samples pcnt function DSO
_______ _____ ________________________________ ________________
3062.00 6.5% clear_page_c [kernel]
2233.00 4.8% _int_malloc /lib64/libc-2.5.so
2100.00 4.5% yylex /home/acme/git/build/allyesconfig/scripts/genksyms/genksyms
2029.00 4.3% memset /lib64/libc-2.5.so
1224.00 2.6% page_fault [kernel]
1075.00 2.3% __GI_strlen /lib64/libc-2.5.so
863.00 1.8% sub_preempt_count [kernel]
822.00 1.8% __GI_memcpy /lib64/libc-2.5.so
810.00 1.7% __GI_vfprintf /lib64/libc-2.5.so
786.00 1.7% _int_free /lib64/libc-2.5.so
775.00 1.7% __GI_strcmp /lib64/libc-2.5.so
748.00 1.6% _spin_lock [kernel]
699.00 1.5% main /home/acme/git/build/allyesconfig/scripts/basic/fixdep
659.00 1.4% add_preempt_count [kernel]
649.00 1.4% yyparse /home/acme/git/build/allyesconfig/scripts/genksyms/genksyms
645.00 1.4% preempt_trace [kernel]
635.00 1.4% __GI___libc_free /lib64/libc-2.5.so
597.00 1.3% trace_preempt_on [kernel]
551.00 1.2% __GI___libc_malloc /lib64/libc-2.5.so
516.00 1.1% _spin_lock_irqsave [kernel]
481.00 1.0% copy_user_generic_string [kernel]
479.00 1.0% unmap_vmas [kernel]
429.00 0.9% _IO_file_xsputn_internal /lib64/libc-2.5.so
425.00 0.9% __GI_strncpy /lib64/libc-2.5.so
416.00 0.9% get_page_from_freelist [kernel]
414.00 0.9% malloc_consolidate /lib64/libc-2.5.so
406.00 0.9% get_parent_ip [kernel]
362.00 0.8% __rmqueue [kernel]
347.00 0.7% in_lock_functions [kernel]
316.00 0.7% __d_lookup [kernel][root@emilia linux-2.6-tip]#
More polishing is needed to print just DSO basename when not --verbose, etc.
Supporting a 'comm' column requires some more reworking of 'perf top' internals as we will need to use something like the hist entries 'perf report' uses and will be done in another patch.
LKML-Reference: <[email protected]>
--- tools/perf/builtin-top.c | 143 ++++++++++++++++++++++++++++++++------------- 1 files changed, 101 insertions(+), 42 deletions(-)
tools/perf/builtin-top.c +101 -42
@@ -318,7 +318,7 @@ static void show_details(struct sym_entry *syme) }/* -* Symbols will be added here in record_ip and will get out +* Symbols will be added here in event__process_sample and will get out * after decayed. */ static LIST_HEAD (active_symbols);
@@ -459,18 +459,18 @@ static void print_sym_table(void) }if (nr_counters ==1 ) -printf (" samples pcnt" ); +printf (" samples pcnt" );else -printf (" weight samples pcnt" ); +printf (" weight samples pcnt" );if (verbose)printf (" RIP " ); -printf (" kernel function\n" ); -printf (" %s _______ _____" , +printf (" function DSO\n" ); +printf (" %s _______ _____" , nr_counters ==1 ?" " :"______" );if (verbose) -printf (" ________________" ); -printf (" _______________\n\n" ); +printf (" ________________" ); +printf (" ________________________________ ________________\n\n" );for (nd =rb_first (&tmp); nd; nd =rb_next (nd)) {struct symbol *sym;
@@ -486,16 +486,15 @@ static void print_sym_table(void) sum_ksamples));if (nr_counters ==1 || !display_weighted) -printf ("%20.2f - " , syme->weight); +printf ("%20.2f " , syme->weight);else -printf ("%9.1f %10ld - " , syme->weight, syme->snap_count); +printf ("%9.1f %10ld " , syme->weight, syme->snap_count);percent_color_fprintf (stdout,"%4.1f%%" , pcnt);if (verbose) -printf (" - %016llx" , sym->start); -printf (" : %s" , sym->name); -if (syme->map->dso->name[0 ] =='[' ) -printf (" \t%s" , syme->map->dso->name); +printf (" %016llx" , sym->start); +printf (" %-32s" , sym->name); +printf (" %s" , syme->map->dso->short_name);printf ("\n" ); } }
@@ -818,41 +817,97 @@ static int parse_symbols(void)return 0 ; } -/* -* Binary search in the histogram table and record the hit: -*/ -static void record_ip (u64 ip,int counter) +static void event__process_sample (const event_t *self,int counter) { +u64 ip = self->ip.ip;struct map *map; -struct symbol *sym =kernel_maps__find_symbol (ip, &map); - -if (sym !=NULL ) { -struct sym_entry *syme =dso__sym_priv (map->dso, sym); - -if (!syme->skip) { - syme->count[counter]++; -record_precise_ip (syme, counter, ip); -pthread_mutex_lock (&active_symbols_lock); -if (list_empty (&syme->node) || !syme->node.next) -__list_insert_active_sym (syme); -pthread_mutex_unlock (&active_symbols_lock); +struct sym_entry *syme; +struct symbol *sym; + +switch (self->header.misc &PERF_RECORD_MISC_CPUMODE_MASK ) { +case PERF_RECORD_MISC_USER : { +struct thread *thread =threads__findnew (self->ip.pid); + +if (thread ==NULL )return ; + + map =thread__find_map (thread, ip); +if (map !=NULL ) { + ip = map->map_ip (map, ip); + sym = map->dso->find_symbol (map->dso, ip); +if (sym ==NULL ) +return ; + userspace_samples++; +break ; } } +/* +* If this is outside of all known maps, +* and is a negative address, try to look it +* up in the kernel dso, as it might be a +* vsyscall or vdso (which executes in user-mode). +*/ +if ((long long )ip >=0 ) +return ; +/* Fall thru */ +case PERF_RECORD_MISC_KERNEL : + sym =kernel_maps__find_symbol (ip, &map); +if (sym ==NULL ) +return ; +break ; +default : +return ; + } + + syme =dso__sym_priv (map->dso, sym); - samples--; +if (!syme->skip) { + syme->count[counter]++; +record_precise_ip (syme, counter, ip); +pthread_mutex_lock (&active_symbols_lock); +if (list_empty (&syme->node) || !syme->node.next) +__list_insert_active_sym (syme); +pthread_mutex_unlock (&active_symbols_lock); + ++samples; +return ; + } } -static void process_event (u64 ip,int counter,int user) +static void event__process_mmap (event_t *self) { - samples++; +struct thread *thread =threads__findnew (self->mmap.pid); + +if (thread !=NULL ) { +struct map *map =map__new (&self->mmap,NULL ,0 , +sizeof (struct sym_entry ), + symbol_filter); +if (map !=NULL ) +thread__insert_map (thread, map); + } +} -if (user) { - userspace_samples++; -return ; +static void event__process_comm (event_t *self) +{ +struct thread *thread =threads__findnew (self->comm.pid); + +if (thread !=NULL ) +thread__set_comm (thread, self->comm.comm); +} + +static int event__process (event_t *event) +{ +switch (event->header.type) { +case PERF_RECORD_COMM : +event__process_comm (event); +break ; +case PERF_RECORD_MMAP : +event__process_mmap (event); +break ; +default : +break ; } -record_ip (ip, counter); +return 0 ; }struct mmap_data {
@@ -925,13 +980,11 @@ static void mmap_read_counter(struct mmap_data *md) event = &event_copy; } +if (event->header.type ==PERF_RECORD_SAMPLE ) +event__process_sample (event, md->counter); +else +event__process (event); old += size; - -if (event->header.type ==PERF_RECORD_SAMPLE ) { -int user = - (event->header.misc &PERF_RECORD_MISC_CPUMODE_MASK ) ==PERF_RECORD_MISC_USER ; -process_event (event->ip.ip, md->counter, user); - } } md->prev = old;
@@ -973,6 +1026,7 @@ static void start_counter(int i, int counter) } attr->inherit = (cpu <0 ) && inherit; + attr->mmap =1 ; try_again: fd[i][counter] =sys_perf_event_open (attr, target_pid, cpu, group_fd,0 );
@@ -1031,6 +1085,11 @@ static int __cmd_top(void)int i, counter;int ret; +if (target_pid !=-1 ) +event__synthesize_thread (target_pid, event__process); +else +event__synthesize_threads (event__process); +for (i =0 ; i < nr_cpus; i++) { group_fd =-1 ;for (counter =0 ; counter < nr_counters; counter++)
[tip:perf/core] perf tools: Generalize event synthesizing routines
In reply to Arnaldo Carvalho de MeloCommit-ID: 234fbbf508c58c5084292b11b242377553897459 Gitweb: http://git.kernel.org/tip/234fbbf508c58c5084292b11b242377553897459 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 26 Oct 2009 19:23:18 -0200 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 27 Oct 2009 13:51:53 +0100
perf tools: Generalize event synthesizing routines
Because we will need it in 'perf top' to support userspace symbols for existing threads.
Now we pass a callback that will receive the synthesized event and then write it to the output file in 'perf record' and in the upcoming patch for 'perf top' we will just immediatelly create the in memory representation of threads and maps.
LKML-Reference: <[email protected]>
--- tools/perf/Makefile | 1 + tools/perf/builtin-record.c | 181 +++---------------------------------------- tools/perf/util/event.c | 177 ++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/event.h | 3 + 4 files changed, 191 insertions(+), 171 deletions(-)
tools/perf/Makefile +1 -0
@@ -380,6 +380,7 @@ LIB_OBJS += util/alias.o LIB_OBJS += util/config.o LIB_OBJS += util/ctype.o LIB_OBJS += util/environment.o +LIB_OBJS += util/event.o LIB_OBJS += util/exec_cmd.o LIB_OBJS += util/help.o LIB_OBJS += util/levenshtein.o
tools/perf/builtin-record.c +10 -171
199 lines not on this page · raw message
tools/perf/util/event.c new file +177 -0
177 lines not on this page · raw message
tools/perf/util/event.h +3 -0
@@ -111,4 +111,7 @@ struct map *map__clone(struct map *self);int map__overlap (struct map *l,struct map *r);size_t map__fprintf (struct map *self,FILE *fp); +int event__synthesize_thread (pid_t pid,int (*process)(event_t *event)); +void event__synthesize_threads (int (*process)(event_t *event)); +#endif /* __PERF_RECORD_H */
[tip:perf/core] perf record: Fix race where process can disappear while reading its /proc/pid/tasks
In reply to Arnaldo Carvalho de MeloCommit-ID: 7f3bedcc93f935631d2363f23de1cc80f04fdf3e Gitweb: http://git.kernel.org/tip/7f3bedcc93f935631d2363f23de1cc80f04fdf3e Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 26 Oct 2009 19:23:17 -0200 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 27 Oct 2009 13:51:53 +0100
perf record: Fix race where process can disappear while reading its /proc/pid/tasks
LKML-Reference: <[email protected]>
--- tools/perf/builtin-record.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
tools/perf/builtin-record.c +4 -0
@@ -206,6 +206,7 @@ static pid_t pid_synthesize_comm_event(pid_t pid, int full) fp =fopen (filename,"r" );if (fp ==NULL ) { +out_race:/* * We raced with a task exiting - just return: */
@@ -247,6 +248,9 @@ static pid_t pid_synthesize_comm_event(pid_t pid, int full)snprintf (filename,sizeof (filename),"/proc/%d/task" , pid); tasks =opendir (filename); +if (tasks ==NULL ) + goto out_race; +while (!readdir_r (tasks, &dirent, &next) && next) {char *end; pid =strtol (dirent.d_name, &end,10 );