[Boost-commit] svn:boost r58835 - in sandbox/stm/branches/vbe/libs/stm: example example/tx test

Subject: [Boost-commit] svn:boost r58835 - in sandbox/stm/branches/vbe/libs/stm: example example/tx test
From: vicente.botet_at_[hidden]
Date: 2010-01-09 08:50:56

Author: viboes
Date: 2010-01-09 08:50:55 EST (Sat, 09 Jan 2010)
New Revision: 58835
URL: http://svn.boost.org/trac/boost/changeset/58835

Log:
TBoost.STM vbe: Manage with Shallow copy
* add compile fail deep_singleton example
* add singleton example
* added bank using tx:: family classes
Added:
   sandbox/stm/branches/vbe/libs/stm/example/deep_singleton.cpp   (contents, props changed)
   sandbox/stm/branches/vbe/libs/stm/example/singleton.cpp   (contents, props changed)
   sandbox/stm/branches/vbe/libs/stm/example/tx/bank.cpp   (contents, props changed)
Text files modified: 
   sandbox/stm/branches/vbe/libs/stm/test/Jamfile.v2 |     8 +++++---                                
   1 files changed, 5 insertions(+), 3 deletions(-)

Added: sandbox/stm/branches/vbe/libs/stm/example/deep_singleton.cpp
==============================================================================
--- (empty file)
+++ sandbox/stm/branches/vbe/libs/stm/example/deep_singleton.cpp	2010-01-09 08:50:55 EST (Sat, 09 Jan 2010)
@@ -0,0 +1,66 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+// (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 <boost/stm.hpp>
+//#include <boost/foreach.hpp>
+//#include <boost/thread.hpp>
+//#include <boost/shared_ptr.hpp>
+//#include <vector>
+//#include <list>
+//#include <stdlib.h>
+
+//#define foreach BOOST_FOREACH
+
+using namespace std;
+using namespace boost;
+using namespace boost::stm;
+
+  class Singleton 
+      : public deep_transaction_object<Singleton> 
+  {
+    Singleton():f(0) {}
+    Singleton(Singleton const&); // =deleted
+    Singleton& operator=(
+	Singleton const&); // =deleted
+  public:
+    static  Singleton* instance() {
+        static  Singleton instance_;
+    
+        return &instance_;
+    }
+    int f;
+  };
+
+  
+bool test() {
+    BOOST_STM_ATOMIC(_) {
+        _.write_ptr(Singleton::instance());
+        Singleton::instance()->f=1;
+    } BOOST_STM_END_ATOMIC
+    BOOST_STM_ATOMIC(_) {
+        BOOST_STM_TX_RETURN(_, Singleton::instance()->f==1) ;
+    } BOOST_STM_END_ATOMIC
+    return false;    
+}  
+
+int main() {
+    transaction::enable_dynamic_priority_assignment();
+    transaction::do_deferred_updating();
+    transaction::initialize();
+    thread_initializer thi;
+
+    int res=0;
+    res+=test();
+    return res;
+
+}

Added: sandbox/stm/branches/vbe/libs/stm/example/singleton.cpp
==============================================================================
--- (empty file)
+++ sandbox/stm/branches/vbe/libs/stm/example/singleton.cpp	2010-01-09 08:50:55 EST (Sat, 09 Jan 2010)
@@ -0,0 +1,86 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+// (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 <boost/stm.hpp>
+//#include <boost/foreach.hpp>
+//#include <boost/thread.hpp>
+//#include <boost/shared_ptr.hpp>
+//#include <vector>
+//#include <list>
+//#include <stdlib.h>
+
+//#define foreach BOOST_FOREACH
+
+using namespace std;
+using namespace boost;
+using namespace boost::stm;
+
+class Singleton;
+namespace boost { namespace stm {
+    // shallow trait
+    template <>
+    struct has_shallow_copy_semantics<Singleton> : boost::mpl::true_
+    {};  
+}}
+
+class Singleton 
+    : public transaction_object<Singleton> 
+{
+    Singleton():f(0) {}
+    Singleton(Singleton const&); // =deleted
+    Singleton& operator=(
+    Singleton const&); // =deleted
+public:
+    // shallow copy 
+    Singleton(Singleton const& rhs, stm::shallow_t) 
+    : f(rhs.f)
+    {}
+    // shallow assignment
+    Singleton& shallow_assign(Singleton const& rhs)
+    {
+        if (this!=&rhs) {
+            f=rhs.f;
+        }
+        return *this;
+    }
+    static  Singleton* instance() {
+        static  Singleton instance_;
+    
+        return &instance_;
+    }
+    int f;
+};
+
+  
+bool test() {
+    BOOST_STM_ATOMIC(_) {
+        _.write_ptr(Singleton::instance());
+        Singleton::instance()->f=1;
+    } BOOST_STM_END_ATOMIC
+    BOOST_STM_ATOMIC(_) {
+        BOOST_STM_TX_RETURN(_, Singleton::instance()->f==1) ;
+    } BOOST_STM_END_ATOMIC
+    return false;    
+}  
+
+int main() {
+    transaction::enable_dynamic_priority_assignment();
+    transaction::do_deferred_updating();
+    transaction::initialize();
+    thread_initializer thi;
+
+    int res=0;
+    res+=test();
+    return res;
+
+}

Added: sandbox/stm/branches/vbe/libs/stm/example/tx/bank.cpp
==============================================================================
--- (empty file)
+++ sandbox/stm/branches/vbe/libs/stm/example/tx/bank.cpp	2010-01-09 08:50:55 EST (Sat, 09 Jan 2010)
@@ -0,0 +1,197 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+// (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 <boost/stm.hpp>
+#include <boost/foreach.hpp>
+#include <boost/thread.hpp>
+#include <boost/shared_ptr.hpp>
+#include <vector>
+#include <list>
+#include <stdlib.h>
+
+#define foreach BOOST_FOREACH
+
+using namespace std;
+using namespace boost;
+using namespace boost::stm;
+
+class BankAccount
+{
+protected:
+    int nb_;
+    tx::int_t balance_;
+public:
+    BankAccount(int nb) : nb_(nb), balance_(0) {
+        bind(&balance_);
+    }
+
+    void Deposit(int amount) {
+        BOOST_STM_ATOMIC(_) {
+            balance_ += amount;
+        } BOOST_STM_END_ATOMIC
+    }
+    int Withdraw(int amount) {
+        BOOST_STM_ATOMIC(_) {
+            balance_ -= amount;
+        } BOOST_STM_END_ATOMIC
+        return amount;
+    }
+    int Balance() const {
+        BOOST_STM_ATOMIC(_) {
+            BOOST_STM_TX_RETURN(_, balance_);
+        } BOOST_STM_END_ATOMIC
+    }
+    int Nb() const {
+        return nb_;
+    }
+    std::list<base_transaction_object*>& binds() {return binds_;}
+    std::list<base_transaction_object*> binds_;
+
+    void bind(base_transaction_object* bto) {binds_.push_back(bto);}
+};
+
+typedef BankAccount account;
+
+struct Bank {
+    std::vector<tx::pointer<BankAccount> > accounts;
+    int overall_balance() const{
+        int tmp=0;
+        foreach(tx::pointer<BankAccount> const &a, this->accounts) {
+            tmp+=a->Balance();
+        }
+        return tmp;
+    }
+    void  print_balance() const{
+        foreach(tx::pointer<BankAccount> const &a, this->accounts){
+            cerr << a->Nb()  << "=" << a->Balance() << endl;
+        }
+    }
+};
+
+struct Teller {
+    Teller(tx::pointer<const Bank> b)
+        : bank_(b){}
+    ~Teller() {}
+    void operator()(){  //thread start
+        thread_initializer thi;
+        for(int i=10; i>0;--i)
+        {
+            BOOST_STM_ATOMIC(_) {
+                int amount=random() % 1000;
+                int acc1=random() % bank_->accounts.size();
+                int acc2=random() % bank_->accounts.size();
+                bank_->accounts[acc1]->Withdraw(amount);
+                bank_->accounts[acc2]->Deposit(amount+1);
+            } BOOST_STM_END_ATOMIC
+            catch(...) {
+                cerr << "aborted"<< endl;
+            }
+        }
+    }
+    tx::pointer<const Bank> bank_;
+    static bool volatile exit;
+};
+
+bool volatile Teller::exit=false;
+
+
+void create_db(tx::pointer<Bank> b, int nr_of_accounts){
+    for(int c=0;c<nr_of_accounts;++c) {
+        BOOST_STM_ATOMIC(_) {
+            tx::pointer<BankAccount> acc(BOOST_STM_TX_NEW_PTR(_, BankAccount(c)));
+            b->accounts.push_back(acc);
+        } BOOST_STM_END_ATOMIC
+    }
+}
+
+tx::pointer<BankAccount> a;
+void account_withdraw_thr() {
+    thread_initializer thi;
+    BOOST_STM_ATOMIC(_) {
+        a->Withdraw(10);
+    } BOOST_STM_END_ATOMIC
+}
+
+void account_deposit_thr() {
+    thread_initializer thi;
+    BOOST_STM_ATOMIC(_) {
+        a->Deposit(10);
+    } BOOST_STM_END_ATOMIC
+}
+
+int test_account() {
+    
+    BOOST_STM_ATOMIC(_) {
+        a=BOOST_STM_TX_NEW_PTR(_, BankAccount(1));
+    } BOOST_STM_END_ATOMIC
+    thread  th1(account_withdraw_thr);
+    thread  th2(account_deposit_thr);
+    thread  th3(account_withdraw_thr);
+    thread  th4(account_deposit_thr);
+
+    th1.join();
+    th2.join();
+    th3.join();
+    th4.join();
+    BOOST_STM_ATOMIC(_) {
+        int res = (a->Balance()==0?0:1);
+        BOOST_STM_TX_DELETE_PTR(_, a.value());
+        BOOST_STM_TX_RETURN(_,res);
+    } BOOST_STM_END_ATOMIC
+}
+
+bool test_bank() {
+    string wait;
+
+    //int nr_of_threads=10;
+    int nr_of_accounts=200;
+
+    //cin >> wait;Teller::exit=true;
+    tx::object<Bank> mybank;
+    create_db(address_of(mybank),nr_of_accounts);
+    //cin >> wait;Teller::exit=true;
+
+#if 0
+    Teller t(mybank);
+    t();
+#else
+    Teller t1(address_of(mybank));
+    thread  th1(boost::ref(t1));
+    Teller t2(address_of(mybank));
+    thread  th2(boost::ref(t2));
+
+    cin >> wait;Teller::exit=true;
+    th1.join();
+    th2.join();
+    BOOST_STM_ATOMIC(_) {
+        address_of(mybank)->print_balance();
+    } BOOST_STM_END_ATOMIC
+#endif
+
+    return true;
+}
+
+int main() {
+    transaction::enable_dynamic_priority_assignment();
+    transaction::do_deferred_updating();
+    transaction::initialize();
+    thread_initializer thi;
+    srand(time(0));
+
+    int res=0;
+    res+=test_account();
+    res+=test_bank();
+
+    return res;
+
+}

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	2010-01-09 08:50:55 EST (Sat, 09 Jan 2010)
@@ -189,12 +189,12 @@
     alias examples
         :
             [ run ../example/bank.cpp ]
+            [ run ../example/tx/bank.cpp : : : : tx_bank ]
 
             ########### fails
             # /bin/sh: line 4:  2656 Segmentation fault      (core dumped) "bin/list.test/gcc-3.4.4/debug/threading-multi/list.exe" > "bin/list.test/gcc-3.4.4/debug/threading-multi/list.output" 2>&1
             #[ link ../example/list.cpp ]
-
-            [ run ../example/counter.cpp ]
+            #[ run ../example/counter.cpp ]
             # fails sometimes
             # assertion "res==0" failed: file "../../../boost/synchro/pthread/mutex.hpp", line 52
             [ run ../example/tx/numeric.cpp ]
@@ -204,7 +204,9 @@
             [ run ../example/counter_ptr.cpp ]
             # fails sometimes
             # assertion "res==0" failed: file "../../../boost/synchro/pthread/mutex.hpp", line 52
-            [ run ../example/non_tx_counter.cpp ]
+            #[ run ../example/non_tx_counter.cpp ]
+            [ compile-fail ../example/deep_singleton.cpp ]
+            [ run ../example/singleton.cpp ]
     ;
 
     alias def