Added syscall hooks, 'finished' produce/consume code.

5 files changed, 61 insertions, 24 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 683407328f5a..cfafef3a795d 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -126,26 +126,14 @@ void preempt_if_preemptable(struct task_struct* t, int on_cpu);
         (is_pgm(t) && \
          tsk_rt(t)->pgm_params.produce != NULL && \
          tsk_rt(t)->pgm_params.consume == NULL)
-#define is_pgm_sink(t) \
-        (is_pgm(t) && \
-         tsk_rt(t)->pgm_params.produce == NULL && \
-         tsk_rt(t)->pgm_params.consume != NULL)
 #define is_pgm_intermediate(t) \
         (is_pgm(t) && \
          tsk_rt(t)->pgm_params.produce != NULL && \
          tsk_rt(t)->pgm_params.consume != NULL)
-#ifdef CONFIG_PGM
-int is_pgm_satisfied(struct task_struct* t);
-void pgm_produce(struct task_struct* t);
-void pgm_consume(struct task_struct* t);
-int pgm_complete(struct task_struct* t);
-#else
-/* nothing */
-#define is_pgm_satisfied(t)
-#define pgm_produce(t)
-#define pgm_consume(t)
-#define pgm_complete(t)
-#endif
+#define is_pgm_sink(t) \
+        (is_pgm_intermediate(t) && \
+         tsk_rt(t)->pgm_params.produce == NULL && \
+         tsk_rt(t)->pgm_params.consume != NULL)
 
 #ifdef CONFIG_LITMUS_LOCKING
 void srp_ceiling_block(void);
diff --git a/include/litmus/pgm.h b/include/litmus/pgm.h
new file mode 100644
index 000000000000..688fc3b9bbe2
--- /dev/null
+++ b/include/litmus/pgm.h
@@ -0,0 +1,28 @@
+/*
+ * Routines for constructing and working with PGMs.
+ */
+
+#ifndef __UNC_PGM_H__
+#define __UNC_PGM_H__
+
+#include <linux/sched.h>
+
+#include <litmus/litmus.h>
+#include <litmus/rt_param.h>
+
+int is_pgm_satisfied(struct task_struct* t);
+
+void pgm_prepare_for_next_period(struct task_struct *t);
+
+int pgm_complete_job(struct task_struct* t);
+
+int do_pgm_add_edge(struct task_struct *a, int nr_gen,
+        struct task_struct *b, int nr_req);
+int do_pgm_signal_ready(struct task_struct *src);
+int do_pgm_set_nr_children(int nr_children);
+int do_pgm_wait_for_children(void);
+
+// TODO
+//int pgm_remove_edge(struct task_struct *a, struct task_struct *b);
+
+#endif
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 613e9f98294e..a767e52882f4 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -77,6 +77,14 @@ struct control_page {
         /* to be extended */
 };
 
+struct pgm_edge {
+        pid_t a;
+        int a_nr_produced;
+
+        pid_t b;
+        int b_nr_consumed;
+};
+
 /* don't export internal data structures to user space (liblitmus) */
 #ifdef __KERNEL__
 
@@ -100,28 +108,29 @@ struct pgm_production
 struct pgm_produce
 {
         unsigned long nr_productions;           /* num productions/children */
-        struct pgm_production produce[0];       /* array of productions */
+        struct pgm_production produce[MAX_FAN]; /* array of productions. TODO: make dyn alloc */
 };
 
 struct pgm_consumption
 {
+        /* assumption required == number consumed */
         unsigned long required;         /* number tokens required before firing */
         long nr_tokens;                         /* constraint met when >= required */
 };
 
 struct pgm_consume
 {
-        spinlock_t      lock;
+        spinlock_t      lock;                   /* TODO: Use atomics instead of a lock. */
         unsigned long nr_consumptions;                          /* num of consumption constraints */
         unsigned long unsatisfied[NR_FAN_CHUNKS];       /* bit-array of unsatisfied constraints */
-        struct pgm_consumption consume[0];      /* array of consumption constraints */
-        //atomic_t nr_pending_release;
+        struct pgm_consumption consume[MAX_FAN];        /* array of consumption constraints. TODO: make dyn alloc */
 };
 
 struct rt_pgm {
         struct pgm_produce *produce;    /* output and current state */
         struct pgm_consume *consume;    /* input constraints and current state */ 
-        struct task_struct *src;                /* only not NULL if task is sink */
+        struct task_struct *root;               /* root node of the PGM */
+//      struct task_struct *src;                /* only not NULL if task is sink */
 };
 
 #endif /* end PGM */
diff --git a/include/litmus/unistd_32.h b/include/litmus/unistd_32.h
index 94264c27d9ac..92e733c42041 100644
--- a/include/litmus/unistd_32.h
+++ b/include/litmus/unistd_32.h
@@ -17,5 +17,9 @@
 #define __NR_wait_for_ts_release __LSC(9)
 #define __NR_release_ts         __LSC(10)
 #define __NR_null_call          __LSC(11)
+#define __NR_add_pgm_edge       __LSC(12)
+#define __NR_pgm_signal_ready   __LSC(13)
+#define __NR_pgm_set_nr_children        __LSC(14)
+#define __NR_pgm_wait_for_children      __LSC(15)
 
-#define NR_litmus_syscalls 12
+#define NR_litmus_syscalls 16
diff --git a/include/litmus/unistd_64.h b/include/litmus/unistd_64.h
index d5ced0d2642c..84125395dfe6 100644
--- a/include/litmus/unistd_64.h
+++ b/include/litmus/unistd_64.h
@@ -27,7 +27,15 @@ __SYSCALL(__NR_wait_for_job_release, sys_wait_for_job_release)
 __SYSCALL(__NR_wait_for_ts_release, sys_wait_for_ts_release)
 #define __NR_release_ts                         __LSC(10)
 __SYSCALL(__NR_release_ts, sys_release_ts)
-#define __NR_null_call                          __LSC(11)
+#define __NR_null_call              __LSC(11)
 __SYSCALL(__NR_null_call, sys_null_call)
+#define __NR_add_pgm_edge                       __LSC(12)
+__SYSCALL(__NR_add_pgm_edge, sys_add_pgm_edge)
+#define __NR_pgm_signal_ready           __LSC(13)
+__SYSCALL(__NR_pgm_signal_ready, sys_pgm_signal_ready)
+#define __NR_pgm_set_nr_children        __LSC(14)
+__SYSCALL(__NR_pgm_set_nr_children, sys_pgm_set_nr_children)
+#define __NR_pgm_wait_for_children      __LSC(15)
+__SYSCALL(__NR_pgm_wait_for_children, sys_pgm_wait_for_children)
 
-#define NR_litmus_syscalls 12
+#define NR_litmus_syscalls 16