#ifndef __MODEL_H__
#define __MODEL_H__
-#include <vector>
#include <cstddef>
#include <ucontext.h>
#include <inttypes.h>
#include "workqueue.h"
#include "config.h"
#include "modeltypes.h"
+#include "stl-model.h"
/* Forward declaration */
class Node;
struct model_snapshot_members;
/** @brief Shorthand for a list of release sequence heads */
-typedef std::vector< const ModelAction *, ModelAlloc<const ModelAction *> > rel_heads_list_t;
+typedef ModelVector<const ModelAction *> rel_heads_list_t;
-typedef std::list< ModelAction *, SnapshotAlloc<ModelAction *> > action_list_t;
+typedef SnapList<ModelAction *> action_list_t;
/**
* Model checker parameter structure. Holds run-time configuration options for
struct model_params {
int maxreads;
int maxfuturedelay;
+ bool yieldon;
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 */
};
struct PendingFutureValue {
- PendingFutureValue(ModelAction *writer, ModelAction *act) : writer(writer), act(act) { }
+ PendingFutureValue(ModelAction *writer, ModelAction *reader) :
+ writer(writer), reader(reader)
+ { }
const ModelAction *writer;
- ModelAction *act;
+ ModelAction *reader;
};
/** @brief Records information regarding a single pending release sequence */
/** @brief The head of the potential longest release sequence chain */
const ModelAction *release;
/** @brief The write(s) that may break the release sequence */
- std::vector<const ModelAction *> writes;
+ SnapVector<const ModelAction *> writes;
};
/** @brief The central structure for model-checking */
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;
/** 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 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 promises_may_allow(const ModelAction *writer, const ModelAction *reader) const;
bool has_asserted() const;
void set_assert();
void set_bad_synchronization();
ModelAction * get_last_fence_conflict(ModelAction *act) const;
ModelAction * get_last_conflict(ModelAction *act) const;
void set_backtracking(ModelAction *act);
- Thread * get_next_thread(ModelAction *curr);
+ Thread * action_select_next_thread(const ModelAction *curr) const;
+ Thread * get_next_thread();
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);
template <typename rf_type>
bool r_modification_order(ModelAction *curr, const rf_type *rf);
- bool w_modification_order(ModelAction *curr, std::vector< ModelAction *, ModelAlloc<ModelAction *> > *send_fv);
+ bool w_modification_order(ModelAction *curr, ModelVector<ModelAction *> *send_fv);
void get_release_seq_heads(ModelAction *acquire, ModelAction *read, rel_heads_list_t *release_heads);
bool release_seq_heads(const ModelAction *rf, rel_heads_list_t *release_heads, struct release_seq *pending) const;
bool resolve_release_sequences(void *location, work_queue_t *work_queue);
void add_future_value(const ModelAction *writer, ModelAction *reader);
- ModelAction * new_uninitialized_action(void *location) const;
+ ModelAction * get_uninitialized_action(const ModelAction *curr) const;
ModelAction *diverge;
ModelAction *earliest_diverge;
* 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;
- HashTable<void *,
std::vector<action_list_t> *, uintptr_t, 4 > * const obj_thrd_map;
- std::vector< Promise *, SnapshotAlloc<Promise *> > * const promises;
- std::vector< struct PendingFutureValue, SnapshotAlloc<struct PendingFutureValue> > * const futurevalues;
+ HashTable<void *,
SnapVector<action_list_t> *, uintptr_t, 4 > * const obj_thrd_map;
+ SnapVector<Promise *> * const promises;
+ SnapVector<struct PendingFutureValue> * const futurevalues;
/**
* List of pending release sequences. Release sequences might be
* are established. Each entry in the list may only be partially
* filled, depending on its pending status.
*/
- std::vector< struct release_seq *, SnapshotAlloc<struct release_seq *> > * const pending_rel_seqs;
+ SnapVector<struct release_seq *> * const pending_rel_seqs;
- std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > * const thrd_last_action;
- std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > * const thrd_last_fence_release;
+ SnapVector<ModelAction *> * const thrd_last_action;
+ SnapVector<ModelAction *> * const thrd_last_fence_release;
NodeStack * const node_stack;
/** Private data members that should be snapshotted. They are grouped
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;
projects / c11tester.git / blobdiff