[rhmessaging-commits] rhmessaging commits: r1885 - in store/trunk/cpp: tests/jrnl and 1 other directories.

Author: kpvdr Date: 2008-04-09 11:12:56 -0400 (Wed, 09 Apr 2008) New Revision: 1885 Modified: store/trunk/cpp/lib/jrnl/cvar.cpp store/trunk/cpp/lib/jrnl/cvar.hpp store/trunk/cpp/lib/jrnl/data_tok.cpp store/trunk/cpp/lib/jrnl/deq_hdr.hpp store/trunk/cpp/lib/jrnl/deq_rec.cpp store/trunk/cpp/lib/jrnl/deq_rec.hpp store/trunk/cpp/lib/jrnl/enq_hdr.hpp store/trunk/cpp/lib/jrnl/enq_map.cpp store/trunk/cpp/lib/jrnl/enq_map.hpp store/trunk/cpp/lib/jrnl/enq_rec.cpp store/trunk/cpp/lib/jrnl/enq_rec.hpp store/trunk/cpp/lib/jrnl/file_hdr.hpp store/trunk/cpp/lib/jrnl/jcntl.cpp store/trunk/cpp/lib/jrnl/jcntl.hpp store/trunk/cpp/lib/jrnl/jdir.cpp store/trunk/cpp/lib/jrnl/jdir.hpp store/trunk/cpp/lib/jrnl/jerrno.cpp store/trunk/cpp/lib/jrnl/jexception.cpp store/trunk/cpp/lib/jrnl/jinf.cpp store/trunk/cpp/lib/jrnl/jrec.cpp store/trunk/cpp/lib/jrnl/jrec.hpp store/trunk/cpp/lib/jrnl/lfh.cpp store/trunk/cpp/lib/jrnl/lfh.hpp store/trunk/cpp/lib/jrnl/nlfh.cpp store/trunk/cpp/lib/jrnl/nlfh.hpp store/trunk/cpp/lib/jrnl/pmgr.cpp store/trunk/cpp/lib/jrnl/pmgr.hpp store/trunk/cpp/lib/jrnl/rcvdat.hpp store/trunk/cpp/lib/jrnl/rec_hdr.hpp store/trunk/cpp/lib/jrnl/rec_tail.hpp store/trunk/cpp/lib/jrnl/rmgr.cpp store/trunk/cpp/lib/jrnl/rmgr.hpp store/trunk/cpp/lib/jrnl/rrfc.cpp store/trunk/cpp/lib/jrnl/rrfc.hpp store/trunk/cpp/lib/jrnl/slock.cpp store/trunk/cpp/lib/jrnl/slock.hpp store/trunk/cpp/lib/jrnl/time_ns.cpp store/trunk/cpp/lib/jrnl/txn_hdr.hpp store/trunk/cpp/lib/jrnl/txn_map.cpp store/trunk/cpp/lib/jrnl/txn_map.hpp store/trunk/cpp/lib/jrnl/txn_rec.cpp store/trunk/cpp/lib/jrnl/txn_rec.hpp store/trunk/cpp/lib/jrnl/wmgr.cpp store/trunk/cpp/lib/jrnl/wmgr.hpp store/trunk/cpp/lib/jrnl/wrfc.cpp store/trunk/cpp/lib/jrnl/wrfc.hpp store/trunk/cpp/tests/jrnl/_st_basic.cpp store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp store/trunk/cpp/tests/jrnl/_st_read.cpp store/trunk/cpp/tests/jrnl/_st_read_txn.cpp store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp store/trunk/cpp/tests/jrnl/_ut_jdir.cpp store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp store/trunk/cpp/tests/jrnl/_ut_jexception.cpp store/trunk/cpp/tests/jrnl/_ut_jinf.cpp store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp store/trunk/cpp/tests/jrnl/jtest.cpp store/trunk/cpp/tests/jrnl/jtest.hpp store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result_agregation.cpp store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp store/trunk/cpp/tests/jrnl/jtt/args.cpp store/trunk/cpp/tests/jrnl/jtt/data_src.cpp store/trunk/cpp/tests/jrnl/jtt/data_src.hpp store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp store/trunk/cpp/tests/jrnl/jtt/main.cpp store/trunk/cpp/tests/jrnl/jtt/read_arg.cpp store/trunk/cpp/tests/jrnl/jtt/test_case.cpp store/trunk/cpp/tests/jrnl/jtt/test_case.hpp store/trunk/cpp/tests/jrnl/jtt/test_case_result.hpp store/trunk/cpp/tests/jrnl/jtt/test_case_set.cpp store/trunk/cpp/tests/jrnl/jtt/test_case_set.hpp store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp store/trunk/cpp/tests/jrnl/msg_consumer.cpp store/trunk/cpp/tests/jrnl/msg_consumer.hpp store/trunk/cpp/tests/jrnl/msg_producer.cpp store/trunk/cpp/tests/jrnl/msg_producer.hpp Log: Another round of cleanups and F9 fixes. Changed convention for #include ".." vs #include <..> Modified: store/trunk/cpp/lib/jrnl/cvar.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/cvar.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/cvar.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,4 +28,4 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/cvar.hpp> +#include "jrnl/cvar.hpp" Modified: store/trunk/cpp/lib/jrnl/cvar.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/cvar.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/cvar.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -31,9 +31,9 @@ #define rhm_journal_cvar_hpp #include <cstring> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> -#include <jrnl/time_ns.hpp> +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" +#include "jrnl/time_ns.hpp" #include <pthread.h> #include <sstream> Modified: store/trunk/cpp/lib/jrnl/data_tok.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/data_tok.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/data_tok.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,11 +28,11 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/data_tok.hpp> +#include "jrnl/data_tok.hpp" +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" #include <sstream> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> namespace rhm { Modified: store/trunk/cpp/lib/jrnl/deq_hdr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/deq_hdr.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/deq_hdr.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -34,7 +34,7 @@ #define rhm_journal_deq_hdr_hpp #include <cstddef> -#include <jrnl/rec_hdr.hpp> +#include "jrnl/rec_hdr.hpp" namespace rhm { Modified: store/trunk/cpp/lib/jrnl/deq_rec.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/deq_rec.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/deq_rec.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,15 +28,15 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/deq_rec.hpp> +#include "jrnl/deq_rec.hpp" #include <cassert> #include <cerrno> #include <cstdlib> #include <cstring> #include <iomanip> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" #include <sstream> namespace rhm Modified: store/trunk/cpp/lib/jrnl/deq_rec.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/deq_rec.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/deq_rec.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -42,8 +42,8 @@ } #include <cstddef> -#include <jrnl/deq_hdr.hpp> -#include <jrnl/jrec.hpp> +#include "jrnl/deq_hdr.hpp" +#include "jrnl/jrec.hpp" namespace rhm { Modified: store/trunk/cpp/lib/jrnl/enq_hdr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_hdr.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/enq_hdr.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -34,7 +34,7 @@ #define rhm_journal_enq_hdr_hpp #include <cstddef> -#include <jrnl/rec_hdr.hpp> +#include "jrnl/rec_hdr.hpp" namespace rhm { Modified: store/trunk/cpp/lib/jrnl/enq_map.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_map.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/enq_map.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,12 +28,12 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/enq_map.hpp> +#include "jrnl/enq_map.hpp" #include <iomanip> +#include "jrnl/jerrno.hpp" +#include "jrnl/slock.hpp" #include <sstream> -#include <jrnl/jerrno.hpp> -#include <jrnl/slock.hpp> namespace rhm Modified: store/trunk/cpp/lib/jrnl/enq_map.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_map.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/enq_map.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -41,7 +41,7 @@ } } -#include <jrnl/jexception.hpp> +#include "jrnl/jexception.hpp" #include <map> #include <pthread.h> #include <vector> Modified: store/trunk/cpp/lib/jrnl/enq_rec.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_rec.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/enq_rec.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,15 +28,15 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/enq_rec.hpp> +#include "jrnl/enq_rec.hpp" #include <cassert> #include <cerrno> #include <cstdlib> #include <cstring> #include <iomanip> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" #include <sstream> namespace rhm Modified: store/trunk/cpp/lib/jrnl/enq_rec.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/enq_rec.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/enq_rec.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -40,8 +40,8 @@ } #include <cstddef> -#include <jrnl/enq_hdr.hpp> -#include <jrnl/jrec.hpp> +#include "jrnl/enq_hdr.hpp" +#include "jrnl/jrec.hpp" namespace rhm { Modified: store/trunk/cpp/lib/jrnl/file_hdr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/file_hdr.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/file_hdr.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -36,9 +36,9 @@ #include <cerrno> #include <ctime> -#include <jrnl/rec_hdr.hpp> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> +#include "jrnl/rec_hdr.hpp" +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" #include <sstream> namespace rhm Modified: store/trunk/cpp/lib/jrnl/jcntl.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jcntl.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/jcntl.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -29,7 +29,7 @@ */ -#include <jrnl/jcntl.hpp> +#include "jrnl/jcntl.hpp" #include <algorithm> #include <cassert> @@ -39,10 +39,10 @@ #include <fstream> #include <iomanip> #include <iostream> -#include <jrnl/file_hdr.hpp> -#include <jrnl/jerrno.hpp> -#include <jrnl/jinf.hpp> -#include <jrnl/slock.hpp> +#include "jrnl/file_hdr.hpp" +#include "jrnl/jerrno.hpp" +#include "jrnl/jinf.hpp" +#include "jrnl/slock.hpp" #include <sstream> #include <unistd.h> Modified: store/trunk/cpp/lib/jrnl/jcntl.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jcntl.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/jcntl.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -41,12 +41,12 @@ #include <cstddef> #include <deque> -#include <jrnl/jdir.hpp> -#include <jrnl/lfh.hpp> -#include <jrnl/rcvdat.hpp> -#include <jrnl/rmgr.hpp> -#include <jrnl/wmgr.hpp> -#include <jrnl/wrfc.hpp> +#include "jrnl/jdir.hpp" +#include "jrnl/lfh.hpp" +#include "jrnl/rcvdat.hpp" +#include "jrnl/rmgr.hpp" +#include "jrnl/wmgr.hpp" +#include "jrnl/wrfc.hpp" namespace rhm { Modified: store/trunk/cpp/lib/jrnl/jdir.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jdir.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/jdir.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -29,18 +29,18 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/jdir.hpp> +#include "jrnl/jdir.hpp" #include <cstdlib> #include <cstring> #include <dirent.h> #include <cerrno> #include <iomanip> +#include "jrnl/jcfg.hpp" +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" #include <sstream> #include <sys/stat.h> -#include <jrnl/jcfg.hpp> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> namespace rhm { Modified: store/trunk/cpp/lib/jrnl/jdir.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jdir.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/jdir.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -42,7 +42,7 @@ } } -#include <jrnl/jinf.hpp> +#include "jrnl/jinf.hpp" namespace rhm { Modified: store/trunk/cpp/lib/jrnl/jerrno.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jerrno.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/jerrno.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -32,7 +32,7 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/jerrno.hpp> +#include "jrnl/jerrno.hpp" namespace rhm { Modified: store/trunk/cpp/lib/jrnl/jexception.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jexception.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/jexception.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -30,11 +30,11 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/jexception.hpp> +#include "jrnl/jexception.hpp" #include <iomanip> #include <sstream> -#include <jrnl/jerrno.hpp> +#include "jrnl/jerrno.hpp" #define CATLEN(p) MAX_MSG_SIZE - std::strlen(p) - 1 Modified: store/trunk/cpp/lib/jrnl/jinf.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jinf.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/jinf.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -29,15 +29,15 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/jinf.hpp> +#include "jrnl/jinf.hpp" #include <cstdlib> #include <cstring> #include <ctime> #include <fstream> -#include <jrnl/file_hdr.hpp> -#include <jrnl/jcntl.hpp> -#include <jrnl/jerrno.hpp> +#include "jrnl/file_hdr.hpp" +#include "jrnl/jcntl.hpp" +#include "jrnl/jerrno.hpp" #include <sstream> namespace rhm Modified: store/trunk/cpp/lib/jrnl/jrec.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/jrec.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/jrec.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -30,12 +30,12 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/jrec.hpp> +#include "jrnl/jrec.hpp" #include <iomanip> +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" #include <sstream> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> namespace rhm { Modified: store/trunk/cpp/lib/jrnl/jrec.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/jrec.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/jrec.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -43,8 +43,8 @@ #include <cstddef> #include <fstream> -#include <jrnl/rec_hdr.hpp> -#include <jrnl/rec_tail.hpp> +#include "jrnl/rec_hdr.hpp" +#include "jrnl/rec_tail.hpp" #include <string> #include <sys/types.h> Modified: store/trunk/cpp/lib/jrnl/lfh.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/lfh.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/lfh.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -31,7 +31,7 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/lfh.hpp> +#include "jrnl/lfh.hpp" namespace rhm { Modified: store/trunk/cpp/lib/jrnl/lfh.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/lfh.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/lfh.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -42,7 +42,7 @@ } } -#include <jrnl/nlfh.hpp> +#include "jrnl/nlfh.hpp" namespace rhm { Modified: store/trunk/cpp/lib/jrnl/nlfh.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/nlfh.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/nlfh.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -29,16 +29,16 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/nlfh.hpp> +#include "jrnl/nlfh.hpp" #include <cerrno> #include <cstdlib> #include <cstring> #include <fcntl.h> #include <iomanip> +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" #include <sstream> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> namespace rhm { Modified: store/trunk/cpp/lib/jrnl/nlfh.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/nlfh.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/nlfh.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -42,7 +42,7 @@ #include <cstddef> #include <string> -#include <jrnl/rcvdat.hpp> +#include "jrnl/rcvdat.hpp" #include <sys/types.h> namespace rhm Modified: store/trunk/cpp/lib/jrnl/pmgr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/pmgr.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/pmgr.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,14 +28,14 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/pmgr.hpp> +#include "jrnl/pmgr.hpp" #include <cerrno> #include <cstdlib> #include <cstring> +#include "jrnl/jcfg.hpp" +#include "jrnl/jerrno.hpp" #include <sstream> -#include <jrnl/jcfg.hpp> -#include <jrnl/jerrno.hpp> namespace rhm Modified: store/trunk/cpp/lib/jrnl/pmgr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/pmgr.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/pmgr.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -42,13 +42,13 @@ #include <deque> #include <libaio.h> -#include <jrnl/data_tok.hpp> -#include <jrnl/deq_rec.hpp> -#include <jrnl/enq_map.hpp> -#include <jrnl/enq_rec.hpp> -#include <jrnl/nlfh.hpp> -#include <jrnl/txn_map.hpp> -#include <jrnl/txn_rec.hpp> +#include "jrnl/data_tok.hpp" +#include "jrnl/deq_rec.hpp" +#include "jrnl/enq_map.hpp" +#include "jrnl/enq_rec.hpp" +#include "jrnl/nlfh.hpp" +#include "jrnl/txn_map.hpp" +#include "jrnl/txn_rec.hpp" namespace rhm { Modified: store/trunk/cpp/lib/jrnl/rcvdat.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rcvdat.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/rcvdat.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -37,7 +37,7 @@ #include <map> #include <sstream> #include <vector> -#include <jrnl/jcfg.hpp> +#include "jrnl/jcfg.hpp" #include <sys/types.h> namespace rhm Modified: store/trunk/cpp/lib/jrnl/rec_hdr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rec_hdr.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/rec_hdr.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -35,7 +35,7 @@ #define rhm_journal_rec_hdr_hpp #include <cstddef> -#include <jrnl/jcfg.hpp> +#include "jrnl/jcfg.hpp" #include <sys/types.h> namespace rhm Modified: store/trunk/cpp/lib/jrnl/rec_tail.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rec_tail.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/rec_tail.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -35,7 +35,7 @@ #define rhm_journal_rec_tail_hpp #include <cstddef> -#include <jrnl/jcfg.hpp> +#include "jrnl/jcfg.hpp" namespace rhm { Modified: store/trunk/cpp/lib/jrnl/rmgr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/rmgr.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/rmgr.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,13 +28,13 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/rmgr.hpp> +#include "jrnl/rmgr.hpp" #include <cassert> #include <cerrno> #include <cstdlib> -#include <jrnl/jcntl.hpp> -#include <jrnl/jerrno.hpp> +#include "jrnl/jcntl.hpp" +#include "jrnl/jerrno.hpp" #include <sstream> namespace rhm Modified: store/trunk/cpp/lib/jrnl/rmgr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rmgr.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/rmgr.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -40,12 +40,12 @@ } #include <cstring> -#include <jrnl/aio_cb.hpp> -#include <jrnl/enums.hpp> -#include <jrnl/file_hdr.hpp> -#include <jrnl/pmgr.hpp> -#include <jrnl/rec_hdr.hpp> -#include <jrnl/rrfc.hpp> +#include "jrnl/aio_cb.hpp" +#include "jrnl/enums.hpp" +#include "jrnl/file_hdr.hpp" +#include "jrnl/pmgr.hpp" +#include "jrnl/rec_hdr.hpp" +#include "jrnl/rrfc.hpp" namespace rhm { Modified: store/trunk/cpp/lib/jrnl/rrfc.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/rrfc.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/rrfc.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -29,10 +29,11 @@ */ +#include "jrnl/rrfc.hpp" + #include <cassert> -#include <jrnl/rrfc.hpp> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" namespace rhm { Modified: store/trunk/cpp/lib/jrnl/rrfc.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/rrfc.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/rrfc.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -42,7 +42,7 @@ } #include <cstddef> -#include <jrnl/nlfh.hpp> +#include "jrnl/nlfh.hpp" namespace rhm { Modified: store/trunk/cpp/lib/jrnl/slock.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/slock.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/slock.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,4 +28,4 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/slock.hpp> +#include "jrnl/slock.hpp" Modified: store/trunk/cpp/lib/jrnl/slock.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/slock.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/slock.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -33,8 +33,8 @@ #include <cerrno> #include <cstring> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" #include <pthread.h> #include <sstream> Modified: store/trunk/cpp/lib/jrnl/time_ns.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/time_ns.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/time_ns.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -24,6 +24,7 @@ */ #include "time_ns.hpp" + #include <sstream> namespace rhm Modified: store/trunk/cpp/lib/jrnl/txn_hdr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_hdr.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/txn_hdr.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -34,7 +34,7 @@ #define rhm_journal_txn_hdr_hpp #include <cstddef> -#include <jrnl/rec_hdr.hpp> +#include "jrnl/rec_hdr.hpp" namespace rhm { Modified: store/trunk/cpp/lib/jrnl/txn_map.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_map.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/txn_map.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,13 +28,13 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/txn_map.hpp> +#include "jrnl/txn_map.hpp" #include <iomanip> +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" +#include "jrnl/slock.hpp" #include <sstream> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> -#include <jrnl/slock.hpp> namespace rhm { Modified: store/trunk/cpp/lib/jrnl/txn_map.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_map.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/txn_map.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -43,6 +43,7 @@ #include <map> #include <pthread.h> +#include <sys/types.h> #include <vector> namespace rhm Modified: store/trunk/cpp/lib/jrnl/txn_rec.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_rec.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/txn_rec.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,15 +28,15 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/txn_rec.hpp> +#include "jrnl/txn_rec.hpp" #include <cassert> #include <cerrno> #include <cstdlib> #include <cstring> #include <iomanip> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" #include <sstream> namespace rhm Modified: store/trunk/cpp/lib/jrnl/txn_rec.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/txn_rec.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/txn_rec.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -42,8 +42,8 @@ } #include <cstddef> -#include <jrnl/jrec.hpp> -#include <jrnl/txn_hdr.hpp> +#include "jrnl/jrec.hpp" +#include "jrnl/txn_hdr.hpp" namespace rhm { Modified: store/trunk/cpp/lib/jrnl/wmgr.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/wmgr.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/wmgr.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,15 +28,15 @@ * The GNU Lesser General Public License is available in the file COPYING. */ -#include <jrnl/wmgr.hpp> +#include "jrnl/wmgr.hpp" #include <cassert> #include <cerrno> #include <cstdlib> #include <cstring> -#include <jrnl/file_hdr.hpp> -#include <jrnl/jcntl.hpp> -#include <jrnl/jerrno.hpp> +#include "jrnl/file_hdr.hpp" +#include "jrnl/jcntl.hpp" +#include "jrnl/jerrno.hpp" #include <sstream> namespace rhm Modified: store/trunk/cpp/lib/jrnl/wmgr.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/wmgr.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/wmgr.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -40,10 +40,10 @@ } #include <cstring> -#include <jrnl/aio_cb.hpp> -#include <jrnl/enums.hpp> -#include <jrnl/pmgr.hpp> -#include <jrnl/wrfc.hpp> +#include "jrnl/aio_cb.hpp" +#include "jrnl/enums.hpp" +#include "jrnl/pmgr.hpp" +#include "jrnl/wrfc.hpp" #include <set> namespace rhm Modified: store/trunk/cpp/lib/jrnl/wrfc.cpp =================================================================== --- store/trunk/cpp/lib/jrnl/wrfc.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/wrfc.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,10 +28,11 @@ * The GNU Lesser General Public License is available in the file COPYING. */ +#include "jrnl/wrfc.hpp" + #include <cmath> -#include <jrnl/wrfc.hpp> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" namespace rhm { Modified: store/trunk/cpp/lib/jrnl/wrfc.hpp =================================================================== --- store/trunk/cpp/lib/jrnl/wrfc.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/lib/jrnl/wrfc.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -40,8 +40,8 @@ } #include <cstddef> -#include <jrnl/enums.hpp> -#include <jrnl/rrfc.hpp> +#include "jrnl/enums.hpp" +#include "jrnl/rrfc.hpp" namespace rhm { Modified: store/trunk/cpp/tests/jrnl/_st_basic.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_st_basic.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/_st_basic.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -26,16 +26,13 @@ */ #include "../unit_test.h" -#include <jrnl/jcntl.hpp> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> -#include <jrnl/jcfg.hpp> - -#include <iostream> #include <cmath> +#include <iostream> +#include "jrnl/jcntl.hpp" +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" +#include "jrnl/jcfg.hpp" -#include <iostream> // debug - using namespace boost::unit_test; using namespace rhm::journal; using namespace std; Modified: store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/_st_basic_txn.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -26,13 +26,12 @@ */ #include "../unit_test.h" -#include <jrnl/jcntl.hpp> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> -#include <jrnl/jcfg.hpp> - -#include <iostream> #include <cmath> +#include <iostream> +#include "jrnl/jcntl.hpp" +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" +#include "jrnl/jcfg.hpp" using namespace boost::unit_test; using namespace rhm::journal; Modified: store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/_st_helper_fns.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,6 +28,7 @@ // NOTE: This file is included in _st_*.cpp files inside the QPID_AUTO_TEST_SUITE() // definition. +#include <cstdlib> #define MAX_AIO_SLEEPS 500 #define AIO_SLEEP_TIME 1000 @@ -109,7 +110,7 @@ } u_int64_t -enq_extern_msg(jcntl& jc, const u_int64_t rid, const size_t msg_size, const bool transient, +enq_extern_msg(jcntl& jc, const u_int64_t rid, const std::size_t msg_size, const bool transient, const iores exp_ret = RHM_IORES_SUCCESS) { ostringstream ctxt; @@ -134,7 +135,7 @@ } u_int64_t -enq_extern_txn_msg(jcntl& jc, const u_int64_t rid, const size_t msg_size, const string& xid, +enq_extern_txn_msg(jcntl& jc, const u_int64_t rid, const std::size_t msg_size, const string& xid, const bool transient, const iores exp_ret = RHM_IORES_SUCCESS) { ostringstream ctxt; @@ -196,9 +197,9 @@ const iores exp_ret = RHM_IORES_SUCCESS) { void* mp = 0; - size_t msize = 0; + std::size_t msize = 0; void* xp = 0; - size_t xsize = 0; + std::size_t xsize = 0; data_tok* dtp = new data_tok; BOOST_CHECK_MESSAGE(dtp != 0, "Data token allocation failed (dtp == 0)."); dtp->set_wstate(data_tok::ENQ); @@ -211,12 +212,12 @@ if (xp) { xid.assign((char*)xp, xsize); - ::free(xp); + std::free(xp); xp = 0; } else if (mp) { - ::free(mp); + std::free(mp); mp = 0; } Modified: store/trunk/cpp/tests/jrnl/_st_read.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_st_read.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/_st_read.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -26,13 +26,13 @@ */ #include "../unit_test.h" -#include <jrnl/jcntl.hpp> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> -#include <jrnl/jcfg.hpp> - +#include <cmath> +#include <cstddef> #include <iostream> -#include <cmath> +#include "jrnl/jcntl.hpp" +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" +#include "jrnl/jcfg.hpp" using namespace boost::unit_test; using namespace rhm::journal; @@ -85,7 +85,7 @@ { read_msg(jc, rmsg, xid, transientFlag, externalFlag); BOOST_CHECK_EQUAL(create_msg(msg, m, MSG_SIZE), rmsg); - BOOST_CHECK_EQUAL(xid.size(), size_t(0)); + BOOST_CHECK_EQUAL(xid.size(), std::size_t(0)); BOOST_CHECK_EQUAL(transientFlag, false); BOOST_CHECK_EQUAL(externalFlag, false); } @@ -117,7 +117,7 @@ jc.flush(); read_msg(jc, rmsg, xid, transientFlag, externalFlag); BOOST_CHECK_EQUAL(create_msg(msg, m, MSG_SIZE), rmsg); - BOOST_CHECK_EQUAL(xid.size(), size_t(0)); + BOOST_CHECK_EQUAL(xid.size(), std::size_t(0)); BOOST_CHECK_EQUAL(transientFlag, false); BOOST_CHECK_EQUAL(externalFlag, false); deq_msg(jc, m); @@ -159,7 +159,7 @@ { read_msg(jc, rmsg, xid, transientFlag, externalFlag); BOOST_CHECK_EQUAL(create_msg(msg, m, MSG_SIZE), rmsg); - BOOST_CHECK_EQUAL(xid.size(), size_t(0)); + BOOST_CHECK_EQUAL(xid.size(), std::size_t(0)); BOOST_CHECK_EQUAL(transientFlag, false); BOOST_CHECK_EQUAL(externalFlag, false); } @@ -201,7 +201,7 @@ { read_msg(jc, rmsg, xid, transientFlag, externalFlag); BOOST_CHECK_EQUAL(create_msg(msg, m, MSG_SIZE), rmsg); - BOOST_CHECK_EQUAL(xid.size(), size_t(0)); + BOOST_CHECK_EQUAL(xid.size(), std::size_t(0)); BOOST_CHECK_EQUAL(transientFlag, false); BOOST_CHECK_EQUAL(externalFlag, false); } @@ -223,7 +223,7 @@ { read_msg(jc, rmsg, xid, transientFlag, externalFlag); BOOST_CHECK_EQUAL(create_msg(msg, m, MSG_SIZE), rmsg); - BOOST_CHECK_EQUAL(xid.size(), size_t(0)); + BOOST_CHECK_EQUAL(xid.size(), std::size_t(0)); BOOST_CHECK_EQUAL(transientFlag, false); BOOST_CHECK_EQUAL(externalFlag, false); } @@ -233,7 +233,7 @@ { read_msg(jc, rmsg, xid, transientFlag, externalFlag); BOOST_CHECK_EQUAL(create_msg(msg, m, MSG_SIZE), rmsg); - BOOST_CHECK_EQUAL(xid.size(), size_t(0)); + BOOST_CHECK_EQUAL(xid.size(), std::size_t(0)); BOOST_CHECK_EQUAL(transientFlag, false); BOOST_CHECK_EQUAL(externalFlag, false); } Modified: store/trunk/cpp/tests/jrnl/_st_read_txn.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_st_read_txn.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/_st_read_txn.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -26,13 +26,13 @@ */ #include "../unit_test.h" -#include <jrnl/jcntl.hpp> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> -#include <jrnl/jcfg.hpp> - +#include <cmath> +#include <cstddef> #include <iostream> -#include <cmath> +#include "jrnl/jcntl.hpp" +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" +#include "jrnl/jcfg.hpp" using namespace boost::unit_test; using namespace rhm::journal; @@ -309,7 +309,7 @@ { read_msg(jc, rmsg, rxid, transientFlag, externalFlag); BOOST_CHECK_EQUAL(create_msg(msg, m, MSG_SIZE), rmsg); - BOOST_CHECK_EQUAL(rxid.length(), size_t(0)); + BOOST_CHECK_EQUAL(rxid.length(), std::size_t(0)); BOOST_CHECK_EQUAL(transientFlag, false); BOOST_CHECK_EQUAL(externalFlag, false); } Modified: store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/_ut_enq_map.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,9 +28,10 @@ */ #include "../unit_test.h" + #include <iostream> -#include <jrnl/enq_map.hpp> -#include <jrnl/jerrno.hpp> +#include "jrnl/enq_map.hpp" +#include "jrnl/jerrno.hpp" using namespace boost::unit_test; using namespace rhm::journal; Modified: store/trunk/cpp/tests/jrnl/_ut_jdir.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_jdir.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/_ut_jdir.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,22 +28,24 @@ */ #include "../unit_test.h" + +#include <cerrno> +#include <cstring> #include <dirent.h> -#include <errno.h> #include <fstream> #include <iomanip> #include <iostream> -#include <jrnl/file_hdr.hpp> -#include <jrnl/jcfg.hpp> -#include <jrnl/jdir.hpp> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> +#include "jrnl/file_hdr.hpp" +#include "jrnl/jcfg.hpp" +#include "jrnl/jdir.hpp" +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" #include <sys/stat.h> #define NUM_JFILES 4 #define JFSIZE_SBLKS 128 -#define ERRORSTR(e) ::strerror(ret) << " (" << ret << ")" +#define ERRORSTR(e) std::strerror(e) << " (" << e << ")" #define NUM_CLEAR_OPS 20 using namespace boost::unit_test; @@ -61,7 +63,7 @@ ofstream of(filename, ofstream::out | ofstream::trunc); if (!of.good()) BOOST_FAIL("Unable to open file " << filename << " for writing."); - of.write(filename, ::strlen(filename)); + of.write(filename, std::strlen(filename)); of.close(); ::chmod(filename, fmode); } @@ -111,13 +113,13 @@ while ((entry = ::readdir(dir)) != NULL) { // Ignore . and .. - if (strcmp(entry->d_name, ".") != 0 && strcmp(entry->d_name, "..") != 0) + if (std::strcmp(entry->d_name, ".") != 0 && std::strcmp(entry->d_name, "..") != 0) { stringstream fn; fn << dirname << "/" << entry->d_name; if (::stat(fn.str().c_str(), &s)) BOOST_FAIL("Unable to stat dir entry " << entry->d_name << "; err=" << - strerror(errno)); + ERRORSTR(errno)); if (S_ISREG(s.st_mode)) file_cnt++; else if (S_ISDIR(s.st_mode)) Modified: store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/_ut_jerrno.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,8 +28,10 @@ */ #include "../unit_test.h" + +#include <cstring> #include <iostream> -#include <jrnl/jerrno.hpp> +#include "jrnl/jerrno.hpp" using namespace boost::unit_test; using namespace rhm::journal; @@ -45,8 +47,8 @@ cout << test_filename << ".jerrno_val: " << flush; const char* m = "JERR__MALLOC"; string malloc_msg = string(jerrno::err_msg(jerrno::JERR__MALLOC)); - BOOST_CHECK(malloc_msg.substr(0, ::strlen(m)).compare(m) == 0); - BOOST_CHECK(::strcmp(jerrno::err_msg(0), "<Unknown error code>") == 0); + BOOST_CHECK(malloc_msg.substr(0, std::strlen(m)).compare(m) == 0); + BOOST_CHECK(std::strcmp(jerrno::err_msg(0), "<Unknown error code>") == 0); cout << "ok" << endl; } Modified: store/trunk/cpp/tests/jrnl/_ut_jexception.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_jexception.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/_ut_jexception.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,9 +28,11 @@ */ #include "../unit_test.h" + +#include <cstring> #include <iostream> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" using namespace boost::unit_test; using namespace rhm::journal; @@ -42,25 +44,26 @@ // === Helper functions === -void throw_exception(const jexception& e, size_t what_len, size_t ai_len, size_t tc_len, - size_t tf_len) +void throw_exception(const jexception& e, std::size_t what_len, std::size_t ai_len, + std::size_t tc_len, std::size_t tf_len) { try { throw e; } catch (const jexception& e) { - BOOST_CHECK_EQUAL(::strlen(e.what()), what_len); + BOOST_CHECK_EQUAL(std::strlen(e.what()), what_len); BOOST_CHECK_EQUAL(e.additional_info().size(), ai_len); BOOST_CHECK_EQUAL(e.throwing_class().size(), tc_len); BOOST_CHECK_EQUAL(e.throwing_fn().size(), tf_len); } } -void throw_exception(const jexception& e, size_t what_len, size_t ai_len) +void throw_exception(const jexception& e, std::size_t what_len, std::size_t ai_len) { throw_exception(e, what_len, ai_len, 0, 0); } -void throw_exception(const jexception& e, size_t what_len, size_t tc_len, size_t tf_len) +void throw_exception(const jexception& e, std::size_t what_len, std::size_t tc_len, + std::size_t tf_len) { throw_exception(e, what_len, 0, tc_len, tf_len); } @@ -77,7 +80,7 @@ BOOST_CHECK(e1.additional_info().size() == 0); BOOST_CHECK(e1.throwing_class().size() == 0); BOOST_CHECK(e1.throwing_fn().size() == 0); - BOOST_CHECK(::strlen(e1.what()) > 0); + BOOST_CHECK(std::strlen(e1.what()) > 0); throw e1; } catch (const jexception& e) @@ -86,7 +89,7 @@ BOOST_CHECK(e.additional_info().size() == 0); BOOST_CHECK(e.throwing_class().size() == 0); BOOST_CHECK(e.throwing_fn().size() == 0); - BOOST_CHECK(::strlen(e.what()) > 0); + BOOST_CHECK(std::strlen(e.what()) > 0); } cout << "ok" << endl; } @@ -102,7 +105,7 @@ BOOST_CHECK(e2.additional_info().size() == 0); BOOST_CHECK(e2.throwing_class().size() == 0); BOOST_CHECK(e2.throwing_fn().size() == 0); - BOOST_CHECK(::strlen(e2.what()) > 0); + BOOST_CHECK(std::strlen(e2.what()) > 0); throw e2; } catch (const jexception& e) @@ -111,7 +114,7 @@ BOOST_CHECK(e.additional_info().size() == 0); BOOST_CHECK(e.throwing_class().size() == 0); BOOST_CHECK(e.throwing_fn().size() == 0); - BOOST_CHECK(::strlen(e.what()) > 0); + BOOST_CHECK(std::strlen(e.what()) > 0); } cout << "ok" << endl; } @@ -127,7 +130,7 @@ BOOST_CHECK(e3.additional_info().compare(err_msg) == 0); BOOST_CHECK(e3.throwing_class().size() == 0); BOOST_CHECK(e3.throwing_fn().size() == 0); - BOOST_CHECK(::strlen(e3.what()) > 0); + BOOST_CHECK(std::strlen(e3.what()) > 0); throw e3; } catch (const jexception& e) @@ -136,7 +139,7 @@ BOOST_CHECK(e.additional_info().compare(err_msg) == 0); BOOST_CHECK(e.throwing_class().size() == 0); BOOST_CHECK(e.throwing_fn().size() == 0); - BOOST_CHECK(::strlen(e.what()) > 0); + BOOST_CHECK(std::strlen(e.what()) > 0); } cout << "ok" << endl; } @@ -152,7 +155,7 @@ BOOST_CHECK(e3.additional_info().compare(err_msg) == 0); BOOST_CHECK(e3.throwing_class().size() == 0); BOOST_CHECK(e3.throwing_fn().size() == 0); - BOOST_CHECK(::strlen(e3.what()) > 0); + BOOST_CHECK(std::strlen(e3.what()) > 0); throw e3; } catch (const jexception& e) @@ -161,7 +164,7 @@ BOOST_CHECK(e.additional_info().compare(err_msg) == 0); BOOST_CHECK(e.throwing_class().size() == 0); BOOST_CHECK(e.throwing_fn().size() == 0); - BOOST_CHECK(::strlen(e.what()) > 0); + BOOST_CHECK(std::strlen(e.what()) > 0); } cout << "ok" << endl; } @@ -178,7 +181,7 @@ BOOST_CHECK(e4.additional_info().compare(err_msg) == 0); BOOST_CHECK(e4.throwing_class().size() == 0); BOOST_CHECK(e4.throwing_fn().size() == 0); - BOOST_CHECK(::strlen(e4.what()) > 0); + BOOST_CHECK(std::strlen(e4.what()) > 0); throw e4; } catch (const jexception& e) @@ -187,7 +190,7 @@ BOOST_CHECK(e.additional_info().compare(err_msg) == 0); BOOST_CHECK(e.throwing_class().size() == 0); BOOST_CHECK(e.throwing_fn().size() == 0); - BOOST_CHECK(::strlen(e.what()) > 0); + BOOST_CHECK(std::strlen(e.what()) > 0); } cout << "ok" << endl; } @@ -204,7 +207,7 @@ BOOST_CHECK(e4.additional_info().compare(err_msg) == 0); BOOST_CHECK(e4.throwing_class().size() == 0); BOOST_CHECK(e4.throwing_fn().size() == 0); - BOOST_CHECK(::strlen(e4.what()) > 0); + BOOST_CHECK(std::strlen(e4.what()) > 0); throw e4; } catch (const jexception& e) @@ -213,7 +216,7 @@ BOOST_CHECK(e.additional_info().compare(err_msg) == 0); BOOST_CHECK(e.throwing_class().size() == 0); BOOST_CHECK(e.throwing_fn().size() == 0); - BOOST_CHECK(::strlen(e.what()) > 0); + BOOST_CHECK(std::strlen(e.what()) > 0); } cout << "ok" << endl; } @@ -231,7 +234,7 @@ BOOST_CHECK(e5.additional_info().size() == 0); BOOST_CHECK(e5.throwing_class().compare(err_class) == 0); BOOST_CHECK(e5.throwing_fn().compare(err_fn) == 0); - BOOST_CHECK(::strlen(e5.what()) > 0); + BOOST_CHECK(std::strlen(e5.what()) > 0); throw e5; } catch (const jexception& e) @@ -240,7 +243,7 @@ BOOST_CHECK(e.additional_info().size() == 0); BOOST_CHECK(e.throwing_class().compare(err_class) == 0); BOOST_CHECK(e.throwing_fn().compare(err_fn) == 0); - BOOST_CHECK(::strlen(e.what()) > 0); + BOOST_CHECK(std::strlen(e.what()) > 0); } cout << "ok" << endl; } @@ -258,7 +261,7 @@ BOOST_CHECK(e5.additional_info().size() == 0); BOOST_CHECK(e5.throwing_class().compare(err_class) == 0); BOOST_CHECK(e5.throwing_fn().compare(err_fn) == 0); - BOOST_CHECK(::strlen(e5.what()) > 0); + BOOST_CHECK(std::strlen(e5.what()) > 0); throw e5; } catch (const jexception& e) @@ -267,7 +270,7 @@ BOOST_CHECK(e.additional_info().size() == 0); BOOST_CHECK(e.throwing_class().compare(err_class) == 0); BOOST_CHECK(e.throwing_fn().compare(err_fn) == 0); - BOOST_CHECK(::strlen(e.what()) > 0); + BOOST_CHECK(std::strlen(e.what()) > 0); } cout << "ok" << endl; } @@ -286,7 +289,7 @@ BOOST_CHECK(e6.additional_info().compare(err_msg) == 0); BOOST_CHECK(e6.throwing_class().compare(err_class) == 0); BOOST_CHECK(e6.throwing_fn().compare(err_fn) == 0); - BOOST_CHECK(::strlen(e6.what()) > 0); + BOOST_CHECK(std::strlen(e6.what()) > 0); throw e6; } catch (const jexception& e) @@ -295,7 +298,7 @@ BOOST_CHECK(e.additional_info().compare(err_msg) == 0); BOOST_CHECK(e.throwing_class().compare(err_class) == 0); BOOST_CHECK(e.throwing_fn().compare(err_fn) == 0); - BOOST_CHECK(::strlen(e.what()) > 0); + BOOST_CHECK(std::strlen(e.what()) > 0); } cout << "ok" << endl; } @@ -314,7 +317,7 @@ BOOST_CHECK(e6.additional_info().compare(err_msg) == 0); BOOST_CHECK(e6.throwing_class().compare(err_class) == 0); BOOST_CHECK(e6.throwing_fn().compare(err_fn) == 0); - BOOST_CHECK(::strlen(e6.what()) > 0); + BOOST_CHECK(std::strlen(e6.what()) > 0); throw e6; } catch (const jexception& e) @@ -323,7 +326,7 @@ BOOST_CHECK(e.additional_info().compare(err_msg) == 0); BOOST_CHECK(e.throwing_class().compare(err_class) == 0); BOOST_CHECK(e.throwing_fn().compare(err_fn) == 0); - BOOST_CHECK(::strlen(e.what()) > 0); + BOOST_CHECK(std::strlen(e.what()) > 0); } cout << "ok" << endl; } Modified: store/trunk/cpp/tests/jrnl/_ut_jinf.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_jinf.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/_ut_jinf.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,14 +28,16 @@ */ #include "../unit_test.h" + +#include <cstring> #include <fstream> #include <iomanip> #include <iostream> -#include <jrnl/file_hdr.hpp> -#include <jrnl/jcfg.hpp> -#include <jrnl/jerrno.hpp> -#include <jrnl/jexception.hpp> -#include <jrnl/jinf.hpp> +#include "jrnl/file_hdr.hpp" +#include "jrnl/jcfg.hpp" +#include "jrnl/jerrno.hpp" +#include "jrnl/jexception.hpp" +#include "jrnl/jinf.hpp" #define NUM_JFILES 4 #define JFSIZE_SBLKS 128 @@ -104,7 +106,7 @@ // prepare file_hdr if (scheme == RID_NONE) // create file containing 0s - ::memset(&fh, 0, sizeof(file_hdr)); + std::memset(&fh, 0, sizeof(file_hdr)); else init_fhdr(fh, fid, rid, fid >= min_fid_offs); Modified: store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/_ut_rec_hdr.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,13 +28,15 @@ */ #include "../unit_test.h" + +#include <ctime> #include <iostream> -#include <jrnl/deq_hdr.hpp> -#include <jrnl/enq_hdr.hpp> -#include <jrnl/file_hdr.hpp> -#include <jrnl/jcfg.hpp> -#include <jrnl/rec_tail.hpp> -#include <jrnl/txn_hdr.hpp> +#include "jrnl/deq_hdr.hpp" +#include "jrnl/enq_hdr.hpp" +#include "jrnl/file_hdr.hpp" +#include "jrnl/jcfg.hpp" +#include "jrnl/rec_tail.hpp" +#include "jrnl/txn_hdr.hpp" using namespace boost::unit_test; using namespace rhm::journal; @@ -144,9 +146,9 @@ const u_int64_t rid = 0xfedcba9876543210ULL; const u_int32_t fid = 0xfedcba98UL; #ifdef JRNL_32_BIT - const size_t fro = 0xfedcba98UL; + const std::size_t fro = 0xfedcba98UL; #else - const size_t fro = 0xfedcba9876543210ULL; + const std::size_t fro = 0xfedcba9876543210ULL; #endif timespec ts; const bool owi = true; @@ -159,8 +161,8 @@ BOOST_CHECK_EQUAL(fh1._uflag, 0); BOOST_CHECK_EQUAL(fh1._rid, 0ULL); BOOST_CHECK_EQUAL(fh1._fid, 0UL); - BOOST_CHECK_EQUAL(fh1._fro, size_t(0)); - BOOST_CHECK_EQUAL(fh1._ts_sec, time_t(0)); + BOOST_CHECK_EQUAL(fh1._fro, std::size_t(0)); + BOOST_CHECK_EQUAL(fh1._ts_sec, std::time_t(0)); BOOST_CHECK_EQUAL(fh1._ts_nsec, uint32_t(0)); BOOST_CHECK(!fh1.get_owi()); } @@ -178,7 +180,7 @@ BOOST_CHECK_EQUAL(fh2._rid, rid); BOOST_CHECK_EQUAL(fh2._fid,fid ); BOOST_CHECK_EQUAL(fh2._fro, fro); - BOOST_CHECK_EQUAL(fh2._ts_sec, time_t(0)); + BOOST_CHECK_EQUAL(fh2._ts_sec, std::time_t(0)); BOOST_CHECK_EQUAL(fh2._ts_nsec, uint32_t(0)); ::clock_gettime(CLOCK_REALTIME, &ts); fh2.set_time(ts); @@ -225,11 +227,11 @@ const u_int64_t rid = 0xfedcba9876543210ULL; const u_int16_t uflag = 0x5537; #ifdef JRNL_32_BIT - const size_t xidsize = 0xfedcba98UL; - const size_t dsize = 0x76543210UL; + const std::size_t xidsize = 0xfedcba98UL; + const std::size_t dsize = 0x76543210UL; #else - const size_t xidsize = 0xfedcba9876543210ULL; - const size_t dsize = 0x76543210fedcba98ULL; + const std::size_t xidsize = 0xfedcba9876543210ULL; + const std::size_t dsize = 0x76543210fedcba98ULL; #endif const bool owi = true; @@ -240,8 +242,8 @@ BOOST_CHECK_EQUAL(eh1._eflag, 0); BOOST_CHECK_EQUAL(eh1._uflag, 0); BOOST_CHECK_EQUAL(eh1._rid, 0ULL); - BOOST_CHECK_EQUAL(eh1._xidsize, size_t(0)); - BOOST_CHECK_EQUAL(eh1._dsize, size_t(0)); + BOOST_CHECK_EQUAL(eh1._xidsize, std::size_t(0)); + BOOST_CHECK_EQUAL(eh1._dsize, std::size_t(0)); BOOST_CHECK(!eh1.get_owi()); } @@ -335,9 +337,9 @@ const u_int64_t rid = 0xfedcba9876543210ULL; const u_int64_t drid = 0x76543210fedcba98ULL; #ifdef JRNL_32_BIT - const size_t xidsize = 0xfedcba98UL; + const std::size_t xidsize = 0xfedcba98UL; #else - const size_t xidsize = 0xfedcba9876543210ULL; + const std::size_t xidsize = 0xfedcba9876543210ULL; #endif const bool owi = true; @@ -349,7 +351,7 @@ BOOST_CHECK_EQUAL(dh1._uflag, 0); BOOST_CHECK_EQUAL(dh1._rid, 0ULL); BOOST_CHECK_EQUAL(dh1._deq_rid, 0ULL); - BOOST_CHECK_EQUAL(dh1._xidsize, size_t(0)); + BOOST_CHECK_EQUAL(dh1._xidsize, std::size_t(0)); BOOST_CHECK(!dh1.get_owi()); } @@ -391,9 +393,9 @@ const u_int16_t uflag = 0x5537; const u_int64_t rid = 0xfedcba9876543210ULL; #ifdef JRNL_32_BIT - const size_t xidsize = 0xfedcba98UL; + const std::size_t xidsize = 0xfedcba98UL; #else - const size_t xidsize = 0xfedcba9876543210ULL; + const std::size_t xidsize = 0xfedcba9876543210ULL; #endif const bool owi = true; @@ -404,7 +406,7 @@ BOOST_CHECK_EQUAL(th1._eflag, 0); BOOST_CHECK_EQUAL(th1._uflag, 0); BOOST_CHECK_EQUAL(th1._rid, 0ULL); - BOOST_CHECK_EQUAL(th1._xidsize, size_t(0)); + BOOST_CHECK_EQUAL(th1._xidsize, std::size_t(0)); BOOST_CHECK(!th1.get_owi()); } Modified: store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/_ut_time_ns.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -22,8 +22,10 @@ */ #include "../unit_test.h" + +#include <ctime> #include <iostream> -#include <jrnl/time_ns.hpp> +#include "jrnl/time_ns.hpp" using namespace boost::unit_test; using namespace rhm::journal; @@ -36,7 +38,7 @@ QPID_AUTO_TEST_CASE(constructors) { cout << test_filename << ".constructors: " << flush; - const time_t sec = 123; + const std::time_t sec = 123; const long nsec = 123456789; time_ns t1; @@ -65,15 +67,15 @@ QPID_AUTO_TEST_CASE(operators) { cout << test_filename << ".operators: " << flush; - const time_t sec1 = 123; + const std::time_t sec1 = 123; const long nsec1 = 123456789; - const time_t sec2 = 1; + const std::time_t sec2 = 1; const long nsec2 = 999999999; - const time_t sec_sum = sec1 + sec2 + 1; + const std::time_t sec_sum = sec1 + sec2 + 1; const long nsec_sum = nsec1 + nsec2 - 1000000000; - const time_t sec_1_minus_2 = sec1 - sec2 - 1; + const std::time_t sec_1_minus_2 = sec1 - sec2 - 1; const long nsec_1_minus_2 = nsec1 - nsec2 + 1000000000; - const time_t sec_2_minus_1 = sec2 - sec1; + const std::time_t sec_2_minus_1 = sec2 - sec1; const long nsec_2_minus_1 = nsec2 - nsec1; time_ns z; time_ns t1(sec1, nsec1); Modified: store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/_ut_txn_map.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -28,9 +28,10 @@ */ #include "../unit_test.h" + #include <iomanip> #include <iostream> -#include <jrnl/txn_map.hpp> +#include "jrnl/txn_map.hpp" #include <sstream> using namespace boost::unit_test; Modified: store/trunk/cpp/tests/jrnl/jtest.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtest.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtest.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -29,7 +29,9 @@ #include "jtest.hpp" -#include <assert.h> +#include <cassert> +#include <cstdlib> +#include <cstring> #include <fstream> #include <iomanip> #include <iostream> @@ -83,9 +85,9 @@ _comment(NULL) {} -jtest::targs::targs(const u_int32_t num_msgs, const size_t min_msg_size, const size_t max_msg_size, - const bool auto_deq, const size_t min_xid_size, const size_t max_xid_size, - const bool transient, const bool external, char* comment): +jtest::targs::targs(const u_int32_t num_msgs, const std::size_t min_msg_size, + const std::size_t max_msg_size, const bool auto_deq, const std::size_t min_xid_size, + const std::size_t max_xid_size, const bool transient, const bool external, char* comment): _num_msgs(num_msgs), _min_msg_size(min_msg_size), _max_msg_size(max_msg_size), @@ -311,7 +313,7 @@ *test_file_name = argv[1]; if (argv[2][0] == '-') { - if (strcspn(argv[2], num_chars) != 1) + if (std::strcspn(argv[2], num_chars) != 1) { ss << "Test number argument \"" << argv[2] << "\" not a valid number."; throw rhm::journal::jexception(EXCEPTION_BASE+1, ss.str().c_str()); @@ -319,13 +321,13 @@ } else { - if (strcspn(argv[2], num_chars) != 0) + if (std::strcspn(argv[2], num_chars) != 0) { ss << "Test number argument \"" << argv[2] << "\" not a valid number."; throw rhm::journal::jexception(EXCEPTION_BASE+2, ss.str().c_str()); } } - *test_num = atoi(argv[2]); + *test_num = std::atoi(argv[2]); if (*test_num < 0) { ss << "Illegal test number \""<< test_num << "\""; @@ -381,7 +383,8 @@ // static method void -jtest::get_test(targs* tap, const std::string& filename, const unsigned tnum) throw (rhm::journal::jexception) +jtest::get_test(targs* tap, const std::string& filename, const unsigned tnum) + throw (rhm::journal::jexception) { if (tap == NULL) throw rhm::journal::jexception(EXCEPTION_BASE+4, "targs NULL", "jtest", "get_test"); @@ -398,36 +401,36 @@ { ifs.getline(line, MAX_LINE_LEN); toks.clear(); - char* pch = strtok(line, ","); + char* pch = std::strtok(line, ","); while (pch != NULL) { toks.push_back(pch); - pch = strtok(NULL, ","); + pch = std::strtok(NULL, ","); } if (toks.size() > TRANSIENT_COL && toks[TEST_NUM_COL][0] != '"') { - unsigned this_tnum = atoi(toks[TEST_NUM_COL]); + unsigned this_tnum = std::atoi(toks[TEST_NUM_COL]); if (this_tnum == tnum) { found = true; - tap->_num_msgs = atol(toks[NUM_MSGS_COL]); - tap->_min_msg_size = atol(toks[MIN_MSG_SIZE_COL]); - tap->_max_msg_size = atol(toks[MAX_MSG_SIZE_COL]); - tap->_min_xid_size = atol(toks[MIN_XID_SIZE_COL]); - tap->_max_xid_size = atol(toks[MAX_XID_SIZE_COL]); - tap->_auto_deq = !(strcmp(toks[AUTO_DEQ_COL], "FALSE") == 0 || - strcmp(toks[AUTO_DEQ_COL], "0") == 0); - tap->_transient = !(strcmp(toks[TRANSIENT_COL], "FALSE") == 0 || - strcmp(toks[TRANSIENT_COL], "0") == 0); - tap->_external = !(strcmp(toks[EXTERN_COL], "FALSE") == 0 || - strcmp(toks[EXTERN_COL], "0") == 0); + tap->_num_msgs = std::atol(toks[NUM_MSGS_COL]); + tap->_min_msg_size = std::atol(toks[MIN_MSG_SIZE_COL]); + tap->_max_msg_size = std::atol(toks[MAX_MSG_SIZE_COL]); + tap->_min_xid_size = std::atol(toks[MIN_XID_SIZE_COL]); + tap->_max_xid_size = std::atol(toks[MAX_XID_SIZE_COL]); + tap->_auto_deq = !(std::strcmp(toks[AUTO_DEQ_COL], "FALSE") == 0 || + std::strcmp(toks[AUTO_DEQ_COL], "0") == 0); + tap->_transient = !(std::strcmp(toks[TRANSIENT_COL], "FALSE") == 0 || + std::strcmp(toks[TRANSIENT_COL], "0") == 0); + tap->_external = !(std::strcmp(toks[EXTERN_COL], "FALSE") == 0 || + std::strcmp(toks[EXTERN_COL], "0") == 0); if (toks.size() > COMMENT_COL) { tap->_comment = toks[COMMENT_COL]; if (tap->_comment[0] == '"') tap->_comment++; - if (tap->_comment[strlen(tap->_comment) - 1] == '"') - tap->_comment[strlen(tap->_comment) - 1] = 0; + if (tap->_comment[std::strlen(tap->_comment) - 1] == '"') + tap->_comment[std::strlen(tap->_comment) - 1] = 0; } else tap->_comment = NULL; Modified: store/trunk/cpp/tests/jrnl/jtest.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtest.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtest.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -30,9 +30,10 @@ #ifndef _jtest_hpp_ #define _jtest_hpp_ -#include <jrnl/jcfg.hpp> -#include <jrnl/jcntl.hpp> -#include <jrnl/jexception.hpp> +#include <cstddef> +#include "jrnl/jcfg.hpp" +#include "jrnl/jcntl.hpp" +#include "jrnl/jexception.hpp" #include "msg_producer.hpp" #include "msg_consumer.hpp" @@ -51,18 +52,19 @@ struct targs { u_int32_t _num_msgs; - size_t _min_msg_size; - size_t _max_msg_size; + std::size_t _min_msg_size; + std::size_t _max_msg_size; bool _auto_deq; - size_t _min_xid_size; - size_t _max_xid_size; + std::size_t _min_xid_size; + std::size_t _max_xid_size; bool _transient; bool _external; char* _comment; targs(); - targs(const u_int32_t num_msgs, const size_t min_msg_size, const size_t max_msg_size, - const bool auto_deq, const size_t min_xid_size, const size_t max_xid_size, - const bool transient, const bool external, char* comment = NULL); + targs(const u_int32_t num_msgs, const std::size_t min_msg_size, + const std::size_t max_msg_size, const bool auto_deq, const std::size_t min_xid_size, + const std::size_t max_xid_size, const bool transient, const bool external, + char* comment = NULL); }; private: Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_data_src.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -22,6 +22,7 @@ */ #include "../../unit_test.h" +#include <cstddef> #include "data_src.hpp" #include <iomanip> #include <iostream> @@ -38,12 +39,12 @@ { cout << test_filename << ".data: " << flush; BOOST_CHECK(data_src::max_dsize > 0); - for (size_t i=0; i<1024; i++) + for (std::size_t i=0; i<1024; i++) { const char* dp = data_src::get_data(i); BOOST_CHECK_EQUAL(*dp, static_cast<char>('0' + ((i + 1) % 10))); } - for (size_t i=data_src::max_dsize-1024; i<data_src::max_dsize; i++) + for (std::size_t i=data_src::max_dsize-1024; i<data_src::max_dsize; i++) { const char* dp = data_src::get_data(i); BOOST_CHECK_EQUAL(*dp, static_cast<char>('0' + ((i + 1) % 10))); @@ -73,7 +74,7 @@ BOOST_CHECK_EQUAL(data_src::get_xid(13), "xid:00000012:"); BOOST_CHECK_EQUAL(data_src::get_xid(14), "xid:00000013:n"); BOOST_CHECK_EQUAL(data_src::get_xid(15), "xid:00000014:no"); - size_t i = 15; + std::size_t i = 15; for (; i<1024; i++) { string xid(data_src::get_xid(i)); @@ -86,7 +87,7 @@ BOOST_CHECK_EQUAL(xid[13], 'n'); BOOST_CHECK_EQUAL(xid[i-1], (char)('a' + ((i-1)%26))); } - for (size_t j=data_src::max_xsize-1024; j<data_src::max_xsize; j++,i++) + for (std::size_t j=data_src::max_xsize-1024; j<data_src::max_xsize; j++,i++) { string xid(data_src::get_xid(j)); Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_jrnl_instance.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -22,11 +22,12 @@ */ #include "../../unit_test.h" + +#include <iostream> #include "jrnl_init_params.hpp" #include "jrnl_instance.hpp" -#include <jrnl/jdir.hpp> -#include <jrnl/jerrno.hpp> -#include <iostream> +#include "jrnl/jdir.hpp" +#include "jrnl/jerrno.hpp" using namespace boost::unit_test; using namespace rhm::journal; Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -21,11 +21,12 @@ * The GNU Lesser General Public License is available in the file COPYING. */ +#include "../../unit_test.h" +#include <cstddef> #include <iomanip> -#include "../../unit_test.h" +#include <iostream> #include "test_case.hpp" #include "test_case_result.hpp" -#include <iostream> using namespace boost::unit_test; using namespace rhm::jtt; @@ -40,11 +41,11 @@ cout << test_filename << ".constructor: " << flush; const unsigned test_case_num = 0x12345; const u_int32_t num_msgs = 0x100; - const size_t min_data_size = 0x1000; - const size_t max_data_size = 0; + const std::size_t min_data_size = 0x1000; + const std::size_t max_data_size = 0; const bool auto_deq = true; - const size_t min_xid_size = 0x200; - const size_t max_xid_size = 0x200; + const std::size_t min_xid_size = 0x200; + const std::size_t max_xid_size = 0x200; using rhm::jtt::test_case; const test_case::transient_t transient = test_case::JTT_PERSISTNET; const test_case::external_t external = test_case::JDL_INTERNAL; @@ -70,11 +71,11 @@ cout << test_filename << ".results: " << flush; const unsigned test_case_num = 0x12345; const u_int32_t num_msgs = 0x100; - const size_t min_data_size = 0x1000; - const size_t max_data_size = 0; + const std::size_t min_data_size = 0x1000; + const std::size_t max_data_size = 0; const bool auto_deq = true; - const size_t min_xid_size = 0x200; - const size_t max_xid_size = 0x200; + const std::size_t min_xid_size = 0x200; + const std::size_t max_xid_size = 0x200; using rhm::jtt::test_case; const test_case::transient_t transient = test_case::JTT_PERSISTNET; const test_case::external_t external = test_case::JDL_INTERNAL; Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -22,9 +22,10 @@ */ #include "../../unit_test.h" -#include <jrnl/jexception.hpp> + +#include <iostream> +#include "jrnl/jexception.hpp" #include "test_case_result.hpp" -#include <iostream> using namespace boost::unit_test; using namespace rhm::journal; Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result_agregation.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result_agregation.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_result_agregation.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -22,8 +22,9 @@ */ #include "../../unit_test.h" +#include <ctime> +#include <iostream> #include "test_case_result_agregation.hpp" -#include <iostream> using namespace boost::unit_test; using namespace rhm::journal; @@ -38,7 +39,7 @@ void check_agregate(const test_case_result_agregation& tcra, const u_int32_t num_enq, const u_int32_t num_deq, const u_int32_t num_reads, const u_int32_t num_results, - const u_int32_t num_exceptions, const time_t secs, const long nsec) + const u_int32_t num_exceptions, const std::time_t secs, const long nsec) { BOOST_CHECK_EQUAL(tcra.num_enq(), num_enq); BOOST_CHECK_EQUAL(tcra.num_deq(), num_deq); @@ -52,7 +53,7 @@ } test_case_result::shared_ptr make_result(const string& jid, const u_int32_t num_enq, - const u_int32_t num_deq, const u_int32_t num_reads, const time_t secs, const long nsec) + const u_int32_t num_deq, const u_int32_t num_reads, const std::time_t secs, const long nsec) { test_case_result::shared_ptr tcrp(new test_case_result(jid)); for (unsigned i=0; i<num_enq; i++) Modified: store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/_ut_test_case_set.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -22,10 +22,11 @@ */ #include "../../unit_test.h" +#include <cstddef> +#include <iostream> #include <sys/stat.h> #include "test_case.hpp" #include "test_case_set.hpp" -#include <iostream> using namespace boost::unit_test; using namespace rhm::jtt; @@ -64,11 +65,11 @@ cout << test_filename << ".append_1: " << flush; const unsigned test_case_num = 0x12345; const u_int32_t num_msgs = 0x100; - const size_t min_data_size = 0x1000; - const size_t max_data_size = 0; + const std::size_t min_data_size = 0x1000; + const std::size_t max_data_size = 0; const bool auto_deq = true; - const size_t min_xid_size = 0x200; - const size_t max_xid_size = 0x200; + const std::size_t min_xid_size = 0x200; + const std::size_t max_xid_size = 0x200; using rhm::jtt::test_case; const test_case::transient_t transient = test_case::JTT_PERSISTNET; const test_case::external_t external = test_case::JDL_INTERNAL; @@ -97,11 +98,11 @@ cout << test_filename << ".append_2: " << flush; const unsigned test_case_num = 0x12345; const u_int32_t num_msgs = 0x100; - const size_t min_data_size = 0x1000; - const size_t max_data_size = 0; + const std::size_t min_data_size = 0x1000; + const std::size_t max_data_size = 0; const bool auto_deq = true; - const size_t min_xid_size = 0x200; - const size_t max_xid_size = 0x200; + const std::size_t min_xid_size = 0x200; + const std::size_t max_xid_size = 0x200; using rhm::jtt::test_case; const test_case::transient_t transient = test_case::JTT_PERSISTNET; const test_case::external_t external = test_case::JDL_INTERNAL; Modified: store/trunk/cpp/tests/jrnl/jtt/args.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/args.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/args.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -23,6 +23,7 @@ #include "args.hpp" +#include <cstddef> #include <iostream> namespace po = boost::program_options; @@ -140,12 +141,12 @@ args::get_jtt_path(const char* argv0) { std::string s(argv0); - size_t pos = s.rfind("/jtt"); + std::size_t pos = s.rfind("/jtt"); assert(pos != std::string::npos); if (pos > 1) { - size_t start = s.substr(0, 2).compare("./") == 0 ? 2 : 0; - size_t len = s.size() - start - 3; + std::size_t start = s.substr(0, 2).compare("./") == 0 ? 2 : 0; + std::size_t len = s.size() - start - 3; jtt_path = s.substr(start, len); } } Modified: store/trunk/cpp/tests/jrnl/jtt/data_src.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/data_src.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/data_src.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -23,6 +23,7 @@ #include "data_src.hpp" +#include <cstddef> #include <iomanip> #include <sstream> @@ -51,14 +52,14 @@ } const char* const -data_src::get_data(const size_t offs) +data_src::get_data(const std::size_t offs) { if (offs >= max_dsize) return 0; return _data_src + offs; } std::string -data_src::get_xid(const size_t xid_size) +data_src::get_xid(const std::size_t xid_size) { if (xid_size == 0) return ""; @@ -77,7 +78,7 @@ } const char* const -data_src::get_xid_content(const size_t offs) +data_src::get_xid_content(const std::size_t offs) { if (offs >= max_xsize) return 0; return _xid_src + offs; Modified: store/trunk/cpp/tests/jrnl/jtt/data_src.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/data_src.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/data_src.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -24,7 +24,8 @@ #ifndef rhm_jtt_data_src_hpp #define rhm_jtt_data_src_hpp -#include <jrnl/slock.hpp> +#include <cstddef> +#include "jrnl/slock.hpp" #include <pthread.h> #include <string> #include <sys/types.h> @@ -39,8 +40,8 @@ class data_src { public: - static const size_t max_dsize = DATA_SIZE; - static const size_t max_xsize = XID_SIZE; + static const std::size_t max_dsize = DATA_SIZE; + static const std::size_t max_xsize = XID_SIZE; private: static char _data_src[]; @@ -59,13 +60,13 @@ static mutex _m; public: - static const char* const get_data(const size_t offs); - static std::string get_xid(const size_t xid_size); + static const char* const get_data(const std::size_t offs); + static std::string get_xid(const std::size_t xid_size); private: data_src(); static u_int64_t get_xid_cnt() { rhm::journal::slock s(_m.m()); return _xid_cnt++; } - static const char* const get_xid_content(const size_t offs); + static const char* const get_xid_content(const std::size_t offs); static bool __init(); }; Modified: store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -23,13 +23,12 @@ #include "jrnl_instance.hpp" +#include <cstdlib> #include "data_src.hpp" +#include "jrnl/data_tok.hpp" +#include "jrnl/jerrno.hpp" #include "test_case_result.hpp" -#include <jrnl/data_tok.hpp> -#include <jrnl/jerrno.hpp> -#include <iostream> // debug - #define MAX_WR_WAIT 10 // in ms #define MAX_RD_WAIT 100 // in ms @@ -169,8 +168,8 @@ dtok_ptr p(new rhm::journal::data_tok); _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(); + const std::size_t msg_size = _tcp->this_data_size(); + const std::size_t xid_size = _tcp->this_xid_size(); const std::string xid(data_src::get_xid(xid_size)); const bool external = _tcp->this_external(); const bool transient = _tcp->this_transience(); @@ -246,7 +245,7 @@ bool do_read = true; if (rd_mode == read_arg::RANDOM) - do_read = 1.0 * ::rand() / RAND_MAX < _args_ptr->read_prob / 100.0; + do_read = 1.0 * std::rand() / RAND_MAX < _args_ptr->read_prob / 100.0; else if (rd_mode == read_arg::LAZYLOAD) do_read = _tcrp->num_rproc() >= _args_ptr->lld_skip_num && _tcrp->num_read() < _args_ptr->lld_rd_num; @@ -254,9 +253,9 @@ while (do_read && !read_compl && !_tcrp->exception()) { void* dptr = 0; - size_t dsize = 0; + std::size_t dsize = 0; void* xptr = 0; - size_t xsize = 0; + std::size_t xsize = 0; bool tr = false; bool ext = false; rhm::journal::iores res = read_data_record(&dptr, dsize, &xptr, xsize, tr, @@ -274,9 +273,9 @@ // clean up if (xsize) - ::free(xptr); + std::free(xptr); else if (dsize) - ::free(dptr); + std::free(dptr); dptr = 0; xptr = 0; break; Modified: store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/jrnl_instance.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -29,10 +29,10 @@ #include "test_case.hpp" #include <boost/shared_ptr.hpp> -#include <jrnl/cvar.hpp> -#include <jrnl/data_tok.hpp> -#include <jrnl/jcntl.hpp> -#include <jrnl/slock.hpp> +#include "jrnl/cvar.hpp" +#include "jrnl/data_tok.hpp" +#include "jrnl/jcntl.hpp" +#include "jrnl/slock.hpp" #include <list> #include <vector> Modified: store/trunk/cpp/tests/jrnl/jtt/main.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/main.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/main.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -23,9 +23,9 @@ #include "test_mgr.hpp" +#include "args.hpp" +#include <csignal> #include <iostream> -#include "args.hpp" -#include <signal.h> #define PACKAGE_NAME "Journal Test Tool" #define VERSION "0.1" @@ -34,8 +34,8 @@ int main(int argc, char** argv) { - ::signal(SIGINT, rhm::jtt::test_mgr::signal_handler); - ::signal(SIGTERM, rhm::jtt::test_mgr::signal_handler); + std::signal(SIGINT, rhm::jtt::test_mgr::signal_handler); + std::signal(SIGTERM, rhm::jtt::test_mgr::signal_handler); std::cout << PACKAGE_NAME << " v." << VERSION << std::endl; Modified: store/trunk/cpp/tests/jrnl/jtt/read_arg.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/read_arg.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/read_arg.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -23,7 +23,7 @@ #include "read_arg.hpp" -#include <assert.h> +#include <cassert> #include <boost/program_options.hpp> namespace po = boost::program_options; Modified: store/trunk/cpp/tests/jrnl/jtt/test_case.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/test_case.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -23,6 +23,7 @@ #include "test_case.hpp" +#include <cstdlib> #include <iomanip> #include <sstream> @@ -32,8 +33,8 @@ { test_case::test_case(const unsigned test_case_num, const u_int32_t num_msgs, - const size_t min_data_size, const size_t max_data_size, const bool auto_deq, - const size_t min_xid_size, const size_t max_xid_size, const transient_t transient, + const std::size_t min_data_size, const std::size_t max_data_size, const bool auto_deq, + const std::size_t min_xid_size, const std::size_t max_xid_size, const transient_t transient, const external_t external, const std::string& comment): _test_case_num(test_case_num), _num_msgs(num_msgs), @@ -52,28 +53,28 @@ test_case::~test_case() {} -size_t +std::size_t test_case::this_data_size() const { if (_min_data_size == _max_data_size) return _max_data_size; - size_t size_diff = _max_data_size - _min_data_size; - return _min_data_size + size_t(1.0 * ::rand() * size_diff/(RAND_MAX + 1.0)); + std::size_t size_diff = _max_data_size - _min_data_size; + return _min_data_size + std::size_t(1.0 * std::rand() * size_diff/(RAND_MAX + 1.0)); } -size_t +std::size_t test_case::this_xid_size() const { // TODO: rework when probabilities are introduced. Assume 50% if _min_xid_size = 0 if (_max_xid_size == 0) - return size_t(0); + return std::size_t(0); if (_min_xid_size == 0) { - if (1.0 * ::rand() / RAND_MAX < 0.5) - return size_t(0); + if (1.0 * std::rand() / RAND_MAX < 0.5) + return std::size_t(0); } - size_t size_diff = _max_xid_size - _min_xid_size; - return _min_xid_size + size_t(1.0 * ::rand() * size_diff/(RAND_MAX + 1.0)); + std::size_t size_diff = _max_xid_size - _min_xid_size; + return _min_xid_size + std::size_t(1.0 * std::rand() * size_diff/(RAND_MAX + 1.0)); } bool @@ -84,7 +85,7 @@ return false; if (_transient == JTT_PERSISTNET) return true; - return 1.0 * ::rand() / RAND_MAX < 0.5; + return 1.0 * std::rand() / RAND_MAX < 0.5; } bool @@ -95,7 +96,7 @@ return false; if (_external == JDL_EXTERNAL) return true; - return 1.0 * ::rand() / RAND_MAX < 0.5; + return 1.0 * std::rand() / RAND_MAX < 0.5; } void Modified: store/trunk/cpp/tests/jrnl/jtt/test_case.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/test_case.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -24,10 +24,11 @@ #ifndef rhm_jtt_test_case_hpp #define rhm_jtt_test_case_hpp +#include <boost/shared_ptr.hpp> +#include <cstddef> +#include <map> #include "test_case_result.hpp" #include "test_case_result_agregation.hpp" -#include <boost/shared_ptr.hpp> -#include <map> #include <vector> namespace rhm @@ -53,12 +54,12 @@ private: unsigned _test_case_num; u_int32_t _num_msgs; - size_t _min_data_size; - size_t _max_data_size; + std::size_t _min_data_size; + std::size_t _max_data_size; bool _auto_dequeue; // TODO: add probability of transaction to these params - size_t _min_xid_size; - size_t _max_xid_size; + std::size_t _min_xid_size; + std::size_t _max_xid_size; // TODO: change these enums (transient_t & external_t) to probabilities transient_t _transient; external_t _external; @@ -69,20 +70,21 @@ public: test_case(const unsigned test_case_num, const u_int32_t num_msgs, - const size_t min_data_size, const size_t max_data_size, const bool auto_deq, - const size_t min_xid_size, const size_t max_xid_size, const transient_t transient, + const std::size_t min_data_size, const std::size_t max_data_size, + const bool auto_deq, const std::size_t min_xid_size, + const std::size_t max_xid_size, const transient_t transient, const external_t external, const std::string& comment); ~test_case(); inline unsigned test_case_num() const { return _test_case_num; } inline u_int32_t num_msgs() const { return _num_msgs; } - inline size_t min_data_size() const { return _min_data_size; } - inline size_t max_data_size() const { return _max_data_size; } - size_t this_data_size() const; + inline std::size_t min_data_size() const { return _min_data_size; } + inline std::size_t max_data_size() const { return _max_data_size; } + std::size_t this_data_size() const; inline bool auto_deq() const { return _auto_dequeue; } - inline size_t min_xid_size() const { return _min_xid_size; } - inline size_t max_xid_size() const { return _max_xid_size; } - size_t this_xid_size() const; + inline std::size_t min_xid_size() const { return _min_xid_size; } + inline std::size_t max_xid_size() const { return _max_xid_size; } + std::size_t this_xid_size() const; inline transient_t transient() const { return _transient; } bool this_transience() const; inline external_t external() const { return _external; } Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_result.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case_result.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/test_case_result.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -26,8 +26,8 @@ #include <boost/shared_ptr.hpp> #include <deque> -#include <jrnl/jexception.hpp> -#include <jrnl/time_ns.hpp> +#include "jrnl/jexception.hpp" +#include "jrnl/time_ns.hpp" #include <string> namespace rhm Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_set.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case_set.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/test_case_set.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -23,6 +23,7 @@ #include "test_case_set.hpp" +#include <cstdlib> #include <fstream> #include <iostream> @@ -49,8 +50,8 @@ void test_case_set::append(const unsigned test_case_num, const u_int32_t num_msgs, - const size_t min_data_size, const size_t max_data_size, const bool auto_deq, - const size_t min_xid_size, const size_t max_xid_size, + const std::size_t min_data_size, const std::size_t max_data_size, const bool auto_deq, + const std::size_t min_xid_size, const std::size_t max_xid_size, const test_case::transient_t transient, const test_case::external_t external, const std::string& comment) { @@ -89,11 +90,11 @@ { unsigned test_case_num = 0; u_int32_t num_msgs = 0; - size_t min_data_size = 0; - size_t max_data_size = 0; + std::size_t min_data_size = 0; + std::size_t max_data_size = 0; bool auto_deq = false; - size_t min_xid_size = 0; - size_t max_xid_size = 0; + std::size_t min_xid_size = 0; + std::size_t max_xid_size = 0; test_case::transient_t transient = test_case::JTT_TRANSIENT; test_case::external_t external = test_case::JDL_INTERNAL; std::string comment; @@ -111,17 +112,17 @@ case CSV_TC_NUM: if (!tok.size() || tok[0] < '0' || tok[0] > '9') return test_case::shared_ptr(); - test_case_num = unsigned(::atol(tok.c_str())); + test_case_num = unsigned(std::atol(tok.c_str())); break; - case CSV_TC_NUM_MSGS: num_msgs = u_int32_t(::atol(tok.c_str())); break; - case CSV_TC_MIN_DATA_SIZE: min_data_size = size_t(::atol(tok.c_str())); break; - case CSV_TC_MAX_DATA_SIZE: max_data_size = size_t(::atol(tok.c_str())); break; + case CSV_TC_NUM_MSGS: num_msgs = u_int32_t(std::atol(tok.c_str())); break; + case CSV_TC_MIN_DATA_SIZE: min_data_size = std::size_t(std::atol(tok.c_str())); break; + case CSV_TC_MAX_DATA_SIZE: max_data_size = std::size_t(std::atol(tok.c_str())); break; case CSV_TC_AUTO_DEQ: if (tok == "TRUE" || tok == "1") auto_deq = true; break; - case CSV_TC_MIN_XID_SIZE: min_xid_size = size_t(::atol(tok.c_str())); break; - case CSV_TC_MAX_XID_SIZE: max_xid_size = size_t(::atol(tok.c_str())); break; + case CSV_TC_MIN_XID_SIZE: min_xid_size = std::size_t(std::atol(tok.c_str())); break; + case CSV_TC_MAX_XID_SIZE: max_xid_size = std::size_t(std::atol(tok.c_str())); break; case CSV_TC_TRANSIENT: if (tok == "TRUE" || tok == "1") transient = test_case::JTT_PERSISTNET; Modified: store/trunk/cpp/tests/jrnl/jtt/test_case_set.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_case_set.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/test_case_set.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -26,6 +26,7 @@ #include "test_case.hpp" +#include <cstddef> #include <boost/tokenizer.hpp> #include <map> #include <vector> @@ -78,9 +79,9 @@ inline void append(const test_case::shared_ptr& tc) { _tc_list.push_back(tc); } void append(const unsigned test_case_num, const u_int32_t num_msgs, - const size_t min_data_size, const size_t max_data_size, const bool auto_deq, - const size_t min_xid_size, const size_t max_xid_size, - const test_case::transient_t transient, + const std::size_t min_data_size, const std::size_t max_data_size, + const bool auto_deq, const std::size_t min_xid_size, + const std::size_t max_xid_size, const test_case::transient_t transient, const test_case::external_t external, const std::string& comment); void append_from_csv(const std::string& csv_filename, const bool recover_mode, const csv_map& cols = std_csv_map); Modified: store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/test_mgr.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -23,6 +23,7 @@ #include "test_mgr.hpp" +#include <cstdlib> #include <iostream> #include "test_case_set.hpp" @@ -37,7 +38,7 @@ _random_fn_ptr(random_fn) { if (_args.seed) - ::srand(_args.seed); + std::srand(_args.seed); } test_mgr::~test_mgr() Modified: store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/jtt/test_mgr.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -24,9 +24,10 @@ #ifndef rhm_jtt_test_mgr_hpp #define rhm_jtt_test_mgr_hpp +#include "args.hpp" +#include <csignal> +#include <cstdlib> #include "jrnl_instance.hpp" -#include "args.hpp" -#include <signal.h> namespace rhm { @@ -43,7 +44,7 @@ ji_list _ji_list; args& _args; ptrdiff_t (*_random_fn_ptr)(const ptrdiff_t i); - static volatile sig_atomic_t _signal; + static volatile std::sig_atomic_t _signal; static volatile bool _abort; public: @@ -57,7 +58,7 @@ void initialize_jrnls(); void print_results(test_case::shared_ptr tcp, const bool summary); inline static ptrdiff_t random_fn(const ptrdiff_t i) - { return static_cast<ptrdiff_t>(1.0 * i * ::rand() / RAND_MAX); } + { return static_cast<ptrdiff_t>(1.0 * i * std::rand() / RAND_MAX); } }; } // namespace jtt Modified: store/trunk/cpp/tests/jrnl/msg_consumer.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/msg_consumer.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/msg_consumer.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -29,17 +29,19 @@ #include "msg_consumer.hpp" -#include <sstream> +#include <cstdlib> #include <cstring> #include <iostream> +#include <sstream> #include <unistd.h> -#include <jrnl/jerrno.hpp> +#include "jrnl/jerrno.hpp" #define EXCEPTION_BASE 0x40 msg_consumer::_c_args::_c_args(rhm::journal::jcntl& jc, const u_int32_t num_msgs, - const size_t min_msg_size, const size_t max_msg_size, const size_t min_xid_size, - const size_t max_xid_size, const bool transient, const bool external): + const std::size_t min_msg_size, const std::size_t max_msg_size, + const std::size_t min_xid_size, const std::size_t max_xid_size, const bool transient, + const bool external): _jc(jc), _num_msgs(num_msgs), _min_msg_size(min_msg_size), @@ -98,18 +100,20 @@ u_int32_t msg_consumer::consume(rhm::journal::jcntl& _jcntl, const u_int32_t num_msgs, #ifdef RHM_TIMERS - const size_t, const size_t, const size_t, const size_t, const bool, const bool) + const std::size_t, const std::size_t, const std::size_t, const std::size_t, + const bool, const bool) #else - const size_t min_msg_size, const size_t max_msg_size, const size_t min_xid_size, - const size_t max_xid_size, const bool transient_expected, const bool external_expected) + const std::size_t min_msg_size, const std::size_t max_msg_size, + const std::size_t min_xid_size, const std::size_t max_xid_size, + const bool transient_expected, const bool external_expected) #endif throw (rhm::journal::jexception) { //std::cout << "msg_consumer::consume() num_msgs=" << num_msgs << std::endl; void* datap = NULL; - size_t data_size = 0; + std::size_t data_size = 0; void* xidp = NULL; - size_t xid_size = 0; + std::size_t xid_size = 0; bool transient_flag = false; bool external_flag = false; @@ -200,9 +204,9 @@ // Clean up allocated message/xid memory if (xidp) - ::free(xidp); + std::free(xidp); else if (datap) - ::free(datap); + std::free(datap); datap = NULL; data_size = 0; xidp = NULL; @@ -231,8 +235,9 @@ } void -msg_consumer::check_msg(const u_int32_t msgCntr, const size_t msg_size, const size_t min_msg_size, - const size_t max_msg_size, bool chk_data, void* datap) const +msg_consumer::check_msg(const u_int32_t msgCntr, const std::size_t msg_size, + const std::size_t min_msg_size, const std::size_t max_msg_size, bool chk_data, + void* datap) const throw (rhm::journal::jexception) { if (max_msg_size > 0 && (msg_size < min_msg_size || msg_size > max_msg_size)) @@ -268,8 +273,9 @@ } void -msg_consumer::check_xid(const u_int32_t msgCntr, const size_t xid_size, const size_t min_xid_size, - const size_t max_xid_size, bool chk_xid_data, void* xidp) const +msg_consumer::check_xid(const u_int32_t msgCntr, const std::size_t xid_size, + const std::size_t min_xid_size, const std::size_t max_xid_size, bool chk_xid_data, + void* xidp) const throw (rhm::journal::jexception) { if (max_xid_size > 0 && (xid_size < min_xid_size || xid_size > max_xid_size)) @@ -342,7 +348,7 @@ } void -msg_consumer::print_dbug(const u_int32_t msgCntr, const size_t msg_size, char* buff, +msg_consumer::print_dbug(const u_int32_t msgCntr, const std::size_t msg_size, char* buff, const bool show_msg) const { // std::cout << 'c' << std::flush; @@ -354,7 +360,7 @@ std::cout << buff; else { - size_t i=0; + std::size_t i=0; for (; i<20; i++) std::cout << buff[i]; std::cout << " ... "; @@ -379,6 +385,6 @@ }; u_int16_t msg_consumer::instCnt = 0; -// const size_t msg_consumer::buffSize = JRNL_DBLK_SIZE * JRNL_SBLK_SIZE * JRNL_FILE_SIZE * JRNL_NUM_FILES; +// const std::size_t msg_consumer::buffSize = JRNL_DBLK_SIZE * JRNL_SBLK_SIZE * JRNL_FILE_SIZE * JRNL_NUM_FILES; // char msg_consumer::_msg_buff[msg_consumer::buffSize]; bool msg_consumer::_interrupt_flag = false; Modified: store/trunk/cpp/tests/jrnl/msg_consumer.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/msg_consumer.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/msg_consumer.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -29,8 +29,9 @@ #ifndef msg_consumer_hpp #define msg_consumer_hpp -#include <jrnl/jcntl.hpp> -#include <jrnl/jexception.hpp> +#include <cstddef> +#include "jrnl/jcntl.hpp" +#include "jrnl/jexception.hpp" #define MAX_AIO_SLEEPS 500 #define AIO_SLEEP_TIME 1000 @@ -47,23 +48,23 @@ { rhm::journal::jcntl& _jc; u_int32_t _num_msgs; - size_t _min_msg_size; - size_t _max_msg_size; - size_t _min_xid_size; - size_t _max_xid_size; + std::size_t _min_msg_size; + std::size_t _max_msg_size; + std::size_t _min_xid_size; + std::size_t _max_xid_size; bool _transient; bool _external; u_int32_t _err; - _c_args(rhm::journal::jcntl& jc, const u_int32_t num_msgs, const size_t min_msg_size, - const size_t max_msg_size, const size_t min_xid_size, const size_t max_xid_size, - const bool transient, const bool external); + _c_args(rhm::journal::jcntl& jc, const u_int32_t num_msgs, const std::size_t min_msg_size, + const std::size_t max_msg_size, const std::size_t min_xid_size, + const std::size_t max_xid_size, const bool transient, const bool external); }; static const char* iores_str[]; private: static u_int16_t instCnt; -// static const size_t buffSize; +// static const std::size_t buffSize; // static char _msg_buff[]; static bool _interrupt_flag; u_int32_t _num_msgs; @@ -82,8 +83,9 @@ void finalize(); u_int32_t consume(rhm::journal::jcntl& _jcntl, const u_int32_t numMsgs, - const size_t min_msg_size, const size_t max_msg_size, const size_t min_xid_size, - const size_t max_xid_size, const bool transient_expected, const bool external_expected) + const std::size_t min_msg_size, const std::size_t max_msg_size, + const std::size_t min_xid_size, const std::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, std::vector<u_int16_t>& pil); @@ -93,17 +95,19 @@ inline std::deque<rhm::journal::data_tok*>& aio_dtokl() { return _aio_cmpl_dtok_list; } static void interrupt(); private: - void check_msg(const u_int32_t msgCntr, const size_t msg_size, const size_t min_msg_size, - const size_t max_msg_size, bool chk_data, void* datap) const + void check_msg(const u_int32_t msgCntr, const std::size_t msg_size, + const std::size_t min_msg_size, const std::size_t max_msg_size, bool chk_data, + void* datap) const throw (rhm::journal::jexception); - void check_xid(const u_int32_t msgCntr, const size_t xid_size, const size_t min_xid_size, - const size_t max_xid_size, bool chk_xid_data, void* xidp) const + void check_xid(const u_int32_t msgCntr, const std::size_t xid_size, + const std::size_t min_xid_size, const std::size_t max_xid_size, bool chk_xid_data, + void* xidp) const throw (rhm::journal::jexception); void check_transience(const u_int32_t msgCntr, const bool transient_flag, const bool transient_expected_flag) const throw (rhm::journal::jexception); void check_external(const u_int32_t msgCntr, const bool external_flag, const bool external_expected_flag) const throw (rhm::journal::jexception); - void print_dbug(const u_int32_t msgCntr, const size_t msg_size, char* buff, + void print_dbug(const u_int32_t msgCntr, const std::size_t msg_size, char* buff, const bool show_msg = false) const; }; // class msg_consumer Modified: store/trunk/cpp/tests/jrnl/msg_producer.cpp =================================================================== --- store/trunk/cpp/tests/jrnl/msg_producer.cpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/msg_producer.cpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -29,15 +29,16 @@ #include "msg_producer.hpp" -#include <assert.h> +#include <cassert> +#include <cstdlib> #include <iostream> #include <sstream> #define EXCEPTION_BASE 0x50 msg_producer::_p_args::_p_args(rhm::journal::jcntl& jc, u_int32_t num_msgs, - size_t min_msg_size, size_t max_msg_size, bool auto_dequeue, size_t min_xid_size, - size_t max_xid_size, bool transient, bool external): + std::size_t min_msg_size, std::size_t max_msg_size, bool auto_dequeue, + std::size_t min_xid_size, std::size_t max_xid_size, bool transient, bool external): _jc(jc), _num_msgs(num_msgs), _min_msg_size(min_msg_size), @@ -106,8 +107,9 @@ } u_int32_t -msg_producer::produce(rhm::journal::jcntl& jc, const size_t minMsgSize, const size_t maxMsgSize, - const size_t minXidSize, const size_t maxXidSize, const bool transient, const bool external) +msg_producer::produce(rhm::journal::jcntl& jc, const std::size_t minMsgSize, + const std::size_t maxMsgSize, const std::size_t minXidSize, const std::size_t maxXidSize, + const bool transient, const bool external) throw (rhm::journal::jexception) { _jcptr = &jc; @@ -123,11 +125,11 @@ { unsigned aio_sleep_cnt = 0; unsigned jfull_sleep_cnt = 0; - size_t xid_size = maxXidSize; + std::size_t xid_size = maxXidSize; if (minXidSize < maxXidSize) { - size_t sizeRange = maxXidSize - minXidSize + 1; - xid_size = minXidSize + (int)(1.0*rand()*sizeRange/(RAND_MAX + 1.0)); + std::size_t sizeRange = maxXidSize - minXidSize + 1; + xid_size = minXidSize + (int)(1.0*std::rand()*sizeRange/(RAND_MAX + 1.0)); } int xid_num_size = xid_size - 5 > 16 ? 16 : xid_size - 5; std::stringstream xid; @@ -135,11 +137,11 @@ xid << std::setw(xid_num_size) << msgCntr << ":"; for (unsigned i = xid_num_size + 5; i < xid_size; i++) xid << (char)('a' + (i%26)); - size_t size = maxMsgSize; + std::size_t size = maxMsgSize; if (minMsgSize < maxMsgSize) { - size_t sizeRange = maxMsgSize - minMsgSize + 1; - size = minMsgSize + (int)(1.0*rand()*sizeRange/(RAND_MAX + 1.0)); + std::size_t sizeRange = maxMsgSize - minMsgSize + 1; + size = minMsgSize + (int)(1.0*std::rand()*sizeRange/(RAND_MAX + 1.0)); } const void* const msg = (char*)_msg_buff + (msgCntr%10); rhm::journal::data_tok* dtokp = _dtok_master_list[msgCntr]; @@ -471,7 +473,8 @@ } void -msg_producer::print_dbug(u_int32_t msg_cnt, size_t msg_size, char* _msg_buff, bool show_msg) const +msg_producer::print_dbug(u_int32_t msg_cnt, std::size_t msg_size, char* _msg_buff, + bool show_msg) const { std::cout << "msg_producer::produce(): wrote msg " << msg_cnt << " size=" << msg_size; if (show_msg) @@ -481,12 +484,12 @@ { // Since _msg_buff points to a *very* large buffer of data, we must still // count out how much we are printing here. - for (size_t i=0; i<msg_size; i++) + for (std::size_t i=0; i<msg_size; i++) std::cout << _msg_buff[i]; } else { - size_t i=0; + std::size_t i=0; for (; i<20; i++) std::cout << _msg_buff[i]; std::cout << " ... "; @@ -501,7 +504,7 @@ } u_int16_t msg_producer::instance_cnt = 0; -const size_t msg_producer::_msg_buff_size = 0x1000000; +const std::size_t msg_producer::_msg_buff_size = 0x1000000; char msg_producer::_msg_buff[msg_producer::_msg_buff_size]; bool msg_producer::_interrupt_flag = false; Modified: store/trunk/cpp/tests/jrnl/msg_producer.hpp =================================================================== --- store/trunk/cpp/tests/jrnl/msg_producer.hpp 2008-04-09 15:08:36 UTC (rev 1884) +++ store/trunk/cpp/tests/jrnl/msg_producer.hpp 2008-04-09 15:12:56 UTC (rev 1885) @@ -29,7 +29,8 @@ #ifndef msg_producer_hpp #define msg_producer_hpp -#include <jrnl/jcntl.hpp> +#include <cstddef> +#include "jrnl/jcntl.hpp" #define MAX_AIO_SLEEPS 500 #define AIO_SLEEP_TIME 1000 @@ -47,22 +48,22 @@ { rhm::journal::jcntl& _jc; u_int32_t _num_msgs; - size_t _min_msg_size; - size_t _max_msg_size; + std::size_t _min_msg_size; + std::size_t _max_msg_size; bool _auto_dequeue; - size_t _min_xid_size; - size_t _max_xid_size; + std::size_t _min_xid_size; + std::size_t _max_xid_size; bool _transient; bool _external; u_int32_t _err; - _p_args(rhm::journal::jcntl& jc, u_int32_t num_msgs, size_t min_msg_size, - size_t max_msg_size, bool auto_dequeue, size_t min_xid_size, - size_t max_xid_size, bool transient, bool external); + _p_args(rhm::journal::jcntl& jc, u_int32_t num_msgs, std::size_t min_msg_size, + std::size_t max_msg_size, bool auto_dequeue, std::size_t min_xid_size, + std::size_t max_xid_size, bool transient, bool external); }; private: static u_int16_t instance_cnt; - static const size_t _msg_buff_size; + static const std::size_t _msg_buff_size; static char _msg_buff[]; static bool _interrupt_flag; rhm::journal::jcntl* _jcptr; @@ -89,9 +90,10 @@ void initialize(_p_args* args); void finalize(); - u_int32_t produce(rhm::journal::jcntl& jc, const size_t minMsgSize, const size_t maxMsgSize, - const size_t minXidSize, const size_t maxXidSize, const bool transient, - const bool external) throw (rhm::journal::jexception); + u_int32_t produce(rhm::journal::jcntl& jc, const std::size_t minMsgSize, + const std::size_t maxMsgSize, const std::size_t minXidSize, + const std::size_t maxXidSize, const bool transient, const bool external) + throw (rhm::journal::jexception); u_int32_t produce(_p_args* args) throw (rhm::journal::jexception); void aio_callback(rhm::journal::jcntl* jc, std::vector<rhm::journal::data_tok*>& dtokl); @@ -104,7 +106,8 @@ void init_msg_buff(); void send_deferred_dequeues(rhm::journal::jcntl& jc); void jrnl_flush(rhm::journal::jcntl& jc, u_int32_t num_msgs_sent); - void print_dbug(u_int32_t msg_cnt, size_t msg_size, char* _msg_buff, bool show_msg = false) const; + void print_dbug(u_int32_t msg_cnt, std::size_t msg_size, char* _msg_buff, + bool show_msg = false) const; }; // class msg_producer