Group locks now allocate fields dynamically

1 files changed, 20 insertions, 16 deletions

diff --git a/include/litmus/dgl.h b/include/litmus/dgl.h
index 2bf61d4a7547..acd58f80b58b 100644
--- a/include/litmus/dgl.h
+++ b/include/litmus/dgl.h
@@ -4,19 +4,13 @@
 #include <litmus/color.h>
 #include <linux/list.h>
 
-#define WP(num, word) (num / word + (num % word != 0))
-
-#define NUM_REPLICAS  NUM_WAYS
-#define NUM_RESOURCES NUM_COLORS
-#define MASK_SIZE     (sizeof(unsigned long) * 8)
-#define MASK_WORDS    WP(NUM_RESOURCES, MASK_SIZE)
-
 /*
  * A request for @replica amount of a single resource.
  */
 struct dgl_req {
         unsigned short          replicas;
         struct list_head        list;
+        struct dgl_group_req    *greq;
 };
 
 /*
@@ -24,9 +18,11 @@ struct dgl_req {
  */
 struct dgl_group_req {
         int                     cpu;
-        unsigned long           requested[MASK_WORDS];
-        unsigned long           waiting[MASK_WORDS];
-        struct dgl_req          requests[NUM_RESOURCES];
+        unsigned long           *requested;
+        unsigned long           *waiting;
+
+        struct dgl_req          *requests;
+
         unsigned long long      ts;
 };
 
@@ -34,7 +30,7 @@ struct dgl_group_req {
  * A single resource.
  */
 struct dgl_resource {
-        unsigned int            free_replicas;
+        unsigned long           free_replicas;
         struct list_head        waiting;
 };
 
@@ -42,18 +38,26 @@ struct dgl_resource {
  * A group of resources.
  */
 struct dgl {
-        struct dgl_resource     resources[NUM_RESOURCES];
-        struct dgl_group_req*   acquired[NR_CPUS];
+        struct dgl_resource     *resources;
+        struct dgl_group_req*   *acquired;
 
         char                    requests;
         char                    running;
         unsigned long long      ts;
+
+        unsigned long           num_resources;
+        unsigned long           num_replicas;
 };
 
-void dgl_init(struct dgl *dgl);
-void dgl_group_req_init(struct dgl_group_req *greq);
+void dgl_init(struct dgl *dgl, unsigned long num_resources,
+              unsigned long num_replicas);
+void dgl_free(struct dgl *dgl);
+
+void dgl_group_req_init(struct dgl *dgl, struct dgl_group_req *greq);
+void dgl_group_req_free(struct dgl_group_req *greq);
 
-void set_req(struct dgl_group_req *greq, int resource, int replicas);
+void set_req(struct dgl *dgl, struct dgl_group_req *greq,
+             int resource, int replicas);
 
 void add_group_req(struct dgl *dgl, struct dgl_group_req *greq, int cpu);
 void remove_group_req(struct dgl *dgl, struct dgl_group_req *greq);