[rhmessaging-commits] rhmessaging commits: r1587 - store/trunk/cpp/tests/jrnl/jtt.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2008-01-20 23:07:42 -0500 (Sun, 20 Jan 2008)
New Revision: 1587

Modified:
   store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp
   store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp
Log:
Bugfix for jtt test program

Modified: store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp	2008-01-20 21:47:07 UTC (rev 1586)
+++ store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp	2008-01-21 04:07:42 UTC (rev 1587)
@@ -40,33 +40,38 @@
         const std::string& base_filename, const u_int16_t num_jfiles, const u_int32_t jfsize_sblks):
         rhm::journal::jcntl(jid, jdir, base_filename, num_jfiles, jfsize_sblks),
         _jpp(new jrnl_init_params(jid, jdir, base_filename, num_jfiles, jfsize_sblks)),
-        _dtok_master_list(),
+        _dtok_master_enq_list(),
+        _dtok_master_txn_list(),
         _dtok_deq_list(),
         _tcp(),
         _tcrp(),
         _recover_mode(false),
         _keep_jrnls(false)
-{}
+{
+    pthread_mutex_init(&_ddl_mutex, 0);
+}
         
 jrnl_instance::jrnl_instance(const jrnl_init_params::shared_ptr& p):
         rhm::journal::jcntl(p->jid(), p->jdir(), p->base_filename(), p->num_jfiles(),
             p->jfsize_sblks()),
         _jpp(p),
-        _dtok_master_list(),
+        _dtok_master_enq_list(),
+        _dtok_master_txn_list(),
         _dtok_deq_list(),
         _tcp(),
         _tcrp(),
         _recover_mode(false),
         _keep_jrnls(false)
 {
-    pthread_mutex_init(&_dm, 0);
+    pthread_mutex_init(&_ddl_mutex, 0);
 }
 
 jrnl_instance::~jrnl_instance()
 {
-    pthread_mutex_destroy(&_dm);
+    pthread_mutex_destroy(&_ddl_mutex);
 }
 
+
 void
 jrnl_instance::init_tc(test_case::shared_ptr& tcp, const bool recover_mode, const bool keep_jrnls)
         throw ()
@@ -145,7 +150,7 @@
         while(_tcrp->num_enq() < _tcp->num_msgs() && !_tcrp->exception())
         {
             dtok_ptr p(new rhm::journal::data_tok);
-            _dtok_master_list.push_back(p);
+            _dtok_master_enq_list.push_back(p);
             const char* msgp = data_src::get_data(_tcrp->num_enq() % 10);
             const size_t msg_size = _tcp->this_data_size();
             const size_t xid_size = _tcp->this_xid_size();
@@ -228,7 +233,7 @@
                 {
                     journal::data_tok* dtokp;
                     {
-                        rhm::journal::slock sl(&_dm);
+                        rhm::journal::slock sl(&_ddl_mutex);
                         dtokp = _dtok_deq_list.front();
                         _dtok_deq_list.pop_front();
                     }
@@ -299,7 +304,7 @@
 jrnl_instance::prep_txn_dtok(const rhm::journal::data_tok* dtokp)
 {
     dtok_ptr p(new rhm::journal::data_tok);
-    _dtok_master_list.push_back(p);
+    _dtok_master_txn_list.push_back(p);
     p->set_xid(dtokp->xid());
     return p.get();
 }

Modified: store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp	2008-01-20 21:47:07 UTC (rev 1586)
+++ store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp	2008-01-21 04:07:42 UTC (rev 1587)
@@ -47,9 +47,10 @@
 
     private:
         jrnl_init_params::shared_ptr _jpp;
-        std::vector<dtok_ptr> _dtok_master_list;
+        std::vector<dtok_ptr> _dtok_master_enq_list;
+        std::vector<dtok_ptr> _dtok_master_txn_list;
         std::deque<journal::data_tok*> _dtok_deq_list;
-        pthread_mutex_t _dm;  ///< Dequeue vector mutex
+        pthread_mutex_t _ddl_mutex;  ///< Mutex for _dtok_deq_list
         pthread_t _enq_thread;
         pthread_t _deq_thread;
         pthread_t _read_thread;
@@ -76,7 +77,7 @@
 
     private:
         inline void push_dtokp(rhm::journal::data_tok* dtokp)
-                { rhm::journal::slock sl(&_dm); _dtok_deq_list.push_back(dtokp); }
+                { rhm::journal::slock sl(&_ddl_mutex); _dtok_deq_list.push_back(dtokp); }
         static inline void push_dtokp(jcntl* jp, rhm::journal::data_tok* dtokp)
                 { static_cast<jrnl_instance*>(jp)->push_dtokp(dtokp); }