Author: kpvdr Date: 2007-09-05 15:05:28 -0400 (Wed, 05 Sep 2007) New Revision: 907 Modified: store/trunk/cpp/Makefile.am store/trunk/cpp/docs/Makefile.am store/trunk/cpp/tests/jrnl/rwtests.csv store/trunk/cpp/tests/jrnl/tests.ods Log: Disabled Latex compilation until doxygen latex generation problems are sorted out. Modified: store/trunk/cpp/Makefile.am =================================================================== --- store/trunk/cpp/Makefile.am 2007-09-05 16:14:52 UTC (rev 906) +++ store/trunk/cpp/Makefile.am 2007-09-05 19:05:28 UTC (rev 907) @@ -3,7 +3,7 @@ EXTRA_DIST = README -SUBDIRS = lib tests docs +SUBDIRS = lib tests # Update libtool, if needed. libtool: $(LIBTOOL_DEPS) Modified: store/trunk/cpp/docs/Makefile.am =================================================================== --- store/trunk/cpp/docs/Makefile.am 2007-09-05 16:14:52 UTC (rev 906) +++ store/trunk/cpp/docs/Makefile.am 2007-09-05 19:05:28 UTC (rev 907) @@ -5,24 +5,26 @@ DOXYGEN = @DOXYGEN@ -EXTRA_DIST = html man rhmj.pdf rhmj.ps +EXTRA_DIST = html man #rhmj.pdf rhmj.ps all: doxygen man: doxygen -rhmj: doxygen +#rhmj: doxygen -rhmj: doxygen +#rhmj: doxygen doxygen: if DOXYGEN @doxygen jrnl_tmpl.dox - @make -C latex - @cd latex; dvipdf refman.dvi refman.pdf - @cd latex; dvips refman.dvi -o refman.ps - @ln -fs latex/refman.pdf rhmj.pdf - @ln -fs latex/refman.ps rhmj.ps +# FIXME: doxygen seems to create files that do not compile under latex on 64-bit +# so the following section is disabled until this is sorted out. +# @make -C latex +# @cd latex; dvipdf refman.dvi refman.pdf +# @cd latex; dvips refman.dvi -o refman.ps +# @ln -fs latex/refman.pdf rhmj.pdf +# @ln -fs latex/refman.ps rhmj.ps else @echo "Doxygen not found during configuration; documentation skipped." endif Modified: store/trunk/cpp/tests/jrnl/rwtests.csv =================================================================== --- store/trunk/cpp/tests/jrnl/rwtests.csv 2007-09-05 16:14:52 UTC (rev 906) +++ store/trunk/cpp/tests/jrnl/rwtests.csv 2007-09-05 19:05:28 UTC (rev 907) @@ -20,39 +20,48 @@ 12,10,477,477,TRUE,,"1 sblk + 1 byte" ,,,,,, "Transition from first page to second",,,,,, -13,8,8156,8156,FALSE,,"8 * 1/8 page; Total = 1 page exact fit" -14,9,8156,8156,FALSE,,"9 * 1/8 page" -15,8,8157,8157,FALSE,,"8 * (1/8 page + 1 byte)" -16,8,8028,8028,TRUE,,"8 * (1/8 page - 1 dblk for deq record); Total = 1 page exact fit with deqs" -17,9,8028,8028,TRUE,,"9 * (1/8 page - 1 dblk for deq record)" -18,8,8029,8029,TRUE,,"8 * (1/8 page - 1 dblk for deq record + 1 byte)" +13,8,4060,4060,FALSE,,"8 * 1/8 page; Total = 1 page exact fit" +14,9,4060,4060,FALSE,,"9 * 1/8 page" +15,8,4061,4061,FALSE,,"8 * (1/8 page + 1 byte)" +16,8,3932,3932,TRUE,,"8 * (1/8 page - 1 dblk for deq record); Total = 1 page exact fit with deqs" +17,9,3932,3932,TRUE,,"9 * (1/8 page - 1 dblk for deq record)" +18,8,3933,3933,TRUE,,"8 * (1/8 page - 1 dblk for deq record + 1 byte)" ,,,,,, -"Multi-page messages (large messages) - tests various paths in encoder; no dequeues required to test this functionality.",,,,,, -19,2,65500,65500,FALSE,,"2 * (1 page exact fit)" -20,2,65501,65501,FALSE,,"2 * (1 page + 1 byte): tail split" -21,2,65512,65512,FALSE,,"2 * (1 page + 12 bytes): tail separated exactly" -22,2,65513,65513,FALSE,,"2 * (1 page + 13 bytes): data split" -23,2,131036,131036,FALSE,,"2 * (2 pages exact fit)" -24,2,131037,131037,FALSE,,"2 * (2 pages + 1 byte): tail split" -25,2,131048,131048,FALSE,,"2 * (2 pages + 12 bytes): tail separated exactly" -26,2,131049,131049,FALSE,,"2 * (2 pages + 13 bytes) data split" -27,1,262108,262108,FALSE,,"4 pages exact fit" -28,1,262109,262109,FALSE,,"4 pages + 1 byte: tail split" -29,1,262120,262120,FALSE,,"4 pages + 12 bytes: tail separated" -30,1,262121,262121,FALSE,,"4 pages + 13 bytes: data split" -31,2,229340,229340,FALSE,,"2 * 3.5 pages; Total = 7 pages" -,,,,,, "Page cache rollover (from page 32 back to page 0) - no dequeues as exact sizes are needed and dequeues are non-deterministic",,,,,, -32,32,65500,65500,FALSE,,"32 * (1 page exact fit); Total = entire cache exactly" -33,33,65500,65500,FALSE,,"33 * (1 page exact fit); Total = entire cache + reuse of 1 page" -34,22,98268,98268,FALSE,,"22 * 1.5 pages" -35,22,98140,98140,TRUE,,"22 * (1.5 pages including 1 sblk for deq record)" +19,32,32732,32732,FALSE,,"32 * (1 page exact fit); Total = entire cache exactly" +20,33,32732,32732,FALSE,,"33 * (1 page exact fit); Total = entire cache + reuse of 1 page" +21,22,49116,49116,FALSE,,"22 * 1.5 pages" +22,22,48988,48988,TRUE,,"22 * (1.5 pages including 1 sblk for deq record)" ,,,,,, "File transition (from file 0000 to 0001) - no dequeues as exact sizes are needed and dequeues are non-deterministic",,,,,, -36,48,65500,65500,FALSE,,"48 * (1 page exact fit); Total = entire file exactly" -37,49,65500,65500,FALSE,,"49 * (1 page exact fit); Total = entire file + 1 page" -38,20,163804,163804,FALSE,,"20 * (2.5 pages); Total = entire file + 2 pages" -39,20,163676,163676,TRUE,,"20 * (2.5 pages including 1 sblk for deq record); Total = entire file + 2 pages" +23,48,32732,32732,FALSE,,"48 * (1 page exact fit); Total = entire file exactly" +24,49,32732,32732,FALSE,,"49 * (1 page exact fit); Total = entire file + 1 page" +25,20,81884,81884,FALSE,,"20 * (2.5 pages); Total = entire file + 2 pages" +26,20,81756,81756,TRUE,,"20 * (2.5 pages including 1 sblk for deq record); Total = entire file + 2 pages" ,,,,,, "File rollover (from file 0007 to 0000) - RHM_WRONLY req'd for auto-dequeue == FALSE",,,,,, -40,16,786396,786396,FALSE,,"16 * (12 pages = ? file); Total = 8 files exactly" +27,16,786396,786396,FALSE,,"16 * (24 pages = ½ file); Total = 8 files exactly" +28,17,786396,786396,FALSE,,"17 * (24 pages = ½ file); Total = 8 files + file 0 overwritten by ½ file" +29,16,786397,786397,FALSE,,"16 * (24 pages + 1 byte); Total = 8 files + file 0 overwritten by 16 sblks" +30,32,786396,786396,FALSE,,"32 * (24 pages = ½ file); Total = 16 files exactly, all files overwritten once" +31,33,786396,786396,FALSE,,"33 * (24 pages = ½ file); Total = 16 ½ files, all files overwritten once + file 0 overwritten again by ½ file" +32,32,786397,786397,FALSE,,"32 * (24 pages + 1 byte); All files overwritten once + file 0 overwritten again by 32 sblks" +,,,,,, +"Multi-page messages (large messages) - tests various paths in encoder; no dequeues required to test this functionality.",,,,,, +33,16,32732,32732,FALSE,,"16 * (1 page exact fit)" +34,16,32733,32733,FALSE,,"16 * (1 page + 1 byte): tail split" +35,16,32743,32743,FALSE,,"16 * (1 page + 11 bytes): tail split" +36,16,32744,32744,FALSE,,"16 * (1 page + 12 bytes): tail separated exactly" +37,16,32745,32745,FALSE,,"16 * (1 page + 13 bytes): data split" +38,16,65500,65500,FALSE,,"16 * (2 pages exact fit)" +39,16,65501,65501,FALSE,,"16 * (2 pages + 1 byte): tail split" +40,16,65511,65511,FALSE,,"16 * (2 pages + 11 bytes): tail split" +41,16,65512,65512,FALSE,,"16 * (2 pages + 12 bytes): tail separated exactly" +42,16,65513,65513,FALSE,,"16 * (2 pages + 13 bytes) data split" +43,16,131036,131036,FALSE,,"16 * (4 pages exact fit)" +44,16,131037,131037,FALSE,,"16 * (4 pages + 1 byte: tail split)" +45,16,131047,131047,FALSE,,"16 * (4 pages + 1 byte: tail split)" +46,16,131048,131048,FALSE,,"16 * (4 pages + 12 bytes: tail separated)" +47,16,131049,131049,FALSE,,"16 * (4 pages + 13 bytes: data split)" +48,16,114652,114652,FALSE,,"16 * (3.5 pages)" +49,16,114653,114653,FALSE,,"16 * (3.5 pages + 1 byte)" Modified: store/trunk/cpp/tests/jrnl/tests.ods =================================================================== (Binary files differ)