OProfile

Update of /cvsroot/oprofile/oprofile/dae
In directory sc8-pr-cvs1:/tmp/cvs-serv28005/dae

Modified Files:
      Tag: branch-dbhash-1
	Makefile.am opd_image.c opd_image.h opd_proc.c 
	opd_sample_files.c 
Log Message:
some changes from branch + compile fix + back out model_ppro change (not related to branch)
 


Index: Makefile.am
===================================================================
RCS file: /cvsroot/oprofile/oprofile/dae/Makefile.am,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- Makefile.am	30 Nov 2002 18:46:44 -0000	1.8.2.1
+++ Makefile.am	1 Dec 2002 06:38:22 -0000	1.8.2.2
@@ -14,9 +14,9 @@
 oprofiled_SOURCES = $(dist_sources)
  
 if enable_abi
-oprofiled_LDADD = ../libabi/libabi.a ../libdb/libdb-hash.a ../libop/libop.a ../libutil/libutil.a
+oprofiled_LDADD = ../libabi/libabi.a ../libdb/libdb.a ../libop/libop.a ../libutil/libutil.a
 else
-oprofiled_LDADD = ../libdb/libdb-hash.a ../libop/libop.a ../libutil/libutil.a
+oprofiled_LDADD = ../libdb/libdb.a ../libop/libop.a ../libutil/libutil.a
 endif
 
 oprofiled_LINK = $(CXX) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

Index: opd_image.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/dae/opd_image.c,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -d -r1.17.2.1 -r1.17.2.2
--- opd_image.c	30 Nov 2002 18:46:44 -0000	1.17.2.1
+++ opd_image.c	1 Dec 2002 06:38:22 -0000	1.17.2.2
@@ -134,7 +134,7 @@
 		   image->name, image->app_name ? image->app_name : "none");
 
 	for (i = 0 ; i < op_nr_counters ; ++i) {
-		memset(&image->sample_files[i], '\0', sizeof(db_hash_t));
+		memset(&image->sample_files[i], '\0', sizeof(samples_db_t));
 	}
 
 	image->mtime = op_get_mtime(image->name);
@@ -169,9 +169,9 @@
 	len = strlen(mangled);
 
 	for (i = 0; i < op_nr_counters; i++) {
-		db_hash_t * hash = &image->sample_files[i];
-		if (hash->base_memory) {
-			db_hash_close(hash);
+		samples_db_t * db = &image->sample_files[i];
+		if (db->base_memory) {
+			db_close(db);
 		}
 		sprintf(mangled + len, "#%d", i);
 		verbprintf("Deleting out of date \"%s\"\n", mangled);

Index: opd_image.h
===================================================================
RCS file: /cvsroot/oprofile/oprofile/dae/opd_image.h,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -d -r1.8.2.1 -r1.8.2.2
--- opd_image.h	30 Nov 2002 18:46:44 -0000	1.8.2.1
+++ opd_image.h	1 Dec 2002 06:38:22 -0000	1.8.2.2
@@ -29,7 +29,7 @@
 	/* used to link image with a valid hash, we never destroy image so a
 	 * simple link is necessary */
 	struct opd_image * hash_next;
-	db_hash_t sample_files[OP_MAX_COUNTERS];
+	samples_db_t sample_files[OP_MAX_COUNTERS];
 	int hash;
 	/* name of this image */
 	char * name;

Index: opd_proc.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/dae/opd_proc.c,v
retrieving revision 1.135.2.1
retrieving revision 1.135.2.2
diff -u -d -r1.135.2.1 -r1.135.2.2
--- opd_proc.c	30 Nov 2002 18:46:44 -0000	1.135.2.1
+++ opd_proc.c	1 Dec 2002 06:38:22 -0000	1.135.2.2
@@ -272,7 +272,7 @@
 void opd_put_image_sample(struct opd_image * image, unsigned long offset,
 			  u32 counter)
 {
-	db_hash_t * sample_file;
+	samples_db_t * sample_file;
 
 	sample_file = &image->sample_files[counter];
 
@@ -284,7 +284,7 @@
 		}
 	}
 
-	db_hash_insert(sample_file, offset, 1);
+	db_insert(sample_file, offset, 1);
 }
 
 

Index: opd_sample_files.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/dae/opd_sample_files.c,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- opd_sample_files.c	30 Nov 2002 18:46:44 -0000	1.10.2.1
+++ opd_sample_files.c	1 Dec 2002 06:38:22 -0000	1.10.2.2
@@ -126,7 +126,7 @@
 void opd_open_sample_file(struct opd_image * image, int counter)
 {
 	char * mangled;
-	db_hash_t * sample_file;
+	samples_db_t * sample_file;
 	struct opd_header * header;
 	char const * app_name;
 
@@ -139,7 +139,7 @@
 
 	verbprintf("Opening \"%s\"\n", mangled);
 
-	db_hash_open(sample_file, mangled, DB_RDWR, sizeof(struct opd_header));
+	db_open(sample_file, mangled, DB_RDWR, sizeof(struct opd_header));
 	if (!sample_file->base_memory) {
 		fprintf(stderr,
 			"oprofiled: db_open() of image sample file \"%s\" failed: %s\n",
@@ -175,7 +175,7 @@
 {
 	uint i;
 	for (i = 0 ; i < op_nr_counters ; ++i) {
-		db_hash_sync(&image->sample_files[i]);
+		db_sync(&image->sample_files[i]);
 	}
 }
 
@@ -188,6 +188,6 @@
 {
 	uint i;
 	for (i = 0 ; i < op_nr_counters ; ++i) {
-		db_hash_close(&image->sample_files[i]);
+		db_close(&image->sample_files[i]);
 	}
 }