History

Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent

Ingo Molnar committed 16 years ago

Commit e1d4e082 parents 5e11637 85e00b52 files · +9 −1Browse files

Unified · Split

2 files
  1. tools/perf/util/symbol.c +7 −0
  2. tools/perf/util/symbol.h +2 −1
tools/perf/util/symbol.c+7−0
@@ -2268,6 +2268,9 @@ static int setup_list(struct strlist **list, const char *list_str, · 2267 unmodified lines
2268 2268
2269int symbol__init(void)2269int symbol__init(void)
2270{2270{
2271 if (symbol_conf.initialized)
2272 return 0;
2273
2271 elf_version(EV_CURRENT);2274 elf_version(EV_CURRENT);
2272 if (symbol_conf.sort_by_name)2275 if (symbol_conf.sort_by_name)
2273 symbol_conf.priv_size += (sizeof(struct symbol_name_rb_node) -2276 symbol_conf.priv_size += (sizeof(struct symbol_name_rb_node) -
@@ -2293,6 +2296,7 @@ int symbol__init(void) · 19 unmodified lines
2293 symbol_conf.sym_list_str, "symbol") < 0)2296 symbol_conf.sym_list_str, "symbol") < 0)
2294 goto out_free_comm_list;2297 goto out_free_comm_list;
2295 2298
2299 symbol_conf.initialized = true;
2296 return 0;2300 return 0;
2297 2301
2298out_free_dso_list:2302out_free_dso_list:
@@ -2304,11 +2308,14 @@ out_free_comm_list: · 5 unmodified lines
2304 2308
2305void symbol__exit(void)2309void symbol__exit(void)
2306{2310{
2311 if (!symbol_conf.initialized)
2312 return;
2307 strlist__delete(symbol_conf.sym_list);2313 strlist__delete(symbol_conf.sym_list);
2308 strlist__delete(symbol_conf.dso_list);2314 strlist__delete(symbol_conf.dso_list);
2309 strlist__delete(symbol_conf.comm_list);2315 strlist__delete(symbol_conf.comm_list);
2310 vmlinux_path__exit();2316 vmlinux_path__exit();
2311 symbol_conf.sym_list = symbol_conf.dso_list = symbol_conf.comm_list = NULL;2317 symbol_conf.sym_list = symbol_conf.dso_list = symbol_conf.comm_list = NULL;
2318 symbol_conf.initialized = false;
2312}2319}
2313 2320
2314int machines__create_kernel_maps(struct rb_root *self, pid_t pid)2321int machines__create_kernel_maps(struct rb_root *self, pid_t pid)
tools/perf/util/symbol.h+2−1
@@ -69,7 +69,8 @@ struct symbol_conf { · 68 unmodified lines
69 show_nr_samples,69 show_nr_samples,
70 use_callchain,70 use_callchain,
71 exclude_other,71 exclude_other,
72 show_cpu_utilization;72 show_cpu_utilization,
73 initialized;
73 const char *vmlinux_name,74 const char *vmlinux_name,
74 *source_prefix,75 *source_prefix,
75 *field_sep;76 *field_sep;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t