small edits

diff --git a/Makefile b/Makefile
index c1d0e232f73aa3c0a089e46de596af5d7d828b89..4f83cd99a12883b2954d075a72e1f52353891730 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,11 +18,9 @@ LDFLAGS := -ldl
 SHARED := -Wl,-undefined,dynamic_lookup -dynamiclib
 endif
 
-TESTS_DIR := test
-
 MARKDOWN := doc/Markdown/Markdown.pl
 
-all: $(LIB_SO) tests README.html
+all: $(LIB_SO) README.html
 
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
@@ -58,7 +56,6 @@ $(LIB_SO): $(OBJECTS)
 PHONY += clean
 clean:
        rm -f *.o *.so .*.d *.pdf *.dot
-       $(MAKE) -C $(TESTS_DIR) clean
 
 PHONY += mrclean
 mrclean: clean
@@ -68,10 +65,6 @@ PHONY += tags
 tags:
        ctags -R
 
-PHONY += tests
-tests: $(LIB_SO)
-#      $(MAKE) -C $(TESTS_DIR)
-
 BENCH_DIR := benchmarks
 
 PHONY += benchmarks

diff --git a/execution.h b/execution.h
index 4a453bb24650ff2f3878dfc2cd07ac491119b997..5493489126a7d30a101e4400e9289acfe130ff4a 100644 (file)
--- a/execution.h
+++ b/execution.h
@@ -136,11 +136,12 @@ private:
        /** The scheduler to use: tracks the running/ready Threads */
        Scheduler * const scheduler;
 
-       action_list_t action_trace;
        SnapVector<Thread *> thread_map;
        SnapVector<Thread *> pthread_map;
        uint32_t pthread_counter;
 
+       action_list_t action_trace;
+
        /** Per-object list of actions. Maps an object (i.e., memory location)
         * to a trace of all actions performed on the object. 
         * Used only for SC fences, unlocks, & wait.
@@ -151,8 +152,10 @@ private:
         * to a trace of all actions performed on the object. */
        HashTable<const void *, action_list_t *, uintptr_t, 2> condvar_waiters_map;
 
+       /** Per-object list of actions that each thread performed. */
        HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 2> obj_thrd_map;
 
+       /** Per-object list of writes that each thread performed. */
        HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 2> obj_wr_thrd_map;
 
        HashTable<const void *, ModelAction *, uintptr_t, 4> obj_last_sc_map;