[rhmessaging-commits] rhmessaging commits: r1496 - store/trunk/cpp/lib.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Fri Dec 14 16:09:53 EST 2007
Author: kpvdr
Date: 2007-12-14 16:09:53 -0500 (Fri, 14 Dec 2007)
New Revision: 1496
Modified:
store/trunk/cpp/lib/BdbMessageStore.cpp
Log:
Forgot to remove a block of commented out code from the last change
Modified: store/trunk/cpp/lib/BdbMessageStore.cpp
===================================================================
--- store/trunk/cpp/lib/BdbMessageStore.cpp 2007-12-14 19:41:15 UTC (rev 1495)
+++ store/trunk/cpp/lib/BdbMessageStore.cpp 2007-12-14 21:09:53 UTC (rev 1496)
@@ -1010,64 +1010,9 @@
jc->enqueue_txn_data_record(buff, size, size, dtokp.get(), txn->getXid(), false);
}
}
-
-// bool written = false;
-// unsigned aio_sleep_cnt = 0;
-// unsigned busy_sleep_cnt = 0;
-// while (!written)
-// {
-// JournalImpl* jc = static_cast<JournalImpl*>(queue->getExternalQueueStore());
-// rhm::journal::iores eres;
-// if (txn->getXid().empty()){
-// if (message->isContentReleased()){
-// eres = jc->enqueue_extern_data_record(size, dtokp.get(), false);
-// }else {
-// eres = jc->enqueue_data_record(buff, size, size, dtokp.get(), false);
-// }
-// }else {
-// if (message->isContentReleased()){
-// eres = jc->enqueue_extern_txn_data_record(size, dtokp.get(), txn->getXid(), false);
-// } else {
-// eres = jc->enqueue_txn_data_record(buff, size, size, dtokp.get(), txn->getXid(), false);
-// }
-// }
-// switch (eres)
-// {
-// case rhm::journal::RHM_IORES_SUCCESS:
-// //std::cout << "." << std::flush;
-// if (dtokp.get()->wstate() >= DataTokenImpl::ENQ_SUBM)
-// written = true;
-// aio_sleep_cnt = 0;
-// busy_sleep_cnt = 0;
-// break;
-// case rhm::journal::RHM_IORES_AIO_WAIT:
-// //std::cout << "w" << std::flush;
-// if (++aio_sleep_cnt > MAX_AIO_SLEEPS)
-// THROW_STORE_EXCEPTION("Timeout waiting for AIO: RHM_IORES_AIO_WAIT");
-// usleep(AIO_SLEEP_TIME); // TODO move sleep to wait for IO in get events
-// jc->get_wr_events();
-// break;
-// case rhm::journal::RHM_IORES_BUSY:
-// //std::cout << "b" << std::flush;
-// if (++busy_sleep_cnt > MAX_AIO_SLEEPS)
-// THROW_STORE_EXCEPTION("Timeout waiting for mutex: RHM_IORES_BUSY");
-// usleep(AIO_SLEEP_TIME); // TODO add sleep time to get events call as option
-// break;
-// case rhm::journal::RHM_IORES_ENQCAPTHRESH:
-// std::cerr << "Enqueue: Error storing record -- Enqueue capacity threshold exceeded on queue \"" << queue->getName() << "\"." << std::endl << std::flush;
-// THROW_STORE_FULL_EXCEPTION("Enqueue: Error storing record -- Enqueue capacity threshold exceeded on queue \"" + queue->getName() + "\".");
-// case rhm::journal::RHM_IORES_FULL:
-// std::cerr << "Enqueue: Error storing record -- Journal full on queue \"" << queue->getName() << "\"." << std::endl << std::flush;
-// THROW_STORE_FULL_EXCEPTION("Enqueue: Error storing record -- Journal full on queue \"" + queue->getName() + "\".");
-// break;
-// default:
-// assert("Store Error: Unexpected msg state");
-// }
-// }
-
} else {
/// cct message db
- if (newId){ // only store in Bd if first time message is stored
+ if (newId) { // only store in Bd if first time message is stored
Dbt data(buff,size);
messageDb.put(txn->get(), &messageId, &data, DB_NOOVERWRITE);
}
@@ -1163,51 +1108,6 @@
} catch (const journal::jexception& e) {
THROW_STORE_EXCEPTION(std::string("Queue ") + queue.getName() + ": async_dequeue() failed: " + e.what());
}
-
-// bool written = false;
-// unsigned aio_sleep_cnt = 0;
-// unsigned busy_sleep_cnt = 0;
-// while (!written)
-// {
-// rhm::journal::iores dres;
-// try {
-// if (tid.empty()){
-// dres = jc->dequeue_data_record(ddtokp.get());
-// } else {
-// dres = jc->dequeue_txn_data_record(ddtokp.get(), tid);
-// }
-// } catch (const journal::jexception& e) {
-// THROW_STORE_EXCEPTION(std::string("Queue ") + queue.getName() + ": async_dequeue() failed: " + e.what());
-// }
-// switch (dres)
-// {
-// case rhm::journal::RHM_IORES_SUCCESS:
-// //std::cout << "." << std::flush;
-// aio_sleep_cnt = 0;
-// busy_sleep_cnt = 0;
-// written = true;
-// break;
-// case rhm::journal::RHM_IORES_AIO_WAIT:
-// //std::cout << "w" << std::flush;
-// if (++aio_sleep_cnt > MAX_AIO_SLEEPS)
-// THROW_STORE_EXCEPTION("Timeout waiting for AIO: RHM_IORES_AIO_WAIT");
-// usleep(AIO_SLEEP_TIME); // TODO add sleep time to get events call as option
-// jc->get_wr_events();
-// break;
-// case rhm::journal::RHM_IORES_BUSY:
-// //std::cout << "b" << std::flush;
-// if (++busy_sleep_cnt > MAX_AIO_SLEEPS)
-// THROW_STORE_EXCEPTION("Timeout waiting for mutex: RHM_IORES_BUSY");
-// usleep(AIO_SLEEP_TIME); // TODO add sleep time to get events call as option
-// break;
-// case rhm::journal::RHM_IORES_FULL:
-// std::cerr << "Dequeue: Error storing record -- Journal full on queue \"" << queue.getName() << "\"." << std::endl << std::flush;
-// THROW_STORE_FULL_EXCEPTION("Dequeue: Error storing record -- Journal full on queue \"" + queue.getName() + "\".");
-// break;
-// default:
-// assert("Store Error: Unexpected msg state");
-// }
-// }
}
bool BdbMessageStore::dequeue(DbTxn* txn, Dbt& messageId, Dbt& queueId)
More information about the rhmessaging-commits
mailing list