5 files changed, 183 insertions, 17 deletions

diff --git a/tests/core_api.c b/tests/core_api.c
index d858f1f..7487c1c 100644
--- a/tests/core_api.c
+++ b/tests/core_api.c
@@ -1,5 +1,8 @@
-#include "tests.h"
+#include <sys/wait.h> /* for waitpid() */
+#include <unistd.h>
+#include <stdio.h>
 
+#include "tests.h"
 #include "litmus.h"
 
 
@@ -49,3 +52,40 @@ TESTCASE(job_control_non_rt, ALL,
 
         SYSCALL_FAILS( EPERM, get_job_no(&job_no) );
 }
+
+
+TESTCASE(rt_fork_non_rt, LITMUS,
+         "children of RT tasks are not automatically RT tasks")
+{
+        unsigned int pid, job_no;
+        int status;
+
+        SYSCALL( sporadic_partitioned(10, 100, 0) );
+        SYSCALL( task_mode(LITMUS_RT_TASK) );
+
+        pid = fork();
+
+        ASSERT( pid != -1 );
+
+        if (pid == 0) {
+                /* child */
+
+                SYSCALL_FAILS( EINVAL, sleep_next_period() );
+                SYSCALL_FAILS( EINVAL, wait_for_job_release(0) );
+                SYSCALL_FAILS( EPERM, get_job_no(&job_no) );
+
+                exit(0);
+        } else {
+                /* parent */
+
+                SYSCALL( sleep_next_period() );
+                SYSCALL( wait_for_job_release(20) );
+                SYSCALL( get_job_no(&job_no) );
+
+                SYSCALL( task_mode(BACKGROUND_TASK) );
+
+                SYSCALL( waitpid(pid, &status, 0) );
+
+                ASSERT(WEXITSTATUS(status) == 0);
+        }
+}
diff --git a/tests/fdso.c b/tests/fdso.c
index c95a578..8a2a0d0 100644
--- a/tests/fdso.c
+++ b/tests/fdso.c
@@ -1,3 +1,5 @@
+#include <sys/wait.h> /* for waitpid() */
+
 #include <fcntl.h>
 #include <unistd.h>
 
@@ -18,7 +20,7 @@ TESTCASE(fmlp_not_active, C_EDF | PFAIR | LINUX,
 
         ASSERT(fd != -1);
 
-        SYSCALL_FAILS(EBUSY, open_fmlp_sem(fd, 0) );
+        SYSCALL_FAILS(ENXIO, open_fmlp_sem(fd, 0) );
 
         SYSCALL( close(fd) );
 
@@ -29,16 +31,16 @@ TESTCASE(fmlp_not_active, C_EDF | PFAIR | LINUX,
 TESTCASE(invalid_od, ALL,
          "reject invalid object descriptors")
 {
-        SYSCALL_FAILS( EINVAL, fmlp_down(3) );
+        SYSCALL_FAILS( EINVAL, litmus_lock(3) );
 
-        SYSCALL_FAILS( EINVAL, fmlp_up(3) );
+        SYSCALL_FAILS( EINVAL, litmus_unlock(3) );
 
         SYSCALL_FAILS( EINVAL, od_close(3) );
 
 
-        SYSCALL_FAILS( EINVAL, fmlp_down(-1) );
+        SYSCALL_FAILS( EINVAL, litmus_lock(-1) );
 
-        SYSCALL_FAILS( EINVAL, fmlp_up(-1) );
+        SYSCALL_FAILS( EINVAL, litmus_unlock(-1) );
 
         SYSCALL_FAILS( EINVAL, od_close(-1) );
 }
@@ -59,23 +61,34 @@ TESTCASE(not_inherit_od, GSN_EDF | PSN_EDF,
 
         SYSCALL( od = open_fmlp_sem(fd, 0) );
 
-        SYSCALL( fmlp_down(od) );
-
-        SYSCALL( fmlp_up(od) );
-
         pid = fork();
 
         ASSERT( pid != -1 );
 
+        /* must be an RT task to lock at all */
+        SYSCALL( sporadic_partitioned(10, 100, 0) );
+        SYSCALL( task_mode(LITMUS_RT_TASK) );
+
         if (pid == 0) {
                 /* child */
-                SYSCALL_FAILS(EINVAL, fmlp_down(od) );
-                SYSCALL_FAILS(EINVAL, fmlp_up(od) );
+                SYSCALL_FAILS(EINVAL, litmus_lock(od) );
+                SYSCALL_FAILS(EINVAL, litmus_unlock(od) );
+
+                SYSCALL( task_mode(BACKGROUND_TASK) );
+
                 exit(0);
         } else {
-                SYSCALL( fmlp_down(od) );
-                SYSCALL( fmlp_up(od) );
+
+                SYSCALL( litmus_lock(od) );
+                SYSCALL( litmus_unlock(od) );
+
+                SYSCALL( litmus_lock(od) );
+                SYSCALL( litmus_unlock(od) );
+
+                SYSCALL( task_mode(BACKGROUND_TASK) );
+
                 SYSCALL( waitpid(pid, &status, 0) );
+
                 ASSERT(WEXITSTATUS(status) == 0);
         }
 
diff --git a/tests/locks.c b/tests/locks.c
new file mode 100644
index 0000000..65b932a
--- /dev/null
+++ b/tests/locks.c
@@ -0,0 +1,110 @@
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdio.h>
+
+#include "tests.h"
+#include "litmus.h"
+
+
+TESTCASE(not_lock_fmlp_be, GSN_EDF | PSN_EDF,
+         "don't let best-effort tasks lock FMLP semaphores")
+{
+        int fd, od;
+
+        SYSCALL( fd = open(".fmlp_locks", O_RDONLY | O_CREAT) );
+
+        SYSCALL( od = open_fmlp_sem(fd, 0) );
+
+        /* BE tasks may not lock FMLP semaphores */
+        SYSCALL_FAILS(EPERM, litmus_lock(od) );
+
+        /* tasks may not unlock resources they don't own */
+        SYSCALL_FAILS(EINVAL, litmus_unlock(od) );
+
+        SYSCALL( od_close(od) );
+
+        SYSCALL( close(fd) );
+
+        SYSCALL( remove(".fmlp_locks") );
+
+}
+
+TESTCASE(not_lock_srp_be, PSN_EDF,
+         "don't let best-effort tasks open SRP semaphores")
+{
+        int fd, od;
+
+        SYSCALL( fd = open(".srp_locks", O_RDONLY | O_CREAT) );
+
+        /* BE tasks may not open SRP semaphores */
+
+        SYSCALL_FAILS(EPERM, od = open_srp_sem(fd, 0) );
+
+        SYSCALL( close(fd) );
+
+        SYSCALL( remove(".srp_locks") );
+
+}
+
+TESTCASE(lock_srp, PSN_EDF,
+         "SRP acquisition and release")
+{
+        int fd, od;
+
+        SYSCALL( fd = open(".srp_locks", O_RDONLY | O_CREAT) );
+
+        SYSCALL( sporadic_partitioned(10, 100, 0) );
+        SYSCALL( task_mode(LITMUS_RT_TASK) );
+
+        SYSCALL( od = open_srp_sem(fd, 0) );
+
+        SYSCALL( litmus_lock(od) );
+        SYSCALL( litmus_unlock(od) );
+
+        SYSCALL( litmus_lock(od) );
+        SYSCALL( litmus_unlock(od) );
+
+        SYSCALL( litmus_lock(od) );
+        SYSCALL( litmus_unlock(od) );
+
+        /* tasks may not unlock resources they don't own */
+        SYSCALL_FAILS(EINVAL, litmus_unlock(od) );
+
+        SYSCALL( od_close(od) );
+
+        SYSCALL( close(fd) );
+
+        SYSCALL( remove(".srp_locks") );
+}
+
+
+TESTCASE(lock_fmlp, PSN_EDF | GSN_EDF,
+         "FMLP acquisition and release")
+{
+        int fd, od;
+
+        SYSCALL( fd = open(".fmlp_locks", O_RDONLY | O_CREAT) );
+
+        SYSCALL( sporadic_partitioned(10, 100, 0) );
+        SYSCALL( task_mode(LITMUS_RT_TASK) );
+
+        SYSCALL( od = open_fmlp_sem(fd, 0) );
+
+        SYSCALL( litmus_lock(od) );
+        SYSCALL( litmus_unlock(od) );
+
+        SYSCALL( litmus_lock(od) );
+        SYSCALL( litmus_unlock(od) );
+
+        SYSCALL( litmus_lock(od) );
+        SYSCALL( litmus_unlock(od) );
+
+        /* tasks may not unlock resources they don't own */
+        SYSCALL_FAILS(EINVAL, litmus_unlock(od) );
+
+        SYSCALL( od_close(od) );
+
+        SYSCALL( close(fd) );
+
+        SYSCALL( remove(".fmlp_locks") );
+}
diff --git a/tests/make_catalog.py b/tests/make_catalog.py
index 75b6aca..96f9b23 100755
--- a/tests/make_catalog.py
+++ b/tests/make_catalog.py
@@ -63,6 +63,7 @@ def create_tc_tables(out=sys.stdout):
             plugins.add(p)
 
     plugins.discard('ALL')
+    plugins.discard('LITMUS')
 
     _('#include "tests.h"')
 
@@ -78,7 +79,9 @@ def create_tc_tables(out=sys.stdout):
         count = 0
         _('int %s_TESTS[] = {' % p)
         for (i, tc) in enumerate(tests):
-            if p in tc.plugins or 'ALL' in tc.plugins:
+            if p in tc.plugins or \
+                    'ALL' in tc.plugins or \
+                    'LITMUS' in tc.plugins and p != 'LINUX':
                 _('\t%d,' % i)
                 count += 1
         _('};')
diff --git a/tests/runner.c b/tests/runner.c
index f2e42b2..ccf8d46 100644
--- a/tests/runner.c
+++ b/tests/runner.c
@@ -7,8 +7,8 @@
 #include <stdio.h>
 
 
-/* auto generated by SConstruct */
-#include "__test_catalog.inc"
+/* auto generated by Makefile */
+#include "../test_catalog.inc"
 
 #include "litmus.h"