Allow one litmus_lock to control multiple fdsos.

Each fdso in a resource group now points to a single litmus_lock object
which will arbitrate access to each of the fdsos.

4 files changed, 12 insertions, 24 deletions

diff --git a/include/litmus/fdso.h b/include/litmus/fdso.h
index 82f88221f4f0..85a649e2722d 100644
--- a/include/litmus/fdso.h
+++ b/include/litmus/fdso.h
@@ -73,7 +73,7 @@ static inline void* od_lookup(int od, obj_type_t type)
         return e && e->obj->type == type ? e->obj->obj : NULL;
 }
 
-#define lookup_fmlp_sem(od)((struct pi_semaphore*)  od_lookup(od, FMLP_SEM))
+#define lookup_fmlp_sem(od)((struct fmlp_semaphore*)  od_lookup(od, FMLP_SEM))
 #define lookup_srp_sem(od) ((struct srp_semaphore*) od_lookup(od, SRP_SEM))
 #define lookup_ics(od)     ((struct ics*)           od_lookup(od, ICS_ID))
 
diff --git a/include/litmus/locking.h b/include/litmus/locking.h
index e9998946e7de..203466933f3c 100644
--- a/include/litmus/locking.h
+++ b/include/litmus/locking.h
@@ -1,9 +1,9 @@
 #ifndef LITMUS_LOCKING_H
 #define LITMUS_LOCKING_H
 
-struct litmus_lock_ops;
+#include <litmus/fdso.h>
 
-struct dynamic_group_lock_ops;
+struct litmus_lock_ops;
 
 /* Generic base struct for LITMUS^RT userspace semaphores.
  * This structure should be embedded in protocol-specific semaphores.
@@ -18,29 +18,20 @@ struct litmus_lock_ops {
          * Optional methods, allowed by default. */
         int (*open)(struct litmus_lock*, void* __user);
         int (*close)(struct litmus_lock*);
+    
+    /* add or remove a resource from control by the dynamic group lock */
+    int (*add)(struct litmus_lock*, int);
+    int (*remove)(struct litmus_lock*, int);
 
         /* Current tries to lock/unlock this lock (mandatory methods). */
         int (*lock)(struct litmus_lock*);
         int (*unlock)(struct litmus_lock*);
 
+    int (*dynamic_group_lock)(struct litmus_lock*, resource_mask_t);
+    int (*dynamic_group_unlock)(struct litmus_lock*, resource_mask_t);
+
         /* The lock is no longer being referenced (mandatory method). */
         void (*deallocate)(struct litmus_lock*);
 };
 
-struct dynamic_group_lock {
-    struct dynamic_group_lock_ops *ops;
-
-    /* Probably useful for different RNLP variants. */
-    int type;
-};
-
-struct dynamic_group_lock_ops {
-    // Do we need open and close?
-
-    int (*lock)(struct dynamic_group_lock*);
-    int (*unlock)(struct dynamic_group_lock*);
-
-    void (*deallocate)(struct dynamic_group_lock*);
-};
-
 #endif
diff --git a/include/litmus/unistd_32.h b/include/litmus/unistd_32.h
index 1c59c92547c5..04e453e89914 100644
--- a/include/litmus/unistd_32.h
+++ b/include/litmus/unistd_32.h
@@ -19,6 +19,5 @@
 #define __NR_null_call          __LSC(11)
 #define __NR_dynamic_group_lock     __LSC(12)
 #define __NR_dynamic_group_unlock   __LSC(13)
-#define __NR_dynamic_group_add      __LSC(14)
 
-#define NR_litmus_syscalls 15
+#define NR_litmus_syscalls 14
diff --git a/include/litmus/unistd_64.h b/include/litmus/unistd_64.h
index 1ad4aa92ae5f..ae55b4884666 100644
--- a/include/litmus/unistd_64.h
+++ b/include/litmus/unistd_64.h
@@ -33,7 +33,5 @@ __SYSCALL(__NR_null_call, sys_null_call)
 __SYSCALL(__NR_dynamic_group_lock, sys_dynamic_group_lock)
 #define __NR_dynamic_group_unlock   __LSC(13)
 __SYSCALL(__NR_dynamic_group_unlock, sys_dynamic_group_unlock)
-#define __NR_dynamic_group_add      __LSC(14)
-__SYSCALL(__NR_dynamic_group_add, sys_dynamic_group_add)
 
-#define NR_litmus_syscalls 15
+#define NR_litmus_syscalls 14