C++: move shared RW locking defs into own file

Part of refactoring sharedres.cpp.

5 files changed, 39 insertions, 31 deletions

diff --git a/native/include/blocking.h b/native/include/blocking.h
index 0734d9d..b70f1a6 100644
--- a/native/include/blocking.h
+++ b/native/include/blocking.h
@@ -82,37 +82,6 @@ Interference bound_blocking_all_clusters(
         unsigned long interval,
         const TaskInfo* exclude_tsk);
 
-void split_by_type(const ContentionSet& requests,
-                   ContentionSet& reads,
-                   ContentionSet& writes);
-void split_by_type(const Resources& resources,
-                   Resources &reads,
-                   Resources &writes);
-void split_by_type(const ClusterResources& per_cluster,
-                   ClusterResources &reads);
-void split_by_type(const ClusterResources& per_cluster,
-                   ClusterResources &reads,
-                   ClusterResources &writes);
-
-struct RWCount {
-        unsigned int res_id;
-        unsigned int num_reads;
-        unsigned int num_writes;
-        unsigned int rlength;
-        unsigned int wlength;
-
-        RWCount(unsigned int id) : res_id(id),
-                                   num_reads(0),
-                                   num_writes(0),
-                                   rlength(0),
-                                   wlength(0)
-        {}
-};
-
-typedef std::vector<RWCount> RWCounts;
-
-void merge_rw_requests(const TaskInfo &tsk, RWCounts &counts);
-
 extern const unsigned int UNLIMITED;
 
 #endif
diff --git a/native/include/rw-blocking.h b/native/include/rw-blocking.h
new file mode 100644
index 0000000..d4463f7
--- /dev/null
+++ b/native/include/rw-blocking.h
@@ -0,0 +1,35 @@
+#ifndef RW_BLOCKING_H
+#define RW_BLOCKING_H
+
+void split_by_type(const ContentionSet& requests,
+                   ContentionSet& reads,
+                   ContentionSet& writes);
+void split_by_type(const Resources& resources,
+                   Resources &reads,
+                   Resources &writes);
+void split_by_type(const ClusterResources& per_cluster,
+                   ClusterResources &reads);
+void split_by_type(const ClusterResources& per_cluster,
+                   ClusterResources &reads,
+                   ClusterResources &writes);
+
+struct RWCount {
+        unsigned int res_id;
+        unsigned int num_reads;
+        unsigned int num_writes;
+        unsigned int rlength;
+        unsigned int wlength;
+
+        RWCount(unsigned int id) : res_id(id),
+                                   num_reads(0),
+                                   num_writes(0),
+                                   rlength(0),
+                                   wlength(0)
+        {}
+};
+
+typedef std::vector<RWCount> RWCounts;
+
+void merge_rw_requests(const TaskInfo &tsk, RWCounts &counts);
+
+#endif RW_BLOCKING_H
diff --git a/native/src/blocking/rw-phase-fair.cpp b/native/src/blocking/rw-phase-fair.cpp
index 65b85b4..d7705d7 100644
--- a/native/src/blocking/rw-phase-fair.cpp
+++ b/native/src/blocking/rw-phase-fair.cpp
@@ -1,5 +1,6 @@
 #include "sharedres.h"
 #include "blocking.h"
+#include "rw-blocking.h"
 
 #include "stl-helper.h"
 
diff --git a/native/src/blocking/rw-task-fair.cpp b/native/src/blocking/rw-task-fair.cpp
index ea0b102..bb27c14 100644
--- a/native/src/blocking/rw-task-fair.cpp
+++ b/native/src/blocking/rw-task-fair.cpp
@@ -1,5 +1,6 @@
 #include "sharedres.h"
 #include "blocking.h"
+#include "rw-blocking.h"
 
 #include "stl-helper.h"
 
diff --git a/native/src/sharedres.cpp b/native/src/sharedres.cpp
index 00d7932..a91bfdf 100644
--- a/native/src/sharedres.cpp
+++ b/native/src/sharedres.cpp
@@ -428,6 +428,8 @@ Interference np_fifo_per_resource(
                                           &tsk);
 }
 
+#include "rw-blocking.h"
+
 void merge_rw_requests(const TaskInfo &tsk, RWCounts &counts)
 {
         foreach(tsk.get_requests(), req)