Moved some requeueing work out of CPU locks.

1 files changed, 23 insertions, 19 deletions

diff --git a/litmus/dgl.c b/litmus/dgl.c
index f6580a9234dc..d8d686b6f334 100644
--- a/litmus/dgl.c
+++ b/litmus/dgl.c
@@ -497,7 +497,6 @@ static void will_acquire_to_acquire(struct dgl *dgl, struct dgl_group_req *greq)
                 add_acquired(dgl, &resource->acquired, our_req);
 
                 resource->real_free -= our_req->replicas;
-
                 BUG_DUMP(dgl, (resource->real_free < 0));
         }
 }
@@ -516,8 +515,10 @@ static void pull_blocked(struct dgl *dgl, struct dgl_resource *resource)
                         take_cpu(dgl, greq);
                         will_acquire_to_acquire(dgl, greq);
                         dgl->cpu_acquired(greq);
+                        update_blocked(dgl, resource);
                 }
         }
+
 }
 
 /*
@@ -642,6 +643,7 @@ static void pull_prio(struct dgl *dgl, struct dgl_resource *resource)
                         } else {
                                 waiting_to_will_acquire(dgl, greq);
                         }
+                        update_prio(dgl, resource);
                 }
         }
 }
@@ -734,6 +736,10 @@ void remove_group_req(struct dgl *dgl, struct dgl_group_req *greq)
         running  = dgl->acquired[greq->cpu] == greq;
         has_prio = !arr_to_bool(dgl, greq->need_prio);
 
+        if (dgl->acquired[greq->cpu] == greq) {
+                release_cpu(dgl, greq);
+        }
+
         for_each_resource(greq->requested, dgl, w, b, i) {
                 our_req  = &greq->requests[i];
                 resource = &dgl->resources[i];
@@ -741,33 +747,31 @@ void remove_group_req(struct dgl *dgl, struct dgl_group_req *greq)
                 if (running) {
                         resource->real_free += our_req->replicas;
                         BUG_DUMP(dgl, resource->real_free > dgl->num_replicas);
+                        update_blocked(dgl, resource);
                 }
                 if (has_prio) {
                         resource->goal_free += our_req->replicas;
                         BUG_DUMP(dgl, resource->goal_free > dgl->num_replicas);
+                        update_prio(dgl, resource);
                 }
 
                 list_del_init(&our_req->list);
         }
 
-        if (dgl->acquired[greq->cpu] == greq) {
-                release_cpu(dgl, greq);
-        }
-
-        if (!arr_to_bool(dgl, greq->need_prio)) {
-                for_each_resource(greq->requested, dgl, w, b, i) {
-                        update_prio(dgl, &dgl->resources[i]);
-                }
-                for_each_resource(greq->requested, dgl, w, b, i) {
-                        pull_prio(dgl, &dgl->resources[i]);
-                }
-        }
-
-        for_each_resource(greq->requested, dgl, w, b, i) {
-                resource = &dgl->resources[i];
-                if (running)  update_blocked(dgl, resource);
-                if (has_prio) update_prio(dgl, resource);
-        }
+        /* if (!arr_to_bool(dgl, greq->need_prio)) { */
+        /*      for_each_resource(greq->requested, dgl, w, b, i) { */
+        /*              update_prio(dgl, &dgl->resources[i]); */
+        /*      } */
+        /*      for_each_resource(greq->requested, dgl, w, b, i) { */
+        /*              pull_prio(dgl, &dgl->resources[i]); */
+        /*      } */
+        /* } */
+
+        /* for_each_resource(greq->requested, dgl, w, b, i) { */
+        /*      resource = &dgl->resources[i]; */
+        /*      if (running)  update_blocked(dgl, resource); */
+        /*      if (has_prio) update_prio(dgl, resource); */
+        /* } */
         for_each_resource(greq->requested, dgl, w, b, i) {
                 resource = &dgl->resources[i];
                 if (running)  pull_blocked(dgl, resource);