[prev in list] [next in list] [prev in thread] [next in thread] 

List:       oprofile-commits
Subject:    [oprof-cvs] CVS: oprofile/daemon/liblegacy opd_image.c,1.9,1.10 opd_proc.c,1.10,1.11 opd_sample_file
From:       John Levon <movement () users ! sourceforge ! net>
Date:       2004-05-28 17:21:42
Message-ID: E1BTl38-0000Wj-NG () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/oprofile/oprofile/daemon/liblegacy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1804/daemon/liblegacy

Modified Files:
	opd_image.c opd_proc.c opd_sample_files.c 
Log Message:
hopefully fix dcookie aliasing bug, by Bin Ren


Index: opd_image.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/daemon/liblegacy/opd_image.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -d -r1.9 -r1.10
--- opd_image.c	29 Jan 2004 20:00:26 -0000	1.9
+++ opd_image.c	28 May 2004 17:21:39 -0000	1.10
@@ -18,6 +18,7 @@
 #include "op_file.h"
 #include "op_config_24.h"
 #include "op_libiberty.h"
+#include "op_string.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -102,7 +103,7 @@ void opd_for_each_image(opd_image_cb ima
  */
 static size_t opd_hash_image(char const * name, pid_t tid, pid_t tgid)
 {
-	size_t hash = opd_hash_name(name);
+	size_t hash = op_hash_string(name);
 	if (separate_thread)
 		hash += tid + tgid;
 	return  hash % OPD_IMAGE_HASH_SIZE;

Index: opd_proc.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/daemon/liblegacy/opd_proc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -d -r1.10 -r1.11
--- opd_proc.c	29 Jan 2004 20:00:26 -0000	1.10
+++ opd_proc.c	28 May 2004 17:21:39 -0000	1.11
@@ -134,7 +134,7 @@ void opd_put_image_sample(struct opd_ima
 	}
 	sfile = image->sfiles[cpu_number][counter];
 
-	if (!sfile || !sfile->sample_file.base_memory) {
+	if (!sfile || !sfile->sample_file.data) {
 		if (opd_open_24_sample_file(image, counter, cpu_number)) {
 			/* opd_open_24_sample_file output an error message */
 			opd_24_stats[OPD_LOST_SAMPLEFILE]++;

Index: opd_sample_files.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/daemon/liblegacy/opd_sample_files.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -d -r1.8 -r1.9
--- opd_sample_files.c	8 Feb 2004 02:08:04 -0000	1.8
+++ opd_sample_files.c	28 May 2004 17:21:39 -0000	1.9
@@ -142,7 +142,7 @@ retry:
 		goto out;
 	}
 
-	fill_header(sfile->sample_file.base_memory, counter,
+	fill_header(sfile->sample_file.data->base_memory, counter,
 	            image->kernel, 0, image->mtime);
 
 out:



-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
_______________________________________________
Oprofile-commits mailing list
Oprofile-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/oprofile-commits
[prev in list] [next in list] [prev in thread] [next in thread]