Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r57050 - sandbox/stm/branches/vbe/libs/stm/test
From: vicente.botet_at_[hidden]
Date: 2009-10-21 15:07:24

Next message: hartmut.kaiser_at_[hidden]: "[Boost-commit] svn:boost r57051 - in trunk/libs/spirit/test: karma qi"
Previous message: troy_at_[hidden]: "[Boost-commit] svn:boost r57049 - branches/release/boost/detail"

Author: viboes
Date: 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
New Revision: 57050
URL: http://svn.boost.org/trac/boost/changeset/57050

Log:
TBoost.STM vbe: Use args and target-name on the Jamfile to avoid the profusion of test files
[ run sources + : args * : input-files * : requirements * : target-name ? : default-build * ]

Removed:
   sandbox/stm/branches/vbe/libs/stm/test/test_accounts_def_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_accounts_dir_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_default.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_hashmap_def_t2_i1000.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_hashmap_dir_t2_i1000.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_hashmap_w_locks_def_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_hashmap_w_locks_dir_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_ht_def_t2_i1000.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_ht_dir_t2_i1000.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_irrevocable_int_def_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_irrevocable_int_dir_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_isolated_composed_int_lock2_def_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_isolated_composed_int_lock2_dir_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_isolated_composed_int_lock_def_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_isolated_composed_int_lock_dir_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_isolated_int_def_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_isolated_int_dir_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_isolated_int_lock_def_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_isolated_int_lock_dir_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_linkedlist_def_t2_i1000.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_linkedlist_dir_t2_i1000.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_linkedlist_w_locks_def_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_linkedlist_w_locks_dir_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_list_hash_w_locks_def_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_list_hash_w_locks_dir_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_lit_def_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_lit_dir_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_ll_def_t2_i1000.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_ll_dir_t2_i1000.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_lot_def_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_lot_dir_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_nested_tx_def_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_nested_tx_dir_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_pointer_def_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_pointer_dir_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_rbtree_def_t2_i1000.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_rbtree_dir_t2_i1000.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_smart_def_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_smart_dir_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_tx_linear_lock_def_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_tx_linear_lock_dir_t2.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_using_linkedlist_def_t2_i1000.cpp
   sandbox/stm/branches/vbe/libs/stm/test/test_using_linkedlist_dir_t2_i1000.cpp
Text files modified:
   sandbox/stm/branches/vbe/libs/stm/test/Jamfile.v2 | 161 ++++++++++++++++++++++-----------------
   sandbox/stm/branches/vbe/libs/stm/test/main.h | 8 -
   sandbox/stm/branches/vbe/libs/stm/test/stm.cpp | 37 +++-----
   3 files changed, 106 insertions(+), 100 deletions(-)

Modified: sandbox/stm/branches/vbe/libs/stm/test/Jamfile.v2
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/Jamfile.v2 (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/Jamfile.v2 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
@@ -36,129 +36,148 @@
#{
# return
# [ run $(sources) : : : <link>static ]
-## [ run $(sources) ../../../../libs/thread/build//boost_thread : : : : $(sources[1]:B)_lib ]
+## [ run $(sources) ../../../../libs/thread/build//boost_thread : : : : $(sources[1]:B)_lib ]
# ;
#}

     static-lib all_my_tests
- : stm.cpp testatom.cpp pointer_test.cpp smart.cpp globalIntArr.cpp testHashMapAndLinkedListsWithLocks.cpp irrevocableInt.cpp testHashMapWithLocks.cpp isolatedComposedIntLockInTx.cpp testInt.cpp isolatedComposedIntLockInTx2.cpp testLL_latm.cpp isolatedInt.cpp testLinkedList.cpp isolatedIntLockInTx.cpp testLinkedListWithLocks.cpp litExample.cpp testPerson.cpp lotExample.cpp testRBTree.cpp transferFun.cpp nestedTxs.cpp txLinearLock.cpp testHT_latm.cpp usingLockTx.cpp testHashMap.cpp
+ : testatom.cpp pointer_test.cpp smart.cpp globalIntArr.cpp testHashMapAndLinkedListsWithLocks.cpp irrevocableInt.cpp testHashMapWithLocks.cpp isolatedComposedIntLockInTx.cpp testInt.cpp isolatedComposedIntLockInTx2.cpp testLL_latm.cpp isolatedInt.cpp testLinkedList.cpp isolatedIntLockInTx.cpp testLinkedListWithLocks.cpp litExample.cpp testPerson.cpp lotExample.cpp testRBTree.cpp transferFun.cpp nestedTxs.cpp txLinearLock.cpp testHT_latm.cpp usingLockTx.cpp testHashMap.cpp
     ;

- test-suite "draco"
- :
- [ run test_default.cpp .//all_my_tests/<link>static ]
+ exe stm
+ : stm.cpp .//all_my_tests/<link>static
+ :
+ ;

- [ run test_accounts_dir_t2.cpp .//all_my_tests/<link>static ]
- [ run test_accounts_def_t2.cpp .//all_my_tests/<link>static ]
+ #[ run sources + : args * : input-files * : requirements * : target-name ? : default-build * ]

- [ run test_hashmap_dir_t2_i1000.cpp .//all_my_tests/<link>static ]
- [ run test_hashmap_def_t2_i1000.cpp .//all_my_tests/<link>static ]
+ alias def_invalid
+ :
+ [ run stm : -bench accounts -def -threads 4 -inserts 100 : : : test_accounts_def_t4_i100 ]
+
+ [ run stm : -bench hashmap -def -threads 4 -inserts 100 : : : test_hashmap_def_t4_i100 ]

- ########### livelock. killed after 3:00 25% CPU
- #[ run test_ht_dir_t2_i1000.cpp .//all_my_tests/<link>static ]

             ########### fails
             # /bin/sh: line 4: 2944 Aborted (core dumped) "bin/test_ht_def_t2_i1000.test/gcc-3.4.4/debug/threading-multi/test_ht_def_t2_i1000.exe" > "bin/test_ht_def_t2_i1000.test/gcc-3.4.4/debug/threading-multi/test_ht_def_t2_i1000.output" 2>&1
             # Rounding max threads to the next multiple of 4 (4).
             # assertion "res==0" failed: file "../../../boost/synchro/pthread/mutex.hpp", line 40
- [ run test_ht_def_t2_i1000.cpp .//all_my_tests/<link>static ]
+ [ run stm : -bench ht -def -threads 2 -inserts 100 : : : test_ht_def_t2_i100 ]

- [ run test_isolated_int_dir_t2.cpp .//all_my_tests/<link>static ]
- [ run test_isolated_int_def_t2.cpp .//all_my_tests/<link>static ]
+ [ run stm : -bench isolated_int -def -threads 4 -inserts 100 : : : test_isolated_int_def_t2_i100 ]

- [ run test_linkedlist_dir_t2_i1000.cpp .//all_my_tests/<link>static ]
- [ run test_linkedlist_def_t2_i1000.cpp .//all_my_tests/<link>static ]
+ [ run stm : -bench linkedlist -def -threads 4 -inserts 100 : : : test_linkedlist_def_t4_i100 ]

- [ run test_ll_dir_t2_i1000.cpp .//all_my_tests/<link>static ]
             ########### fails
             # assertion "res==0" failed: file "../../../boost/synchro/pthread/mutex.hpp", line 40
- [ run test_ll_def_t2_i1000.cpp .//all_my_tests/<link>static ]
-
- ########### fails with CHECK
- #/bin/sh: line 4: 3764 Aborted (core dumped) "bin/test_tx_linear_lock_dir_t2.test/gcc-3.4.4/debug/threading-multi/test_tx_linear_lock_dir_t2.exe" > "bin/test_tx_linear_lock_dir_t2.test/gcc-3.4.4/debug/threading-multi/test_tx_linear_lock_dir_t2.output" 2>&1
- #assertion "res==0" failed: file "../../../boost/synchro/pthread/mutex.hpp", line 40
- ########### deadlock. without CHECK
- #[ run test_tx_linear_lock_dir_t2.cpp .//all_my_tests/<link>static ]
+ [ run stm : -bench ll -def -threads 2 -inserts 100 : : : test_ll_def_t2_i100 ]

             ########### deadlock. killed after 0:26. 00% CPU
             # assertion "res==0" failed: file "../../../boost/synchro/pthread/mutex.hpp", line 40
             # 19469 [sig] test_tx_linear_lock_def_t2 3768 _cygtls::handle_exceptions: Error while dumping state (probably corrupted stack)
- #[ run test_tx_linear_lock_def_t2.cpp .//all_my_tests/<link>static ]
-
- [ run test_isolated_int_lock_dir_t2.cpp .//all_my_tests/<link>static ]
+ [ run stm : -bench tx_linear_lock -def -threads 2 -inserts 100 : : : test_tx_linear_lock_def_t2_i100 ]

             ########### deadlock. killed after 0:26. 00% CPU
- #[ run test_isolated_int_lock_def_t2.cpp .//all_my_tests/<link>static ]
-
- ########### deadlock. killed after 0:20. 00% CPU
- #[ run test_isolated_composed_int_lock_dir_t2.cpp .//all_my_tests/<link>static ]
+ [ run stm : -bench isolated_int_lock_in_tx -def -threads 2 -inserts 100 : : : test_isolated_int_lock_in_tx_def_t2_i100 ]

             ########### fails
             # /bin/sh: line 4: 3660 Segmentation fault (core dumped) "bin/test_isolated_composed_int_lock_def_t2.test/gcc-3.4.4/debug/threading-multi/test_isolated_composed_int_lock_def_t2.exe" > "bin/test_isolated_composed_int_lock_def_t2.test/gcc-3.4.4/debug/threading-multi/test_isolated_composed_int_lock_def_t2.output" 2>&1
             # assertion "res==0" failed: file "../../../boost/synchro/pthread/mutex.hpp", line 40
- #[ run test_isolated_composed_int_lock_def_t2.cpp .//all_my_tests/<link>static ]
-
- ########### fails
- # /bin/sh: line 4: 3172 Aborted (core dumped) "bin/test_isolated_composed_int_lock2_dir_t2.test/gcc-3.4.4/debug/threading-multi/test_isolated_composed_int_lock2_dir_t2.exe" > "bin/test_isolated_composed_int_lock2_dir_t2.test/gcc-3.4.4/debug/threading-multi/test_isolated_composed_int_lock2_dir_t2.output" 2>&1
- #assertion "res==0" failed: file "../../../boost/synchro/pthread/mutex.hpp", line 40
- # 11 [sig] test_isolated_composed_int_lock_def_t2 3660 _cygtls::handle_except ions: Error while dumping state (probably corrupted stack)
- [ run test_isolated_composed_int_lock2_dir_t2.cpp .//all_my_tests/<link>static ]
+ [ run stm : -bench isolated_composed_int_lock -def -threads 2 -inserts 100 : : : test_isolated_composed_int_lock_def_t2_i100 ]

             ########### fails
             # /bin/sh: line 4: 3172 Aborted (core dumped) "bin/test_isolated_composed_int_lock2_dir_t2.test/gcc-3.4.4/debug/threading-multi/test_isolated_composed_int_lock2_dir_t2.exe" > "bin/test_isolated_composed_int_lock2_dir_t2.test/gcc-3.4.4/debug/threading-multi/test_isolated_composed_int_lock2_dir_t2.output" 2>&1
             # ====== BEGIN OUTPUT ======
             # assertion "res==0" failed: file "../../../boost/synchro/pthread/mutex.hpp", line 40
- #[ run test_isolated_composed_int_lock2_def_t2.cpp .//all_my_tests/<link>static ]
+ [ run stm : -bench isolated_composed_int_lock2 -def -threads 2 -inserts 100 : : : test_isolated_composed_int_lock2_def_t2_i100 ]

- [ run test_irrevocable_int_dir_t2.cpp .//all_my_tests/<link>static ]
- [ run test_irrevocable_int_def_t2.cpp .//all_my_tests/<link>static ]
+ [ run stm : -bench irrevocable_int -def -threads 4 -inserts 100 : : : test_irrevocable_int_def_t4_i100 ]

- ########### deadlock. killed after 0:20. 00% CPU
- #[ run test_lot_dir_t2.cpp .//all_my_tests/<link>static ]
             ########### deadlock. killed after 0:26. 00% CPU
- #[ run test_lot_def_t2.cpp .//all_my_tests/<link>static ]
-
- ########### deadlock. killed after 0:40. 00% CPU
- #[ run test_lit_dir_t2.cpp .//all_my_tests/<link>static ]
+ #[ run stm : -bench lot_example -def -threads 2 -inserts 100 : : : test_lot_example_def_t2_i100 ]

             ########### fails with CHECK
             # /bin/sh: line 4: 4072 Aborted (core dumped) "bin/test_lit_def_t2.test/gcc-3.4.4/debug/threading-multi/test_lit_def_t2.exe" > "bin/test_lit_def_t2.test/gcc-3.4.4/debug/threading-multi/test_lit_def_t2.output" 2>&1
             ########### deadlock sometimes without CHECK. killed after 0:40. 00% CPU
- #[ run test_lit_def_t2.cpp .//all_my_tests/<link>static ]
+ [ run stm : -bench lit_example -def -threads 2 -inserts 100 : : : test_lit_example_def_t2_i100 ]

- ########### livelock. killed after 3:00. 50% CPU
- #[ run test_nested_tx_dir_t2.cpp .//all_my_tests/<link>static ]
             ########### livelock. killed after 3:50. 50% CPU
- #[ run test_nested_tx_def_t2.cpp .//all_my_tests/<link>static ]
+ #[ run stm : -bench nested_tx -def -threads 2 -inserts 100 : : : test_nested_tx_def_t2_i100 ]

- [ run test_rbtree_dir_t2_i1000.cpp .//all_my_tests/<link>static ]
- [ run test_rbtree_def_t2_i1000.cpp .//all_my_tests/<link>static ]
+ [ run stm : -bench rbtree -def -threads 4 -inserts 100 : : : test_rbtree_def_t4_i100 ]

- [ run test_smart_dir_t2.cpp .//all_my_tests/<link>static ]
- [ run test_smart_def_t2.cpp .//all_my_tests/<link>static ]
-
- ########### fails
- #/bin/sh: line 4: 408 Aborted (core dumped) "bin/test_using_linkedlist_dir_t2_i1000.test/gcc-3.4.4/debug/threading-multi/test_using_linkedlist_dir_t2_i1000.exe" > "bin/test_using_linkedlist_dir_t2_i1000.test/gcc-3.4.4/debug/threading-multi/test_using_linkedlist_dir_t2_i1000.output" 2>&1
- [ run test_using_linkedlist_dir_t2_i1000.cpp .//all_my_tests/<link>static ]
+ [ run stm : -bench smart -def -threads 4 -inserts 100 : : : test_smart_def_t4_i100 ]

             ########### fails
             # /bin/sh: line 4: 2376 Aborted (core dumped) "bin/test_using_linkedlist_def_t2_i1000.test/gcc-3.4.4/debug/threading-multi/test_using_linkedlist_def_t2_i1000.exe" > "bin/test_using_linkedlist_def_t2_i1000.test/gcc-3.4.4/debug/threading-multi/test_using_linkedlist_def_t2_i1000.output" 2>&1
- [ run test_using_linkedlist_def_t2_i1000.cpp .//all_my_tests/<link>static ]
-
-
- [ run test_hashmap_w_locks_dir_t2.cpp .//all_my_tests/<link>static ]
+ [ run stm : -bench using_linkedlist -def -threads 2 -inserts 100 : : : test_using_linkedlist_def_t2_i100 ]

             ########### fails
             # assertion "res==0" failed: file "../../../boost/synchro/pthread/mutex.hpp", line 40
- [ run test_hashmap_w_locks_def_t2.cpp .//all_my_tests/<link>static ]
+ [ run stm : -bench hashmap_w_locks -def -threads 2 -inserts 100 : : : test_hashmap_w_locks_def_t2_i100 ]

- [ run test_list_hash_w_locks_dir_t2.cpp .//all_my_tests/<link>static ]
             ########### fails
             # assertion "res==0" failed: file "../../../boost/synchro/pthread/mutex.hpp", line 40
- [ run test_list_hash_w_locks_def_t2.cpp .//all_my_tests/<link>static ]
+ [ run stm : -bench list_hash_w_locks -def -threads 2 -inserts 100 : : : test_list_hash_w_locks_def_t2_i100 ]
+ ;
+
+ alias dir_invalid
+ :
+ [ run stm : -bench accounts -dir -threads 4 -inserts 100 : : : test_accounts_dir_t4_i100 ]
+
+ [ run stm : -bench hashmap -dir -threads 4 -inserts 100 : : : test_hashmap_dir_t4_i100 ]
+
+ ########### livelock. killed after 3:00 25% CPU
+ [ run stm : -bench ht -dir -threads 2 -inserts 100 : : : test_ht_dir_t2_i100 ]
+
+ [ run stm : -bench isolated_int -dir -threads 4 -inserts 100 : : : test_isolated_int_dir_t2_i100 ]
+
+ [ run stm : -bench linkedlist -dir -threads 4 -inserts 100 : : : test_linkedlist_dir_t4_i100 ]
+
+ [ run stm : -bench ll -dir -threads 2 -inserts 100 : : : test_ll_dir_t2_i100 ]
+
+ ########### fails with CHECK
+ #/bin/sh: line 4: 3764 Aborted (core dumped) "bin/test_tx_linear_lock_dir_t2.test/gcc-3.4.4/debug/threading-multi/test_tx_linear_lock_dir_t2.exe" > "bin/test_tx_linear_lock_dir_t2.test/gcc-3.4.4/debug/threading-multi/test_tx_linear_lock_dir_t2.output" 2>&1
+ #assertion "res==0" failed: file "../../../boost/synchro/pthread/mutex.hpp", line 40
+ ########### deadlock. without CHECK
+ [ run stm : -bench tx_linear_lock -dir -threads 2 -inserts 100 : : : test_tx_linear_lock_dir_t2_i100 ]
+
+ [ run stm : -bench isolated_int_lock_in_tx -dir -threads 2 -inserts 100 : : : test_isolated_int_lock_in_tx_dir_t2_i100 ]
+
+ ########### deadlock. killed after 0:20. 00% CPU
+ #[ run stm : -bench isolated_composed_int_lock -dir -threads 2 -inserts 100 : : : test_isolated_composed_int_lock_dir_t2_i100 ]
+
+ ########### fails
+ # /bin/sh: line 4: 3172 Aborted (core dumped) "bin/test_isolated_composed_int_lock2_dir_t2.test/gcc-3.4.4/debug/threading-multi/test_isolated_composed_int_lock2_dir_t2.exe" > "bin/test_isolated_composed_int_lock2_dir_t2.test/gcc-3.4.4/debug/threading-multi/test_isolated_composed_int_lock2_dir_t2.output" 2>&1
+ #assertion "res==0" failed: file "../../../boost/synchro/pthread/mutex.hpp", line 40
+ # 11 [sig] test_isolated_composed_int_lock_def_t2 3660 _cygtls::handle_except ions: Error while dumping state (probably corrupted stack)
+ [ run stm : -bench isolated_composed_int_lock2 -dir -threads 2 -inserts 100 : : : test_isolated_composed_int_lock2_dir_t2_i100 ]
+
+ [ run stm : -bench irrevocable_int -dir -threads 4 -inserts 100 : : : test_irrevocable_int_dir_t4_i100 ]
+
+ ########### deadlock. killed after 0:20. 00% CPU
+ #[ run stm : -bench lot_example -dir -threads 2 -inserts 100 : : : test_lot_example_dir_t2_i100 ]
+
+ ########### deadlock. killed after 0:40. 00% CPU
+ #[ run stm : -bench lit_example -dir -threads 2 -inserts 100 : : : test_lit_example_dir_t2_i100 ]
+
+ ########### livelock. killed after 3:00. 50% CPU
+ #[ run stm : -bench nested_tx -dir -threads 2 -inserts 100 : : : test_nested_tx_dir_t2_i100 ]
+
+ [ run stm : -bench rbtree -dir -threads 4 -inserts 100 : : : test_rbtree_dir_t4_i100 ]
+
+ [ run stm : -bench smart -dir -threads 4 -inserts 100 : : : test_smart_dir_t4_i100 ]
+
+ ########### fails
+ #/bin/sh: line 4: 408 Aborted (core dumped) "bin/test_using_linkedlist_dir_t2_i1000.test/gcc-3.4.4/debug/threading-multi/test_using_linkedlist_dir_t2_i1000.exe" > "bin/test_using_linkedlist_dir_t2_i1000.test/gcc-3.4.4/debug/threading-multi/test_using_linkedlist_dir_t2_i1000.output" 2>&1
+ [ run stm : -bench using_linkedlist -dir -threads 2 -inserts 100 : : : test_using_linkedlist_dir_t2_i100 ]
+
+ [ run stm : -bench hashmap_w_locks -dir -threads 4 -inserts 100 : : : test_hashmap_w_locks_dir_t4_i100 ]
+
+ [ run stm : -bench list_hash_w_locks -dir -threads 4 -inserts 100 : : : test_list_hash_w_locks_dir_t4_i100 ]
     ;

- test-suite "examples"
+ alias examples
         :
             [ run ../example/bank.cpp ]

@@ -169,8 +188,10 @@
             [ run ../example/counter.cpp ]
             [ run ../example/numeric.cpp ]
             [ run ../example/counter_ptr.cpp ]
-
- ########### fails
- # /bin/sh: line 4: 2084 Segmentation fault (core dumped) "bin/non_tx_counter.test/gcc-3.4.4/debug/threading-multi/non_tx_counter.exe" > "bin/non_tx_counter.test/gcc-3.4.4/debug/threading-multi/non_tx_counter.output" 2>&1
             [ run ../example/non_tx_counter.cpp ]
     ;
+
+
+ alias all
+ : def_invalid dir_invalid examples
+ ;

Modified: sandbox/stm/branches/vbe/libs/stm/test/main.h
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/main.h (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/main.h 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
@@ -36,17 +36,13 @@
extern bool kDoLookup;
extern bool kDoMove;
extern bool kMoveSemantics;
+extern std::string bench;

extern int kMaxThreads;
extern int kMainThreadId;
extern int kMaxArrSize;
extern int kMaxArrIter;

-extern int kMaxIterations;
-extern std::string bench;
-extern std::string updateMethod;
-extern std::string latmType;
-
////////////////////////////////////////////////////////////////////////////
//
// global variables all of which are used in the main transaction iteration
@@ -68,6 +64,4 @@
void finishThread();
void logCommitsAndAborts(std::string const &typeOfRun);

-void set_default_environment();
-
#endif // MAIN_H

Modified: sandbox/stm/branches/vbe/libs/stm/test/stm.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/stm.cpp (original)
+++ sandbox/stm/branches/vbe/libs/stm/test/stm.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
@@ -74,7 +74,6 @@

int kMaxThreads = 2;
int kMainThreadId = kMaxThreads-1;
-std::string latmType;

//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
@@ -110,8 +109,8 @@
    {
       std::string first = argv[i];

- if (first == "-def") updateMethod="deferred";
- else if (first == "-dir") updateMethod="direct";
+ if (first == "-def") transaction::do_deferred_updating();
+ else if (first == "-dir") transaction::do_direct_updating();
       else if (first == "-lookup") kDoLookup = true;
       else if (first == "-remove") kDoRemoval = true;
       else if (first == "-inserts")
@@ -121,6 +120,7 @@
       else if (first == "-threads")
       {
          kMaxThreads = atoi(argv[++i]);
+ kMainThreadId = kMaxThreads-1;
       }
       else if (first == "-moveSemantics")
       {
@@ -138,7 +138,17 @@
       else if (first == "-latm")
       {
#if PERFORMING_LATM
- latmType = argv[++i];
+
+ std::string latmType = argv[++i];
+ if (latmType == "full") transaction::do_full_lock_protection();
+ else if (latmType == "tm") transaction::do_tm_lock_protection();
+ else if (latmType == "tx") transaction::do_tx_lock_protection();
+ else
+ {
+ cout << "invalid LATM protection type, exiting" << endl;
+ cout << first << latmType << endl;
+ exit(0);
+ }
#endif
       }
       else
@@ -147,26 +157,8 @@
          exit(0);
       }
    }
-
- kMainThreadId = kMaxThreads-1;
- if (updateMethod=="deferred") transaction::do_deferred_updating();
- else if (updateMethod== "direct") transaction::do_direct_updating();
-
-#if PERFORMING_LATM
- if (latmType == "full") transaction::do_full_lock_protection();
- else if (latmType == "tm") transaction::do_tm_lock_protection();
- else if (latmType == "tx") transaction::do_tx_lock_protection();
- else
- {
- cout << "invalid LATM protection type, " << latmType << ". Exiting" << endl;
- exit(0);
- }
-#endif
-
}

-//int test_bank();
-
//-----------------------------------------------------------------------------
// main
//-----------------------------------------------------------------------------
@@ -174,7 +166,6 @@
{
    transaction::enable_dynamic_priority_assignment();

- set_default_environment();
    setupEnvironment(argc, argv);

    for (int i = 0; i < kMaxIterations; ++i)

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_accounts_def_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_accounts_def_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "accounts";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_accounts_dir_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_accounts_dir_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "accounts";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_default.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_default.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "rbtree";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_hashmap_def_t2_i1000.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_hashmap_def_t2_i1000.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,57 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kInsertSameValues = false;
- kDoRemoval = false;
- kDoLookup = false;
- kDoMove = false;
- kMoveSemantics = false;
-
- bench = "hashmap";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_hashmap_dir_t2_i1000.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_hashmap_dir_t2_i1000.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,57 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kInsertSameValues = false;
- kDoRemoval = false;
- kDoLookup = false;
- kDoMove = false;
- kMoveSemantics = false;
-
- bench = "hashmap";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_hashmap_w_locks_def_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_hashmap_w_locks_def_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "hashmap_w_locks";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_hashmap_w_locks_dir_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_hashmap_w_locks_dir_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "hashmap_w_locks";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_ht_def_t2_i1000.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_ht_def_t2_i1000.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,57 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kInsertSameValues = false;
- kDoRemoval = false;
- kDoLookup = false;
- kDoMove = false;
- kMoveSemantics = false;
-
- bench = "ht";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_ht_dir_t2_i1000.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_ht_dir_t2_i1000.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,57 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kInsertSameValues = false;
- kDoRemoval = false;
- kDoLookup = false;
- kDoMove = false;
- kMoveSemantics = false;
-
- bench = "ht";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_irrevocable_int_def_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_irrevocable_int_def_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "irrevocable_int";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_irrevocable_int_dir_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_irrevocable_int_dir_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "irrevocable_int";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_isolated_composed_int_lock2_def_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_isolated_composed_int_lock2_def_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "isolated_composed_int_lock2";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_isolated_composed_int_lock2_dir_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_isolated_composed_int_lock2_dir_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "isolated_composed_int_lock2";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_isolated_composed_int_lock_def_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_isolated_composed_int_lock_def_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "isolated_composed_int_lock";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_isolated_composed_int_lock_dir_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_isolated_composed_int_lock_dir_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "isolated_composed_int_lock";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_isolated_int_def_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_isolated_int_def_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,57 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kInsertSameValues = false;
- kDoRemoval = false;
- kDoLookup = false;
- kDoMove = false;
- kMoveSemantics = false;
-
- bench = "isolated_int";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_isolated_int_dir_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_isolated_int_dir_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,57 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kInsertSameValues = false;
- kDoRemoval = false;
- kDoLookup = false;
- kDoMove = false;
- kMoveSemantics = false;
-
- bench = "isolated_int";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_isolated_int_lock_def_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_isolated_int_lock_def_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "isolated_int_lock";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_isolated_int_lock_dir_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_isolated_int_lock_dir_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "isolated_int_lock";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_linkedlist_def_t2_i1000.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_linkedlist_def_t2_i1000.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,57 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kInsertSameValues = false;
- kDoRemoval = false;
- kDoLookup = false;
- kDoMove = false;
- kMoveSemantics = false;
-
- bench = "linkedlist";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_linkedlist_dir_t2_i1000.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_linkedlist_dir_t2_i1000.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,58 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kInsertSameValues = false;
- kDoRemoval = false;
- kDoLookup = false;
- kDoMove = false;
- kMoveSemantics = false;
-
- bench = "linkedlist";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_linkedlist_w_locks_def_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_linkedlist_w_locks_def_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "linkedlist_w_locks";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_linkedlist_w_locks_dir_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_linkedlist_w_locks_dir_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "linkedlist_w_locks";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_list_hash_w_locks_def_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_list_hash_w_locks_def_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "list_hash_w_locks";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_list_hash_w_locks_dir_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_list_hash_w_locks_dir_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "list_hash_w_locks";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_lit_def_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_lit_def_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "lit_example";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_lit_dir_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_lit_dir_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "lit_example";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_ll_def_t2_i1000.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_ll_def_t2_i1000.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,57 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kInsertSameValues = false;
- kDoRemoval = false;
- kDoLookup = false;
- kDoMove = false;
- kMoveSemantics = false;
-
- bench = "ll";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_ll_dir_t2_i1000.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_ll_dir_t2_i1000.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,57 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kInsertSameValues = false;
- kDoRemoval = false;
- kDoLookup = false;
- kDoMove = false;
- kMoveSemantics = false;
-
- bench = "ll";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_lot_def_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_lot_def_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "lot_example";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_lot_dir_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_lot_dir_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "lot_example";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_nested_tx_def_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_nested_tx_def_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,57 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kInsertSameValues = false;
- kDoRemoval = false;
- kDoLookup = false;
- kDoMove = false;
- kMoveSemantics = false;
-
- bench = "nested_tx";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_nested_tx_dir_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_nested_tx_dir_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,57 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kInsertSameValues = false;
- kDoRemoval = false;
- kDoLookup = false;
- kDoMove = false;
- kMoveSemantics = false;
-
- bench = "nested_tx";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_pointer_def_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_pointer_def_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "pointer";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_pointer_dir_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_pointer_dir_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "pointer";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_rbtree_def_t2_i1000.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_rbtree_def_t2_i1000.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "rbtree";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_rbtree_dir_t2_i1000.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_rbtree_dir_t2_i1000.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "rbtree";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_smart_def_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_smart_def_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "smart";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_smart_dir_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_smart_dir_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "smart";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_tx_linear_lock_def_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_tx_linear_lock_def_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "tx_linear_lock";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_tx_linear_lock_dir_t2.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_tx_linear_lock_dir_t2.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kDoRemoval = false;
- kDoLookup = false;
- kMoveSemantics = false;
-
- bench = "tx_linear_lock";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_using_linkedlist_def_t2_i1000.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_using_linkedlist_def_t2_i1000.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,57 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kInsertSameValues = false;
- kDoRemoval = false;
- kDoLookup = false;
- kDoMove = false;
- kMoveSemantics = false;
-
- bench = "using_linkedlist";
- updateMethod = "deferred";
- kMaxThreads = 2;
- latmType="full";
-}
-

Deleted: sandbox/stm/branches/vbe/libs/stm/test/test_using_linkedlist_dir_t2_i1000.cpp
==============================================================================
--- sandbox/stm/branches/vbe/libs/stm/test/test_using_linkedlist_dir_t2_i1000.cpp 2009-10-21 15:07:20 EDT (Wed, 21 Oct 2009)
+++ (empty file)
@@ -1,57 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-//
-// (C) Copyright Justin E. Gottchlich 2009.
-// (C) Copyright Vicente J. Botet Escriba 2009.
-// Distributed under the Boost
-// Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or
-// copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/stm for documentation.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "main.h"
-
-/*
- cout << "DracoSTM usage:" << endl << endl;
- cout << " -bench <name> - 'rbtree', 'linkedlist', 'hashmap' (or 'hashtable')" << endl;
- cout << " 'irrevocable_int'" << endl;
- cout << " 'isolated_int'" << endl;
- cout << " 'isolated_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock'" << endl;
- cout << " 'isolated_composed_int_lock2'" << endl;
- cout << " 'linkedlist_w_locks' (uses transactions and locks)" << endl;
- cout << " 'hashmap_w_locks' (uses transactions and locks)" << endl;
- cout << " 'list_hash_w_locks' (uses transactions and locks)" << endl;
- cout << " 'tx_linear_lock' (uses transactions and multiple linearly ordered locks)" << endl;
- cout << " 'lot_example' (for paper)" << endl;
- cout << " -def - do deferred updating transactions" << endl;
- cout << " -dir - do direct updating transactions" << endl;
- cout << " -latm <name> - 'full', 'tm', 'tx'" << endl;
- cout << " -h - shows this help (usage) output" << endl;
- cout << " -inserts <#> - sets the # of inserts per container per thread" << endl;
- cout << " -threads <#> - sets the # of threads" << endl;
- cout << " -lookup - performs individual lookup after inserts" << endl;
- cout << " -remove - performs individual remove after inserts/lookup" << endl;
-*/
-////////////////////////////////////////////////////////////////////////////
-
-void set_default_environment() {
-
- kMaxArrSize = 10;
- kMaxArrIter = 10;
- kMaxIterations = 1;
- kMaxInserts = 100;
- kInsertSameValues = false;
- kDoRemoval = false;
- kDoLookup = false;
- kDoMove = false;
- kMoveSemantics = false;
-
- bench = "using_linkedlist";
- updateMethod = "direct";
- kMaxThreads = 2;
- latmType="full";
-}
-

Next message: hartmut.kaiser_at_[hidden]: "[Boost-commit] svn:boost r57051 - in trunk/libs/spirit/test: karma qi"
Previous message: troy_at_[hidden]: "[Boost-commit] svn:boost r57049 - branches/release/boost/detail"

Date view	Thread view	Subject view	Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk