C++: Break out the G-OMLP and G-FMLP code into own file

Part of refactoring sharedres.cpp.

4 files changed, 115 insertions, 105 deletions

diff --git a/native/Makefile b/native/Makefile
index 1957006..3a697db 100644
--- a/native/Makefile
+++ b/native/Makefile
@@ -54,7 +54,7 @@ vpath %.cpp src src/edf src/blocking
 EDF_OBJ   = baker.o baruah.o gfb.o bcl.o bcl_iterative.o rta.o ffdbf.o gedf.o load.o cpu_time.o
 SCHED_OBJ = sim.o schedule_sim.o
 CORE_OBJ  = tasks.o
-SYNC_OBJ  = sharedres.o dpcp.o mpcp.o fmlp_plus.o
+SYNC_OBJ  = sharedres.o dpcp.o mpcp.o fmlp_plus.o global-omlp.o global-fmlp.o
 
 # #### Targets ####
 
diff --git a/native/src/blocking/global-fmlp.cpp b/native/src/blocking/global-fmlp.cpp
new file mode 100644
index 0000000..b7cd25b
--- /dev/null
+++ b/native/src/blocking/global-fmlp.cpp
@@ -0,0 +1,53 @@
+#include "sharedres.h"
+#include "blocking.h"
+
+#include "stl-helper.h"
+
+
+BlockingBounds* global_fmlp_bounds(const ResourceSharingInfo& info)
+{
+        // split every thing by resources, sort, and then start counting.
+        Resources resources;
+
+        split_by_resource(info, resources);
+        sort_by_request_length(resources);
+
+
+        unsigned int i;
+        BlockingBounds* _results = new BlockingBounds(info);
+        BlockingBounds& results = *_results;
+
+        unsigned int num_tasks = info.get_tasks().size();
+
+        for (i = 0; i < info.get_tasks().size(); i++)
+        {
+                const TaskInfo& tsk  = info.get_tasks()[i];
+                Interference bterm;
+
+
+                foreach(tsk.get_requests(), jt)
+                {
+                        const RequestBound& req = *jt;
+                        const ContentionSet& cs =
+                                resources[req.get_resource_id()];
+
+                        unsigned long interval = tsk.get_response();
+                        unsigned long issued   = req.get_num_requests();
+
+                        // every other task may block once per request
+                        unsigned int total_limit = (num_tasks - 1) * issued;
+                        unsigned int per_src_limit = issued;
+
+                        bterm += bound_blocking(cs,
+                                                interval,
+                                                total_limit,
+                                                per_src_limit,
+                                                &tsk);
+                }
+
+                results[i] = bterm;
+        }
+
+        return _results;
+}
+
diff --git a/native/src/blocking/global-omlp.cpp b/native/src/blocking/global-omlp.cpp
new file mode 100644
index 0000000..3c4f3da
--- /dev/null
+++ b/native/src/blocking/global-omlp.cpp
@@ -0,0 +1,61 @@
+#include "sharedres.h"
+#include "blocking.h"
+
+#include "stl-helper.h"
+
+BlockingBounds* global_omlp_bounds(const ResourceSharingInfo& info,
+                                   unsigned int num_procs)
+{
+        // split every thing by resources, sort, and then start counting.
+        Resources resources;
+
+        split_by_resource(info, resources);
+        sort_by_request_length(resources);
+
+        unsigned int i;
+        BlockingBounds* _results = new BlockingBounds(info);
+        BlockingBounds& results = *_results;
+
+        for (i = 0; i < info.get_tasks().size(); i++)
+        {
+                const TaskInfo& tsk  = info.get_tasks()[i];
+                Interference bterm;
+
+                foreach(tsk.get_requests(), jt)
+                {
+                        const RequestBound& req = *jt;
+                        const ContentionSet& cs =
+                                resources[req.get_resource_id()];
+
+                        unsigned int num_sources = cs.size();
+                        unsigned long interval = tsk.get_response();
+                        unsigned long issued   = req.get_num_requests();
+
+
+                        unsigned int total_limit = (2 * num_procs - 1) * issued;
+                        // Derived in the dissertation: at most twice per request.
+                        unsigned int per_src_limit = 2 * issued;
+
+                        if (num_sources <= num_procs + 1) {
+                                // FIFO case: no job is ever skipped in the
+                                //  priority queue (since at most one job is in
+                                //  PQ at any time).
+                                // Lemma 15 in RTSS'10: at most one blocking
+                                // request per source per issued request.
+                                per_src_limit = issued;
+                                total_limit   = (num_sources - 1) * issued;
+                        }
+
+                        bterm += bound_blocking(cs,
+                                                interval,
+                                                total_limit,
+                                                per_src_limit,
+                                                &tsk);
+                }
+
+                results[i] = bterm;
+        }
+
+        return _results;
+}
+
diff --git a/native/src/sharedres.cpp b/native/src/sharedres.cpp
index 259e5a7..4520ccb 100644
--- a/native/src/sharedres.cpp
+++ b/native/src/sharedres.cpp
@@ -468,110 +468,6 @@ static void charge_arrival_blocking(const ResourceSharingInfo& info,
 
 // **** blocking term analysis ****
 
-BlockingBounds* global_omlp_bounds(const ResourceSharingInfo& info,
-                                   unsigned int num_procs)
-{
-        // split every thing by resources, sort, and then start counting.
-        Resources resources;
-
-        split_by_resource(info, resources);
-        sort_by_request_length(resources);
-
-        unsigned int i;
-        BlockingBounds* _results = new BlockingBounds(info);
-        BlockingBounds& results = *_results;
-
-        for (i = 0; i < info.get_tasks().size(); i++)
-        {
-                const TaskInfo& tsk  = info.get_tasks()[i];
-                Interference bterm;
-
-                foreach(tsk.get_requests(), jt)
-                {
-                        const RequestBound& req = *jt;
-                        const ContentionSet& cs =
-                                resources[req.get_resource_id()];
-
-                        unsigned int num_sources = cs.size();
-                        unsigned long interval = tsk.get_response();
-                        unsigned long issued   = req.get_num_requests();
-
-
-                        unsigned int total_limit = (2 * num_procs - 1) * issued;
-                        // Derived in the dissertation: at most twice per request.
-                        unsigned int per_src_limit = 2 * issued;
-
-                        if (num_sources <= num_procs + 1) {
-                                // FIFO case: no job is ever skipped in the
-                                //  priority queue (since at most one job is in
-                                //  PQ at any time).
-                                // Lemma 15 in RTSS'10: at most one blocking
-                                // request per source per issued request.
-                                per_src_limit = issued;
-                                total_limit   = (num_sources - 1) * issued;
-                        }
-
-                        bterm += bound_blocking(cs,
-                                                interval,
-                                                total_limit,
-                                                per_src_limit,
-                                                &tsk);
-                }
-
-                results[i] = bterm;
-        }
-
-        return _results;
-}
-
-
-BlockingBounds* global_fmlp_bounds(const ResourceSharingInfo& info)
-{
-        // split every thing by resources, sort, and then start counting.
-        Resources resources;
-
-        split_by_resource(info, resources);
-        sort_by_request_length(resources);
-
-
-        unsigned int i;
-        BlockingBounds* _results = new BlockingBounds(info);
-        BlockingBounds& results = *_results;
-
-        unsigned int num_tasks = info.get_tasks().size();
-
-        for (i = 0; i < info.get_tasks().size(); i++)
-        {
-                const TaskInfo& tsk  = info.get_tasks()[i];
-                Interference bterm;