DGL testing.wip-nested-locking

1 files changed, 45 insertions, 11 deletions

diff --git a/bin/dglspin.c b/bin/dglspin.c
index 805fd85..5999662 100644
--- a/bin/dglspin.c
+++ b/bin/dglspin.c
@@ -6,6 +6,7 @@
 #include <time.h>
 #include <assert.h>
 #include <fcntl.h>
+#include <strings.h>
 
 
 #include "litmus.h"
@@ -110,16 +111,31 @@ static int loop_once(void)
 static int loop_for(double exec_time, double emergency_exit, int mask)
 {
         double last_loop = 0, loop_start;
-        int tmp = 0;
+        int tmp = 0, locks = 1, locked=0, phase=0;
 
         double start = cputime();
         double now = cputime();
 
         while (now + last_loop < start + exec_time) {
-                loop_start = now;
-        dynamic_group_lock(mask);
-                tmp += loop_once();
-        dynamic_group_unlock(mask);
+
+        loop_start = now;
+
+        if(now + last_loop > start + phase * (exec_time / (2*locks))){
+            if(locked){
+                locked = 0;
+                printf("unlock\n");
+                dynamic_group_unlock(mask);
+            }
+            else{
+                dynamic_group_lock(mask);
+                printf("lock\n");
+                locked = 1;
+            }
+            phase += 1;
+        }
+
+        tmp += loop_once();
+
                 now = cputime();
                 last_loop = now - loop_start;
                 if (emergency_exit && wctime() > emergency_exit) {
@@ -131,6 +147,10 @@ static int loop_for(double exec_time, double emergency_exit, int mask)
                 }
         }
 
+    if(locked){
+        dynamic_group_unlock(mask);
+    }
+
         return tmp;
 }
 
@@ -164,7 +184,8 @@ static int job(double exec_time, double program_end, int mask)
         }
 }
 
-#define OPTSTR "p:c:wlveo:f:s:q:"
+#define OPTSTR "p:c:wlveo:f:s:q:r:"
+#define MAX_RESOURCES 10
 
 int main(int argc, char** argv)
 {
@@ -187,7 +208,10 @@ int main(int argc, char** argv)
         task_class_t class = RT_CLASS_HARD;
         int cur_job, num_jobs;
 
-    int fd, od_org, od_new, mask;
+    int fd, i;
+    int mask = 0;
+    char* resources;
+    int ods[MAX_RESOURCES];
 
         progname = argv[0];
 
@@ -225,6 +249,9 @@ int main(int argc, char** argv)
                 case 's':
                         scale = atof(optarg);
                         break;
+        case 'r':
+            resources = optarg;
+            break;
                 case ':':
                         usage("Argument missing.");
                         break;
@@ -306,9 +333,16 @@ int main(int argc, char** argv)
                         bail_out("wait_for_ts_release()");
         }
 
-    od_org = open_new_dgl_sem(fd, 0);
-    od_new = attach_dgl_sem(fd, 1, od_org);
-    mask = (1<<od_org) & (1<<od_new);
+    for(i = 0; i < MAX_RESOURCES; i++){
+        if(i==0)
+            ods[i] = open_new_dgl_sem(fd, i);
+        else
+            ods[i] = attach_dgl_sem(fd, i, ods[0]);
+
+        if(resources[i]=='1'){
+            mask |= (1 << ods[i]);
+        }
+    }
 
         start = wctime();
 
@@ -320,7 +354,7 @@ int main(int argc, char** argv)
                                         start + duration, mask);
                 }
         } else {
-                /* conver to seconds and scale */
+                /* convert to seconds and scale */
                 while (job(wcet_ms * 0.001 * scale, start + duration, mask));
         }