aboutsummaryrefslogtreecommitdiffstats
path: root/native/src
diff options
context:
space:
mode:
authorBjoern Brandenburg <bbb@mpi-sws.org>2012-05-16 13:10:50 -0400
committerBjoern Brandenburg <bbb@mpi-sws.org>2012-05-17 09:29:05 -0400
commit7cd7212e7273c9c137e4bb1825d2b9f3842c882d (patch)
treee73b650eaed2868b12cb9c7c2150456e989d7a01 /native/src
parent5cb503377c18b1c099c5b1a5375ece53fe25258e (diff)
C++: move shared RW locking defs into own file
Part of refactoring sharedres.cpp.
Diffstat (limited to 'native/src')
-rw-r--r--native/src/blocking/rw-phase-fair.cpp1
-rw-r--r--native/src/blocking/rw-task-fair.cpp1
-rw-r--r--native/src/sharedres.cpp2
3 files changed, 4 insertions, 0 deletions
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 @@
1#include "sharedres.h" 1#include "sharedres.h"
2#include "blocking.h" 2#include "blocking.h"
3#include "rw-blocking.h"
3 4
4#include "stl-helper.h" 5#include "stl-helper.h"
5 6
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 @@
1#include "sharedres.h" 1#include "sharedres.h"
2#include "blocking.h" 2#include "blocking.h"
3#include "rw-blocking.h"
3 4
4#include "stl-helper.h" 5#include "stl-helper.h"
5 6
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(
428 &tsk); 428 &tsk);
429} 429}
430 430
431#include "rw-blocking.h"
432
431void merge_rw_requests(const TaskInfo &tsk, RWCounts &counts) 433void merge_rw_requests(const TaskInfo &tsk, RWCounts &counts)
432{ 434{
433 foreach(tsk.get_requests(), req) 435 foreach(tsk.get_requests(), req)