Brian Demsky [Fri, 26 Apr 2013 20:46:35 +0000 (13:46 -0700)]
Fix bug that prevents graph generation from compiling.
Check in test case that shows theorem that I've been trying to prove for 2 days is in fact not true (and thus difficult to prove).
Brian Norris [Wed, 24 Apr 2013 17:28:34 +0000 (10:28 -0700)]
action: improve "unintialized load" bug print
Brian Norris [Wed, 24 Apr 2013 17:11:16 +0000 (10:11 -0700)]
action: add get_{type,mo}_str() accessors
The big switch/case statements can be shortened and separated into their
own functions.
Brian Norris [Tue, 23 Apr 2013 01:43:20 +0000 (18:43 -0700)]
Merge remote-tracking branch 'private/master'
Brian Norris [Tue, 23 Apr 2013 01:42:51 +0000 (18:42 -0700)]
README: update text
Brian Demsky [Tue, 23 Apr 2013 00:19:25 +0000 (17:19 -0700)]
bug...will sometimes print SC traces in a bad order
Brian Demsky [Mon, 22 Apr 2013 23:00:56 +0000 (16:00 -0700)]
cleanup printing
Brian Demsky [Mon, 22 Apr 2013 22:59:22 +0000 (15:59 -0700)]
Rework how we present non-SC traces...previous presentation didn't make reasons clear.
Brian Norris [Fri, 19 Apr 2013 22:21:07 +0000 (15:21 -0700)]
snapshot-interface: bugfix - terminate string from readlink()
readlink() doesn't terminate the string for us, so our string doesn't
match properly (it will have a little extra garbage at the end).
Brian Norris [Fri, 19 Apr 2013 22:20:18 +0000 (15:20 -0700)]
snapshot: debugging - show the snapshot regions that are added
Brian Norris [Fri, 19 Apr 2013 21:47:35 +0000 (14:47 -0700)]
snapshot-interface: don't snapshot libmodel.so
We don't need to snapshot our own globals; we are careful to only place
constant pointers in global memory.
Brian Norris [Fri, 19 Apr 2013 21:42:05 +0000 (14:42 -0700)]
snapshot: use perror()
Brian Norris [Wed, 17 Apr 2013 19:42:14 +0000 (12:42 -0700)]
main: support long options, improve help message
Brian Norris [Fri, 19 Apr 2013 21:32:51 +0000 (14:32 -0700)]
execution: improve documentation
is_yieldblocked() wasn't documented
check_action_enabled() had incorrect documentation, since I removed the
waiter lists
Brian Norris [Fri, 19 Apr 2013 21:29:29 +0000 (14:29 -0700)]
execution: improve yield-blocking structure
We should just check the yieldblock parameter within
ModelExecution::is_yieldblock().
Brian Norris [Thu, 18 Apr 2013 02:10:47 +0000 (19:10 -0700)]
TMP: improve debugging, remove print_trace()
Brian Demsky [Fri, 19 Apr 2013 00:34:41 +0000 (17:34 -0700)]
Remove special cases for printing SC executions.
Just use happens before relation instead. Also include a criteria to keep things in execution order as much as possible.
Brian Demsky [Thu, 18 Apr 2013 21:53:58 +0000 (14:53 -0700)]
Add yield block support. The idea is to not generate executions with yield actions.
While preventing yields doesn't preserve livelock, under the CHESS assumptions, it does allow us to reach all states.
Brian Norris [Thu, 18 Apr 2013 01:45:44 +0000 (18:45 -0700)]
datarace: bugfix - use proper multiple-inclusion guard
The DATARACE_H macro is never defined, so it never succeeds as a
multiple-inclusion guard.
Brian Norris [Thu, 18 Apr 2013 00:10:20 +0000 (17:10 -0700)]
stacktrace: remove usage of FILE in stacktrace
The original print_stacktrace() function required a FILE pointer, so we
manufactured one. We really should avoid the bugs that can come from the
allocation and buffering done with FILE, since this is used on error
paths.
Brian Demsky [Wed, 17 Apr 2013 22:51:47 +0000 (15:51 -0700)]
Bug: ModelExecution had bogus model_params reference.
Fix.
Brian Norris [Wed, 17 Apr 2013 20:17:46 +0000 (13:17 -0700)]
datarace: bugfix - don't implicitly allocate global SnapVector
We do not want to pollute the user's snapshotting region with the
unrealizedraces SnapVector. Allocate it in initRaceDetector(), so that
it is placed on the model-checker's snapshotting heap.
Brian Norris [Wed, 17 Apr 2013 20:15:30 +0000 (13:15 -0700)]
datarace: don't export unrealized race vector
Brian Norris [Wed, 17 Apr 2013 17:50:25 +0000 (10:50 -0700)]
execution: bugfix - no action "conflicts" with itself
Brian Norris [Wed, 17 Apr 2013 17:46:19 +0000 (10:46 -0700)]
execution: bugfix - backtrack seq-cst fences properly
The commented-out ATOMIC_FENCE should not be commented out; the note
that "fences don't directly cause backtracking" is false for seq-cst
fences. We intend to backtrack for all seq-cst fences, so we need to
perform the appropriate 'get conflict' search for all fences.
Brian Norris [Wed, 17 Apr 2013 17:45:58 +0000 (10:45 -0700)]
execution: correct comment on check_current_action()
Brian Norris [Tue, 16 Apr 2013 19:27:06 +0000 (12:27 -0700)]
nodestack: localize the model-checker parameters
Brian Norris [Tue, 16 Apr 2013 18:58:28 +0000 (11:58 -0700)]
model: privatize ModelChecker::get_num_threads()
The public interface is now in ModelExecution.
Brian Norris [Tue, 16 Apr 2013 18:56:59 +0000 (11:56 -0700)]
nodestack: register ModelExecution class w/in NodeStack
Brian Norris [Tue, 16 Apr 2013 18:45:51 +0000 (11:45 -0700)]
promise: add max_available_thread_idx() interface
To remove an unnecessary use of global/public model->get_num_threads().
Brian Norris [Tue, 16 Apr 2013 18:29:11 +0000 (11:29 -0700)]
clockvector: don't use global get_num_threads()
Brian Norris [Tue, 16 Apr 2013 18:13:55 +0000 (11:13 -0700)]
model: remove leftover junk
Brian Norris [Tue, 16 Apr 2013 18:01:46 +0000 (11:01 -0700)]
execution: embed obj_map directly in class
This structure can be embedded as a full-fledged member, not a pointer.
Brian Norris [Tue, 16 Apr 2013 17:23:44 +0000 (10:23 -0700)]
hashtable: update documentation
Some of the existing documentation was incorrect or insufficient. Also,
add new documentation to describe the design "feature" of this table:
that 0/NULL is not a valid key.
Brian Norris [Tue, 16 Apr 2013 16:49:01 +0000 (09:49 -0700)]
hashtable: enforce, document non-zero keys
HashTable does not support a key of "zero." ...
Brian Norris [Tue, 16 Apr 2013 16:30:17 +0000 (09:30 -0700)]
execution: convert HashTable to SnapVector
We don't actually need a hash table for threads, since we allocate their
indeces contiguously, at least for now. Also, HashTable is really
designed for pointer-based keys and may not accept a 0-valued key. To
avoid these problems, just switch to a snapshotted vector.
Brian Norris [Tue, 16 Apr 2013 16:46:58 +0000 (09:46 -0700)]
action: bugfix - use non-zero fence "location"
Our HashTable does not support zero-based keys (e.g., NULL pointer as a
key). So as a hack, switch to use a small, arbitrary, non-zero location
instead of NULL (0).
Brian Norris [Tue, 16 Apr 2013 06:23:43 +0000 (23:23 -0700)]
execution: embed action_list as full member
Brian Norris [Tue, 16 Apr 2013 06:23:25 +0000 (23:23 -0700)]
execution: add const
Brian Norris [Tue, 16 Apr 2013 03:28:09 +0000 (20:28 -0700)]
execution: embed more data structures directly in class
Brian Norris [Tue, 16 Apr 2013 03:20:11 +0000 (20:20 -0700)]
execution: embed snapshotted data structures in class
Brian Norris [Tue, 16 Apr 2013 03:11:14 +0000 (20:11 -0700)]
execution: make structure snapshotting
All members are snapshot-able.
Brian Norris [Tue, 16 Apr 2013 03:08:41 +0000 (20:08 -0700)]
execution: move execution number back to ModelChecker class
Brian Norris [Tue, 16 Apr 2013 02:59:53 +0000 (19:59 -0700)]
clean out includes, etc.
Brian Norris [Tue, 16 Apr 2013 02:55:37 +0000 (19:55 -0700)]
model: embed the trace_analyses in the class
Brian Norris [Tue, 16 Apr 2013 02:53:40 +0000 (19:53 -0700)]
action: add <stdlib>
For exit() and EXIT_*
Brian Norris [Tue, 16 Apr 2013 02:48:25 +0000 (19:48 -0700)]
scanalysis: allocate structures as true members of class (not pointers)
They're all snapshotting, so it makes sense to make them legitimate
members of the SCAnalysis class.
Brian Norris [Tue, 16 Apr 2013 02:41:50 +0000 (19:41 -0700)]
scanalysis: fixup spacing
Brian Norris [Tue, 16 Apr 2013 18:35:07 +0000 (11:35 -0700)]
Merge cleanup branch
This branch separated ModelChecker into two separate classes/modules. It was a
big disruptive change, and it was not compile-able at some points (the BROKEN
commit and some of its successors). Hence the non-fast-forward merge here, to
record the divergent portion of history as special.
Brian Norris [Tue, 16 Apr 2013 02:37:21 +0000 (19:37 -0700)]
schedule: drop the ModelChecker::check_promises_thread_disabled interface
Brian Norris [Tue, 16 Apr 2013 02:31:58 +0000 (19:31 -0700)]
model / threads: remove global get_next_id() interface
Brian Norris [Tue, 16 Apr 2013 02:25:46 +0000 (19:25 -0700)]
promise: get reference to ModelExecution
Brian Norris [Tue, 16 Apr 2013 02:20:02 +0000 (19:20 -0700)]
scanalysis: use ModelExecution interfaces
Brian Norris [Tue, 16 Apr 2013 02:19:16 +0000 (19:19 -0700)]
scanalysis: install ModelExecution object in the analysis
Brian Norris [Tue, 16 Apr 2013 02:17:53 +0000 (19:17 -0700)]
execution: add 'const'
Brian Norris [Tue, 16 Apr 2013 02:01:41 +0000 (19:01 -0700)]
model: cleanup a few more interfaces
These public interfaces are no longer presentin ModelChecker.
Brian Norris [Tue, 16 Apr 2013 01:59:53 +0000 (18:59 -0700)]
model: add get_execution() interface
Brian Norris [Tue, 16 Apr 2013 01:25:53 +0000 (18:25 -0700)]
BROKEN: restructure much of ModelChecker as ModelExecution class
This will *not* compile fully. It is an interim step in which I move
much of the ModelChecker code into a separate class which does not need
to be globally-accessible. The next few commits should fix the compile
problems as I rewrite/remove some interfaces.
Brian Norris [Tue, 16 Apr 2013 01:46:18 +0000 (18:46 -0700)]
datarace: simplify raceCheck{Read,Write}() function interfaces
The user should not have to pass in a ClockVector.
Brian Norris [Tue, 16 Apr 2013 01:33:28 +0000 (18:33 -0700)]
datarace: make globals static
They're only global within this file.
Brian Norris [Tue, 16 Apr 2013 00:59:36 +0000 (17:59 -0700)]
model: drop public get_current_node() interface
Brian Norris [Tue, 16 Apr 2013 00:38:45 +0000 (17:38 -0700)]
model: remove public check_promises() interface
Brian Norris [Tue, 16 Apr 2013 00:28:11 +0000 (17:28 -0700)]
model: add synchronize() function
To prevent code duplication.
Brian Norris [Tue, 16 Apr 2013 01:19:10 +0000 (18:19 -0700)]
common: drop model_print_summary()
This can cause problems if we include it in the output of ASSERT().
Brian Norris [Tue, 16 Apr 2013 00:53:11 +0000 (17:53 -0700)]
promise: add Promise::get_index function
Brian Norris [Tue, 16 Apr 2013 00:26:24 +0000 (17:26 -0700)]
action: we don't need special cases for lock/join anymore
Brian Norris [Tue, 16 Apr 2013 00:12:20 +0000 (17:12 -0700)]
move license to LICENSE file
Brian Norris [Tue, 16 Apr 2013 00:09:53 +0000 (17:09 -0700)]
Merge cleanup code from Brian N.
Brian Norris [Mon, 15 Apr 2013 23:56:51 +0000 (16:56 -0700)]
traceanalysis: rename to remove '_'
Brian Norris [Mon, 15 Apr 2013 22:41:31 +0000 (15:41 -0700)]
bugmessage: move struct to header file
Brian Demsky [Mon, 15 Apr 2013 08:00:36 +0000 (01:00 -0700)]
fix weird duplicated code
Brian Norris [Mon, 15 Apr 2013 07:02:58 +0000 (00:02 -0700)]
params: move model_params to header file
Brian Norris [Mon, 15 Apr 2013 06:24:44 +0000 (23:24 -0700)]
model: add too_many_steps()
Brian Norris [Mon, 15 Apr 2013 06:11:53 +0000 (23:11 -0700)]
model: fixup whitespace
Brian Norris [Mon, 15 Apr 2013 04:34:49 +0000 (21:34 -0700)]
scanalysis: fix warning
canalysis.cc: In member function ‘bool SCAnalysis::processRead(ModelAction*, ClockVector*)’:
scanalysis.cc:162:78: warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
Brian Norris [Mon, 15 Apr 2013 03:57:48 +0000 (20:57 -0700)]
scanalysis: remove whitespace
Brian Demsky [Sun, 14 Apr 2013 07:57:55 +0000 (00:57 -0700)]
clean up printing a little for cycle cases...
Brian Demsky [Fri, 12 Apr 2013 08:33:34 +0000 (01:33 -0700)]
more implementation of scanalysis...
implementation of scanalysis and printout code... should work now
Brian Demsky [Fri, 12 Apr 2013 08:33:34 +0000 (01:33 -0700)]
more implementation of scanalysis...
seems like it might work at this point, but need code to tell whether it is a SC trace or not and which parts are SC
Brian Demsky [Thu, 11 Apr 2013 10:01:07 +0000 (03:01 -0700)]
towards supporting scanalysis...
added some accessor methods in model.cc for external analyses
Brian Demsky [Wed, 10 Apr 2013 18:26:19 +0000 (11:26 -0700)]
add some support for traceanalysis plugins
Brian Demsky [Wed, 10 Apr 2013 18:26:19 +0000 (11:26 -0700)]
add some support for traceanalysis plugins
Brian Norris [Thu, 11 Apr 2013 19:15:10 +0000 (12:15 -0700)]
improve documentation + Doxygen formatting
Brian Norris [Thu, 11 Apr 2013 18:25:16 +0000 (11:25 -0700)]
action: refactor, move VALUE_TRY{SUCCESS,FAILED} out of header
Brian Norris [Thu, 11 Apr 2013 17:57:30 +0000 (10:57 -0700)]
cyclegraph: kill unused promise_list_t type
Brian Norris [Sat, 6 Apr 2013 01:42:16 +0000 (18:42 -0700)]
snapshot: cleanup/document much of fork-based snapshotting
We can consolidate much of the fork-based snapshotting "context"
variables so that they are easier to understand; we essentially only
need two types of contexts, the "shared" context used for the client
program (i.e., the model-checker) and the "private" context, which
each snapshot process uses for running and managing its state. That way,
we only have a single process using the "shared" context at a time,
while the others reside in their private context.
Additionally, I add an "exit" context, which is used just to help with
terminating processes once they have to roll back.
Otherwise, this commit contains renaming and documenting of several
fields, variables, etc.
Brian Norris [Fri, 5 Apr 2013 21:44:02 +0000 (14:44 -0700)]
snapshot: use sizeof(*fork_snap)
Brian Norris [Fri, 5 Apr 2013 21:17:42 +0000 (14:17 -0700)]
model: remove DEBUG action print
A ModelAction should only be printed at certain points, where the action
is guaranteed to be consistent (e.g., its reads_from pointer is valid).
Rather than try to position this print opportunely, just drop it; we
already print out the whole trace, which should be sufficient.
Brian Norris [Fri, 5 Apr 2013 21:02:58 +0000 (14:02 -0700)]
snapshot: clean up fork-based error handling
This is an ugly attempt at error handling. Kill the useless variables,
reword the debug prints, and use perror().
Brian Norris [Fri, 5 Apr 2013 21:01:33 +0000 (14:01 -0700)]
action: correct RF capitalization
Brian Norris [Thu, 4 Apr 2013 08:38:40 +0000 (01:38 -0700)]
model: deadlock: print the culprit thread, when known
Brian Norris [Thu, 4 Apr 2013 08:38:28 +0000 (01:38 -0700)]
datarace: use variable-argument bug-printing
Brian Norris [Thu, 4 Apr 2013 08:25:34 +0000 (01:25 -0700)]
model: add variable arguments for bug messages
Brian Norris [Thu, 4 Apr 2013 08:00:17 +0000 (01:00 -0700)]
model: proactively build/prune is_enabled() set
We should proactively check whether threads are enabled, as this allows
the model-checker to more accurately reason about backtracking, fairness
(particularly, assigning thread priorities), and sleep sets.
This commit causes changes in observed executions for many test
programs. Often, this occurs for programs where the main thread
performs a JOIN on a child thread. Previously, we would only discover
that this thread should be disabled once the scheduler attempts to
execute the JOIN ModelAction. For the period of the trace in which this
disabling isn't discovered, we may try to set backtracking points for
the main thread. These executions just turn into infeasible or
sleep-set-redundant executions anyway.
This can also affect the assertion of thread priority when assigning
backtracking points. If a thread is supposedly "enabled" (but in fact is
not), then we may prevent other threads from running because this thread has
priority. But that thread cannot run, so instead we were doing some
funky things with the remaining ("low-priority") threads.
This fix remedies these sorts of issues by precisely computing the set
of threads which are disabled, waiting on other threads/locks.
Brian Norris [Wed, 3 Apr 2013 16:44:07 +0000 (09:44 -0700)]
model: pull thread control logic out of take_step(), check_current...()
Much of the scheduling and main control loop should be handled closer to
the top-level run() method. This is a start toward putting these
decisions at the appropriate level, making things more clear. Of course,
it's not complete.
Brian Norris [Fri, 5 Apr 2013 17:27:18 +0000 (10:27 -0700)]
snapshot: kill useless macro
We're not reusing this macro, so it's better just to use the standard
perror() followed by exit().
Brian Norris [Thu, 4 Apr 2013 20:19:50 +0000 (13:19 -0700)]
context: move Mac swapcontext() to separate compilation unit
We really don't want model_swapcontext() to ever be inlined on Mac OSX,
since this could potentially cause subtle getcontext()-related bugs to
resurface. Just make it a separate compilation unit (*.cc file).
Brian Norris [Thu, 4 Apr 2013 19:55:33 +0000 (12:55 -0700)]
common: improve redirect_output() error handling
Check the return code and errno results of all system/library calls.
Also delete the extraneous 'fd' variable and use the appropriate
STDOUT_FILENO macro instead of fileno(stdout).
Brian Norris [Thu, 4 Apr 2013 19:46:13 +0000 (12:46 -0700)]
common: make model_print() use OS file descriptor, not C library FILE*
A C library FILE does buffering (and possibly other opaque operations)
that can conflict with the model-checker's methods of snapshotting
memory. Particularly, it seems like we could corrupt and drop data that
was written to model_out, if the data was large enough and buffered in
just the right way.
Really, with the presence of dprintf(), there is no reason to print to a
FILE stream; we can just use the file descriptor (either STDOUT_FILENO
or the descriptor received from dup2()).
This fixes bugs seen in verbose mode, with a lot of extra debug
printing. Some of the output was being dropped.
Brian Norris [Thu, 4 Apr 2013 17:10:32 +0000 (10:10 -0700)]
action: include reads-from-promise in HASH calculations
And include the *value*, since the same promise index can yield
different future values.