nodestack/promise: move future_value struct, update headers

struct future_value will be used more closely with class Promise, so put
it in the promise.h header. This requires some updates to other header
inclusions.

diff --git a/nodestack.cc b/nodestack.cc
index 46f7d12a007e6289aa384993d7e58fb29e1d5fed..e0800156f56178a0cfa5f69d4ad1026a316460f8 100644 (file)
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -8,6 +8,7 @@
 #include "common.h"
 #include "model.h"
 #include "threads-model.h"
+#include "modeltypes.h"
 
 /**
  * @brief Node constructor

diff --git a/nodestack.h b/nodestack.h
index d2e6491b2edec5891943351e9891b358f2b05594..13c6d09a7c7c39b88ef903012dd91449e37c7239 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -10,8 +10,8 @@
 #include <inttypes.h>
 
 #include "mymemory.h"
-#include "modeltypes.h"
 #include "schedule.h"
+#include "promise.h"
 
 class ModelAction;
 class Thread;
@@ -32,11 +32,6 @@ class Thread;
 
 typedef int promise_t;
 
-struct future_value {
-       uint64_t value;
-       modelclock_t expiration;
-};
-
 struct fairness_info {
        unsigned int enabled_count;
        unsigned int turns;

diff --git a/promise.h b/promise.h
index 3166c8f6f1603bfad9ba27124f60fcca73b55d41..413d360896e282abb66a21d98c3cec689c428dd9 100644 (file)
--- a/promise.h
+++ b/promise.h
@@ -11,6 +11,12 @@
 #include "threads-model.h"
 
 #include "model.h"
+#include "modeltypes.h"
+
+struct future_value {
+       uint64_t value;
+       modelclock_t expiration;
+};
 
 class Promise {
  public:

diff --git a/schedule.h b/schedule.h
index 83b25c61cdc1d296f404fe244d185db4e6f3d7f7..10312326528fadd4ad6e39f113030068d0cb19b7 100644 (file)
--- a/schedule.h
+++ b/schedule.h
@@ -6,6 +6,7 @@
 #define __SCHEDULE_H__
 
 #include "mymemory.h"
+#include "modeltypes.h"
 
 /* Forward declaration */
 class Thread;