X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_barrier.c;h=961b894cdd0eef1150425f6d80cd055c9efaeed5;hb=36973b53a5876a555eb59be0b0fb5f1f49686696;hp=7718fc8840f096e916a7c12c6bdc947152ea481c;hpb=94429f4b9268cf4d5f86dee5c3d929110811ac80;p=palacios.git

diff --git a/palacios/src/palacios/vmm_barrier.c b/palacios/src/palacios/vmm_barrier.c
index 7718fc8..961b894 100644
--- a/palacios/src/palacios/vmm_barrier.c
+++ b/palacios/src/palacios/vmm_barrier.c
@@ -41,28 +41,14 @@ int v3_deinit_barrier(struct v3_vm_info * vm_info) {
     return 0;
 }
 
-
-/* Barrier synchronization primitive
- *   -- This call will block until all the guest cores are waiting at a common synchronization point
- *      in a yield loop. The core will block at the sync point until the barrier is lowered.
- * 
- *   ARGUMENTS: 
- *       vm_info -- The VM for which the barrier is being activated
- *       local_core -- The core whose thread this function is being called from, or NULL 
- *                     if the calling thread is not associated with a VM's core context
- */
-
-int v3_raise_barrier(struct v3_vm_info * vm_info, struct guest_info * local_core) {
+int v3_raise_barrier_nowait(struct v3_vm_info * vm_info, struct guest_info * local_core) {
     struct v3_barrier * barrier = &(vm_info->barrier);
     addr_t flag;
     int acquired = 0;
-    int all_blocked = 0;
 
     int local_vcpu = -1;
     int i = 0;
 
-
-
     flag = v3_lock_irqsave(barrier->lock);
 
     if (barrier->active == 0) {
@@ -99,6 +85,18 @@ int v3_raise_barrier(struct v3_vm_info * vm_info, struct guest_info * local_core
 	}
     }
 
+    return 0;
+}
+
+int v3_wait_for_barrier(struct v3_vm_info * vm_info, struct guest_info * local_core) {
+    struct v3_barrier * barrier = &(vm_info->barrier);
+    int all_blocked = 0;
+    int i = 0;
+
+    if (barrier->active == 0) {
+	return -1;
+    }
+
     // wait for barrier catch on all cores
     while (all_blocked == 0) {
 	all_blocked = 1;
@@ -125,12 +123,35 @@ int v3_raise_barrier(struct v3_vm_info * vm_info, struct guest_info * local_core
 	v3_yield(local_core);
     }
 
-
     return 0;
 }
 
 
 
+/* Barrier synchronization primitive
+ *   -- This call will block until all the guest cores are waiting at a common synchronization point
+ *      in a yield loop. The core will block at the sync point until the barrier is lowered.
+ * 
+ *   ARGUMENTS: 
+ *       vm_info -- The VM for which the barrier is being activated
+ *       local_core -- The core whose thread this function is being called from, or NULL 
+ *                     if the calling thread is not associated with a VM's core context
+ */
+
+int v3_raise_barrier(struct v3_vm_info * vm_info, struct guest_info * local_core) {
+    int ret = 0;
+
+    ret = v3_raise_barrier_nowait(vm_info, local_core);
+
+    if (ret != 0) {
+	return ret;
+    }
+
+    return v3_wait_for_barrier(vm_info, local_core);
+}
+
+
+
 /* Lowers a barrier that has already been raised
  *    guest cores will automatically resume execution 
  *    once this has been called
@@ -177,7 +198,7 @@ int v3_wait_at_barrier(struct guest_info * core) {
     V3_Print("Core %d bit set as waiting\n", core->vcpu_id);
 
     // wait for cpu bit to clear
-    while (v3_bitmap_check(&(barrier->cpu_map), core->vcpu_id) == 1) {
+    while (v3_bitmap_check(&(barrier->cpu_map), core->vcpu_id)) {
 	v3_yield(core);
     }