[rhmessaging-commits] rhmessaging commits: r4409 - in store/trunk/cpp: lib/jrnl and 1 other directory.
Author: kpvdr
Date: 2010-11-01 15:28:39 -0400 (Mon, 01 Nov 2010)
New Revision: 4409
Modified:
store/trunk/cpp/Makefile.am
store/trunk/cpp/configure.ac
store/trunk/cpp/lib/jrnl/data_tok.cpp
Log:
Add perf dir (from last checkin) to configure.ac and Makefile.am. Also a bugfix in the
data token class data_tok's status_str() method printing the wrong information.
Modified: store/trunk/cpp/Makefile.am
===================================================================
--- store/trunk/cpp/Makefile.am 2010-11-01 19:23:53 UTC (rev 4408)
+++ store/trunk/cpp/Makefile.am 2010-11-01 19:28:39 UTC (rev 4409)
@@ -28,7 +28,7 @@
sysconf_DATA = etc/rhmd.conf
-SUBDIRS = lib tests tools docs
+SUBDIRS = lib tests tools perf docs
# Update libtool, if needed.
libtool: $(LIBTOOL_DEPS)
Modified: store/trunk/cpp/configure.ac
===================================================================
--- store/trunk/cpp/configure.ac 2010-11-01 19:23:53 UTC (rev 4408)
+++ store/trunk/cpp/configure.ac 2010-11-01 19:28:39 UTC (rev 4409)
@@ -221,6 +221,7 @@
tests/cluster/Makefile
tests/jrnl/Makefile
tests/jrnl/jtt/Makefile
+ perf/Makefile
tools/Makefile
lib/Makefile
docs/Makefile
Modified: store/trunk/cpp/lib/jrnl/data_tok.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/data_tok.cpp 2010-11-01 19:23:53 UTC (rev 4408)
+++ store/trunk/cpp/lib/jrnl/data_tok.cpp 2010-11-01 19:28:39 UTC (rev 4409)
@@ -175,7 +175,7 @@
{
std::ostringstream oss;
oss << std::hex << std::setfill('0');
- oss << "dtok id=0x" << _cnt << "; ws=" <<
wstate_str() << "; rs=" << rstate_str();
+ oss << "dtok id=0x" << _icnt << "; ws="
<< wstate_str() << "; rs=" << rstate_str();
oss << "; fid=0x" << _fid << "; rid=0x"
<< _rid << "; xid=";
for (unsigned i=0; i<_xid.size(); i++)
{