projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
action: correct RF capitalization
[c11tester.git]
/
model.h
diff --git
a/model.h
b/model.h
index a72e0b50ef8188c49188dee959085f807625dcfa..8fdfc47ae41a8fc0419d04c1570075bdddb0243e 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-6,7
+6,6
@@
#define __MODEL_H__
#include <cstddef>
#define __MODEL_H__
#include <cstddef>
-#include <ucontext.h>
#include <inttypes.h>
#include "mymemory.h"
#include <inttypes.h>
#include "mymemory.h"
@@
-15,6
+14,7
@@
#include "config.h"
#include "modeltypes.h"
#include "stl-model.h"
#include "config.h"
#include "modeltypes.h"
#include "stl-model.h"
+#include "context.h"
/* Forward declaration */
class Node;
/* Forward declaration */
class Node;
@@
-73,9
+73,11
@@
struct execution_stats {
};
struct PendingFutureValue {
};
struct PendingFutureValue {
- PendingFutureValue(ModelAction *writer, ModelAction *act) : writer(writer), act(act) { }
+ PendingFutureValue(ModelAction *writer, ModelAction *reader) :
+ writer(writer), reader(reader)
+ { }
const ModelAction *writer;
const ModelAction *writer;
- ModelAction *
act
;
+ ModelAction *
reader
;
};
/** @brief Records information regarding a single pending release sequence */
};
/** @brief Records information regarding a single pending release sequence */
@@
-111,8
+113,6
@@
public:
void dumpGraph(char *filename) const;
#endif
void dumpGraph(char *filename) const;
#endif
- void add_thread(Thread *t);
- void remove_thread(Thread *t);
Thread * get_thread(thread_id_t tid) const;
Thread * get_thread(const ModelAction *act) const;
int get_promise_number(const Promise *promise) const;
Thread * get_thread(thread_id_t tid) const;
Thread * get_thread(const ModelAction *act) const;
int get_promise_number(const Promise *promise) const;
@@
-132,7
+132,7
@@
public:
void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector *merge_cv);
bool isfeasibleprefix() const;
void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector *merge_cv);
bool isfeasibleprefix() const;
- bool assert_bug(const char *msg);
+ bool assert_bug(const char *msg
, ...
);
void assert_user_bug(const char *msg);
const model_params params;
void assert_user_bug(const char *msg);
const model_params params;
@@
-143,9
+143,12
@@
private:
/** The scheduler to use: tracks the running/ready Threads */
Scheduler * const scheduler;
/** The scheduler to use: tracks the running/ready Threads */
Scheduler * const scheduler;
+ void add_thread(Thread *t);
+
bool sleep_can_read_from(ModelAction *curr, const ModelAction *write);
bool sleep_can_read_from(ModelAction *curr, const ModelAction *write);
- bool thin_air_constraint_may_allow(const ModelAction *writer, const ModelAction *reader);
+ bool thin_air_constraint_may_allow(const ModelAction *writer, const ModelAction *reader)
const
;
bool mo_may_allow(const ModelAction *writer, const ModelAction *reader);
bool mo_may_allow(const ModelAction *writer, const ModelAction *reader);
+ bool promises_may_allow(const ModelAction *writer, const ModelAction *reader) const;
bool has_asserted() const;
void set_assert();
void set_bad_synchronization();
bool has_asserted() const;
void set_assert();
void set_bad_synchronization();
@@
-168,6
+171,7
@@
private:
bool check_action_enabled(ModelAction *curr);
Thread * take_step(ModelAction *curr);
bool check_action_enabled(ModelAction *curr);
Thread * take_step(ModelAction *curr);
+ bool should_terminate_execution();
template <typename T>
bool check_recency(ModelAction *curr, const T *rf) const;
template <typename T>
bool check_recency(ModelAction *curr, const T *rf) const;
@@
-183,8
+187,8
@@
private:
bool set_latest_backtrack(ModelAction *act);
ModelAction * get_next_backtrack();
void reset_to_initial_state();
bool set_latest_backtrack(ModelAction *act);
ModelAction * get_next_backtrack();
void reset_to_initial_state();
-
int get_promise_to_resolve(const ModelAction *curr) const
;
- bool resolve_promise(ModelAction *curr,
unsigned int promise_idx
);
+
Promise * pop_promise_to_resolve(const ModelAction *curr)
;
+ bool resolve_promise(ModelAction *curr,
Promise *promise
);
void compute_promises(ModelAction *curr);
void compute_relseq_breakwrites(ModelAction *curr);
void compute_promises(ModelAction *curr);
void compute_relseq_breakwrites(ModelAction *curr);
@@
-223,10
+227,6
@@
private:
* to a trace of all actions performed on the object. */
HashTable<const void *, action_list_t *, uintptr_t, 4> * const obj_map;
* to a trace of all actions performed on the object. */
HashTable<const void *, action_list_t *, uintptr_t, 4> * const obj_map;
- /** Per-object list of actions. Maps an object (i.e., memory location)
- * to a trace of all actions performed on the object. */
- HashTable<const void *, action_list_t *, uintptr_t, 4> * const lock_waiters_map;
-
/** Per-object list of actions. Maps an object (i.e., memory location)
* to a trace of all actions performed on the object. */
HashTable<const void *, action_list_t *, uintptr_t, 4> * const condvar_waiters_map;
/** Per-object list of actions. Maps an object (i.e., memory location)
* to a trace of all actions performed on the object. */
HashTable<const void *, action_list_t *, uintptr_t, 4> * const condvar_waiters_map;
@@
-279,7
+279,6
@@
private:
bool is_feasible_prefix_ignore_relseq() const;
bool is_infeasible() const;
bool is_deadlocked() const;
bool is_feasible_prefix_ignore_relseq() const;
bool is_infeasible() const;
bool is_deadlocked() const;
- bool is_circular_wait(const Thread *t) const;
bool is_complete_execution() const;
bool have_bug_reports() const;
void print_bugs() const;
bool is_complete_execution() const;
bool have_bug_reports() const;
void print_bugs() const;