From: Philippe E. <ph...@us...> - 2004-01-04 13:54:11
|
Update of /cvsroot/oprofile/oprofile/daemon/liblegacy In directory sc8-pr-cvs1:/tmp/cvs-serv953/daemon/liblegacy Modified Files: Tag: BRANCH_CALLGRAPH init.c opd_24_stats.c opd_sample_files.c Log Message: Big. Better handling of callgraph. Only opgprof can handle callgraph but in a less ugly way than previosly. Daemon now create cross-binary call graph. Fix a cg filename filtering bug (Run this fix the invalid filename error you get). Index: init.c =================================================================== RCS file: /cvsroot/oprofile/oprofile/daemon/liblegacy/init.c,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -p -d -r1.3.2.2 -r1.3.2.3 --- init.c 13 Nov 2003 01:17:30 -0000 1.3.2.2 +++ init.c 4 Jan 2004 13:54:08 -0000 1.3.2.3 @@ -335,8 +335,8 @@ static void opd_24_init(void) if (!no_vmlinux) opd_parse_kernel_range(kernel_range); - opd_buf_size = opd_read_fs_int(OP_MOUNT, "bufsize"); - opd_note_buf_size = opd_read_fs_int(OP_MOUNT, "notesize"); + opd_buf_size = opd_read_fs_int(OP_MOUNT, "bufsize", 1); + opd_note_buf_size = opd_read_fs_int(OP_MOUNT, "notesize", 1); s_buf_bytesize = sizeof(struct op_buffer_head) + opd_buf_size * sizeof(struct op_sample); Index: opd_24_stats.c =================================================================== RCS file: /cvsroot/oprofile/oprofile/daemon/liblegacy/opd_24_stats.c,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -u -p -d -r1.4.2.3 -r1.4.2.4 --- opd_24_stats.c 13 Nov 2003 23:34:37 -0000 1.4.2.3 +++ opd_24_stats.c 4 Jan 2004 13:54:08 -0000 1.4.2.4 @@ -55,8 +55,8 @@ void opd_print_24_stats(void) printf("Nr. samples total: %lu\n", opd_24_stats[OPD_SAMPLES]); printf("Nr. notifications: %lu\n", opd_24_stats[OPD_NOTIFICATIONS]); printf("Nr. kernel note buffer overflow: %u\n", - opd_read_fs_int(OP_MOUNT, "note_buffer_overflow")); + opd_read_fs_int(OP_MOUNT, "note_buffer_overflow", 0)); printf("Nr. kernel samples buffer overflow: %u\n", - opd_read_fs_int(OP_MOUNT, "buffer_overflow")); + opd_read_fs_int(OP_MOUNT, "buffer_overflow", 0)); fflush(stdout); } Index: opd_sample_files.c =================================================================== RCS file: /cvsroot/oprofile/oprofile/daemon/liblegacy/opd_sample_files.c,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -p -d -r1.5.2.1 -r1.5.2.2 --- opd_sample_files.c 8 Nov 2003 16:17:31 -0000 1.5.2.1 +++ opd_sample_files.c 4 Jan 2004 13:54:08 -0000 1.5.2.2 @@ -68,15 +68,12 @@ static char * opd_mangle_filename(struct int cpu_nr) { char * mangled; - char const * dep_name = separate_lib ? image->app_name : NULL; struct mangle_values values; struct opd_event * event = find_counter_event(counter); values.flags = 0; if (image->kernel) values.flags |= MANGLE_KERNEL; - if (dep_name && strcmp(dep_name, image->name)) - values.flags |= MANGLE_DEP_NAME; if (separate_thread) { values.flags |= MANGLE_TGID | MANGLE_TID; @@ -94,7 +91,7 @@ static char * opd_mangle_filename(struct values.unit_mask = event->um; values.image_name = image->name; - values.dep_name = dep_name; + values.dep_name = separate_lib ? image->app_name : image->name; mangled = op_mangle_filename(&values); |