[oprof-cvs] CVS: oprofile/libabi Makefile.am,1.6,1.7 abi.cpp,1.8,1.9 abi_test.cpp,1.9,1.10 op_import.cpp,1.11,1.12

[William C. <wc...@us...>]

Update of /cvsroot/oprofile/oprofile/libabi
In directory sc8-pr-cvs1:/tmp/cvs-serv19570/libabi

Modified Files:
	Makefile.am abi.cpp abi_test.cpp op_import.cpp 
Log Message:
Change names to avoid /usr/lib/libdb.a name conflicts.



Index: Makefile.am
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libabi/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	15 Mar 2003 21:25:23 -0000	1.6
+++ Makefile.am	31 Mar 2003 16:39:47 -0000	1.7
@@ -24,7 +24,7 @@
 op_import_SOURCES = op_import.cpp
 op_import_LDADD = \
 	libabi.a \
-	../libdb/libdb.a \
+	../libdb/libodb.a \
 	../libopt++/libopt++.a \
 	../libutil++/libutil++.a \
 	../libutil/libutil.a
@@ -34,7 +34,7 @@
 abi_test_SOURCES = abi_test.cpp
 abi_test_LDADD = \
 	libabi.a \
-	../libdb/libdb.a \
+	../libdb/libodb.a \
 	../libopt++/libopt++.a \
 	../libutil++/libutil++.a \
 	../libutil/libutil.a

Index: abi.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libabi/abi.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- abi.cpp	11 Feb 2003 21:09:03 -0000	1.8
+++ abi.cpp	31 Mar 2003 16:39:48 -0000	1.9
@@ -9,7 +9,7 @@
  */
  
 #include "abi.h"
-#include "db_hash.h"
+#include "odb_hash.h"
 #include "op_sample_file.h"
 
 #include <iostream>
@@ -28,8 +28,8 @@
 Abi::Abi() 
 {
 	
-	db_node_t node;
-	db_descr_t descr;
+	odb_node_t node;
+	odb_descr_t descr;
 	struct opd_header header;
 	
 	slots["sizeof_double"] = sizeof(double);
@@ -38,12 +38,12 @@
 	slots["sizeof_u32"] = sizeof(u32);
 	slots["sizeof_int"] = sizeof(int);
 	slots["sizeof_unsigned_int"] = sizeof(unsigned int);
-	slots["sizeof_db_key_t"] = sizeof(db_key_t);
-	slots["sizeof_db_index_t"] = sizeof(db_index_t);
-	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_odb_key_t"] = sizeof(odb_key_t);
+	slots["sizeof_odb_index_t"] = sizeof(odb_index_t);
+	slots["sizeof_odb_value_t"] = sizeof(odb_value_t);
+	slots["sizeof_odb_node_nr_t"] = sizeof(odb_node_nr_t);
+	slots["sizeof_odb_descr_t"] = sizeof(odb_descr_t);
+	slots["sizeof_odb_node_t"] = sizeof(odb_node_t);
 	slots["sizeof_struct_opd_header"] = sizeof(struct opd_header);		
 	
 	slots["offsetof_node_key"] = field_offset(node, key);

Index: abi_test.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libabi/abi_test.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- abi_test.cpp	6 Mar 2003 22:25:59 -0000	1.9
+++ abi_test.cpp	31 Mar 2003 16:39:48 -0000	1.10
@@ -9,7 +9,7 @@
  */
 
 #include "abi.h"
-#include "db_hash.h"
+#include "odb_hash.h"
 #include "popt_options.h"
 #include "op_sample_file.h"
 #include "op_cpu_type.h"
@@ -50,12 +50,12 @@
 	}
 
 	if (db_filename.size() > 0) {
-		samples_db_t dest;
+		samples_odb_t dest;
 		char * err_msg;
 		int rc;
-		rc = db_open(&dest, db_filename.c_str(), DB_RDWR, sizeof(struct opd_header), &err_msg);
+		rc = odb_open(&dest, db_filename.c_str(), ODB_RDWR, sizeof(struct opd_header), &err_msg);
 		if (rc != EXIT_SUCCESS) {
-			cerr << "db_open() fail:\n"
+			cerr << "odb_open() fail:\n"
 			     << err_msg << endl;
 			free(err_msg);
 			exit(EXIT_FAILURE);
@@ -80,14 +80,14 @@
     
 		for (int i = 0; i < 3793; ++i) {
 			char * err_msg;
-			int rc = db_insert(&dest, ((i*i) ^ (i+i)), ((i*i) ^ i), &err_msg);
+			int rc = odb_insert(&dest, ((i*i) ^ (i+i)), ((i*i) ^ i), &err_msg);
 			if (rc != EXIT_SUCCESS) {
 				cerr << err_msg << endl;
 				free(err_msg);
 				exit(EXIT_FAILURE);
 			}
 		}
-		db_close(&dest);
+		odb_close(&dest);
 		file_processed = true;
 	}
 

Index: op_import.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/libabi/op_import.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- op_import.cpp	6 Mar 2003 22:26:00 -0000	1.11
+++ op_import.cpp	31 Mar 2003 16:39:48 -0000	1.12
@@ -9,7 +9,7 @@
  */
 
 #include "abi.h"
-#include "db_hash.h"
+#include "odb_hash.h"
 #include "popt_options.h"
 #include "op_sample_file.h"
 
@@ -101,7 +101,7 @@
 void import_from_abi(Abi const & abi, 
 		     void const * srcv, 
 		     size_t len, 
-		     samples_db_t * dest) throw (Abi_exception)
+		     samples_odb_t * dest) throw (Abi_exception)
 {
 	struct opd_header * head;
 	head = static_cast<opd_header *>(dest->base_memory);	
@@ -127,28 +127,28 @@
 	// done extracting opd header
 
 	// begin extracting necessary parts of descr
-	db_node_nr_t node_nr;
-	ext.extract(node_nr, src, "sizeof_db_node_nr_t", "offsetof_descr_current_size");
-	src += abi.need("sizeof_db_descr_t");
+	odb_node_nr_t node_nr;
+	ext.extract(node_nr, src, "sizeof_odb_node_nr_t", "offsetof_descr_current_size");
+	src += abi.need("sizeof_odb_descr_t");
 	// done extracting descr
 
 	// skip node zero, it is reserved and contains nothing usefull
-	src += abi.need("sizeof_db_node_t");
+	src += abi.need("sizeof_odb_node_t");
 
 	// begin extracting nodes
-	unsigned int step = abi.need("sizeof_db_node_t");
+	unsigned int step = abi.need("sizeof_odb_node_t");
 	if (verbose)
 		cerr << "extracting " << node_nr << " nodes of " << step << " bytes each " << endl;
 
 	assert(src + (node_nr * step) <= begin + len);
 
-	for (db_node_nr_t i = 1 ; i < node_nr ; ++i, src += step) {
-		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_value");
+	for (odb_node_nr_t i = 1 ; i < node_nr ; ++i, src += step) {
+		odb_key_t key;
+		odb_value_t val;
+		ext.extract(key, src, "sizeof_odb_key_t", "offsetof_node_key");
+		ext.extract(val, src, "sizeof_odb_value_t", "offsetof_node_value");
 		char * err_msg;
-		int rc = db_insert(dest, key, val, &err_msg);
+		int rc = odb_insert(dest, key, val, &err_msg);
 		if (rc != EXIT_SUCCESS) {
 			cerr << err_msg << endl;
 			free(err_msg);
@@ -191,7 +191,7 @@
 		int in_fd;
 		struct stat statb;
 		void * in;
-		samples_db_t dest;
+		samples_odb_t dest;
 		char * err_msg;
 		int rc;
 
@@ -200,10 +200,10 @@
 		assert((in = mmap(0, statb.st_size, PROT_READ, 
 				  MAP_PRIVATE, in_fd, 0)) != (void *)-1);
 
-		rc = db_open(&dest, output_filename.c_str(), DB_RDWR, 
+		rc = odb_open(&dest, output_filename.c_str(), ODB_RDWR, 
 			     sizeof(struct opd_header), &err_msg);
 		if (rc != EXIT_SUCCESS) {
-			cerr << "db_open() fail:\n"
+			cerr << "odb_open() fail:\n"
 			     << err_msg << endl;
 			free(err_msg);
 			exit(EXIT_FAILURE);
@@ -215,7 +215,7 @@
 			cerr << "caught abi exception: " << e.desc << endl;
 		}
 
-		db_close(&dest);
+		odb_close(&dest);
 
 		assert(munmap(in, statb.st_size)==0);		
 	}