Extract sharedres_types.h from sharedres.h

The LP code requires many of the same definitions. Therefore, this patch splits the reusable
type definitions into an individual file to facilitate inclusion.

4 files changed, 405 insertions, 397 deletions

diff --git a/native/include/sharedres.h b/native/include/sharedres.h
index c0b2e3a..7765fd8 100644
--- a/native/include/sharedres.h
+++ b/native/include/sharedres.h
@@ -1,390 +1,7 @@
 #ifndef SHAREDRES_H
 #define SHAREDRES_H
 
-#ifndef SWIG
-#include <limits.h>
-#include <assert.h>
-
-#include <vector>
-#include <algorithm>
-#endif
-
-typedef enum {
-        WRITE = 0,
-        READ  = 1,
-} request_type_t;
-
-class TaskInfo;
-
-class RequestBound
-{
-private:
-        unsigned int resource_id;
-        unsigned int num_requests;
-        unsigned int request_length;
-        const TaskInfo*    task;
-        request_type_t request_type;
-
-public:
-        RequestBound(unsigned int res_id,
-                     unsigned int num,
-                     unsigned int length,
-                     const TaskInfo* tsk,
-                     request_type_t type = WRITE)
-                : resource_id(res_id),
-                  num_requests(num),
-                  request_length(length),
-                  task(tsk),
-                  request_type(type)
-        {}
-
-        unsigned int get_max_num_requests(unsigned long interval) const;
-
-        unsigned int get_resource_id() const { return resource_id; }
-        unsigned int get_num_requests() const { return num_requests; }
-        unsigned int get_request_length() const { return request_length; }
-
-        request_type_t get_request_type() const { return request_type; }
-
-        bool is_read() const { return get_request_type() == READ; }
-        bool is_write() const { return get_request_type() == WRITE; }
-
-        const TaskInfo* get_task() const { return task; }
-};
-
-typedef std::vector<RequestBound> Requests;
-
-class TaskInfo
-{
-private:
-        unsigned int  priority;
-        unsigned long period;
-        unsigned long response;
-        unsigned int  cluster;
-
-        Requests requests;
-
-public:
-        TaskInfo(unsigned long _period,
-                 unsigned long _response,
-                 unsigned int _cluster,
-                 unsigned int _priority)
-                : priority(_priority),
-                  period(_period),
-                  response(_response),
-                  cluster(_cluster)
-        {}
-
-        void add_request(unsigned int res_id,
-                         unsigned int num,
-                         unsigned int length,
-                         request_type_t type = WRITE)
-        {
-                requests.push_back(RequestBound(res_id, num, length, this, type));
-        }
-
-        const Requests& get_requests() const
-        {
-                return requests;
-        }
-
-        unsigned int  get_priority() const { return priority; }
-        unsigned long get_period() const { return period; }
-        unsigned long get_response() const { return response; }
-        unsigned int  get_cluster() const { return cluster; }
-
-        unsigned int get_num_arrivals() const
-        {
-                return get_total_num_requests() + 1; // one for the job release
-        }
-
-        unsigned int get_total_num_requests() const
-        {
-                unsigned int count = 0;
-                Requests::const_iterator it;
-                for (it = requests.begin();
-                     it != requests.end();
-                     it++)
-                        count += it->get_num_requests();
-                return count;
-        }
-
-        unsigned int get_max_request_length() const
-        {
-                unsigned int len = 0;
-                Requests::const_iterator it;
-                for (it = requests.begin();
-                     it != requests.end();
-                     it++)
-                        len = std::max(len, it->get_request_length());
-                return len;
-        }
-
-};
-
-typedef std::vector<TaskInfo> TaskInfos;
-
-class ResourceSharingInfo
-{
-private:
-        TaskInfos tasks;
-
-public:
-        ResourceSharingInfo(unsigned int num_tasks)
-        {
-                // Make sure all tasks will fit without re-allocation.
-                tasks.reserve(num_tasks);
-        }
-
-        const TaskInfos& get_tasks() const
-        {
-                return tasks;
-        }
-
-        void add_task(unsigned long period,
-                      unsigned long response,
-                      unsigned int cluster  = 0,
-                      unsigned int priority = UINT_MAX)
-        {
-                // Avoid re-allocation!
-                assert(tasks.size() < tasks.capacity());
-                tasks.push_back(TaskInfo(period, response, cluster, priority));
-        }
-
-        void add_request(unsigned int resource_id,
-                         unsigned int max_num,
-                         unsigned int max_length)
-        {
-                assert(!tasks.empty());
-
-                TaskInfo& last_added = tasks.back();
-                last_added.add_request(resource_id, max_num, max_length);
-        }
-
-        void add_request_rw(unsigned int resource_id,
-                            unsigned int max_num,
-                            unsigned int max_length,
-                            int type)
-        {
-                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);
-        }
-
-};
-
-
-#define NO_CPU (-1)
-
-class ResourceLocality
-{
-private:
-        std::vector<int> mapping;
-
-public:
-        void assign_resource(unsigned int res_id, unsigned int processor)
-        {
-                while (mapping.size() <= res_id)
-                        mapping.push_back(NO_CPU);
-
-                mapping[res_id] = processor;
-        }
-
-        int operator[](unsigned int res_id) const
-        {
-                if (mapping.size() <= res_id)
-                        return NO_CPU;
-                else
-                        return mapping[res_id];
-        }
-
-};
-
-class ReplicaInfo
-{
-private:
-        std::vector<unsigned int> num_replicas;
-
-public:
+#include "sharedres_types.h"