clean out includes, etc.

diff --git a/execution.cc b/execution.cc
index 828502686d0194e642e8b2335c910c33f86ff049..f0288d2e7de1eb2d23bc32c95a3c01fb8c7d1683 100644 (file)
--- a/execution.cc
+++ b/execution.cc
@@ -5,18 +5,15 @@
 #include <stdarg.h>
 
 #include "execution.h"
-#include "model.h"
 #include "action.h"
 #include "nodestack.h"
 #include "schedule.h"
-#include "snapshot-interface.h"
 #include "common.h"
 #include "clockvector.h"
 #include "cyclegraph.h"
 #include "promise.h"
 #include "datarace.h"
 #include "threads-model.h"
-#include "output.h"
 #include "bugmessage.h"
 
 #define INITIAL_THREAD_ID      0
@@ -31,7 +28,6 @@ struct model_snapshot_members {
                used_sequence_numbers(0),
                next_backtrack(NULL),
                bugs(),
-               stats(),
                failed_promise(false),
                too_many_reads(false),
                no_valid_reads(false),
@@ -49,7 +45,6 @@ struct model_snapshot_members {
        modelclock_t used_sequence_numbers;
        ModelAction *next_backtrack;
        SnapVector<bug_message *> bugs;
-       struct execution_stats stats;
        bool failed_promise;
        bool too_many_reads;
        bool no_valid_reads;

diff --git a/execution.h b/execution.h
index 6810fee665a6b018cbec1c353b12f22667a8c42e..0f1e8aed1e243dc3a05d4b7fa666e33fca400c71 100644 (file)
--- a/execution.h
+++ b/execution.h
@@ -14,7 +14,6 @@
 #include "config.h"
 #include "modeltypes.h"
 #include "stl-model.h"
-#include "context.h"
 #include "params.h"
 
 /* Forward declaration */

diff --git a/model.cc b/model.cc
index 8d5bc0fa3bab813c3a68b5fa149ae95b27c51800..48fa28acb71cf1b8d49112df717d2ac460dc2e9b 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <algorithm>
-#include <mutex>
 #include <new>
 #include <stdarg.h>