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

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2008-02-07 14:49:50 -0500 (Thu, 07 Feb 2008)
New Revision: 1659

Modified:
   store/trunk/cpp/tests/jrnl/jtest.cpp
   store/trunk/cpp/tests/jrnl/jtest.hpp
   store/trunk/cpp/tests/jrnl/msg_consumer.cpp
   store/trunk/cpp/tests/jrnl/msg_consumer.hpp
Log:
Minor updates for soon-to-be-removed manual tests, not part of current testing strategy.

Modified: store/trunk/cpp/tests/jrnl/jtest.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtest.cpp	2008-02-07 18:41:03 UTC (rev 1658)
+++ store/trunk/cpp/tests/jrnl/jtest.cpp	2008-02-07 19:49:50 UTC (rev 1659)
@@ -149,7 +149,7 @@
 #ifndef RHM_WRONLY
     _mc.initialize(c_args);
 #endif
-    _jc.initialize(&mp_aio_cb);
+    _jc.initialize(&mc_aio_cb, &mp_aio_cb);
 
     for (u_int32_t i=0; i<p_args->_num_msgs; i++)
     {
@@ -282,7 +282,14 @@
         JFSIZE_SBLKS);
 
 // static method
+
 void
+jtest::mc_aio_cb(rhm::journal::jcntl* jc, std::vector<u_int16_t>& pil)
+{
+    jtest::_mc.aio_callback(jc, pil);
+}
+
+void
 jtest::mp_aio_cb(rhm::journal::jcntl* jc, std::vector<rhm::journal::data_tok*>& dtokl)
 {
     jtest::_mp.aio_callback(jc, dtokl);

Modified: store/trunk/cpp/tests/jrnl/jtest.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/jtest.hpp	2008-02-07 18:41:03 UTC (rev 1658)
+++ store/trunk/cpp/tests/jrnl/jtest.hpp	2008-02-07 19:49:50 UTC (rev 1659)
@@ -106,6 +106,7 @@
 
     // AIO callback functions
     static void mp_aio_cb(rhm::journal::jcntl* jc, std::vector<rhm::journal::data_tok*>& dtokl);
+    static void mc_aio_cb(rhm::journal::jcntl* jc, std::vector<u_int16_t>& pil);
 };
 
 #endif

Modified: store/trunk/cpp/tests/jrnl/msg_consumer.cpp
===================================================================
--- store/trunk/cpp/tests/jrnl/msg_consumer.cpp	2008-02-07 18:41:03 UTC (rev 1658)
+++ store/trunk/cpp/tests/jrnl/msg_consumer.cpp	2008-02-07 19:49:50 UTC (rev 1659)
@@ -221,10 +221,8 @@
 }
 
 void
-msg_consumer::aio_callback(rhm::journal::jcntl* /*jc*/, u_int32_t num_dtoks)
-{
-    std::cout << "msg_consumer::aio_cb(" << num_dtoks << ")" << std::endl;
-}
+msg_consumer::aio_callback(rhm::journal::jcntl* /*jc*/, std::vector<u_int16_t>& /*pil*/)
+{}
 
 void
 msg_consumer::interrupt()

Modified: store/trunk/cpp/tests/jrnl/msg_consumer.hpp
===================================================================
--- store/trunk/cpp/tests/jrnl/msg_consumer.hpp	2008-02-07 18:41:03 UTC (rev 1658)
+++ store/trunk/cpp/tests/jrnl/msg_consumer.hpp	2008-02-07 19:49:50 UTC (rev 1659)
@@ -86,7 +86,7 @@
             const size_t max_xid_size, const bool transient_expected, const bool external_expected)
             throw (rhm::journal::jexception);
     u_int32_t consume(_c_args* args) throw (rhm::journal::jexception);
-    void aio_callback(rhm::journal::jcntl* jc, u_int32_t num_dtoks);
+    void aio_callback(rhm::journal::jcntl* jc, std::vector<u_int16_t>& pil);
 
     const inline u_int64_t  get_tot_dblks() const { return _tot_dblks; }
     const inline u_int64_t  get_tot_dsize() const { return _tot_dsize; }