From: Philippe E. <ph...@us...> - 2003-01-06 14:36:43
|
Update of /cvsroot/oprofile/oprofile/libabi In directory sc8-pr-cvs1:/tmp/cvs-serv16740 Modified Files: abi.cpp op_import.cpp Log Message: update to get account last change in libdb regards, Phil Index: abi.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/libabi/abi.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- abi.cpp 3 Dec 2002 03:44:50 -0000 1.5 +++ abi.cpp 6 Jan 2003 14:36:35 -0000 1.6 @@ -47,6 +47,7 @@ slots["sizeof_db_value_t"] = sizeof(db_value_t); slots["sizeof_db_node_nr_t"] = sizeof(db_node_nr_t); slots["sizeof_db_descr_t"] = sizeof(db_descr_t); + slots["sizeof_db_node_t"] = sizeof(db_node_t); slots["sizeof_struct_opd_header"] = sizeof(struct opd_header); slots["offsetof_node_key"] = field_offset(node, key); Index: op_import.cpp =================================================================== RCS file: /cvsroot/oprofile/oprofile/libabi/op_import.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- op_import.cpp 3 Dec 2002 03:44:50 -0000 1.6 +++ op_import.cpp 6 Jan 2003 14:36:38 -0000 1.7 @@ -111,22 +111,22 @@ // begin extracting necessary parts of descr db_node_nr_t node_nr; - ext.extract(&node_nr, src, "sizeof_db_page_count_t", "offsetof_descr_current_size"); + ext.extract(&node_nr, src, "sizeof_db_node_nr_t", "offsetof_descr_current_size"); src += abi.need("sizeof_db_descr_t"); // done extracting descr // skip node zero, it is reserved and contains nothing usefull - src += abi.need("sizeof_db_node_nr_t"); + src += abi.need("sizeof_db_node_t"); // begin extracting nodes for (db_node_nr_t i = 1 ; i < node_nr ; ++i) { db_key_t key; db_value_t val; ext.extract(&key, src, "sizeof_db_key_t", "offsetof_node_key"); - ext.extract(&val, src, "sizeof_db_value_t", "offsetof_node_info"); + ext.extract(&val, src, "sizeof_db_value_t", "offsetof_node_value"); db_insert(dest, key, val); - src += abi.need("sizeof_db_node_nr_t"); + src += abi.need("sizeof_db_node_t"); } // done extracting nodes } |