X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=blobdiff_plain;f=drivers%2Foprofile%2Fbuffer_sync.c;fp=drivers%2Foprofile%2Fbuffer_sync.c;h=b2e8e49c865987e42f4a3e9a9d9c0e5f353df1e4;hp=13416adfbedb7323d8b5c04dde5b9e7302d1997d;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c

diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index 13416adfb..b2e8e49c8 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -6,10 +6,6 @@
  *
  * @author John Levon <levon@movementarian.org>
  *
- * Modified by Aravind Menon for Xen
- * These modifications are:
- * Copyright (C) 2005 Hewlett-Packard Co.
- *
  * This is the core of the buffer management. Each
  * CPU buffer is processed and entered into the
  * global event buffer. Such processing is necessary
@@ -112,10 +108,10 @@ static int module_load_notify(struct notifier_block * self, unsigned long val, v
 		return 0;
 
 	/* FIXME: should we process all CPU buffers ? */
-	mutex_lock(&buffer_mutex);
+	down(&buffer_sem);
 	add_event_entry(ESCAPE_CODE);
 	add_event_entry(MODULE_LOADED_CODE);
-	mutex_unlock(&buffer_mutex);
+	up(&buffer_sem);
 #endif
 	return 0;
 }
@@ -279,31 +275,15 @@ static void add_cpu_switch(int i)
 	last_cookie = INVALID_COOKIE;
 }
 
-static void add_cpu_mode_switch(unsigned int cpu_mode)
+static void add_kernel_ctx_switch(unsigned int in_kernel)
 {
 	add_event_entry(ESCAPE_CODE);
-	switch (cpu_mode) {
-	case CPU_MODE_USER:
-		add_event_entry(USER_ENTER_SWITCH_CODE);
-		break;
-	case CPU_MODE_KERNEL:
-		add_event_entry(KERNEL_ENTER_SWITCH_CODE);
-		break;
-	case CPU_MODE_XEN:
-		add_event_entry(XEN_ENTER_SWITCH_CODE);
-	  	break;
-	default:
-		break;
-	}
-}
-
-static void add_domain_switch(unsigned long domain_id)
-{
-	add_event_entry(ESCAPE_CODE);
-	add_event_entry(DOMAIN_SWITCH_CODE);
-	add_event_entry(domain_id);
+	if (in_kernel)
+		add_event_entry(KERNEL_ENTER_SWITCH_CODE); 
+	else
+		add_event_entry(KERNEL_EXIT_SWITCH_CODE); 
 }
-
+ 
 static void
 add_user_ctx_switch(struct task_struct const * task, unsigned long cookie)
 {
@@ -368,9 +348,9 @@ static int add_us_sample(struct mm_struct * mm, struct op_sample * s)
  * for later lookup from userspace.
  */
 static int
-add_sample(struct mm_struct * mm, struct op_sample * s, int cpu_mode)
+add_sample(struct mm_struct * mm, struct op_sample * s, int in_kernel)
 {
-	if (cpu_mode >= CPU_MODE_KERNEL) {
+	if (in_kernel) {
 		add_sample_entry(s->eip, s->event);
 		return 1;
 	} else if (mm) {
@@ -516,13 +496,12 @@ void sync_buffer(int cpu)
 	struct mm_struct *mm = NULL;
 	struct task_struct * new;
 	unsigned long cookie = 0;
-	int cpu_mode = 1;
+	int in_kernel = 1;
 	unsigned int i;
 	sync_buffer_state state = sb_buffer_start;
 	unsigned long available;
-	int domain_switch = 0;
 
-	mutex_lock(&buffer_mutex);
+	down(&buffer_sem);
  
 	add_cpu_switch(cpu);
 
@@ -533,18 +512,16 @@ void sync_buffer(int cpu)
 	for (i = 0; i < available; ++i) {
 		struct op_sample * s = &cpu_buf->buffer[cpu_buf->tail_pos];
  
-		if (is_code(s->eip) && !domain_switch) {
-			if (s->event <= CPU_MODE_XEN) {
-				/* xen/kernel/userspace switch */
-				cpu_mode = s->event;
+		if (is_code(s->eip)) {
+			if (s->event <= CPU_IS_KERNEL) {
+				/* kernel/userspace switch */
+				in_kernel = s->event;
 				if (state == sb_buffer_start)
 					state = sb_sample_start;
-				add_cpu_mode_switch(s->event);
+				add_kernel_ctx_switch(s->event);
 			} else if (s->event == CPU_TRACE_BEGIN) {
 				state = sb_bt_start;
 				add_trace_begin();
-			} else if (s->event == CPU_DOMAIN_SWITCH) {
-					domain_switch = 1;				
 			} else {
 				struct mm_struct * oldmm = mm;
 
@@ -558,16 +535,11 @@ void sync_buffer(int cpu)
 				add_user_ctx_switch(new, cookie);
 			}
 		} else {
-			if (domain_switch) {
-				add_domain_switch(s->eip);
-				domain_switch = 0;
-			} else {
-				if (state >= sb_bt_start &&
-				    !add_sample(mm, s, cpu_mode)) {
-					if (state == sb_bt_start) {
-						state = sb_bt_ignore;
-						atomic_inc(&oprofile_stats.bt_lost_no_mapping);
-					}
+			if (state >= sb_bt_start &&
+			    !add_sample(mm, s, in_kernel)) {
+				if (state == sb_bt_start) {
+					state = sb_bt_ignore;
+					atomic_inc(&oprofile_stats.bt_lost_no_mapping);
 				}
 			}
 		}
@@ -578,5 +550,5 @@ void sync_buffer(int cpu)
 
 	mark_done(cpu);
 
-	mutex_unlock(&buffer_mutex);
+	up(&buffer_sem);
 }