Added liblitmus support for locking with CS length

3 files changed, 29 insertions, 4 deletions

diff --git a/bin/rtspin.c b/bin/rtspin.c
index 28bc956..74d97e2 100644
--- a/bin/rtspin.c
+++ b/bin/rtspin.c
@@ -83,6 +83,7 @@ const char *usage_msg =
         "    -L CS-LENGTH      simulate a critical section length of CS-LENGTH milliseconds\n"
         "    -Q RESOURCE-ID    access the resource identified by RESOURCE-ID\n"
         "    -Z                enable checking for forbidden zones after locking a resource\n"
+        "        -K                                enable passing worst-case critical-section duration to lock calls\n"
         "\n"
         "Units:\n"
         "    WCET and PERIOD are expected in milliseconds.\n"
@@ -299,9 +300,10 @@ static int generate_output(int output_fd)
         return written == len;
 }
 
-static void job(double exec_time, double program_end, int lock_od, double cs_length, int check_fz)
+static void job(double exec_time, double program_end, int lock_od, double cs_length, int check_fz, int pass_cs_len)
 {
         double chunk1, chunk2;
+        int lock_res;
 
         if (lock_od >= 0) {
                 /* simulate critical section somewhere in the middle */
@@ -312,7 +314,12 @@ static void job(double exec_time, double program_end, int lock_od, double cs_len
                 loop_for(chunk1, program_end + 1);
 
                 /* critical section */
-                litmus_lock(lock_od);
+                if (pass_cs_len == 1)
+                        lock_res = litmus_lock_cs(lock_od, cs_length);
+                else
+                        lock_res = litmus_lock(lock_od);
+                if (lock_res != 0)
+                        printf("Result of lock call: %d\n", lock_res);
                 if (check_fz)
                         litmus_access_forbidden_zone_check(lock_od, s2ns(cs_length), 0.9 * s2ns(cs_length));
                 loop_for(cs_length, program_end + 1);
@@ -339,7 +346,7 @@ static lt_t choose_inter_arrival_time_ns(
         return ms2ns(iat_ms);
 }
 
-#define OPTSTR "p:c:wlveo:s:m:q:r:X:L:Q:ZiRu:U:Bhd:C:S::O::TD:E:A:a:"
+#define OPTSTR "p:c:wlveo:s:m:q:r:X:L:Q:ZKiRu:U:Bhd:C:S::O::TD:E:A:a:"
 
 int main(int argc, char** argv)
 {
@@ -406,6 +413,7 @@ int main(int argc, char** argv)
         int protocol = -1;
         double cs_length = 1; /* millisecond */
         int check_fz = 0;
+        int pass_cs_len = 0;
 
         progname = argv[0];
 
@@ -537,6 +545,9 @@ int main(int argc, char** argv)
                 case 'Z':
                         check_fz = 1;
                         break;
+                case 'K':
+                        pass_cs_len = 1;
+                        break;
                 case 'v':
                         verbose = 1;
                         break;
@@ -810,7 +821,7 @@ int main(int argc, char** argv)
                                 (acet * 1000 / wcet_ms) * 100);
 
                 /* burn cycles */
-                job(acet, start + duration, lock_od, cs_length * 0.001, check_fz);
+                job(acet, start + duration, lock_od, cs_length * 0.001, check_fz, pass_cs_len);
 
                 if (want_output) {
                         /* generate some output at end of job */
diff --git a/include/litmus.h b/include/litmus.h
index b4affb1..dd9b95f 100644
--- a/include/litmus.h
+++ b/include/litmus.h
@@ -235,6 +235,12 @@ int litmus_open_lock(obj_type_t protocol, int lock_id, const char* name_space,
  */
 int litmus_lock(int od);
 /**
+ * Obtain lock with specified worst-case critical section duration
+ * @param od Object descriptor obtained by litmus_open_lock()
+ * @return 0 iff the lock was opened successfully
+ */
+int litmus_lock_cs(int od, lt_t cs_len);
+/**
  *  Access protected resource (wait if in forbidden zone)
  * @param od Object descriptor obtained by litmus_open_lock()
  * @return 0 iff the resource access was granted successfully
diff --git a/src/syscalls.c b/src/syscalls.c
index a87a6fe..7d1b12a 100644
--- a/src/syscalls.c
+++ b/src/syscalls.c
@@ -67,6 +67,14 @@ int litmus_lock(int od)
         return litmus_syscall(LRT_litmus_lock, od);
 }
 
+int litmus_lock_cs(int od, lt_t cs_len)
+{
+        union litmus_syscall_args args;
+        args.litmus_lock_cs.sem_od = od;
+        args.litmus_lock_cs.cs_len = cs_len;
+        return litmus_syscall(LRT_litmus_lock_cs, (unsigned long) &args);
+}
+
 int litmus_access_forbidden_zone_check(int od, lt_t fz_len, lt_t fz_police)
 {
         union litmus_syscall_args args;