[oprof-cvs] CVS: oprofile/dae opd_image.c,1.17,1.18 opd_image.h,1.8,1.9 opd_proc.c,1.135,1.136 opd_sample_files.c,1.10,1.11

[John L. <mov...@us...>]

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

Modified Files:
	opd_image.c opd_image.h opd_proc.c opd_sample_files.c 
Log Message:
s/db_tree_t/samples_db_t/ and related changes



Index: opd_image.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/dae/opd_image.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- opd_image.c	14 Nov 2002 04:54:14 -0000	1.17
+++ opd_image.c	1 Dec 2002 06:17:35 -0000	1.18
@@ -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_tree_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_tree_t * tree = &image->sample_files[i];
-		if (tree->base_memory) {
-			db_close(tree);
+		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
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- opd_image.h	14 Nov 2002 04:54:14 -0000	1.8
+++ opd_image.h	1 Dec 2002 06:17:35 -0000	1.9
@@ -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_tree_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
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- opd_proc.c	16 Nov 2002 04:53:51 -0000	1.135
+++ opd_proc.c	1 Dec 2002 06:17:35 -0000	1.136
@@ -272,7 +272,7 @@
 void opd_put_image_sample(struct opd_image * image, unsigned long offset,
 			  u32 count, u32 counter)
 {
-	db_tree_t * sample_file;
+	samples_db_t * sample_file;
 
 	sample_file = &image->sample_files[counter];
 

Index: opd_sample_files.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/dae/opd_sample_files.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- opd_sample_files.c	14 Nov 2002 04:54:15 -0000	1.10
+++ opd_sample_files.c	1 Dec 2002 06:17:36 -0000	1.11
@@ -126,7 +126,7 @@
 void opd_open_sample_file(struct opd_image * image, int counter)
 {
 	char * mangled;
-	db_tree_t * sample_file;
+	samples_db_t * sample_file;
 	struct opd_header * header;
 	char const * app_name;