params: move model_params to header file

diff --git a/main.cc b/main.cc
index 815a382360d5ed87763fe64e5bdf497cdeb243ae..689fe9dd4dbd3698e66d5bfe5adfbd66330efbe6 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -11,6 +11,7 @@
 
 /* global "model" object */
 #include "model.h"
+#include "params.h"
 #include "snapshot-interface.h"
 #include "scanalysis.h"
 

diff --git a/model.h b/model.h
index fba6eccdcbfb23f45740fc1fad08b32e74fa564b..ff4b2c1800a0a2faece1d4d19de23e9176b684da 100644 (file)
--- a/model.h
+++ b/model.h
@@ -15,6 +15,7 @@
 #include "modeltypes.h"
 #include "stl-model.h"
 #include "context.h"
+#include "params.h"
 
 /* Forward declaration */
 class Node;
@@ -31,39 +32,6 @@ struct model_snapshot_members;
 typedef ModelVector<const ModelAction *> rel_heads_list_t;
 typedef SnapList<ModelAction *> action_list_t;
 
-/**
- * Model checker parameter structure. Holds run-time configuration options for
- * the model checker.
- */
-struct model_params {
-       int maxreads;
-       int maxfuturedelay;
-       bool yieldon;
-       bool sc_trace_analysis;
-       unsigned int fairwindow;
-       unsigned int enabledcount;
-       unsigned int bound;
-       unsigned int uninitvalue;
-
-       /** @brief Maximum number of future values that can be sent to the same
-        *  read */
-       int maxfuturevalues;
-
-       /** @brief Only generate a new future value/expiration pair if the
-        *  expiration time exceeds the existing one by more than the slop
-        *  value */
-       unsigned int expireslop;
-
-       /** @brief Verbosity (0 = quiet; 1 = noisy) */
-       int verbose;
-
-       /** @brief Command-line argument count to pass to user program */
-       int argc;
-
-       /** @brief Command-line arguments to pass to user program */
-       char **argv;
-};
-
 /** @brief Model checker execution stats */
 struct execution_stats {
        int num_total; /**< @brief Total number of executions */

diff --git a/params.h b/params.h
new file mode 100644 (file)
index 0000000..946c801
--- /dev/null
+++ b/params.h
@@ -0,0 +1,37 @@
+#ifndef __PARAMS_H__
+#define __PARAMS_H__
+
+/**
+ * Model checker parameter structure. Holds run-time configuration options for
+ * the model checker.
+ */
+struct model_params {
+       int maxreads;
+       int maxfuturedelay;
+       bool yieldon;
+       bool sc_trace_analysis;
+       unsigned int fairwindow;
+       unsigned int enabledcount;
+       unsigned int bound;
+       unsigned int uninitvalue;
+
+       /** @brief Maximum number of future values that can be sent to the same
+        *  read */
+       int maxfuturevalues;
+
+       /** @brief Only generate a new future value/expiration pair if the
+        *  expiration time exceeds the existing one by more than the slop
+        *  value */
+       unsigned int expireslop;
+
+       /** @brief Verbosity (0 = quiet; 1 = noisy) */
+       int verbose;
+
+       /** @brief Command-line argument count to pass to user program */
+       int argc;
+
+       /** @brief Command-line arguments to pass to user program */
+       char **argv;
+};
+
+#endif /* __PARAMS_H__ */