X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_halt.c;h=445f43fecfd6437161a7aa856888071fd93b27db;hb=40a6dd36505a959c132c32497aa50bd74afd8250;hp=604d06b6d2a19840d051eab70504da103e2cbc8f;hpb=7ca1f3f6bcb065c7c28b98f049d4abbca21a7bc1;p=palacios.git

diff --git a/palacios/src/palacios/vmm_halt.c b/palacios/src/palacios/vmm_halt.c
index 604d06b..445f43f 100644
--- a/palacios/src/palacios/vmm_halt.c
+++ b/palacios/src/palacios/vmm_halt.c
@@ -21,6 +21,7 @@
 #include <palacios/vmm_halt.h>
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_lowlevel.h> 
+#include <palacios/vmm_perftune.h>
 
 #ifndef V3_CONFIG_DEBUG_HALT
 #undef PrintDebug
@@ -28,11 +29,6 @@
 #endif
 
 
-#define NO_PROGRESS_CYCLE_LIMIT  4000000ULL   // 4 million cycles, about 1ms on a 4 GHz machine
-
-#define YIELD_TIME_USEC    1000
-
-
 //
 // This should trigger a #GP if cpl != 0, otherwise, yield to host
 //
@@ -43,36 +39,29 @@ int v3_handle_halt(struct guest_info * info)
     if (info->cpl != 0) { 
 	v3_raise_exception(info, GPF_EXCEPTION);
     } else {
-	uint64_t total_cycles;
+	uint64_t start_cycles;
 	
+	PrintDebug(info->vm_info, info, "CPU Yield\n");
 
-	PrintDebug("CPU Yield\n");
-
-	total_cycles = 0;
+	start_cycles  = v3_get_host_time(&info->time_state);
 
-	while (!v3_intr_pending(info) && (info->vm_info->run_state == VM_RUNNING)) {
+	while (!v3_intr_pending(info) &&
+	       !v3_excp_pending(info) &&
+	       (info->vm_info->run_state == VM_RUNNING)) {
             uint64_t t, cycles;
-	    /* Yield, allowing time to pass while yielded */
+
 	    t = v3_get_host_time(&info->time_state);
 
-	    // adaptively select the best yield option
-	    if (total_cycles > NO_PROGRESS_CYCLE_LIMIT) { 
-		// Slow yield - will take at least YIELD_TIME_USEC to come back
-		v3_yield(info,YIELD_TIME_USEC);
-	    } else {
-		// Fast yield - may come back immediately
-		v3_yield(info,-1);
-	    }
+	    /* Yield, allowing time to pass while yielded */
+	    v3_strategy_driven_yield(info, v3_cycle_diff_in_usec(info, start_cycles, t));
 
 	    cycles = v3_get_host_time(&info->time_state) - t;
 
-	    if ((total_cycles + cycles) > total_cycles) { 
-		total_cycles += cycles;
-	    }
-
 	    v3_advance_time(info, &cycles);
 
 	    v3_update_timers(info);
+	    
+
     	    
 	    /* At this point, we either have some combination of 
 	       interrupts, including perhaps a timer interrupt, or 
@@ -83,11 +72,20 @@ int v3_handle_halt(struct guest_info * info)
 		/* asm("hlt"); */
 	    }
 
+	    // participate in any barrier that might be raised
+	    v3_wait_at_barrier(info);
+
+	    // stop if the VM is being halted or core is being reset
+	    if (info->core_run_state == CORE_STOPPED || info->core_run_state == CORE_RESETTING) { 
+		break;
+	    }
+
 	}
 
-	/* V3_Print("palacios: done with halt\n"); */
+	/* V3_Print(info->vm_info, info, "palacios: done with halt\n"); */
 	
 	info->rip += 1;
+	
     }
 
     return 0;