incorporated request priority into C++ resource model

2 files changed, 18 insertions, 10 deletions

diff --git a/native/include/sharedres_types.h b/native/include/sharedres_types.h
index 800659a..714ec61 100644
--- a/native/include/sharedres_types.h
+++ b/native/include/sharedres_types.h
@@ -26,18 +26,21 @@ private:
         unsigned int request_length;
         const TaskInfo*    task;
         request_type_t request_type;
+        unsigned int request_priority;
 
 public:
         RequestBound(unsigned int res_id,
                      unsigned int num,
                      unsigned int length,
                      const TaskInfo* tsk,
-                     request_type_t type = WRITE)
+                     request_type_t type = WRITE,
+                     unsigned int priority = 0)
                 : resource_id(res_id),
                   num_requests(num),
                   request_length(length),
                   task(tsk),
-                  request_type(type)
+                  request_type(type),
+                  request_priority(priority)
         {}
 
         unsigned int get_max_num_requests(unsigned long interval) const;
@@ -48,6 +51,8 @@ public:
 
         request_type_t get_request_type() const { return request_type; }
 
+        unsigned int get_request_priority() const { return request_priority; }
+
         bool is_read() const { return get_request_type() == READ; }
         bool is_write() const { return get_request_type() == WRITE; }
 
@@ -82,9 +87,10 @@ public:
         void add_request(unsigned int res_id,
                          unsigned int num,
                          unsigned int length,
-                         request_type_t type = WRITE)
+                         request_type_t type = WRITE,
+                         unsigned int priority = 0)
         {
-                requests.push_back(RequestBound(res_id, num, length, this, type));
+                requests.push_back(RequestBound(res_id, num, length, this, type, priority));
         }
 
         const Requests& get_requests() const
@@ -160,7 +166,8 @@ public:
 
         void add_request(unsigned int resource_id,
                          unsigned int max_num,
-                         unsigned int max_length)
+                         unsigned int max_length,
+                         unsigned int locking_priority = 0)
         {
                 assert(!tasks.empty());
 
@@ -171,13 +178,14 @@ public:
         void add_request_rw(unsigned int resource_id,
                             unsigned int max_num,
                             unsigned int max_length,
-                            int type)
+                            int type,
+                            unsigned int locking_priority = 0)
         {
                 assert(!tasks.empty());
                 assert(type == WRITE || type == READ);
 
                 TaskInfo& last_added = tasks.back();
-                last_added.add_request(resource_id, max_num, max_length, (request_type_t) type);
+                last_added.add_request(resource_id, max_num, max_length, (request_type_t) type, locking_priority);
         }
 
 };
diff --git a/schedcat/locking/bounds.py b/schedcat/locking/bounds.py
index 8091eb7..22c1e07 100644
--- a/schedcat/locking/bounds.py
+++ b/schedcat/locking/bounds.py
@@ -11,7 +11,7 @@ def get_cpp_model(all_tasks, use_task_period=False):
         for req in t.resmodel:
             req = t.resmodel[req]
             if req.max_requests > 0:
-                rsi.add_request_rw(req.res_id, req.max_requests, req.max_length, cpp.WRITE)
+                rsi.add_request_rw(req.res_id, req.max_requests, req.max_length, cpp.WRITE, t.locking_prio)
     return rsi
 
 def get_cpp_model_rw(all_tasks, use_task_period=False):
@@ -24,9 +24,9 @@ def get_cpp_model_rw(all_tasks, use_task_period=False):
         for req in t.resmodel:
             req = t.resmodel[req]
             if req.max_writes > 0:
-                rsi.add_request_rw(req.res_id, req.max_writes, req.max_write_length, cpp.WRITE)
+                rsi.add_request_rw(req.res_id, req.max_writes, req.max_write_length, cpp.WRITE, t.locking_prio)
             if req.max_reads > 0:
-                rsi.add_request_rw(req.res_id, req.max_reads, req.max_read_length, cpp.READ)
+                rsi.add_request_rw(req.res_id, req.max_reads, req.max_read_length, cpp.READ, t.locking_prio)
     return rsi
 
 def assign_edf_locking_prios(all_tasks):