From: John L. <mov...@us...> - 2003-10-20 03:36:47
|
Update of /cvsroot/oprofile/oprofile/libabi In directory sc8-pr-cvs1:/tmp/cvs-serv28086/libabi Modified Files: abi.cpp abi_test.cpp op_import.cpp Log Message: sample file header changes. version bumped. Index: abi.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/libabi/abi.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -d -r1.12 -r1.13 --- abi.cpp 17 Sep 2003 23:55:57 -0000 1.12 +++ abi.cpp 20 Oct 2003 01:42:33 -0000 1.13 @@ -55,16 +55,13 @@ abi::abi() slots["offsetof_header_magic"] = field_offset(header, magic); slots["offsetof_header_version"] = field_offset(header, version); - slots["offsetof_header_is_kernel"] = field_offset(header, is_kernel); + slots["offsetof_header_cpu_type"] = field_offset(header, cpu_type); slots["offsetof_header_ctr_event"] = field_offset(header, ctr_event); slots["offsetof_header_ctr_um"] = field_offset(header, ctr_um); - slots["offsetof_header_ctr"] = field_offset(header, ctr); - slots["offsetof_header_cpu_type"] = field_offset(header, cpu_type); slots["offsetof_header_ctr_count"] = field_offset(header, ctr_count); + slots["offsetof_header_is_kernel"] = field_offset(header, is_kernel); slots["offsetof_header_cpu_speed"] = field_offset(header, cpu_speed); slots["offsetof_header_mtime"] = field_offset(header, mtime); - slots["offsetof_header_separate_lib"] = field_offset(header, separate_lib); - slots["offsetof_header_separate_kernel"] = field_offset(header, separate_kernel); // determine endianness Index: abi_test.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/libabi/abi_test.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -d -r1.16 -r1.17 --- abi_test.cpp 25 Sep 2003 23:40:55 -0000 1.16 +++ abi_test.cpp 20 Oct 2003 01:42:34 -0000 1.17 @@ -72,13 +72,10 @@ int main(int argc, char const ** argv) header->is_kernel = 1; header->ctr_event = 0x80; /* ICACHE_FETCHES */ header->ctr_um = 0x0; - header->ctr = 0x0; header->cpu_type = CPU_ATHLON; header->ctr_count = 0xdeadbeef; header->cpu_speed = 0; header->mtime = 1034790063; - header->separate_lib = 0; - header->separate_kernel = 0; for (int i = 0; i < 3793; ++i) { int rc = odb_insert(&dest, ((i*i) ^ (i+i)), ((i*i) ^ i)); Index: op_import.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/libabi/op_import.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -d -r1.22 -r1.23 --- op_import.cpp 1 Oct 2003 14:32:29 -0000 1.22 +++ op_import.cpp 20 Oct 2003 01:42:34 -0000 1.23 @@ -113,17 +113,14 @@ void import_from_abi(abi const & abi, vo // begin extracting opd header ext.extract(head->version, src, "sizeof_u32", "offsetof_header_version"); - ext.extract(head->is_kernel, src, "sizeof_u8", "offsetof_header_is_kernel"); + ext.extract(head->cpu_type, src, "sizeof_u32", "offsetof_header_cpu_type"); ext.extract(head->ctr_event, src, "sizeof_u32", "offsetof_header_ctr_event"); ext.extract(head->ctr_um, src, "sizeof_u32", "offsetof_header_ctr_um"); - ext.extract(head->ctr, src, "sizeof_u32", "offsetof_header_ctr"); - ext.extract(head->cpu_type, src, "sizeof_u32", "offsetof_header_cpu_type"); ext.extract(head->ctr_count, src, "sizeof_u32", "offsetof_header_ctr_count"); + ext.extract(head->is_kernel, src, "sizeof_u32", "offsetof_header_is_kernel"); // "double" extraction is unlikely to work head->cpu_speed = 0.0; ext.extract(head->mtime, src, "sizeof_time_t", "offsetof_header_mtime"); - ext.extract(head->separate_lib, src, "sizeof_int", "offsetof_header_separate_lib"); - ext.extract(head->separate_kernel, src, "sizeof_int", "offsetof_header_separate_kernel"); src += abi.need("sizeof_struct_opd_header"); // done extracting opd header |