-- cgit v1.2.3 From f4c20290509d7ed3a8fd5304577e7a4cc0b9d974 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Tue, 3 Apr 2007 03:49:53 +0000 Subject: Ok, no code is left in src, it's all in src/old. We'll gradually move code back into src as it's fixed and re-org'd. This includes tests, which, I may write a unit test system into libbu++ just to make my life easier. --- src/arraylist.cpp | 100 ---- src/arraylist.h | 80 --- src/cgi.cpp | 644 -------------------- src/cgi.h | 196 ------- src/configmanagerbase.cpp | 63 -- src/configmanagerbase.h | 24 - src/confpair.cpp | 2 - src/confpair.h | 81 --- src/confpairbase.cpp | 17 - src/confpairbase.h | 24 - src/conftree.cpp | 9 - src/conftree.h | 19 - src/connection.cpp | 564 ------------------ src/connection.h | 411 ------------- src/connectionmanager.cpp | 397 ------------- src/connectionmanager.h | 169 ------ src/connectionmonitor.cpp | 10 - src/connectionmonitor.h | 47 -- src/exceptionbase.cpp | 70 --- src/exceptionbase.h | 105 ---- src/exceptions.cpp | 8 - src/exceptions.h | 25 - src/flexbuf.cpp | 229 -------- src/flexbuf.h | 162 ------ src/formula.cpp | 262 --------- src/formula.h | 77 --- src/fstring.cpp | 13 - src/fstring.h | 651 --------------------- src/hash.cpp | 113 ---- src/hash.h | 744 ------------------------ src/hashable.cpp | 1 - src/hashable.h | 12 - src/hashfunction.cpp | 10 - src/hashfunction.h | 48 -- src/hashfunctioncasestring.cpp | 39 -- src/hashfunctioncasestring.h | 28 - src/hashfunctionint.cpp | 20 - src/hashfunctionint.h | 26 - src/hashfunctionstring.cpp | 51 -- src/hashfunctionstring.h | 27 - src/hashtable.cpp | 424 -------------- src/hashtable.h | 308 ---------- src/http.cpp | 377 ------------ src/http.h | 273 --------- src/httpget.cpp | 263 --------- src/httpget.h | 44 -- src/linkedlist.cpp | 210 ------- src/linkedlist.h | 87 --- src/linkmessage.cpp | 44 -- src/linkmessage.h | 39 -- src/linkmessenger.cpp | 41 -- src/linkmessenger.h | 32 - src/list.cpp | 10 - src/list.h | 101 ---- src/md5.cpp | 190 ------ src/md5.h | 81 --- src/multilog.cpp | 102 ---- src/multilog.h | 130 ----- src/multilogchannel.cpp | 13 - src/multilogchannel.h | 46 -- src/multilogtext.cpp | 188 ------ src/multilogtext.h | 70 --- src/old/arraylist.cpp | 100 ++++ src/old/arraylist.h | 80 +++ src/old/cgi.cpp | 644 ++++++++++++++++++++ src/old/cgi.h | 196 +++++++ src/old/configmanagerbase.cpp | 63 ++ src/old/configmanagerbase.h | 24 + src/old/confpair.cpp | 2 + src/old/confpair.h | 81 +++ src/old/confpairbase.cpp | 17 + src/old/confpairbase.h | 24 + src/old/conftree.cpp | 9 + src/old/conftree.h | 19 + src/old/connection.cpp | 564 ++++++++++++++++++ src/old/connection.h | 411 +++++++++++++ src/old/connectionmanager.cpp | 397 +++++++++++++ src/old/connectionmanager.h | 169 ++++++ src/old/connectionmonitor.cpp | 10 + src/old/connectionmonitor.h | 47 ++ src/old/exceptionbase.cpp | 70 +++ src/old/exceptionbase.h | 105 ++++ src/old/exceptions.cpp | 8 + src/old/exceptions.h | 25 + src/old/flexbuf.cpp | 229 ++++++++ src/old/flexbuf.h | 162 ++++++ src/old/formula.cpp | 262 +++++++++ src/old/formula.h | 77 +++ src/old/fstring.cpp | 13 + src/old/fstring.h | 651 +++++++++++++++++++++ src/old/hash.cpp | 113 ++++ src/old/hash.h | 744 ++++++++++++++++++++++++ src/old/hashable.cpp | 1 + src/old/hashable.h | 12 + src/old/hashfunction.cpp | 10 + src/old/hashfunction.h | 48 ++ src/old/hashfunctioncasestring.cpp | 39 ++ src/old/hashfunctioncasestring.h | 28 + src/old/hashfunctionint.cpp | 20 + src/old/hashfunctionint.h | 26 + src/old/hashfunctionstring.cpp | 51 ++ src/old/hashfunctionstring.h | 27 + src/old/hashtable.cpp | 424 ++++++++++++++ src/old/hashtable.h | 308 ++++++++++ src/old/http.cpp | 377 ++++++++++++ src/old/http.h | 273 +++++++++ src/old/httpget.cpp | 263 +++++++++ src/old/httpget.h | 44 ++ src/old/linkedlist.cpp | 210 +++++++ src/old/linkedlist.h | 87 +++ src/old/linkmessage.cpp | 44 ++ src/old/linkmessage.h | 39 ++ src/old/linkmessenger.cpp | 41 ++ src/old/linkmessenger.h | 32 + src/old/list.cpp | 10 + src/old/list.h | 101 ++++ src/old/md5.cpp | 190 ++++++ src/old/md5.h | 81 +++ src/old/multilog.cpp | 102 ++++ src/old/multilog.h | 130 +++++ src/old/multilogchannel.cpp | 13 + src/old/multilogchannel.h | 46 ++ src/old/multilogtext.cpp | 188 ++++++ src/old/multilogtext.h | 70 +++ src/old/ordhash.cpp | 1 + src/old/ordhash.h | 104 ++++ src/old/paramproc.cpp | 514 ++++++++++++++++ src/old/paramproc.h | 153 +++++ src/old/plugger.cpp | 1 + src/old/plugger.h | 198 +++++++ src/old/pqueue.cpp | 33 ++ src/old/pqueue.h | 48 ++ src/old/programchain.cpp | 96 +++ src/old/programchain.h | 95 +++ src/old/programlink.cpp | 54 ++ src/old/programlink.h | 99 ++++ src/old/protocol.cpp | 20 + src/old/protocol.h | 62 ++ src/old/protocoltelnet.cpp | 316 ++++++++++ src/old/protocoltelnet.h | 77 +++ src/old/queue.cpp | 26 + src/old/queue.h | 45 ++ src/old/ringlist.cpp | 106 ++++ src/old/ringlist.h | 112 ++++ src/old/sbuffer.cpp | 67 +++ src/old/sbuffer.h | 40 ++ src/old/serializable.cpp | 8 + src/old/serializable.h | 34 ++ src/old/serializer.cpp | 338 +++++++++++ src/old/serializer.h | 80 +++ src/old/serializerbinary.cpp | 63 ++ src/old/serializerbinary.h | 24 + src/old/serializerbzip2.cpp | 88 +++ src/old/serializerbzip2.h | 27 + src/old/serializerconnection.cpp | 15 + src/old/serializerconnection.h | 24 + src/old/serializertext.cpp | 170 ++++++ src/old/serializertext.h | 49 ++ src/old/sfile.cpp | 74 +++ src/old/sfile.h | 29 + src/old/sha1.cpp | 161 +++++ src/old/sha1.h | 42 ++ src/old/singleton.h | 59 ++ src/old/sptr.cpp | 1 + src/old/sptr.h | 99 ++++ src/old/stack.cpp | 33 ++ src/old/stack.h | 50 ++ src/old/staticstring.cpp | 282 +++++++++ src/old/staticstring.h | 63 ++ src/old/stream.cpp | 10 + src/old/stream.h | 27 + src/old/stringrep.cpp | 19 + src/old/stringrep.h | 17 + src/old/tests/clistress.cpp | 20 + src/old/tests/confpair.cpp | 19 + src/old/tests/connect.cpp | 38 ++ src/old/tests/exception.cpp | 16 + src/old/tests/formula.cpp | 13 + src/old/tests/fstring.cpp | 48 ++ src/old/tests/hash.cpp | 116 ++++ src/old/tests/hashtest.cpp | 107 ++++ src/old/tests/hashtest2.cpp | 15 + src/old/tests/httpsrv/httpconnectionmonitor.cpp | 88 +++ src/old/tests/httpsrv/httpconnectionmonitor.h | 16 + src/old/tests/httpsrv/main.cpp | 22 + src/old/tests/log.cpp | 29 + src/old/tests/md5test.cpp | 19 + src/old/tests/ordhash.cpp | 48 ++ src/old/tests/param.cpp | 46 ++ src/old/tests/param.h | 21 + src/old/tests/plugin/main.cpp | 14 + src/old/tests/plugin/plugin.cpp | 10 + src/old/tests/plugin/plugin.h | 14 + src/old/tests/qsort.cpp | 228 ++++++++ src/old/tests/sbuffer.cpp | 27 + src/old/tests/serialize.cpp | 30 + src/old/tests/serializetext.cpp | 28 + src/old/tests/sha1.cpp | 44 ++ src/old/tests/sptr.cpp | 55 ++ src/old/tests/srvstress.cpp | 91 +++ src/old/tests/strhash.cpp | 12 + src/old/tests/teltest/main.cpp | 21 + src/old/tests/teltest/telnetmonitor.cpp | 54 ++ src/old/tests/teltest/telnetmonitor.h | 26 + src/old/tests/xmlreadtest.cpp | 29 + src/old/tests/xmlrepltest.cpp | 31 + src/old/tests/xmlwritetest.cpp | 48 ++ src/old/tokenstring.cpp | 163 ++++++ src/old/tokenstring.h | 114 ++++ src/old/tqsort.h | 207 +++++++ src/old/unit/hashtable/hashtable.cpp | 107 ++++ src/old/unit/xml/xml.cpp | 59 ++ src/old/xmldocument.cpp | 149 +++++ src/old/xmldocument.h | 171 ++++++ src/old/xmlfilereader.cpp | 58 ++ src/old/xmlfilereader.h | 47 ++ src/old/xmlfilewriter.cpp | 28 + src/old/xmlfilewriter.h | 45 ++ src/old/xmlnode.cpp | 445 ++++++++++++++ src/old/xmlnode.h | 236 ++++++++ src/old/xmlreader.cpp | 602 +++++++++++++++++++ src/old/xmlreader.h | 141 +++++ src/old/xmlstringreader.cpp | 38 ++ src/old/xmlstringreader.h | 49 ++ src/old/xmlstringwriter.cpp | 23 + src/old/xmlstringwriter.h | 50 ++ src/old/xmlwriter.cpp | 173 ++++++ src/old/xmlwriter.h | 96 +++ src/ordhash.cpp | 1 - src/ordhash.h | 104 ---- src/paramproc.cpp | 514 ---------------- src/paramproc.h | 153 ----- src/plugger.cpp | 1 - src/plugger.h | 198 ------- src/pqueue.cpp | 33 -- src/pqueue.h | 48 -- src/programchain.cpp | 96 --- src/programchain.h | 95 --- src/programlink.cpp | 54 -- src/programlink.h | 99 ---- src/protocol.cpp | 20 - src/protocol.h | 62 -- src/protocoltelnet.cpp | 316 ---------- src/protocoltelnet.h | 77 --- src/queue.cpp | 26 - src/queue.h | 45 -- src/ringlist.cpp | 106 ---- src/ringlist.h | 112 ---- src/sbuffer.cpp | 67 --- src/sbuffer.h | 40 -- src/serializable.cpp | 8 - src/serializable.h | 34 -- src/serializer.cpp | 338 ----------- src/serializer.h | 80 --- src/serializerbinary.cpp | 63 -- src/serializerbinary.h | 24 - src/serializerbzip2.cpp | 88 --- src/serializerbzip2.h | 27 - src/serializerconnection.cpp | 15 - src/serializerconnection.h | 24 - src/serializertext.cpp | 170 ------ src/serializertext.h | 49 -- src/sfile.cpp | 74 --- src/sfile.h | 29 - src/sha1.cpp | 161 ----- src/sha1.h | 42 -- src/singleton.h | 59 -- src/sptr.cpp | 1 - src/sptr.h | 99 ---- src/stack.cpp | 33 -- src/stack.h | 50 -- src/staticstring.cpp | 282 --------- src/staticstring.h | 63 -- src/stream.cpp | 10 - src/stream.h | 27 - src/stringrep.cpp | 19 - src/stringrep.h | 17 - src/tests/clistress.cpp | 20 - src/tests/confpair.cpp | 19 - src/tests/connect.cpp | 38 -- src/tests/exception.cpp | 16 - src/tests/formula.cpp | 13 - src/tests/fstring.cpp | 48 -- src/tests/hash.cpp | 116 ---- src/tests/hashtest.cpp | 107 ---- src/tests/hashtest2.cpp | 15 - src/tests/httpsrv/httpconnectionmonitor.cpp | 88 --- src/tests/httpsrv/httpconnectionmonitor.h | 16 - src/tests/httpsrv/main.cpp | 22 - src/tests/log.cpp | 29 - src/tests/md5test.cpp | 19 - src/tests/ordhash.cpp | 48 -- src/tests/param.cpp | 46 -- src/tests/param.h | 21 - src/tests/plugin/main.cpp | 14 - src/tests/plugin/plugin.cpp | 10 - src/tests/plugin/plugin.h | 14 - src/tests/qsort.cpp | 228 -------- src/tests/sbuffer.cpp | 27 - src/tests/serialize.cpp | 30 - src/tests/serializetext.cpp | 28 - src/tests/sha1.cpp | 44 -- src/tests/sptr.cpp | 55 -- src/tests/srvstress.cpp | 91 --- src/tests/strhash.cpp | 12 - src/tests/teltest/main.cpp | 21 - src/tests/teltest/telnetmonitor.cpp | 54 -- src/tests/teltest/telnetmonitor.h | 26 - src/tests/xmlreadtest.cpp | 29 - src/tests/xmlrepltest.cpp | 31 - src/tests/xmlwritetest.cpp | 48 -- src/tokenstring.cpp | 163 ------ src/tokenstring.h | 114 ---- src/tqsort.h | 207 ------- src/unit/hashtable/hashtable.cpp | 107 ---- src/unit/xml/xml.cpp | 59 -- src/xmldocument.cpp | 149 ----- src/xmldocument.h | 171 ------ src/xmlfilereader.cpp | 58 -- src/xmlfilereader.h | 47 -- src/xmlfilewriter.cpp | 28 - src/xmlfilewriter.h | 45 -- src/xmlnode.cpp | 445 -------------- src/xmlnode.h | 236 -------- src/xmlreader.cpp | 602 ------------------- src/xmlreader.h | 141 ----- src/xmlstringreader.cpp | 38 -- src/xmlstringreader.h | 49 -- src/xmlstringwriter.cpp | 23 - src/xmlstringwriter.h | 50 -- src/xmlwriter.cpp | 173 ------ src/xmlwriter.h | 96 --- 332 files changed, 17248 insertions(+), 17248 deletions(-) delete mode 100644 src/arraylist.cpp delete mode 100644 src/arraylist.h delete mode 100644 src/cgi.cpp delete mode 100644 src/cgi.h delete mode 100644 src/configmanagerbase.cpp delete mode 100644 src/configmanagerbase.h delete mode 100644 src/confpair.cpp delete mode 100644 src/confpair.h delete mode 100644 src/confpairbase.cpp delete mode 100644 src/confpairbase.h delete mode 100644 src/conftree.cpp delete mode 100644 src/conftree.h delete mode 100644 src/connection.cpp delete mode 100644 src/connection.h delete mode 100644 src/connectionmanager.cpp delete mode 100644 src/connectionmanager.h delete mode 100644 src/connectionmonitor.cpp delete mode 100644 src/connectionmonitor.h delete mode 100644 src/exceptionbase.cpp delete mode 100644 src/exceptionbase.h delete mode 100644 src/exceptions.cpp delete mode 100644 src/exceptions.h delete mode 100644 src/flexbuf.cpp delete mode 100644 src/flexbuf.h delete mode 100644 src/formula.cpp delete mode 100644 src/formula.h delete mode 100644 src/fstring.cpp delete mode 100644 src/fstring.h delete mode 100644 src/hash.cpp delete mode 100644 src/hash.h delete mode 100644 src/hashable.cpp delete mode 100644 src/hashable.h delete mode 100644 src/hashfunction.cpp delete mode 100644 src/hashfunction.h delete mode 100644 src/hashfunctioncasestring.cpp delete mode 100644 src/hashfunctioncasestring.h delete mode 100644 src/hashfunctionint.cpp delete mode 100644 src/hashfunctionint.h delete mode 100644 src/hashfunctionstring.cpp delete mode 100644 src/hashfunctionstring.h delete mode 100644 src/hashtable.cpp delete mode 100644 src/hashtable.h delete mode 100644 src/http.cpp delete mode 100644 src/http.h delete mode 100644 src/httpget.cpp delete mode 100644 src/httpget.h delete mode 100644 src/linkedlist.cpp delete mode 100644 src/linkedlist.h delete mode 100644 src/linkmessage.cpp delete mode 100644 src/linkmessage.h delete mode 100644 src/linkmessenger.cpp delete mode 100644 src/linkmessenger.h delete mode 100644 src/list.cpp delete mode 100644 src/list.h delete mode 100644 src/md5.cpp delete mode 100644 src/md5.h delete mode 100644 src/multilog.cpp delete mode 100644 src/multilog.h delete mode 100644 src/multilogchannel.cpp delete mode 100644 src/multilogchannel.h delete mode 100644 src/multilogtext.cpp delete mode 100644 src/multilogtext.h create mode 100644 src/old/arraylist.cpp create mode 100644 src/old/arraylist.h create mode 100644 src/old/cgi.cpp create mode 100644 src/old/cgi.h create mode 100644 src/old/configmanagerbase.cpp create mode 100644 src/old/configmanagerbase.h create mode 100644 src/old/confpair.cpp create mode 100644 src/old/confpair.h create mode 100644 src/old/confpairbase.cpp create mode 100644 src/old/confpairbase.h create mode 100644 src/old/conftree.cpp create mode 100644 src/old/conftree.h create mode 100644 src/old/connection.cpp create mode 100644 src/old/connection.h create mode 100644 src/old/connectionmanager.cpp create mode 100644 src/old/connectionmanager.h create mode 100644 src/old/connectionmonitor.cpp create mode 100644 src/old/connectionmonitor.h create mode 100644 src/old/exceptionbase.cpp create mode 100644 src/old/exceptionbase.h create mode 100644 src/old/exceptions.cpp create mode 100644 src/old/exceptions.h create mode 100644 src/old/flexbuf.cpp create mode 100644 src/old/flexbuf.h create mode 100644 src/old/formula.cpp create mode 100644 src/old/formula.h create mode 100644 src/old/fstring.cpp create mode 100644 src/old/fstring.h create mode 100644 src/old/hash.cpp create mode 100644 src/old/hash.h create mode 100644 src/old/hashable.cpp create mode 100644 src/old/hashable.h create mode 100644 src/old/hashfunction.cpp create mode 100644 src/old/hashfunction.h create mode 100644 src/old/hashfunctioncasestring.cpp create mode 100644 src/old/hashfunctioncasestring.h create mode 100644 src/old/hashfunctionint.cpp create mode 100644 src/old/hashfunctionint.h create mode 100644 src/old/hashfunctionstring.cpp create mode 100644 src/old/hashfunctionstring.h create mode 100644 src/old/hashtable.cpp create mode 100644 src/old/hashtable.h create mode 100644 src/old/http.cpp create mode 100644 src/old/http.h create mode 100644 src/old/httpget.cpp create mode 100644 src/old/httpget.h create mode 100644 src/old/linkedlist.cpp create mode 100644 src/old/linkedlist.h create mode 100644 src/old/linkmessage.cpp create mode 100644 src/old/linkmessage.h create mode 100644 src/old/linkmessenger.cpp create mode 100644 src/old/linkmessenger.h create mode 100644 src/old/list.cpp create mode 100644 src/old/list.h create mode 100644 src/old/md5.cpp create mode 100644 src/old/md5.h create mode 100644 src/old/multilog.cpp create mode 100644 src/old/multilog.h create mode 100644 src/old/multilogchannel.cpp create mode 100644 src/old/multilogchannel.h create mode 100644 src/old/multilogtext.cpp create mode 100644 src/old/multilogtext.h create mode 100644 src/old/ordhash.cpp create mode 100644 src/old/ordhash.h create mode 100644 src/old/paramproc.cpp create mode 100644 src/old/paramproc.h create mode 100644 src/old/plugger.cpp create mode 100644 src/old/plugger.h create mode 100644 src/old/pqueue.cpp create mode 100644 src/old/pqueue.h create mode 100644 src/old/programchain.cpp create mode 100644 src/old/programchain.h create mode 100644 src/old/programlink.cpp create mode 100644 src/old/programlink.h create mode 100644 src/old/protocol.cpp create mode 100644 src/old/protocol.h create mode 100644 src/old/protocoltelnet.cpp create mode 100644 src/old/protocoltelnet.h create mode 100644 src/old/queue.cpp create mode 100644 src/old/queue.h create mode 100644 src/old/ringlist.cpp create mode 100644 src/old/ringlist.h create mode 100644 src/old/sbuffer.cpp create mode 100644 src/old/sbuffer.h create mode 100644 src/old/serializable.cpp create mode 100644 src/old/serializable.h create mode 100644 src/old/serializer.cpp create mode 100644 src/old/serializer.h create mode 100644 src/old/serializerbinary.cpp create mode 100644 src/old/serializerbinary.h create mode 100644 src/old/serializerbzip2.cpp create mode 100644 src/old/serializerbzip2.h create mode 100644 src/old/serializerconnection.cpp create mode 100644 src/old/serializerconnection.h create mode 100644 src/old/serializertext.cpp create mode 100644 src/old/serializertext.h create mode 100644 src/old/sfile.cpp create mode 100644 src/old/sfile.h create mode 100644 src/old/sha1.cpp create mode 100644 src/old/sha1.h create mode 100644 src/old/singleton.h create mode 100644 src/old/sptr.cpp create mode 100644 src/old/sptr.h create mode 100644 src/old/stack.cpp create mode 100644 src/old/stack.h create mode 100644 src/old/staticstring.cpp create mode 100644 src/old/staticstring.h create mode 100644 src/old/stream.cpp create mode 100644 src/old/stream.h create mode 100644 src/old/stringrep.cpp create mode 100644 src/old/stringrep.h create mode 100644 src/old/tests/clistress.cpp create mode 100644 src/old/tests/confpair.cpp create mode 100644 src/old/tests/connect.cpp create mode 100644 src/old/tests/exception.cpp create mode 100644 src/old/tests/formula.cpp create mode 100644 src/old/tests/fstring.cpp create mode 100644 src/old/tests/hash.cpp create mode 100644 src/old/tests/hashtest.cpp create mode 100644 src/old/tests/hashtest2.cpp create mode 100644 src/old/tests/httpsrv/httpconnectionmonitor.cpp create mode 100644 src/old/tests/httpsrv/httpconnectionmonitor.h create mode 100644 src/old/tests/httpsrv/main.cpp create mode 100644 src/old/tests/log.cpp create mode 100644 src/old/tests/md5test.cpp create mode 100644 src/old/tests/ordhash.cpp create mode 100644 src/old/tests/param.cpp create mode 100644 src/old/tests/param.h create mode 100644 src/old/tests/plugin/main.cpp create mode 100644 src/old/tests/plugin/plugin.cpp create mode 100644 src/old/tests/plugin/plugin.h create mode 100644 src/old/tests/qsort.cpp create mode 100644 src/old/tests/sbuffer.cpp create mode 100644 src/old/tests/serialize.cpp create mode 100644 src/old/tests/serializetext.cpp create mode 100644 src/old/tests/sha1.cpp create mode 100644 src/old/tests/sptr.cpp create mode 100644 src/old/tests/srvstress.cpp create mode 100644 src/old/tests/strhash.cpp create mode 100644 src/old/tests/teltest/main.cpp create mode 100644 src/old/tests/teltest/telnetmonitor.cpp create mode 100644 src/old/tests/teltest/telnetmonitor.h create mode 100644 src/old/tests/xmlreadtest.cpp create mode 100644 src/old/tests/xmlrepltest.cpp create mode 100644 src/old/tests/xmlwritetest.cpp create mode 100644 src/old/tokenstring.cpp create mode 100644 src/old/tokenstring.h create mode 100644 src/old/tqsort.h create mode 100644 src/old/unit/hashtable/hashtable.cpp create mode 100644 src/old/unit/xml/xml.cpp create mode 100644 src/old/xmldocument.cpp create mode 100644 src/old/xmldocument.h create mode 100644 src/old/xmlfilereader.cpp create mode 100644 src/old/xmlfilereader.h create mode 100644 src/old/xmlfilewriter.cpp create mode 100644 src/old/xmlfilewriter.h create mode 100644 src/old/xmlnode.cpp create mode 100644 src/old/xmlnode.h create mode 100644 src/old/xmlreader.cpp create mode 100644 src/old/xmlreader.h create mode 100644 src/old/xmlstringreader.cpp create mode 100644 src/old/xmlstringreader.h create mode 100644 src/old/xmlstringwriter.cpp create mode 100644 src/old/xmlstringwriter.h create mode 100644 src/old/xmlwriter.cpp create mode 100644 src/old/xmlwriter.h delete mode 100644 src/ordhash.cpp delete mode 100644 src/ordhash.h delete mode 100644 src/paramproc.cpp delete mode 100644 src/paramproc.h delete mode 100644 src/plugger.cpp delete mode 100644 src/plugger.h delete mode 100644 src/pqueue.cpp delete mode 100644 src/pqueue.h delete mode 100644 src/programchain.cpp delete mode 100644 src/programchain.h delete mode 100644 src/programlink.cpp delete mode 100644 src/programlink.h delete mode 100644 src/protocol.cpp delete mode 100644 src/protocol.h delete mode 100644 src/protocoltelnet.cpp delete mode 100644 src/protocoltelnet.h delete mode 100644 src/queue.cpp delete mode 100644 src/queue.h delete mode 100644 src/ringlist.cpp delete mode 100644 src/ringlist.h delete mode 100644 src/sbuffer.cpp delete mode 100644 src/sbuffer.h delete mode 100644 src/serializable.cpp delete mode 100644 src/serializable.h delete mode 100644 src/serializer.cpp delete mode 100644 src/serializer.h delete mode 100644 src/serializerbinary.cpp delete mode 100644 src/serializerbinary.h delete mode 100644 src/serializerbzip2.cpp delete mode 100644 src/serializerbzip2.h delete mode 100644 src/serializerconnection.cpp delete mode 100644 src/serializerconnection.h delete mode 100644 src/serializertext.cpp delete mode 100644 src/serializertext.h delete mode 100644 src/sfile.cpp delete mode 100644 src/sfile.h delete mode 100644 src/sha1.cpp delete mode 100644 src/sha1.h delete mode 100644 src/singleton.h delete mode 100644 src/sptr.cpp delete mode 100644 src/sptr.h delete mode 100644 src/stack.cpp delete mode 100644 src/stack.h delete mode 100644 src/staticstring.cpp delete mode 100644 src/staticstring.h delete mode 100644 src/stream.cpp delete mode 100644 src/stream.h delete mode 100644 src/stringrep.cpp delete mode 100644 src/stringrep.h delete mode 100644 src/tests/clistress.cpp delete mode 100644 src/tests/confpair.cpp delete mode 100644 src/tests/connect.cpp delete mode 100644 src/tests/exception.cpp delete mode 100644 src/tests/formula.cpp delete mode 100644 src/tests/fstring.cpp delete mode 100644 src/tests/hash.cpp delete mode 100644 src/tests/hashtest.cpp delete mode 100644 src/tests/hashtest2.cpp delete mode 100644 src/tests/httpsrv/httpconnectionmonitor.cpp delete mode 100644 src/tests/httpsrv/httpconnectionmonitor.h delete mode 100644 src/tests/httpsrv/main.cpp delete mode 100644 src/tests/log.cpp delete mode 100644 src/tests/md5test.cpp delete mode 100644 src/tests/ordhash.cpp delete mode 100644 src/tests/param.cpp delete mode 100644 src/tests/param.h delete mode 100644 src/tests/plugin/main.cpp delete mode 100644 src/tests/plugin/plugin.cpp delete mode 100644 src/tests/plugin/plugin.h delete mode 100644 src/tests/qsort.cpp delete mode 100644 src/tests/sbuffer.cpp delete mode 100644 src/tests/serialize.cpp delete mode 100644 src/tests/serializetext.cpp delete mode 100644 src/tests/sha1.cpp delete mode 100644 src/tests/sptr.cpp delete mode 100644 src/tests/srvstress.cpp delete mode 100644 src/tests/strhash.cpp delete mode 100644 src/tests/teltest/main.cpp delete mode 100644 src/tests/teltest/telnetmonitor.cpp delete mode 100644 src/tests/teltest/telnetmonitor.h delete mode 100644 src/tests/xmlreadtest.cpp delete mode 100644 src/tests/xmlrepltest.cpp delete mode 100644 src/tests/xmlwritetest.cpp delete mode 100644 src/tokenstring.cpp delete mode 100644 src/tokenstring.h delete mode 100644 src/tqsort.h delete mode 100644 src/unit/hashtable/hashtable.cpp delete mode 100644 src/unit/xml/xml.cpp delete mode 100644 src/xmldocument.cpp delete mode 100644 src/xmldocument.h delete mode 100644 src/xmlfilereader.cpp delete mode 100644 src/xmlfilereader.h delete mode 100644 src/xmlfilewriter.cpp delete mode 100644 src/xmlfilewriter.h delete mode 100644 src/xmlnode.cpp delete mode 100644 src/xmlnode.h delete mode 100644 src/xmlreader.cpp delete mode 100644 src/xmlreader.h delete mode 100644 src/xmlstringreader.cpp delete mode 100644 src/xmlstringreader.h delete mode 100644 src/xmlstringwriter.cpp delete mode 100644 src/xmlstringwriter.h delete mode 100644 src/xmlwriter.cpp delete mode 100644 src/xmlwriter.h diff --git a/src/arraylist.cpp b/src/arraylist.cpp deleted file mode 100644 index ef21426..0000000 --- a/src/arraylist.cpp +++ /dev/null @@ -1,100 +0,0 @@ -#include "arraylist.h" -#include -#include - -ArrayList::ArrayList( int initSize, int growByFactor ) -{ - apData = new void *[initSize]; - nSize = 0; - nCapacity = initSize; - nGrowByFactor = growByFactor; -} - -ArrayList::~ArrayList( ) -{ - delete[] apData; -} - -void *ArrayList::getAt( int index ) -{ - if( index < 0 || index > nSize ) - return NULL; - - return apData[index]; -} - -void ArrayList::append( void *data ) -{ - insertBefore( data, nSize ); -} - -void ArrayList::insertBefore( void *data, int pos ) -{ - if( pos < 0 || pos > nSize ) - return; - - checkResize(); - memmove( &apData[pos+1], &apData[pos], (nSize-pos)*sizeof(void*) ); - apData[pos] = data; - nSize++; -} - -int ArrayList::getSize( ) -{ - return nSize; -} - -bool ArrayList::isEmpty( ) -{ - return nSize==0; -} - -void ArrayList::deleteAt( int index ) -{ - if( index < 0 || index >= nSize ) - return; - - memmove( &apData[index], &apData[index+1], (nSize-index-1)*sizeof(void *) ); - nSize--; -} - -void ArrayList::empty() -{ - // Probably the easiest as far as things go. - nSize = 0; -} - -void ArrayList::resizeTo( int newSize ) -{ - void **apNew = new void *[newSize]; - memmove( apNew, apData, nSize*sizeof(void *) ); - nCapacity = newSize; - delete[] apData; - apData = apNew; -} - -void ArrayList::checkResize() -{ - if( nSize >= nCapacity ) - { - resizeTo( nCapacity + nGrowByFactor ); - } -} - -void ArrayList::setSize( int newSize ) -{ - if( newSize < 0 ) - return; - - nSize = newSize; - checkResize(); -} - -void ArrayList::setAt( int index, void *data ) -{ - if( index < 0 || index >= nSize ) - return; - - apData[index] = data; -} - diff --git a/src/arraylist.h b/src/arraylist.h deleted file mode 100644 index 0fda34a..0000000 --- a/src/arraylist.h +++ /dev/null @@ -1,80 +0,0 @@ -/** \file arraylist.h - * Describes the ArrayList class. - *@author Mike Buland - */ -#ifndef ARRAY_LIST_H -#define ARRAY_LIST_H - -#include "list.h" - -/** A simple list which uses an array. This is a great choice if you won't do - * a lot of adding and deleting and need a fast random access list. Otherwise - * use the LinkedList. - *@author Mike Buland - */ -class ArrayList : public List -{ -public: - /** Creates an arraylist with some pre-defined specs spelled out. - *@param initSize the inital number of elements to allocate. - *@param growByFactor How much to increase the size of the array by - * each time we run out of room. - */ - ArrayList( int initSize=100, int growByFactor=10 ); - /** - * Destroy the ArrayList - */ - virtual ~ArrayList(); - - void *getAt( int nIndex ); - void append( void *pData ); - void insertBefore( void *pData, int nPos = 0 ); - int getSize( ); - bool isEmpty( ); - void deleteAt( int nIndex ); - void empty(); - void setSize( int nNewSize ); - void setAt( int nIndex, void *pData ); - -private: - /** - * Checks to see if the system needs to be resized, if it does, this will - * automatically resize based on your parameters. - */ - void checkResize(); - - /** - * Resize the system to a specified size. If it is larger, then all data - * will be retained, if smaller the elements at the end will be cut off. - *@param newSize The number of elements to include after resizing. - */ - void resizeTo( int newSize ); - - /** - * Actual master array of pointers. This is done to follow the List specs. - * All data transactions are performed with pointers or compatable - * primitive data-types. - */ - void **apData; - - /** - * The number of filled in elements in the array. This is the practical - * real size of the ArrayList for all userspace applications. - */ - int nSize; - - /** - * The number of elements allocated in memory. Not all of these have to be - * filled in, and it is usually larger than nSize so that adding and - * deleting elements is fast and easy. - */ - int nCapacity; - - /** - * The amount to grow by whenever the array needs resizing. - */ - int nGrowByFactor; -}; - -#endif - diff --git a/src/cgi.cpp b/src/cgi.cpp deleted file mode 100644 index 1fecbbe..0000000 --- a/src/cgi.cpp +++ /dev/null @@ -1,644 +0,0 @@ -#include -#include -#include -#include -#include - -#include "cgi.h" - -Cgi::Cgi( const char *strSource ) : - aContent( new HashFunctionString(), 151, true ) -{ - int length, j, k, mode = 0, slen = 0; - char hexbuf[3] = { 0, 0, 0 }; - char *buf, chr; - Item *cur = NULL; - int nCur = 0; - - if( strSource != NULL ) - { - loadContent( strSource ); - } - - if( ( getenv( "CONTENT_LENGTH" ) ) ) - { - if( !strcmp - ( getenv( "CONTENT_TYPE" ), - "application/x-www-form-urlencoded" ) ) - { - length = atoi( getenv( "CONTENT_LENGTH" ) ); - buf = new char[length + 1]; - fread( buf, 1, length, stdin ); - cur = new Item( ); - aVars.append( cur ); - cur->type = VAR_STDINPUT; - for( j = 0; j < length; j++ ) - { - switch ( buf[j] ) - { - case '=': - cur->name = new char[slen + 1]; - slen = 0; - break; - - case '&': - cur->value = new char[slen + 1]; - cur->len = slen; - slen = 0; - cur = new Item( ); - aVars.append( cur ); - cur->type = VAR_STDINPUT; - break; - - default: - switch ( buf[j] ) - { - case '%': /* per-cents mean a hex-code for an ASCII char */ - j += 2; - slen++; - break; - - default: /* Nothing special, move along, folks... */ - slen++; - break; - } - break; - } - } - cur->value = new char[slen + 1]; - cur->len = slen; - slen = 0; - mode = 0; - cur = ( Item * ) aVars.getAt( 0 ); - k = 0; - nCur = 0; - for( j = 0; j < length; j++ ) - { - switch ( buf[j] ) - { - case '=': - mode = 1; - k = 0; - break; - - case '&': - mode = 0; - k = 0; - nCur++; - cur = ( Item * ) aVars.getAt( nCur ); - break; - - default: - switch ( buf[j] ) - { - case '%': /* per-cents mean a hex-code for an ASCII char */ - hexbuf[0] = buf[++j]; - hexbuf[1] = buf[++j]; - chr = ( char ) ( strtol( hexbuf, NULL, 16 ) ); - break; - - case '+': /* Pluses mean spaces, odd, I know... */ - chr = ' '; - break; - - default: /* Nothing special, move along, folks... */ - chr = buf[j]; - break; - } - if( mode == 0 ) - { - cur->name[k] = chr; - cur->name[++k] = '\0'; - } - else - { - cur->value[k] = chr; - cur->value[++k] = '\0'; - } - break; - } - } - delete buf; - } - else if( !strncmp - ( getenv( "CONTENT_TYPE" ), "multipart/form-data;", 20 ) ) - { - char *boundary, *oname; - int blen, j, k, olen; - - length = atoi( getenv( "CONTENT_LENGTH" ) ); - buf = new char[length + 1]; - fread( buf, 1, length, stdin ); - for( blen = 0; buf[blen + 1] != '\n'; blen++ ); - boundary = new char[blen + 1]; - memcpy( boundary, buf, blen ); - boundary[blen] = '\0'; - j = blen + 2; - for( ;; ) - { - cur = new Item( ); - aVars.append( cur ); - cur->type = VAR_STDINPUT; - if( !strncmp - ( buf + j, "Content-Disposition: form-data; name=\"", - 38 ) ) - { - j += 38; - for( k = 0; buf[j + k] != '\"'; k++ ); - oname = cur->name = new char[k + 1]; - memcpy( cur->name, buf + j, k ); - olen = k; - cur->name[k] = '\0'; - j += k + 1; - if( !strncmp( buf + j, "; filename=\"", 12 ) ) /* Must be a file */ - { - /* Acquire file name */ - j += 12; - for( k = 0; buf[j + k] != '\"'; k++ ); - cur->value = new char[k + 1]; - memcpy( cur->value, buf + j, k ); - cur->value[k] = '\0'; - cur->len = k; - j += k + 3; - - /* Acquire content type */ - if( !strncmp( "Content-Type: ", buf + j, 14 ) ) - { - j += 14; - cur = new Item( ); - aVars.append( cur ); - cur->type = VAR_STDINPUT; - cur->name = new char[olen + 1]; - memcpy( cur->name, oname, olen + 1 ); - for( k = 0; buf[j + k + 1] != '\n'; k++ ); - cur->value = new char[k + 1]; - memcpy( cur->value, buf + j, k ); - cur->value[k] = '\0'; - cur->len = k; - j += k; - } - else - { - cur = new Item( ); - aVars.append( cur ); - cur->type = VAR_STDINPUT; - cur->name = new char[olen + 1]; - memcpy( cur->name, oname, olen + 1 ); - cur->value = new char[1]; - cur->value[0] = '\0'; - cur->len = 0; - } - j += 4; - - /* Acquire content */ - cur = new Item( ); - aVars.append( cur ); - cur->type = VAR_STDINPUT; - cur->name = new char[olen + 1]; - memcpy( cur->name, oname, olen + 1 ); - if( !strncmp( buf + j + k, boundary, blen ) ) - { - cur->value = new char[1]; - cur->value[0] = '\0'; - j += blen + 4; - } - else if( !strncmp( buf + j + k + 1, boundary, blen ) ) - { - cur->value = new char[1]; - cur->value[0] = '\0'; - j += blen + 5; - } - else - { - for( k = 0; - strncmp( buf + j + k + 2, boundary, blen ); - k++ ); - cur->value = new char[k + 1]; - memcpy( cur->value, buf + j, k ); - cur->value[k] = '\0'; - cur->len = k; - j += k + blen + 4; - } - } - else - { - j += 4; - for( k = 0; - strncmp( buf + j + k + 2, boundary, blen ); - k++ ); - cur->value = new char[k + 1]; - memcpy( cur->value, buf + j, k ); - cur->value[k] = '\0'; - cur->len = k; - j += k + blen + 4; - } - if( buf[j + 1] == '\n' ) - j += 2; - if( j >= length ) - break; - } - else - { - cur->name = ( char * ) "ERROR"; - cur->value = ( char * ) "Error here"; - } - } - } - delete buf; - } - - if( ( buf = getenv( "HTTP_COOKIE" ) ) ) - { - int lbase = aVars.getSize( ); - length = strlen( buf ); - cur = new Item( ); - aVars.append( cur ); - cur->type = VAR_COOKIE; - for( j = 0; j < length; j++ ) - { - switch ( buf[j] ) - { - case '=': - cur->name = new char[slen + 1]; - slen = 0; - break; - - case ';': - cur->value = new char[slen + 1]; - cur->len = slen; - slen = 0; - cur = new Item( ); - aVars.append( cur ); - cur->type = VAR_COOKIE; - break; - - default: - switch ( buf[j] ) - { - case '%': /* per-cents mean a hex-code for an ASCII char */ - j += 2; - slen++; - break; - - default: /* Nothing special, move along, folks... */ - slen++; - break; - } - break; - } - } - cur->value = new char[slen + 1]; - cur->len = slen; - slen = 0; - cur = ( Item * ) aVars.getAt( lbase ); - mode = 0; - k = 0; - nCur = lbase; - for( j = 0; j < length; j++ ) - { - switch ( buf[j] ) - { - case '=': - mode = 1; - k = 0; - break; - - case ';': - mode = 0; - k = 0; - nCur++; - cur = ( Item * ) aVars.getAt( nCur ); - break; - - default: - switch ( buf[j] ) - { - case '%': /* per-cents mean a hex-code for an ASCII char */ - hexbuf[0] = buf[++j]; - hexbuf[1] = buf[++j]; - chr = ( char ) ( strtol( hexbuf, NULL, 16 ) ); - break; - - case '+': /* Pluses mean spaces, odd, I know... */ - chr = ' '; - break; - - case ' ': - continue; - break; - - default: /* Nothing special, move along, folks... */ - chr = buf[j]; - break; - } - if( mode == 0 ) - { - cur->name[k] = chr; - cur->name[++k] = '\0'; - } - else - { - cur->value[k] = chr; - cur->value[++k] = '\0'; - } - break; - } - } - } - - if( ( buf = getenv( "QUERY_STRING" ) ) ) - { - if( strlen( buf ) > 0 ) - { - int lbase = aVars.getSize( ); - length = strlen( buf ); - cur = new Item( ); - aVars.append( cur ); - cur->type = VAR_CMDLINE; - for( j = 0; j < length; j++ ) - { - switch ( buf[j] ) - { - case '=': - cur->name = new char[slen + 1]; - slen = 0; - break; - - case '&': - cur->value = new char[slen + 1]; - cur->len = slen; - slen = 0; - cur = new Item( ); - aVars.append( cur ); - cur->type = VAR_CMDLINE; - break; - - default: - switch ( buf[j] ) - { - case '%': /* per-cents mean a hex-code for an ASCII char */ - j += 2; - slen++; - break; - - default: /* Nothing special, move along, folks... */ - slen++; - break; - } - break; - } - } - cur->value = new char[slen + 1]; - cur->len = slen; - slen = 0; - cur = ( Item * ) aVars.getAt( lbase ); - nCur = lbase; - mode = 0; - k = 0; - for( j = 0; j < length; j++ ) - { - switch ( buf[j] ) - { - case '=': - mode = 1; - k = 0; - break; - - case '&': - mode = 0; - k = 0; - nCur++; - cur = ( Item * ) aVars.getAt( nCur ); - break; - - default: - switch ( buf[j] ) - { - case '%': /* per-cents mean a hex-code for an ASCII char */ - hexbuf[0] = buf[++j]; - hexbuf[1] = buf[++j]; - chr = ( char ) ( strtol( hexbuf, NULL, 16 ) ); - break; - - case '+': /* Pluses mean spaces, odd, I know... */ - chr = ' '; - break; - - default: /* Nothing special, move along, folks... */ - chr = buf[j]; - break; - } - if( mode == 0 ) - { - cur->name[k] = chr; - cur->name[++k] = '\0'; - } - else - { - cur->value[k] = chr; - cur->value[++k] = '\0'; - } - break; - } - } - } - } -} - -Cgi::~Cgi( ) -{ -} - -char *Cgi::getVarValue( const char *name, int skip, unsigned char type ) -{ - for( int j = 0; j < aVars.getSize( ); j++ ) - { - Item *cur = ( Item * ) aVars.getAt( j ); - if( !strcmp( cur->name, name ) ) - { - if( ( cur->type & type ) ) - { - if( skip <= 0 ) - { - return cur->value; - } - else - { - skip--; - } - } - } - } - return NULL; -} - -int Cgi::getVarLength( const char *name, int skip, unsigned char type ) -{ - for( int j = 0; j < aVars.getSize( ); j++ ) - { - Item *cur = ( Item * ) aVars.getAt( j ); - if( !strcmp( cur->name, name ) ) - { - if( ( cur->type & type ) ) - { - if( skip <= 0 ) - { - return cur->len; - } - else - { - skip--; - } - } - } - } - return -1; -} - -void Cgi::writeDebugInfo() -{ - printf( "
\n" );
-    printf( "0x%02X - stdInput | 0x%02X - cookie | 0x%02X - cmdLine\n\n",
-             VAR_STDINPUT, VAR_COOKIE, VAR_CMDLINE );
-    for( int j = 0; j < aVars.getSize(  ); j++ )
-    {
-        Item *item = ( Item * ) aVars.getAt( j );
-        printf("[%s] = \"%s\" [0x%02X]\n", item->name,
-                 item->value, item->type );
-    }
-    printf( "
\n" ); -} - -void Cgi::writeContentHeader( int type ) -{ - switch( type ) - { - case headerHTML: - printf("Content-type: text/html\n\n"); - break; - } -} - -void Cgi::writeContent( const char *name, ...) -{ - char *templ = (char *)aContent.get(name); - - if( templ ) - { - va_list ap; - - va_start (ap, name); - vprintf (templ, ap); - va_end (ap); - } - else - { - printf("Error finding content labeled \"%s\"\n", name ); - } -} - -void Cgi::loadContent( const char *strSource ) -{ - FILE *fh = NULL; - if( strSource == NULL ) - { - extern char *program_invocation_short_name; - char *tmpName = new char[strlen(program_invocation_short_name)+10]; - memset( tmpName, 0, strlen(program_invocation_short_name)+10 ); - strcpy( tmpName, program_invocation_short_name ); - strcat( tmpName, ".content" ); - fh = fopen( tmpName, "rt" ); - delete tmpName; - } - else - { - fh = fopen( strSource, "rt" ); - } - - if( fh == NULL ) return; - - struct stat xStats; - - fstat( fileno( fh ), &xStats ); - - char *bigBuf = new char[xStats.st_size+1]; - memset( bigBuf, 0, xStats.st_size+1 ); - fread( bigBuf, 1, xStats.st_size, fh ); - fclose( fh ); - - // Now we can actually load stuff from the file, first we need to make us up a format... - int lSize=0; - struct Content - { - char *name; - char *value; - } xCont; - int j = 0; - while( j < xStats.st_size ) - { - // We're looking for a content-block init statement - for( ; j < xStats.st_size; j++ ) - { - if( bigBuf[j] == '#' ) - { - if( bigBuf[j+1] == '{' ) - { - break; - } - } - } - j=j+2; - if( j >= xStats.st_size ) break; - for( ; bigBuf[j] == ' ' || bigBuf[j] == '\t'; j++ ); - for( lSize = 0; lSize+j < xStats.st_size && bigBuf[lSize+j] != '\n' && bigBuf[lSize+j] != '\r'; lSize++ ); - xCont.name = new char[lSize+1]; - memset( xCont.name, 0, lSize+1 ); - memcpy( xCont.name, &bigBuf[j], lSize ); - j += lSize+1; - - for( lSize = 0; lSize+j < xStats.st_size; lSize++ ) - { - if( bigBuf[lSize+j] == '#' ) - { - if( bigBuf[lSize+j+1] == '}' ) - { - break; - } - } - } - xCont.value = new char[lSize+1]; - memset( xCont.value, 0, lSize+1 ); - memcpy( xCont.value, &bigBuf[j], lSize ); - - aContent.insert( xCont.name, xCont.value ); - - j += lSize + 2; - } -} - -void Cgi::writeCookie( char const *name, char const *value, char const *expires, char const *path, char const *domain, bool secure ) -{ - printf("Set-Cookie: %s=%s", name, value ); - - if( expires != NULL ) - { - printf("; expires=%s", expires ); - } - - if( path != NULL ) - { - printf("; path=%s", path ); - } - - if( domain != NULL ) - { - printf("; domain=%s", domain ); - } - - if( secure ) - { - printf("; secure"); - } - - printf("\n"); -} diff --git a/src/cgi.h b/src/cgi.h deleted file mode 100644 index 01142b5..0000000 --- a/src/cgi.h +++ /dev/null @@ -1,196 +0,0 @@ -/**\file cgi.h - * Describes extra params needed to use the Cgi class as well as the class - * itself. - *@author Mike Buland - */ - -#include "linkedlist.h" -#include "hashtable.h" -#include "hashfunctionstring.h" - -#define VAR_STDINPUT 0x01 /**< Variable came from stdinput, web form */ -#define VAR_COOKIE 0x02 /**< Variable came from a cookie */ -#define VAR_CMDLINE 0x04 /**< Variable came from commandline / uri */ -#define VAR_ANY 0xFF /**< Mask including all other types */ - -/** - * Cgi header processor originally designed for apache cgi programs. When used - * from apache with what I beleive are some sort of standard set of command - * line parameters and environment variables. This always worked for all of my - * purposes. This class will automatically extract all data from the system - * that you need and places it into tables and things for easy access. - * There are three types of input that data can come from, StandardInput, - * CommandLine, and Cookies. StandardInput is when you get formdata in - * multi-part forms, Cookies should usually be cookies that you set, and - * command line is everything after the question mark in the URL. - * This also contains some simple helpers for putting templated data into the - * HTTP data feed. - *@author Mike Buland - */ -class Cgi -{ -public: - /** - * Create a complete CGI object, this object will automatically read data - * from all available sources and be ready for use on the very next line! - * If strSource is filled in it will also automatically read in a content - * file, which is a simple file format containing named blocks of reusable - * templates. - *@param strSource Set to a filename in order to load up a content file. - */ - Cgi( const char *strSource = NULL ); - - /** - * Destroy the cgi object. - */ - virtual ~Cgi( ); - - /** - * Get's the value for a variable as a character string. The name is the - * name that was given on the URL or in the form or cookie. Skip can be - * set to any value above zero to retreive subsequent variables with the - * same name. The most obvious use of this is when dealing with file - * uploads, each file upload sends you three variables with the same name - * and different content. Finally the variable type determines where you - * will accept this variable from. This is generally a bit of a security - * thing, if you store login info in a cookie and don't want people getting - * in by faking the appropriate URL. - *@param name The name of the variable you wish to retreive. - *@param skip THe number of variables with the given name to skip before - * returning something meaningful. The only way to determine how many - * variables with the same name there are is to skip until you get a NULL - * value returned. - *@param type Can be set to any combination of VAR_STDINPUT, VAR_COOKIE, - * VAR_CMDLINE, or just VAR_ANY. This takes bitflags, so you can or the - * values together. If a variable is found but came from the wrong source - * it won't match any other criteria and will be treated as though it - * doesn't exist. - *@returns A null-terminated string representing the value of the requested - * variable, or NULL if the variable did not exist. If a variable does - * exist but has no value the string returned will start with a NULL char, - * but be a valid string. - */ - char *getVarValue( const char *name, int skip=0, unsigned char type=VAR_ANY ); - - /** - * This functions identically in every way to getVarValue, except that - * instead of returning a pointer to the variable's value, it returns the - * length of the variable's value string. The params are the same and so - * a call to both functions with the same params should yeild a value and - * a corresponding length. - *@param name The name of the variable you wish to retreive. - *@param skip THe number of variables with the given name to skip before - * returning something meaningful. The only way to determine how many - * variables with the same name there are is to skip until you get a NULL - * value returned. - *@param type Can be set to any combination of VAR_STDINPUT, VAR_COOKIE, - * VAR_CMDLINE, or just VAR_ANY. This takes bitflags, so you can or the - * values together. If a variable is found but came from the wrong source - * it won't match any other criteria and will be treated as though it - * doesn't exist. - *@returns The length of the value-string of the requested variable. If - * the requested variable is not found, -1 is returned. - */ - int getVarLength( const char *name, int skip=0, unsigned char type=VAR_ANY ); - - /** - * A handy little function that writes a load of debug info related to - * parsing CGI params to the standard output in html. This is generally - * best used at the end of a page. - */ - void writeDebugInfo(); - - /** - * Write a content header to the standard output. This should also be the - * first thing that you do (except for writing cookies) after initializing - * the Cgi class. You can select a type of header or content from the - * header enum, and a properly formatted header will show up on the - * standard output. - *@param type Any value from the header enum in this class. The default is - * to write an html header, probably the most common as well. - */ - void writeContentHeader( int type=headerHTML ); - - /** - * Write content to the stnadard output. The content variable should have - * been loaded during construction of the Cgi object or with the - * loadContent function. The content variable should be formatted just like - * a printf string, so that anything you want to put into it will have a % - * symbol replacement code, like %s, %d, etc. Since this actually uses a - * type of printf function everything from those docs work here. - *@param name The name of the content variable to format and write to - * stnadard output. - *@param ... As many params as you want to include, ala printf. - */ - void writeContent( const char *name, ...); - - /** - * Load a content file. I don't want to describe the format here, you can - * just read the code or find an example for now. Sorry. - *@param strSource The name of the file to open and read in to get the - * content loaded. - */ - void loadContent( const char *strSource = NULL ); - - /** - * Write a cookie-set header to the output stream. This should be done - * before any other content-headers are written. The specifics of this - * function are very simple, since I rely on the user's understanding of - * how standard HTTP/1.1 or HTTP/1.0 cookie syntax works. If you don't - * care then just use the name and value and the defaults should keep you - * in good stead for a long time. - *@param name The name of the cookie variable to set. - *@param value The value to set to that variable. - *@param expires The formatted string value for the date and time this - * cookie should expire. A NULL here will put a "until the browser closes" - * tag in. - *@param path The path (URL) that this cookie belongs to. If you run a lot - * of hosted servers or sub-sites that may have some shared URL bits then - * you may want to set this. The cookie should only be sent to URL's that - * match this as their first part. - *@param domain The domain that is allowed to read this, if not set, it's - * the domain the web browser contacted when they got the cookie. - *@param secure I'm not sure, I think it's something to tell if the cookie - * is safe to keep because any potentially valuable data is encypted or - * otherwise unusable. I could be wrong. - */ - void writeCookie( char const *name, char const *value, char const *expires=NULL, char const *path=NULL, char const *domain=NULL, bool secure=false ); - - /** - * A simple helper class to contain variable data. - */ - class Item - { - public: - /** - * Build an empty Item. - */ - Item( ) - { - name = NULL; - value = NULL; - len = 0; - type = 0; - } - /** The name of the item. */ - char *name; - /** The value of the item. */ - char *value; - /** The length of the item's value. */ - unsigned long len; - /** The type of the item (where it came from). */ - unsigned char type; - }; - - /** Header values */ - enum - { - headerHTML - }; - -private: - /** Keeps track of all contained variables. */ - LinkedList aVars; - /** Keeps track of all content variables. */ - HashTable aContent; -}; diff --git a/src/configmanagerbase.cpp b/src/configmanagerbase.cpp deleted file mode 100644 index ac55fe0..0000000 --- a/src/configmanagerbase.cpp +++ /dev/null @@ -1,63 +0,0 @@ -#include -#include -#include "xmlnode.h" -#include "xmlfilereader.h" -#include "configmanagerbase.h" - -ConfigManagerBase::ConfigManagerBase() -{ -} - -ConfigManagerBase::~ConfigManagerBase() -{ -} - -void ConfigManagerBase::addSearchPath( const std::string &sPath ) -{ - lSearchPath.push_back( sPath ); -} - -void ConfigManagerBase::loadConfig( const std::string &sFileName, const char *lpProfile ) -{ - // Try a few locations... - std::list::const_iterator i; - for( i = lSearchPath.begin(); i != lSearchPath.end(); i++ ) - { - if( parseConfig( (*i + sFileName).c_str(), lpProfile ) ) - { - break; - } - } -} - -bool ConfigManagerBase::parseConfig( const char *lpFileName, const char *lpProfile ) -{ - XmlNode *pRoot, *pCur; - XmlFileReader doc( lpFileName ); - - pRoot = doc.getRoot(); - if( pRoot == NULL ) - { - return false; - } - - if( strcmp("config", pRoot->getName() ) ) - { - return false; - } - - for( int j = 0;; j++ ) - { - pCur = pRoot->getChild( "profile", j ); - if( pCur == NULL ) - return false; - - if( !strcmp( pCur->getProperty("id"), lpProfile ) ) - { - return processProfile( pCur ); - } - } - - return false; -} - diff --git a/src/configmanagerbase.h b/src/configmanagerbase.h deleted file mode 100644 index 381cc1f..0000000 --- a/src/configmanagerbase.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef CONFIG_MANAGER_BASE_H -#define CONFIG_MANAGER_BASE_H - -#include -#include - -class ConfigManagerBase -{ -public: - ConfigManagerBase(); - virtual ~ConfigManagerBase(); - -public: - void addSearchPath( const std::string &sPath ); - void loadConfig( const std::string &sFileName, const char *lpProfile="default" ); - -private: - bool parseConfig( const char *lpFileName, const char *lpProfile ); - virtual bool processProfile( class XmlNode *pBase )=0; - - std::list lSearchPath; -}; - -#endif diff --git a/src/confpair.cpp b/src/confpair.cpp deleted file mode 100644 index 4741401..0000000 --- a/src/confpair.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "confpair.h" - diff --git a/src/confpair.h b/src/confpair.h deleted file mode 100644 index 56eb06e..0000000 --- a/src/confpair.h +++ /dev/null @@ -1,81 +0,0 @@ -#ifndef CONF_PAIR_H -#define CONF_PAIR_H - -#include -#include -#include -#include "confpairbase.h" - -/** - * - */ -template -class ConfPair : public ConfPairBase -{ -public: - ConfPair( const std::string &sName ) : - sName( sName ) - { } - - virtual ~ConfPair() - { } - - T &value() - { - return tValue; - } - - const std::string &name() - { - return sName; - } - - virtual void setFromString( const std::string &sStr ) - { - std::stringstream(sStr) >> tValue; - } - - virtual std::string getAsString() - { - std::stringstream tmp; - tmp << tValue; - return tmp.str(); - } - -private: - std::string sName; - T tValue; -}; - -template<> -void ConfPair::setFromString( const std::string &sStr ) -{ - tValue = sStr; -} - -template<> -std::string ConfPair::getAsString() -{ - return tValue; -} - -template<> -void ConfPair::setFromString( const std::string &sStr ) -{ - if( !strcasecmp( sStr.c_str(), "true" ) || - !strcasecmp( sStr.c_str(), "yes" ) || - !strcasecmp( sStr.c_str(), "on" ) ) - tValue = true; - else - tValue = false; -} - -template<> -std::string ConfPair::getAsString() -{ - if( tValue == true ) - return "True"; - return "False"; -} - -#endif diff --git a/src/confpairbase.cpp b/src/confpairbase.cpp deleted file mode 100644 index 1203dc0..0000000 --- a/src/confpairbase.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "confpairbase.h" - -ConfPairBase::ConfPairBase() -{ -} - -ConfPairBase::~ConfPairBase() -{ -} - -ConfPairBase &ConfPairBase::operator=( const std::string &s ) -{ - setFromString( s ); - - return *this; -} - diff --git a/src/confpairbase.h b/src/confpairbase.h deleted file mode 100644 index 2530756..0000000 --- a/src/confpairbase.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef CONF_PAIR_BASE_H -#define CONF_PAIR_BASE_H - -#include -#include -#include -#include - -class ConfPairBase -{ -public: - ConfPairBase(); - virtual ~ConfPairBase(); - - virtual void setFromString( const std::string &sStr )=0; - virtual std::string getAsString()=0; - - ConfPairBase &operator=( const std::string &s ); - -private: - -}; - -#endif diff --git a/src/conftree.cpp b/src/conftree.cpp deleted file mode 100644 index d9a3a3f..0000000 --- a/src/conftree.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "conftree.h" - -ConfTree::ConfTree() -{ -} - -ConfTree::~ConfTree() -{ -} diff --git a/src/conftree.h b/src/conftree.h deleted file mode 100644 index 197b1ef..0000000 --- a/src/conftree.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef CONF_TREE_H -#define CONF_TREE_H - -#include - -/** - * - */ -class ConfTree -{ -public: - ConfTree(); - virtual ~ConfTree(); - -private: - -}; - -#endif diff --git a/src/connection.cpp b/src/connection.cpp deleted file mode 100644 index efef144..0000000 --- a/src/connection.cpp +++ /dev/null @@ -1,564 +0,0 @@ -#include "connection.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "exceptions.h" - -// Read buffer size...maybe fix wierd issues... -#define RBS (1024*10) - -Connection::Connection() -{ - nSocket = -1; - bActive = false; - bDisconnectMe = false; - pProtocol = NULL; -} - -Connection::~Connection() -{ - if( pProtocol != NULL ) delete pProtocol; -} - -void Connection::ensureCapacity( int nSize ) -{ - xOutputBuf.ensureCapacity( nSize ); -} - -bool Connection::appendOutput( const char *lpOutput, int nSize ) -{ - return xOutputBuf.appendData( lpOutput, nSize ); -} - -bool Connection::appendOutput( const char lOutput ) -{ - return xOutputBuf.appendData( lOutput ); -} - -bool Connection::appendOutput( const short lOutput ) -{ - return xOutputBuf.appendData( lOutput ); -} - -bool Connection::appendOutput( const int lOutput ) -{ - return xOutputBuf.appendData( lOutput ); -} - -bool Connection::appendOutput( const long lOutput ) -{ - return xOutputBuf.appendData( lOutput ); -} - -bool Connection::appendOutput( const float lOutput ) -{ - return xOutputBuf.appendData( lOutput ); -} - -bool Connection::appendOutput( const double lOutput ) -{ - return xOutputBuf.appendData( lOutput ); -} - -bool Connection::appendOutput( const unsigned char lOutput ) -{ - return xOutputBuf.appendData( lOutput ); -} - -bool Connection::appendOutput( const unsigned short lOutput ) -{ - return xOutputBuf.appendData( lOutput ); -} - -bool Connection::appendOutput( const unsigned long lOutput ) -{ - return xOutputBuf.appendData( lOutput ); -} - -bool Connection::appendOutput( const unsigned int lOutput ) -{ - return xOutputBuf.appendData( lOutput ); -} - -bool Connection::appendInput( const char *lpInput, int nSize ) -{ - return xInputBuf.appendData( lpInput, nSize ); -} - -int Connection::scanInputFor( char cTarget ) -{ - const char *lpTmp = xInputBuf.getData(); - int jMax = xInputBuf.getLength(); - - for( int j = 0; j < jMax; j++ ) - { - if( lpTmp[j] == cTarget ) - { - return j; - } - } - - return -1; -} - -const char *Connection::getOutput() -{ - return xOutputBuf.getData(); -} - -const char *Connection::getInput() -{ - return xInputBuf.getData(); -} - -void Connection::setSocket( int nNewSocket ) -{ - nSocket = nNewSocket; -} - -int Connection::getSocket() -{ - return nSocket; -} - -bool Connection::isActive() -{ - return bActive; -} - -void Connection::close() -{ - //printf("Close called, socket is: %s\n", bActive?"Active":"Inactive" ); - if( bActive ) - { - fsync( nSocket ); - ::close( nSocket ); - //printf("Socket closed.\n"); - } - bActive = false; - //nSocket = -1; - xInputBuf.clearData(); - xOutputBuf.clearData(); - if( pProtocol != NULL ) - { - delete pProtocol; - pProtocol = NULL; - } -} - -bool Connection::open( int nNewSocket ) -{ - bActive = true; - setSocket( nNewSocket ); - bDisconnectMe = false; - - return true; -} - -bool Connection::open( const char *sAddr, int nPort, int nSec ) -{ - struct sockaddr_in xServerName; - bActive = false; - - /* Create the socket. */ - nSocket = socket( PF_INET, SOCK_STREAM, 0 ); - - if( nSocket < 0 ) - { - bActive = false; - return false; - } - - // These lines set the socket to non-blocking, a good thing? - int flags; - flags = fcntl(nSocket, F_GETFL, 0); - flags |= O_NONBLOCK; - if (fcntl(nSocket, F_SETFL, flags) < 0) - { - return false; - } - - /* Connect to the server. */ - //printf("Resolving hostname (%s)...\n", sAddr ); - { - struct hostent *hostinfo; - - xServerName.sin_family = AF_INET; - xServerName.sin_port = htons( nPort ); - hostinfo = gethostbyname( sAddr ); - if (hostinfo == NULL) - { - return false; - } - xServerName.sin_addr = *(struct in_addr *) hostinfo->h_addr; - } - - //printf("Making actual connection..."); - //fflush( stdout ); - connect( - nSocket, - (struct sockaddr *)&xServerName, - sizeof(xServerName) - ); - //printf("Connected.\n"); - - bActive = true; - bDisconnectMe = false; - - if( nSec > 0 ) - { - fd_set rfds, wfds, efds; - int retval; - - FD_ZERO(&rfds); - FD_SET(nSocket, &rfds); - FD_ZERO(&wfds); - FD_SET(nSocket, &wfds); - FD_ZERO(&efds); - FD_SET(nSocket, &efds); - - struct timeval tv; - tv.tv_sec = nSec; - tv.tv_usec = 0; - - retval = select( nSocket+1, &rfds, &wfds, &efds, &tv ); - - if( retval == 0 ) - { - close(); - throw ExceptionBase("Connection timeout.\n"); - } - - } - - /* - if( ret < 0 ) - { - return false; - }*/ - - return true; -} - -int Connection::readInput() -{ - char buffer[RBS]; - int nbytes; - int nTotalRead=0; - - for(;;) - { - //memset( buffer, 0, RBS ); - - nbytes = read( nSocket, buffer, RBS ); - if( nbytes < 0 && errno != 0 && errno != EAGAIN ) - { - //printf("errno: %d, %s\n", errno, strerror( errno ) ); - /* Read error. */ - //perror("readInput"); - throw ConnectionException( excodeReadError, "Read error: %s", strerror( errno ) ); - } - else - { - if( nbytes <= 0 ) - break; - nTotalRead += nbytes; - appendInput( buffer, nbytes ); - /* Data read. */ - if( nbytes < RBS ) - { - break; - } - - /* New test, if data is divisible by RBS bytes on some libs the - * read could block, this keeps it from happening. - */ - { - fd_set rfds; - FD_ZERO(&rfds); - FD_SET(nSocket, &rfds); - struct timeval tv = { 0, 0 }; - int retval = select( nSocket+1, &rfds, NULL, NULL, &tv ); - if( retval == -1 ) - throw ConnectionException( - excodeBadReadError, - "Bad Read error" - ); - if( !FD_ISSET( nSocket, &rfds ) ) - break; - } - - } - } - - if( pProtocol != NULL && nTotalRead > 0 ) - { - pProtocol->onNewData(); - } - - return nTotalRead; -} - -bool Connection::readInput( int nSec, int nUSec, int *pnSecBack, int *pnUSecBack ) -{ - fd_set rfds, efds; - struct timeval tv, start, end; - struct timezone tz; - int retval; - - gettimeofday( &start, &tz ); - - FD_ZERO(&rfds); - FD_SET(nSocket, &rfds); - FD_ZERO(&efds); - FD_SET(nSocket, &efds); - - tv.tv_sec = nSec; - tv.tv_usec = nUSec; - - //printf("Starting at %d %d\n", nSec, nUSec ); - retval = select( nSocket+1, &rfds, NULL, NULL, &tv ); - - if( retval == -1 ) - { - // Oh my god!!! some kind of horrible problem!!!! - throw ConnectionException( excodeBadReadError, "Bad Read error"); - return false; - } - else if( retval ) - { - //printf("retval=%d, nSocket=%d,%d, sec=%d, usec=%d\n", retval, nSocket, FD_ISSET( nSocket, &rfds ), tv.tv_sec, tv.tv_usec ); - // None of them have data, but the connection is still active. - if( FD_ISSET( nSocket, &rfds ) ) - { - if( readInput() == 0 ) - { - throw ConnectionException( excodeConnectionClosed, "Connection closed"); } - } - } - - gettimeofday( &end, &tz ); - - int st, ust; - st = nSec - ( end.tv_sec - start.tv_sec ); - if( ( end.tv_usec - start.tv_usec ) > nUSec ) - { - (st)--; - ust = 1000000 - (end.tv_usec - start.tv_usec); - } - else - { - ust = nUSec - (end.tv_usec - start.tv_usec); - } - - if( st < 0 ) - { - st = ust = 0; - } - - if( pnSecBack ) - { - *pnSecBack = st; - *pnUSecBack = ust; - } - - //printf("New time: %d %d\n", *pnSecBack, *pnUSecBack ); - - return true; -} - -void Connection::waitForInput( int nBytesIn, int nSec, int nUSec ) -{ - int rlen = getInputAmnt(); - - if( rlen >= nBytesIn ) - return; - - while( rlen < nBytesIn ) - { - if( nSec == 0 && nUSec == 0 ) - { - throw ConnectionException( excodeSocketTimeout, "Timed out while waiting for %d bytes.", nBytesIn ); - } - readInput( nSec, nUSec, &nSec, &nUSec ); - rlen = getInputAmnt(); - } -} - -bool Connection::clearOutput() -{ - return xOutputBuf.clearData(); -} - -bool Connection::clearInput() -{ - return xInputBuf.clearData(); -} - -#define min( a, b ) ((asetConnection( this ); -} - -int Connection::getInputAmnt() -{ - return xInputBuf.getLength(); -} - -int Connection::getOutputAmnt() -{ - return xOutputBuf.getLength(); -} - -class Protocol *Connection::getProtocol() -{ - return pProtocol; -} - -void Connection::printInputDebug( const char *lpPrefix, FILE *fh, int nBytesMax ) -{ - printDataDebug( - (const unsigned char *)xInputBuf.getData(), - xInputBuf.getLength(), - "input", - lpPrefix, - fh, - nBytesMax - ); -} - -void Connection::printOutputDebug( const char *lpPrefix, FILE *fh, int nBytesMax ) -{ - printDataDebug( - (const unsigned char *)xOutputBuf.getData(), - xOutputBuf.getLength(), - "output", - lpPrefix, - fh, - nBytesMax - ); -} - -void Connection::printDataDebug( const unsigned char *pData, long nDataLen, const char *lpName, const char *lpPrefix, FILE *fh, int nBytesMax ) -{ - if( nBytesMax > 0 ) - { - nDataLen = (nBytesMax32 && pData[j+k]<=128)?(pData[j+k]):('.') ); - } - fprintf( fh, "\n"); - j += kmax; - if( j >= nDataLen ) break; - } - fprintf( fh, lpPrefix ); - for( int l = 0; l < 8*3+2*8+2; l++ ) fprintf( fh, (l!=8*3)?("-"):("+") ); fprintf( fh, "\n"); -} - diff --git a/src/connection.h b/src/connection.h deleted file mode 100644 index 0e991c7..0000000 --- a/src/connection.h +++ /dev/null @@ -1,411 +0,0 @@ -/**\file - * Contains the Connection class. - *@author Mike Buland - */ - -#ifndef CONNECTION_H -#define CONNECTION_H - -#include "multilog.h" -#include "flexbuf.h" -#include "protocol.h" - -/** Represents a single connection on a network. While these connections - * may be treated more or less just like files, occasionally problems arise - * when writing data at any time you feel like. Therefore you run all your - * data through a Connection, which buffers all data and makes sure no - * buffers are exceeded and nothing inappropriate for the recipient of the - * data is sent. - *@author Mike Buland - */ -class Connection -{ -public: - /** - * Construct a blank and non-connected Connection. The created object is - * not yet connected to anything, and most of the functions except open are - * unusable. - */ - Connection(); - - /** - * Destroy the connection, clean up all pending data requests and close the - * contained socket. This does not send out pending data, especially since - * such an operation could take considerable time, depending on the pending - * data and state of the receiving end. - */ - virtual ~Connection(); - - /** - * Open a connection to a remote server. This sets up this connection as - * a client instead of a server and does all of the work that needs to be - * done to actually open an INET_AF connection, which is a lot of work. - *@param sAddr The address to connect to. This can be in any format - * normally understood by your system to be an address, ip, domain name, - * etc. - *@param nPort The port number to connect to on the remote server. - *@returns True if the connection was successful and everything is setup, - * false if there were any of a dozen errors and the connection is not set. - *@todo Make this function add log entries to a standard MultiLog if - * something goes wrong. - */ - bool open( const char *sAddr, int nPort, int nSec=30 ); - - void ensureCapacity( int nSize ); - - /** Append the given data to the output. The data is presumed to be null - * terminated. To put binary data into the stream, use the other - * appendOutput function. This should be the only method used to - * communicate with the socket. - *@param lpOutput The data to add to the output queue. - *@param nSize How much data is in the lpOutput buffer. If this value - * is -1 then the program treats lpOutput as a null-terminated string. - *@returns True if everything is ok, false otherwise. - */ - bool appendOutput( const char *lpOutput, int nSize=-1 ); - - /** - * Append the character to the output. - *@param lOutput The character to add to the output queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendOutput( const char lOutput ); - - /** - * Append the short to the output. - *@param lOutput The short to add to the output queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendOutput( const short lOutput ); - - /** - * Append the int to the output. - *@param lOutput The int to add to the output queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendOutput( const int lOutput ); - - /** - * Append the long to the output. - *@param lOutput The long to add to the output queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendOutput( const long lOutput ); - - /** - * Append the float to the output. - *@param lOutput The float to add to the output queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendOutput( const float lOutput ); - - /** - * Append the double to the output. - *@param lOutput The double to add to the output queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendOutput( const double lOutput ); - - /** - * Append the unsigned char to the output. - *@param lOutput The unsigned char to add to the output queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendOutput( const unsigned char lOutput ); - - /** - * Append the unsigned short to the output. - *@param lOutput The unsigned short to add to the output queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendOutput( const unsigned short lOutput ); - - /** - * Append the unsigned int to the output. - *@param lOutput The unsigned int to add to the output queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendOutput( const unsigned int lOutput ); - - /** - * Append the unsigned long to the output. - *@param lOutput The unsigned long to add to the output queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendOutput( const unsigned long lOutput ); - - /** - * Writes all input data in the buffer in a dual-view ascii and hex display - * to a file. There are a number of options that also help with debugging. - *@param lpPrefix Text to be added to the begining of every line written - * out. The default is a blank string. - *@param fh The file to write the data to in text mode. This is stdout by - * default, but could be any already open file handle. - *@param nBytesMax The maximum number of bytes to write to the output. The - * amount of data can be overwhelming sometimes, so you can limit it. The - * default value is -1, which is also unlimited. - */ - void printInputDebug( const char *lpPrefix="", FILE *fh=stdout, int nBytesMax=-1 ); - - /** - * Writes all output data in the buffer in a dual-view ascii and hex display - * to a file. There are a number of options that also help with debugging. - *@param lpPrefix Text to be added to the begining of every line written - * out. The default is a blank string. - *@param fh The file to write the data to in text mode. This is stdout by - * default, but could be any already open file handle. - *@param nBytesMax The maximum number of bytes to write to the output. The - * amount of data can be overwhelming sometimes, so you can limit it. The - * default value is -1, which is also unlimited. - */ - void printOutputDebug( const char *lpPrefix="", FILE *fh=stdout, int nBytesMax=-1 ); - - /** - * This is the low-level generic function that is called by both - * printInputDebug and printOutputDebug. It works effectively just like - * both of them, except that you can give it a raw pointer to the data to - * print out. This probably doesn't belong in this class, but this was - * where I was when I needed it. - *@param pData A pointer to the data to write. This is not treated as a - * null terminated string, so make sure that the nDataLen param is set - * properly. - *@param nDataLen The number of bytes that are in pData and that you want to - * see. - *@param lpName The name of the data, this is used in the header where it - * says "Displaying nnn bytes of ." A good example would be input - * or output. - *@param lpPrefix Text to put before every line output. This just makes it - * easier to tell large blocks apart in the output. - *@param fh The file handle to write all data to. - *@param nBytesMax The maximum number of bytes. This parameter is stupid. - * If it is set to -1, then nDataLen is used, otherwise the smaller value is - * used as the number of bytes to output. - *@todo Put this function somewhere more deserving. - *@todo Remove the nBytesMax param, we need that in the other functions, - * not this one! - */ - void printDataDebug( const unsigned char *pData, long nDataLen, const char *lpName, const char *lpPrefix, FILE *fh, int nBytesMax ); - - /** Append the given data to the input. The data is presumed to be null - * terminated. To put binary data into the stream, use the other - * appendInput function. This is mainly used by internal routines. - *@param lpInput The data to add to the input queue. - *@param nSize How much data is in the lpInput buffer. If this value - * is -1 then the program treats lpOutput as a null-terminated string. - *@returns True if everything is ok, false otherwise. - */ - bool appendInput( const char *lpInput, int nSize=-1 ); - - /** Searches through the current pending input for a certain character. - * This is useful for finding out where exactly the end of a line is, for - * example, to see if a command has been entered yet. - *@param cTarget The character to search for. - *@returns The position of the target relative to the begining of the input - * or -1 if the target wasn't found. - */ - int scanInputFor( char cTarget ); - - /** Gets a pointer to the output buffer. This is mainly used by internal - * routines, and is cleared every click when data is sent out again. - *@returns A pointer to the buffer holding the pending output data. - */ - const char *getOutput(); - - /** Gets a pointer to the start of the input buffer's active data - * section. Use this to gain access to the input you need to do - * your job. - *@returns A pointer to the data in the input buffer. Do not delete this. - */ - const char *getInput(); - - /** Clears all pending output, this is mainly just used internally. - *@returns True if operation was a success, otherwise false. - */ - bool clearOutput(); - - /** Clears all pending input, weather it's been used or not. Please - * refrain from calling this during normal operation, use usedInput - * instead, it's much safer. - *@returns True if the operation was a success, false otherwise. - */ - bool clearInput(); - - /** Sets the socket that should be used internally. - *@param nNewSocket The new socket to work with. - */ - void setSocket( int nNewSocket ); - - /** Gets the handle (number) of the working socket. This can be a - * dangerous function to call, please refrain from calling it directly - * if any alternative can be found. - *@returns The number of the working socket. - */ - int getSocket(); - - /** Determines if the connection is still active. - *@returns True if the connection is active, false otherwise. - */ - bool isActive(); - - /** Clears all buffers and sets up the connection to be reused. - * Does not actually close the socket, that's handled by the - * ConnectionManager - */ - void close(); - - /** Opens a socket. Really just sets up the connection for use since - * the socket itself was created and opened by the ConnectionManager. - * This also calls setSocket so you don't have to. - *@param nNewSocket The socket to assosiate with. - */ - bool open( int nNewSocket ); - - /** - * Reads all pending input from the connection. If this is called outside - * of the ConnectionManager it will usually block indefinately waiting for - * new data. The only way to change this behaviour is to modify the socket - * low-level when you connect it manually, or, preferably use the other - * readInput function to control blocking time. - *@returns True socket is still connected, otherwise false. - */ - int readInput(); - - /** - * Reads all pending input from the connection, blocking up to nSec - * seconds and nUSec micro-seconds for the data. This uses select to - * simulate blocking, but has the same effect as standard io blocking. - * If you don't want to block, just set both values to zero. The back - * parameters are optional, set to null to not use them. The variables - * you pass in through the back parameters will contain the remaining - * time if data arrived before the max timeout was reached. - *@param nSec Max seconds to wait. - *@param nUSec Max micro-seconds to wait. - *@param pnSecBack The number of seconds remaining. - *@param pnUSecBack The number of micro-seconds remaining. - */ - bool readInput( int nSec, int nUSec, int *pnSecBack=NULL, int *pnUSecBack=NULL ); - - /** - * Waits until at least nBytesIn are read into the input buffer and ready - * to be used. Wait at most nSec seconds plus nUSec micro seconds. - * If the timeout is exceeded, this function throws an exception. If this - * function returns normally, you are guranteed to have at least nBytesIn - * bytes in your input buffer. - *@param nBytesIn Number of bytes to read. - *@param nSec The max seconds to wait. - *@param sUSec The max microseconds to wait. - */ - void waitForInput( int nBytesIn, int nSec, int nUSec ); - - /** Writes some data that is pending to the socket. - *@returns True if all data was written succesfully, false otherwise. - */ - bool writeOutput(); - - /** - * Writes all data that is pending on the socekt. - */ - bool writeAllOutput(); - - /** Determines if the connection has output waiting to go out. - *@returns true if there is pending output, otherwise false. - */ - bool hasOutput(); - - /** Sets internal flags so that this connection will be deleted next - * time through the ConnectionManager. - */ - void disconnect(); - - /** Determines if this connection is ready to be disconnected or not. - *@returns True if it is time to disconnect, false if it isn't. - */ - bool needDisconnect(); - - /** Tells the caller if there is pending input waiting to be processed. - *@returns True if there is pending input that has not been used, returns - * false if there isn't. - */ - bool hasInput(); - - /** Removes bytes from the begining of the input queue. Use this after - * getting the input and processing as much as you need to. - *@param nAmount The number of bytes used. - *@returns true if the update was successful, otherwise false. - */ - bool usedInput( int nAmount ); - - /** Sets the protocol to be used by this connection. All data in and out - * passes through the protocol object, which may process that data to - * filter out and process any special messages that may have been - * included. Everything that isn't processed can be accessed in the - * standard method. - *@param pNewProtocol A pointer to a protocol object that you want to - * use. - */ - void setProtocol( class Protocol *pNewProtocol ); - - /** Gets the number of bytes that are waiting in the input queue, the data - * that has yet to be processed. - *@returns The number of bytes in the input queue. - */ - int getInputAmnt(); - - /** Gets the number of bytes that are waiting in the output queue, the data - * that has yet to be sent to the connected socket. - *@returns The number of bytes in the input queue. - */ - int getOutputAmnt(); - - /** Gets a pointer to the protocol that is attatched to this connection - * object. This is useful to set modes, and send special commands in - * addition to the standard raw data reads and writes that are normally - * permitted. In fact, in everything besides a raw telnet protocol all - * data should be sent through the protocol and not the connection object. - *@returns A pointer to the Protocol assosiated with this connection. - */ - class Protocol *getProtocol(); - -private: - /** - * A buffer to keep data read from the socket in. This is filled in by - * the function readInput, which is automatically called by the - * ConnectionManager whenever new data is ready. - */ - FlexBuf xInputBuf; - - /** - * A buffer to keep data that should be sent to the socket. This is filled - * in by using the AppendOutput functions and is sent to the socket using - * the writeOutput function, which is automatically called every cycle by - * the ConnectionManager when there is pending data. - */ - FlexBuf xOutputBuf; - - /** - * The socket that the user is connected to. This is not the same as the - * socket number of the listening socket, this is the unique socket on the - * system that the data is coming to. - */ - int nSocket; - - /** - * True=active connection, False=connection lost - */ - bool bActive; - - /** - * True=disconnect next cycle (after data is transmitted), Flse=keep going. - */ - bool bDisconnectMe; - - /** - * A pointer to a protocol handler that can automatically process the data - * in the buffers. This is optional if you use the connections on your own - * but reccomended if you use this with the rest of the ConnectionManager - * system. - */ - class Protocol *pProtocol; -}; - -#endif diff --git a/src/connectionmanager.cpp b/src/connectionmanager.cpp deleted file mode 100644 index ea60b2b..0000000 --- a/src/connectionmanager.cpp +++ /dev/null @@ -1,397 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "connectionmanager.h" -#include - -ConnectionManager::ConnectionManager( int nInitPool ) : - xLog( MultiLog::getInstance() ) -{ - //nMasterSocket = -1; - pMonitor = NULL; - for( int j = 0; j < nInitPool; j++ ) - { - lInactive.insert( lInactive.begin(), new Connection() ); - } - FD_ZERO (&fdActive); - FD_ZERO (&fdRead); - FD_ZERO (&fdWrite); - FD_ZERO (&fdException); -} - -ConnectionManager::~ConnectionManager() -{ - std::list::const_iterator i; - for( i = lActive.begin(); i != lActive.end(); i++ ) - { - delete (*i); - } - for( i = lInactive.begin(); i != lInactive.end(); i++ ) - { - delete (*i); - } -} - -bool ConnectionManager::startServer( int nPort ) -{ - /* Create the socket and set it up to accept connections. */ - struct sockaddr_in name; - - /* Give the socket a name. */ - name.sin_family = AF_INET; - name.sin_port = htons( nPort ); - - // I think this specifies who we will accept connections from, - // a good thing to make configurable later on - name.sin_addr.s_addr = htonl( INADDR_ANY ); - - return startServer( name ); -} - -bool ConnectionManager::startServer( const char *sAddr, int nPort ) -{ - /* Create the socket and set it up to accept connections. */ - struct sockaddr_in name; - - /* Give the socket a name. */ - name.sin_family = AF_INET; - name.sin_port = htons( nPort ); - - inet_aton( sAddr, &name.sin_addr ); - - return startServer( name ); -} - -bool ConnectionManager::startServer( struct sockaddr_in &name ) -{ - /* Create the socket. */ - int nMasterSocket = socket (PF_INET, SOCK_STREAM, 0); - if (nMasterSocket < 0) - { - xLog.LineLog( MultiLog::LError, "Couldn't create a listen socket."); - return false; - } - - int opt = 1; - setsockopt( - nMasterSocket, - SOL_SOCKET, - SO_REUSEADDR, - (char *)&opt, - sizeof(opt) - ); - - if (bind (nMasterSocket, (struct sockaddr *) &name, sizeof (name)) < 0) - { - xLog.LineLog( MultiLog::LError, "Couldn't bind to the listen socket."); - return false; - } - - if (listen (nMasterSocket, 40) < 0) - { - xLog.LineLog( MultiLog::LError, "Couldn't begin listening to the server socket."); - return false; - } - - /* Initialize the set of active sockets. */ - FD_SET (nMasterSocket, &fdActive); - - sMasterSocket[nMasterSocket] = name.sin_port; - - return true; -} - -bool ConnectionManager::startServer( int nPort, int nNumTries, int nTimeout ) -{ - struct timeval xTimeout; - - for( int j = 0; j < nNumTries; j++ ) - { - xLog.LineLog( MultiLog::LStatus, "Attempting to create server socket (attempt [%d/%d])...", j+1, nNumTries ); - if( startServer( nPort ) == true ) - { - return true; - } - else if( j < nNumTries-1 ) - { - xLog.LineLog( MultiLog::LStatus, "Waiting for %d secconds to allow port to clear...", nTimeout ); - xTimeout.tv_sec = nTimeout; - xTimeout.tv_usec = 0; - if (select(0, (fd_set *) 0, (fd_set *) 0, (fd_set *) 0, &xTimeout) < 0) { - xLog.LineLog( MultiLog::LError, "Error using select to sleep for a while."); - } - usleep( nTimeout ); - } - } - - return false; -} - -bool ConnectionManager::scanConnections( int nTimeout, bool bForceTimeout ) -{ - struct timeval xTimeout; - - xTimeout.tv_sec = nTimeout / 1000000; - xTimeout.tv_usec = nTimeout % 1000000; - - /* Block until input arrives on one or more active sockets. */ - fdRead = fdActive; - fdWrite = fdActive; - fdException = fdActive; - - // We removed the write checking because it just checks to see if you *can* - // write...that's stupid, they're all open, so it always exits immediately - // if there are ANY connections there... - if( TEMP_FAILURE_RETRY( select( FD_SETSIZE, &fdRead, (fd_set *)0/*&fdWrite*/, &fdException, &xTimeout ) ) < 0 ) - { - xLog.LineLog( MultiLog::LError, "Error attempting to scan open connections."); - perror("ConnectionManager"); - return false; - } - // Now we use select to sleep as well as to scan for connections, now we - // just need to fix the fact that if there are no connections, the seccond - // select call doesn't return until there is a connection... - if( bForceTimeout ) - { - if (select(0, (fd_set *) 0, (fd_set *) 0, (fd_set *) 0, &xTimeout) < 0) { - xLog.LineLog( MultiLog::LError, "Error using select to sleep for a while."); - } - } - - /* Service all the sockets with input pending. */ - for( int i = 0; i < FD_SETSIZE; ++i ) - { - if( FD_ISSET( i, &fdRead ) ) - { - if( sMasterSocket.find( i ) != sMasterSocket.end() ) - { - addConnection( i ); - } - else - { - Connection *pCon = findActiveConnection( i ); - if( pCon == NULL ) - { - xLog.LineLog( MultiLog::LError, "A connection object was lost, or never created!"); - return false; - } - - /* Data arriving on an already-connected socket. */ - if( pCon->readInput() == 0 ) - { - xLog.LineLog( MultiLog::LStatus, "Closing connection due to disconnect."); - close( i ); - FD_CLR( i, &fdActive ); - pMonitor->onClosedConnection( pCon ); - pCon->close(); - } - else - { - // We actually read something...but the connection handles - // protocol notification, so we don't need to do anything - // here... - } - } - } - } - std::list::iterator i; - for( i = lActive.begin(); i != lActive.end(); i++ ) - { - if( (*i)->isActive() == false ) - { - std::list::iterator l = i; - i--; - lInactive.insert( lInactive.end(), *l ); - lActive.erase( l ); - continue; - } - (*i)->getProtocol()->poll(); - if( (*i)->hasOutput() ) - { - (*i)->writeOutput(); - } - if( (*i)->needDisconnect() && !(*i)->hasOutput() ) - { - int prt = (*i)->getSocket(); - close( prt ); - FD_CLR( prt, &fdActive ); - pMonitor->onClosedConnection( *i ); - (*i)->close(); - lInactive.insert( lInactive.end(), *i ); - std::list::iterator l = i; - i--; - lActive.erase( l ); - xLog.LineLog( MultiLog::LStatus, "Closing connection due to server request."); - } - } - - return true; -} - -bool ConnectionManager::shutdownServer() -{ - while( !lActive.empty() ) - { - Connection *i = *(lActive.begin()); - if( i->isActive() ) - { - pMonitor->onClosedConnection( i ); - i->close(); - lInactive.insert( lInactive.end(), i ); - lActive.erase( lActive.begin() ); - } - } -/* - for( int i = 0; i < nPoolSize; i++ ) - { - - int prt = axConPool[i].getSocket(); - close( prt ); -// FD_CLR( prt, &fdActive ); - pMonitor->onClosedConnection( &axConPool[i] ); - axConPool[i].close(); - } -*/ - std::map::iterator i; - for( i = sMasterSocket.begin(); i != sMasterSocket.end(); i++ ) - { - int nSocket = (*i).first; - shutdown( nSocket, SHUT_RDWR ); - close( nSocket ); - } - - return true; -} - -bool ConnectionManager::broadcastMessage( const char *lpData, int nExcludeSocket ) -{ - std::list::const_iterator i; - for( i = lActive.begin(); i != lActive.end(); i++ ) - { - if( (*i)->isActive() && - (*i)->getSocket() != nExcludeSocket ) - { - (*i)->appendOutput( lpData ); - } - } - - return true; -} - -bool ConnectionManager::addConnection( int nSocket ) -{ - struct sockaddr_in clientname; - size_t size; - int newSocket; - - size = sizeof( clientname ); -#ifdef __CYGWIN__ - newSocket = accept( nSocket, (struct sockaddr *) &clientname, (int *)&size ); -#else - newSocket = accept( nSocket, (struct sockaddr *) &clientname, &size ); -#endif - if( newSocket < 0 ) - { - xLog.LineLog( MultiLog::LError, "Error accepting a new connection!" ); - return false; - } -// char *tmpa = inet_ntoa(clientname.sin_addr); - char tmpa[20]; - inet_ntop( AF_INET, (void *)&clientname.sin_addr, tmpa, 20 ); - xLog.LineLog( MultiLog::LStatus, "New connection from host %s, port %hd.", tmpa, ntohs (clientname.sin_port) ); -/* - int nCnt = 0; - for( int j = 0; j < nPoolSize; j++ ) - { - if( axConPool[j].isActive() ) - { - nCnt++; - } - } - xLog.LineLog( MultiLog::LStatus, "Connections %d/%d.", nCnt, nPoolSize ); - */ -// free( tmpa ); - FD_SET( newSocket, &fdActive ); - - //void nonblock(socket_t s) - { - int flags; - - flags = fcntl(newSocket, F_GETFL, 0); - flags |= O_NONBLOCK; - if (fcntl(newSocket, F_SETFL, flags) < 0) - { - return false; - } - } - - Connection *pCon = getInactiveConnection(); - pCon->open( newSocket ); - - pMonitor->onNewConnection( pCon, (*sMasterSocket.find(nSocket)).second ); - if( pCon->getProtocol() ) - pCon->getProtocol()->onNewConnection(); - - lActive.insert( lActive.end(), pCon ); - - return true; -} - -void ConnectionManager::connect( - const char *lpAddress, - int nPort, - int nProtocolPort, - Protocol *pNewProto - ) -{ - Connection *pCon = getInactiveConnection(); - pCon->open( lpAddress, nPort ); - int nSocket = pCon->getSocket(); - FD_SET( nSocket, &fdActive ); - - pCon->setProtocol( pNewProto ); - pMonitor->onNewClientConnection( pCon, nProtocolPort ); - if( pCon->getProtocol() ) - pCon->getProtocol()->onNewClientConnection(); - - lActive.insert( lActive.end(), pCon ); -} - -Connection *ConnectionManager::getInactiveConnection() -{ - if( lInactive.empty() ) - { - return new Connection(); - } - Connection *pCon = *(lInactive.begin()); - lInactive.erase( lInactive.begin() ); - return pCon; -} - -Connection *ConnectionManager::findActiveConnection( int nSocket ) -{ - std::list::const_iterator i; - for( i = lActive.begin(); i != lActive.end(); i++ ) - { - if( (*i)->getSocket() == nSocket ) - { - return *i; - } - } - - return NULL; -} - -void ConnectionManager::setConnectionMonitor( ConnectionMonitor *pNewMonitor ) -{ - pMonitor = pNewMonitor; -} diff --git a/src/connectionmanager.h b/src/connectionmanager.h deleted file mode 100644 index cff036b..0000000 --- a/src/connectionmanager.h +++ /dev/null @@ -1,169 +0,0 @@ -/** - *@file - * Contains the ConnectionManager. - *@author Mike Buland - */ - -#ifndef CONNECTIONMANAGER_H -#define CONNECTIONMANAGER_H - -#include "multilog.h" -#include "connection.h" -#include "connectionmonitor.h" -#include -#include -#include - -/** Manges incoming network connections as a server. Creates and works with - * Connection objects. All operations are performed on TCP/IP v4 right now, - * and on a single port, although any number of connections can be handled. - *@author Mike Buland - */ -class ConnectionManager -{ -public: - /** - * Sets up the basics, like storage for the pool, and so on. This does not - * actually start a server, bind to a port, or create a connection pool. - * That's all handled by startServer(). - */ - ConnectionManager( int nInitPool=40 ); - - /** - * Cleans up everything, and even clears out all still-connected Connection - * objects. - */ - virtual ~ConnectionManager(); - - /** - * Starts a server socket and binds to it, listening for new connections. - * Unlike the version of this that takes two parameters, this listens on - * all local addresses, or the virtual 0.0.0.0 address if available, which - * is mapped to all active local addresses. - *@param nPort The port to listen on. - *@returns True if the socket was bound to the port and serving was - * started. False if there was a problem connecting to the port. - */ - bool startServer( int nPort ); - - /** - * Starts a server socket and binds to it, listening only on the address - * specified. If you want to listen to all local addresses you can enter - * "0.0.0.0" for the address, but the version of this with one parameter - * is more universal. - *@param sAddr The local ip address to bind to - *@param nPort The port to listen on. - *@returns True if the socket was bound to the port and serving was - * started. False if there was a problem connecting to the port. - */ - bool startServer( const char *sAddr, int nPort ); - - /** - * I recomend probably not using this function on your own too much, it - * does the real work of setting up a socket, but requires a properly - * prepared sackaddr_in structure. This isn't too hard, but it's easier - * to use the other startServer functions. They call this function after - * some prepwork. - *@param name A properly formed sockaddr_in structure that will not be - * modified, but describes how to listen and to what to listen. - *@returns True on success. - */ - bool startServer( struct sockaddr_in &name ); - - /** - * This is identicle to the simpler startServer function except that it - * will automatically try to connect multiple times in case the first - * attempt or two doesn't work for some reason. Initially this was - * written to compensate for server sockets staying locked after they were - * closed for a while. - *@param nPort The port to listen on. - *@param nInitPool The size of the initial connection pool. This will - * grow automatically if necesarry. - *@param nNumTries The maximum number of times to try to connect. - *@param nTimeout The amount of time to wait in-between connection - * attempts. - *@returns True if the socket was bound to the port and serving was - * started. False if there was a problem connecting to the port. - */ - bool startServer( int nPort, int nNumTries, int nTimeout ); - - /** - * Scans all open connections, halting the calling processes until data - * is received or nTimeout ms have gone by. While waiting for the timeout - * to complete the process is placed into an idle mode. - *@param nTimeout The number of millisecconds to wait if there is nothing - * to actually do. - *@param bForceTimeout If set to true, this will force the scanner to wait - * for the timout to complete before returning, even if there was pending - * data. - */ - bool scanConnections( int nTimeout, bool bForceTimeout ); - - /** Shutdown the server and all assosiated sockets. - *@returns True if every socket was closed without problem. - */ - bool shutdownServer(); - - /** Sends a message directly to every connected port. - *@param lpData A null-terminated string of data to send. - *@param nExcludeSocket An optional socket to exclude from the broadcast. - *@returns True if every socket that should have gotten the message did. - */ - bool broadcastMessage( const char *lpData, int nExcludeSocket=-1 ); - - /** Sets a monitor for the manager. The monitor is sent notifications - * whenever a socket is connected, disconnected, or whenever an error - * occurs. - *@param pNewMonitor A pointer to a preconstructed ConnectionMonitor - */ - void setConnectionMonitor( ConnectionMonitor *pNewMonitor ); - - void connect( const char *lpAddress, int nPort, int nProtocolPort, Protocol *pNewProto ); - -private: - /** - * Take care of the work of actually accepting a connection. This will - * accept the connection, set the initial modes, and add it to the master - * list of active connections, as well as fire off any messages that need - * to be handled by anything else. - *@param nSocket The handle of the listening socket that had an incoming - * connection. - *@returns True if everything worked, False otherwise. - */ - bool addConnection( int nSocket ); - - /** - * Seraches the internal lists of connections for one with a specific - * socket. - *@param nSocket The socket the connection is using for communication. - * This is the unique socket and not the one that the connection was - * initially to. - *@returns NULL if no connection was found, otherwise a pointer to a live - * Connection object. - */ - Connection *findActiveConnection( int nSocket ); - - /** - * Searches the connection pool for an object that isn't in use yet, and - * returns it, ready to be filled in and used. - *@returns An unused connection object ready for use. - *@todo Check this code over to insure that the pool grows appropriately - * when enough extra connections are detected. - */ - Connection *getInactiveConnection(); - - std::map sMasterSocket; - //int nMasterSocket; /**< The listening or server socket. */ - fd_set fdActive; /**< The active socket set. */ - fd_set fdRead; /**< The sockets ready for a read. */ - fd_set fdWrite; /**< The sockets ready for a write. */ - fd_set fdException; /**< The sockets that have gotten errors. */ - std::list lInactive; /**< The pool of inactive Connections */ - std::list lActive; /**< The pool of active Connections */ - MultiLog &xLog; /**< A handle to the active multilog. */ - - /** The ConnectionMonitor to notify of new connections. */ - ConnectionMonitor *pMonitor; -}; - -#endif diff --git a/src/connectionmonitor.cpp b/src/connectionmonitor.cpp deleted file mode 100644 index 4f90ee6..0000000 --- a/src/connectionmonitor.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "connectionmonitor.h" - -ConnectionMonitor::ConnectionMonitor() -{ -} - -ConnectionMonitor::~ConnectionMonitor() -{ -} - diff --git a/src/connectionmonitor.h b/src/connectionmonitor.h deleted file mode 100644 index 9910556..0000000 --- a/src/connectionmonitor.h +++ /dev/null @@ -1,47 +0,0 @@ -/**@file - * Describes the ConnectionMonitor class. - */ -#ifndef CONNECTIONMONITOR_H -#define CONNECTIONMONITOR_H - -#include "connection.h" - -/** Connection Monitor defines the base class of the objects that will be - * notified whenever a connection is created or destroyed. - *@author Mike Buland - */ -class ConnectionMonitor -{ -public: - /** - * This is only here for completeness. It does nothing. - */ - ConnectionMonitor(); - - /** - * This is only here for completeness. It does nothing. - */ - virtual ~ConnectionMonitor(); - - /** Receives the notification that new connection was received. - *@param pCon The connection that was created. - *@param nSocket The socket that the client connected to, used to determine - * which protocol to apply. - *@returns Should return a true value if everything is OK, a false to - * force a shutdown. - */ - virtual bool onNewConnection( Connection *pCon, int nPort ) = 0; - virtual bool onNewClientConnection( Connection *pCon, int nPort ) - { - return onNewConnection( pCon, nPort ); - }; - - /** Receives the notification that a connection was closed. - *@param pCon The connection that was closed. - *@returns Should return a true value if everything is OK, a false to - * force a shutdown. - */ - virtual bool onClosedConnection( Connection *pCon ) = 0; -}; - -#endif diff --git a/src/exceptionbase.cpp b/src/exceptionbase.cpp deleted file mode 100644 index f3d22da..0000000 --- a/src/exceptionbase.cpp +++ /dev/null @@ -1,70 +0,0 @@ -#include "exceptionbase.h" -#include - -ExceptionBase::ExceptionBase( const char *lpFormat, ... ) throw() : - nErrorCode( 0 ), - sWhat( NULL ) -{ - va_list ap; - - va_start(ap, lpFormat); - setWhat( lpFormat, ap ); - va_end(ap); -} - -ExceptionBase::ExceptionBase( int nCode, const char *lpFormat, ... ) throw() : - nErrorCode( nCode ), - sWhat( NULL ) -{ - va_list ap; - - va_start(ap, lpFormat); - setWhat( lpFormat, ap ); - va_end(ap); -} - -ExceptionBase::ExceptionBase( int nCode ) throw() : - nErrorCode( nCode ), - sWhat( NULL ) -{ -} - -ExceptionBase::~ExceptionBase() throw() -{ - if( sWhat ) - { - delete[] sWhat; - sWhat = NULL; - } -} - -void ExceptionBase::setWhat( const char *lpFormat, va_list &vargs ) -{ - if( sWhat ) delete[] sWhat; - int nSize; - - nSize = vsnprintf( NULL, 0, lpFormat, vargs ); - sWhat = new char[nSize+1]; - vsnprintf( sWhat, nSize+1, lpFormat, vargs ); -} - -void ExceptionBase::setWhat( const char *lpText ) -{ - if( sWhat ) delete[] sWhat; - int nSize; - - nSize = strlen( lpText ); - sWhat = new char[nSize+1]; - strcpy( sWhat, lpText ); -} - -const char *ExceptionBase::what() const throw() -{ - return sWhat; -} - -int ExceptionBase::getErrorCode() -{ - return nErrorCode; -} - diff --git a/src/exceptionbase.h b/src/exceptionbase.h deleted file mode 100644 index 6f1eca7..0000000 --- a/src/exceptionbase.h +++ /dev/null @@ -1,105 +0,0 @@ -#ifndef EXCEPTION_BASE_H -#define EXCEPTION_BASE_H - -#include -#include -#include - -/** - * A generalized Exception base class. This is nice for making general and - * flexible child classes that can create new error code classes. - */ -class ExceptionBase : public std::exception -{ -public: - /** - * Construct an exception with an error code of zero, but with a - * description. The use of this is not reccomended most of the time, it's - * generally best to include an error code with the exception so your - * program can handle the exception in a better way. - * @param sFormat The format of the text. See printf for more info. - */ - ExceptionBase( const char *sFormat, ... ) throw(); - - /** - * - * @param nCode - * @param sFormat - */ - ExceptionBase( int nCode, const char *sFormat, ... ) throw(); - - /** - * - * @param nCode - * @return - */ - ExceptionBase( int nCode=0 ) throw(); - - /** - * - * @return - */ - virtual ~ExceptionBase() throw(); - - /** - * - * @return - */ - virtual const char *what() const throw(); - - /** - * - * @return - */ - int getErrorCode(); - - /** - * - * @param lpFormat - * @param vargs - */ - void setWhat( const char *lpFormat, va_list &vargs ); - - /** - * - * @param lpText - */ - void setWhat( const char *lpText ); - -private: - int nErrorCode; /**< The code for the error that occured. */ - char *sWhat; /**< The text string telling people what went wrong. */ -}; - -#define subExceptionDecl( name ) \ -class name : public ExceptionBase \ -{ \ - public: \ - name( const char *sFormat, ... ) throw (); \ - name( int nCode, const char *sFormat, ... ) throw(); \ - name( int nCode=0 ) throw (); \ -}; - -#define subExceptionDef( name ) \ -name::name( const char *lpFormat, ... ) throw() : \ - ExceptionBase( 0 ) \ -{ \ - va_list ap; \ - va_start( ap, lpFormat ); \ - setWhat( lpFormat, ap ); \ - va_end( ap ); \ -} \ -name::name( int nCode, const char *lpFormat, ... ) throw() : \ - ExceptionBase( nCode ) \ -{ \ - va_list ap; \ - va_start( ap, lpFormat ); \ - setWhat( lpFormat, ap ); \ - va_end( ap ); \ -} \ -name::name( int nCode ) throw() : \ - ExceptionBase( nCode ) \ -{ \ -} - -#endif diff --git a/src/exceptions.cpp b/src/exceptions.cpp deleted file mode 100644 index ce79a5e..0000000 --- a/src/exceptions.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "exceptions.h" -#include - -subExceptionDef( XmlException ) -subExceptionDef( FileException ) -subExceptionDef( ConnectionException ) -subExceptionDef( PluginException ) - diff --git a/src/exceptions.h b/src/exceptions.h deleted file mode 100644 index 0ab2b15..0000000 --- a/src/exceptions.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef EXCEPTIONS_H -#define EXCEPTIONS_H - -#include "exceptionbase.h" -#include - -subExceptionDecl( XmlException ) -subExceptionDecl( FileException ) -subExceptionDecl( ConnectionException ) -subExceptionDecl( PluginException ) - -enum eFileException -{ - excodeEOF -}; - -enum eConnectionException -{ - excodeReadError, - excodeBadReadError, - excodeConnectionClosed, - excodeSocketTimeout -}; - -#endif diff --git a/src/flexbuf.cpp b/src/flexbuf.cpp deleted file mode 100644 index 6d55294..0000000 --- a/src/flexbuf.cpp +++ /dev/null @@ -1,229 +0,0 @@ -#include "flexbuf.h" -#include - -FlexBuf::FlexBuf() -{ - lpBuf = new char[1024]; - nLastChar = 0; - nFirstChar = 0; - nSize = 1024; - nFill = 0; - clearData(); -} - -FlexBuf::~FlexBuf() -{ - delete[] lpBuf; -} - -bool FlexBuf::appendData( const char *lpData, int nDSize ) -{ - int nStrLen; - if( nDSize < 0 ) - { - nStrLen = strlen( lpData ); - } - else - { - nStrLen = nDSize; - } - - if( nLastChar + nStrLen + 1 > nSize ) - { - if( nFill + nStrLen + 1 < nSize ) - { - memcpy( lpBuf, lpBuf+nFirstChar, nFill ); - nLastChar -= nFirstChar; - nFirstChar = 0; - } - else - { - nSize += nStrLen+1; - char *lpNewBuf = new char[nSize]; - memcpy( lpNewBuf, lpBuf+nFirstChar, nFill ); - delete[] lpBuf; - lpBuf = lpNewBuf; - nLastChar -= nFirstChar; - nFirstChar = 0; - } - } - - memcpy( &lpBuf[nLastChar], lpData, nStrLen ); - nLastChar += nStrLen; - nFill += nStrLen; - lpBuf[nLastChar] = '\0'; - - return true; -} - -bool FlexBuf::appendData( const char lData ) -{ - if( nLastChar + 2 > nSize ) - { - if( nFill+2 < nSize ) - { - memcpy( lpBuf, lpBuf+nFirstChar, nFill ); - nLastChar -= nFirstChar; - nFirstChar = 0; - } - else - { - nSize += 1024; - char *lpNewBuf = new char[nSize]; - memcpy( lpNewBuf, lpBuf+nFirstChar, nFill ); - delete[] lpBuf; - lpBuf = lpNewBuf; - nLastChar -= nFirstChar; - nFirstChar = 0; - } - } - - lpBuf[nLastChar] = lData; - nLastChar++; - nFill++; - lpBuf[nLastChar] = '\0'; - - return true; -} - -bool FlexBuf::appendData( const short lData ) -{ - return appendData( (const char *)&lData, sizeof(short) ); -} - -bool FlexBuf::appendData( const int lData ) -{ - return appendData( (const char *)&lData, sizeof(int) ); -} - -bool FlexBuf::appendData( const long lData ) -{ - return appendData( (const char *)&lData, sizeof(long) ); -} - -bool FlexBuf::appendData( const float lData ) -{ - return appendData( (const char *)&lData, sizeof(float) ); -} - -bool FlexBuf::appendData( const double lData ) -{ - return appendData( (const char *)&lData, sizeof(double) ); -} - -bool FlexBuf::appendData( const unsigned char lData ) -{ - return appendData( (const char)lData ); -} - -bool FlexBuf::appendData( const unsigned short lData ) -{ - return appendData( (const char *)&lData, sizeof(short) ); -} - -bool FlexBuf::appendData( const unsigned long lData ) -{ - return appendData( (const char *)&lData, sizeof(long) ); -} - -bool FlexBuf::appendData( const unsigned int lData ) -{ - return appendData( (const char *)&lData, sizeof(int) ); -} - -bool FlexBuf::clearData() -{ - nFirstChar = nLastChar = nFill = 0; - lpBuf[nLastChar] = '\0'; - - return true; -} - -const char *FlexBuf::getData() -{ - return (lpBuf+nFirstChar); -} - -int FlexBuf::getLength() -{ - return nFill; -} - -int FlexBuf::getCapacity() -{ - return nSize; -} - -bool FlexBuf::usedData( int nAmount ) -{ - // Remove from the end if negative - if( nAmount < 0 ) - { - if( nFill+nAmount < 0 ) - { - nFill = nFirstChar = nLastChar = 0; - return true; - } - nLastChar += nAmount; - nFill += nAmount; - return true; - } - if( nAmount > nFill ) - { - nAmount = nSize; -// return false; - } - - //nLastChar -= nAmount; - nFirstChar += nAmount; - nFill -= nAmount; - - if( nFill == 0 ) - { - nFirstChar = nLastChar = 0; - } - - //if( nLastChar > 0 ) - //{ - //memmove( lpBuf, &lpBuf[nAmount], nLastChar ); - //} - - return true; -} - -int FlexBuf::findChar( char cTarget ) -{ - for( int j = nFirstChar; j < nLastChar; j++ ) - { - if( lpBuf[j] == cTarget ) - { - return j; - } - } - - return -1; -} - -void FlexBuf::ensureCapacity( int nAmount ) -{ - if( nLastChar + nAmount + 1 > nSize ) - { - if( nFill + nAmount + 1 < nSize ) - { - memcpy( lpBuf, lpBuf+nFirstChar, nFill ); - nLastChar -= nFirstChar; - nFirstChar = 0; - } - else - { - nSize += nAmount+1; - char *lpNewBuf = new char[nSize]; - memcpy( lpNewBuf, lpBuf+nFirstChar, nFill ); - delete[] lpBuf; - lpBuf = lpNewBuf; - nLastChar -= nFirstChar; - nFirstChar = 0; - } - } -} - diff --git a/src/flexbuf.h b/src/flexbuf.h deleted file mode 100644 index 7d7f11a..0000000 --- a/src/flexbuf.h +++ /dev/null @@ -1,162 +0,0 @@ -/**\flexbuf.h - * Describes the FlexBuf class. - *@author Mike Buland - */ - -#ifndef FLEXBUF_H -#define FLEXBUF_H - -/** Stores any amount of data, but starts small, growing as necesarry. - * It is optimized to work with stream type situations, with data being - * added to the end while it is being taken from the begning. - *@todo Set this class up to auto-shrink back to a specified sized buffer each - * time it has shrunk below that for enough operations. - *@author Mike Buland - */ -class FlexBuf -{ -public: - /** - * Construct a blank FlexBuf containing about 1k of buffer space. - */ - FlexBuf(); - - /** - * Clean up the FlexBuf, delete all buffers. - */ - virtual ~FlexBuf(); - - /** Appends a whole string of data to the buffer. The string - * must be null terminated. - *@param lpData The data to append to the buffer. - *@param nDSize The size of the data described by lpData. If this - * value is -1 lpData is treated as a null-terminated string. - *@returns True if no problems occured, false otherwise. - */ - bool appendData( const char *lpData, int nDSize=-1 ); - - /** Appends a single character to the end of the buffer. - *@param lData The character to append to the buffer. - *@returns True if no problems occured, false otherwise. - */ - bool appendData( const char lData ); - - /** - * Append the short to the buffer. - *@param lData The short to add to the buffer queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendData( const short lData ); - - /** - * Append the int to the buffer. - *@param lData The int to add to the buffer queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendData( const int lData ); - - /** - * Append the long to the buffer. - *@param lData The long to add to the buffer queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendData( const long lData ); - - /** - * Append the float to the buffer. - *@param lData The float to add to the buffer queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendData( const float lData ); - - /** - * Append the double to the buffer. - *@param lData The double to add to the buffer queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendData( const double lData ); - - /** - * Append the unsigned char to the buffer. - *@param lData The unsigned char to add to the buffer queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendData( const unsigned char lData ); - - /** - * Append the unsigned short to the buffer. - *@param lData The unsigned short to add to the buffer queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendData( const unsigned short lData ); - - /** - * Append the unsigned int to the buffer. - *@param lData The unsigned int to add to the buffer queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendData( const unsigned int lData ); - - /** - * Append the unsigned long to the buffer. - *@param lData The unsigned long to add to the buffer queue. - *@returns True if everything is ok, false otherwise. - */ - bool appendData( const unsigned long lData ); - - /** Removes all pending data from the buffer. - *@returns True if no problems occured, false otherwise. - */ - bool clearData(); - - /** Gets a pointer to the internal buffer, at the begining of the current - * data stream. - *@returns A pointer to the internal data buffer. - */ - const char *getData(); - - /** Gets the length of the current buffer (how much data is really in the - * buffer, not it's current capacity, for that check getCapacity) - *@returns The length of the current buffer. - */ - int getLength(); - - /** Gets the current capacity of the FlexBuf. If the size nears this value - * then the entire buffer is resized to accomidate more data. - *@returns The current capacity of the FlexBuf. - */ - int getCapacity(); - - /** - * Removes nAmount bytes from the begning of the buffer. Actually, if - * nAmount happens to be negative it will remove tha absolute value of - * nValue bytes from the end of the buffer, like the old delData command. - *@param nAmount The number of bytes used. - *@returns True if everything was successful, false if there was an error. - */ - bool usedData( int nAmount ); - - /** Finds the first instance of the given character in the buffer and - * returns an index to it. - *@param cTarget The character you're looking for. - *@returns The index of the first instance of the given character, or - * -1 if it just wasn't found. - */ - int findChar( char cTarget ); - - void ensureCapacity( int nAmount ); - -private: - /** The raw storage location of the FlexBuf. */ - char *lpBuf; - /** The real size of the FlexBuf. */ - int nSize; - /** Where the last char is. */ - int nLastChar; - /** Where the first char is. */ - int nFirstChar; - /** The amount of real data in the FlexBuf. This is effectively nLastChar-nFirstChar. */ - int nFill; -}; - -#endif diff --git a/src/formula.cpp b/src/formula.cpp deleted file mode 100644 index cf63cf3..0000000 --- a/src/formula.cpp +++ /dev/null @@ -1,262 +0,0 @@ -#include "formula.h" - -subExceptionDef( ParseException ); - -Formula::Formula() -{ - hVars["pi"] = M_PI; - hVars["e"] = M_E; - - hFunc["sin"] = FuncSin(); -} - -Formula::~Formula() -{ -} - -double Formula::run( char *sFormula ) -{ - for(;;) - { - uint8_t tNum = nextToken( &sFormula ); - if( tNum == symEOS ) - break; - else if( tNum == symSubtract ) - { - tNum = nextToken( &sFormula ); - if( tNum != symNumber ) - throw ParseException("Unary minus must be followed by a number, " - "variable, function, or parenthesis."); - sValue.top() = -sValue.top(); - } - else if( tNum == symOpenParen ) - { - sOper.push( tNum ); - continue; - } - -oppart: uint8_t tOpr = nextToken( &sFormula ); - if( tOpr == symEOS ) - { - //printf("EOS "); - reduce(); - return sValue.top(); - break; - } - if( !sOper.empty() && getPrec( sOper.top() ) > getPrec( tOpr ) ) - { - reduce(); - } - if( tOpr != symCloseParen ) - { - sOper.push( tOpr ); - } - else - { - reduce( true ); - goto oppart; - } - } - return sValue.top(); -} - -void Formula::reduce( bool bCloseParen ) -{ - while( !sOper.empty() ) - { - uint8_t nOpr = sOper.top(); - if( nOpr == symOpenParen ) - { - //printf("Found ( stopping reduction.\n"); - if( bCloseParen == true ) - sOper.pop(); - return; - } - sOper.pop(); - - double dTop = sValue.top(); - sValue.pop(); - - switch( nOpr ) - { - case symAdd: - //printf("%f + %f = %f\n", sValue.top(), dTop, sValue.top()+dTop ); - sValue.top() += dTop; - break; - - case symSubtract: - //printf("%f - %f = %f\n", sValue.top(), dTop, sValue.top()-dTop ); - sValue.top() -= dTop; - break; - - case symMultiply: - //printf("%f * %f = %f\n", sValue.top(), dTop, sValue.top()*dTop ); - sValue.top() *= dTop; - break; - - case symDivide: - //printf("%f / %f = %f\n", sValue.top(), dTop, sValue.top()/dTop ); - sValue.top() /= dTop; - break; - - case symExponent: - //printf("%f ^ %f = %f\n", sValue.top(), dTop, pow(sValue.top(),dTop) ); - sValue.top() = pow( sValue.top(), dTop ); - break; - - case symModulus: - //printf("%f %% %f = %f\n", sValue.top(), dTop, fmod(sValue.top(),dTop) ); - sValue.top() = fmod( sValue.top(), dTop ); - break; - } - } - - if( bCloseParen == true ) - { - throw ParseException("Close-paren found without matching open-paren."); - } -} - -uint8_t Formula::getPrec( uint8_t nOper ) -{ - switch( nOper ) - { - case symNumber: - case symVariable: - case symOpenParen: - case symCloseParen: - return 0; - - case symAdd: - case symSubtract: - return 1; - - case symMultiply: - case symDivide: - case symModulus: - return 2; - - case symExponent: - return 3; - - default: - return 0; - } -} - -uint8_t Formula::nextToken( char **sBuf ) -{ - for(;;) - { - char cbuf = **sBuf; - ++(*sBuf); - switch( cbuf ) - { - case '+': - return symAdd; - - case '-': - return symSubtract; - - case '*': - return symMultiply; - - case '/': - return symDivide; - - case '^': - return symExponent; - - case '%': - return symModulus; - - case '(': - return symOpenParen; - - case ')': - return symCloseParen; - - case ' ': - case '\t': - case '\n': - case '\r': - break; - - case '\0': - return symEOS; - - default: - if( cbuf == '.' || (cbuf >= '0' && cbuf <= '9') ) - { - char num[50]={cbuf}; - int nPos = 1; - bool bDot = false; - - for(;;) - { - cbuf = **sBuf; - if( cbuf == '.' ) - { - if( bDot == false ) - bDot = true; - else - throw ParseException( - "Numbers cannot have more than one " - ". in them." - ); - } - if( cbuf == '.' || (cbuf >= '0' && cbuf <= '9') ) - { - num[nPos++] = cbuf; - } - else - { - num[nPos] = '\0'; - sValue.push( strtod( num, NULL ) ); - return symNumber; - } - ++(*sBuf); - } - } - else if( (cbuf >= 'a' && cbuf <= 'z') || - (cbuf >= 'A' && cbuf <= 'Z') || - (cbuf == '_') ) - { - char tok[50]={cbuf}; - int nPos = 1; - - for(;;) - { - cbuf = **sBuf; - if( (cbuf >= 'a' && cbuf <= 'z') || - (cbuf >= 'A' && cbuf <= 'Z') || - (cbuf >= '0' && cbuf <= '9') || - cbuf == '_' || cbuf == '.' || cbuf == ':' ) - { - tok[nPos++] = cbuf; - } - else - { - tok[nPos] = '\0'; - //printf("Checking variable \"%s\"\n", tok ); - try - { - sValue.push( hVars[tok] ); - return symNumber; - } - catch( HashException &e ) - { - throw ParseException( - "No variable named \"%s\" exists.", - tok - ); - } - } - ++(*sBuf); - } - } - break; - } - } -} - diff --git a/src/formula.h b/src/formula.h deleted file mode 100644 index 939eb09..0000000 --- a/src/formula.h +++ /dev/null @@ -1,77 +0,0 @@ -#ifndef FORMULA_H -#define FORMULA_H - -#include - -#include -#include -#include "sbuffer.h" - -#include "exceptionbase.h" -#include "hash.h" - -subExceptionDecl( ParseException ); - -/** - * Implements a very simple formula parser that allows use of variables and - * custom functions. This is based on a simple calculator-type parser that - * executes as it processes, accounting for operator precedence and grouping. - */ -class Formula -{ -public: - Formula(); - virtual ~Formula(); - - double run( char *sFormula ); - - typedef Hash varHash; - varHash hVars; - - typedef struct Func - { - double operator()( double x ) - { - return 0.0; - } - } Func; - - typedef Hash funcHash; - funcHash hFunc; - - typedef struct FuncSin : Func - { - double operator()( double x ) - { - return sin( x ); - } - } FuncSin; - -private: - enum - { - symEOS, - symAdd, - symSubtract, - symMultiply, - symDivide, - symOpenParen, - symCloseParen, - symNumber, - symVariable, - symExponent, - symModulus - }; - - typedef uint8_t symType; - - std::stack sOper; - std::stack sValue; - -private: - symType getPrec( symType nOper ); - symType nextToken( char **sBuf ); - void reduce( bool bCloseParen = false ); -}; - -#endif diff --git a/src/fstring.cpp b/src/fstring.cpp deleted file mode 100644 index 82d024d..0000000 --- a/src/fstring.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "fstring.h" -#include "hash.h" - -template<> uint32_t __calcHashCode( const FString &k ) -{ - return __calcHashCode( k.c_str() ); -} - -template<> bool __cmpHashKeys( const FString &a, const FString &b ) -{ - return a == b; -} - diff --git a/src/fstring.h b/src/fstring.h deleted file mode 100644 index c5397cc..0000000 --- a/src/fstring.h +++ /dev/null @@ -1,651 +0,0 @@ -#ifndef F_STRING_H -#define F_STRING_H - -#include -#include -#include "serializable.h" -#include "serializer.h" - -template< typename chr > -struct FStringChunk -{ - long nLength; - chr *pData; - FStringChunk *pNext; -}; - -/** - * Flexible String class. This class was designed with string passing and - * generation in mind. Like the standard string class you can specify what - * datatype to use for each character. Unlike the standard string class, - * collection of appended and prepended terms is done lazily, making long - * operations that involve many appends very inexpensive. In addition internal - * ref-counting means that if you pass strings around between functions there's - * almost no overhead in time or memory since a reference is created and no - * data is actually copied. This also means that you never need to put any - * FBasicString into a ref-counting container class. - */ -template< typename chr, typename chralloc=std::allocator, typename chunkalloc=std::allocator > > -class FBasicString : public Serializable -{ -#ifndef VALTEST -#define cpy( dest, src, size ) memcpy( dest, src, size*sizeof(chr) ) -#endif -private: - typedef struct FStringChunk Chunk; - typedef struct FBasicString MyType; - -public: - FBasicString() : - nLength( 0 ), - pnRefs( NULL ), - pFirst( NULL ), - pLast( NULL ) - { - } - - FBasicString( const chr *pData ) : - nLength( 0 ), - pnRefs( NULL ), - pFirst( NULL ), - pLast( NULL ) - { - append( pData ); - } - - FBasicString( const chr *pData, long nLength ) : - nLength( 0 ), - pnRefs( NULL ), - pFirst( NULL ), - pLast( NULL ) - { - append( pData, nLength ); - } - - FBasicString( const MyType &rSrc ) : - nLength( 0 ), - pnRefs( NULL ), - pFirst( NULL ), - pLast( NULL ) - { - // Here we have no choice but to copy, since the other guy is a const. - // In the case that the source were flat, we could get a reference, it - // would make some things faster, but not matter in many other cases. - - joinShare( rSrc ); - //copyFrom( rSrc ); - } - - FBasicString( const MyType &rSrc, long nLength ) : - nLength( 0 ), - pnRefs( NULL ), - pFirst( NULL ), - pLast( NULL ) - { - append( rSrc.pFirst->pData, nLength ); - } - - FBasicString( const MyType &rSrc, long nStart, long nLength ) : - nLength( 0 ), - pnRefs( NULL ), - pFirst( NULL ), - pLast( NULL ) - { - append( rSrc.pFirst->pData+nStart, nLength ); - } - - FBasicString( long nSize ) : - nLength( nSize ), - pnRefs( NULL ), - pFirst( NULL ), - pLast( NULL ) - { - pFirst = pLast = newChunk( nSize ); - } - - virtual ~FBasicString() - { - clear(); - } - - void append( const chr *pData ) - { - long nLen; - for( nLen = 0; pData[nLen] != (chr)0; nLen++ ); - - Chunk *pNew = newChunk( nLen ); - cpy( pNew->pData, pData, nLen ); - - appendChunk( pNew ); - } - - void append( const chr *pData, long nLen ) - { - Chunk *pNew = newChunk( nLen ); - - cpy( pNew->pData, pData, nLen ); - - appendChunk( pNew ); - } - - void prepend( const chr *pData ) - { - long nLen; - for( nLen = 0; pData[nLen] != (chr)0; nLen++ ); - - Chunk *pNew = newChunk( nLen ); - cpy( pNew->pData, pData, nLen ); - - prependChunk( pNew ); - } - - void prepend( const chr *pData, long nLen ) - { - Chunk *pNew = newChunk( nLen ); - - cpy( pNew->pData, pData, nLen ); - - prependChunk( pNew ); - } - - void clear() - { - realClear(); - } - - void resize( long nNewSize ) - { - if( nLength == nNewSize ) - return; - - flatten(); - - Chunk *pNew = newChunk( nNewSize ); - long nNewLen = (nNewSizepData, pFirst->pData, nNewLen ); - pNew->pData[nNewLen] = (chr)0; - aChr.deallocate( pFirst->pData, pFirst->nLength+1 ); - aChunk.deallocate( pFirst, 1 ); - pFirst = pLast = pNew; - nLength = nNewSize; - } - - long getSize() const - { - return nLength; - } - - chr *getStr() - { - if( pFirst == NULL ) - return NULL; - - flatten(); - return pFirst->pData; - } - - const chr *getStr() const - { - if( pFirst == NULL ) - return NULL; - - flatten(); - return pFirst->pData; - } - - chr *c_str() - { - if( pFirst == NULL ) - return NULL; - - flatten(); - return pFirst->pData; - } - - const chr *c_str() const - { - if( pFirst == NULL ) - return NULL; - - flatten(); - return pFirst->pData; - } - - MyType &operator +=( const chr *pData ) - { - append( pData ); - - return (*this); - } - - MyType &operator +=( const MyType &rSrc ) - { - rSrc.flatten(); - append( rSrc.pFirst->pData, rSrc.nLength ); - - return (*this); - } - - MyType &operator +=( const chr pData ) - { - chr tmp[2] = { pData, (chr)0 }; - append( tmp ); - - return (*this); - } - - MyType &operator =( const chr *pData ) - { - clear(); - append( pData ); - - return (*this); - } - - MyType &operator =( const MyType &rSrc ) - { - //if( rSrc.isFlat() ) - //{ - joinShare( rSrc ); - //} - //else - //{ - // copyFrom( rSrc ); - //} - // - - return (*this); - } - - bool operator ==( const chr *pData ) const - { - if( pFirst == NULL ) { - if( pData == NULL ) - return true; - return false; - } - - flatten(); - const chr *a = pData; - chr *b = pFirst->pData; - for( ; *a!=(chr)0; a++, b++ ) - { - if( *a != *b ) - return false; - } - - return true; - } - - bool operator ==( const MyType &pData ) const - { - if( pFirst == pData.pFirst ) - return true; - if( pFirst == NULL ) - return false; - - flatten(); - pData.flatten(); - const chr *a = pData.pFirst->pData; - chr *b = pFirst->pData; - for( ; *a!=(chr)0; a++, b++ ) - { - if( *a != *b ) - return false; - } - - return true; - } - - bool operator !=(const chr *pData ) const - { - return !(*this == pData); - } - - bool operator !=(const MyType &pData ) const - { - return !(*this == pData); - } - - chr &operator[]( long nIndex ) - { - flatten(); - - return pFirst->pData[nIndex]; - } - - const chr &operator[]( long nIndex ) const - { - flatten(); - - return pFirst->pData[nIndex]; - } - - bool isWS( long nIndex ) const - { - flatten(); - - return pFirst->pData[nIndex]==' ' || pFirst->pData[nIndex]=='\t' - || pFirst->pData[nIndex]=='\r' || pFirst->pData[nIndex]=='\n'; - } - - bool isAlpha( long nIndex ) const - { - flatten(); - - return (pFirst->pData[nIndex] >= 'a' && pFirst->pData[nIndex] <= 'z') - || (pFirst->pData[nIndex] >= 'A' && pFirst->pData[nIndex] <= 'Z'); - } - - void toLower() - { - flatten(); - unShare(); - - for( long j = 0; j < nLength; j++ ) - { - if( pFirst->pData[j] >= 'A' && pFirst->pData[j] <= 'Z' ) - pFirst->pData[j] -= 'A'-'a'; - } - } - - void toUpper() - { - flatten(); - unShare(); - - for( long j = 0; j < nLength; j++ ) - { - if( pFirst->pData[j] >= 'a' && pFirst->pData[j] <= 'z' ) - pFirst->pData[j] += 'A'-'a'; - } - } - - void serialize( class Serializer &ar ) - { - if( ar.isLoading() ) - { - clear(); - long nLen; - ar >> nLen; - - Chunk *pNew = newChunk( nLen ); - ar.read( pNew->pData, nLen*sizeof(chr) ); - appendChunk( pNew ); - } - else - { - flatten(); - - ar << nLength; - ar.write( pFirst->pData, nLength*sizeof(chr) ); - } - } - -private: - void flatten() const - { - if( isFlat() ) - return; - - if( pFirst == NULL ) - return; - - unShare(); - - Chunk *pNew = newChunk( nLength ); - chr *pos = pNew->pData; - Chunk *i = pFirst; - for(;;) - { - cpy( pos, i->pData, i->nLength ); - pos += i->nLength; - i = i->pNext; - if( i == NULL ) - break; - } - realClear(); - - pLast = pFirst = pNew; - nLength = pNew->nLength; - } - - void realClear() const - { - if( pFirst == NULL ) - return; - - if( isShared() ) - { - decRefs(); - } - else - { - Chunk *i = pFirst; - for(;;) - { - Chunk *n = i->pNext; - aChr.deallocate( i->pData, i->nLength+1 ); - aChunk.deallocate( i, 1 ); - if( n == NULL ) - break; - i = n; - } - pFirst = pLast = NULL; - nLength = 0; - } - } - - void copyFrom( const FBasicString &rSrc ) - { - if( rSrc.pFirst == NULL ) - return; - - decRefs(); - - Chunk *pNew = newChunk( rSrc.nLength ); - chr *pos = pNew->pData; - Chunk *i = rSrc.pFirst; - for(;;) - { - cpy( pos, i->pData, i->nLength ); - pos += i->nLength; - i = i->pNext; - if( i == NULL ) - break; - } - clear(); - - appendChunk( pNew ); - } - - bool isFlat() const - { - return (pFirst == pLast); - } - - bool isShared() const - { - return (pnRefs != NULL); - } - - Chunk *newChunk() const - { - Chunk *pNew = aChunk.allocate( 1 ); - pNew->pNext = NULL; - return pNew; - } - - Chunk *newChunk( long nLen ) const - { - Chunk *pNew = aChunk.allocate( 1 ); - pNew->pNext = NULL; - pNew->nLength = nLen; - pNew->pData = aChr.allocate( nLen+1 ); - pNew->pData[nLen] = (chr)0; - return pNew; - } - - void appendChunk( Chunk *pNewChunk ) - { - unShare(); - - if( pFirst == NULL ) - pLast = pFirst = pNewChunk; - else - { - pLast->pNext = pNewChunk; - pLast = pNewChunk; - } - - nLength += pNewChunk->nLength; - } - - void prependChunk( Chunk *pNewChunk ) - { - unShare(); - - if( pFirst == NULL ) - pLast = pFirst = pNewChunk; - else - { - pNewChunk->pNext = pFirst; - pFirst = pNewChunk; - } - - nLength += pNewChunk->nLength; - } - - void joinShare( MyType &rSrc ) - { - clear(); - - if( !rSrc.isFlat() ) - rSrc.flatten(); - - rSrc.initCount(); - pnRefs = rSrc.pnRefs; - (*pnRefs)++; - nLength = rSrc.nLength; - pFirst = rSrc.pFirst; - pLast = rSrc.pLast; - } - - void joinShare( const MyType &rSrc ) - { - clear(); - - rSrc.flatten(); - - if( !rSrc.isShared() ) - { - rSrc.pnRefs = new uint32_t; - (*rSrc.pnRefs) = 1; - } - pnRefs = rSrc.pnRefs; - (*pnRefs)++; - nLength = rSrc.nLength; - pFirst = rSrc.pFirst; - pLast = rSrc.pLast; - } - - /** - * This takes an object that was shared and makes a copy of the base data - * that was being shared so that this copy can be changed. This should be - * added before any call that will change this object; - */ - void unShare() const - { - if( isShared() == false ) - return; - - Chunk *pNew = newChunk( nLength ); - chr *pos = pNew->pData; - Chunk *i = pFirst; - for(;;) - { - cpy( pos, i->pData, i->nLength ); - pos += i->nLength; - i = i->pNext; - if( i == NULL ) - break; - } - decRefs(); - pLast = pFirst = pNew; - nLength = pNew->nLength; - } - - /** - * This decrements our ref count and pulls us out of the share. If the ref - * count hits zero because of this, it destroys the share. This is not - * safe to call on it's own, it's much better to call unShare. - */ - void decRefs() const - { - if( isShared() ) - { - (*pnRefs)--; - if( (*pnRefs) == 0 ) - destroyShare(); - else - { - pnRefs = NULL; - pFirst = NULL; - pLast = NULL; - nLength = 0; - } - } - } - - /** - * While the unShare function removes an instance from a share, this - * function destroys the data that was in the share, removing the share - * itself. This should only be called when the refcount for the share has - * or is about to reach zero. - */ - void destroyShare() const - { - delete pnRefs; - pnRefs = NULL; - realClear(); - } - -#ifdef VALTEST - void cpy( chr *dest, const chr *src, long count ) const - { - for( int j = 0; j < count; j++ ) - { - *dest = *src; - dest++; - src++; - } - } -#endif - - void initCount() const - { - if( !isShared() ) - { - pnRefs = new uint32_t; - (*pnRefs) = 1; - } - } - -private: - mutable long nLength; - mutable uint32_t *pnRefs; - mutable Chunk *pFirst; - mutable Chunk *pLast; - - mutable chralloc aChr; - mutable chunkalloc aChunk; -}; - -typedef FBasicString FString; - -#include "hash.h" -template<> uint32_t __calcHashCode( const FString &k ); -template<> bool __cmpHashKeys( const FString &a, const FString &b ); - - -#endif diff --git a/src/hash.cpp b/src/hash.cpp deleted file mode 100644 index c52e6b1..0000000 --- a/src/hash.cpp +++ /dev/null @@ -1,113 +0,0 @@ -#include "hash.h" - -subExceptionDef( HashException ) - -template<> uint32_t __calcHashCode( const int &k ) -{ - return k; -} - -template<> bool __cmpHashKeys( const int &a, const int &b ) -{ - return a == b; -} - -template<> uint32_t __calcHashCode( const unsigned int &k ) -{ - return k; -} - -template<> bool __cmpHashKeys( const unsigned int &a, const unsigned int &b ) -{ - return a == b; -} - -template<> -uint32_t __calcHashCode( const char * const &k ) -{ - if (k == NULL) - { - return 0; - } - - unsigned long int nPos = 0; - for( const char *s = k; *s; s++ ) - { - nPos = *s + (nPos << 6) + (nPos << 16) - nPos; - } - - return nPos; -} - -template<> bool __cmpHashKeys( const char * const &a, const char * const &b ) -{ - if( a == b ) - return true; - - for(int j=0; a[j] == b[j]; j++ ) - if( a[j] == '\0' ) - return true; - - return false; -} - -template<> -uint32_t __calcHashCode( char * const &k ) -{ - if (k == NULL) - { - return 0; - } - - unsigned long int nPos = 0; - for( const char *s = k; *s; s++ ) - { - nPos = *s + (nPos << 6) + (nPos << 16) - nPos; - } - - return nPos; -} - -template<> bool __cmpHashKeys( char * const &a, char * const &b ) -{ - if( a == b ) - return true; - - for(int j=0; a[j] == b[j]; j++ ) - if( a[j] == '\0' ) - return true; - - return false; -} - -template<> uint32_t __calcHashCode( const std::string &k ) -{ - std::string::size_type j, sz = k.size(); - const char *s = k.c_str(); - - unsigned long int nPos = 0; - for( j = 0; j < sz; j++, s++ ) - { - nPos = *s + (nPos << 6) + (nPos << 16) - nPos; - } - - return nPos; -} - -template<> bool __cmpHashKeys( const std::string &a, const std::string &b ) -{ - return a == b; -} - -template<> uint32_t __calcHashCode( const Hashable &k ) -{ - return 0; - //return k.getHashCode(); -} - -template<> bool __cmpHashKeys( const Hashable &a, const Hashable &b ) -{ - return false; - //return a.compareForHash( b ); -} - diff --git a/src/hash.h b/src/hash.h deleted file mode 100644 index e819379..0000000 --- a/src/hash.h +++ /dev/null @@ -1,744 +0,0 @@ -#ifndef HASH_H -#define HASH_H - -#include -#include -#include -#include -#include -#include "exceptionbase.h" -#include "hashable.h" -#include "serializable.h" -#include "serializer.h" - -#define bitsToBytes( n ) (n/32+(n%32>0 ? 1 : 0)) - -subExceptionDecl( HashException ) - -enum eHashException -{ - excodeNotFilled -}; - -template -uint32_t __calcHashCode( const T &k ); - -template -bool __cmpHashKeys( const T &a, const T &b ); - -struct __calcNextTSize_fast -{ - uint32_t operator()( uint32_t nCapacity, uint32_t nFill, uint32_t nDeleted ) const - { - if( nDeleted >= nCapacity/2 ) - return nCapacity; - return nCapacity*2+1; - } -}; - -template, typename valuealloc = std::allocator, typename challoc = std::allocator > -class Hash; - -template< typename key, typename _value, typename sizecalc = __calcNextTSize_fast, typename keyalloc = std::allocator, typename valuealloc = std::allocator<_value>, typename challoc = std::allocator > -struct HashProxy -{ - friend class Hash; -private: - HashProxy( Hash &h, key *k, uint32_t nPos, uint32_t hash ) : - hsh( h ), - pKey( k ), - nPos( nPos ), - hash( hash ), - bFilled( false ) - { - } - - HashProxy( Hash &h, uint32_t nPos, _value *pValue ) : - hsh( h ), - nPos( nPos ), - pValue( pValue ), - bFilled( true ) - { - } - - Hash &hsh; - key *pKey; - uint32_t nPos; - _value *pValue; - uint32_t hash; - bool bFilled; - -public: - operator _value &() - { - if( bFilled == false ) - throw HashException( - excodeNotFilled, - "No data assosiated with that key." - ); - return *pValue; - } - - _value &value() - { - if( bFilled == false ) - throw HashException( - excodeNotFilled, - "No data assosiated with that key." - ); - return *pValue; - } - - bool isFilled() - { - return bFilled; - } - - void erase() - { - if( bFilled ) - { - hsh._erase( nPos ); - hsh.onDelete(); - } - } - - _value operator=( _value nval ) - { - if( bFilled ) - { - hsh.va.destroy( pValue ); - hsh.va.construct( pValue, nval ); - hsh.onUpdate(); - } - else - { - hsh.fill( nPos, *pKey, nval, hash ); - hsh.onInsert(); - } - - return nval; - } - - _value *operator->() - { - if( bFilled == false ) - throw HashException( - excodeNotFilled, - "No data assosiated with that key." - ); - return pValue; - } -}; - -template -class Hash -{ - friend struct HashProxy; -public: - Hash() : - nCapacity( 11 ), - nFilled( 0 ), - nDeleted( 0 ), - bFilled( NULL ), - bDeleted( NULL ), - aKeys( NULL ), - aValues( NULL ), - aHashCodes( NULL ) - { - nKeysSize = bitsToBytes( nCapacity ); - bFilled = ca.allocate( nKeysSize ); - bDeleted = ca.allocate( nKeysSize ); - clearBits(); - - aHashCodes = ca.allocate( nCapacity ); - aKeys = ka.allocate( nCapacity ); - aValues = va.allocate( nCapacity ); - } - - Hash( const Hash &src ) : - nCapacity( src.nCapacity ), - nFilled( 0 ), - nDeleted( 0 ), - bFilled( NULL ), - bDeleted( NULL ), - aKeys( NULL ), - aValues( NULL ), - aHashCodes( NULL ) - { - nKeysSize = bitsToBytes( nCapacity ); - bFilled = ca.allocate( nKeysSize ); - bDeleted = ca.allocate( nKeysSize ); - clearBits(); - - aHashCodes = ca.allocate( nCapacity ); - aKeys = ka.allocate( nCapacity ); - aValues = va.allocate( nCapacity ); - - for( uint32_t j = 0; j < src.nCapacity; j++ ) - { - if( src.isFilled( j ) ) - { - insert( src.aKeys[j], src.aValues[j] ); - } - } - } - - Hash &operator=( const Hash &src ) - { - for( uint32_t j = 0; j < nCapacity; j++ ) - { - if( isFilled( j ) ) - if( !isDeleted( j ) ) - { - va.destroy( &aValues[j] ); - ka.destroy( &aKeys[j] ); - } - } - va.deallocate( aValues, nCapacity ); - ka.deallocate( aKeys, nCapacity ); - ca.deallocate( bFilled, nKeysSize ); - ca.deallocate( bDeleted, nKeysSize ); - ca.deallocate( aHashCodes, nCapacity ); - - nFilled = 0; - nDeleted = 0; - nCapacity = src.nCapacity; - nKeysSize = bitsToBytes( nCapacity ); - bFilled = ca.allocate( nKeysSize ); - bDeleted = ca.allocate( nKeysSize ); - clearBits(); - - aHashCodes = ca.allocate( nCapacity ); - aKeys = ka.allocate( nCapacity ); - aValues = va.allocate( nCapacity ); - - for( uint32_t j = 0; j < src.nCapacity; j++ ) - { - if( src.isFilled( j ) ) - { - insert( src.aKeys[j], src.aValues[j] ); - } - } - - return *this; - } - - virtual ~Hash() - { - for( uint32_t j = 0; j < nCapacity; j++ ) - { - if( isFilled( j ) ) - if( !isDeleted( j ) ) - { - va.destroy( &aValues[j] ); - ka.destroy( &aKeys[j] ); - } - } - va.deallocate( aValues, nCapacity ); - ka.deallocate( aKeys, nCapacity ); - ca.deallocate( bFilled, nKeysSize ); - ca.deallocate( bDeleted, nKeysSize ); - ca.deallocate( aHashCodes, nCapacity ); - } - - uint32_t getCapacity() - { - return nCapacity; - } - - uint32_t getFill() - { - return nFilled; - } - - uint32_t size() - { - return nFilled-nDeleted; - } - - uint32_t getDeleted() - { - return nDeleted; - } - - virtual HashProxy operator[]( key k ) - { - uint32_t hash = __calcHashCode( k ); - bool bFill; - uint32_t nPos = probe( hash, k, bFill ); - - if( bFill ) - { - return HashProxy( *this, nPos, &aValues[nPos] ); - } - else - { - return HashProxy( *this, &k, nPos, hash ); - } - } - - virtual void insert( key k, value v ) - { - uint32_t hash = __calcHashCode( k ); - bool bFill; - uint32_t nPos = probe( hash, k, bFill ); - - if( bFill ) - { - va.destroy( &aValues[nPos] ); - va.construct( &aValues[nPos], v ); - onUpdate(); - } - else - { - fill( nPos, k, v, hash ); - onInsert(); - } - } - - virtual void erase( key k ) - { - uint32_t hash = __calcHashCode( k ); - bool bFill; - uint32_t nPos = probe( hash, k, bFill ); - - if( bFill ) - { - _erase( nPos ); - onDelete(); - } - } - - struct iterator; - virtual void erase( struct iterator &i ) - { - if( this != &i.hsh ) - throw HashException("This iterator didn't come from this Hash."); - if( isFilled( i.nPos ) && !isDeleted( i.nPos ) ) - { - _erase( i.nPos ); - onDelete(); - } - } - - virtual void clear() - { - for( uint32_t j = 0; j < nCapacity; j++ ) - { - if( isFilled( j ) ) - if( !isDeleted( j ) ) - { - va.destroy( &aValues[j] ); - ka.destroy( &aKeys[j] ); - onDelete(); - } - } - - clearBits(); - } - - virtual value &get( key k ) - { - uint32_t hash = __calcHashCode( k ); - bool bFill; - uint32_t nPos = probe( hash, k, bFill ); - - if( bFill ) - { - return aValues[nPos]; - } - else - { - throw HashException( - excodeNotFilled, - "No data assosiated with that key." - ); - } - } - - virtual bool has( key k ) - { - bool bFill; - probe( __calcHashCode( k ), k, bFill, false ); - - return bFill; - } - - typedef struct iterator - { - friend class Hash; - private: - iterator( Hash &hsh ) : - hsh( hsh ), - nPos( 0 ), - bFinished( false ) - { - nPos = hsh.getFirstPos( bFinished ); - } - - iterator( Hash &hsh, bool bDone ) : - hsh( hsh ), - nPos( 0 ), - bFinished( bDone ) - { - } - - Hash &hsh; - uint32_t nPos; - bool bFinished; - - public: - iterator operator++( int ) - { - if( bFinished == false ) - nPos = hsh.getNextPos( nPos, bFinished ); - - return *this; - } - - iterator operator++() - { - if( bFinished == false ) - nPos = hsh.getNextPos( nPos, bFinished ); - - return *this; - } - - bool operator==( const iterator &oth ) - { - if( bFinished != oth.bFinished ) - return false; - if( bFinished == true ) - { - return true; - } - else - { - if( oth.nPos == nPos ) - return true; - return false; - } - } - - bool operator!=( const iterator &oth ) - { - return !(*this == oth ); - } - - iterator operator=( const iterator &oth ) - { - if( &hsh != &oth.hsh ) - throw HashException( - "Cannot mix iterators from different hash objects."); - nPos = oth.nPos; - bFinished = oth.bFinished; - } - - std::pair operator *() - { - return hsh.getAtPos( nPos ); - } - - key &getKey() - { - return hsh.getKeyAtPos( nPos ); - } - - value &getValue() - { - return hsh.getValueAtPos( nPos ); - } - }; - - iterator begin() - { - return iterator( *this ); - } - - iterator end() - { - return iterator( *this, true ); - } - - std::list getKeys() - { - std::list lKeys; - - for( uint32_t j = 0; j < nCapacity; j++ ) - { - if( isFilled( j ) ) - { - if( !isDeleted( j ) ) - { - lKeys.push_back( aKeys[j] ); - } - } - } - - return lKeys; - } - -protected: - virtual void onInsert() {} - virtual void onUpdate() {} - virtual void onDelete() {} - virtual void onReHash() {} - - virtual void clearBits() - { - for( uint32_t j = 0; j < nKeysSize; j++ ) - { - bFilled[j] = bDeleted[j] = 0; - } - } - - virtual void fill( uint32_t loc, key &k, value &v, uint32_t hash ) - { - bFilled[loc/32] |= (1<<(loc%32)); - va.construct( &aValues[loc], v ); - ka.construct( &aKeys[loc], k ); - aHashCodes[loc] = hash; - nFilled++; - //printf("Filled: %d, Deleted: %d, Capacity: %d\n", - // nFilled, nDeleted, nCapacity ); - } - - virtual void _erase( uint32_t loc ) - { - bDeleted[loc/32] |= (1<<(loc%32)); - va.destroy( &aValues[loc] ); - ka.destroy( &aKeys[loc] ); - nDeleted++; - //printf("Filled: %d, Deleted: %d, Capacity: %d\n", - // nFilled, nDeleted, nCapacity ); - } - - virtual std::pair getAtPos( uint32_t nPos ) - { - return std::pair(aKeys[nPos],aValues[nPos]); - } - - virtual key &getKeyAtPos( uint32_t nPos ) - { - return aKeys[nPos]; - } - - virtual value &getValueAtPos( uint32_t nPos ) - { - return aValues[nPos]; - } - - virtual uint32_t getFirstPos( bool &bFinished ) - { - for( uint32_t j = 0; j < nCapacity; j++ ) - { - if( isFilled( j ) ) - if( !isDeleted( j ) ) - return j; - } - - bFinished = true; - return 0; - } - - virtual uint32_t getNextPos( uint32_t nPos, bool &bFinished ) - { - for( uint32_t j = nPos+1; j < nCapacity; j++ ) - { - if( isFilled( j ) ) - if( !isDeleted( j ) ) - return j; - } - - bFinished = true; - return 0; - } - - uint32_t probe( uint32_t hash, key k, bool &bFill, bool rehash=true ) - { - uint32_t nCur = hash%nCapacity; - - // First we scan to see if the key is already there, abort if we - // run out of probing room, or we find a non-filled entry - for( int8_t j = 0; - isFilled( nCur ) && j < 32; - nCur = (nCur + (1< uint32_t __calcHashCode( const int &k ); -template<> bool __cmpHashKeys( const int &a, const int &b ); - -template<> uint32_t __calcHashCode( const unsigned int &k ); -template<> bool __cmpHashKeys( const unsigned int &a, const unsigned int &b ); - -template<> uint32_t __calcHashCode( const char * const &k ); -template<> bool __cmpHashKeys( const char * const &a, const char * const &b ); - -template<> uint32_t __calcHashCode( char * const &k ); -template<> bool __cmpHashKeys( char * const &a, char * const &b ); - -template<> uint32_t __calcHashCode( const std::string &k ); -template<> bool __cmpHashKeys( const std::string &a, const std::string &b ); - -template<> uint32_t __calcHashCode( const Hashable &k ); -template<> bool __cmpHashKeys( const Hashable &a, const Hashable &b ); - -template -Serializer &operator<<( Serializer &ar, Hash &h ) -{ - ar << h.size(); - for( typename Hash::iterator i = h.begin(); i != h.end(); i++ ) - { - std::pair p = *i; - ar << p.first << p.second; - } - - return ar; -} - -template -Serializer &operator>>( Serializer &ar, Hash &h ) -{ - h.clear(); - uint32_t nSize; - ar >> nSize; - - for( uint32_t j = 0; j < nSize; j++ ) - { - key k; value v; - ar >> k >> v; - h.insert( k, v ); - } - - return ar; -} - -template -Serializer &operator&&( Serializer &ar, Hash &h ) -{ - if( ar.isLoading() ) - { - return ar >> h; - } - else - { - return ar << h; - } -} - -#endif diff --git a/src/hashable.cpp b/src/hashable.cpp deleted file mode 100644 index 8565956..0000000 --- a/src/hashable.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "hashable.h" diff --git a/src/hashable.h b/src/hashable.h deleted file mode 100644 index 98643d5..0000000 --- a/src/hashable.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef HASHABLE_H -#define HASHABLE_H - -class Hashable -{ -public: - virtual ~Hashable() {}; - virtual unsigned long int getHashCode() = 0; - virtual bool compareForHash( Hashable &other ) = 0; -}; - -#endif diff --git a/src/hashfunction.cpp b/src/hashfunction.cpp deleted file mode 100644 index 51f2259..0000000 --- a/src/hashfunction.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "hashfunction.h" - -HashFunction::HashFunction() -{ -} - -HashFunction::~HashFunction() -{ -} - diff --git a/src/hashfunction.h b/src/hashfunction.h deleted file mode 100644 index cbcf70f..0000000 --- a/src/hashfunction.h +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef HASH_FUNCTION -#define HASH_FUNCTION - -/** This represents the shell of a hash function. It must be aggregated in - * order to be used. Please read about it's two functions for specificatins - * relating to what values will be passed to them and what they should return - * for creating your own hash functions. - *@author Mike Buland. - */ -class HashFunction -{ -public: - /** - * Standard Constructor. - */ - HashFunction(); - - /** - * Standard Deconstructor. - */ - virtual ~HashFunction(); - - /** Hashes the value represnted by id. This must return a fairly unique - * number in the range of 0-2^32 (or whatever the size of an unsigned long - * is on your system) based on the id given. The faster the number changes - * the better in a general sence. The return value will be the index - * (after probing takes place) to the data assosiated with an id, so this - * function should always produce the same number for any given id. - *@param id The identifier to use to create a unique numerical identifier. - *@returns A mostly unique numerical identifier generated using the given - * id. - */ - virtual unsigned long int hash( const void *id ) = 0; - - /** This function must compare two ids in the format that this hashfunction - * accepts. For example, if the hash function hashes strings it should - * probably { return strcmp( id1, id2 ) == 0 }. - *@param id1 One value to use in the comparison - *@param id2 Another value to use in the comparison - *@returns True if the two values match, otherwise false. - */ - virtual bool cmpIDs( const void *id1, const void *id2 ) = 0; - -// virtual void *createPersistantID( const void *id ) = 0; -// virtual void destroyPersistantID( const void *id ) = 0; -}; - -#endif diff --git a/src/hashfunctioncasestring.cpp b/src/hashfunctioncasestring.cpp deleted file mode 100644 index 6361f45..0000000 --- a/src/hashfunctioncasestring.cpp +++ /dev/null @@ -1,39 +0,0 @@ -#include -#include -#include -#include "hashfunctioncasestring.h" - -HashFunctionCaseString::HashFunctionCaseString() -{ -} - -HashFunctionCaseString::~HashFunctionCaseString() -{ -} - -unsigned long int HashFunctionCaseString::hash( const void *id ) -{ - const char *str = (const char *)id; - unsigned long int nPos = 0; - for( int j = 0; str[j] != '\0'; j++ ) - { - nPos = tolower(str[j]) + (nPos << 6) + (nPos << 16) - nPos; -// nPos += nPos<<16|(((unsigned long int)tolower(str[j]))<<((j*7)%24)); - } - return nPos; -} - -bool HashFunctionCaseString::cmpIDs( const void *id1, const void *id2 ) -{ - const char *str1 = (const char *)id1; - const char *str2 = (const char *)id2; - - int j; - for( j = 0; str1[j] != '\0' && str2[j] != '\0'; j++ ) - { - if( tolower(str1[j]) != tolower(str2[j]) ) - return false; - } - return (str1[j]==str2[j]); -} - diff --git a/src/hashfunctioncasestring.h b/src/hashfunctioncasestring.h deleted file mode 100644 index 7816a1b..0000000 --- a/src/hashfunctioncasestring.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef HASH_FUNCTION_CASE_STRING -#define HASH_FUNCTION_CASE_STRING - -#include "hashfunction.h" - -/** A hash function for string data. This hash function does strings, but is - * actually generalized to handle any binary stream of characters terminated - * by a null character. This is different than HashFunctionString in that - * this does comparisons without regaurd to case. - *@author Mike Buland. - */ -class HashFunctionCaseString : public HashFunction -{ -public: - /** - * Standard Constructor. - */ - HashFunctionCaseString(); - - /** - * Standard Deconstructor. - */ - virtual ~HashFunctionCaseString(); - unsigned long int hash( const void *id ); - bool cmpIDs( const void *id1, const void *id2 ); -}; - -#endif diff --git a/src/hashfunctionint.cpp b/src/hashfunctionint.cpp deleted file mode 100644 index 4bd0feb..0000000 --- a/src/hashfunctionint.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "hashfunctionint.h" - -HashFunctionInt::HashFunctionInt() -{ -} - -HashFunctionInt::~HashFunctionInt() -{ -} - -unsigned long int HashFunctionInt::hash( const void *id ) -{ - return (unsigned long)(id); -} - -bool HashFunctionInt::cmpIDs( const void *id1, const void *id2 ) -{ - return (unsigned long)(id1) == (unsigned long)(id2); -} - diff --git a/src/hashfunctionint.h b/src/hashfunctionint.h deleted file mode 100644 index 0fbc764..0000000 --- a/src/hashfunctionint.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef HASH_FUNCTION_INT -#define HASH_FUNCTION_INT - -#include "hashfunction.h" - -/** A hash function for integer data. Really, this does almost nothing except - * ensure we're dealing with positive indicies. - *@author Mike Buland. - */ -class HashFunctionInt : public HashFunction -{ -public: - /** - * Standard Constructor. - */ - HashFunctionInt(); - - /** - * Standard Deconstructor. - */ - virtual ~HashFunctionInt(); - unsigned long int hash( const void *id ); - bool cmpIDs( const void *id1, const void *id2 ); -}; - -#endif diff --git a/src/hashfunctionstring.cpp b/src/hashfunctionstring.cpp deleted file mode 100644 index bd14643..0000000 --- a/src/hashfunctionstring.cpp +++ /dev/null @@ -1,51 +0,0 @@ -#include "hashfunctionstring.h" -#ifndef NULL -#define NULL ((void *) 0) -#endif - -HashFunctionString::HashFunctionString() -{ -} - -HashFunctionString::~HashFunctionString() -{ -} - -unsigned long int HashFunctionString::hash( const void *id ) -{ - if (id == NULL) - { - return 0; - } - - unsigned long int nPos = 0; - for( const char *s = (const char *)id; *s; s++ ) - { - nPos = *s + (nPos << 6) + (nPos << 16) - nPos; - } - return nPos; -} - -bool HashFunctionString::cmpIDs( const void *id1, const void *id2 ) -{ - if (id1 == NULL || id2 == NULL) - { - return false; - } - if (id1 == id2) - { - return true; - } - - const char *str1 = (const char *)id1; - const char *str2 = (const char *)id2; - - int j; - for( j = 0; str1[j] != '\0' && str2[j] != '\0'; j++ ) - { - if( str1[j] != str2[j] ) - return false; - } - return (str1[j]==str2[j]); -} - diff --git a/src/hashfunctionstring.h b/src/hashfunctionstring.h deleted file mode 100644 index 7d2a1a6..0000000 --- a/src/hashfunctionstring.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef HASH_FUNCTION_STRING -#define HASH_FUNCTION_STRING - -#include "hashfunction.h" - -/** A hash function for string data. This hash function does strings, but is - * actually generalized to handle any binary stream of characters terminated - * by a null character. - *@author Mike Buland. - */ -class HashFunctionString : public HashFunction -{ -public: - /** - * Standard Constructor. - */ - HashFunctionString(); - - /** - * Standard Deconstructor. - */ - virtual ~HashFunctionString(); - unsigned long int hash( const void *id ); - bool cmpIDs( const void *id1, const void *id2 ); -}; - -#endif diff --git a/src/hashtable.cpp b/src/hashtable.cpp deleted file mode 100644 index dbcd964..0000000 --- a/src/hashtable.cpp +++ /dev/null @@ -1,424 +0,0 @@ -#include -#include -#include - -#include "hashtable.h" - -HashTable::HashTable( HashFunction *hNewFunc, unsigned long int nInitSize, bool bAllowDupes ) -{ - hFunc = hNewFunc; - nTableSize = nextPrime( nInitSize ); - aTable = new HashNode[nTableSize]; - //for( int j = 0; j < nTableSize; j++ ) if( aTable[j].id || aTable[j].data || aTable[j].bDeleted ) printf("Unclean entry\n"); - nSize = 0; - nFilled = 0; - this->bAllowDupes = bAllowDupes; -} - -HashTable::~HashTable() -{ - delete[] aTable; - delete hFunc; -} - -void HashTable::set( int j, const void *newID, const void *newData ) -{ - if( newData == NULL ) - { - printf("Inserting NULL data is indestinguishable from uninserted data!\n"); - } - aTable[j].id = newID; - aTable[j].data = newData; -} - -void HashTable::clear() -{ - memset( aTable, 0, sizeof(HashNode) * nTableSize ); -} - -bool HashTable::isFilled( int j ) -{ - return (aTable[j].id != NULL)||(aTable[j].bDeleted); -} - -void HashTable::reHash( unsigned long int nNewSize ) -{ - HashNode *aOldTable = aTable; - unsigned long int oldSize = nTableSize; - - // If the table can still be used if we just get rid of deleted items, don't - // change the size of the table, otherwise, go ahead and use the number - // passed in. - if( nSize > nTableSize>>1 ) - { - nTableSize = nextPrime( nNewSize ); - } - - aTable = newTable( nTableSize ); - //for( int j = 0; j < nTableSize; j++ ) if( aTable[j].id || aTable[j].data || aTable[j].bDeleted ) printf("Unclean entry\n"); - - nSize = 0; - nFilled = 0; - - for( unsigned long int j = 0; j < oldSize; j++ ) - { - if( aOldTable[j].id != NULL && aOldTable[j].bDeleted == false ) - { - insert( aOldTable[j].id, aOldTable[j].data ); - } - } - - delete[] aOldTable; -} - -unsigned long int HashTable::probe( unsigned long int nStart, const void *id ) -{ - int nHash = nStart; - nStart = nStart%nTableSize; - if( bAllowDupes == true ) - { - for( - unsigned long int j=0; - isFilled( nStart ) && j < 32; - nStart = (nStart+(1<cmpIDs( aTable[nStart].id, id ) == true && - aTable[nStart].bDeleted == false ) - { - return nStart; - } - } - } - } - // This is our insurance, if the table is full, then go ahead and rehash, - // then try again. - if( isFilled( nStart ) ) - { - reHash( getCapacity()*2 ); - return probe( nHash, id ); - } - return nStart; -} - -HashTable::HashNode *HashTable::newTable( unsigned long int nNewSize ) -{ - return new HashNode[nNewSize]; -} - -#ifdef HASH_DEBUG_VIS -void HashTable::printDebugLine( const char *exData ) -{ - char *buf = new char[getCapacity()+3]; - int j; - buf[0] = '['; - for( j = 0; j < getCapacity(); j++ ) - { - buf[j+1] = (aTable[j].bDeleted)?('X'):((isFilled( j ))?('#'):('-')); - } - buf[j+1] = ']'; - buf[j+2] = '\0'; - printf("%s %s\n", buf, exData ); - delete[] buf; -} -#endif - -bool HashTable::insert( const void *id, const void *data ) -{ - unsigned long int nPos = probe( hFunc->hash( id ), id )%nTableSize; - - if( bAllowDupes == true ) - { - if( aTable[nPos].id == NULL && aTable[nPos].bDeleted == false ) - { - set( nPos, id, data ); -#ifdef HASH_DEBUG_VIS - printDebugLine( (const char *)id ); -#endif - nSize++; - nFilled++; - return true; - } - else - { - return false; - } - } - else - { - if( aTable[nPos].id == NULL && aTable[nPos].bDeleted == false ) - { - set( nPos, id, data ); -#ifdef HASH_DEBUG_VIS - printDebugLine( (const char *)id ); -#endif - nSize++; - nFilled++; - return true; - } - else if( hFunc->cmpIDs( aTable[nPos].id, id ) == true ) - { - set( nPos, id, data ); -#ifdef HASH_DEBUG_VIS - printDebugLine( (const char *)id ); -#endif - return true; - } - else - { - return false; - } - } -} - -const void *HashTable::get( const void *id, unsigned long int nSkip ) -{ - unsigned long int nPos = hFunc->hash( id )%nTableSize; - - for( unsigned long int j=0; j < 32; nPos = (nPos+(1<cmpIDs( id, aTable[nPos].id ) ) - { - if( nSkip == 0 ) - { - return aTable[nPos].data; - } - else - { - nSkip--; - } - } - } - } - - if( bAllowDupes ) - { - unsigned long int nOldPos = nPos; - for( nPos++; nPos != nOldPos; nPos=(nPos+1)%nTableSize ) - { - if( !isFilled( nPos ) ) return NULL; - if( aTable[nPos].bDeleted == false ) - { - if( hFunc->cmpIDs( id, aTable[nPos].id ) ) - { - if( nSkip == 0 ) - { - return aTable[nPos].data; - } - else - { - nSkip--; - } - } - } - } - } - - return NULL; -} - -const void *HashTable::getKey( const void *id, unsigned long int nSkip ) -{ - unsigned long int nPos = hFunc->hash( id )%nTableSize; - - for( unsigned long int j=0; j < 32; nPos = (nPos+(1<cmpIDs( id, aTable[nPos].id ) ) - { - if( nSkip == 0 ) - { - return aTable[nPos].id; - } - else - { - nSkip--; - } - } - } - } - - if( bAllowDupes ) - { - unsigned long int nOldPos = nPos; - for( nPos++; nPos != nOldPos; nPos=(nPos+1)%nTableSize ) - { - if( !isFilled( nPos ) ) return NULL; - if( aTable[nPos].bDeleted == false ) - { - if( hFunc->cmpIDs( id, aTable[nPos].id ) ) - { - if( nSkip == 0 ) - { - return aTable[nPos].id; - } - else - { - nSkip--; - } - } - } - } - } - - return NULL; -} - -void *HashTable::getFirstItemPos() -{ - HashPos *pos = new HashPos; - return pos; -} - -const void *HashTable::getItemData( void *xPos ) -{ - return aTable[((HashPos *)xPos)->nPos].data; -} - -const void *HashTable::getItemID( void *xPos ) -{ - return aTable[((HashPos *)xPos)->nPos].id; -} - -void *HashTable::getNextItemPos( void *xPos ) -{ - HashPos *pos = (HashPos *)xPos; - if( pos->bStarted == false ) - { - pos->bStarted = true; - pos->nPos = 0; - } - else - { - pos->nPos++; - } - if( pos->nPos < nTableSize ) - { - for( ; pos->nPos < nTableSize; pos->nPos++ ) - { - if( isFilled( pos->nPos ) && - aTable[pos->nPos].bDeleted == false ) - { - return xPos; - } - } - } - - delete pos; - - return NULL; -} - -// Big-O sqrt(n) -// Change this to be erethpothynies table with a storage -// lookup later on. -bool HashTable::isPrime (int num) -{ - if (num == 2) // the only even prime - return true; - else if (num % 2 == 0) // other even numbers are composite - return false; - else - { - //bool prime = true; - int divisor = 3; - int upperLimit = static_cast(sqrt(num) + 1); - while (divisor <= upperLimit) - { - if (num % divisor == 0) - return false; - // prime = false; - divisor +=2; - } - return true; - } -} - -// Big-O n^(3/2) -int HashTable::nextPrime( int base ) -{ - int nPrime; - for( nPrime = base; isPrime( nPrime ) == false; nPrime++ ); - return nPrime; -} - -unsigned long int HashTable::getCapacity() -{ - return nTableSize; -} - -unsigned long int HashTable::getSize() -{ - return nSize; -} - -double HashTable::getLoad() -{ - return (double)(nFilled)/(double)(nTableSize); -} - -const void *HashTable::operator[](const void *id) -{ - return get( id ); -} - -bool HashTable::del( const void *id, int nSkip ) -{ - unsigned long int nPos = hFunc->hash( id )%nTableSize; - - for( unsigned long int j=0; j < 32; nPos = (nPos+(1<cmpIDs( id, aTable[nPos].id ) && - aTable[nPos].bDeleted == false ) - { - if( nSkip == 0 ) - { - aTable[nPos].bDeleted = true; - nSize--; -#ifdef HASH_DEBUG_VIS - printDebugLine( (const char *)id ); -#endif - return true; - } - else - { - nSkip--; - } - } - } - - return false; -} - diff --git a/src/hashtable.h b/src/hashtable.h deleted file mode 100644 index 179b694..0000000 --- a/src/hashtable.h +++ /dev/null @@ -1,308 +0,0 @@ -/**\hashtable.h - * Describes the HashFunction, HashFunctionString, and HashTable classes. It - * was just easier to put them all in one set of files. - *@author Mike Buland - */ - -#ifndef HASH_TABLE_H -#define HASH_TABLE_H - -//Uncomment this line to see a cool text-mode visualization of what's going on -//#define HASH_DEBUG_VIS 1 - -#include -#include -#include - -#include "hashfunction.h" - -/** - * A simple yet flexable hash-table. This uses several tricks to help ensure - * that the table is always running at maximum efficiency. You no longer have - * to specify a "danger fill level" when more space is needed a rehash is - * automatically trigered. Deleting elements is fully supported, as well as - * duplicate elements. To work with and allow duplicates simple construct your - * HashTable the way you normally would, but when deleting or getting elements - * you can specify a skip value. This effectively allows you to treat elements - * with duplicate ID's as though they were in a zero-based array. The first - * element inserted with a given ID would be at skip zero, the next at skip 1 - * and so on. This allows you to quickly search for elements with duplicate - * names, just stop when you get a null for a skip number, i.e. - * 
- *   for( int j = 0;; j++ )
- *   {
- *       void *pData = hash.get( myID, j );
- *       if( !pData ) break;
- *       // Do something interesting with pData
- *   }
- *
- * There are new features in this HashTable that also allow for memory saving - * when dealing with systems where many elements are being deleted from the - * table. In those cases the elements deleted cannot be simply deleted, instead - * they have to be marked as deleted and hidden from the user, but maintained in - * the table so that future hashing operations don't fail. When rehashing - * occurs all elements marked as deleted are quietly removed. In these cases, - * if the number of deleted items would free enough space in the table for the - * table to be used efficiently without resizing, it is left the same size and - * rehashing is performed effectively in place, allowing the deleted items to - * be removed. - *
- * For info on adding new hashing algorithms, please see the HashFunction class. - *@author Mike Buland - *@todo Fix probing for tables that allow duplicates, and delete an item, then - * insert an item with the same name. - */ -class HashTable -{ -public: - /** Constructs a hash table. - *@param hNewFunc A pointer to a hashfunction class to use. If this is - * null the default general string type will be used. - *@param nInitSize The initial size of the hashtable. - *@param bAllowDupes Setting this value to true allows the system to - * insert more than one copy of any given key. This can be tricky, and - * will require you to use the nSkip parameter on the get function. - */ - HashTable( HashFunction *hNewFunc, unsigned long int nInitSize, bool bAllowDupes=false ); - - /** - * Destroys the hashtable, cleaning up all internal storage, but not stored - * elements. Also deletes the HashFunction passed in in the constructor. - */ - virtual ~HashTable(); - - /** Inserts an item into the hashtable. This function will trigger a - * rehash if adding another item would force the table's load factor over - * the danger level. - *@param id used to find the data later. - *@param data The data item to insert into the table with the identifier - * id - *@returns True if insertion was successfull, and false if it failed. - */ - bool insert( const void *id, const void *data ); - - /** Gets an item in the hashtable based on the id of that item. If there - * is more than one item with the same id you can use the nSkip parameter - * to access all of them. - *@param id The id of the item you're trying to find. - *@param nSkip The number of items with that id to skip before returning - * with the requested item. - *@returns A pointer to the data stored at the given id. - */ - const void *get( const void *id, unsigned long int nSkip=0 ); - - const void *getKey( const void *id, unsigned long int nSkip=0 ); - - /** Gets the total capacity of the hashtable. This is actually the number - * of total positions available inside the hashtable at the moment. This - * will change when the hashtable's load exceeds the danger level. - * Please note that this is NOT the actual amount of space available. - * In reality you can only access about 45-50 percent of that space. - *@returns The total capacity. - */ - unsigned long int getCapacity(); - - /** Gets the number of filled in items in the hash table. This is roughly - * equivelent to the getSize function assosiated with the Lists. - *@returns The number of filled in items in the hash table. - */ - unsigned long int getSize(); - - /** Gets the load (percentage) of filled in items in the table. This is - * technically the size divided by the capacity, but is definately usefull - * since it's required to check if it's time to rehash. - *@returns The table load in the range 0.0 to 1.0 - */ - double getLoad(); - - /** Sets up an xPos object for use indexing the items in the table. Call - * this first and follow the directions for getNextItemPos below to - * iterate through every item in the table, while avoiding the empty - * spaces. - *@returns A pointer to a xPos object telling the hashtable where to find - * the item you're looking at. - */ - void *getFirstItemPos(); - - /** Get the item's data that is being pointed to by xPos. This is only - * valid after xPos was created using getFirstItemPos and getNextItemPos - * was called at least once. - *@param xPos supplied by getFirstItemPos. - *@returns The key value that was used to insert the data into the table. - */ - const void *getItemData( void *xPos ); - - /** Get the item's ID that is being pointed to by xPos. This is only - * valid after xPos was created using getFirstItemPos and getNextItemPos - * was called at least once. - *@param xPos supplied by getFirstItemPos. - *@returns The key value that was used to insert the data into the table. - */ - const void *getItemID( void *xPos ); - - /** Used for iterating through a hash table sequentially. This will - * update the xPos pointer to point to the next time, all ready to - * be accessed with getItemID and getItemData. This must be called at - * least once before xPos is meaningful, and will return a NULL when it - * has reached the last item. - *@param xPos This must be an object created by a call to the function - * getFirstItemPos, and is only meaningful to the internal routines. - * Aborting a call in the middle (not running to the end of the table) - * may result in a memory leak at the moment. - *@returns xPos if still iterating through the list, otherwise it will - * return NULL when the end has been reached and the xPos variable has - * been deleted. - */ - void *getNextItemPos( void *xPos ); - - /** A helpful operator to make accessing items easier. Please note that - * this simply returns a pointer to the data stored internally, and cannot - * be used like the STL operator to store new data, use insert for that. - *@param id The identifier used to store the requested item. - *@returns The data value assosiated with the given id, or NULL if it - * wasn't found in the table. - */ - const void *operator[](const void *id); - - /** - * Delete the specified item from the hashtable. This actually keeps the - * data and marks it deleted. For all intents and purposes to the user it - * is deleted, except that the space is still used until a rehash is forced. - * This means that in hashtables where elements are being inserted and - * deleted frequently you may run into a higher rate of expansion. - *@param id The ID to delete. - *@param nSkip The number of similar id's to skip before deleting in a - * hashtable that allows duplicates. - *@returns True if the element was found and deleted, false otherwise. - */ - bool del( const void *id, int nSkip=0 ); - - /** - * Deletes every entry in the hash table. See the notes on del to see what - * this means, except that since no data is being kept, the entire table is - * just marked as usable space. - */ - void clear(); - -private: - /** - * Contains info related to a position in the hashtable. Used for - * searching through hashtables one item at a time, in order. This class - * should never be created by anything but a HashTable, and should never - * be referenced directly. Instead the hashtable returns a void pointer, - * which is what should be passed back in next time you use a search - * function. Always finish a search, since the object is deleted at the - * end of the search. - *@author Mike Buland - */ - class HashPos - { - public: - /** Create a blank HashPos. */ - HashPos() { bStarted=false; nPos = 0; }; - /** Has the search been started? */ - bool bStarted; - /** The position (index) into the backend storage structure. */ - unsigned long int nPos; - }; - - /** - * All data related to a single element in the hashtable. This should - * really only be used and manipulated by the HashTable itself. - *@author Mike Buland - */ - typedef struct HashNode - { - public: - /** Create a new, empty HashNode. */ - HashNode() { id = NULL; data = NULL; bDeleted = false; }; - /** A pointer to the original ID that was used to key the data. */ - const void *id; - /** A pointer to the data stored along with the above ID. */ - const void *data; - /** Weather or not this data should really...exist */ - bool bDeleted; - } HashNode; - -private: - /** - * Just sets the values in the element to some friendly values. - *@param newID The new ID to store. - *@param newData The new Data to store. - */ - void set( int j, const void *newID, const void *newData ); - /** - * Tells you if the node is filled or not. - *@returns True=an ID has been stored here, False=no ID. - */ - bool isFilled( int j ); - /** - * This actually resizes, but since every resize requires a reHash to go - * along with it, that's the name. This actually creates a new buffer for - * all of the contained data and then pulls every old element that was in - * the old table out and performs the hashing placement calculations again. - * This function skips all data that was marked as deleted, so at this - * point it really will be. - *@param nNewSize The new size to set the table to while re-hashing. - *@returns True if the operation was successful, false otherwise. - */ - void reHash( unsigned long int nNewSize ); - - /** - * Helper function to allocate a new table. Really just does the memory - * allocation. - *@param nNewSize The size of the table to generate. - *@returns A new, blank array of HashNode objects the size you specified. - */ - HashNode *newTable( unsigned long int nNewSize ); - - /** - * This function is used once an actual hash code is obtained. nStart is - * the given hash code, which is then wrapped to the size of the table. If - * there is data at that location, tests are performed to see if it's the - * right one. If it is, then it is returned, otherwise a series of further - * tests based on a 2^n search pattern is performed. The position of the - * requested data in the back-end storage is returned if found, otherwise - * another less useful value is returned... - *@param nStart The initial hashcode of the ID testing for. - *@param id A pointer to the id that is being searched for. - *@returns The real location of the data requested. - */ - unsigned long int probe( unsigned long int nStart, const void *id ); - - /** - * Simple helper function to determine if a number is prime or not. - * This function runs in sqrt(n) time. - *@param num Number to test for prime-hood. - *@returns True if the number is prime, false otherwise. - */ - bool isPrime( int num ); - - /** - * Given any number, this function finds the first number after it that is - * prime. Since this number is a multiple internally it's rare that the - * starting number would be prime. - *@param base The number to start the prime search on. - *@returns The first prime after the number given. - */ - int nextPrime( int base ); - -#ifdef HASH_DEBUG_VIS - void printDebugLine( const char *exData ); -#endif - - /** A pointer to the HashFunction subclass instance to use. */ - HashFunction *hFunc; - /** The complete array of HashNode objects to store data in. */ - HashNode *aTable; - /** The actual size of the table, not how many elements are in it. */ - unsigned long int nTableSize; - /** The number of elements that are in the table. */ - unsigned long int nSize; - /** The number of elements that are unavailable now. */ - unsigned long int nFilled; - /** Allow duplicate ID's in the table. */ - bool bAllowDupes; -}; - -#endif diff --git a/src/http.cpp b/src/http.cpp deleted file mode 100644 index df7dafe..0000000 --- a/src/http.cpp +++ /dev/null @@ -1,377 +0,0 @@ -#include -#include -#include "http.h" -#include "hashfunctionstring.h" - -Http::Http( Connection *pConnection ) : hReqHeader( new HashFunctionString(), 100 ) -{ - pCon = pConnection; - nParseState = parseInit; -} - -Http::~Http() -{ - for( int j = 0; j < lStrings.getSize(); j++ ) - { - delete (std::string *)lStrings[j]; - } -} - -bool Http::parseRequest() -{ - for(;;) - { - pCon->readInput(); - switch( nParseState ) - { - case parseInit: - { - int nLen = pCon->scanInputFor( CR ); - if( nLen == -1 ) - { - return false; - } - else - { - nReqType = getRequestType( pCon->getInput() ); - pCon->usedInput( pCon->scanInputFor(' ')+1 ); - - nLen = pCon->scanInputFor(' '); - sReqURI.append( pCon->getInput(), nLen ); - pCon->usedInput( nLen+1 ); - - if( !strncmp( pCon->getInput(), "HTTP/", 5 ) ) - { - char mbuf[2]={'\0','\0'}; - unsigned char major, minor; - - pCon->usedInput( 5 ); - mbuf[0] = pCon->getInput()[0]; - major = (unsigned char)atoi(mbuf); - mbuf[0] = pCon->getInput()[2]; - minor = (unsigned char)atoi(mbuf); - setRequestVersion( major, minor ); - if( checkRequestVer() ) - { - nParseState = parseHeader; - } - else - { - setResponseStatus( statusHTTPVersionNotSupported ); - //printf("Verson not supported.\n"); - return true; - } - - pCon->usedInput( 5 ); - } - else - { - setResponseStatus( statusBadRequest ); - } - - //return false; - } - } - break; - - case parseHeader: - { - int nLen = pCon->scanInputFor( CR ); - //printf("nLen = %d: :::%s:::\n", nLen, pCon->getInput() ); - if( nLen == -1 ) - { - pCon->readInput( 1, 0); - } - else if( nLen == 0 ) - { - // We've got our double-newline, time for content. - pCon->usedInput( 2 ); - setResponseStatus( statusOK ); - return true; - } - else - { - nLen = pCon->scanInputFor(':'); - if( nLen == -1 ) - { - //printf("No colon? what are you trying to pull?\n"); - } - else - { - std::string *pName = new std::string( pCon->getInput(), nLen ); - lStrings.append( pName ); - pCon->usedInput( nLen+1 ); - - nLen = pCon->scanInputFor( CR ); - std::string *pValue = convSpaceString( pCon->getInput(), nLen ); - lStrings.append( pValue ); - pCon->usedInput( nLen+2 ); - - hReqHeader.insert( - pName->c_str(), - pValue->c_str() - ); - - //printf("::%s = \"%s\"\n", - // pName->c_str(), - // pValue->c_str() - // ); - } - } - } - break; - - case parseFinished: - break; - } - } -} - -bool Http::buildResponse( short nResponseCode, const char *sResponse ) -{ - if( nResponseCode > 0 ) - { - nResStatus = nResponseCode; - } - - if( sResponse == NULL ) - { - sResStatusStr = "uh yeah"; - } - else - { - sResStatusStr = sResponse; - } - - time_t curTime; - time( &curTime ); - gmtime_r( &curTime, &tResTime ); - - sServerStr = "libbu++ Http/0.0.1"; - bResPersistant = false; - - //char buf[30]; - //strftime( buf, 30, "%a, %d %b %Y %H:%M:%S GMT", &tResponseTime ); - - return true; -} - -bool Http::sendResponse() -{ - char buf[256]; - - sprintf( buf, "HTTP/1.1 %d %s\r\n", nResStatus, sResStatusStr.c_str() ); - pCon->appendOutput( buf ); - - strftime( buf, 256, "Date: %a, %d %b %Y %H:%M:%S GMT\r\n", &tResTime ); - pCon->appendOutput( buf ); - - sprintf( buf, "Server: %s\r\n", sServerStr.c_str() ); - pCon->appendOutput( buf ); - - if( bResPersistant ) - { - } - else - { - pCon->appendOutput("Connection: close\r\n"); - } - - sprintf( buf, "Content-Type: %s\r\n", sResMime.c_str() ); - pCon->appendOutput( buf ); - - sprintf( buf, "Content-Length: %d\r\n", sResContent.size() ); - pCon->appendOutput( buf ); - - pCon->appendOutput("\r\n"); - - pCon->appendOutput( sResContent.c_str(), sResContent.size() ); - - return true; -} - -void Http::setResponsePersistant( bool bPersistant ) -{ - bResPersistant = bPersistant; -} - -void Http::setResponseContent( const char *sMime, const char *sContent, int nLen ) -{ - sResMime = sMime; - sResContent.erase(); - sResContent.append( sContent, nLen ); -} - -std::string *Http::convSpaceString( const char *sStr, int nLen ) -{ - int nNewLen = 0; - bool bStart = true; - bool bSpace = false; - - for( int j = 0; j < nLen; j++ ) - { - if( sStr[j] == ' ' || sStr[j] == '\t' ) - { - if( bStart ) - { - } - else if( bSpace == false ) - { - bSpace = true; - nNewLen++; - } - } - else - { - bStart = false; - bSpace = false; - nNewLen++; - } - } - if( bSpace ) - { - nNewLen--; - } - - std::string *pSStr = new std::string; - //char *pStr = pSStr->c_str(); - nNewLen = 0; - bStart = true; - bSpace = false; - - for( int j = 0; j < nLen; j++ ) - { - if( sStr[j] == ' ' || sStr[j] == '\t' ) - { - if( bStart ) - { - } - else if( bSpace == false ) - { - bSpace = true; - *pSStr += ' '; - //pStr[nNewLen++] = ' '; - } - } - else - { - bStart = false; - bSpace = false; - *pSStr += sStr[j]; - //pStr[nNewLen++] = sStr[j]; - } - } - if( bSpace == true ) - { - nNewLen--; -// pStr[nNewLen] = '\0'; - } - - return pSStr; -} - -const char *Http::getRequestURI() -{ - return sReqURI.c_str(); -} - -short Http::getRequestType( const char *sType ) -{ - if( !strncmp( sType, "OPTIONS", 7 ) ) - { - return reqOptions; - } - else if( !strncmp( sType, "GET", 3 ) ) - { - return reqGet; - } - else if( !strncmp( sType, "HEAD", 4 ) ) - { - return reqHead; - } - else if( !strncmp( sType, "POST", 4 ) ) - { - return reqPost; - } - else if( !strncmp( sType, "PUT", 3 ) ) - { - return reqPut; - } - else if( !strncmp( sType, "DELETE", 6 ) ) - { - return reqDelete; - } - else if( !strncmp( sType, "TRACE", 5 ) ) - { - return reqTrace; - } - else if( !strncmp( sType, "CONNECT", 7 ) ) - { - return reqConnect; - } - else - { - printf(" Uh oh, extension!\n"); - return reqExtension; - } -} - -const char *Http::getRequestType( short nType ) -{ - switch( nType ) - { - case reqOptions: return "OPTIONS"; - case reqGet: return "GET"; - case reqHead: return "HEAD"; - case reqPost: return "POST"; - case reqPut: return "PUT"; - case reqDelete: return "DELETE"; - case reqTrace: return "TRACE"; - case reqConnect: return "CONNECT"; - case reqExtension: return "EXTENSION"; - default: return "INVALID VALUE"; - } -} - -short Http::getRequestType() -{ - return nReqType; -} - -const char *Http::getRequestTypeStr() -{ - return getRequestType( nReqType ); -} - -void Http::setResponseStatus( short nStatus ) -{ - nResStatus = nStatus; -} - -void Http::setRequestVersion( unsigned char nMajor, unsigned char nMinor ) -{ - cReqVersion = (nMajor<<4)|nMinor; -} - -unsigned char Http::getRequestMinorVer() -{ - return cReqVersion&0x0F; -} - -unsigned char Http::getRequestMajorVer() -{ - return cReqVersion>>4; -} - -bool Http::checkRequestVer() -{ - if( cReqVersion == HTTP11 ) - return true; - return false; -} - -const char *Http::getHeader( const char *lpStr ) -{ - return (const char *)hReqHeader[lpStr]; -} - diff --git a/src/http.h b/src/http.h deleted file mode 100644 index 7e9f9a0..0000000 --- a/src/http.h +++ /dev/null @@ -1,273 +0,0 @@ -/**\file http.h - * Describe a Hyper Text Transfer Protocol processor. This class will allow - * any program to act as either an HTTP server, client, or both. It contains - * a number of additional helpers and subclasses. - *@author Mike Buland - */ - -#ifndef HTTP_H -#define HTTP_H - -#include -#include "connection.h" -#include "linkedlist.h" -#include "hashtable.h" - -#define CR '\r' /**< The ASCII value of a Carrage Return */ -#define LF '\n' /**< The ASCII value of a Line Feed */ -#define CRLF CR LF /**< Combo of CR+LF for use in http */ - -/** - * Macro to create combined http version codes. This just makes processing a - * little bit faster for the most part. - *@param maj Major version number, between 0 and 15 - *@param min Minor version number, between 0 and 15 - *@returns A one byte combined version number suitable for use in switches. - */ -#define HTTPVER( maj, min ) ((maj<<4)|(min)) - -#define HTTP10 HTTPVER( 1, 0 ) /**< Combined version code for http 1.0 */ -#define HTTP11 HTTPVER( 1, 1 ) /**< Combined version code for http 1.1 */ - -/** - * This is the master HTTP processing class. One instance handles one - * transaction, in the future a different mechanism may be thought up, but for - * now this means that you must create multiple objects to handle a single - * connection that contains multiple requests. - * In the constructor the Http class is given a connection object. This object - * should already be initialized and connected to whatever socket it wants to - * be sending and receiving data to and from. Once that's done you can call - * parseRequest if you're acting as a server, or a variety of buildRequest - * functions to create and send a request if you're a client. - * Please note that this class does not provide any HTTP or extended format - * processing systems, but will allow for mime types tables to be registered. - *@author Mike Buland - */ -class Http -{ -public: - /** - * Create an Http object tied to an existing connection object. - *@param pConnection The live connection object to deal with. - */ - Http( Connection *pConnection ); - - /** - * Standard Deconstructor. - */ - virtual ~Http(); - - /** - * Perform all parsing needed to figure out what an HTTP client wants from - * us. This will setup a number of properties in the Http object itself - * and has the possibility of setting one or more response states initially. - * These states should be checked for immediately after parsing to see if - * an appropriate error message should be generated. These errors can - * include issues with protocol, data formats, or unknown versions of the - * protocol. - *@returns True means that all processing is finished, false means that - * the parseRequest function should be called again when more data is - * ready. A return value of true does not indicate success, only that - * processing is finished, the getResponseStatus function should be called - * to see what status was set in the parse routine. A 200 indicates that - * as far as the parser is concerned, everything when smoothly. Otherwise - * it's your responsibility to build the appropriate error response body - * (like an html file) and send it as the response. - */ - bool parseRequest(); - - /** - * Get a request type's internal Http object id based on the string - * representation. These can be any HTTP/1.1 standard request type. - *@param sType The string that should be checked for type. This is in all - * caps, just like if it came from the HTTP client, which is most often - * the case. - *@returns The numerical ID of the given request type. Please note that - * HTTP/1.1 standard specifies that any string is valid here as long as - * the non-basic string is a request type understood by the serving - * software. This means that anything that is non-standard will return - * a type reqExtension and not an error. This is not a mistake. - */ - short getRequestType( const char *sType ); - - /** - * Get the string representation of an Http object request type integer ID. - * This is used mainly for debugging to be sure the system has what we - * think it has. - *@param nType The integer ID of the request type to process. - *@returns The HTTP/1.1 string representation of that Http object ID code. - */ - const char *getRequestType( short nType ); - - /** - * Returns the Http object request type ID code that is stored in the - * object by either the parseRequest function or use of the buildRequest - * functions. - *@returns The ID of the request type stored in the object. - */ - short getRequestType(); - - /** - * Same as getRequestType, only returns the string representation. - *@returns The string representation of the request type ID stored in the - * object. - */ - const char *getRequestTypeStr(); - - /** - * Sets the version of the request used by the system. This will be used - * by parse request, but is also part of the buildRequest tool functions. - *@param nMajor The major version number. - *@param nMinor The minor version number. - */ - void setRequestVersion( unsigned char nMajor, unsigned char nMinor ); - - /** - * Gets the major version number of the protocol used/to be used in this - * request. - *@returns The major version number of the request protocol. - */ - unsigned char getRequestMinorVer(); - - /** - * Gets the minor version number of the protocol used/to be used in this - * request. - *@returns The minor version number of the request protocol. - */ - unsigned char getRequestMajorVer(); - - /** - * Checks the stored request version against an internal table of supported - * protocol versions. - *@returns True if the protocol version is supported, false otherwise. - */ - bool checkRequestVer(); - - /** - * Converts an arbitrary string to a new string object with space saving - * operations performed ala the HTTP/1.1 specs. All leading and trailing - * whitespace is stripped, and all whitespace within the string is reduced - * to a single space char. - *@param sStr A pointer to the string data to process. - *@param nLen The length of the string to process. Since this function is - * often called on stream data, there is no null terminator where we need - * one. This is here for convinience so the data doesn't need to be hacked - * up or moved to an intermediate buffer. - *@returns A new string that may well be shorter than the original but that - * will have the same value as far as the HTTP/1.1 specs are concerned. - */ - std::string *convSpaceString( const char *sStr, int nLen ); - - /** - * Gets a string pointer to the URI that was/is being requested. This can - * be any RFC standard URI, with or without protocol and domain. - *@returns A pointer to the URI that was/is being requested. - */ - const char *getRequestURI(); - - /** - * Set a new response status. This status can be anything that the HTTP - * specs allow. Other values are allowed as well, but beware, not all - * servers/clients will accept values that are not in the tables in this - * class. - *@param nStatus The status to set. - */ - void setResponseStatus( short nStatus ); - - bool buildResponse( short nResponseCode=-1, const char *sResponse=NULL ); - void setResponseContent( const char *sMime, const char *sContent, int nLen ); - void setResponsePersistant( bool bPersistant ); - bool sendResponse(); - - enum - { - reqOptions, - reqGet, - reqHead, - reqPost, - reqPut, - reqDelete, - reqTrace, - reqConnect, - reqExtension - }; - - enum - { - statusContinue = 100, - statusSwitchProto = 101, - - statusOK = 200, - statusCreated = 201, - statusAccepted = 202, - statusNonAuthInfo = 203, - statusNoContent = 204, - statusResetContent = 205, - statusPartialContent = 206, - - statusMultiChoices = 300, - statusMovedPermanently = 301, - statusFound = 302, - statusSeeOther = 303, - statusNotModified = 304, - statusUseProxy = 305, - statusUnused = 306, - statusTempRedirect = 307, - - statusBadRequest = 400, - statusUnauthorized = 401, - statusPaymentRequired = 402, - statusForbidden = 403, - statusNotFound = 404, - statusMethodNotAllowed = 405, - statusNotAcceptable = 406, - statusProxyAuthRequired = 407, - statusRequestTimeout = 408, - statusConflict = 409, - statusGone = 410, - statusLengthRequired = 411, - statusPreconditionFailed = 412, - statusRequestEntityTooLarge = 413, - statusRequestURITooLong = 414, - statusUnsupportedMediaType = 415, - statusRequestedRangeNotSatisfiable = 416, - statusExpectationFailed = 417, - - statusInternalServerError = 500, - statusNotImplemented = 501, - statusBadGateway = 502, - statusServiceUnavailable = 503, - statusGatewayTimeout = 504, - statusHTTPVersionNotSupported = 505 - }; - - const char *getHeader( const char *lpStr ); - -private: - Connection *pCon; - unsigned char nParseState; - - short nReqType; - std::string *pReqStr; - std::string sReqURI; - unsigned char cReqVersion; - HashTable hReqHeader; - LinkedList lStrings; - - std::string sServerStr; - std::string sResMime; - std::string sResContent; - std::string sResStatusStr; - bool bResPersistant; - struct tm tResTime; - short nResStatus; - - enum - { - parseInit, - parseHeader, - parseFinished - }; -}; - -#endif diff --git a/src/httpget.cpp b/src/httpget.cpp deleted file mode 100644 index ee1f29c..0000000 --- a/src/httpget.cpp +++ /dev/null @@ -1,263 +0,0 @@ -#include "httpget.h" -#include "exceptions.h" -#include "connection.h" -#include - -char HttpGet::hexcode[]={'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}; - -HttpGet::HttpGet() : - nPort( 80 ), - sUserAgent("libbu++; HttpGet") -{ -} - -HttpGet::HttpGet( const std::string &url ) : - nPort( 80 ) -{ - setURL( url ); -} - -HttpGet::~HttpGet() -{ -} - -void HttpGet::setURL( const std::string &url ) -{ - int len = url.size(); - //printf("Full URL: %s\n", url.c_str() ); - int pos = url.find("://"); - sProto.assign( url, 0, pos ); - //printf("Protocol: %s\n", sProto.c_str() ); - - int pos2 = url.find("/", pos+3 ); - if( pos2 >= 0 ) - { - sHost.assign( url, pos+3, pos2-pos-3 ); - } - else - { - sHost.assign( url, pos+3, std::string::npos ); - } - - int pos3 = sHost.find(":"); - if( pos3 >= 0 ) - { - nPort = strtol( sHost.c_str()+pos3+1, NULL, 10 ); - sHost.erase( pos3 ); - } - //printf("Hostname: %s\n", sHost.c_str() ); - //printf("Port: %d\n", nPort ); - - pos3 = url.find("?", pos2+1 ); - if( pos3 >= 0 ) - { - sPath.assign( url, pos2, pos3-pos2 ); - //printf("Path: %s\n", sPath.c_str() ); - for(;;) - { - int end = pos3+1; - for(; url[end] != '=' && url[end] != '&' && end < len; end++ ); - std::string sKey, sValue; - sKey.assign( url, pos3+1, end-pos3-1 ); - if( url[end] == '=' ) - { - pos3 = end; - for( end++; url[end] != '&' && end < len; end++ ); - sValue.assign( url, pos3+1, end-pos3-1 ); - pos3 = end; - } - else - { - } - lParams.push_back( StringPair( sKey, sValue ) ); - //printf("Param: %s = %s\n", sKey.c_str(), sValue.c_str() ); - if( end+1 >= len ) break; - } - } - else - { - sPath.assign( url, pos2, std::string::npos ); - //printf("Path: %s\n", sPath.c_str() ); - } - - //printf("\n"); -} - -void HttpGet::addParam( const std::string &key, const std::string &value ) -{ - lParams.push_back( StringPair( key, value ) ); -} - -std::string HttpGet::escape( const std::string &src ) -{ - std::string escaped(""); - for( std::string::const_iterator i = src.begin(); i != src.end(); i++ ) - { - unsigned char j = *i; - if( (j >= '0' && j <= '9') || - (j >= 'a' && j <= 'z') || - (j >= 'A' && j <= 'Z') || - j == '$' || - j == '-' || - j == '_' || - j == '.' || - j == '+' || - j == '!' || - j == '*' || - j == '\'' || - j == '(' || - j == ')' ) - { - escaped += j; - } - else - { - escaped += "%"; - escaped += hexcode[j>>4]; - escaped += hexcode[j&0x0F]; - } - } - - return escaped; -} - -SBuffer *HttpGet::get() -{ - std::string sData; - sData = "GET " + sPath; - if( !lParams.empty() ) - { - sData += "?"; - for( std::list::iterator i = lParams.begin(); - i != lParams.end(); i++ ) - { - if( i != lParams.begin() ) - sData += "&"; - - if( (*i).second == "" ) - { - sData += escape( (*i).first ); - } - else - { - sData += escape( (*i).first ); - sData += "="; - sData += escape( (*i).second ); - } - } - } - - sData += " HTTP/1.1\r\n" - "User-Agent: " + sUserAgent + "\r\n" - "Connection: close\r\n" - "Host: " + sHost + "\r\n" - "Content-type: application/x-www-form-urlencoded\r\n\r\n"; - - //printf("Connection content:\n\n%s\n\n", sData.c_str() ); - - Connection con; - //printf("Opening connection...\n"); - con.open( sHost.c_str(), nPort ); - { - int nSocket = con.getSocket(); - fd_set rfds, wfds, efds; - int retval; - - FD_ZERO(&rfds); - FD_SET(nSocket, &rfds); - FD_ZERO(&wfds); - FD_SET(nSocket, &wfds); - FD_ZERO(&efds); - FD_SET(nSocket, &efds); - - struct timeval tv; - tv.tv_sec = 4; - tv.tv_usec = 0; - - //printf("Selecting on socket, can we read, write, etc?\n"); - retval = select( nSocket+1, &rfds, &wfds, &efds, &tv ); - /*printf("About to write: sock=%d, r=%d, w=%d, e=%d, ret=%d\n", - nSocket, - FD_ISSET( nSocket, &rfds ), - FD_ISSET( nSocket, &wfds ), - FD_ISSET( nSocket, &efds ), - retval - );*/ - - if( retval == 0 ) - { - //printf("Timeout on connection.\n"); - con.close(); - throw ExceptionBase("Connection Timeout on open.\n"); - } - - } - con.appendOutput( sData.c_str(), sData.size() ); - //printf("Writing to socket...\n"); - con.writeOutput(); - //printf("Data written...\n"); - int nSec = 5; - int nUSec = 0; - int nLastAmnt = con.getInputAmnt(); - try - { - double dTotTime = 0.0; - //printf("About to read input...\n"); - while( con.readInput( nSec, nUSec, &nSec, &nUSec ) ) - { - if( nLastAmnt == con.getInputAmnt() ) - { - if( nSec <= 0 && nUSec <= 0 ) - { - //printf("out of time, closing up.\n"); - con.close(); - throw ExceptionBase("Connection Timeout.\n"); - } - if( nSec == 5 && nUSec == 0 ) - { - //printf("No new data, breaking.\n"); - break; - } - } - else - { - dTotTime += (5.0-(nSec+nUSec/1000000.0)); - printf("\rRead %db at %.2fkb/sec", - con.getInputAmnt(), - ((double)(con.getInputAmnt())/1024.0) / dTotTime - ); - fflush( stdout ); - nSec = 5; - nUSec = 0; - nLastAmnt = con.getInputAmnt(); - } - } - } - catch( ConnectionException &e ) - { - //con.close(); - if( strcmp( e.what(), "Connection closed" ) ) - printf("\nConnectionException: %s\n", e.what() ); - } - - int total = con.getInputAmnt(); - const char *dat = con.getInput(); - //printf("\n===> Final size %d\n", total ); - for( int i = 0; i < total; i++ ) - { - if( !memcmp( dat+i, "\r\n\r\n", 4 ) ) - { - SBuffer *buf = new SBuffer; - buf->write( dat+i+4, total-i-4 ); - buf->setPos( 0 ); - con.close(); - return buf; - } - } - con.close(); - - //printf("\n\n%s\n\n", dat ); - - throw ExceptionBase("Something went wrong, incomplete response? fix this.\n"); -} - diff --git a/src/httpget.h b/src/httpget.h deleted file mode 100644 index 8272641..0000000 --- a/src/httpget.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef HTTP_GET_H -#define HTTP_GET_H - -#include -#include -#include -#include - -#include "sbuffer.h" - -class HttpGet -{ -public: - HttpGet(); - HttpGet( const std::string &url ); - virtual ~HttpGet(); - - void setURL( const std::string &url ); - void addParam( const std::string &key, const std::string &value ); - void setUserAgent( const std::string &sUserAgent ) - { - this->sUserAgent = sUserAgent; - } - void setHost( const std::string &sHost ) - { - this->sHost = sHost; - } - - std::string escape( const std::string &src ); - SBuffer *get(); - -private: - std::string sProto; - std::string sHost; - std::string sPath; - int nPort; - std::string sUserAgent; - typedef std::pair StringPair; - std::list lParams; - static char hexcode[]; - -}; - -#endif diff --git a/src/linkedlist.cpp b/src/linkedlist.cpp deleted file mode 100644 index a9902bc..0000000 --- a/src/linkedlist.cpp +++ /dev/null @@ -1,210 +0,0 @@ -#include "linkedlist.h" - -LinkedList::LinkedList( ) -{ - pBase = NULL; - pTop = NULL; - pLast = NULL; - nSize = 0; - nLast = -1; -} - -LinkedList::~LinkedList( ) -{ -/* - Link *pCur = pBase; - while( pCur ) - { - Link *pLast = pCur; - pCur = pCur->pNext; - delete pLast; - } -*/ - empty(); -} - -void *LinkedList::getAt( int index ) -{ - if( index < 0 || index >= nSize ) - return NULL; - - return getPtrTo( index )->pData; -} - -void LinkedList::append( void *data ) -{ - if( pBase == NULL ) - { - pBase = new Link( data ); - pTop = pBase; - nSize++; - } - else - { - pTop->pNext = new Link( data ); - pTop = pTop->pNext; - nSize++; - } -} - -void LinkedList::insertBefore( void *data, int pos ) -{ - if( pos < 0 || pos > nSize ) - return; - - if( pos == 0 ) - { - Link *pTmp = new Link( data, pBase ); - if( pBase == NULL ) - { - pTop = pTmp; - } - pBase = pTmp; - if( nLast >= 0 ) nLast++; - nSize++; - } - else - { - Link *pCur; - if( (pCur = getPtrTo( pos-1 )) == NULL ) - { - return; - } - Link *pNew = new Link( data, pCur->pNext ); - pCur->pNext = pNew; - if( pNew->pNext == NULL ) - { - pTop = pNew; - } - if( nLast >= pos ) nLast++; - nSize++; - } -} - -int LinkedList::getSize( ) -{ - return nSize; -} - -bool LinkedList::isEmpty( ) -{ - if( nSize == 0 ) - return true; - return false; -} - -void LinkedList::deleteAt( int index ) -{ - if( index >= nSize || - pBase == NULL ) - return; - - if( index == 0 ) - { - Link *pTmp = pBase->pNext; - delete pBase; - pBase = pTmp; - if( nLast >= 0 ) nLast--; - nSize--; - if( pBase == NULL ) - { - pTop = NULL; - } - else if( pBase->pNext == NULL ) - { - pTop = pBase; - } - } - else - { - Link *pCur = getPtrTo( index-1 ); - if( pCur->pNext == pTop ) - { - pTop = pCur; - } - Link *pTmp; - if( pCur->pNext == NULL ) - { - pTmp = NULL; - } - else - { - pTmp = pCur->pNext->pNext; - } - delete pCur->pNext; - pCur->pNext = pTmp; - if( nLast == index ) nLast = -1; - else if( index < nLast ) nLast--; - nSize--; - } -} - -void LinkedList::empty() -{ - while( nSize > 0 ) - { - deleteAt( 0 ); - } -} - -void LinkedList::setSize( int newSize ) -{ - if( newSize < nSize ) - { - // Delete items off of the end of the list. - while( nSize > newSize ) - { - deleteAt( nSize-1 ); - } - } - else - { - // Add null items to the end of the list. - while( nSize < newSize ) - { - append( NULL ); - } - } -} - -void LinkedList::setAt( int index, void *data ) -{ - if( index >= nSize || index < 0 ) - return; - - getPtrTo( index )->pData = data; -} - -LinkedList::Link *LinkedList::getPtrTo( int index ) -{ - if( index < 0 || index >= nSize ) - return NULL; - if( index == nLast ) - { - return pLast; - } - if( index == 0 ) - { - pLast = pBase; - nLast = 0; - return pBase; - } - else - { - Link *pCur = pBase; - int nCur = 0; - if( nLast < index && nLast >= 0 ) - { - pCur = pLast; - nCur = nLast; - } - while( nCur != index ) - { - pCur = pCur->pNext; - nCur++; - } - nLast = index; - pLast = pCur; - return pCur; - } -} diff --git a/src/linkedlist.h b/src/linkedlist.h deleted file mode 100644 index e430108..0000000 --- a/src/linkedlist.h +++ /dev/null @@ -1,87 +0,0 @@ -/**@file - * Describes the LinkedList implementation of the List ADT. - *@author Mike Buland - */ - -#ifndef LINKEDLIST_H -#define LINKEDLIST_H - -#include -#include "list.h" - -/** A linked-item implementation of the List ADT. Since the data is linked - * sequentially this is a great choice for lists that will grow and shrink - * a lot, but don't require as much random access. This implementation - * includes optomizations that make iterating through data, and appending - * items to the list take O(1) time. - *@author Mike Buland - */ -class LinkedList : public List -{ -public: - /** - * Construct a blank LinkedList. - */ - LinkedList(); - - /** - * Delete all list data, but do not delete any of the contained elements. - */ - virtual ~LinkedList(); - - void *getAt( int nIndex ); - void append( void *pData ); - void insertBefore( void *pData, int nPos = 0 ); - int getSize( ); - bool isEmpty( ); - void deleteAt( int nIndex ); - void empty(); - void setSize( int nNewSize ); - void setAt( int nIndex, void *pData ); - -private: - /** - * A link in the linked list. - */ - class Link - { - public: - /** - * Construct an empty link. - */ - Link() - { - pData = NULL; - pNext = NULL; - } - /** - * Construct a link filled in with useful data. - *@param newData The data this link should hold. - *@param newNext The next link that this link should point to. - */ - Link( void *newData = NULL, Link * newNext = NULL ) - { - pData = newData; - pNext = newNext; - } - void *pData; /**< A pointer to the contained data. */ - Link *pNext; /**< A pointer to the next link in the chain */ - }; - - /** - * Finds a pointer to the link at index index. This is the core function - * called for all seek operations, and has been optimized as heavily as - * possible. - *@param index The zero-based index of the desired element. - *@returns A pointer to the requested Link, or NULL if it isn't found. - */ - Link *getPtrTo( int index ); - Link *pBase; /**< The first link in the list. */ - Link *pTop; /**< The Last link in the list. */ - Link *pLast; /**< The previously requested link. */ - int nSize; /**< The number of contained links. */ - int nLast; /**< The index of the previously requested link. */ -}; - -#endif - diff --git a/src/linkmessage.cpp b/src/linkmessage.cpp deleted file mode 100644 index cf3df42..0000000 --- a/src/linkmessage.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include "linkmessage.h" -#include - -LinkMessage::LinkMessage( int nNewMsg ) -{ - nMsg = nNewMsg; -} - -LinkMessage::~LinkMessage() -{ -} - -/* -void LinkMessage::setBroadcast( bool bOn ) -{ - bBroadcast = bOn; -} - -bool LinkMessage::isBroadcast() -{ - return bBroadcast; -} - - -void LinkMessage::setFromID( int id ) -{ - nFromLinkID = id; -} - -int LinkMessage::getFromID() -{ - return nFromLinkID; -} - -void LinkMessage::setToID( int id ) -{ - nTargetLinkID = id; -} - -int LinkMessage::getToID() -{ - return nTargetLinkID; -} -*/ diff --git a/src/linkmessage.h b/src/linkmessage.h deleted file mode 100644 index 6cdfb2f..0000000 --- a/src/linkmessage.h +++ /dev/null @@ -1,39 +0,0 @@ -/**\file linkmessage.h - */ - -#ifndef LINKMESSAGE_H -#define LINKMESSAGE_H - -/** - * A message to be broadcast accross ProgramLinks in a ProgramChain. Generally - * one would make a subclass of this in order to transmit more useful - * information, but sometimes it isn't necesarry. - *@author Mike Buland - */ -class LinkMessage -{ -public: - /** - * Construct a blank LinkMessage. - */ - LinkMessage() {}; - - /** - * Deconstruct a LinkMessage. - */ - virtual ~LinkMessage(); - - /** - * Create a LinkMessage object with a specific message assosiated with it - * to start with. - *@param nNewMsg The message to use in the Message object. - */ - LinkMessage( int nNewMsg ); - - /** - * The message contained in the Message object. - */ - int nMsg; -}; - -#endif diff --git a/src/linkmessenger.cpp b/src/linkmessenger.cpp deleted file mode 100644 index 3bd401a..0000000 --- a/src/linkmessenger.cpp +++ /dev/null @@ -1,41 +0,0 @@ -#include "linkmessenger.h" - -LinkMessenger::LinkMessenger() : - pFirst( NULL ), - pLast( NULL ) -{ -} - -LinkMessenger::~LinkMessenger() -{ -} - -void LinkMessenger::enqueueMessage( LinkMessage *pMsg ) -{ - if( pLast == NULL ) - { - pFirst = pLast = new Link; - pLast->pMsg = pMsg; - pLast->pNext = NULL; - } - else - { - pLast->pNext = new Link; - pLast = pLast->pNext; - pLast->pMsg = pMsg; - pLast->pNext = NULL; - } -} - -LinkMessage *LinkMessenger::dequeueMessage() -{ - if( pFirst == NULL ) - return NULL; - - Link *pTmp = pFirst; - pFirst = pFirst->pNext; - LinkMessage *pRet = pTmp->pMsg; - delete pTmp; - return pRet; -} - diff --git a/src/linkmessenger.h b/src/linkmessenger.h deleted file mode 100644 index ed52639..0000000 --- a/src/linkmessenger.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef LINK_MESSENGER_H -#define LINK_MESSENGER_H - -#include -#include -#include "linkmessage.h" - -class LinkMessenger -{ -public: - LinkMessenger(); - virtual ~LinkMessenger(); - - void enqueueMessage( LinkMessage *pMsg ); - LinkMessage *dequeueMessage(); - bool hasMessages() - { - return (pFirst != NULL); - } - -private: - typedef struct Link - { - LinkMessage *pMsg; - Link *pNext; - }; - Link *pFirst; - Link *pLast; - -}; - -#endif diff --git a/src/list.cpp b/src/list.cpp deleted file mode 100644 index 18f1a66..0000000 --- a/src/list.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "list.h" - -List::List( ) -{ -} - -List::~List( ) -{ -} - diff --git a/src/list.h b/src/list.h deleted file mode 100644 index c71b328..0000000 --- a/src/list.h +++ /dev/null @@ -1,101 +0,0 @@ -#ifndef LIST_H -#define LIST_H - - -/** The basic List class ADT. This, on it's own, does absolutely nothing, but - * does define all standard interface functions to access a list. - *@author Mike Buland - */ -class List -{ -public: - /** - * Construct a list. - */ - List(); - - /** - * Desconstruct a list. - */ - virtual ~List(); - - /** Gets the value at a specified index. - *@param nIndex The index of the item to return. - *@returns The specified item, or NULL if the index was beyond the range - * of the list. - *@author Mike Buland - */ - virtual void *getAt( int nIndex ) = 0; - - /** Append the given data to the end of the list. This increases the - * size of the list by one. - *@param pData The data to append to the list. - *@author Mike Buland - */ - virtual void append( void *pData ) = 0; - - /** Inserts an item at the specified position in the list. The - * new item takes the index that you specify, and all other items - * are moved up one position. The size of the list is increased by - * one. - *@param pData The value to insert into the list. - *@param nPos Where to insert the data into the list. - *@author Mike Buland - */ - virtual void insertBefore( void *pData, int nPos = 0 ) = 0; - - /** Determines the size of the list, in elements. - *@returns The size of the list. - *@author Mike Buland - */ - virtual int getSize( ) = 0; - - /** Determines if the list is empty or not. - *@returns True if the list is empty, or false if the list has - * data in it (if the size is greater than zero). - *@author Mike Buland - */ - virtual bool isEmpty( ) = 0; - - /** Deletes an item at the specified index and moves all other - * values down one index. The size of the list is decreased by one. - *@param nIndex The index of the item to delete. - *@author Mike Buland - */ - virtual void deleteAt( int nIndex ) = 0; - - /** Completely empties the list, and sets the effective size to - * zero. - *@author Mike Buland - */ - virtual void empty() = 0; - - /** Sets the size of the list. This can be larger or smaller - * than what it was previously. If larger, new blank items will - * be added to the end of the list. If smaller than the old list - * items will be deleted from the end. - *@param nNewSize The new size of the list. - *@author Mike Buland - */ - virtual void setSize( int nNewSize ) = 0; - - /** Sets a member at a specified location to a new value. - * If the member being set is outside of the range of the - * current list it should be expanded. - *@param nIndex The zero-based index of the item to change. - *@param pData The new value for that index. - *@author Mike Buland - */ - virtual void setAt( int nIndex, void *pData ) = 0; - - /** Makes the List work like an array. Just say listObj[2] to get - * the third element. - *@param nIndex The index to access in the list. - *@returns A pointer to the data at element index. - *@author Mike Buland - */ - void *operator[]( int nIndex ) { return getAt( nIndex ); }; -}; - -#endif - diff --git a/src/md5.cpp b/src/md5.cpp deleted file mode 100644 index c0cacdd..0000000 --- a/src/md5.cpp +++ /dev/null @@ -1,190 +0,0 @@ -#include -#include -#include -#include "md5.h" - -// This is a fun macro that tells us where the length char goes after the data -// section in the padded data segment. It's short for OBfuscation LOCaction. -#define OBLOC(len) ((((len + 64) >> 9) << 4) + 14) -// This performs a wrapping bitwise shift, kinda' fun! - -#define bit_roll( num, cnt ) \ - (((num) << (cnt)) | (((num) >> (32 - (cnt))) & ~(-1<<(cnt)))) - -//#define md5_cmn( q, a, b, x, s, t ) (bit_roll((a + q + x + t), s) + b) - -// The following are handy wrappers for the cmn function -#define md5_ff( a, b, c, d, x, s, t ) \ - (md5_cmn((b & c) | ((~b) & d), a, b, x, s, t)) - -#define md5_gg( a, b, c, d, x, s, t ) \ - (md5_cmn((b & d) | (c & (~d)), a, b, x, s, t)) - -#define md5_hh( a, b, c, d, x, s, t ) \ - (md5_cmn(b ^ c ^ d, a, b, x, s, t)) - -#define md5_ii( a, b, c, d, x, s, t ) \ - (md5_cmn(c ^ (b | (~d)), a, b, x, s, t)) - -inline long md5_cmn( long q, long a, long b, long x, long s, long t ) -{ - return bit_roll((a + q + x + t), s) + b; -} - -md5::md5() -{ -} - -md5::~md5() -{ -} - -/* - * Calculate the MD5 of an array of little-endian words, and a bit length - */ -void md5::core_md5( long *x, long len, md5sum *output ) -{ - long a = 1732584193, olda; - long b = -271733879, oldb; - long c = -1732584194, oldc; - long d = 271733878, oldd; - - for( long i = 0; i < len; i += 16 ) - { - olda = a; - oldb = b; - oldc = c; - oldd = d; - - a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936); - d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586); - c = md5_ff(c, d, a, b, x[i+ 2], 17, 606105819); - b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330); - a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897); - d = md5_ff(d, a, b, c, x[i+ 5], 12, 1200080426); - c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341); - b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983); - a = md5_ff(a, b, c, d, x[i+ 8], 7 , 1770035416); - d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417); - c = md5_ff(c, d, a, b, x[i+10], 17, -42063); - b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162); - a = md5_ff(a, b, c, d, x[i+12], 7 , 1804603682); - d = md5_ff(d, a, b, c, x[i+13], 12, -40341101); - c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290); - b = md5_ff(b, c, d, a, x[i+15], 22, 1236535329); - - a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510); - d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632); - c = md5_gg(c, d, a, b, x[i+11], 14, 643717713); - b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302); - a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691); - d = md5_gg(d, a, b, c, x[i+10], 9 , 38016083); - c = md5_gg(c, d, a, b, x[i+15], 14, -660478335); - b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848); - a = md5_gg(a, b, c, d, x[i+ 9], 5 , 568446438); - d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690); - c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961); - b = md5_gg(b, c, d, a, x[i+ 8], 20, 1163531501); - a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467); - d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784); - c = md5_gg(c, d, a, b, x[i+ 7], 14, 1735328473); - b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734); - - a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558); - d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463); - c = md5_hh(c, d, a, b, x[i+11], 16, 1839030562); - b = md5_hh(b, c, d, a, x[i+14], 23, -35309556); - a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060); - d = md5_hh(d, a, b, c, x[i+ 4], 11, 1272893353); - c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632); - b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640); - a = md5_hh(a, b, c, d, x[i+13], 4 , 681279174); - d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222); - c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979); - b = md5_hh(b, c, d, a, x[i+ 6], 23, 76029189); - a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487); - d = md5_hh(d, a, b, c, x[i+12], 11, -421815835); - c = md5_hh(c, d, a, b, x[i+15], 16, 530742520); - b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651); - - a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844); - d = md5_ii(d, a, b, c, x[i+ 7], 10, 1126891415); - c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905); - b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055); - a = md5_ii(a, b, c, d, x[i+12], 6 , 1700485571); - d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606); - c = md5_ii(c, d, a, b, x[i+10], 15, -1051523); - b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799); - a = md5_ii(a, b, c, d, x[i+ 8], 6 , 1873313359); - d = md5_ii(d, a, b, c, x[i+15], 10, -30611744); - c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380); - b = md5_ii(b, c, d, a, x[i+13], 21, 1309151649); - a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070); - d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379); - c = md5_ii(c, d, a, b, x[i+ 2], 15, 718787259); - b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551); - - a = a + olda; - b = b + oldb; - c = c + oldc; - d = d + oldd; - } - - output->data[0] = a; - output->data[1] = b; - output->data[2] = c; - output->data[3] = d; - delete[] x; -} - -long *md5::c2l( const char *str, long len, long *nNewLen ) -{ - long len8 = len*8; - long mlen = OBLOC( len8 ); - long flen = (((mlen/16)+((mlen%16)?(1):(0))))*16; - long *aBin = new long[flen]; - memset( aBin, 0, flen*4 ); - - for( long i = 0; i < len8; i+=8 ) - { - aBin[i>>5] |= ((long)str[i/8]) << (i%32); - } - - aBin[len8 >> 5] |= 0x80 << ((len8) % 32); - aBin[OBLOC( len8 )] = len8; - - (*nNewLen) = flen; - - return aBin; -} - -void md5::l2hexstr( long *binarray, char *str ) -{ - static const char hex_tab[] = {"0123456789abcdef"}; - //static char str[33]; - - int k = 0; - for( int i = 0; i < 16; i++) - { - str[k++] = hex_tab[(binarray[i>>2] >> ((i%4)*8+4)) & 0xF]; - str[k++] = hex_tab[(binarray[i>>2] >> ((i%4)*8 )) & 0xF]; - } -} - -void md5::sumString( md5sum *pSum, const char *sStr ) -{ - sumData( pSum, sStr, strlen( sStr ) ); -} - -void md5::sumData( md5sum *pSum, const char *aData, long nLen ) -{ - long nNewLen; - long *aOb = c2l( aData, nLen, &nNewLen ); - core_md5( aOb, nNewLen, pSum ); -} - -void md5::sumToHex( md5sum *pSum, char *sHex ) -{ - l2hexstr( pSum->data, sHex ); -} - diff --git a/src/md5.h b/src/md5.h deleted file mode 100644 index 7f77d83..0000000 --- a/src/md5.h +++ /dev/null @@ -1,81 +0,0 @@ -#ifndef MD5_H -#define MD5_H - -/** - * Used to store an MD5 sum in a handy container. - */ -typedef struct -{ - /** The actual data-storage for an MD5 sum. */ - long data[4]; -} md5sum; - -/** - * Class for easily calculating MD5 sums of just about any data. - *@author Mike Buland - */ -class md5 -{ -public: - /** Build an MD5 sum builder. */ - md5(); - - /** Deconstruct */ - virtual ~md5(); - - /** - * Create a sum of a standard c string, null terminated. This is probably - * the easiest function to use. - *@param pSum The MD5 sum structure to fill up. - *@param sStr The null-terminated string to turn into an MD5 sum. - */ - void sumString( md5sum *pSum, const char *sStr ); - - /** - * Create a sum of an array of arbitrary data. This is the most handy for - * dealing with files and so on. - *@param pSum The MD5 sum structure to fill up. - *@param aData A pointer to the base of the data to sum. - *@param nLen The number of bytes to use in the sum. - */ - void sumData( md5sum *pSum, const char *aData, long nLen ); - - /** - * Convert an md5sum to standard hex representation. Make sure that sHex - * contains at least 17 characters of space. - *@param pSum The sum structure to convert to hex. - *@param sHex The string to store the hex value in. - */ - void sumToHex( md5sum *pSum, char *sHex ); - -private: - /** - * Do the bulk of the work of the md5 algorithm. - *@param x I'm not sure. I'll need to look it up. - *@param len The length of the data. - *@param output The sum structure to put the output in. - */ - void core_md5( long *x, long len, md5sum *output ); - - /** - * Convert an array of charaters to an array of longs in a very crafty way. - * This also applies standard MD5 obfuscation to the resulting array, and - * makes it fit within MD5 size constraints. - *@param str The data to convert. - *@param len The length of the data. - *@param nNewLen A pointer to a variable that will hold the new length of - * the resulting array of longs. - *@returns The newly obfuscated and resized long array. - */ - long *c2l( const char *str, long len, long *nNewLen ); - - /** - * Backend helper to convert an array of longs into a hex string. - *@param binarray The binary data to convert. - *@param str The string to store the hex string in. - */ - void l2hexstr( long *binarray, char *str ); - -}; - -#endif diff --git a/src/multilog.cpp b/src/multilog.cpp deleted file mode 100644 index 143ee89..0000000 --- a/src/multilog.cpp +++ /dev/null @@ -1,102 +0,0 @@ -#include "multilog.h" -#include -#include -#include -#include - -#include "multilogchannel.h" - -MultiLog::MultiLog() -{ - lChannel = new LinkedList(); - rEntry = new RingList( 150 ); - nEntriesLost = 0; -} - -MultiLog::~MultiLog() -{ - int nMax = lChannel->getSize(); - for( int j = 0; j < nMax; j++ ) - { - ((MultiLogChannel *)lChannel->getAt(j))->closeLog(); - delete ((MultiLogChannel *)lChannel->getAt(j)); - } - delete lChannel; - - for( int j = 0; j < rEntry->getSize(); j++ ) - { - delete (LogEntry *)rEntry->getAt( j ); - } - delete rEntry; -} -/* -void MultiLog::Log( int nLevel, const char *lpFormat, ...) -{ - switch( nLevel ) - { - default: - break; - } - va_list ap; - va_start(ap, lpFormat); - - vprintf( lpFormat, ap ); - - va_end(ap); -}*/ - -void MultiLog::DetailLog( int nLevel, const char *lpFile, int nLine, const char *lpFunction, const char *lpFormat, ...) -{ - LogEntry *e = new LogEntry(); - - va_list ap; - va_start(ap, lpFormat); - char *text; - vasprintf( &text, lpFormat, ap ); - va_end(ap); - - time( &e->xTime ); - e->nLevel = nLevel; - e->nLine = nLine; - e->lpFile = new char[strlen(lpFile)+1]; - strcpy( e->lpFile, lpFile ); - e->lpText = new char[strlen(text)+1]; - strcpy( e->lpText, text ); - free( text ); - - append( e ); -} - -void MultiLog::append( LogEntry *pEntry ) -{ - rEntry->append( pEntry ); - if( rEntry->getPushBuf() ) - { - delete (LogEntry *)rEntry->getPushBuf(); - nEntriesLost++; - } - - for( int j = 0; j < lChannel->getSize(); j++ ) - { - ((MultiLogChannel *)lChannel->getAt( j ))->append( pEntry ); - } -} - -void MultiLog::addChannel( MultiLogChannel *pChannel ) -{ - lChannel->append( pChannel ); - - pChannel->openLog(); - - for( int j = 0; j < rEntry->getSize(); j++ ) - { - pChannel->append( (LogEntry *)rEntry->getAt( j ) ); - } -} - -MultiLog::LogEntry::~LogEntry() -{ - delete[] lpFile; - delete[] lpText; -} - diff --git a/src/multilog.h b/src/multilog.h deleted file mode 100644 index 692095a..0000000 --- a/src/multilog.h +++ /dev/null @@ -1,130 +0,0 @@ -#ifndef MULTILOG_H -#define MULTILOG_H - -#include -#include -#include - -#include "ringlist.h" -#include "linkedlist.h" -#include "singleton.h" - -/** - * Calls the DetailLog function but includes pre-processor macros to fill in - * most of the fields for you. This makes your life a lot easier, and makes the - * log useful for system debugging as well as just letting people know what's - * going on. - *@param LEVEL The log level, comes from an enum in the MultiLog class. - *@param FORMAT The text to store in the log, using printf style formatting. - *@param ... Parameters to help format the text in the FROMAT param. - */ -#define LineLog( LEVEL, FORMAT, ...) DetailLog( LEVEL, __FILE__, __LINE__, __PRETTY_FUNCTION__, FORMAT, ##__VA_ARGS__ ) - -#define MultiLineLog( LEVEL, FORMAT, ...) MultiLog::getInstance().DetailLog( LEVEL, __FILE__, __LINE__, __PRETTY_FUNCTION__, FORMAT, ##__VA_ARGS__ ) - -/** MultiLog keeps track of logfile info in a myriad of varieties, and is - * easily configurable between them all. It allows output to the standard - * output, error output, files, networks, and streams, which includes memory - * buffers. - * MultiLog uses the singleton pattern to keep only a single instance of - * the log. Instead of instantiating a new copy, call the getLog method. - *@author Mike Buland - */ -class MultiLog : public Singleton -{ - friend class Singleton; -public: - /** - * Keeps track of a single log entry, in a standard format, that can be - * processed by any MultiLogChannel derrived class. - *@author Mike Buland - */ - typedef struct LogEntry - { - /** Safely delete a log entry. */ - virtual ~LogEntry(); - time_t xTime; /**< The time the log entry was made. */ - int nLevel; /**< The log-level of the entry. */ - char *lpFile; /**< The name of the file this entry came from. */ - int nLine; /**< The line number that this log came from. */ - char *lpText; /**< The text content of this log entry. */ - } LogEntry; - -protected: - /** - * Private constructor, this ensures that this is a singleton. - */ - MultiLog(); - - /** - * Destroy the multilog. - */ - virtual ~MultiLog(); - - /** - * Append a new logentry to the log list, possibly pushing an old entry off. - *@param pEntry The new entry to append. - */ - void append( LogEntry *pEntry ); - - /** - * The actual log entry storage mechanism. - */ - RingList *rEntry; - - /** - * The number of entries that have rolled off the end of the RingList. - */ - unsigned long nEntriesLost; - - /** - * A list of all channels that are registered with the MultiLog. - */ - LinkedList *lChannel; - -public: - - /** Sends info to the logfile. - *@param nLevel The type of data being logged (error, info, etc.) - *@param lpFormat The data to send to the log. - *@author Mike Buland - */ - //void Log( int nLevel, const char *lpFormat, ...); - - /** Sends info to the logfile with extra information, including the files - * that it was called from and the line in the code. Besides that, it's - * exactly the same as Log. Please use the LineLog macro to make DetailLog - * really easy to use. It operates exacly like Log, but inserts the - * builtin macros as the lpFile and nLine parameters. - *@param nLevel The type of data being logged (error, info, etc.) - *@param lpFile The name of the file that called the log function. - *@param nLine The line in the file that this log function was called from. - *@param lpFunction The name of the function that called the log function. - *@param lpFormat The data to send to the log. - *@author Mike Buland - */ - void DetailLog( int nLevel, const char *lpFile, int nLine, const char *lpFunction, const char *lpFormat, ...); - - /** - * Adds a logging channel to the MultiLog channel chain. Every added - * channel will automatically receive a complete log of everything that - * happened before the channel was added as well as all future messages. - *@param pChannel A pointer to the pre-contructed channel object to add. - */ - void addChannel( class MultiLogChannel *pChannel ); - - /** The various pre-defined levels available to use when logging. - * The person logging can make up their own, just make sure to remember - * which value is which (all levels are integers). - *@author Mike Buland - */ - enum Levels - { - LError, - LWarning, - LInfo, - LStatus - }; -}; - -#endif diff --git a/src/multilogchannel.cpp b/src/multilogchannel.cpp deleted file mode 100644 index ee4c9bf..0000000 --- a/src/multilogchannel.cpp +++ /dev/null @@ -1,13 +0,0 @@ -// -// C++ Implementation: multilogchannel -// -// Description: -// -// -// Author: Mike Buland , (C) 2005 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#include "multilogchannel.h" - diff --git a/src/multilogchannel.h b/src/multilogchannel.h deleted file mode 100644 index d891a65..0000000 --- a/src/multilogchannel.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef MULTILOGCHANNEL_H -#define MULTILOGCHANNEL_H - -#include "multilog.h" - -/** - * The baseclass for any MultiLog output channel. Any class that implements - * all of these functions can be put in the log chain and will be sent - * messages from active MultiLoggers. - *@author Mike Buland - */ -class MultiLogChannel -{ -public: - /** - * Deconstruct a MultiLogChannel. - */ - virtual ~MultiLogChannel() {}; - - /** - * Should perform any operations that need to take place in order to start - * the output of data into this channel. This will be called once by the - * MultiLog when the MultiLogChannel is registered. - *@returns True means that everything can go as planned. False means that - * the MultiLog should remove this channel from the list and delete it. - */ - virtual bool openLog() = 0; - - /** - * Should append a log entry to the long, by whatever means are necesarry. - *@param pEntry The LogEntry to append. - *@returns True means that everything can go as planned. False means that - * the MultiLog should remove this channel from the list and delete it. - */ - virtual bool append( MultiLog::LogEntry *pEntry ) = 0; - - /** - * Should perform any operations that need to take place in order to safely - * close and cleanup the log. - *@returns True means that everything can go as planned. False means that - * the MultiLog should remove this channel from the list and delete it. - */ - virtual bool closeLog() = 0; -}; - -#endif diff --git a/src/multilogtext.cpp b/src/multilogtext.cpp deleted file mode 100644 index 4337cc9..0000000 --- a/src/multilogtext.cpp +++ /dev/null @@ -1,188 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include "multilogtext.h" -/* -bool fileexists( const char *sPath ) -{ - int nFileDesc = open( sPath, O_RDONLY ); - if( nFileDesc < 0 ) - { - return false; - } - else - { - close( nFileDesc ); - return true; - } -}*/ - -MultiLogText::MultiLogText( const char *sFileName, const char *lpFormat, bool bRotateLog, int nMaxLogs ) -{ - this->lpFormat = NULL; - /* - if( bRotateLog ) - { - if( fileexists( sFileName ) == false ) - { - return; - } - - int nLen = strlen( sFileName ); - char *buf = new char[nLen+6]; - sprintf( buf, "%s.", sFileName ); - - for( int j = 1; j < nMaxLogs; j++ ) - { - sprintf( &buf[nLen+1], "%d", j ); - if( !fileexists( buf ) ) - { - rename( sFileName, buf ); - break; - } - } - }*/ - - nFD = open( sFileName, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH ); - setLogFormat( lpFormat ); -} - -MultiLogText::MultiLogText( int nFileDesc, const char *lpFormat ) -{ - this->lpFormat = NULL; - nFD = nFileDesc; - setLogFormat( lpFormat ); -} - -MultiLogText::~MultiLogText() -{ - if( nFD != -1 ) - { - close( nFD ); - } - - delete[] lpFormat; -} - -bool MultiLogText::setLogFormat( const char *lpFormat ) -{ - char buf[200]; - int k = 0; - static char fmts[10][4]={ - {'y', 'd', '0', '1'}, - {'m', 'd', '0', '2'}, - {'d', 'd', '0', '3'}, - {'h', 'd', '0', '4'}, - {'M', 'd', '0', '5'}, - {'s', 'd', '0', '6'}, - {'l', 'd', '0', '7'}, - {'f', 's', '0', '8'}, - {'L', 'd', '0', '9'}, - {'t', 's', '1', '0'}, - }; - - for( int j = 0; lpFormat[j] != '\0'; j++ ) - { - if( lpFormat[j] == '%' ) - { - buf[k++] = '%'; - int nPlace = k++; - k++; - buf[k++] = '$'; - bool bDone = false; - for( j++; bDone == false; j++ ) - { - int l; - for( l = 0; l < 10; l++ ) - { - if( lpFormat[j] == fmts[l][0] ) - { - buf[nPlace] = fmts[l][2]; - buf[nPlace+1] = fmts[l][3]; - buf[k++] = fmts[l][1]; - bDone = true; - break; - } - } - if( l == 10 ) - { - buf[k++] = lpFormat[j]; - } - } - j--; - } - else - { - buf[k++] = lpFormat[j]; - } - } - buf[k++] = '\n'; - buf[k] = '\0'; - - if( this->lpFormat != NULL ) - { - delete[] this->lpFormat; - } - this->lpFormat = new char[k+1]; - strcpy( this->lpFormat, buf ); - - return true; -} - -bool MultiLogText::openLog() -{ - if( nFD == -1 ) - { - return false; - } - return true; -} - -bool MultiLogText::append( MultiLog::LogEntry *pEntry ) -{ - if( nFD == -1 ) - { - return false; - } - - char *line = NULL; - struct tm *pTime; - pTime = localtime( &pEntry->xTime ); - asprintf( - &line, - lpFormat, - pTime->tm_year+1900, - pTime->tm_mon+1, - pTime->tm_mday, - pTime->tm_hour, - pTime->tm_min, - pTime->tm_sec, - pEntry->nLevel, - pEntry->lpFile, - pEntry->nLine, - pEntry->lpText - ); - write( nFD, line, strlen(line) ); - free( line ); - - return true; -} - -bool MultiLogText::closeLog() -{ - if( nFD == -1 ) - { - return false; - } - // Don't close it if it's sdtout or errorout - if( nFD > 2 ) - { - close( nFD ); - } - nFD = -1; - return true; -} - diff --git a/src/multilogtext.h b/src/multilogtext.h deleted file mode 100644 index 197aef1..0000000 --- a/src/multilogtext.h +++ /dev/null @@ -1,70 +0,0 @@ -#ifndef MULTILOGTEXT_H -#define MULTILOGTEXT_H - -#include "multilogchannel.h" - -/** - * Simple MultiLogChannel that takes the logdata, formats it textually, and - * writes it to a text device, either a file or the screen, yay! This takes - * the place of the old standard logging facility. - * The entries in the format follow the standard printf % style, and are as - * follows: - *
    - *
  • %y - current year
    • - *
  • %m - current month
    • - *
  • %d - current day
    • - *
  • %h - current hour (24-hour format)
    • - *
  • %M - current minute
    • - *
  • %s - current seccond
    • - *
  • %l - Loglevel (numerical)
    • - *
  • %f - Filename
    • - *
  • %L - Line number
    • - *
  • %t - Full text of the log entry
    • - *
- *@author Mike Buland - */ -class MultiLogText : public MultiLogChannel -{ -public: - /** - * Construct a MultiLogText object around a specific filename and format. - * The file named by sFileName will be opened for writting in text+append - * mode. No existing data will be destroyed. - *@param sFileName The file to output log-data to. - *@param lpFormat The format using the above specifications to be used for - * every log entry. - */ - MultiLogText( const char *sFileName, const char *lpFormat, bool bRotateLog=false, int nMaxLogs=0 ); - - /** - * Construct a MultiLogText object around a specific file and format. - * The file descriptor passed in should describe an already opened and set- - * up file or device. This could easily be a socket or stdout or stderr. - *@param nFileDesc The already opened descriptor to send data to. - *@param lpFormat The format using the above specifications to be used for - * every log entry. - */ - MultiLogText( int nFileDesc, const char *lpFormat ); - - /** - * Destroy the object. - */ - virtual ~MultiLogText(); - - bool openLog(); - bool append( MultiLog::LogEntry *pEntry ); - bool closeLog(); - - /** - * Change the log format on the fly. - *@param lpFormat The new format to use for all future log entries. - *@returns True if everything was fine, false for catastrophic failure. - */ - bool setLogFormat( const char *lpFormat ); - -private: - int nFD; /**< The file descriptor we're writing to. */ - char *lpFormat; /**< The format that we're using, converted for printf. */ -}; - -#endif diff --git a/src/old/arraylist.cpp b/src/old/arraylist.cpp new file mode 100644 index 0000000..ef21426 --- /dev/null +++ b/src/old/arraylist.cpp @@ -0,0 +1,100 @@ +#include "arraylist.h" +#include +#include + +ArrayList::ArrayList( int initSize, int growByFactor ) +{ + apData = new void *[initSize]; + nSize = 0; + nCapacity = initSize; + nGrowByFactor = growByFactor; +} + +ArrayList::~ArrayList( ) +{ + delete[] apData; +} + +void *ArrayList::getAt( int index ) +{ + if( index < 0 || index > nSize ) + return NULL; + + return apData[index]; +} + +void ArrayList::append( void *data ) +{ + insertBefore( data, nSize ); +} + +void ArrayList::insertBefore( void *data, int pos ) +{ + if( pos < 0 || pos > nSize ) + return; + + checkResize(); + memmove( &apData[pos+1], &apData[pos], (nSize-pos)*sizeof(void*) ); + apData[pos] = data; + nSize++; +} + +int ArrayList::getSize( ) +{ + return nSize; +} + +bool ArrayList::isEmpty( ) +{ + return nSize==0; +} + +void ArrayList::deleteAt( int index ) +{ + if( index < 0 || index >= nSize ) + return; + + memmove( &apData[index], &apData[index+1], (nSize-index-1)*sizeof(void *) ); + nSize--; +} + +void ArrayList::empty() +{ + // Probably the easiest as far as things go. + nSize = 0; +} + +void ArrayList::resizeTo( int newSize ) +{ + void **apNew = new void *[newSize]; + memmove( apNew, apData, nSize*sizeof(void *) ); + nCapacity = newSize; + delete[] apData; + apData = apNew; +} + +void ArrayList::checkResize() +{ + if( nSize >= nCapacity ) + { + resizeTo( nCapacity + nGrowByFactor ); + } +} + +void ArrayList::setSize( int newSize ) +{ + if( newSize < 0 ) + return; + + nSize = newSize; + checkResize(); +} + +void ArrayList::setAt( int index, void *data ) +{ + if( index < 0 || index >= nSize ) + return; + + apData[index] = data; +} + diff --git a/src/old/arraylist.h b/src/old/arraylist.h new file mode 100644 index 0000000..0fda34a --- /dev/null +++ b/src/old/arraylist.h @@ -0,0 +1,80 @@ +/** \file arraylist.h + * Describes the ArrayList class. + *@author Mike Buland + */ +#ifndef ARRAY_LIST_H +#define ARRAY_LIST_H + +#include "list.h" + +/** A simple list which uses an array. This is a great choice if you won't do + * a lot of adding and deleting and need a fast random access list. Otherwise + * use the LinkedList. + *@author Mike Buland + */ +class ArrayList : public List +{ +public: + /** Creates an arraylist with some pre-defined specs spelled out. + *@param initSize the inital number of elements to allocate. + *@param growByFactor How much to increase the size of the array by + * each time we run out of room. + */ + ArrayList( int initSize=100, int growByFactor=10 ); + /** + * Destroy the ArrayList + */ + virtual ~ArrayList(); + + void *getAt( int nIndex ); + void append( void *pData ); + void insertBefore( void *pData, int nPos = 0 ); + int getSize( ); + bool isEmpty( ); + void deleteAt( int nIndex ); + void empty(); + void setSize( int nNewSize ); + void setAt( int nIndex, void *pData ); + +private: + /** + * Checks to see if the system needs to be resized, if it does, this will + * automatically resize based on your parameters. + */ + void checkResize(); + + /** + * Resize the system to a specified size. If it is larger, then all data + * will be retained, if smaller the elements at the end will be cut off. + *@param newSize The number of elements to include after resizing. + */ + void resizeTo( int newSize ); + + /** + * Actual master array of pointers. This is done to follow the List specs. + * All data transactions are performed with pointers or compatable + * primitive data-types. + */ + void **apData; + + /** + * The number of filled in elements in the array. This is the practical + * real size of the ArrayList for all userspace applications. + */ + int nSize; + + /** + * The number of elements allocated in memory. Not all of these have to be + * filled in, and it is usually larger than nSize so that adding and + * deleting elements is fast and easy. + */ + int nCapacity; + + /** + * The amount to grow by whenever the array needs resizing. + */ + int nGrowByFactor; +}; + +#endif + diff --git a/src/old/cgi.cpp b/src/old/cgi.cpp new file mode 100644 index 0000000..1fecbbe --- /dev/null +++ b/src/old/cgi.cpp @@ -0,0 +1,644 @@ +#include +#include +#include +#include +#include + +#include "cgi.h" + +Cgi::Cgi( const char *strSource ) : + aContent( new HashFunctionString(), 151, true ) +{ + int length, j, k, mode = 0, slen = 0; + char hexbuf[3] = { 0, 0, 0 }; + char *buf, chr; + Item *cur = NULL; + int nCur = 0; + + if( strSource != NULL ) + { + loadContent( strSource ); + } + + if( ( getenv( "CONTENT_LENGTH" ) ) ) + { + if( !strcmp + ( getenv( "CONTENT_TYPE" ), + "application/x-www-form-urlencoded" ) ) + { + length = atoi( getenv( "CONTENT_LENGTH" ) ); + buf = new char[length + 1]; + fread( buf, 1, length, stdin ); + cur = new Item( ); + aVars.append( cur ); + cur->type = VAR_STDINPUT; + for( j = 0; j < length; j++ ) + { + switch ( buf[j] ) + { + case '=': + cur->name = new char[slen + 1]; + slen = 0; + break; + + case '&': + cur->value = new char[slen + 1]; + cur->len = slen; + slen = 0; + cur = new Item( ); + aVars.append( cur ); + cur->type = VAR_STDINPUT; + break; + + default: + switch ( buf[j] ) + { + case '%': /* per-cents mean a hex-code for an ASCII char */ + j += 2; + slen++; + break; + + default: /* Nothing special, move along, folks... */ + slen++; + break; + } + break; + } + } + cur->value = new char[slen + 1]; + cur->len = slen; + slen = 0; + mode = 0; + cur = ( Item * ) aVars.getAt( 0 ); + k = 0; + nCur = 0; + for( j = 0; j < length; j++ ) + { + switch ( buf[j] ) + { + case '=': + mode = 1; + k = 0; + break; + + case '&': + mode = 0; + k = 0; + nCur++; + cur = ( Item * ) aVars.getAt( nCur ); + break; + + default: + switch ( buf[j] ) + { + case '%': /* per-cents mean a hex-code for an ASCII char */ + hexbuf[0] = buf[++j]; + hexbuf[1] = buf[++j]; + chr = ( char ) ( strtol( hexbuf, NULL, 16 ) ); + break; + + case '+': /* Pluses mean spaces, odd, I know... */ + chr = ' '; + break; + + default: /* Nothing special, move along, folks... */ + chr = buf[j]; + break; + } + if( mode == 0 ) + { + cur->name[k] = chr; + cur->name[++k] = '\0'; + } + else + { + cur->value[k] = chr; + cur->value[++k] = '\0'; + } + break; + } + } + delete buf; + } + else if( !strncmp + ( getenv( "CONTENT_TYPE" ), "multipart/form-data;", 20 ) ) + { + char *boundary, *oname; + int blen, j, k, olen; + + length = atoi( getenv( "CONTENT_LENGTH" ) ); + buf = new char[length + 1]; + fread( buf, 1, length, stdin ); + for( blen = 0; buf[blen + 1] != '\n'; blen++ ); + boundary = new char[blen + 1]; + memcpy( boundary, buf, blen ); + boundary[blen] = '\0'; + j = blen + 2; + for( ;; ) + { + cur = new Item( ); + aVars.append( cur ); + cur->type = VAR_STDINPUT; + if( !strncmp + ( buf + j, "Content-Disposition: form-data; name=\"", + 38 ) ) + { + j += 38; + for( k = 0; buf[j + k] != '\"'; k++ ); + oname = cur->name = new char[k + 1]; + memcpy( cur->name, buf + j, k ); + olen = k; + cur->name[k] = '\0'; + j += k + 1; + if( !strncmp( buf + j, "; filename=\"", 12 ) ) /* Must be a file */ + { + /* Acquire file name */ + j += 12; + for( k = 0; buf[j + k] != '\"'; k++ ); + cur->value = new char[k + 1]; + memcpy( cur->value, buf + j, k ); + cur->value[k] = '\0'; + cur->len = k; + j += k + 3; + + /* Acquire content type */ + if( !strncmp( "Content-Type: ", buf + j, 14 ) ) + { + j += 14; + cur = new Item( ); + aVars.append( cur ); + cur->type = VAR_STDINPUT; + cur->name = new char[olen + 1]; + memcpy( cur->name, oname, olen + 1 ); + for( k = 0; buf[j + k + 1] != '\n'; k++ ); + cur->value = new char[k + 1]; + memcpy( cur->value, buf + j, k ); + cur->value[k] = '\0'; + cur->len = k; + j += k; + } + else + { + cur = new Item( ); + aVars.append( cur ); + cur->type = VAR_STDINPUT; + cur->name = new char[olen + 1]; + memcpy( cur->name, oname, olen + 1 ); + cur->value = new char[1]; + cur->value[0] = '\0'; + cur->len = 0; + } + j += 4; + + /* Acquire content */ + cur = new Item( ); + aVars.append( cur ); + cur->type = VAR_STDINPUT; + cur->name = new char[olen + 1]; + memcpy( cur->name, oname, olen + 1 ); + if( !strncmp( buf + j + k, boundary, blen ) ) + { + cur->value = new char[1]; + cur->value[0] = '\0'; + j += blen + 4; + } + else if( !strncmp( buf + j + k + 1, boundary, blen ) ) + { + cur->value = new char[1]; + cur->value[0] = '\0'; + j += blen + 5; + } + else + { + for( k = 0; + strncmp( buf + j + k + 2, boundary, blen ); + k++ ); + cur->value = new char[k + 1]; + memcpy( cur->value, buf + j, k ); + cur->value[k] = '\0'; + cur->len = k; + j += k + blen + 4; + } + } + else + { + j += 4; + for( k = 0; + strncmp( buf + j + k + 2, boundary, blen ); + k++ ); + cur->value = new char[k + 1]; + memcpy( cur->value, buf + j, k ); + cur->value[k] = '\0'; + cur->len = k; + j += k + blen + 4; + } + if( buf[j + 1] == '\n' ) + j += 2; + if( j >= length ) + break; + } + else + { + cur->name = ( char * ) "ERROR"; + cur->value = ( char * ) "Error here"; + } + } + } + delete buf; + } + + if( ( buf = getenv( "HTTP_COOKIE" ) ) ) + { + int lbase = aVars.getSize( ); + length = strlen( buf ); + cur = new Item( ); + aVars.append( cur ); + cur->type = VAR_COOKIE; + for( j = 0; j < length; j++ ) + { + switch ( buf[j] ) + { + case '=': + cur->name = new char[slen + 1]; + slen = 0; + break; + + case ';': + cur->value = new char[slen + 1]; + cur->len = slen; + slen = 0; + cur = new Item( ); + aVars.append( cur ); + cur->type = VAR_COOKIE; + break; + + default: + switch ( buf[j] ) + { + case '%': /* per-cents mean a hex-code for an ASCII char */ + j += 2; + slen++; + break; + + default: /* Nothing special, move along, folks... */ + slen++; + break; + } + break; + } + } + cur->value = new char[slen + 1]; + cur->len = slen; + slen = 0; + cur = ( Item * ) aVars.getAt( lbase ); + mode = 0; + k = 0; + nCur = lbase; + for( j = 0; j < length; j++ ) + { + switch ( buf[j] ) + { + case '=': + mode = 1; + k = 0; + break; + + case ';': + mode = 0; + k = 0; + nCur++; + cur = ( Item * ) aVars.getAt( nCur ); + break; + + default: + switch ( buf[j] ) + { + case '%': /* per-cents mean a hex-code for an ASCII char */ + hexbuf[0] = buf[++j]; + hexbuf[1] = buf[++j]; + chr = ( char ) ( strtol( hexbuf, NULL, 16 ) ); + break; + + case '+': /* Pluses mean spaces, odd, I know... */ + chr = ' '; + break; + + case ' ': + continue; + break; + + default: /* Nothing special, move along, folks... */ + chr = buf[j]; + break; + } + if( mode == 0 ) + { + cur->name[k] = chr; + cur->name[++k] = '\0'; + } + else + { + cur->value[k] = chr; + cur->value[++k] = '\0'; + } + break; + } + } + } + + if( ( buf = getenv( "QUERY_STRING" ) ) ) + { + if( strlen( buf ) > 0 ) + { + int lbase = aVars.getSize( ); + length = strlen( buf ); + cur = new Item( ); + aVars.append( cur ); + cur->type = VAR_CMDLINE; + for( j = 0; j < length; j++ ) + { + switch ( buf[j] ) + { + case '=': + cur->name = new char[slen + 1]; + slen = 0; + break; + + case '&': + cur->value = new char[slen + 1]; + cur->len = slen; + slen = 0; + cur = new Item( ); + aVars.append( cur ); + cur->type = VAR_CMDLINE; + break; + + default: + switch ( buf[j] ) + { + case '%': /* per-cents mean a hex-code for an ASCII char */ + j += 2; + slen++; + break; + + default: /* Nothing special, move along, folks... */ + slen++; + break; + } + break; + } + } + cur->value = new char[slen + 1]; + cur->len = slen; + slen = 0; + cur = ( Item * ) aVars.getAt( lbase ); + nCur = lbase; + mode = 0; + k = 0; + for( j = 0; j < length; j++ ) + { + switch ( buf[j] ) + { + case '=': + mode = 1; + k = 0; + break; + + case '&': + mode = 0; + k = 0; + nCur++; + cur = ( Item * ) aVars.getAt( nCur ); + break; + + default: + switch ( buf[j] ) + { + case '%': /* per-cents mean a hex-code for an ASCII char */ + hexbuf[0] = buf[++j]; + hexbuf[1] = buf[++j]; + chr = ( char ) ( strtol( hexbuf, NULL, 16 ) ); + break; + + case '+': /* Pluses mean spaces, odd, I know... */ + chr = ' '; + break; + + default: /* Nothing special, move along, folks... */ + chr = buf[j]; + break; + } + if( mode == 0 ) + { + cur->name[k] = chr; + cur->name[++k] = '\0'; + } + else + { + cur->value[k] = chr; + cur->value[++k] = '\0'; + } + break; + } + } + } + } +} + +Cgi::~Cgi( ) +{ +} + +char *Cgi::getVarValue( const char *name, int skip, unsigned char type ) +{ + for( int j = 0; j < aVars.getSize( ); j++ ) + { + Item *cur = ( Item * ) aVars.getAt( j ); + if( !strcmp( cur->name, name ) ) + { + if( ( cur->type & type ) ) + { + if( skip <= 0 ) + { + return cur->value; + } + else + { + skip--; + } + } + } + } + return NULL; +} + +int Cgi::getVarLength( const char *name, int skip, unsigned char type ) +{ + for( int j = 0; j < aVars.getSize( ); j++ ) + { + Item *cur = ( Item * ) aVars.getAt( j ); + if( !strcmp( cur->name, name ) ) + { + if( ( cur->type & type ) ) + { + if( skip <= 0 ) + { + return cur->len; + } + else + { + skip--; + } + } + } + } + return -1; +} + +void Cgi::writeDebugInfo() +{ + printf( "
\n" );
+    printf( "0x%02X - stdInput | 0x%02X - cookie | 0x%02X - cmdLine\n\n",
+             VAR_STDINPUT, VAR_COOKIE, VAR_CMDLINE );
+    for( int j = 0; j < aVars.getSize(  ); j++ )
+    {
+        Item *item = ( Item * ) aVars.getAt( j );
+        printf("[%s] = \"%s\" [0x%02X]\n", item->name,
+                 item->value, item->type );
+    }
+    printf( "
\n" ); +} + +void Cgi::writeContentHeader( int type ) +{ + switch( type ) + { + case headerHTML: + printf("Content-type: text/html\n\n"); + break; + } +} + +void Cgi::writeContent( const char *name, ...) +{ + char *templ = (char *)aContent.get(name); + + if( templ ) + { + va_list ap; + + va_start (ap, name); + vprintf (templ, ap); + va_end (ap); + } + else + { + printf("Error finding content labeled \"%s\"\n", name ); + } +} + +void Cgi::loadContent( const char *strSource ) +{ + FILE *fh = NULL; + if( strSource == NULL ) + { + extern char *program_invocation_short_name; + char *tmpName = new char[strlen(program_invocation_short_name)+10]; + memset( tmpName, 0, strlen(program_invocation_short_name)+10 ); + strcpy( tmpName, program_invocation_short_name ); + strcat( tmpName, ".content" ); + fh = fopen( tmpName, "rt" ); + delete tmpName; + } + else + { + fh = fopen( strSource, "rt" ); + } + + if( fh == NULL ) return; + + struct stat xStats; + + fstat( fileno( fh ), &xStats ); + + char *bigBuf = new char[xStats.st_size+1]; + memset( bigBuf, 0, xStats.st_size+1 ); + fread( bigBuf, 1, xStats.st_size, fh ); + fclose( fh ); + + // Now we can actually load stuff from the file, first we need to make us up a format... + int lSize=0; + struct Content + { + char *name; + char *value; + } xCont; + int j = 0; + while( j < xStats.st_size ) + { + // We're looking for a content-block init statement + for( ; j < xStats.st_size; j++ ) + { + if( bigBuf[j] == '#' ) + { + if( bigBuf[j+1] == '{' ) + { + break; + } + } + } + j=j+2; + if( j >= xStats.st_size ) break; + for( ; bigBuf[j] == ' ' || bigBuf[j] == '\t'; j++ ); + for( lSize = 0; lSize+j < xStats.st_size && bigBuf[lSize+j] != '\n' && bigBuf[lSize+j] != '\r'; lSize++ ); + xCont.name = new char[lSize+1]; + memset( xCont.name, 0, lSize+1 ); + memcpy( xCont.name, &bigBuf[j], lSize ); + j += lSize+1; + + for( lSize = 0; lSize+j < xStats.st_size; lSize++ ) + { + if( bigBuf[lSize+j] == '#' ) + { + if( bigBuf[lSize+j+1] == '}' ) + { + break; + } + } + } + xCont.value = new char[lSize+1]; + memset( xCont.value, 0, lSize+1 ); + memcpy( xCont.value, &bigBuf[j], lSize ); + + aContent.insert( xCont.name, xCont.value ); + + j += lSize + 2; + } +} + +void Cgi::writeCookie( char const *name, char const *value, char const *expires, char const *path, char const *domain, bool secure ) +{ + printf("Set-Cookie: %s=%s", name, value ); + + if( expires != NULL ) + { + printf("; expires=%s", expires ); + } + + if( path != NULL ) + { + printf("; path=%s", path ); + } + + if( domain != NULL ) + { + printf("; domain=%s", domain ); + } + + if( secure ) + { + printf("; secure"); + } + + printf("\n"); +} diff --git a/src/old/cgi.h b/src/old/cgi.h new file mode 100644 index 0000000..01142b5 --- /dev/null +++ b/src/old/cgi.h @@ -0,0 +1,196 @@ +/**\file cgi.h + * Describes extra params needed to use the Cgi class as well as the class + * itself. + *@author Mike Buland + */ + +#include "linkedlist.h" +#include "hashtable.h" +#include "hashfunctionstring.h" + +#define VAR_STDINPUT 0x01 /**< Variable came from stdinput, web form */ +#define VAR_COOKIE 0x02 /**< Variable came from a cookie */ +#define VAR_CMDLINE 0x04 /**< Variable came from commandline / uri */ +#define VAR_ANY 0xFF /**< Mask including all other types */ + +/** + * Cgi header processor originally designed for apache cgi programs. When used + * from apache with what I beleive are some sort of standard set of command + * line parameters and environment variables. This always worked for all of my + * purposes. This class will automatically extract all data from the system + * that you need and places it into tables and things for easy access. + * There are three types of input that data can come from, StandardInput, + * CommandLine, and Cookies. StandardInput is when you get formdata in + * multi-part forms, Cookies should usually be cookies that you set, and + * command line is everything after the question mark in the URL. + * This also contains some simple helpers for putting templated data into the + * HTTP data feed. + *@author Mike Buland + */ +class Cgi +{ +public: + /** + * Create a complete CGI object, this object will automatically read data + * from all available sources and be ready for use on the very next line! + * If strSource is filled in it will also automatically read in a content + * file, which is a simple file format containing named blocks of reusable + * templates. + *@param strSource Set to a filename in order to load up a content file. + */ + Cgi( const char *strSource = NULL ); + + /** + * Destroy the cgi object. + */ + virtual ~Cgi( ); + + /** + * Get's the value for a variable as a character string. The name is the + * name that was given on the URL or in the form or cookie. Skip can be + * set to any value above zero to retreive subsequent variables with the + * same name. The most obvious use of this is when dealing with file + * uploads, each file upload sends you three variables with the same name + * and different content. Finally the variable type determines where you + * will accept this variable from. This is generally a bit of a security + * thing, if you store login info in a cookie and don't want people getting + * in by faking the appropriate URL. + *@param name The name of the variable you wish to retreive. + *@param skip THe number of variables with the given name to skip before + * returning something meaningful. The only way to determine how many + * variables with the same name there are is to skip until you get a NULL + * value returned. + *@param type Can be set to any combination of VAR_STDINPUT, VAR_COOKIE, + * VAR_CMDLINE, or just VAR_ANY. This takes bitflags, so you can or the + * values together. If a variable is found but came from the wrong source + * it won't match any other criteria and will be treated as though it + * doesn't exist. + *@returns A null-terminated string representing the value of the requested + * variable, or NULL if the variable did not exist. If a variable does + * exist but has no value the string returned will start with a NULL char, + * but be a valid string. + */ + char *getVarValue( const char *name, int skip=0, unsigned char type=VAR_ANY ); + + /** + * This functions identically in every way to getVarValue, except that + * instead of returning a pointer to the variable's value, it returns the + * length of the variable's value string. The params are the same and so + * a call to both functions with the same params should yeild a value and + * a corresponding length. + *@param name The name of the variable you wish to retreive. + *@param skip THe number of variables with the given name to skip before + * returning something meaningful. The only way to determine how many + * variables with the same name there are is to skip until you get a NULL + * value returned. + *@param type Can be set to any combination of VAR_STDINPUT, VAR_COOKIE, + * VAR_CMDLINE, or just VAR_ANY. This takes bitflags, so you can or the + * values together. If a variable is found but came from the wrong source + * it won't match any other criteria and will be treated as though it + * doesn't exist. + *@returns The length of the value-string of the requested variable. If + * the requested variable is not found, -1 is returned. + */ + int getVarLength( const char *name, int skip=0, unsigned char type=VAR_ANY ); + + /** + * A handy little function that writes a load of debug info related to + * parsing CGI params to the standard output in html. This is generally + * best used at the end of a page. + */ + void writeDebugInfo(); + + /** + * Write a content header to the standard output. This should also be the + * first thing that you do (except for writing cookies) after initializing + * the Cgi class. You can select a type of header or content from the + * header enum, and a properly formatted header will show up on the + * standard output. + *@param type Any value from the header enum in this class. The default is + * to write an html header, probably the most common as well. + */ + void writeContentHeader( int type=headerHTML ); + + /** + * Write content to the stnadard output. The content variable should have + * been loaded during construction of the Cgi object or with the + * loadContent function. The content variable should be formatted just like + * a printf string, so that anything you want to put into it will have a % + * symbol replacement code, like %s, %d, etc. Since this actually uses a + * type of printf function everything from those docs work here. + *@param name The name of the content variable to format and write to + * stnadard output. + *@param ... As many params as you want to include, ala printf. + */ + void writeContent( const char *name, ...); + + /** + * Load a content file. I don't want to describe the format here, you can + * just read the code or find an example for now. Sorry. + *@param strSource The name of the file to open and read in to get the + * content loaded. + */ + void loadContent( const char *strSource = NULL ); + + /** + * Write a cookie-set header to the output stream. This should be done + * before any other content-headers are written. The specifics of this + * function are very simple, since I rely on the user's understanding of + * how standard HTTP/1.1 or HTTP/1.0 cookie syntax works. If you don't + * care then just use the name and value and the defaults should keep you + * in good stead for a long time. + *@param name The name of the cookie variable to set. + *@param value The value to set to that variable. + *@param expires The formatted string value for the date and time this + * cookie should expire. A NULL here will put a "until the browser closes" + * tag in. + *@param path The path (URL) that this cookie belongs to. If you run a lot + * of hosted servers or sub-sites that may have some shared URL bits then + * you may want to set this. The cookie should only be sent to URL's that + * match this as their first part. + *@param domain The domain that is allowed to read this, if not set, it's + * the domain the web browser contacted when they got the cookie. + *@param secure I'm not sure, I think it's something to tell if the cookie + * is safe to keep because any potentially valuable data is encypted or + * otherwise unusable. I could be wrong. + */ + void writeCookie( char const *name, char const *value, char const *expires=NULL, char const *path=NULL, char const *domain=NULL, bool secure=false ); + + /** + * A simple helper class to contain variable data. + */ + class Item + { + public: + /** + * Build an empty Item. + */ + Item( ) + { + name = NULL; + value = NULL; + len = 0; + type = 0; + } + /** The name of the item. */ + char *name; + /** The value of the item. */ + char *value; + /** The length of the item's value. */ + unsigned long len; + /** The type of the item (where it came from). */ + unsigned char type; + }; + + /** Header values */ + enum + { + headerHTML + }; + +private: + /** Keeps track of all contained variables. */ + LinkedList aVars; + /** Keeps track of all content variables. */ + HashTable aContent; +}; diff --git a/src/old/configmanagerbase.cpp b/src/old/configmanagerbase.cpp new file mode 100644 index 0000000..ac55fe0 --- /dev/null +++ b/src/old/configmanagerbase.cpp @@ -0,0 +1,63 @@ +#include +#include +#include "xmlnode.h" +#include "xmlfilereader.h" +#include "configmanagerbase.h" + +ConfigManagerBase::ConfigManagerBase() +{ +} + +ConfigManagerBase::~ConfigManagerBase() +{ +} + +void ConfigManagerBase::addSearchPath( const std::string &sPath ) +{ + lSearchPath.push_back( sPath ); +} + +void ConfigManagerBase::loadConfig( const std::string &sFileName, const char *lpProfile ) +{ + // Try a few locations... + std::list::const_iterator i; + for( i = lSearchPath.begin(); i != lSearchPath.end(); i++ ) + { + if( parseConfig( (*i + sFileName).c_str(), lpProfile ) ) + { + break; + } + } +} + +bool ConfigManagerBase::parseConfig( const char *lpFileName, const char *lpProfile ) +{ + XmlNode *pRoot, *pCur; + XmlFileReader doc( lpFileName ); + + pRoot = doc.getRoot(); + if( pRoot == NULL ) + { + return false; + } + + if( strcmp("config", pRoot->getName() ) ) + { + return false; + } + + for( int j = 0;; j++ ) + { + pCur = pRoot->getChild( "profile", j ); + if( pCur == NULL ) + return false; + + if( !strcmp( pCur->getProperty("id"), lpProfile ) ) + { + return processProfile( pCur ); + } + } + + return false; +} + diff --git a/src/old/configmanagerbase.h b/src/old/configmanagerbase.h new file mode 100644 index 0000000..381cc1f --- /dev/null +++ b/src/old/configmanagerbase.h @@ -0,0 +1,24 @@ +#ifndef CONFIG_MANAGER_BASE_H +#define CONFIG_MANAGER_BASE_H + +#include +#include + +class ConfigManagerBase +{ +public: + ConfigManagerBase(); + virtual ~ConfigManagerBase(); + +public: + void addSearchPath( const std::string &sPath ); + void loadConfig( const std::string &sFileName, const char *lpProfile="default" ); + +private: + bool parseConfig( const char *lpFileName, const char *lpProfile ); + virtual bool processProfile( class XmlNode *pBase )=0; + + std::list lSearchPath; +}; + +#endif diff --git a/src/old/confpair.cpp b/src/old/confpair.cpp new file mode 100644 index 0000000..4741401 --- /dev/null +++ b/src/old/confpair.cpp @@ -0,0 +1,2 @@ +#include "confpair.h" + diff --git a/src/old/confpair.h b/src/old/confpair.h new file mode 100644 index 0000000..56eb06e --- /dev/null +++ b/src/old/confpair.h @@ -0,0 +1,81 @@ +#ifndef CONF_PAIR_H +#define CONF_PAIR_H + +#include +#include +#include +#include "confpairbase.h" + +/** + * + */ +template +class ConfPair : public ConfPairBase +{ +public: + ConfPair( const std::string &sName ) : + sName( sName ) + { } + + virtual ~ConfPair() + { } + + T &value() + { + return tValue; + } + + const std::string &name() + { + return sName; + } + + virtual void setFromString( const std::string &sStr ) + { + std::stringstream(sStr) >> tValue; + } + + virtual std::string getAsString() + { + std::stringstream tmp; + tmp << tValue; + return tmp.str(); + } + +private: + std::string sName; + T tValue; +}; + +template<> +void ConfPair::setFromString( const std::string &sStr ) +{ + tValue = sStr; +} + +template<> +std::string ConfPair::getAsString() +{ + return tValue; +} + +template<> +void ConfPair::setFromString( const std::string &sStr ) +{ + if( !strcasecmp( sStr.c_str(), "true" ) || + !strcasecmp( sStr.c_str(), "yes" ) || + !strcasecmp( sStr.c_str(), "on" ) ) + tValue = true; + else + tValue = false; +} + +template<> +std::string ConfPair::getAsString() +{ + if( tValue == true ) + return "True"; + return "False"; +} + +#endif diff --git a/src/old/confpairbase.cpp b/src/old/confpairbase.cpp new file mode 100644 index 0000000..1203dc0 --- /dev/null +++ b/src/old/confpairbase.cpp @@ -0,0 +1,17 @@ +#include "confpairbase.h" + +ConfPairBase::ConfPairBase() +{ +} + +ConfPairBase::~ConfPairBase() +{ +} + +ConfPairBase &ConfPairBase::operator=( const std::string &s ) +{ + setFromString( s ); + + return *this; +} + diff --git a/src/old/confpairbase.h b/src/old/confpairbase.h new file mode 100644 index 0000000..2530756 --- /dev/null +++ b/src/old/confpairbase.h @@ -0,0 +1,24 @@ +#ifndef CONF_PAIR_BASE_H +#define CONF_PAIR_BASE_H + +#include +#include +#include +#include + +class ConfPairBase +{ +public: + ConfPairBase(); + virtual ~ConfPairBase(); + + virtual void setFromString( const std::string &sStr )=0; + virtual std::string getAsString()=0; + + ConfPairBase &operator=( const std::string &s ); + +private: + +}; + +#endif diff --git a/src/old/conftree.cpp b/src/old/conftree.cpp new file mode 100644 index 0000000..d9a3a3f --- /dev/null +++ b/src/old/conftree.cpp @@ -0,0 +1,9 @@ +#include "conftree.h" + +ConfTree::ConfTree() +{ +} + +ConfTree::~ConfTree() +{ +} diff --git a/src/old/conftree.h b/src/old/conftree.h new file mode 100644 index 0000000..197b1ef --- /dev/null +++ b/src/old/conftree.h @@ -0,0 +1,19 @@ +#ifndef CONF_TREE_H +#define CONF_TREE_H + +#include + +/** + * + */ +class ConfTree +{ +public: + ConfTree(); + virtual ~ConfTree(); + +private: + +}; + +#endif diff --git a/src/old/connection.cpp b/src/old/connection.cpp new file mode 100644 index 0000000..efef144 --- /dev/null +++ b/src/old/connection.cpp @@ -0,0 +1,564 @@ +#include "connection.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "exceptions.h" + +// Read buffer size...maybe fix wierd issues... +#define RBS (1024*10) + +Connection::Connection() +{ + nSocket = -1; + bActive = false; + bDisconnectMe = false; + pProtocol = NULL; +} + +Connection::~Connection() +{ + if( pProtocol != NULL ) delete pProtocol; +} + +void Connection::ensureCapacity( int nSize ) +{ + xOutputBuf.ensureCapacity( nSize ); +} + +bool Connection::appendOutput( const char *lpOutput, int nSize ) +{ + return xOutputBuf.appendData( lpOutput, nSize ); +} + +bool Connection::appendOutput( const char lOutput ) +{ + return xOutputBuf.appendData( lOutput ); +} + +bool Connection::appendOutput( const short lOutput ) +{ + return xOutputBuf.appendData( lOutput ); +} + +bool Connection::appendOutput( const int lOutput ) +{ + return xOutputBuf.appendData( lOutput ); +} + +bool Connection::appendOutput( const long lOutput ) +{ + return xOutputBuf.appendData( lOutput ); +} + +bool Connection::appendOutput( const float lOutput ) +{ + return xOutputBuf.appendData( lOutput ); +} + +bool Connection::appendOutput( const double lOutput ) +{ + return xOutputBuf.appendData( lOutput ); +} + +bool Connection::appendOutput( const unsigned char lOutput ) +{ + return xOutputBuf.appendData( lOutput ); +} + +bool Connection::appendOutput( const unsigned short lOutput ) +{ + return xOutputBuf.appendData( lOutput ); +} + +bool Connection::appendOutput( const unsigned long lOutput ) +{ + return xOutputBuf.appendData( lOutput ); +} + +bool Connection::appendOutput( const unsigned int lOutput ) +{ + return xOutputBuf.appendData( lOutput ); +} + +bool Connection::appendInput( const char *lpInput, int nSize ) +{ + return xInputBuf.appendData( lpInput, nSize ); +} + +int Connection::scanInputFor( char cTarget ) +{ + const char *lpTmp = xInputBuf.getData(); + int jMax = xInputBuf.getLength(); + + for( int j = 0; j < jMax; j++ ) + { + if( lpTmp[j] == cTarget ) + { + return j; + } + } + + return -1; +} + +const char *Connection::getOutput() +{ + return xOutputBuf.getData(); +} + +const char *Connection::getInput() +{ + return xInputBuf.getData(); +} + +void Connection::setSocket( int nNewSocket ) +{ + nSocket = nNewSocket; +} + +int Connection::getSocket() +{ + return nSocket; +} + +bool Connection::isActive() +{ + return bActive; +} + +void Connection::close() +{ + //printf("Close called, socket is: %s\n", bActive?"Active":"Inactive" ); + if( bActive ) + { + fsync( nSocket ); + ::close( nSocket ); + //printf("Socket closed.\n"); + } + bActive = false; + //nSocket = -1; + xInputBuf.clearData(); + xOutputBuf.clearData(); + if( pProtocol != NULL ) + { + delete pProtocol; + pProtocol = NULL; + } +} + +bool Connection::open( int nNewSocket ) +{ + bActive = true; + setSocket( nNewSocket ); + bDisconnectMe = false; + + return true; +} + +bool Connection::open( const char *sAddr, int nPort, int nSec ) +{ + struct sockaddr_in xServerName; + bActive = false; + + /* Create the socket. */ + nSocket = socket( PF_INET, SOCK_STREAM, 0 ); + + if( nSocket < 0 ) + { + bActive = false; + return false; + } + + // These lines set the socket to non-blocking, a good thing? + int flags; + flags = fcntl(nSocket, F_GETFL, 0); + flags |= O_NONBLOCK; + if (fcntl(nSocket, F_SETFL, flags) < 0) + { + return false; + } + + /* Connect to the server. */ + //printf("Resolving hostname (%s)...\n", sAddr ); + { + struct hostent *hostinfo; + + xServerName.sin_family = AF_INET; + xServerName.sin_port = htons( nPort ); + hostinfo = gethostbyname( sAddr ); + if (hostinfo == NULL) + { + return false; + } + xServerName.sin_addr = *(struct in_addr *) hostinfo->h_addr; + } + + //printf("Making actual connection..."); + //fflush( stdout ); + connect( + nSocket, + (struct sockaddr *)&xServerName, + sizeof(xServerName) + ); + //printf("Connected.\n"); + + bActive = true; + bDisconnectMe = false; + + if( nSec > 0 ) + { + fd_set rfds, wfds, efds; + int retval; + + FD_ZERO(&rfds); + FD_SET(nSocket, &rfds); + FD_ZERO(&wfds); + FD_SET(nSocket, &wfds); + FD_ZERO(&efds); + FD_SET(nSocket, &efds); + + struct timeval tv; + tv.tv_sec = nSec; + tv.tv_usec = 0; + + retval = select( nSocket+1, &rfds, &wfds, &efds, &tv ); + + if( retval == 0 ) + { + close(); + throw ExceptionBase("Connection timeout.\n"); + } + + } + + /* + if( ret < 0 ) + { + return false; + }*/ + + return true; +} + +int Connection::readInput() +{ + char buffer[RBS]; + int nbytes; + int nTotalRead=0; + + for(;;) + { + //memset( buffer, 0, RBS ); + + nbytes = read( nSocket, buffer, RBS ); + if( nbytes < 0 && errno != 0 && errno != EAGAIN ) + { + //printf("errno: %d, %s\n", errno, strerror( errno ) ); + /* Read error. */ + //perror("readInput"); + throw ConnectionException( excodeReadError, "Read error: %s", strerror( errno ) ); + } + else + { + if( nbytes <= 0 ) + break; + nTotalRead += nbytes; + appendInput( buffer, nbytes ); + /* Data read. */ + if( nbytes < RBS ) + { + break; + } + + /* New test, if data is divisible by RBS bytes on some libs the + * read could block, this keeps it from happening. + */ + { + fd_set rfds; + FD_ZERO(&rfds); + FD_SET(nSocket, &rfds); + struct timeval tv = { 0, 0 }; + int retval = select( nSocket+1, &rfds, NULL, NULL, &tv ); + if( retval == -1 ) + throw ConnectionException( + excodeBadReadError, + "Bad Read error" + ); + if( !FD_ISSET( nSocket, &rfds ) ) + break; + } + + } + } + + if( pProtocol != NULL && nTotalRead > 0 ) + { + pProtocol->onNewData(); + } + + return nTotalRead; +} + +bool Connection::readInput( int nSec, int nUSec, int *pnSecBack, int *pnUSecBack ) +{ + fd_set rfds, efds; + struct timeval tv, start, end; + struct timezone tz; + int retval; + + gettimeofday( &start, &tz ); + + FD_ZERO(&rfds); + FD_SET(nSocket, &rfds); + FD_ZERO(&efds); + FD_SET(nSocket, &efds); + + tv.tv_sec = nSec; + tv.tv_usec = nUSec; + + //printf("Starting at %d %d\n", nSec, nUSec ); + retval = select( nSocket+1, &rfds, NULL, NULL, &tv ); + + if( retval == -1 ) + { + // Oh my god!!! some kind of horrible problem!!!! + throw ConnectionException( excodeBadReadError, "Bad Read error"); + return false; + } + else if( retval ) + { + //printf("retval=%d, nSocket=%d,%d, sec=%d, usec=%d\n", retval, nSocket, FD_ISSET( nSocket, &rfds ), tv.tv_sec, tv.tv_usec ); + // None of them have data, but the connection is still active. + if( FD_ISSET( nSocket, &rfds ) ) + { + if( readInput() == 0 ) + { + throw ConnectionException( excodeConnectionClosed, "Connection closed"); } + } + } + + gettimeofday( &end, &tz ); + + int st, ust; + st = nSec - ( end.tv_sec - start.tv_sec ); + if( ( end.tv_usec - start.tv_usec ) > nUSec ) + { + (st)--; + ust = 1000000 - (end.tv_usec - start.tv_usec); + } + else + { + ust = nUSec - (end.tv_usec - start.tv_usec); + } + + if( st < 0 ) + { + st = ust = 0; + } + + if( pnSecBack ) + { + *pnSecBack = st; + *pnUSecBack = ust; + } + + //printf("New time: %d %d\n", *pnSecBack, *pnUSecBack ); + + return true; +} + +void Connection::waitForInput( int nBytesIn, int nSec, int nUSec ) +{ + int rlen = getInputAmnt(); + + if( rlen >= nBytesIn ) + return; + + while( rlen < nBytesIn ) + { + if( nSec == 0 && nUSec == 0 ) + { + throw ConnectionException( excodeSocketTimeout, "Timed out while waiting for %d bytes.", nBytesIn ); + } + readInput( nSec, nUSec, &nSec, &nUSec ); + rlen = getInputAmnt(); + } +} + +bool Connection::clearOutput() +{ + return xOutputBuf.clearData(); +} + +bool Connection::clearInput() +{ + return xInputBuf.clearData(); +} + +#define min( a, b ) ((asetConnection( this ); +} + +int Connection::getInputAmnt() +{ + return xInputBuf.getLength(); +} + +int Connection::getOutputAmnt() +{ + return xOutputBuf.getLength(); +} + +class Protocol *Connection::getProtocol() +{ + return pProtocol; +} + +void Connection::printInputDebug( const char *lpPrefix, FILE *fh, int nBytesMax ) +{ + printDataDebug( + (const unsigned char *)xInputBuf.getData(), + xInputBuf.getLength(), + "input", + lpPrefix, + fh, + nBytesMax + ); +} + +void Connection::printOutputDebug( const char *lpPrefix, FILE *fh, int nBytesMax ) +{ + printDataDebug( + (const unsigned char *)xOutputBuf.getData(), + xOutputBuf.getLength(), + "output", + lpPrefix, + fh, + nBytesMax + ); +} + +void Connection::printDataDebug( const unsigned char *pData, long nDataLen, const char *lpName, const char *lpPrefix, FILE *fh, int nBytesMax ) +{ + if( nBytesMax > 0 ) + { + nDataLen = (nBytesMax32 && pData[j+k]<=128)?(pData[j+k]):('.') ); + } + fprintf( fh, "\n"); + j += kmax; + if( j >= nDataLen ) break; + } + fprintf( fh, lpPrefix ); + for( int l = 0; l < 8*3+2*8+2; l++ ) fprintf( fh, (l!=8*3)?("-"):("+") ); fprintf( fh, "\n"); +} + diff --git a/src/old/connection.h b/src/old/connection.h new file mode 100644 index 0000000..0e991c7 --- /dev/null +++ b/src/old/connection.h @@ -0,0 +1,411 @@ +/**\file + * Contains the Connection class. + *@author Mike Buland + */ + +#ifndef CONNECTION_H +#define CONNECTION_H + +#include "multilog.h" +#include "flexbuf.h" +#include "protocol.h" + +/** Represents a single connection on a network. While these connections + * may be treated more or less just like files, occasionally problems arise + * when writing data at any time you feel like. Therefore you run all your + * data through a Connection, which buffers all data and makes sure no + * buffers are exceeded and nothing inappropriate for the recipient of the + * data is sent. + *@author Mike Buland + */ +class Connection +{ +public: + /** + * Construct a blank and non-connected Connection. The created object is + * not yet connected to anything, and most of the functions except open are + * unusable. + */ + Connection(); + + /** + * Destroy the connection, clean up all pending data requests and close the + * contained socket. This does not send out pending data, especially since + * such an operation could take considerable time, depending on the pending + * data and state of the receiving end. + */ + virtual ~Connection(); + + /** + * Open a connection to a remote server. This sets up this connection as + * a client instead of a server and does all of the work that needs to be + * done to actually open an INET_AF connection, which is a lot of work. + *@param sAddr The address to connect to. This can be in any format + * normally understood by your system to be an address, ip, domain name, + * etc. + *@param nPort The port number to connect to on the remote server. + *@returns True if the connection was successful and everything is setup, + * false if there were any of a dozen errors and the connection is not set. + *@todo Make this function add log entries to a standard MultiLog if + * something goes wrong. + */ + bool open( const char *sAddr, int nPort, int nSec=30 ); + + void ensureCapacity( int nSize ); + + /** Append the given data to the output. The data is presumed to be null + * terminated. To put binary data into the stream, use the other + * appendOutput function. This should be the only method used to + * communicate with the socket. + *@param lpOutput The data to add to the output queue. + *@param nSize How much data is in the lpOutput buffer. If this value + * is -1 then the program treats lpOutput as a null-terminated string. + *@returns True if everything is ok, false otherwise. + */ + bool appendOutput( const char *lpOutput, int nSize=-1 ); + + /** + * Append the character to the output. + *@param lOutput The character to add to the output queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendOutput( const char lOutput ); + + /** + * Append the short to the output. + *@param lOutput The short to add to the output queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendOutput( const short lOutput ); + + /** + * Append the int to the output. + *@param lOutput The int to add to the output queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendOutput( const int lOutput ); + + /** + * Append the long to the output. + *@param lOutput The long to add to the output queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendOutput( const long lOutput ); + + /** + * Append the float to the output. + *@param lOutput The float to add to the output queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendOutput( const float lOutput ); + + /** + * Append the double to the output. + *@param lOutput The double to add to the output queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendOutput( const double lOutput ); + + /** + * Append the unsigned char to the output. + *@param lOutput The unsigned char to add to the output queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendOutput( const unsigned char lOutput ); + + /** + * Append the unsigned short to the output. + *@param lOutput The unsigned short to add to the output queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendOutput( const unsigned short lOutput ); + + /** + * Append the unsigned int to the output. + *@param lOutput The unsigned int to add to the output queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendOutput( const unsigned int lOutput ); + + /** + * Append the unsigned long to the output. + *@param lOutput The unsigned long to add to the output queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendOutput( const unsigned long lOutput ); + + /** + * Writes all input data in the buffer in a dual-view ascii and hex display + * to a file. There are a number of options that also help with debugging. + *@param lpPrefix Text to be added to the begining of every line written + * out. The default is a blank string. + *@param fh The file to write the data to in text mode. This is stdout by + * default, but could be any already open file handle. + *@param nBytesMax The maximum number of bytes to write to the output. The + * amount of data can be overwhelming sometimes, so you can limit it. The + * default value is -1, which is also unlimited. + */ + void printInputDebug( const char *lpPrefix="", FILE *fh=stdout, int nBytesMax=-1 ); + + /** + * Writes all output data in the buffer in a dual-view ascii and hex display + * to a file. There are a number of options that also help with debugging. + *@param lpPrefix Text to be added to the begining of every line written + * out. The default is a blank string. + *@param fh The file to write the data to in text mode. This is stdout by + * default, but could be any already open file handle. + *@param nBytesMax The maximum number of bytes to write to the output. The + * amount of data can be overwhelming sometimes, so you can limit it. The + * default value is -1, which is also unlimited. + */ + void printOutputDebug( const char *lpPrefix="", FILE *fh=stdout, int nBytesMax=-1 ); + + /** + * This is the low-level generic function that is called by both + * printInputDebug and printOutputDebug. It works effectively just like + * both of them, except that you can give it a raw pointer to the data to + * print out. This probably doesn't belong in this class, but this was + * where I was when I needed it. + *@param pData A pointer to the data to write. This is not treated as a + * null terminated string, so make sure that the nDataLen param is set + * properly. + *@param nDataLen The number of bytes that are in pData and that you want to + * see. + *@param lpName The name of the data, this is used in the header where it + * says "Displaying nnn bytes of ." A good example would be input + * or output. + *@param lpPrefix Text to put before every line output. This just makes it + * easier to tell large blocks apart in the output. + *@param fh The file handle to write all data to. + *@param nBytesMax The maximum number of bytes. This parameter is stupid. + * If it is set to -1, then nDataLen is used, otherwise the smaller value is + * used as the number of bytes to output. + *@todo Put this function somewhere more deserving. + *@todo Remove the nBytesMax param, we need that in the other functions, + * not this one! + */ + void printDataDebug( const unsigned char *pData, long nDataLen, const char *lpName, const char *lpPrefix, FILE *fh, int nBytesMax ); + + /** Append the given data to the input. The data is presumed to be null + * terminated. To put binary data into the stream, use the other + * appendInput function. This is mainly used by internal routines. + *@param lpInput The data to add to the input queue. + *@param nSize How much data is in the lpInput buffer. If this value + * is -1 then the program treats lpOutput as a null-terminated string. + *@returns True if everything is ok, false otherwise. + */ + bool appendInput( const char *lpInput, int nSize=-1 ); + + /** Searches through the current pending input for a certain character. + * This is useful for finding out where exactly the end of a line is, for + * example, to see if a command has been entered yet. + *@param cTarget The character to search for. + *@returns The position of the target relative to the begining of the input + * or -1 if the target wasn't found. + */ + int scanInputFor( char cTarget ); + + /** Gets a pointer to the output buffer. This is mainly used by internal + * routines, and is cleared every click when data is sent out again. + *@returns A pointer to the buffer holding the pending output data. + */ + const char *getOutput(); + + /** Gets a pointer to the start of the input buffer's active data + * section. Use this to gain access to the input you need to do + * your job. + *@returns A pointer to the data in the input buffer. Do not delete this. + */ + const char *getInput(); + + /** Clears all pending output, this is mainly just used internally. + *@returns True if operation was a success, otherwise false. + */ + bool clearOutput(); + + /** Clears all pending input, weather it's been used or not. Please + * refrain from calling this during normal operation, use usedInput + * instead, it's much safer. + *@returns True if the operation was a success, false otherwise. + */ + bool clearInput(); + + /** Sets the socket that should be used internally. + *@param nNewSocket The new socket to work with. + */ + void setSocket( int nNewSocket ); + + /** Gets the handle (number) of the working socket. This can be a + * dangerous function to call, please refrain from calling it directly + * if any alternative can be found. + *@returns The number of the working socket. + */ + int getSocket(); + + /** Determines if the connection is still active. + *@returns True if the connection is active, false otherwise. + */ + bool isActive(); + + /** Clears all buffers and sets up the connection to be reused. + * Does not actually close the socket, that's handled by the + * ConnectionManager + */ + void close(); + + /** Opens a socket. Really just sets up the connection for use since + * the socket itself was created and opened by the ConnectionManager. + * This also calls setSocket so you don't have to. + *@param nNewSocket The socket to assosiate with. + */ + bool open( int nNewSocket ); + + /** + * Reads all pending input from the connection. If this is called outside + * of the ConnectionManager it will usually block indefinately waiting for + * new data. The only way to change this behaviour is to modify the socket + * low-level when you connect it manually, or, preferably use the other + * readInput function to control blocking time. + *@returns True socket is still connected, otherwise false. + */ + int readInput(); + + /** + * Reads all pending input from the connection, blocking up to nSec + * seconds and nUSec micro-seconds for the data. This uses select to + * simulate blocking, but has the same effect as standard io blocking. + * If you don't want to block, just set both values to zero. The back + * parameters are optional, set to null to not use them. The variables + * you pass in through the back parameters will contain the remaining + * time if data arrived before the max timeout was reached. + *@param nSec Max seconds to wait. + *@param nUSec Max micro-seconds to wait. + *@param pnSecBack The number of seconds remaining. + *@param pnUSecBack The number of micro-seconds remaining. + */ + bool readInput( int nSec, int nUSec, int *pnSecBack=NULL, int *pnUSecBack=NULL ); + + /** + * Waits until at least nBytesIn are read into the input buffer and ready + * to be used. Wait at most nSec seconds plus nUSec micro seconds. + * If the timeout is exceeded, this function throws an exception. If this + * function returns normally, you are guranteed to have at least nBytesIn + * bytes in your input buffer. + *@param nBytesIn Number of bytes to read. + *@param nSec The max seconds to wait. + *@param sUSec The max microseconds to wait. + */ + void waitForInput( int nBytesIn, int nSec, int nUSec ); + + /** Writes some data that is pending to the socket. + *@returns True if all data was written succesfully, false otherwise. + */ + bool writeOutput(); + + /** + * Writes all data that is pending on the socekt. + */ + bool writeAllOutput(); + + /** Determines if the connection has output waiting to go out. + *@returns true if there is pending output, otherwise false. + */ + bool hasOutput(); + + /** Sets internal flags so that this connection will be deleted next + * time through the ConnectionManager. + */ + void disconnect(); + + /** Determines if this connection is ready to be disconnected or not. + *@returns True if it is time to disconnect, false if it isn't. + */ + bool needDisconnect(); + + /** Tells the caller if there is pending input waiting to be processed. + *@returns True if there is pending input that has not been used, returns + * false if there isn't. + */ + bool hasInput(); + + /** Removes bytes from the begining of the input queue. Use this after + * getting the input and processing as much as you need to. + *@param nAmount The number of bytes used. + *@returns true if the update was successful, otherwise false. + */ + bool usedInput( int nAmount ); + + /** Sets the protocol to be used by this connection. All data in and out + * passes through the protocol object, which may process that data to + * filter out and process any special messages that may have been + * included. Everything that isn't processed can be accessed in the + * standard method. + *@param pNewProtocol A pointer to a protocol object that you want to + * use. + */ + void setProtocol( class Protocol *pNewProtocol ); + + /** Gets the number of bytes that are waiting in the input queue, the data + * that has yet to be processed. + *@returns The number of bytes in the input queue. + */ + int getInputAmnt(); + + /** Gets the number of bytes that are waiting in the output queue, the data + * that has yet to be sent to the connected socket. + *@returns The number of bytes in the input queue. + */ + int getOutputAmnt(); + + /** Gets a pointer to the protocol that is attatched to this connection + * object. This is useful to set modes, and send special commands in + * addition to the standard raw data reads and writes that are normally + * permitted. In fact, in everything besides a raw telnet protocol all + * data should be sent through the protocol and not the connection object. + *@returns A pointer to the Protocol assosiated with this connection. + */ + class Protocol *getProtocol(); + +private: + /** + * A buffer to keep data read from the socket in. This is filled in by + * the function readInput, which is automatically called by the + * ConnectionManager whenever new data is ready. + */ + FlexBuf xInputBuf; + + /** + * A buffer to keep data that should be sent to the socket. This is filled + * in by using the AppendOutput functions and is sent to the socket using + * the writeOutput function, which is automatically called every cycle by + * the ConnectionManager when there is pending data. + */ + FlexBuf xOutputBuf; + + /** + * The socket that the user is connected to. This is not the same as the + * socket number of the listening socket, this is the unique socket on the + * system that the data is coming to. + */ + int nSocket; + + /** + * True=active connection, False=connection lost + */ + bool bActive; + + /** + * True=disconnect next cycle (after data is transmitted), Flse=keep going. + */ + bool bDisconnectMe; + + /** + * A pointer to a protocol handler that can automatically process the data + * in the buffers. This is optional if you use the connections on your own + * but reccomended if you use this with the rest of the ConnectionManager + * system. + */ + class Protocol *pProtocol; +}; + +#endif diff --git a/src/old/connectionmanager.cpp b/src/old/connectionmanager.cpp new file mode 100644 index 0000000..ea60b2b --- /dev/null +++ b/src/old/connectionmanager.cpp @@ -0,0 +1,397 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "connectionmanager.h" +#include + +ConnectionManager::ConnectionManager( int nInitPool ) : + xLog( MultiLog::getInstance() ) +{ + //nMasterSocket = -1; + pMonitor = NULL; + for( int j = 0; j < nInitPool; j++ ) + { + lInactive.insert( lInactive.begin(), new Connection() ); + } + FD_ZERO (&fdActive); + FD_ZERO (&fdRead); + FD_ZERO (&fdWrite); + FD_ZERO (&fdException); +} + +ConnectionManager::~ConnectionManager() +{ + std::list::const_iterator i; + for( i = lActive.begin(); i != lActive.end(); i++ ) + { + delete (*i); + } + for( i = lInactive.begin(); i != lInactive.end(); i++ ) + { + delete (*i); + } +} + +bool ConnectionManager::startServer( int nPort ) +{ + /* Create the socket and set it up to accept connections. */ + struct sockaddr_in name; + + /* Give the socket a name. */ + name.sin_family = AF_INET; + name.sin_port = htons( nPort ); + + // I think this specifies who we will accept connections from, + // a good thing to make configurable later on + name.sin_addr.s_addr = htonl( INADDR_ANY ); + + return startServer( name ); +} + +bool ConnectionManager::startServer( const char *sAddr, int nPort ) +{ + /* Create the socket and set it up to accept connections. */ + struct sockaddr_in name; + + /* Give the socket a name. */ + name.sin_family = AF_INET; + name.sin_port = htons( nPort ); + + inet_aton( sAddr, &name.sin_addr ); + + return startServer( name ); +} + +bool ConnectionManager::startServer( struct sockaddr_in &name ) +{ + /* Create the socket. */ + int nMasterSocket = socket (PF_INET, SOCK_STREAM, 0); + if (nMasterSocket < 0) + { + xLog.LineLog( MultiLog::LError, "Couldn't create a listen socket."); + return false; + } + + int opt = 1; + setsockopt( + nMasterSocket, + SOL_SOCKET, + SO_REUSEADDR, + (char *)&opt, + sizeof(opt) + ); + + if (bind (nMasterSocket, (struct sockaddr *) &name, sizeof (name)) < 0) + { + xLog.LineLog( MultiLog::LError, "Couldn't bind to the listen socket."); + return false; + } + + if (listen (nMasterSocket, 40) < 0) + { + xLog.LineLog( MultiLog::LError, "Couldn't begin listening to the server socket."); + return false; + } + + /* Initialize the set of active sockets. */ + FD_SET (nMasterSocket, &fdActive); + + sMasterSocket[nMasterSocket] = name.sin_port; + + return true; +} + +bool ConnectionManager::startServer( int nPort, int nNumTries, int nTimeout ) +{ + struct timeval xTimeout; + + for( int j = 0; j < nNumTries; j++ ) + { + xLog.LineLog( MultiLog::LStatus, "Attempting to create server socket (attempt [%d/%d])...", j+1, nNumTries ); + if( startServer( nPort ) == true ) + { + return true; + } + else if( j < nNumTries-1 ) + { + xLog.LineLog( MultiLog::LStatus, "Waiting for %d secconds to allow port to clear...", nTimeout ); + xTimeout.tv_sec = nTimeout; + xTimeout.tv_usec = 0; + if (select(0, (fd_set *) 0, (fd_set *) 0, (fd_set *) 0, &xTimeout) < 0) { + xLog.LineLog( MultiLog::LError, "Error using select to sleep for a while."); + } + usleep( nTimeout ); + } + } + + return false; +} + +bool ConnectionManager::scanConnections( int nTimeout, bool bForceTimeout ) +{ + struct timeval xTimeout; + + xTimeout.tv_sec = nTimeout / 1000000; + xTimeout.tv_usec = nTimeout % 1000000; + + /* Block until input arrives on one or more active sockets. */ + fdRead = fdActive; + fdWrite = fdActive; + fdException = fdActive; + + // We removed the write checking because it just checks to see if you *can* + // write...that's stupid, they're all open, so it always exits immediately + // if there are ANY connections there... + if( TEMP_FAILURE_RETRY( select( FD_SETSIZE, &fdRead, (fd_set *)0/*&fdWrite*/, &fdException, &xTimeout ) ) < 0 ) + { + xLog.LineLog( MultiLog::LError, "Error attempting to scan open connections."); + perror("ConnectionManager"); + return false; + } + // Now we use select to sleep as well as to scan for connections, now we + // just need to fix the fact that if there are no connections, the seccond + // select call doesn't return until there is a connection... + if( bForceTimeout ) + { + if (select(0, (fd_set *) 0, (fd_set *) 0, (fd_set *) 0, &xTimeout) < 0) { + xLog.LineLog( MultiLog::LError, "Error using select to sleep for a while."); + } + } + + /* Service all the sockets with input pending. */ + for( int i = 0; i < FD_SETSIZE; ++i ) + { + if( FD_ISSET( i, &fdRead ) ) + { + if( sMasterSocket.find( i ) != sMasterSocket.end() ) + { + addConnection( i ); + } + else + { + Connection *pCon = findActiveConnection( i ); + if( pCon == NULL ) + { + xLog.LineLog( MultiLog::LError, "A connection object was lost, or never created!"); + return false; + } + + /* Data arriving on an already-connected socket. */ + if( pCon->readInput() == 0 ) + { + xLog.LineLog( MultiLog::LStatus, "Closing connection due to disconnect."); + close( i ); + FD_CLR( i, &fdActive ); + pMonitor->onClosedConnection( pCon ); + pCon->close(); + } + else + { + // We actually read something...but the connection handles + // protocol notification, so we don't need to do anything + // here... + } + } + } + } + std::list::iterator i; + for( i = lActive.begin(); i != lActive.end(); i++ ) + { + if( (*i)->isActive() == false ) + { + std::list::iterator l = i; + i--; + lInactive.insert( lInactive.end(), *l ); + lActive.erase( l ); + continue; + } + (*i)->getProtocol()->poll(); + if( (*i)->hasOutput() ) + { + (*i)->writeOutput(); + } + if( (*i)->needDisconnect() && !(*i)->hasOutput() ) + { + int prt = (*i)->getSocket(); + close( prt ); + FD_CLR( prt, &fdActive ); + pMonitor->onClosedConnection( *i ); + (*i)->close(); + lInactive.insert( lInactive.end(), *i ); + std::list::iterator l = i; + i--; + lActive.erase( l ); + xLog.LineLog( MultiLog::LStatus, "Closing connection due to server request."); + } + } + + return true; +} + +bool ConnectionManager::shutdownServer() +{ + while( !lActive.empty() ) + { + Connection *i = *(lActive.begin()); + if( i->isActive() ) + { + pMonitor->onClosedConnection( i ); + i->close(); + lInactive.insert( lInactive.end(), i ); + lActive.erase( lActive.begin() ); + } + } +/* + for( int i = 0; i < nPoolSize; i++ ) + { + + int prt = axConPool[i].getSocket(); + close( prt ); +// FD_CLR( prt, &fdActive ); + pMonitor->onClosedConnection( &axConPool[i] ); + axConPool[i].close(); + } +*/ + std::map::iterator i; + for( i = sMasterSocket.begin(); i != sMasterSocket.end(); i++ ) + { + int nSocket = (*i).first; + shutdown( nSocket, SHUT_RDWR ); + close( nSocket ); + } + + return true; +} + +bool ConnectionManager::broadcastMessage( const char *lpData, int nExcludeSocket ) +{ + std::list::const_iterator i; + for( i = lActive.begin(); i != lActive.end(); i++ ) + { + if( (*i)->isActive() && + (*i)->getSocket() != nExcludeSocket ) + { + (*i)->appendOutput( lpData ); + } + } + + return true; +} + +bool ConnectionManager::addConnection( int nSocket ) +{ + struct sockaddr_in clientname; + size_t size; + int newSocket; + + size = sizeof( clientname ); +#ifdef __CYGWIN__ + newSocket = accept( nSocket, (struct sockaddr *) &clientname, (int *)&size ); +#else + newSocket = accept( nSocket, (struct sockaddr *) &clientname, &size ); +#endif + if( newSocket < 0 ) + { + xLog.LineLog( MultiLog::LError, "Error accepting a new connection!" ); + return false; + } +// char *tmpa = inet_ntoa(clientname.sin_addr); + char tmpa[20]; + inet_ntop( AF_INET, (void *)&clientname.sin_addr, tmpa, 20 ); + xLog.LineLog( MultiLog::LStatus, "New connection from host %s, port %hd.", tmpa, ntohs (clientname.sin_port) ); +/* + int nCnt = 0; + for( int j = 0; j < nPoolSize; j++ ) + { + if( axConPool[j].isActive() ) + { + nCnt++; + } + } + xLog.LineLog( MultiLog::LStatus, "Connections %d/%d.", nCnt, nPoolSize ); + */ +// free( tmpa ); + FD_SET( newSocket, &fdActive ); + + //void nonblock(socket_t s) + { + int flags; + + flags = fcntl(newSocket, F_GETFL, 0); + flags |= O_NONBLOCK; + if (fcntl(newSocket, F_SETFL, flags) < 0) + { + return false; + } + } + + Connection *pCon = getInactiveConnection(); + pCon->open( newSocket ); + + pMonitor->onNewConnection( pCon, (*sMasterSocket.find(nSocket)).second ); + if( pCon->getProtocol() ) + pCon->getProtocol()->onNewConnection(); + + lActive.insert( lActive.end(), pCon ); + + return true; +} + +void ConnectionManager::connect( + const char *lpAddress, + int nPort, + int nProtocolPort, + Protocol *pNewProto + ) +{ + Connection *pCon = getInactiveConnection(); + pCon->open( lpAddress, nPort ); + int nSocket = pCon->getSocket(); + FD_SET( nSocket, &fdActive ); + + pCon->setProtocol( pNewProto ); + pMonitor->onNewClientConnection( pCon, nProtocolPort ); + if( pCon->getProtocol() ) + pCon->getProtocol()->onNewClientConnection(); + + lActive.insert( lActive.end(), pCon ); +} + +Connection *ConnectionManager::getInactiveConnection() +{ + if( lInactive.empty() ) + { + return new Connection(); + } + Connection *pCon = *(lInactive.begin()); + lInactive.erase( lInactive.begin() ); + return pCon; +} + +Connection *ConnectionManager::findActiveConnection( int nSocket ) +{ + std::list::const_iterator i; + for( i = lActive.begin(); i != lActive.end(); i++ ) + { + if( (*i)->getSocket() == nSocket ) + { + return *i; + } + } + + return NULL; +} + +void ConnectionManager::setConnectionMonitor( ConnectionMonitor *pNewMonitor ) +{ + pMonitor = pNewMonitor; +} diff --git a/src/old/connectionmanager.h b/src/old/connectionmanager.h new file mode 100644 index 0000000..cff036b --- /dev/null +++ b/src/old/connectionmanager.h @@ -0,0 +1,169 @@ +/** + *@file + * Contains the ConnectionManager. + *@author Mike Buland + */ + +#ifndef CONNECTIONMANAGER_H +#define CONNECTIONMANAGER_H + +#include "multilog.h" +#include "connection.h" +#include "connectionmonitor.h" +#include +#include +#include + +/** Manges incoming network connections as a server. Creates and works with + * Connection objects. All operations are performed on TCP/IP v4 right now, + * and on a single port, although any number of connections can be handled. + *@author Mike Buland + */ +class ConnectionManager +{ +public: + /** + * Sets up the basics, like storage for the pool, and so on. This does not + * actually start a server, bind to a port, or create a connection pool. + * That's all handled by startServer(). + */ + ConnectionManager( int nInitPool=40 ); + + /** + * Cleans up everything, and even clears out all still-connected Connection + * objects. + */ + virtual ~ConnectionManager(); + + /** + * Starts a server socket and binds to it, listening for new connections. + * Unlike the version of this that takes two parameters, this listens on + * all local addresses, or the virtual 0.0.0.0 address if available, which + * is mapped to all active local addresses. + *@param nPort The port to listen on. + *@returns True if the socket was bound to the port and serving was + * started. False if there was a problem connecting to the port. + */ + bool startServer( int nPort ); + + /** + * Starts a server socket and binds to it, listening only on the address + * specified. If you want to listen to all local addresses you can enter + * "0.0.0.0" for the address, but the version of this with one parameter + * is more universal. + *@param sAddr The local ip address to bind to + *@param nPort The port to listen on. + *@returns True if the socket was bound to the port and serving was + * started. False if there was a problem connecting to the port. + */ + bool startServer( const char *sAddr, int nPort ); + + /** + * I recomend probably not using this function on your own too much, it + * does the real work of setting up a socket, but requires a properly + * prepared sackaddr_in structure. This isn't too hard, but it's easier + * to use the other startServer functions. They call this function after + * some prepwork. + *@param name A properly formed sockaddr_in structure that will not be + * modified, but describes how to listen and to what to listen. + *@returns True on success. + */ + bool startServer( struct sockaddr_in &name ); + + /** + * This is identicle to the simpler startServer function except that it + * will automatically try to connect multiple times in case the first + * attempt or two doesn't work for some reason. Initially this was + * written to compensate for server sockets staying locked after they were + * closed for a while. + *@param nPort The port to listen on. + *@param nInitPool The size of the initial connection pool. This will + * grow automatically if necesarry. + *@param nNumTries The maximum number of times to try to connect. + *@param nTimeout The amount of time to wait in-between connection + * attempts. + *@returns True if the socket was bound to the port and serving was + * started. False if there was a problem connecting to the port. + */ + bool startServer( int nPort, int nNumTries, int nTimeout ); + + /** + * Scans all open connections, halting the calling processes until data + * is received or nTimeout ms have gone by. While waiting for the timeout + * to complete the process is placed into an idle mode. + *@param nTimeout The number of millisecconds to wait if there is nothing + * to actually do. + *@param bForceTimeout If set to true, this will force the scanner to wait + * for the timout to complete before returning, even if there was pending + * data. + */ + bool scanConnections( int nTimeout, bool bForceTimeout ); + + /** Shutdown the server and all assosiated sockets. + *@returns True if every socket was closed without problem. + */ + bool shutdownServer(); + + /** Sends a message directly to every connected port. + *@param lpData A null-terminated string of data to send. + *@param nExcludeSocket An optional socket to exclude from the broadcast. + *@returns True if every socket that should have gotten the message did. + */ + bool broadcastMessage( const char *lpData, int nExcludeSocket=-1 ); + + /** Sets a monitor for the manager. The monitor is sent notifications + * whenever a socket is connected, disconnected, or whenever an error + * occurs. + *@param pNewMonitor A pointer to a preconstructed ConnectionMonitor + */ + void setConnectionMonitor( ConnectionMonitor *pNewMonitor ); + + void connect( const char *lpAddress, int nPort, int nProtocolPort, Protocol *pNewProto ); + +private: + /** + * Take care of the work of actually accepting a connection. This will + * accept the connection, set the initial modes, and add it to the master + * list of active connections, as well as fire off any messages that need + * to be handled by anything else. + *@param nSocket The handle of the listening socket that had an incoming + * connection. + *@returns True if everything worked, False otherwise. + */ + bool addConnection( int nSocket ); + + /** + * Seraches the internal lists of connections for one with a specific + * socket. + *@param nSocket The socket the connection is using for communication. + * This is the unique socket and not the one that the connection was + * initially to. + *@returns NULL if no connection was found, otherwise a pointer to a live + * Connection object. + */ + Connection *findActiveConnection( int nSocket ); + + /** + * Searches the connection pool for an object that isn't in use yet, and + * returns it, ready to be filled in and used. + *@returns An unused connection object ready for use. + *@todo Check this code over to insure that the pool grows appropriately + * when enough extra connections are detected. + */ + Connection *getInactiveConnection(); + + std::map sMasterSocket; + //int nMasterSocket; /**< The listening or server socket. */ + fd_set fdActive; /**< The active socket set. */ + fd_set fdRead; /**< The sockets ready for a read. */ + fd_set fdWrite; /**< The sockets ready for a write. */ + fd_set fdException; /**< The sockets that have gotten errors. */ + std::list lInactive; /**< The pool of inactive Connections */ + std::list lActive; /**< The pool of active Connections */ + MultiLog &xLog; /**< A handle to the active multilog. */ + + /** The ConnectionMonitor to notify of new connections. */ + ConnectionMonitor *pMonitor; +}; + +#endif diff --git a/src/old/connectionmonitor.cpp b/src/old/connectionmonitor.cpp new file mode 100644 index 0000000..4f90ee6 --- /dev/null +++ b/src/old/connectionmonitor.cpp @@ -0,0 +1,10 @@ +#include "connectionmonitor.h" + +ConnectionMonitor::ConnectionMonitor() +{ +} + +ConnectionMonitor::~ConnectionMonitor() +{ +} + diff --git a/src/old/connectionmonitor.h b/src/old/connectionmonitor.h new file mode 100644 index 0000000..9910556 --- /dev/null +++ b/src/old/connectionmonitor.h @@ -0,0 +1,47 @@ +/**@file + * Describes the ConnectionMonitor class. + */ +#ifndef CONNECTIONMONITOR_H +#define CONNECTIONMONITOR_H + +#include "connection.h" + +/** Connection Monitor defines the base class of the objects that will be + * notified whenever a connection is created or destroyed. + *@author Mike Buland + */ +class ConnectionMonitor +{ +public: + /** + * This is only here for completeness. It does nothing. + */ + ConnectionMonitor(); + + /** + * This is only here for completeness. It does nothing. + */ + virtual ~ConnectionMonitor(); + + /** Receives the notification that new connection was received. + *@param pCon The connection that was created. + *@param nSocket The socket that the client connected to, used to determine + * which protocol to apply. + *@returns Should return a true value if everything is OK, a false to + * force a shutdown. + */ + virtual bool onNewConnection( Connection *pCon, int nPort ) = 0; + virtual bool onNewClientConnection( Connection *pCon, int nPort ) + { + return onNewConnection( pCon, nPort ); + }; + + /** Receives the notification that a connection was closed. + *@param pCon The connection that was closed. + *@returns Should return a true value if everything is OK, a false to + * force a shutdown. + */ + virtual bool onClosedConnection( Connection *pCon ) = 0; +}; + +#endif diff --git a/src/old/exceptionbase.cpp b/src/old/exceptionbase.cpp new file mode 100644 index 0000000..f3d22da --- /dev/null +++ b/src/old/exceptionbase.cpp @@ -0,0 +1,70 @@ +#include "exceptionbase.h" +#include + +ExceptionBase::ExceptionBase( const char *lpFormat, ... ) throw() : + nErrorCode( 0 ), + sWhat( NULL ) +{ + va_list ap; + + va_start(ap, lpFormat); + setWhat( lpFormat, ap ); + va_end(ap); +} + +ExceptionBase::ExceptionBase( int nCode, const char *lpFormat, ... ) throw() : + nErrorCode( nCode ), + sWhat( NULL ) +{ + va_list ap; + + va_start(ap, lpFormat); + setWhat( lpFormat, ap ); + va_end(ap); +} + +ExceptionBase::ExceptionBase( int nCode ) throw() : + nErrorCode( nCode ), + sWhat( NULL ) +{ +} + +ExceptionBase::~ExceptionBase() throw() +{ + if( sWhat ) + { + delete[] sWhat; + sWhat = NULL; + } +} + +void ExceptionBase::setWhat( const char *lpFormat, va_list &vargs ) +{ + if( sWhat ) delete[] sWhat; + int nSize; + + nSize = vsnprintf( NULL, 0, lpFormat, vargs ); + sWhat = new char[nSize+1]; + vsnprintf( sWhat, nSize+1, lpFormat, vargs ); +} + +void ExceptionBase::setWhat( const char *lpText ) +{ + if( sWhat ) delete[] sWhat; + int nSize; + + nSize = strlen( lpText ); + sWhat = new char[nSize+1]; + strcpy( sWhat, lpText ); +} + +const char *ExceptionBase::what() const throw() +{ + return sWhat; +} + +int ExceptionBase::getErrorCode() +{ + return nErrorCode; +} + diff --git a/src/old/exceptionbase.h b/src/old/exceptionbase.h new file mode 100644 index 0000000..6f1eca7 --- /dev/null +++ b/src/old/exceptionbase.h @@ -0,0 +1,105 @@ +#ifndef EXCEPTION_BASE_H +#define EXCEPTION_BASE_H + +#include +#include +#include + +/** + * A generalized Exception base class. This is nice for making general and + * flexible child classes that can create new error code classes. + */ +class ExceptionBase : public std::exception +{ +public: + /** + * Construct an exception with an error code of zero, but with a + * description. The use of this is not reccomended most of the time, it's + * generally best to include an error code with the exception so your + * program can handle the exception in a better way. + * @param sFormat The format of the text. See printf for more info. + */ + ExceptionBase( const char *sFormat, ... ) throw(); + + /** + * + * @param nCode + * @param sFormat + */ + ExceptionBase( int nCode, const char *sFormat, ... ) throw(); + + /** + * + * @param nCode + * @return + */ + ExceptionBase( int nCode=0 ) throw(); + + /** + * + * @return + */ + virtual ~ExceptionBase() throw(); + + /** + * + * @return + */ + virtual const char *what() const throw(); + + /** + * + * @return + */ + int getErrorCode(); + + /** + * + * @param lpFormat + * @param vargs + */ + void setWhat( const char *lpFormat, va_list &vargs ); + + /** + * + * @param lpText + */ + void setWhat( const char *lpText ); + +private: + int nErrorCode; /**< The code for the error that occured. */ + char *sWhat; /**< The text string telling people what went wrong. */ +}; + +#define subExceptionDecl( name ) \ +class name : public ExceptionBase \ +{ \ + public: \ + name( const char *sFormat, ... ) throw (); \ + name( int nCode, const char *sFormat, ... ) throw(); \ + name( int nCode=0 ) throw (); \ +}; + +#define subExceptionDef( name ) \ +name::name( const char *lpFormat, ... ) throw() : \ + ExceptionBase( 0 ) \ +{ \ + va_list ap; \ + va_start( ap, lpFormat ); \ + setWhat( lpFormat, ap ); \ + va_end( ap ); \ +} \ +name::name( int nCode, const char *lpFormat, ... ) throw() : \ + ExceptionBase( nCode ) \ +{ \ + va_list ap; \ + va_start( ap, lpFormat ); \ + setWhat( lpFormat, ap ); \ + va_end( ap ); \ +} \ +name::name( int nCode ) throw() : \ + ExceptionBase( nCode ) \ +{ \ +} + +#endif diff --git a/src/old/exceptions.cpp b/src/old/exceptions.cpp new file mode 100644 index 0000000..ce79a5e --- /dev/null +++ b/src/old/exceptions.cpp @@ -0,0 +1,8 @@ +#include "exceptions.h" +#include + +subExceptionDef( XmlException ) +subExceptionDef( FileException ) +subExceptionDef( ConnectionException ) +subExceptionDef( PluginException ) + diff --git a/src/old/exceptions.h b/src/old/exceptions.h new file mode 100644 index 0000000..0ab2b15 --- /dev/null +++ b/src/old/exceptions.h @@ -0,0 +1,25 @@ +#ifndef EXCEPTIONS_H +#define EXCEPTIONS_H + +#include "exceptionbase.h" +#include + +subExceptionDecl( XmlException ) +subExceptionDecl( FileException ) +subExceptionDecl( ConnectionException ) +subExceptionDecl( PluginException ) + +enum eFileException +{ + excodeEOF +}; + +enum eConnectionException +{ + excodeReadError, + excodeBadReadError, + excodeConnectionClosed, + excodeSocketTimeout +}; + +#endif diff --git a/src/old/flexbuf.cpp b/src/old/flexbuf.cpp new file mode 100644 index 0000000..6d55294 --- /dev/null +++ b/src/old/flexbuf.cpp @@ -0,0 +1,229 @@ +#include "flexbuf.h" +#include + +FlexBuf::FlexBuf() +{ + lpBuf = new char[1024]; + nLastChar = 0; + nFirstChar = 0; + nSize = 1024; + nFill = 0; + clearData(); +} + +FlexBuf::~FlexBuf() +{ + delete[] lpBuf; +} + +bool FlexBuf::appendData( const char *lpData, int nDSize ) +{ + int nStrLen; + if( nDSize < 0 ) + { + nStrLen = strlen( lpData ); + } + else + { + nStrLen = nDSize; + } + + if( nLastChar + nStrLen + 1 > nSize ) + { + if( nFill + nStrLen + 1 < nSize ) + { + memcpy( lpBuf, lpBuf+nFirstChar, nFill ); + nLastChar -= nFirstChar; + nFirstChar = 0; + } + else + { + nSize += nStrLen+1; + char *lpNewBuf = new char[nSize]; + memcpy( lpNewBuf, lpBuf+nFirstChar, nFill ); + delete[] lpBuf; + lpBuf = lpNewBuf; + nLastChar -= nFirstChar; + nFirstChar = 0; + } + } + + memcpy( &lpBuf[nLastChar], lpData, nStrLen ); + nLastChar += nStrLen; + nFill += nStrLen; + lpBuf[nLastChar] = '\0'; + + return true; +} + +bool FlexBuf::appendData( const char lData ) +{ + if( nLastChar + 2 > nSize ) + { + if( nFill+2 < nSize ) + { + memcpy( lpBuf, lpBuf+nFirstChar, nFill ); + nLastChar -= nFirstChar; + nFirstChar = 0; + } + else + { + nSize += 1024; + char *lpNewBuf = new char[nSize]; + memcpy( lpNewBuf, lpBuf+nFirstChar, nFill ); + delete[] lpBuf; + lpBuf = lpNewBuf; + nLastChar -= nFirstChar; + nFirstChar = 0; + } + } + + lpBuf[nLastChar] = lData; + nLastChar++; + nFill++; + lpBuf[nLastChar] = '\0'; + + return true; +} + +bool FlexBuf::appendData( const short lData ) +{ + return appendData( (const char *)&lData, sizeof(short) ); +} + +bool FlexBuf::appendData( const int lData ) +{ + return appendData( (const char *)&lData, sizeof(int) ); +} + +bool FlexBuf::appendData( const long lData ) +{ + return appendData( (const char *)&lData, sizeof(long) ); +} + +bool FlexBuf::appendData( const float lData ) +{ + return appendData( (const char *)&lData, sizeof(float) ); +} + +bool FlexBuf::appendData( const double lData ) +{ + return appendData( (const char *)&lData, sizeof(double) ); +} + +bool FlexBuf::appendData( const unsigned char lData ) +{ + return appendData( (const char)lData ); +} + +bool FlexBuf::appendData( const unsigned short lData ) +{ + return appendData( (const char *)&lData, sizeof(short) ); +} + +bool FlexBuf::appendData( const unsigned long lData ) +{ + return appendData( (const char *)&lData, sizeof(long) ); +} + +bool FlexBuf::appendData( const unsigned int lData ) +{ + return appendData( (const char *)&lData, sizeof(int) ); +} + +bool FlexBuf::clearData() +{ + nFirstChar = nLastChar = nFill = 0; + lpBuf[nLastChar] = '\0'; + + return true; +} + +const char *FlexBuf::getData() +{ + return (lpBuf+nFirstChar); +} + +int FlexBuf::getLength() +{ + return nFill; +} + +int FlexBuf::getCapacity() +{ + return nSize; +} + +bool FlexBuf::usedData( int nAmount ) +{ + // Remove from the end if negative + if( nAmount < 0 ) + { + if( nFill+nAmount < 0 ) + { + nFill = nFirstChar = nLastChar = 0; + return true; + } + nLastChar += nAmount; + nFill += nAmount; + return true; + } + if( nAmount > nFill ) + { + nAmount = nSize; +// return false; + } + + //nLastChar -= nAmount; + nFirstChar += nAmount; + nFill -= nAmount; + + if( nFill == 0 ) + { + nFirstChar = nLastChar = 0; + } + + //if( nLastChar > 0 ) + //{ + //memmove( lpBuf, &lpBuf[nAmount], nLastChar ); + //} + + return true; +} + +int FlexBuf::findChar( char cTarget ) +{ + for( int j = nFirstChar; j < nLastChar; j++ ) + { + if( lpBuf[j] == cTarget ) + { + return j; + } + } + + return -1; +} + +void FlexBuf::ensureCapacity( int nAmount ) +{ + if( nLastChar + nAmount + 1 > nSize ) + { + if( nFill + nAmount + 1 < nSize ) + { + memcpy( lpBuf, lpBuf+nFirstChar, nFill ); + nLastChar -= nFirstChar; + nFirstChar = 0; + } + else + { + nSize += nAmount+1; + char *lpNewBuf = new char[nSize]; + memcpy( lpNewBuf, lpBuf+nFirstChar, nFill ); + delete[] lpBuf; + lpBuf = lpNewBuf; + nLastChar -= nFirstChar; + nFirstChar = 0; + } + } +} + diff --git a/src/old/flexbuf.h b/src/old/flexbuf.h new file mode 100644 index 0000000..7d7f11a --- /dev/null +++ b/src/old/flexbuf.h @@ -0,0 +1,162 @@ +/**\flexbuf.h + * Describes the FlexBuf class. + *@author Mike Buland + */ + +#ifndef FLEXBUF_H +#define FLEXBUF_H + +/** Stores any amount of data, but starts small, growing as necesarry. + * It is optimized to work with stream type situations, with data being + * added to the end while it is being taken from the begning. + *@todo Set this class up to auto-shrink back to a specified sized buffer each + * time it has shrunk below that for enough operations. + *@author Mike Buland + */ +class FlexBuf +{ +public: + /** + * Construct a blank FlexBuf containing about 1k of buffer space. + */ + FlexBuf(); + + /** + * Clean up the FlexBuf, delete all buffers. + */ + virtual ~FlexBuf(); + + /** Appends a whole string of data to the buffer. The string + * must be null terminated. + *@param lpData The data to append to the buffer. + *@param nDSize The size of the data described by lpData. If this + * value is -1 lpData is treated as a null-terminated string. + *@returns True if no problems occured, false otherwise. + */ + bool appendData( const char *lpData, int nDSize=-1 ); + + /** Appends a single character to the end of the buffer. + *@param lData The character to append to the buffer. + *@returns True if no problems occured, false otherwise. + */ + bool appendData( const char lData ); + + /** + * Append the short to the buffer. + *@param lData The short to add to the buffer queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendData( const short lData ); + + /** + * Append the int to the buffer. + *@param lData The int to add to the buffer queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendData( const int lData ); + + /** + * Append the long to the buffer. + *@param lData The long to add to the buffer queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendData( const long lData ); + + /** + * Append the float to the buffer. + *@param lData The float to add to the buffer queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendData( const float lData ); + + /** + * Append the double to the buffer. + *@param lData The double to add to the buffer queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendData( const double lData ); + + /** + * Append the unsigned char to the buffer. + *@param lData The unsigned char to add to the buffer queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendData( const unsigned char lData ); + + /** + * Append the unsigned short to the buffer. + *@param lData The unsigned short to add to the buffer queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendData( const unsigned short lData ); + + /** + * Append the unsigned int to the buffer. + *@param lData The unsigned int to add to the buffer queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendData( const unsigned int lData ); + + /** + * Append the unsigned long to the buffer. + *@param lData The unsigned long to add to the buffer queue. + *@returns True if everything is ok, false otherwise. + */ + bool appendData( const unsigned long lData ); + + /** Removes all pending data from the buffer. + *@returns True if no problems occured, false otherwise. + */ + bool clearData(); + + /** Gets a pointer to the internal buffer, at the begining of the current + * data stream. + *@returns A pointer to the internal data buffer. + */ + const char *getData(); + + /** Gets the length of the current buffer (how much data is really in the + * buffer, not it's current capacity, for that check getCapacity) + *@returns The length of the current buffer. + */ + int getLength(); + + /** Gets the current capacity of the FlexBuf. If the size nears this value + * then the entire buffer is resized to accomidate more data. + *@returns The current capacity of the FlexBuf. + */ + int getCapacity(); + + /** + * Removes nAmount bytes from the begning of the buffer. Actually, if + * nAmount happens to be negative it will remove tha absolute value of + * nValue bytes from the end of the buffer, like the old delData command. + *@param nAmount The number of bytes used. + *@returns True if everything was successful, false if there was an error. + */ + bool usedData( int nAmount ); + + /** Finds the first instance of the given character in the buffer and + * returns an index to it. + *@param cTarget The character you're looking for. + *@returns The index of the first instance of the given character, or + * -1 if it just wasn't found. + */ + int findChar( char cTarget ); + + void ensureCapacity( int nAmount ); + +private: + /** The raw storage location of the FlexBuf. */ + char *lpBuf; + /** The real size of the FlexBuf. */ + int nSize; + /** Where the last char is. */ + int nLastChar; + /** Where the first char is. */ + int nFirstChar; + /** The amount of real data in the FlexBuf. This is effectively nLastChar-nFirstChar. */ + int nFill; +}; + +#endif diff --git a/src/old/formula.cpp b/src/old/formula.cpp new file mode 100644 index 0000000..cf63cf3 --- /dev/null +++ b/src/old/formula.cpp @@ -0,0 +1,262 @@ +#include "formula.h" + +subExceptionDef( ParseException ); + +Formula::Formula() +{ + hVars["pi"] = M_PI; + hVars["e"] = M_E; + + hFunc["sin"] = FuncSin(); +} + +Formula::~Formula() +{ +} + +double Formula::run( char *sFormula ) +{ + for(;;) + { + uint8_t tNum = nextToken( &sFormula ); + if( tNum == symEOS ) + break; + else if( tNum == symSubtract ) + { + tNum = nextToken( &sFormula ); + if( tNum != symNumber ) + throw ParseException("Unary minus must be followed by a number, " + "variable, function, or parenthesis."); + sValue.top() = -sValue.top(); + } + else if( tNum == symOpenParen ) + { + sOper.push( tNum ); + continue; + } + +oppart: uint8_t tOpr = nextToken( &sFormula ); + if( tOpr == symEOS ) + { + //printf("EOS "); + reduce(); + return sValue.top(); + break; + } + if( !sOper.empty() && getPrec( sOper.top() ) > getPrec( tOpr ) ) + { + reduce(); + } + if( tOpr != symCloseParen ) + { + sOper.push( tOpr ); + } + else + { + reduce( true ); + goto oppart; + } + } + return sValue.top(); +} + +void Formula::reduce( bool bCloseParen ) +{ + while( !sOper.empty() ) + { + uint8_t nOpr = sOper.top(); + if( nOpr == symOpenParen ) + { + //printf("Found ( stopping reduction.\n"); + if( bCloseParen == true ) + sOper.pop(); + return; + } + sOper.pop(); + + double dTop = sValue.top(); + sValue.pop(); + + switch( nOpr ) + { + case symAdd: + //printf("%f + %f = %f\n", sValue.top(), dTop, sValue.top()+dTop ); + sValue.top() += dTop; + break; + + case symSubtract: + //printf("%f - %f = %f\n", sValue.top(), dTop, sValue.top()-dTop ); + sValue.top() -= dTop; + break; + + case symMultiply: + //printf("%f * %f = %f\n", sValue.top(), dTop, sValue.top()*dTop ); + sValue.top() *= dTop; + break; + + case symDivide: + //printf("%f / %f = %f\n", sValue.top(), dTop, sValue.top()/dTop ); + sValue.top() /= dTop; + break; + + case symExponent: + //printf("%f ^ %f = %f\n", sValue.top(), dTop, pow(sValue.top(),dTop) ); + sValue.top() = pow( sValue.top(), dTop ); + break; + + case symModulus: + //printf("%f %% %f = %f\n", sValue.top(), dTop, fmod(sValue.top(),dTop) ); + sValue.top() = fmod( sValue.top(), dTop ); + break; + } + } + + if( bCloseParen == true ) + { + throw ParseException("Close-paren found without matching open-paren."); + } +} + +uint8_t Formula::getPrec( uint8_t nOper ) +{ + switch( nOper ) + { + case symNumber: + case symVariable: + case symOpenParen: + case symCloseParen: + return 0; + + case symAdd: + case symSubtract: + return 1; + + case symMultiply: + case symDivide: + case symModulus: + return 2; + + case symExponent: + return 3; + + default: + return 0; + } +} + +uint8_t Formula::nextToken( char **sBuf ) +{ + for(;;) + { + char cbuf = **sBuf; + ++(*sBuf); + switch( cbuf ) + { + case '+': + return symAdd; + + case '-': + return symSubtract; + + case '*': + return symMultiply; + + case '/': + return symDivide; + + case '^': + return symExponent; + + case '%': + return symModulus; + + case '(': + return symOpenParen; + + case ')': + return symCloseParen; + + case ' ': + case '\t': + case '\n': + case '\r': + break; + + case '\0': + return symEOS; + + default: + if( cbuf == '.' || (cbuf >= '0' && cbuf <= '9') ) + { + char num[50]={cbuf}; + int nPos = 1; + bool bDot = false; + + for(;;) + { + cbuf = **sBuf; + if( cbuf == '.' ) + { + if( bDot == false ) + bDot = true; + else + throw ParseException( + "Numbers cannot have more than one " + ". in them." + ); + } + if( cbuf == '.' || (cbuf >= '0' && cbuf <= '9') ) + { + num[nPos++] = cbuf; + } + else + { + num[nPos] = '\0'; + sValue.push( strtod( num, NULL ) ); + return symNumber; + } + ++(*sBuf); + } + } + else if( (cbuf >= 'a' && cbuf <= 'z') || + (cbuf >= 'A' && cbuf <= 'Z') || + (cbuf == '_') ) + { + char tok[50]={cbuf}; + int nPos = 1; + + for(;;) + { + cbuf = **sBuf; + if( (cbuf >= 'a' && cbuf <= 'z') || + (cbuf >= 'A' && cbuf <= 'Z') || + (cbuf >= '0' && cbuf <= '9') || + cbuf == '_' || cbuf == '.' || cbuf == ':' ) + { + tok[nPos++] = cbuf; + } + else + { + tok[nPos] = '\0'; + //printf("Checking variable \"%s\"\n", tok ); + try + { + sValue.push( hVars[tok] ); + return symNumber; + } + catch( HashException &e ) + { + throw ParseException( + "No variable named \"%s\" exists.", + tok + ); + } + } + ++(*sBuf); + } + } + break; + } + } +} + diff --git a/src/old/formula.h b/src/old/formula.h new file mode 100644 index 0000000..939eb09 --- /dev/null +++ b/src/old/formula.h @@ -0,0 +1,77 @@ +#ifndef FORMULA_H +#define FORMULA_H + +#include + +#include +#include +#include "sbuffer.h" + +#include "exceptionbase.h" +#include "hash.h" + +subExceptionDecl( ParseException ); + +/** + * Implements a very simple formula parser that allows use of variables and + * custom functions. This is based on a simple calculator-type parser that + * executes as it processes, accounting for operator precedence and grouping. + */ +class Formula +{ +public: + Formula(); + virtual ~Formula(); + + double run( char *sFormula ); + + typedef Hash varHash; + varHash hVars; + + typedef struct Func + { + double operator()( double x ) + { + return 0.0; + } + } Func; + + typedef Hash funcHash; + funcHash hFunc; + + typedef struct FuncSin : Func + { + double operator()( double x ) + { + return sin( x ); + } + } FuncSin; + +private: + enum + { + symEOS, + symAdd, + symSubtract, + symMultiply, + symDivide, + symOpenParen, + symCloseParen, + symNumber, + symVariable, + symExponent, + symModulus + }; + + typedef uint8_t symType; + + std::stack sOper; + std::stack sValue; + +private: + symType getPrec( symType nOper ); + symType nextToken( char **sBuf ); + void reduce( bool bCloseParen = false ); +}; + +#endif diff --git a/src/old/fstring.cpp b/src/old/fstring.cpp new file mode 100644 index 0000000..82d024d --- /dev/null +++ b/src/old/fstring.cpp @@ -0,0 +1,13 @@ +#include "fstring.h" +#include "hash.h" + +template<> uint32_t __calcHashCode( const FString &k ) +{ + return __calcHashCode( k.c_str() ); +} + +template<> bool __cmpHashKeys( const FString &a, const FString &b ) +{ + return a == b; +} + diff --git a/src/old/fstring.h b/src/old/fstring.h new file mode 100644 index 0000000..c5397cc --- /dev/null +++ b/src/old/fstring.h @@ -0,0 +1,651 @@ +#ifndef F_STRING_H +#define F_STRING_H + +#include +#include +#include "serializable.h" +#include "serializer.h" + +template< typename chr > +struct FStringChunk +{ + long nLength; + chr *pData; + FStringChunk *pNext; +}; + +/** + * Flexible String class. This class was designed with string passing and + * generation in mind. Like the standard string class you can specify what + * datatype to use for each character. Unlike the standard string class, + * collection of appended and prepended terms is done lazily, making long + * operations that involve many appends very inexpensive. In addition internal + * ref-counting means that if you pass strings around between functions there's + * almost no overhead in time or memory since a reference is created and no + * data is actually copied. This also means that you never need to put any + * FBasicString into a ref-counting container class. + */ +template< typename chr, typename chralloc=std::allocator, typename chunkalloc=std::allocator > > +class FBasicString : public Serializable +{ +#ifndef VALTEST +#define cpy( dest, src, size ) memcpy( dest, src, size*sizeof(chr) ) +#endif +private: + typedef struct FStringChunk Chunk; + typedef struct FBasicString MyType; + +public: + FBasicString() : + nLength( 0 ), + pnRefs( NULL ), + pFirst( NULL ), + pLast( NULL ) + { + } + + FBasicString( const chr *pData ) : + nLength( 0 ), + pnRefs( NULL ), + pFirst( NULL ), + pLast( NULL ) + { + append( pData ); + } + + FBasicString( const chr *pData, long nLength ) : + nLength( 0 ), + pnRefs( NULL ), + pFirst( NULL ), + pLast( NULL ) + { + append( pData, nLength ); + } + + FBasicString( const MyType &rSrc ) : + nLength( 0 ), + pnRefs( NULL ), + pFirst( NULL ), + pLast( NULL ) + { + // Here we have no choice but to copy, since the other guy is a const. + // In the case that the source were flat, we could get a reference, it + // would make some things faster, but not matter in many other cases. + + joinShare( rSrc ); + //copyFrom( rSrc ); + } + + FBasicString( const MyType &rSrc, long nLength ) : + nLength( 0 ), + pnRefs( NULL ), + pFirst( NULL ), + pLast( NULL ) + { + append( rSrc.pFirst->pData, nLength ); + } + + FBasicString( const MyType &rSrc, long nStart, long nLength ) : + nLength( 0 ), + pnRefs( NULL ), + pFirst( NULL ), + pLast( NULL ) + { + append( rSrc.pFirst->pData+nStart, nLength ); + } + + FBasicString( long nSize ) : + nLength( nSize ), + pnRefs( NULL ), + pFirst( NULL ), + pLast( NULL ) + { + pFirst = pLast = newChunk( nSize ); + } + + virtual ~FBasicString() + { + clear(); + } + + void append( const chr *pData ) + { + long nLen; + for( nLen = 0; pData[nLen] != (chr)0; nLen++ ); + + Chunk *pNew = newChunk( nLen ); + cpy( pNew->pData, pData, nLen ); + + appendChunk( pNew ); + } + + void append( const chr *pData, long nLen ) + { + Chunk *pNew = newChunk( nLen ); + + cpy( pNew->pData, pData, nLen ); + + appendChunk( pNew ); + } + + void prepend( const chr *pData ) + { + long nLen; + for( nLen = 0; pData[nLen] != (chr)0; nLen++ ); + + Chunk *pNew = newChunk( nLen ); + cpy( pNew->pData, pData, nLen ); + + prependChunk( pNew ); + } + + void prepend( const chr *pData, long nLen ) + { + Chunk *pNew = newChunk( nLen ); + + cpy( pNew->pData, pData, nLen ); + + prependChunk( pNew ); + } + + void clear() + { + realClear(); + } + + void resize( long nNewSize ) + { + if( nLength == nNewSize ) + return; + + flatten(); + + Chunk *pNew = newChunk( nNewSize ); + long nNewLen = (nNewSizepData, pFirst->pData, nNewLen ); + pNew->pData[nNewLen] = (chr)0; + aChr.deallocate( pFirst->pData, pFirst->nLength+1 ); + aChunk.deallocate( pFirst, 1 ); + pFirst = pLast = pNew; + nLength = nNewSize; + } + + long getSize() const + { + return nLength; + } + + chr *getStr() + { + if( pFirst == NULL ) + return NULL; + + flatten(); + return pFirst->pData; + } + + const chr *getStr() const + { + if( pFirst == NULL ) + return NULL; + + flatten(); + return pFirst->pData; + } + + chr *c_str() + { + if( pFirst == NULL ) + return NULL; + + flatten(); + return pFirst->pData; + } + + const chr *c_str() const + { + if( pFirst == NULL ) + return NULL; + + flatten(); + return pFirst->pData; + } + + MyType &operator +=( const chr *pData ) + { + append( pData ); + + return (*this); + } + + MyType &operator +=( const MyType &rSrc ) + { + rSrc.flatten(); + append( rSrc.pFirst->pData, rSrc.nLength ); + + return (*this); + } + + MyType &operator +=( const chr pData ) + { + chr tmp[2] = { pData, (chr)0 }; + append( tmp ); + + return (*this); + } + + MyType &operator =( const chr *pData ) + { + clear(); + append( pData ); + + return (*this); + } + + MyType &operator =( const MyType &rSrc ) + { + //if( rSrc.isFlat() ) + //{ + joinShare( rSrc ); + //} + //else + //{ + // copyFrom( rSrc ); + //} + // + + return (*this); + } + + bool operator ==( const chr *pData ) const + { + if( pFirst == NULL ) { + if( pData == NULL ) + return true; + return false; + } + + flatten(); + const chr *a = pData; + chr *b = pFirst->pData; + for( ; *a!=(chr)0; a++, b++ ) + { + if( *a != *b ) + return false; + } + + return true; + } + + bool operator ==( const MyType &pData ) const + { + if( pFirst == pData.pFirst ) + return true; + if( pFirst == NULL ) + return false; + + flatten(); + pData.flatten(); + const chr *a = pData.pFirst->pData; + chr *b = pFirst->pData; + for( ; *a!=(chr)0; a++, b++ ) + { + if( *a != *b ) + return false; + } + + return true; + } + + bool operator !=(const chr *pData ) const + { + return !(*this == pData); + } + + bool operator !=(const MyType &pData ) const + { + return !(*this == pData); + } + + chr &operator[]( long nIndex ) + { + flatten(); + + return pFirst->pData[nIndex]; + } + + const chr &operator[]( long nIndex ) const + { + flatten(); + + return pFirst->pData[nIndex]; + } + + bool isWS( long nIndex ) const + { + flatten(); + + return pFirst->pData[nIndex]==' ' || pFirst->pData[nIndex]=='\t' + || pFirst->pData[nIndex]=='\r' || pFirst->pData[nIndex]=='\n'; + } + + bool isAlpha( long nIndex ) const + { + flatten(); + + return (pFirst->pData[nIndex] >= 'a' && pFirst->pData[nIndex] <= 'z') + || (pFirst->pData[nIndex] >= 'A' && pFirst->pData[nIndex] <= 'Z'); + } + + void toLower() + { + flatten(); + unShare(); + + for( long j = 0; j < nLength; j++ ) + { + if( pFirst->pData[j] >= 'A' && pFirst->pData[j] <= 'Z' ) + pFirst->pData[j] -= 'A'-'a'; + } + } + + void toUpper() + { + flatten(); + unShare(); + + for( long j = 0; j < nLength; j++ ) + { + if( pFirst->pData[j] >= 'a' && pFirst->pData[j] <= 'z' ) + pFirst->pData[j] += 'A'-'a'; + } + } + + void serialize( class Serializer &ar ) + { + if( ar.isLoading() ) + { + clear(); + long nLen; + ar >> nLen; + + Chunk *pNew = newChunk( nLen ); + ar.read( pNew->pData, nLen*sizeof(chr) ); + appendChunk( pNew ); + } + else + { + flatten(); + + ar << nLength; + ar.write( pFirst->pData, nLength*sizeof(chr) ); + } + } + +private: + void flatten() const + { + if( isFlat() ) + return; + + if( pFirst == NULL ) + return; + + unShare(); + + Chunk *pNew = newChunk( nLength ); + chr *pos = pNew->pData; + Chunk *i = pFirst; + for(;;) + { + cpy( pos, i->pData, i->nLength ); + pos += i->nLength; + i = i->pNext; + if( i == NULL ) + break; + } + realClear(); + + pLast = pFirst = pNew; + nLength = pNew->nLength; + } + + void realClear() const + { + if( pFirst == NULL ) + return; + + if( isShared() ) + { + decRefs(); + } + else + { + Chunk *i = pFirst; + for(;;) + { + Chunk *n = i->pNext; + aChr.deallocate( i->pData, i->nLength+1 ); + aChunk.deallocate( i, 1 ); + if( n == NULL ) + break; + i = n; + } + pFirst = pLast = NULL; + nLength = 0; + } + } + + void copyFrom( const FBasicString &rSrc ) + { + if( rSrc.pFirst == NULL ) + return; + + decRefs(); + + Chunk *pNew = newChunk( rSrc.nLength ); + chr *pos = pNew->pData; + Chunk *i = rSrc.pFirst; + for(;;) + { + cpy( pos, i->pData, i->nLength ); + pos += i->nLength; + i = i->pNext; + if( i == NULL ) + break; + } + clear(); + + appendChunk( pNew ); + } + + bool isFlat() const + { + return (pFirst == pLast); + } + + bool isShared() const + { + return (pnRefs != NULL); + } + + Chunk *newChunk() const + { + Chunk *pNew = aChunk.allocate( 1 ); + pNew->pNext = NULL; + return pNew; + } + + Chunk *newChunk( long nLen ) const + { + Chunk *pNew = aChunk.allocate( 1 ); + pNew->pNext = NULL; + pNew->nLength = nLen; + pNew->pData = aChr.allocate( nLen+1 ); + pNew->pData[nLen] = (chr)0; + return pNew; + } + + void appendChunk( Chunk *pNewChunk ) + { + unShare(); + + if( pFirst == NULL ) + pLast = pFirst = pNewChunk; + else + { + pLast->pNext = pNewChunk; + pLast = pNewChunk; + } + + nLength += pNewChunk->nLength; + } + + void prependChunk( Chunk *pNewChunk ) + { + unShare(); + + if( pFirst == NULL ) + pLast = pFirst = pNewChunk; + else + { + pNewChunk->pNext = pFirst; + pFirst = pNewChunk; + } + + nLength += pNewChunk->nLength; + } + + void joinShare( MyType &rSrc ) + { + clear(); + + if( !rSrc.isFlat() ) + rSrc.flatten(); + + rSrc.initCount(); + pnRefs = rSrc.pnRefs; + (*pnRefs)++; + nLength = rSrc.nLength; + pFirst = rSrc.pFirst; + pLast = rSrc.pLast; + } + + void joinShare( const MyType &rSrc ) + { + clear(); + + rSrc.flatten(); + + if( !rSrc.isShared() ) + { + rSrc.pnRefs = new uint32_t; + (*rSrc.pnRefs) = 1; + } + pnRefs = rSrc.pnRefs; + (*pnRefs)++; + nLength = rSrc.nLength; + pFirst = rSrc.pFirst; + pLast = rSrc.pLast; + } + + /** + * This takes an object that was shared and makes a copy of the base data + * that was being shared so that this copy can be changed. This should be + * added before any call that will change this object; + */ + void unShare() const + { + if( isShared() == false ) + return; + + Chunk *pNew = newChunk( nLength ); + chr *pos = pNew->pData; + Chunk *i = pFirst; + for(;;) + { + cpy( pos, i->pData, i->nLength ); + pos += i->nLength; + i = i->pNext; + if( i == NULL ) + break; + } + decRefs(); + pLast = pFirst = pNew; + nLength = pNew->nLength; + } + + /** + * This decrements our ref count and pulls us out of the share. If the ref + * count hits zero because of this, it destroys the share. This is not + * safe to call on it's own, it's much better to call unShare. + */ + void decRefs() const + { + if( isShared() ) + { + (*pnRefs)--; + if( (*pnRefs) == 0 ) + destroyShare(); + else + { + pnRefs = NULL; + pFirst = NULL; + pLast = NULL; + nLength = 0; + } + } + } + + /** + * While the unShare function removes an instance from a share, this + * function destroys the data that was in the share, removing the share + * itself. This should only be called when the refcount for the share has + * or is about to reach zero. + */ + void destroyShare() const + { + delete pnRefs; + pnRefs = NULL; + realClear(); + } + +#ifdef VALTEST + void cpy( chr *dest, const chr *src, long count ) const + { + for( int j = 0; j < count; j++ ) + { + *dest = *src; + dest++; + src++; + } + } +#endif + + void initCount() const + { + if( !isShared() ) + { + pnRefs = new uint32_t; + (*pnRefs) = 1; + } + } + +private: + mutable long nLength; + mutable uint32_t *pnRefs; + mutable Chunk *pFirst; + mutable Chunk *pLast; + + mutable chralloc aChr; + mutable chunkalloc aChunk; +}; + +typedef FBasicString FString; + +#include "hash.h" +template<> uint32_t __calcHashCode( const FString &k ); +template<> bool __cmpHashKeys( const FString &a, const FString &b ); + + +#endif diff --git a/src/old/hash.cpp b/src/old/hash.cpp new file mode 100644 index 0000000..c52e6b1 --- /dev/null +++ b/src/old/hash.cpp @@ -0,0 +1,113 @@ +#include "hash.h" + +subExceptionDef( HashException ) + +template<> uint32_t __calcHashCode( const int &k ) +{ + return k; +} + +template<> bool __cmpHashKeys( const int &a, const int &b ) +{ + return a == b; +} + +template<> uint32_t __calcHashCode( const unsigned int &k ) +{ + return k; +} + +template<> bool __cmpHashKeys( const unsigned int &a, const unsigned int &b ) +{ + return a == b; +} + +template<> +uint32_t __calcHashCode( const char * const &k ) +{ + if (k == NULL) + { + return 0; + } + + unsigned long int nPos = 0; + for( const char *s = k; *s; s++ ) + { + nPos = *s + (nPos << 6) + (nPos << 16) - nPos; + } + + return nPos; +} + +template<> bool __cmpHashKeys( const char * const &a, const char * const &b ) +{ + if( a == b ) + return true; + + for(int j=0; a[j] == b[j]; j++ ) + if( a[j] == '\0' ) + return true; + + return false; +} + +template<> +uint32_t __calcHashCode( char * const &k ) +{ + if (k == NULL) + { + return 0; + } + + unsigned long int nPos = 0; + for( const char *s = k; *s; s++ ) + { + nPos = *s + (nPos << 6) + (nPos << 16) - nPos; + } + + return nPos; +} + +template<> bool __cmpHashKeys( char * const &a, char * const &b ) +{ + if( a == b ) + return true; + + for(int j=0; a[j] == b[j]; j++ ) + if( a[j] == '\0' ) + return true; + + return false; +} + +template<> uint32_t __calcHashCode( const std::string &k ) +{ + std::string::size_type j, sz = k.size(); + const char *s = k.c_str(); + + unsigned long int nPos = 0; + for( j = 0; j < sz; j++, s++ ) + { + nPos = *s + (nPos << 6) + (nPos << 16) - nPos; + } + + return nPos; +} + +template<> bool __cmpHashKeys( const std::string &a, const std::string &b ) +{ + return a == b; +} + +template<> uint32_t __calcHashCode( const Hashable &k ) +{ + return 0; + //return k.getHashCode(); +} + +template<> bool __cmpHashKeys( const Hashable &a, const Hashable &b ) +{ + return false; + //return a.compareForHash( b ); +} + diff --git a/src/old/hash.h b/src/old/hash.h new file mode 100644 index 0000000..e819379 --- /dev/null +++ b/src/old/hash.h @@ -0,0 +1,744 @@ +#ifndef HASH_H +#define HASH_H + +#include +#include +#include +#include +#include +#include "exceptionbase.h" +#include "hashable.h" +#include "serializable.h" +#include "serializer.h" + +#define bitsToBytes( n ) (n/32+(n%32>0 ? 1 : 0)) + +subExceptionDecl( HashException ) + +enum eHashException +{ + excodeNotFilled +}; + +template +uint32_t __calcHashCode( const T &k ); + +template +bool __cmpHashKeys( const T &a, const T &b ); + +struct __calcNextTSize_fast +{ + uint32_t operator()( uint32_t nCapacity, uint32_t nFill, uint32_t nDeleted ) const + { + if( nDeleted >= nCapacity/2 ) + return nCapacity; + return nCapacity*2+1; + } +}; + +template, typename valuealloc = std::allocator, typename challoc = std::allocator > +class Hash; + +template< typename key, typename _value, typename sizecalc = __calcNextTSize_fast, typename keyalloc = std::allocator, typename valuealloc = std::allocator<_value>, typename challoc = std::allocator > +struct HashProxy +{ + friend class Hash; +private: + HashProxy( Hash &h, key *k, uint32_t nPos, uint32_t hash ) : + hsh( h ), + pKey( k ), + nPos( nPos ), + hash( hash ), + bFilled( false ) + { + } + + HashProxy( Hash &h, uint32_t nPos, _value *pValue ) : + hsh( h ), + nPos( nPos ), + pValue( pValue ), + bFilled( true ) + { + } + + Hash &hsh; + key *pKey; + uint32_t nPos; + _value *pValue; + uint32_t hash; + bool bFilled; + +public: + operator _value &() + { + if( bFilled == false ) + throw HashException( + excodeNotFilled, + "No data assosiated with that key." + ); + return *pValue; + } + + _value &value() + { + if( bFilled == false ) + throw HashException( + excodeNotFilled, + "No data assosiated with that key." + ); + return *pValue; + } + + bool isFilled() + { + return bFilled; + } + + void erase() + { + if( bFilled ) + { + hsh._erase( nPos ); + hsh.onDelete(); + } + } + + _value operator=( _value nval ) + { + if( bFilled ) + { + hsh.va.destroy( pValue ); + hsh.va.construct( pValue, nval ); + hsh.onUpdate(); + } + else + { + hsh.fill( nPos, *pKey, nval, hash ); + hsh.onInsert(); + } + + return nval; + } + + _value *operator->() + { + if( bFilled == false ) + throw HashException( + excodeNotFilled, + "No data assosiated with that key." + ); + return pValue; + } +}; + +template +class Hash +{ + friend struct HashProxy; +public: + Hash() : + nCapacity( 11 ), + nFilled( 0 ), + nDeleted( 0 ), + bFilled( NULL ), + bDeleted( NULL ), + aKeys( NULL ), + aValues( NULL ), + aHashCodes( NULL ) + { + nKeysSize = bitsToBytes( nCapacity ); + bFilled = ca.allocate( nKeysSize ); + bDeleted = ca.allocate( nKeysSize ); + clearBits(); + + aHashCodes = ca.allocate( nCapacity ); + aKeys = ka.allocate( nCapacity ); + aValues = va.allocate( nCapacity ); + } + + Hash( const Hash &src ) : + nCapacity( src.nCapacity ), + nFilled( 0 ), + nDeleted( 0 ), + bFilled( NULL ), + bDeleted( NULL ), + aKeys( NULL ), + aValues( NULL ), + aHashCodes( NULL ) + { + nKeysSize = bitsToBytes( nCapacity ); + bFilled = ca.allocate( nKeysSize ); + bDeleted = ca.allocate( nKeysSize ); + clearBits(); + + aHashCodes = ca.allocate( nCapacity ); + aKeys = ka.allocate( nCapacity ); + aValues = va.allocate( nCapacity ); + + for( uint32_t j = 0; j < src.nCapacity; j++ ) + { + if( src.isFilled( j ) ) + { + insert( src.aKeys[j], src.aValues[j] ); + } + } + } + + Hash &operator=( const Hash &src ) + { + for( uint32_t j = 0; j < nCapacity; j++ ) + { + if( isFilled( j ) ) + if( !isDeleted( j ) ) + { + va.destroy( &aValues[j] ); + ka.destroy( &aKeys[j] ); + } + } + va.deallocate( aValues, nCapacity ); + ka.deallocate( aKeys, nCapacity ); + ca.deallocate( bFilled, nKeysSize ); + ca.deallocate( bDeleted, nKeysSize ); + ca.deallocate( aHashCodes, nCapacity ); + + nFilled = 0; + nDeleted = 0; + nCapacity = src.nCapacity; + nKeysSize = bitsToBytes( nCapacity ); + bFilled = ca.allocate( nKeysSize ); + bDeleted = ca.allocate( nKeysSize ); + clearBits(); + + aHashCodes = ca.allocate( nCapacity ); + aKeys = ka.allocate( nCapacity ); + aValues = va.allocate( nCapacity ); + + for( uint32_t j = 0; j < src.nCapacity; j++ ) + { + if( src.isFilled( j ) ) + { + insert( src.aKeys[j], src.aValues[j] ); + } + } + + return *this; + } + + virtual ~Hash() + { + for( uint32_t j = 0; j < nCapacity; j++ ) + { + if( isFilled( j ) ) + if( !isDeleted( j ) ) + { + va.destroy( &aValues[j] ); + ka.destroy( &aKeys[j] ); + } + } + va.deallocate( aValues, nCapacity ); + ka.deallocate( aKeys, nCapacity ); + ca.deallocate( bFilled, nKeysSize ); + ca.deallocate( bDeleted, nKeysSize ); + ca.deallocate( aHashCodes, nCapacity ); + } + + uint32_t getCapacity() + { + return nCapacity; + } + + uint32_t getFill() + { + return nFilled; + } + + uint32_t size() + { + return nFilled-nDeleted; + } + + uint32_t getDeleted() + { + return nDeleted; + } + + virtual HashProxy operator[]( key k ) + { + uint32_t hash = __calcHashCode( k ); + bool bFill; + uint32_t nPos = probe( hash, k, bFill ); + + if( bFill ) + { + return HashProxy( *this, nPos, &aValues[nPos] ); + } + else + { + return HashProxy( *this, &k, nPos, hash ); + } + } + + virtual void insert( key k, value v ) + { + uint32_t hash = __calcHashCode( k ); + bool bFill; + uint32_t nPos = probe( hash, k, bFill ); + + if( bFill ) + { + va.destroy( &aValues[nPos] ); + va.construct( &aValues[nPos], v ); + onUpdate(); + } + else + { + fill( nPos, k, v, hash ); + onInsert(); + } + } + + virtual void erase( key k ) + { + uint32_t hash = __calcHashCode( k ); + bool bFill; + uint32_t nPos = probe( hash, k, bFill ); + + if( bFill ) + { + _erase( nPos ); + onDelete(); + } + } + + struct iterator; + virtual void erase( struct iterator &i ) + { + if( this != &i.hsh ) + throw HashException("This iterator didn't come from this Hash."); + if( isFilled( i.nPos ) && !isDeleted( i.nPos ) ) + { + _erase( i.nPos ); + onDelete(); + } + } + + virtual void clear() + { + for( uint32_t j = 0; j < nCapacity; j++ ) + { + if( isFilled( j ) ) + if( !isDeleted( j ) ) + { + va.destroy( &aValues[j] ); + ka.destroy( &aKeys[j] ); + onDelete(); + } + } + + clearBits(); + } + + virtual value &get( key k ) + { + uint32_t hash = __calcHashCode( k ); + bool bFill; + uint32_t nPos = probe( hash, k, bFill ); + + if( bFill ) + { + return aValues[nPos]; + } + else + { + throw HashException( + excodeNotFilled, + "No data assosiated with that key." + ); + } + } + + virtual bool has( key k ) + { + bool bFill; + probe( __calcHashCode( k ), k, bFill, false ); + + return bFill; + } + + typedef struct iterator + { + friend class Hash; + private: + iterator( Hash &hsh ) : + hsh( hsh ), + nPos( 0 ), + bFinished( false ) + { + nPos = hsh.getFirstPos( bFinished ); + } + + iterator( Hash &hsh, bool bDone ) : + hsh( hsh ), + nPos( 0 ), + bFinished( bDone ) + { + } + + Hash &hsh; + uint32_t nPos; + bool bFinished; + + public: + iterator operator++( int ) + { + if( bFinished == false ) + nPos = hsh.getNextPos( nPos, bFinished ); + + return *this; + } + + iterator operator++() + { + if( bFinished == false ) + nPos = hsh.getNextPos( nPos, bFinished ); + + return *this; + } + + bool operator==( const iterator &oth ) + { + if( bFinished != oth.bFinished ) + return false; + if( bFinished == true ) + { + return true; + } + else + { + if( oth.nPos == nPos ) + return true; + return false; + } + } + + bool operator!=( const iterator &oth ) + { + return !(*this == oth ); + } + + iterator operator=( const iterator &oth ) + { + if( &hsh != &oth.hsh ) + throw HashException( + "Cannot mix iterators from different hash objects."); + nPos = oth.nPos; + bFinished = oth.bFinished; + } + + std::pair operator *() + { + return hsh.getAtPos( nPos ); + } + + key &getKey() + { + return hsh.getKeyAtPos( nPos ); + } + + value &getValue() + { + return hsh.getValueAtPos( nPos ); + } + }; + + iterator begin() + { + return iterator( *this ); + } + + iterator end() + { + return iterator( *this, true ); + } + + std::list getKeys() + { + std::list lKeys; + + for( uint32_t j = 0; j < nCapacity; j++ ) + { + if( isFilled( j ) ) + { + if( !isDeleted( j ) ) + { + lKeys.push_back( aKeys[j] ); + } + } + } + + return lKeys; + } + +protected: + virtual void onInsert() {} + virtual void onUpdate() {} + virtual void onDelete() {} + virtual void onReHash() {} + + virtual void clearBits() + { + for( uint32_t j = 0; j < nKeysSize; j++ ) + { + bFilled[j] = bDeleted[j] = 0; + } + } + + virtual void fill( uint32_t loc, key &k, value &v, uint32_t hash ) + { + bFilled[loc/32] |= (1<<(loc%32)); + va.construct( &aValues[loc], v ); + ka.construct( &aKeys[loc], k ); + aHashCodes[loc] = hash; + nFilled++; + //printf("Filled: %d, Deleted: %d, Capacity: %d\n", + // nFilled, nDeleted, nCapacity ); + } + + virtual void _erase( uint32_t loc ) + { + bDeleted[loc/32] |= (1<<(loc%32)); + va.destroy( &aValues[loc] ); + ka.destroy( &aKeys[loc] ); + nDeleted++; + //printf("Filled: %d, Deleted: %d, Capacity: %d\n", + // nFilled, nDeleted, nCapacity ); + } + + virtual std::pair getAtPos( uint32_t nPos ) + { + return std::pair(aKeys[nPos],aValues[nPos]); + } + + virtual key &getKeyAtPos( uint32_t nPos ) + { + return aKeys[nPos]; + } + + virtual value &getValueAtPos( uint32_t nPos ) + { + return aValues[nPos]; + } + + virtual uint32_t getFirstPos( bool &bFinished ) + { + for( uint32_t j = 0; j < nCapacity; j++ ) + { + if( isFilled( j ) ) + if( !isDeleted( j ) ) + return j; + } + + bFinished = true; + return 0; + } + + virtual uint32_t getNextPos( uint32_t nPos, bool &bFinished ) + { + for( uint32_t j = nPos+1; j < nCapacity; j++ ) + { + if( isFilled( j ) ) + if( !isDeleted( j ) ) + return j; + } + + bFinished = true; + return 0; + } + + uint32_t probe( uint32_t hash, key k, bool &bFill, bool rehash=true ) + { + uint32_t nCur = hash%nCapacity; + + // First we scan to see if the key is already there, abort if we + // run out of probing room, or we find a non-filled entry + for( int8_t j = 0; + isFilled( nCur ) && j < 32; + nCur = (nCur + (1< uint32_t __calcHashCode( const int &k ); +template<> bool __cmpHashKeys( const int &a, const int &b ); + +template<> uint32_t __calcHashCode( const unsigned int &k ); +template<> bool __cmpHashKeys( const unsigned int &a, const unsigned int &b ); + +template<> uint32_t __calcHashCode( const char * const &k ); +template<> bool __cmpHashKeys( const char * const &a, const char * const &b ); + +template<> uint32_t __calcHashCode( char * const &k ); +template<> bool __cmpHashKeys( char * const &a, char * const &b ); + +template<> uint32_t __calcHashCode( const std::string &k ); +template<> bool __cmpHashKeys( const std::string &a, const std::string &b ); + +template<> uint32_t __calcHashCode( const Hashable &k ); +template<> bool __cmpHashKeys( const Hashable &a, const Hashable &b ); + +template +Serializer &operator<<( Serializer &ar, Hash &h ) +{ + ar << h.size(); + for( typename Hash::iterator i = h.begin(); i != h.end(); i++ ) + { + std::pair p = *i; + ar << p.first << p.second; + } + + return ar; +} + +template +Serializer &operator>>( Serializer &ar, Hash &h ) +{ + h.clear(); + uint32_t nSize; + ar >> nSize; + + for( uint32_t j = 0; j < nSize; j++ ) + { + key k; value v; + ar >> k >> v; + h.insert( k, v ); + } + + return ar; +} + +template +Serializer &operator&&( Serializer &ar, Hash &h ) +{ + if( ar.isLoading() ) + { + return ar >> h; + } + else + { + return ar << h; + } +} + +#endif diff --git a/src/old/hashable.cpp b/src/old/hashable.cpp new file mode 100644 index 0000000..8565956 --- /dev/null +++ b/src/old/hashable.cpp @@ -0,0 +1 @@ +#include "hashable.h" diff --git a/src/old/hashable.h b/src/old/hashable.h new file mode 100644 index 0000000..98643d5 --- /dev/null +++ b/src/old/hashable.h @@ -0,0 +1,12 @@ +#ifndef HASHABLE_H +#define HASHABLE_H + +class Hashable +{ +public: + virtual ~Hashable() {}; + virtual unsigned long int getHashCode() = 0; + virtual bool compareForHash( Hashable &other ) = 0; +}; + +#endif diff --git a/src/old/hashfunction.cpp b/src/old/hashfunction.cpp new file mode 100644 index 0000000..51f2259 --- /dev/null +++ b/src/old/hashfunction.cpp @@ -0,0 +1,10 @@ +#include "hashfunction.h" + +HashFunction::HashFunction() +{ +} + +HashFunction::~HashFunction() +{ +} + diff --git a/src/old/hashfunction.h b/src/old/hashfunction.h new file mode 100644 index 0000000..cbcf70f --- /dev/null +++ b/src/old/hashfunction.h @@ -0,0 +1,48 @@ +#ifndef HASH_FUNCTION +#define HASH_FUNCTION + +/** This represents the shell of a hash function. It must be aggregated in + * order to be used. Please read about it's two functions for specificatins + * relating to what values will be passed to them and what they should return + * for creating your own hash functions. + *@author Mike Buland. + */ +class HashFunction +{ +public: + /** + * Standard Constructor. + */ + HashFunction(); + + /** + * Standard Deconstructor. + */ + virtual ~HashFunction(); + + /** Hashes the value represnted by id. This must return a fairly unique + * number in the range of 0-2^32 (or whatever the size of an unsigned long + * is on your system) based on the id given. The faster the number changes + * the better in a general sence. The return value will be the index + * (after probing takes place) to the data assosiated with an id, so this + * function should always produce the same number for any given id. + *@param id The identifier to use to create a unique numerical identifier. + *@returns A mostly unique numerical identifier generated using the given + * id. + */ + virtual unsigned long int hash( const void *id ) = 0; + + /** This function must compare two ids in the format that this hashfunction + * accepts. For example, if the hash function hashes strings it should + * probably { return strcmp( id1, id2 ) == 0 }. + *@param id1 One value to use in the comparison + *@param id2 Another value to use in the comparison + *@returns True if the two values match, otherwise false. + */ + virtual bool cmpIDs( const void *id1, const void *id2 ) = 0; + +// virtual void *createPersistantID( const void *id ) = 0; +// virtual void destroyPersistantID( const void *id ) = 0; +}; + +#endif diff --git a/src/old/hashfunctioncasestring.cpp b/src/old/hashfunctioncasestring.cpp new file mode 100644 index 0000000..6361f45 --- /dev/null +++ b/src/old/hashfunctioncasestring.cpp @@ -0,0 +1,39 @@ +#include +#include +#include +#include "hashfunctioncasestring.h" + +HashFunctionCaseString::HashFunctionCaseString() +{ +} + +HashFunctionCaseString::~HashFunctionCaseString() +{ +} + +unsigned long int HashFunctionCaseString::hash( const void *id ) +{ + const char *str = (const char *)id; + unsigned long int nPos = 0; + for( int j = 0; str[j] != '\0'; j++ ) + { + nPos = tolower(str[j]) + (nPos << 6) + (nPos << 16) - nPos; +// nPos += nPos<<16|(((unsigned long int)tolower(str[j]))<<((j*7)%24)); + } + return nPos; +} + +bool HashFunctionCaseString::cmpIDs( const void *id1, const void *id2 ) +{ + const char *str1 = (const char *)id1; + const char *str2 = (const char *)id2; + + int j; + for( j = 0; str1[j] != '\0' && str2[j] != '\0'; j++ ) + { + if( tolower(str1[j]) != tolower(str2[j]) ) + return false; + } + return (str1[j]==str2[j]); +} + diff --git a/src/old/hashfunctioncasestring.h b/src/old/hashfunctioncasestring.h new file mode 100644 index 0000000..7816a1b --- /dev/null +++ b/src/old/hashfunctioncasestring.h @@ -0,0 +1,28 @@ +#ifndef HASH_FUNCTION_CASE_STRING +#define HASH_FUNCTION_CASE_STRING + +#include "hashfunction.h" + +/** A hash function for string data. This hash function does strings, but is + * actually generalized to handle any binary stream of characters terminated + * by a null character. This is different than HashFunctionString in that + * this does comparisons without regaurd to case. + *@author Mike Buland. + */ +class HashFunctionCaseString : public HashFunction +{ +public: + /** + * Standard Constructor. + */ + HashFunctionCaseString(); + + /** + * Standard Deconstructor. + */ + virtual ~HashFunctionCaseString(); + unsigned long int hash( const void *id ); + bool cmpIDs( const void *id1, const void *id2 ); +}; + +#endif diff --git a/src/old/hashfunctionint.cpp b/src/old/hashfunctionint.cpp new file mode 100644 index 0000000..4bd0feb --- /dev/null +++ b/src/old/hashfunctionint.cpp @@ -0,0 +1,20 @@ +#include "hashfunctionint.h" + +HashFunctionInt::HashFunctionInt() +{ +} + +HashFunctionInt::~HashFunctionInt() +{ +} + +unsigned long int HashFunctionInt::hash( const void *id ) +{ + return (unsigned long)(id); +} + +bool HashFunctionInt::cmpIDs( const void *id1, const void *id2 ) +{ + return (unsigned long)(id1) == (unsigned long)(id2); +} + diff --git a/src/old/hashfunctionint.h b/src/old/hashfunctionint.h new file mode 100644 index 0000000..0fbc764 --- /dev/null +++ b/src/old/hashfunctionint.h @@ -0,0 +1,26 @@ +#ifndef HASH_FUNCTION_INT +#define HASH_FUNCTION_INT + +#include "hashfunction.h" + +/** A hash function for integer data. Really, this does almost nothing except + * ensure we're dealing with positive indicies. + *@author Mike Buland. + */ +class HashFunctionInt : public HashFunction +{ +public: + /** + * Standard Constructor. + */ + HashFunctionInt(); + + /** + * Standard Deconstructor. + */ + virtual ~HashFunctionInt(); + unsigned long int hash( const void *id ); + bool cmpIDs( const void *id1, const void *id2 ); +}; + +#endif diff --git a/src/old/hashfunctionstring.cpp b/src/old/hashfunctionstring.cpp new file mode 100644 index 0000000..bd14643 --- /dev/null +++ b/src/old/hashfunctionstring.cpp @@ -0,0 +1,51 @@ +#include "hashfunctionstring.h" +#ifndef NULL +#define NULL ((void *) 0) +#endif + +HashFunctionString::HashFunctionString() +{ +} + +HashFunctionString::~HashFunctionString() +{ +} + +unsigned long int HashFunctionString::hash( const void *id ) +{ + if (id == NULL) + { + return 0; + } + + unsigned long int nPos = 0; + for( const char *s = (const char *)id; *s; s++ ) + { + nPos = *s + (nPos << 6) + (nPos << 16) - nPos; + } + return nPos; +} + +bool HashFunctionString::cmpIDs( const void *id1, const void *id2 ) +{ + if (id1 == NULL || id2 == NULL) + { + return false; + } + if (id1 == id2) + { + return true; + } + + const char *str1 = (const char *)id1; + const char *str2 = (const char *)id2; + + int j; + for( j = 0; str1[j] != '\0' && str2[j] != '\0'; j++ ) + { + if( str1[j] != str2[j] ) + return false; + } + return (str1[j]==str2[j]); +} + diff --git a/src/old/hashfunctionstring.h b/src/old/hashfunctionstring.h new file mode 100644 index 0000000..7d2a1a6 --- /dev/null +++ b/src/old/hashfunctionstring.h @@ -0,0 +1,27 @@ +#ifndef HASH_FUNCTION_STRING +#define HASH_FUNCTION_STRING + +#include "hashfunction.h" + +/** A hash function for string data. This hash function does strings, but is + * actually generalized to handle any binary stream of characters terminated + * by a null character. + *@author Mike Buland. + */ +class HashFunctionString : public HashFunction +{ +public: + /** + * Standard Constructor. + */ + HashFunctionString(); + + /** + * Standard Deconstructor. + */ + virtual ~HashFunctionString(); + unsigned long int hash( const void *id ); + bool cmpIDs( const void *id1, const void *id2 ); +}; + +#endif diff --git a/src/old/hashtable.cpp b/src/old/hashtable.cpp new file mode 100644 index 0000000..dbcd964 --- /dev/null +++ b/src/old/hashtable.cpp @@ -0,0 +1,424 @@ +#include +#include +#include + +#include "hashtable.h" + +HashTable::HashTable( HashFunction *hNewFunc, unsigned long int nInitSize, bool bAllowDupes ) +{ + hFunc = hNewFunc; + nTableSize = nextPrime( nInitSize ); + aTable = new HashNode[nTableSize]; + //for( int j = 0; j < nTableSize; j++ ) if( aTable[j].id || aTable[j].data || aTable[j].bDeleted ) printf("Unclean entry\n"); + nSize = 0; + nFilled = 0; + this->bAllowDupes = bAllowDupes; +} + +HashTable::~HashTable() +{ + delete[] aTable; + delete hFunc; +} + +void HashTable::set( int j, const void *newID, const void *newData ) +{ + if( newData == NULL ) + { + printf("Inserting NULL data is indestinguishable from uninserted data!\n"); + } + aTable[j].id = newID; + aTable[j].data = newData; +} + +void HashTable::clear() +{ + memset( aTable, 0, sizeof(HashNode) * nTableSize ); +} + +bool HashTable::isFilled( int j ) +{ + return (aTable[j].id != NULL)||(aTable[j].bDeleted); +} + +void HashTable::reHash( unsigned long int nNewSize ) +{ + HashNode *aOldTable = aTable; + unsigned long int oldSize = nTableSize; + + // If the table can still be used if we just get rid of deleted items, don't + // change the size of the table, otherwise, go ahead and use the number + // passed in. + if( nSize > nTableSize>>1 ) + { + nTableSize = nextPrime( nNewSize ); + } + + aTable = newTable( nTableSize ); + //for( int j = 0; j < nTableSize; j++ ) if( aTable[j].id || aTable[j].data || aTable[j].bDeleted ) printf("Unclean entry\n"); + + nSize = 0; + nFilled = 0; + + for( unsigned long int j = 0; j < oldSize; j++ ) + { + if( aOldTable[j].id != NULL && aOldTable[j].bDeleted == false ) + { + insert( aOldTable[j].id, aOldTable[j].data ); + } + } + + delete[] aOldTable; +} + +unsigned long int HashTable::probe( unsigned long int nStart, const void *id ) +{ + int nHash = nStart; + nStart = nStart%nTableSize; + if( bAllowDupes == true ) + { + for( + unsigned long int j=0; + isFilled( nStart ) && j < 32; + nStart = (nStart+(1<cmpIDs( aTable[nStart].id, id ) == true && + aTable[nStart].bDeleted == false ) + { + return nStart; + } + } + } + } + // This is our insurance, if the table is full, then go ahead and rehash, + // then try again. + if( isFilled( nStart ) ) + { + reHash( getCapacity()*2 ); + return probe( nHash, id ); + } + return nStart; +} + +HashTable::HashNode *HashTable::newTable( unsigned long int nNewSize ) +{ + return new HashNode[nNewSize]; +} + +#ifdef HASH_DEBUG_VIS +void HashTable::printDebugLine( const char *exData ) +{ + char *buf = new char[getCapacity()+3]; + int j; + buf[0] = '['; + for( j = 0; j < getCapacity(); j++ ) + { + buf[j+1] = (aTable[j].bDeleted)?('X'):((isFilled( j ))?('#'):('-')); + } + buf[j+1] = ']'; + buf[j+2] = '\0'; + printf("%s %s\n", buf, exData ); + delete[] buf; +} +#endif + +bool HashTable::insert( const void *id, const void *data ) +{ + unsigned long int nPos = probe( hFunc->hash( id ), id )%nTableSize; + + if( bAllowDupes == true ) + { + if( aTable[nPos].id == NULL && aTable[nPos].bDeleted == false ) + { + set( nPos, id, data ); +#ifdef HASH_DEBUG_VIS + printDebugLine( (const char *)id ); +#endif + nSize++; + nFilled++; + return true; + } + else + { + return false; + } + } + else + { + if( aTable[nPos].id == NULL && aTable[nPos].bDeleted == false ) + { + set( nPos, id, data ); +#ifdef HASH_DEBUG_VIS + printDebugLine( (const char *)id ); +#endif + nSize++; + nFilled++; + return true; + } + else if( hFunc->cmpIDs( aTable[nPos].id, id ) == true ) + { + set( nPos, id, data ); +#ifdef HASH_DEBUG_VIS + printDebugLine( (const char *)id ); +#endif + return true; + } + else + { + return false; + } + } +} + +const void *HashTable::get( const void *id, unsigned long int nSkip ) +{ + unsigned long int nPos = hFunc->hash( id )%nTableSize; + + for( unsigned long int j=0; j < 32; nPos = (nPos+(1<cmpIDs( id, aTable[nPos].id ) ) + { + if( nSkip == 0 ) + { + return aTable[nPos].data; + } + else + { + nSkip--; + } + } + } + } + + if( bAllowDupes ) + { + unsigned long int nOldPos = nPos; + for( nPos++; nPos != nOldPos; nPos=(nPos+1)%nTableSize ) + { + if( !isFilled( nPos ) ) return NULL; + if( aTable[nPos].bDeleted == false ) + { + if( hFunc->cmpIDs( id, aTable[nPos].id ) ) + { + if( nSkip == 0 ) + { + return aTable[nPos].data; + } + else + { + nSkip--; + } + } + } + } + } + + return NULL; +} + +const void *HashTable::getKey( const void *id, unsigned long int nSkip ) +{ + unsigned long int nPos = hFunc->hash( id )%nTableSize; + + for( unsigned long int j=0; j < 32; nPos = (nPos+(1<cmpIDs( id, aTable[nPos].id ) ) + { + if( nSkip == 0 ) + { + return aTable[nPos].id; + } + else + { + nSkip--; + } + } + } + } + + if( bAllowDupes ) + { + unsigned long int nOldPos = nPos; + for( nPos++; nPos != nOldPos; nPos=(nPos+1)%nTableSize ) + { + if( !isFilled( nPos ) ) return NULL; + if( aTable[nPos].bDeleted == false ) + { + if( hFunc->cmpIDs( id, aTable[nPos].id ) ) + { + if( nSkip == 0 ) + { + return aTable[nPos].id; + } + else + { + nSkip--; + } + } + } + } + } + + return NULL; +} + +void *HashTable::getFirstItemPos() +{ + HashPos *pos = new HashPos; + return pos; +} + +const void *HashTable::getItemData( void *xPos ) +{ + return aTable[((HashPos *)xPos)->nPos].data; +} + +const void *HashTable::getItemID( void *xPos ) +{ + return aTable[((HashPos *)xPos)->nPos].id; +} + +void *HashTable::getNextItemPos( void *xPos ) +{ + HashPos *pos = (HashPos *)xPos; + if( pos->bStarted == false ) + { + pos->bStarted = true; + pos->nPos = 0; + } + else + { + pos->nPos++; + } + if( pos->nPos < nTableSize ) + { + for( ; pos->nPos < nTableSize; pos->nPos++ ) + { + if( isFilled( pos->nPos ) && + aTable[pos->nPos].bDeleted == false ) + { + return xPos; + } + } + } + + delete pos; + + return NULL; +} + +// Big-O sqrt(n) +// Change this to be erethpothynies table with a storage +// lookup later on. +bool HashTable::isPrime (int num) +{ + if (num == 2) // the only even prime + return true; + else if (num % 2 == 0) // other even numbers are composite + return false; + else + { + //bool prime = true; + int divisor = 3; + int upperLimit = static_cast(sqrt(num) + 1); + while (divisor <= upperLimit) + { + if (num % divisor == 0) + return false; + // prime = false; + divisor +=2; + } + return true; + } +} + +// Big-O n^(3/2) +int HashTable::nextPrime( int base ) +{ + int nPrime; + for( nPrime = base; isPrime( nPrime ) == false; nPrime++ ); + return nPrime; +} + +unsigned long int HashTable::getCapacity() +{ + return nTableSize; +} + +unsigned long int HashTable::getSize() +{ + return nSize; +} + +double HashTable::getLoad() +{ + return (double)(nFilled)/(double)(nTableSize); +} + +const void *HashTable::operator[](const void *id) +{ + return get( id ); +} + +bool HashTable::del( const void *id, int nSkip ) +{ + unsigned long int nPos = hFunc->hash( id )%nTableSize; + + for( unsigned long int j=0; j < 32; nPos = (nPos+(1<cmpIDs( id, aTable[nPos].id ) && + aTable[nPos].bDeleted == false ) + { + if( nSkip == 0 ) + { + aTable[nPos].bDeleted = true; + nSize--; +#ifdef HASH_DEBUG_VIS + printDebugLine( (const char *)id ); +#endif + return true; + } + else + { + nSkip--; + } + } + } + + return false; +} + diff --git a/src/old/hashtable.h b/src/old/hashtable.h new file mode 100644 index 0000000..179b694 --- /dev/null +++ b/src/old/hashtable.h @@ -0,0 +1,308 @@ +/**\hashtable.h + * Describes the HashFunction, HashFunctionString, and HashTable classes. It + * was just easier to put them all in one set of files. + *@author Mike Buland + */ + +#ifndef HASH_TABLE_H +#define HASH_TABLE_H + +//Uncomment this line to see a cool text-mode visualization of what's going on +//#define HASH_DEBUG_VIS 1 + +#include +#include +#include + +#include "hashfunction.h" + +/** + * A simple yet flexable hash-table. This uses several tricks to help ensure + * that the table is always running at maximum efficiency. You no longer have + * to specify a "danger fill level" when more space is needed a rehash is + * automatically trigered. Deleting elements is fully supported, as well as + * duplicate elements. To work with and allow duplicates simple construct your + * HashTable the way you normally would, but when deleting or getting elements + * you can specify a skip value. This effectively allows you to treat elements + * with duplicate ID's as though they were in a zero-based array. The first + * element inserted with a given ID would be at skip zero, the next at skip 1 + * and so on. This allows you to quickly search for elements with duplicate + * names, just stop when you get a null for a skip number, i.e. + * 
+ *   for( int j = 0;; j++ )
+ *   {
+ *       void *pData = hash.get( myID, j );
+ *       if( !pData ) break;
+ *       // Do something interesting with pData
+ *   }
+ *
+ * There are new features in this HashTable that also allow for memory saving + * when dealing with systems where many elements are being deleted from the + * table. In those cases the elements deleted cannot be simply deleted, instead + * they have to be marked as deleted and hidden from the user, but maintained in + * the table so that future hashing operations don't fail. When rehashing + * occurs all elements marked as deleted are quietly removed. In these cases, + * if the number of deleted items would free enough space in the table for the + * table to be used efficiently without resizing, it is left the same size and + * rehashing is performed effectively in place, allowing the deleted items to + * be removed. + *
+ * For info on adding new hashing algorithms, please see the HashFunction class. + *@author Mike Buland + *@todo Fix probing for tables that allow duplicates, and delete an item, then + * insert an item with the same name. + */ +class HashTable +{ +public: + /** Constructs a hash table. + *@param hNewFunc A pointer to a hashfunction class to use. If this is + * null the default general string type will be used. + *@param nInitSize The initial size of the hashtable. + *@param bAllowDupes Setting this value to true allows the system to + * insert more than one copy of any given key. This can be tricky, and + * will require you to use the nSkip parameter on the get function. + */ + HashTable( HashFunction *hNewFunc, unsigned long int nInitSize, bool bAllowDupes=false ); + + /** + * Destroys the hashtable, cleaning up all internal storage, but not stored + * elements. Also deletes the HashFunction passed in in the constructor. + */ + virtual ~HashTable(); + + /** Inserts an item into the hashtable. This function will trigger a + * rehash if adding another item would force the table's load factor over + * the danger level. + *@param id used to find the data later. + *@param data The data item to insert into the table with the identifier + * id + *@returns True if insertion was successfull, and false if it failed. + */ + bool insert( const void *id, const void *data ); + + /** Gets an item in the hashtable based on the id of that item. If there + * is more than one item with the same id you can use the nSkip parameter + * to access all of them. + *@param id The id of the item you're trying to find. + *@param nSkip The number of items with that id to skip before returning + * with the requested item. + *@returns A pointer to the data stored at the given id. + */ + const void *get( const void *id, unsigned long int nSkip=0 ); + + const void *getKey( const void *id, unsigned long int nSkip=0 ); + + /** Gets the total capacity of the hashtable. This is actually the number + * of total positions available inside the hashtable at the moment. This + * will change when the hashtable's load exceeds the danger level. + * Please note that this is NOT the actual amount of space available. + * In reality you can only access about 45-50 percent of that space. + *@returns The total capacity. + */ + unsigned long int getCapacity(); + + /** Gets the number of filled in items in the hash table. This is roughly + * equivelent to the getSize function assosiated with the Lists. + *@returns The number of filled in items in the hash table. + */ + unsigned long int getSize(); + + /** Gets the load (percentage) of filled in items in the table. This is + * technically the size divided by the capacity, but is definately usefull + * since it's required to check if it's time to rehash. + *@returns The table load in the range 0.0 to 1.0 + */ + double getLoad(); + + /** Sets up an xPos object for use indexing the items in the table. Call + * this first and follow the directions for getNextItemPos below to + * iterate through every item in the table, while avoiding the empty + * spaces. + *@returns A pointer to a xPos object telling the hashtable where to find + * the item you're looking at. + */ + void *getFirstItemPos(); + + /** Get the item's data that is being pointed to by xPos. This is only + * valid after xPos was created using getFirstItemPos and getNextItemPos + * was called at least once. + *@param xPos supplied by getFirstItemPos. + *@returns The key value that was used to insert the data into the table. + */ + const void *getItemData( void *xPos ); + + /** Get the item's ID that is being pointed to by xPos. This is only + * valid after xPos was created using getFirstItemPos and getNextItemPos + * was called at least once. + *@param xPos supplied by getFirstItemPos. + *@returns The key value that was used to insert the data into the table. + */ + const void *getItemID( void *xPos ); + + /** Used for iterating through a hash table sequentially. This will + * update the xPos pointer to point to the next time, all ready to + * be accessed with getItemID and getItemData. This must be called at + * least once before xPos is meaningful, and will return a NULL when it + * has reached the last item. + *@param xPos This must be an object created by a call to the function + * getFirstItemPos, and is only meaningful to the internal routines. + * Aborting a call in the middle (not running to the end of the table) + * may result in a memory leak at the moment. + *@returns xPos if still iterating through the list, otherwise it will + * return NULL when the end has been reached and the xPos variable has + * been deleted. + */ + void *getNextItemPos( void *xPos ); + + /** A helpful operator to make accessing items easier. Please note that + * this simply returns a pointer to the data stored internally, and cannot + * be used like the STL operator to store new data, use insert for that. + *@param id The identifier used to store the requested item. + *@returns The data value assosiated with the given id, or NULL if it + * wasn't found in the table. + */ + const void *operator[](const void *id); + + /** + * Delete the specified item from the hashtable. This actually keeps the + * data and marks it deleted. For all intents and purposes to the user it + * is deleted, except that the space is still used until a rehash is forced. + * This means that in hashtables where elements are being inserted and + * deleted frequently you may run into a higher rate of expansion. + *@param id The ID to delete. + *@param nSkip The number of similar id's to skip before deleting in a + * hashtable that allows duplicates. + *@returns True if the element was found and deleted, false otherwise. + */ + bool del( const void *id, int nSkip=0 ); + + /** + * Deletes every entry in the hash table. See the notes on del to see what + * this means, except that since no data is being kept, the entire table is + * just marked as usable space. + */ + void clear(); + +private: + /** + * Contains info related to a position in the hashtable. Used for + * searching through hashtables one item at a time, in order. This class + * should never be created by anything but a HashTable, and should never + * be referenced directly. Instead the hashtable returns a void pointer, + * which is what should be passed back in next time you use a search + * function. Always finish a search, since the object is deleted at the + * end of the search. + *@author Mike Buland + */ + class HashPos + { + public: + /** Create a blank HashPos. */ + HashPos() { bStarted=false; nPos = 0; }; + /** Has the search been started? */ + bool bStarted; + /** The position (index) into the backend storage structure. */ + unsigned long int nPos; + }; + + /** + * All data related to a single element in the hashtable. This should + * really only be used and manipulated by the HashTable itself. + *@author Mike Buland + */ + typedef struct HashNode + { + public: + /** Create a new, empty HashNode. */ + HashNode() { id = NULL; data = NULL; bDeleted = false; }; + /** A pointer to the original ID that was used to key the data. */ + const void *id; + /** A pointer to the data stored along with the above ID. */ + const void *data; + /** Weather or not this data should really...exist */ + bool bDeleted; + } HashNode; + +private: + /** + * Just sets the values in the element to some friendly values. + *@param newID The new ID to store. + *@param newData The new Data to store. + */ + void set( int j, const void *newID, const void *newData ); + /** + * Tells you if the node is filled or not. + *@returns True=an ID has been stored here, False=no ID. + */ + bool isFilled( int j ); + /** + * This actually resizes, but since every resize requires a reHash to go + * along with it, that's the name. This actually creates a new buffer for + * all of the contained data and then pulls every old element that was in + * the old table out and performs the hashing placement calculations again. + * This function skips all data that was marked as deleted, so at this + * point it really will be. + *@param nNewSize The new size to set the table to while re-hashing. + *@returns True if the operation was successful, false otherwise. + */ + void reHash( unsigned long int nNewSize ); + + /** + * Helper function to allocate a new table. Really just does the memory + * allocation. + *@param nNewSize The size of the table to generate. + *@returns A new, blank array of HashNode objects the size you specified. + */ + HashNode *newTable( unsigned long int nNewSize ); + + /** + * This function is used once an actual hash code is obtained. nStart is + * the given hash code, which is then wrapped to the size of the table. If + * there is data at that location, tests are performed to see if it's the + * right one. If it is, then it is returned, otherwise a series of further + * tests based on a 2^n search pattern is performed. The position of the + * requested data in the back-end storage is returned if found, otherwise + * another less useful value is returned... + *@param nStart The initial hashcode of the ID testing for. + *@param id A pointer to the id that is being searched for. + *@returns The real location of the data requested. + */ + unsigned long int probe( unsigned long int nStart, const void *id ); + + /** + * Simple helper function to determine if a number is prime or not. + * This function runs in sqrt(n) time. + *@param num Number to test for prime-hood. + *@returns True if the number is prime, false otherwise. + */ + bool isPrime( int num ); + + /** + * Given any number, this function finds the first number after it that is + * prime. Since this number is a multiple internally it's rare that the + * starting number would be prime. + *@param base The number to start the prime search on. + *@returns The first prime after the number given. + */ + int nextPrime( int base ); + +#ifdef HASH_DEBUG_VIS + void printDebugLine( const char *exData ); +#endif + + /** A pointer to the HashFunction subclass instance to use. */ + HashFunction *hFunc; + /** The complete array of HashNode objects to store data in. */ + HashNode *aTable; + /** The actual size of the table, not how many elements are in it. */ + unsigned long int nTableSize; + /** The number of elements that are in the table. */ + unsigned long int nSize; + /** The number of elements that are unavailable now. */ + unsigned long int nFilled; + /** Allow duplicate ID's in the table. */ + bool bAllowDupes; +}; + +#endif diff --git a/src/old/http.cpp b/src/old/http.cpp new file mode 100644 index 0000000..df7dafe --- /dev/null +++ b/src/old/http.cpp @@ -0,0 +1,377 @@ +#include +#include +#include "http.h" +#include "hashfunctionstring.h" + +Http::Http( Connection *pConnection ) : hReqHeader( new HashFunctionString(), 100 ) +{ + pCon = pConnection; + nParseState = parseInit; +} + +Http::~Http() +{ + for( int j = 0; j < lStrings.getSize(); j++ ) + { + delete (std::string *)lStrings[j]; + } +} + +bool Http::parseRequest() +{ + for(;;) + { + pCon->readInput(); + switch( nParseState ) + { + case parseInit: + { + int nLen = pCon->scanInputFor( CR ); + if( nLen == -1 ) + { + return false; + } + else + { + nReqType = getRequestType( pCon->getInput() ); + pCon->usedInput( pCon->scanInputFor(' ')+1 ); + + nLen = pCon->scanInputFor(' '); + sReqURI.append( pCon->getInput(), nLen ); + pCon->usedInput( nLen+1 ); + + if( !strncmp( pCon->getInput(), "HTTP/", 5 ) ) + { + char mbuf[2]={'\0','\0'}; + unsigned char major, minor; + + pCon->usedInput( 5 ); + mbuf[0] = pCon->getInput()[0]; + major = (unsigned char)atoi(mbuf); + mbuf[0] = pCon->getInput()[2]; + minor = (unsigned char)atoi(mbuf); + setRequestVersion( major, minor ); + if( checkRequestVer() ) + { + nParseState = parseHeader; + } + else + { + setResponseStatus( statusHTTPVersionNotSupported ); + //printf("Verson not supported.\n"); + return true; + } + + pCon->usedInput( 5 ); + } + else + { + setResponseStatus( statusBadRequest ); + } + + //return false; + } + } + break; + + case parseHeader: + { + int nLen = pCon->scanInputFor( CR ); + //printf("nLen = %d: :::%s:::\n", nLen, pCon->getInput() ); + if( nLen == -1 ) + { + pCon->readInput( 1, 0); + } + else if( nLen == 0 ) + { + // We've got our double-newline, time for content. + pCon->usedInput( 2 ); + setResponseStatus( statusOK ); + return true; + } + else + { + nLen = pCon->scanInputFor(':'); + if( nLen == -1 ) + { + //printf("No colon? what are you trying to pull?\n"); + } + else + { + std::string *pName = new std::string( pCon->getInput(), nLen ); + lStrings.append( pName ); + pCon->usedInput( nLen+1 ); + + nLen = pCon->scanInputFor( CR ); + std::string *pValue = convSpaceString( pCon->getInput(), nLen ); + lStrings.append( pValue ); + pCon->usedInput( nLen+2 ); + + hReqHeader.insert( + pName->c_str(), + pValue->c_str() + ); + + //printf("::%s = \"%s\"\n", + // pName->c_str(), + // pValue->c_str() + // ); + } + } + } + break; + + case parseFinished: + break; + } + } +} + +bool Http::buildResponse( short nResponseCode, const char *sResponse ) +{ + if( nResponseCode > 0 ) + { + nResStatus = nResponseCode; + } + + if( sResponse == NULL ) + { + sResStatusStr = "uh yeah"; + } + else + { + sResStatusStr = sResponse; + } + + time_t curTime; + time( &curTime ); + gmtime_r( &curTime, &tResTime ); + + sServerStr = "libbu++ Http/0.0.1"; + bResPersistant = false; + + //char buf[30]; + //strftime( buf, 30, "%a, %d %b %Y %H:%M:%S GMT", &tResponseTime ); + + return true; +} + +bool Http::sendResponse() +{ + char buf[256]; + + sprintf( buf, "HTTP/1.1 %d %s\r\n", nResStatus, sResStatusStr.c_str() ); + pCon->appendOutput( buf ); + + strftime( buf, 256, "Date: %a, %d %b %Y %H:%M:%S GMT\r\n", &tResTime ); + pCon->appendOutput( buf ); + + sprintf( buf, "Server: %s\r\n", sServerStr.c_str() ); + pCon->appendOutput( buf ); + + if( bResPersistant ) + { + } + else + { + pCon->appendOutput("Connection: close\r\n"); + } + + sprintf( buf, "Content-Type: %s\r\n", sResMime.c_str() ); + pCon->appendOutput( buf ); + + sprintf( buf, "Content-Length: %d\r\n", sResContent.size() ); + pCon->appendOutput( buf ); + + pCon->appendOutput("\r\n"); + + pCon->appendOutput( sResContent.c_str(), sResContent.size() ); + + return true; +} + +void Http::setResponsePersistant( bool bPersistant ) +{ + bResPersistant = bPersistant; +} + +void Http::setResponseContent( const char *sMime, const char *sContent, int nLen ) +{ + sResMime = sMime; + sResContent.erase(); + sResContent.append( sContent, nLen ); +} + +std::string *Http::convSpaceString( const char *sStr, int nLen ) +{ + int nNewLen = 0; + bool bStart = true; + bool bSpace = false; + + for( int j = 0; j < nLen; j++ ) + { + if( sStr[j] == ' ' || sStr[j] == '\t' ) + { + if( bStart ) + { + } + else if( bSpace == false ) + { + bSpace = true; + nNewLen++; + } + } + else + { + bStart = false; + bSpace = false; + nNewLen++; + } + } + if( bSpace ) + { + nNewLen--; + } + + std::string *pSStr = new std::string; + //char *pStr = pSStr->c_str(); + nNewLen = 0; + bStart = true; + bSpace = false; + + for( int j = 0; j < nLen; j++ ) + { + if( sStr[j] == ' ' || sStr[j] == '\t' ) + { + if( bStart ) + { + } + else if( bSpace == false ) + { + bSpace = true; + *pSStr += ' '; + //pStr[nNewLen++] = ' '; + } + } + else + { + bStart = false; + bSpace = false; + *pSStr += sStr[j]; + //pStr[nNewLen++] = sStr[j]; + } + } + if( bSpace == true ) + { + nNewLen--; +// pStr[nNewLen] = '\0'; + } + + return pSStr; +} + +const char *Http::getRequestURI() +{ + return sReqURI.c_str(); +} + +short Http::getRequestType( const char *sType ) +{ + if( !strncmp( sType, "OPTIONS", 7 ) ) + { + return reqOptions; + } + else if( !strncmp( sType, "GET", 3 ) ) + { + return reqGet; + } + else if( !strncmp( sType, "HEAD", 4 ) ) + { + return reqHead; + } + else if( !strncmp( sType, "POST", 4 ) ) + { + return reqPost; + } + else if( !strncmp( sType, "PUT", 3 ) ) + { + return reqPut; + } + else if( !strncmp( sType, "DELETE", 6 ) ) + { + return reqDelete; + } + else if( !strncmp( sType, "TRACE", 5 ) ) + { + return reqTrace; + } + else if( !strncmp( sType, "CONNECT", 7 ) ) + { + return reqConnect; + } + else + { + printf(" Uh oh, extension!\n"); + return reqExtension; + } +} + +const char *Http::getRequestType( short nType ) +{ + switch( nType ) + { + case reqOptions: return "OPTIONS"; + case reqGet: return "GET"; + case reqHead: return "HEAD"; + case reqPost: return "POST"; + case reqPut: return "PUT"; + case reqDelete: return "DELETE"; + case reqTrace: return "TRACE"; + case reqConnect: return "CONNECT"; + case reqExtension: return "EXTENSION"; + default: return "INVALID VALUE"; + } +} + +short Http::getRequestType() +{ + return nReqType; +} + +const char *Http::getRequestTypeStr() +{ + return getRequestType( nReqType ); +} + +void Http::setResponseStatus( short nStatus ) +{ + nResStatus = nStatus; +} + +void Http::setRequestVersion( unsigned char nMajor, unsigned char nMinor ) +{ + cReqVersion = (nMajor<<4)|nMinor; +} + +unsigned char Http::getRequestMinorVer() +{ + return cReqVersion&0x0F; +} + +unsigned char Http::getRequestMajorVer() +{ + return cReqVersion>>4; +} + +bool Http::checkRequestVer() +{ + if( cReqVersion == HTTP11 ) + return true; + return false; +} + +const char *Http::getHeader( const char *lpStr ) +{ + return (const char *)hReqHeader[lpStr]; +} + diff --git a/src/old/http.h b/src/old/http.h new file mode 100644 index 0000000..7e9f9a0 --- /dev/null +++ b/src/old/http.h @@ -0,0 +1,273 @@ +/**\file http.h + * Describe a Hyper Text Transfer Protocol processor. This class will allow + * any program to act as either an HTTP server, client, or both. It contains + * a number of additional helpers and subclasses. + *@author Mike Buland + */ + +#ifndef HTTP_H +#define HTTP_H + +#include +#include "connection.h" +#include "linkedlist.h" +#include "hashtable.h" + +#define CR '\r' /**< The ASCII value of a Carrage Return */ +#define LF '\n' /**< The ASCII value of a Line Feed */ +#define CRLF CR LF /**< Combo of CR+LF for use in http */ + +/** + * Macro to create combined http version codes. This just makes processing a + * little bit faster for the most part. + *@param maj Major version number, between 0 and 15 + *@param min Minor version number, between 0 and 15 + *@returns A one byte combined version number suitable for use in switches. + */ +#define HTTPVER( maj, min ) ((maj<<4)|(min)) + +#define HTTP10 HTTPVER( 1, 0 ) /**< Combined version code for http 1.0 */ +#define HTTP11 HTTPVER( 1, 1 ) /**< Combined version code for http 1.1 */ + +/** + * This is the master HTTP processing class. One instance handles one + * transaction, in the future a different mechanism may be thought up, but for + * now this means that you must create multiple objects to handle a single + * connection that contains multiple requests. + * In the constructor the Http class is given a connection object. This object + * should already be initialized and connected to whatever socket it wants to + * be sending and receiving data to and from. Once that's done you can call + * parseRequest if you're acting as a server, or a variety of buildRequest + * functions to create and send a request if you're a client. + * Please note that this class does not provide any HTTP or extended format + * processing systems, but will allow for mime types tables to be registered. + *@author Mike Buland + */ +class Http +{ +public: + /** + * Create an Http object tied to an existing connection object. + *@param pConnection The live connection object to deal with. + */ + Http( Connection *pConnection ); + + /** + * Standard Deconstructor. + */ + virtual ~Http(); + + /** + * Perform all parsing needed to figure out what an HTTP client wants from + * us. This will setup a number of properties in the Http object itself + * and has the possibility of setting one or more response states initially. + * These states should be checked for immediately after parsing to see if + * an appropriate error message should be generated. These errors can + * include issues with protocol, data formats, or unknown versions of the + * protocol. + *@returns True means that all processing is finished, false means that + * the parseRequest function should be called again when more data is + * ready. A return value of true does not indicate success, only that + * processing is finished, the getResponseStatus function should be called + * to see what status was set in the parse routine. A 200 indicates that + * as far as the parser is concerned, everything when smoothly. Otherwise + * it's your responsibility to build the appropriate error response body + * (like an html file) and send it as the response. + */ + bool parseRequest(); + + /** + * Get a request type's internal Http object id based on the string + * representation. These can be any HTTP/1.1 standard request type. + *@param sType The string that should be checked for type. This is in all + * caps, just like if it came from the HTTP client, which is most often + * the case. + *@returns The numerical ID of the given request type. Please note that + * HTTP/1.1 standard specifies that any string is valid here as long as + * the non-basic string is a request type understood by the serving + * software. This means that anything that is non-standard will return + * a type reqExtension and not an error. This is not a mistake. + */ + short getRequestType( const char *sType ); + + /** + * Get the string representation of an Http object request type integer ID. + * This is used mainly for debugging to be sure the system has what we + * think it has. + *@param nType The integer ID of the request type to process. + *@returns The HTTP/1.1 string representation of that Http object ID code. + */ + const char *getRequestType( short nType ); + + /** + * Returns the Http object request type ID code that is stored in the + * object by either the parseRequest function or use of the buildRequest + * functions. + *@returns The ID of the request type stored in the object. + */ + short getRequestType(); + + /** + * Same as getRequestType, only returns the string representation. + *@returns The string representation of the request type ID stored in the + * object. + */ + const char *getRequestTypeStr(); + + /** + * Sets the version of the request used by the system. This will be used + * by parse request, but is also part of the buildRequest tool functions. + *@param nMajor The major version number. + *@param nMinor The minor version number. + */ + void setRequestVersion( unsigned char nMajor, unsigned char nMinor ); + + /** + * Gets the major version number of the protocol used/to be used in this + * request. + *@returns The major version number of the request protocol. + */ + unsigned char getRequestMinorVer(); + + /** + * Gets the minor version number of the protocol used/to be used in this + * request. + *@returns The minor version number of the request protocol. + */ + unsigned char getRequestMajorVer(); + + /** + * Checks the stored request version against an internal table of supported + * protocol versions. + *@returns True if the protocol version is supported, false otherwise. + */ + bool checkRequestVer(); + + /** + * Converts an arbitrary string to a new string object with space saving + * operations performed ala the HTTP/1.1 specs. All leading and trailing + * whitespace is stripped, and all whitespace within the string is reduced + * to a single space char. + *@param sStr A pointer to the string data to process. + *@param nLen The length of the string to process. Since this function is + * often called on stream data, there is no null terminator where we need + * one. This is here for convinience so the data doesn't need to be hacked + * up or moved to an intermediate buffer. + *@returns A new string that may well be shorter than the original but that + * will have the same value as far as the HTTP/1.1 specs are concerned. + */ + std::string *convSpaceString( const char *sStr, int nLen ); + + /** + * Gets a string pointer to the URI that was/is being requested. This can + * be any RFC standard URI, with or without protocol and domain. + *@returns A pointer to the URI that was/is being requested. + */ + const char *getRequestURI(); + + /** + * Set a new response status. This status can be anything that the HTTP + * specs allow. Other values are allowed as well, but beware, not all + * servers/clients will accept values that are not in the tables in this + * class. + *@param nStatus The status to set. + */ + void setResponseStatus( short nStatus ); + + bool buildResponse( short nResponseCode=-1, const char *sResponse=NULL ); + void setResponseContent( const char *sMime, const char *sContent, int nLen ); + void setResponsePersistant( bool bPersistant ); + bool sendResponse(); + + enum + { + reqOptions, + reqGet, + reqHead, + reqPost, + reqPut, + reqDelete, + reqTrace, + reqConnect, + reqExtension + }; + + enum + { + statusContinue = 100, + statusSwitchProto = 101, + + statusOK = 200, + statusCreated = 201, + statusAccepted = 202, + statusNonAuthInfo = 203, + statusNoContent = 204, + statusResetContent = 205, + statusPartialContent = 206, + + statusMultiChoices = 300, + statusMovedPermanently = 301, + statusFound = 302, + statusSeeOther = 303, + statusNotModified = 304, + statusUseProxy = 305, + statusUnused = 306, + statusTempRedirect = 307, + + statusBadRequest = 400, + statusUnauthorized = 401, + statusPaymentRequired = 402, + statusForbidden = 403, + statusNotFound = 404, + statusMethodNotAllowed = 405, + statusNotAcceptable = 406, + statusProxyAuthRequired = 407, + statusRequestTimeout = 408, + statusConflict = 409, + statusGone = 410, + statusLengthRequired = 411, + statusPreconditionFailed = 412, + statusRequestEntityTooLarge = 413, + statusRequestURITooLong = 414, + statusUnsupportedMediaType = 415, + statusRequestedRangeNotSatisfiable = 416, + statusExpectationFailed = 417, + + statusInternalServerError = 500, + statusNotImplemented = 501, + statusBadGateway = 502, + statusServiceUnavailable = 503, + statusGatewayTimeout = 504, + statusHTTPVersionNotSupported = 505 + }; + + const char *getHeader( const char *lpStr ); + +private: + Connection *pCon; + unsigned char nParseState; + + short nReqType; + std::string *pReqStr; + std::string sReqURI; + unsigned char cReqVersion; + HashTable hReqHeader; + LinkedList lStrings; + + std::string sServerStr; + std::string sResMime; + std::string sResContent; + std::string sResStatusStr; + bool bResPersistant; + struct tm tResTime; + short nResStatus; + + enum + { + parseInit, + parseHeader, + parseFinished + }; +}; + +#endif diff --git a/src/old/httpget.cpp b/src/old/httpget.cpp new file mode 100644 index 0000000..ee1f29c --- /dev/null +++ b/src/old/httpget.cpp @@ -0,0 +1,263 @@ +#include "httpget.h" +#include "exceptions.h" +#include "connection.h" +#include + +char HttpGet::hexcode[]={'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}; + +HttpGet::HttpGet() : + nPort( 80 ), + sUserAgent("libbu++; HttpGet") +{ +} + +HttpGet::HttpGet( const std::string &url ) : + nPort( 80 ) +{ + setURL( url ); +} + +HttpGet::~HttpGet() +{ +} + +void HttpGet::setURL( const std::string &url ) +{ + int len = url.size(); + //printf("Full URL: %s\n", url.c_str() ); + int pos = url.find("://"); + sProto.assign( url, 0, pos ); + //printf("Protocol: %s\n", sProto.c_str() ); + + int pos2 = url.find("/", pos+3 ); + if( pos2 >= 0 ) + { + sHost.assign( url, pos+3, pos2-pos-3 ); + } + else + { + sHost.assign( url, pos+3, std::string::npos ); + } + + int pos3 = sHost.find(":"); + if( pos3 >= 0 ) + { + nPort = strtol( sHost.c_str()+pos3+1, NULL, 10 ); + sHost.erase( pos3 ); + } + //printf("Hostname: %s\n", sHost.c_str() ); + //printf("Port: %d\n", nPort ); + + pos3 = url.find("?", pos2+1 ); + if( pos3 >= 0 ) + { + sPath.assign( url, pos2, pos3-pos2 ); + //printf("Path: %s\n", sPath.c_str() ); + for(;;) + { + int end = pos3+1; + for(; url[end] != '=' && url[end] != '&' && end < len; end++ ); + std::string sKey, sValue; + sKey.assign( url, pos3+1, end-pos3-1 ); + if( url[end] == '=' ) + { + pos3 = end; + for( end++; url[end] != '&' && end < len; end++ ); + sValue.assign( url, pos3+1, end-pos3-1 ); + pos3 = end; + } + else + { + } + lParams.push_back( StringPair( sKey, sValue ) ); + //printf("Param: %s = %s\n", sKey.c_str(), sValue.c_str() ); + if( end+1 >= len ) break; + } + } + else + { + sPath.assign( url, pos2, std::string::npos ); + //printf("Path: %s\n", sPath.c_str() ); + } + + //printf("\n"); +} + +void HttpGet::addParam( const std::string &key, const std::string &value ) +{ + lParams.push_back( StringPair( key, value ) ); +} + +std::string HttpGet::escape( const std::string &src ) +{ + std::string escaped(""); + for( std::string::const_iterator i = src.begin(); i != src.end(); i++ ) + { + unsigned char j = *i; + if( (j >= '0' && j <= '9') || + (j >= 'a' && j <= 'z') || + (j >= 'A' && j <= 'Z') || + j == '$' || + j == '-' || + j == '_' || + j == '.' || + j == '+' || + j == '!' || + j == '*' || + j == '\'' || + j == '(' || + j == ')' ) + { + escaped += j; + } + else + { + escaped += "%"; + escaped += hexcode[j>>4]; + escaped += hexcode[j&0x0F]; + } + } + + return escaped; +} + +SBuffer *HttpGet::get() +{ + std::string sData; + sData = "GET " + sPath; + if( !lParams.empty() ) + { + sData += "?"; + for( std::list::iterator i = lParams.begin(); + i != lParams.end(); i++ ) + { + if( i != lParams.begin() ) + sData += "&"; + + if( (*i).second == "" ) + { + sData += escape( (*i).first ); + } + else + { + sData += escape( (*i).first ); + sData += "="; + sData += escape( (*i).second ); + } + } + } + + sData += " HTTP/1.1\r\n" + "User-Agent: " + sUserAgent + "\r\n" + "Connection: close\r\n" + "Host: " + sHost + "\r\n" + "Content-type: application/x-www-form-urlencoded\r\n\r\n"; + + //printf("Connection content:\n\n%s\n\n", sData.c_str() ); + + Connection con; + //printf("Opening connection...\n"); + con.open( sHost.c_str(), nPort ); + { + int nSocket = con.getSocket(); + fd_set rfds, wfds, efds; + int retval; + + FD_ZERO(&rfds); + FD_SET(nSocket, &rfds); + FD_ZERO(&wfds); + FD_SET(nSocket, &wfds); + FD_ZERO(&efds); + FD_SET(nSocket, &efds); + + struct timeval tv; + tv.tv_sec = 4; + tv.tv_usec = 0; + + //printf("Selecting on socket, can we read, write, etc?\n"); + retval = select( nSocket+1, &rfds, &wfds, &efds, &tv ); + /*printf("About to write: sock=%d, r=%d, w=%d, e=%d, ret=%d\n", + nSocket, + FD_ISSET( nSocket, &rfds ), + FD_ISSET( nSocket, &wfds ), + FD_ISSET( nSocket, &efds ), + retval + );*/ + + if( retval == 0 ) + { + //printf("Timeout on connection.\n"); + con.close(); + throw ExceptionBase("Connection Timeout on open.\n"); + } + + } + con.appendOutput( sData.c_str(), sData.size() ); + //printf("Writing to socket...\n"); + con.writeOutput(); + //printf("Data written...\n"); + int nSec = 5; + int nUSec = 0; + int nLastAmnt = con.getInputAmnt(); + try + { + double dTotTime = 0.0; + //printf("About to read input...\n"); + while( con.readInput( nSec, nUSec, &nSec, &nUSec ) ) + { + if( nLastAmnt == con.getInputAmnt() ) + { + if( nSec <= 0 && nUSec <= 0 ) + { + //printf("out of time, closing up.\n"); + con.close(); + throw ExceptionBase("Connection Timeout.\n"); + } + if( nSec == 5 && nUSec == 0 ) + { + //printf("No new data, breaking.\n"); + break; + } + } + else + { + dTotTime += (5.0-(nSec+nUSec/1000000.0)); + printf("\rRead %db at %.2fkb/sec", + con.getInputAmnt(), + ((double)(con.getInputAmnt())/1024.0) / dTotTime + ); + fflush( stdout ); + nSec = 5; + nUSec = 0; + nLastAmnt = con.getInputAmnt(); + } + } + } + catch( ConnectionException &e ) + { + //con.close(); + if( strcmp( e.what(), "Connection closed" ) ) + printf("\nConnectionException: %s\n", e.what() ); + } + + int total = con.getInputAmnt(); + const char *dat = con.getInput(); + //printf("\n===> Final size %d\n", total ); + for( int i = 0; i < total; i++ ) + { + if( !memcmp( dat+i, "\r\n\r\n", 4 ) ) + { + SBuffer *buf = new SBuffer; + buf->write( dat+i+4, total-i-4 ); + buf->setPos( 0 ); + con.close(); + return buf; + } + } + con.close(); + + //printf("\n\n%s\n\n", dat ); + + throw ExceptionBase("Something went wrong, incomplete response? fix this.\n"); +} + diff --git a/src/old/httpget.h b/src/old/httpget.h new file mode 100644 index 0000000..8272641 --- /dev/null +++ b/src/old/httpget.h @@ -0,0 +1,44 @@ +#ifndef HTTP_GET_H +#define HTTP_GET_H + +#include +#include +#include +#include + +#include "sbuffer.h" + +class HttpGet +{ +public: + HttpGet(); + HttpGet( const std::string &url ); + virtual ~HttpGet(); + + void setURL( const std::string &url ); + void addParam( const std::string &key, const std::string &value ); + void setUserAgent( const std::string &sUserAgent ) + { + this->sUserAgent = sUserAgent; + } + void setHost( const std::string &sHost ) + { + this->sHost = sHost; + } + + std::string escape( const std::string &src ); + SBuffer *get(); + +private: + std::string sProto; + std::string sHost; + std::string sPath; + int nPort; + std::string sUserAgent; + typedef std::pair StringPair; + std::list lParams; + static char hexcode[]; + +}; + +#endif diff --git a/src/old/linkedlist.cpp b/src/old/linkedlist.cpp new file mode 100644 index 0000000..a9902bc --- /dev/null +++ b/src/old/linkedlist.cpp @@ -0,0 +1,210 @@ +#include "linkedlist.h" + +LinkedList::LinkedList( ) +{ + pBase = NULL; + pTop = NULL; + pLast = NULL; + nSize = 0; + nLast = -1; +} + +LinkedList::~LinkedList( ) +{ +/* + Link *pCur = pBase; + while( pCur ) + { + Link *pLast = pCur; + pCur = pCur->pNext; + delete pLast; + } +*/ + empty(); +} + +void *LinkedList::getAt( int index ) +{ + if( index < 0 || index >= nSize ) + return NULL; + + return getPtrTo( index )->pData; +} + +void LinkedList::append( void *data ) +{ + if( pBase == NULL ) + { + pBase = new Link( data ); + pTop = pBase; + nSize++; + } + else + { + pTop->pNext = new Link( data ); + pTop = pTop->pNext; + nSize++; + } +} + +void LinkedList::insertBefore( void *data, int pos ) +{ + if( pos < 0 || pos > nSize ) + return; + + if( pos == 0 ) + { + Link *pTmp = new Link( data, pBase ); + if( pBase == NULL ) + { + pTop = pTmp; + } + pBase = pTmp; + if( nLast >= 0 ) nLast++; + nSize++; + } + else + { + Link *pCur; + if( (pCur = getPtrTo( pos-1 )) == NULL ) + { + return; + } + Link *pNew = new Link( data, pCur->pNext ); + pCur->pNext = pNew; + if( pNew->pNext == NULL ) + { + pTop = pNew; + } + if( nLast >= pos ) nLast++; + nSize++; + } +} + +int LinkedList::getSize( ) +{ + return nSize; +} + +bool LinkedList::isEmpty( ) +{ + if( nSize == 0 ) + return true; + return false; +} + +void LinkedList::deleteAt( int index ) +{ + if( index >= nSize || + pBase == NULL ) + return; + + if( index == 0 ) + { + Link *pTmp = pBase->pNext; + delete pBase; + pBase = pTmp; + if( nLast >= 0 ) nLast--; + nSize--; + if( pBase == NULL ) + { + pTop = NULL; + } + else if( pBase->pNext == NULL ) + { + pTop = pBase; + } + } + else + { + Link *pCur = getPtrTo( index-1 ); + if( pCur->pNext == pTop ) + { + pTop = pCur; + } + Link *pTmp; + if( pCur->pNext == NULL ) + { + pTmp = NULL; + } + else + { + pTmp = pCur->pNext->pNext; + } + delete pCur->pNext; + pCur->pNext = pTmp; + if( nLast == index ) nLast = -1; + else if( index < nLast ) nLast--; + nSize--; + } +} + +void LinkedList::empty() +{ + while( nSize > 0 ) + { + deleteAt( 0 ); + } +} + +void LinkedList::setSize( int newSize ) +{ + if( newSize < nSize ) + { + // Delete items off of the end of the list. + while( nSize > newSize ) + { + deleteAt( nSize-1 ); + } + } + else + { + // Add null items to the end of the list. + while( nSize < newSize ) + { + append( NULL ); + } + } +} + +void LinkedList::setAt( int index, void *data ) +{ + if( index >= nSize || index < 0 ) + return; + + getPtrTo( index )->pData = data; +} + +LinkedList::Link *LinkedList::getPtrTo( int index ) +{ + if( index < 0 || index >= nSize ) + return NULL; + if( index == nLast ) + { + return pLast; + } + if( index == 0 ) + { + pLast = pBase; + nLast = 0; + return pBase; + } + else + { + Link *pCur = pBase; + int nCur = 0; + if( nLast < index && nLast >= 0 ) + { + pCur = pLast; + nCur = nLast; + } + while( nCur != index ) + { + pCur = pCur->pNext; + nCur++; + } + nLast = index; + pLast = pCur; + return pCur; + } +} diff --git a/src/old/linkedlist.h b/src/old/linkedlist.h new file mode 100644 index 0000000..e430108 --- /dev/null +++ b/src/old/linkedlist.h @@ -0,0 +1,87 @@ +/**@file + * Describes the LinkedList implementation of the List ADT. + *@author Mike Buland + */ + +#ifndef LINKEDLIST_H +#define LINKEDLIST_H + +#include +#include "list.h" + +/** A linked-item implementation of the List ADT. Since the data is linked + * sequentially this is a great choice for lists that will grow and shrink + * a lot, but don't require as much random access. This implementation + * includes optomizations that make iterating through data, and appending + * items to the list take O(1) time. + *@author Mike Buland + */ +class LinkedList : public List +{ +public: + /** + * Construct a blank LinkedList. + */ + LinkedList(); + + /** + * Delete all list data, but do not delete any of the contained elements. + */ + virtual ~LinkedList(); + + void *getAt( int nIndex ); + void append( void *pData ); + void insertBefore( void *pData, int nPos = 0 ); + int getSize( ); + bool isEmpty( ); + void deleteAt( int nIndex ); + void empty(); + void setSize( int nNewSize ); + void setAt( int nIndex, void *pData ); + +private: + /** + * A link in the linked list. + */ + class Link + { + public: + /** + * Construct an empty link. + */ + Link() + { + pData = NULL; + pNext = NULL; + } + /** + * Construct a link filled in with useful data. + *@param newData The data this link should hold. + *@param newNext The next link that this link should point to. + */ + Link( void *newData = NULL, Link * newNext = NULL ) + { + pData = newData; + pNext = newNext; + } + void *pData; /**< A pointer to the contained data. */ + Link *pNext; /**< A pointer to the next link in the chain */ + }; + + /** + * Finds a pointer to the link at index index. This is the core function + * called for all seek operations, and has been optimized as heavily as + * possible. + *@param index The zero-based index of the desired element. + *@returns A pointer to the requested Link, or NULL if it isn't found. + */ + Link *getPtrTo( int index ); + Link *pBase; /**< The first link in the list. */ + Link *pTop; /**< The Last link in the list. */ + Link *pLast; /**< The previously requested link. */ + int nSize; /**< The number of contained links. */ + int nLast; /**< The index of the previously requested link. */ +}; + +#endif + diff --git a/src/old/linkmessage.cpp b/src/old/linkmessage.cpp new file mode 100644 index 0000000..cf3df42 --- /dev/null +++ b/src/old/linkmessage.cpp @@ -0,0 +1,44 @@ +#include "linkmessage.h" +#include + +LinkMessage::LinkMessage( int nNewMsg ) +{ + nMsg = nNewMsg; +} + +LinkMessage::~LinkMessage() +{ +} + +/* +void LinkMessage::setBroadcast( bool bOn ) +{ + bBroadcast = bOn; +} + +bool LinkMessage::isBroadcast() +{ + return bBroadcast; +} + + +void LinkMessage::setFromID( int id ) +{ + nFromLinkID = id; +} + +int LinkMessage::getFromID() +{ + return nFromLinkID; +} + +void LinkMessage::setToID( int id ) +{ + nTargetLinkID = id; +} + +int LinkMessage::getToID() +{ + return nTargetLinkID; +} +*/ diff --git a/src/old/linkmessage.h b/src/old/linkmessage.h new file mode 100644 index 0000000..6cdfb2f --- /dev/null +++ b/src/old/linkmessage.h @@ -0,0 +1,39 @@ +/**\file linkmessage.h + */ + +#ifndef LINKMESSAGE_H +#define LINKMESSAGE_H + +/** + * A message to be broadcast accross ProgramLinks in a ProgramChain. Generally + * one would make a subclass of this in order to transmit more useful + * information, but sometimes it isn't necesarry. + *@author Mike Buland + */ +class LinkMessage +{ +public: + /** + * Construct a blank LinkMessage. + */ + LinkMessage() {}; + + /** + * Deconstruct a LinkMessage. + */ + virtual ~LinkMessage(); + + /** + * Create a LinkMessage object with a specific message assosiated with it + * to start with. + *@param nNewMsg The message to use in the Message object. + */ + LinkMessage( int nNewMsg ); + + /** + * The message contained in the Message object. + */ + int nMsg; +}; + +#endif diff --git a/src/old/linkmessenger.cpp b/src/old/linkmessenger.cpp new file mode 100644 index 0000000..3bd401a --- /dev/null +++ b/src/old/linkmessenger.cpp @@ -0,0 +1,41 @@ +#include "linkmessenger.h" + +LinkMessenger::LinkMessenger() : + pFirst( NULL ), + pLast( NULL ) +{ +} + +LinkMessenger::~LinkMessenger() +{ +} + +void LinkMessenger::enqueueMessage( LinkMessage *pMsg ) +{ + if( pLast == NULL ) + { + pFirst = pLast = new Link; + pLast->pMsg = pMsg; + pLast->pNext = NULL; + } + else + { + pLast->pNext = new Link; + pLast = pLast->pNext; + pLast->pMsg = pMsg; + pLast->pNext = NULL; + } +} + +LinkMessage *LinkMessenger::dequeueMessage() +{ + if( pFirst == NULL ) + return NULL; + + Link *pTmp = pFirst; + pFirst = pFirst->pNext; + LinkMessage *pRet = pTmp->pMsg; + delete pTmp; + return pRet; +} + diff --git a/src/old/linkmessenger.h b/src/old/linkmessenger.h new file mode 100644 index 0000000..ed52639 --- /dev/null +++ b/src/old/linkmessenger.h @@ -0,0 +1,32 @@ +#ifndef LINK_MESSENGER_H +#define LINK_MESSENGER_H + +#include +#include +#include "linkmessage.h" + +class LinkMessenger +{ +public: + LinkMessenger(); + virtual ~LinkMessenger(); + + void enqueueMessage( LinkMessage *pMsg ); + LinkMessage *dequeueMessage(); + bool hasMessages() + { + return (pFirst != NULL); + } + +private: + typedef struct Link + { + LinkMessage *pMsg; + Link *pNext; + }; + Link *pFirst; + Link *pLast; + +}; + +#endif diff --git a/src/old/list.cpp b/src/old/list.cpp new file mode 100644 index 0000000..18f1a66 --- /dev/null +++ b/src/old/list.cpp @@ -0,0 +1,10 @@ +#include "list.h" + +List::List( ) +{ +} + +List::~List( ) +{ +} + diff --git a/src/old/list.h b/src/old/list.h new file mode 100644 index 0000000..c71b328 --- /dev/null +++ b/src/old/list.h @@ -0,0 +1,101 @@ +#ifndef LIST_H +#define LIST_H + + +/** The basic List class ADT. This, on it's own, does absolutely nothing, but + * does define all standard interface functions to access a list. + *@author Mike Buland + */ +class List +{ +public: + /** + * Construct a list. + */ + List(); + + /** + * Desconstruct a list. + */ + virtual ~List(); + + /** Gets the value at a specified index. + *@param nIndex The index of the item to return. + *@returns The specified item, or NULL if the index was beyond the range + * of the list. + *@author Mike Buland + */ + virtual void *getAt( int nIndex ) = 0; + + /** Append the given data to the end of the list. This increases the + * size of the list by one. + *@param pData The data to append to the list. + *@author Mike Buland + */ + virtual void append( void *pData ) = 0; + + /** Inserts an item at the specified position in the list. The + * new item takes the index that you specify, and all other items + * are moved up one position. The size of the list is increased by + * one. + *@param pData The value to insert into the list. + *@param nPos Where to insert the data into the list. + *@author Mike Buland + */ + virtual void insertBefore( void *pData, int nPos = 0 ) = 0; + + /** Determines the size of the list, in elements. + *@returns The size of the list. + *@author Mike Buland + */ + virtual int getSize( ) = 0; + + /** Determines if the list is empty or not. + *@returns True if the list is empty, or false if the list has + * data in it (if the size is greater than zero). + *@author Mike Buland + */ + virtual bool isEmpty( ) = 0; + + /** Deletes an item at the specified index and moves all other + * values down one index. The size of the list is decreased by one. + *@param nIndex The index of the item to delete. + *@author Mike Buland + */ + virtual void deleteAt( int nIndex ) = 0; + + /** Completely empties the list, and sets the effective size to + * zero. + *@author Mike Buland + */ + virtual void empty() = 0; + + /** Sets the size of the list. This can be larger or smaller + * than what it was previously. If larger, new blank items will + * be added to the end of the list. If smaller than the old list + * items will be deleted from the end. + *@param nNewSize The new size of the list. + *@author Mike Buland + */ + virtual void setSize( int nNewSize ) = 0; + + /** Sets a member at a specified location to a new value. + * If the member being set is outside of the range of the + * current list it should be expanded. + *@param nIndex The zero-based index of the item to change. + *@param pData The new value for that index. + *@author Mike Buland + */ + virtual void setAt( int nIndex, void *pData ) = 0; + + /** Makes the List work like an array. Just say listObj[2] to get + * the third element. + *@param nIndex The index to access in the list. + *@returns A pointer to the data at element index. + *@author Mike Buland + */ + void *operator[]( int nIndex ) { return getAt( nIndex ); }; +}; + +#endif + diff --git a/src/old/md5.cpp b/src/old/md5.cpp new file mode 100644 index 0000000..c0cacdd --- /dev/null +++ b/src/old/md5.cpp @@ -0,0 +1,190 @@ +#include +#include +#include +#include "md5.h" + +// This is a fun macro that tells us where the length char goes after the data +// section in the padded data segment. It's short for OBfuscation LOCaction. +#define OBLOC(len) ((((len + 64) >> 9) << 4) + 14) +// This performs a wrapping bitwise shift, kinda' fun! + +#define bit_roll( num, cnt ) \ + (((num) << (cnt)) | (((num) >> (32 - (cnt))) & ~(-1<<(cnt)))) + +//#define md5_cmn( q, a, b, x, s, t ) (bit_roll((a + q + x + t), s) + b) + +// The following are handy wrappers for the cmn function +#define md5_ff( a, b, c, d, x, s, t ) \ + (md5_cmn((b & c) | ((~b) & d), a, b, x, s, t)) + +#define md5_gg( a, b, c, d, x, s, t ) \ + (md5_cmn((b & d) | (c & (~d)), a, b, x, s, t)) + +#define md5_hh( a, b, c, d, x, s, t ) \ + (md5_cmn(b ^ c ^ d, a, b, x, s, t)) + +#define md5_ii( a, b, c, d, x, s, t ) \ + (md5_cmn(c ^ (b | (~d)), a, b, x, s, t)) + +inline long md5_cmn( long q, long a, long b, long x, long s, long t ) +{ + return bit_roll((a + q + x + t), s) + b; +} + +md5::md5() +{ +} + +md5::~md5() +{ +} + +/* + * Calculate the MD5 of an array of little-endian words, and a bit length + */ +void md5::core_md5( long *x, long len, md5sum *output ) +{ + long a = 1732584193, olda; + long b = -271733879, oldb; + long c = -1732584194, oldc; + long d = 271733878, oldd; + + for( long i = 0; i < len; i += 16 ) + { + olda = a; + oldb = b; + oldc = c; + oldd = d; + + a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936); + d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586); + c = md5_ff(c, d, a, b, x[i+ 2], 17, 606105819); + b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330); + a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897); + d = md5_ff(d, a, b, c, x[i+ 5], 12, 1200080426); + c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341); + b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983); + a = md5_ff(a, b, c, d, x[i+ 8], 7 , 1770035416); + d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417); + c = md5_ff(c, d, a, b, x[i+10], 17, -42063); + b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162); + a = md5_ff(a, b, c, d, x[i+12], 7 , 1804603682); + d = md5_ff(d, a, b, c, x[i+13], 12, -40341101); + c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290); + b = md5_ff(b, c, d, a, x[i+15], 22, 1236535329); + + a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510); + d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632); + c = md5_gg(c, d, a, b, x[i+11], 14, 643717713); + b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302); + a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691); + d = md5_gg(d, a, b, c, x[i+10], 9 , 38016083); + c = md5_gg(c, d, a, b, x[i+15], 14, -660478335); + b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848); + a = md5_gg(a, b, c, d, x[i+ 9], 5 , 568446438); + d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690); + c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961); + b = md5_gg(b, c, d, a, x[i+ 8], 20, 1163531501); + a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467); + d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784); + c = md5_gg(c, d, a, b, x[i+ 7], 14, 1735328473); + b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734); + + a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558); + d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463); + c = md5_hh(c, d, a, b, x[i+11], 16, 1839030562); + b = md5_hh(b, c, d, a, x[i+14], 23, -35309556); + a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060); + d = md5_hh(d, a, b, c, x[i+ 4], 11, 1272893353); + c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632); + b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640); + a = md5_hh(a, b, c, d, x[i+13], 4 , 681279174); + d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222); + c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979); + b = md5_hh(b, c, d, a, x[i+ 6], 23, 76029189); + a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487); + d = md5_hh(d, a, b, c, x[i+12], 11, -421815835); + c = md5_hh(c, d, a, b, x[i+15], 16, 530742520); + b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651); + + a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844); + d = md5_ii(d, a, b, c, x[i+ 7], 10, 1126891415); + c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905); + b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055); + a = md5_ii(a, b, c, d, x[i+12], 6 , 1700485571); + d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606); + c = md5_ii(c, d, a, b, x[i+10], 15, -1051523); + b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799); + a = md5_ii(a, b, c, d, x[i+ 8], 6 , 1873313359); + d = md5_ii(d, a, b, c, x[i+15], 10, -30611744); + c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380); + b = md5_ii(b, c, d, a, x[i+13], 21, 1309151649); + a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070); + d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379); + c = md5_ii(c, d, a, b, x[i+ 2], 15, 718787259); + b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551); + + a = a + olda; + b = b + oldb; + c = c + oldc; + d = d + oldd; + } + + output->data[0] = a; + output->data[1] = b; + output->data[2] = c; + output->data[3] = d; + delete[] x; +} + +long *md5::c2l( const char *str, long len, long *nNewLen ) +{ + long len8 = len*8; + long mlen = OBLOC( len8 ); + long flen = (((mlen/16)+((mlen%16)?(1):(0))))*16; + long *aBin = new long[flen]; + memset( aBin, 0, flen*4 ); + + for( long i = 0; i < len8; i+=8 ) + { + aBin[i>>5] |= ((long)str[i/8]) << (i%32); + } + + aBin[len8 >> 5] |= 0x80 << ((len8) % 32); + aBin[OBLOC( len8 )] = len8; + + (*nNewLen) = flen; + + return aBin; +} + +void md5::l2hexstr( long *binarray, char *str ) +{ + static const char hex_tab[] = {"0123456789abcdef"}; + //static char str[33]; + + int k = 0; + for( int i = 0; i < 16; i++) + { + str[k++] = hex_tab[(binarray[i>>2] >> ((i%4)*8+4)) & 0xF]; + str[k++] = hex_tab[(binarray[i>>2] >> ((i%4)*8 )) & 0xF]; + } +} + +void md5::sumString( md5sum *pSum, const char *sStr ) +{ + sumData( pSum, sStr, strlen( sStr ) ); +} + +void md5::sumData( md5sum *pSum, const char *aData, long nLen ) +{ + long nNewLen; + long *aOb = c2l( aData, nLen, &nNewLen ); + core_md5( aOb, nNewLen, pSum ); +} + +void md5::sumToHex( md5sum *pSum, char *sHex ) +{ + l2hexstr( pSum->data, sHex ); +} + diff --git a/src/old/md5.h b/src/old/md5.h new file mode 100644 index 0000000..7f77d83 --- /dev/null +++ b/src/old/md5.h @@ -0,0 +1,81 @@ +#ifndef MD5_H +#define MD5_H + +/** + * Used to store an MD5 sum in a handy container. + */ +typedef struct +{ + /** The actual data-storage for an MD5 sum. */ + long data[4]; +} md5sum; + +/** + * Class for easily calculating MD5 sums of just about any data. + *@author Mike Buland + */ +class md5 +{ +public: + /** Build an MD5 sum builder. */ + md5(); + + /** Deconstruct */ + virtual ~md5(); + + /** + * Create a sum of a standard c string, null terminated. This is probably + * the easiest function to use. + *@param pSum The MD5 sum structure to fill up. + *@param sStr The null-terminated string to turn into an MD5 sum. + */ + void sumString( md5sum *pSum, const char *sStr ); + + /** + * Create a sum of an array of arbitrary data. This is the most handy for + * dealing with files and so on. + *@param pSum The MD5 sum structure to fill up. + *@param aData A pointer to the base of the data to sum. + *@param nLen The number of bytes to use in the sum. + */ + void sumData( md5sum *pSum, const char *aData, long nLen ); + + /** + * Convert an md5sum to standard hex representation. Make sure that sHex + * contains at least 17 characters of space. + *@param pSum The sum structure to convert to hex. + *@param sHex The string to store the hex value in. + */ + void sumToHex( md5sum *pSum, char *sHex ); + +private: + /** + * Do the bulk of the work of the md5 algorithm. + *@param x I'm not sure. I'll need to look it up. + *@param len The length of the data. + *@param output The sum structure to put the output in. + */ + void core_md5( long *x, long len, md5sum *output ); + + /** + * Convert an array of charaters to an array of longs in a very crafty way. + * This also applies standard MD5 obfuscation to the resulting array, and + * makes it fit within MD5 size constraints. + *@param str The data to convert. + *@param len The length of the data. + *@param nNewLen A pointer to a variable that will hold the new length of + * the resulting array of longs. + *@returns The newly obfuscated and resized long array. + */ + long *c2l( const char *str, long len, long *nNewLen ); + + /** + * Backend helper to convert an array of longs into a hex string. + *@param binarray The binary data to convert. + *@param str The string to store the hex string in. + */ + void l2hexstr( long *binarray, char *str ); + +}; + +#endif diff --git a/src/old/multilog.cpp b/src/old/multilog.cpp new file mode 100644 index 0000000..143ee89 --- /dev/null +++ b/src/old/multilog.cpp @@ -0,0 +1,102 @@ +#include "multilog.h" +#include +#include +#include +#include + +#include "multilogchannel.h" + +MultiLog::MultiLog() +{ + lChannel = new LinkedList(); + rEntry = new RingList( 150 ); + nEntriesLost = 0; +} + +MultiLog::~MultiLog() +{ + int nMax = lChannel->getSize(); + for( int j = 0; j < nMax; j++ ) + { + ((MultiLogChannel *)lChannel->getAt(j))->closeLog(); + delete ((MultiLogChannel *)lChannel->getAt(j)); + } + delete lChannel; + + for( int j = 0; j < rEntry->getSize(); j++ ) + { + delete (LogEntry *)rEntry->getAt( j ); + } + delete rEntry; +} +/* +void MultiLog::Log( int nLevel, const char *lpFormat, ...) +{ + switch( nLevel ) + { + default: + break; + } + va_list ap; + va_start(ap, lpFormat); + + vprintf( lpFormat, ap ); + + va_end(ap); +}*/ + +void MultiLog::DetailLog( int nLevel, const char *lpFile, int nLine, const char *lpFunction, const char *lpFormat, ...) +{ + LogEntry *e = new LogEntry(); + + va_list ap; + va_start(ap, lpFormat); + char *text; + vasprintf( &text, lpFormat, ap ); + va_end(ap); + + time( &e->xTime ); + e->nLevel = nLevel; + e->nLine = nLine; + e->lpFile = new char[strlen(lpFile)+1]; + strcpy( e->lpFile, lpFile ); + e->lpText = new char[strlen(text)+1]; + strcpy( e->lpText, text ); + free( text ); + + append( e ); +} + +void MultiLog::append( LogEntry *pEntry ) +{ + rEntry->append( pEntry ); + if( rEntry->getPushBuf() ) + { + delete (LogEntry *)rEntry->getPushBuf(); + nEntriesLost++; + } + + for( int j = 0; j < lChannel->getSize(); j++ ) + { + ((MultiLogChannel *)lChannel->getAt( j ))->append( pEntry ); + } +} + +void MultiLog::addChannel( MultiLogChannel *pChannel ) +{ + lChannel->append( pChannel ); + + pChannel->openLog(); + + for( int j = 0; j < rEntry->getSize(); j++ ) + { + pChannel->append( (LogEntry *)rEntry->getAt( j ) ); + } +} + +MultiLog::LogEntry::~LogEntry() +{ + delete[] lpFile; + delete[] lpText; +} + diff --git a/src/old/multilog.h b/src/old/multilog.h new file mode 100644 index 0000000..692095a --- /dev/null +++ b/src/old/multilog.h @@ -0,0 +1,130 @@ +#ifndef MULTILOG_H +#define MULTILOG_H + +#include +#include +#include + +#include "ringlist.h" +#include "linkedlist.h" +#include "singleton.h" + +/** + * Calls the DetailLog function but includes pre-processor macros to fill in + * most of the fields for you. This makes your life a lot easier, and makes the + * log useful for system debugging as well as just letting people know what's + * going on. + *@param LEVEL The log level, comes from an enum in the MultiLog class. + *@param FORMAT The text to store in the log, using printf style formatting. + *@param ... Parameters to help format the text in the FROMAT param. + */ +#define LineLog( LEVEL, FORMAT, ...) DetailLog( LEVEL, __FILE__, __LINE__, __PRETTY_FUNCTION__, FORMAT, ##__VA_ARGS__ ) + +#define MultiLineLog( LEVEL, FORMAT, ...) MultiLog::getInstance().DetailLog( LEVEL, __FILE__, __LINE__, __PRETTY_FUNCTION__, FORMAT, ##__VA_ARGS__ ) + +/** MultiLog keeps track of logfile info in a myriad of varieties, and is + * easily configurable between them all. It allows output to the standard + * output, error output, files, networks, and streams, which includes memory + * buffers. + * MultiLog uses the singleton pattern to keep only a single instance of + * the log. Instead of instantiating a new copy, call the getLog method. + *@author Mike Buland + */ +class MultiLog : public Singleton +{ + friend class Singleton; +public: + /** + * Keeps track of a single log entry, in a standard format, that can be + * processed by any MultiLogChannel derrived class. + *@author Mike Buland + */ + typedef struct LogEntry + { + /** Safely delete a log entry. */ + virtual ~LogEntry(); + time_t xTime; /**< The time the log entry was made. */ + int nLevel; /**< The log-level of the entry. */ + char *lpFile; /**< The name of the file this entry came from. */ + int nLine; /**< The line number that this log came from. */ + char *lpText; /**< The text content of this log entry. */ + } LogEntry; + +protected: + /** + * Private constructor, this ensures that this is a singleton. + */ + MultiLog(); + + /** + * Destroy the multilog. + */ + virtual ~MultiLog(); + + /** + * Append a new logentry to the log list, possibly pushing an old entry off. + *@param pEntry The new entry to append. + */ + void append( LogEntry *pEntry ); + + /** + * The actual log entry storage mechanism. + */ + RingList *rEntry; + + /** + * The number of entries that have rolled off the end of the RingList. + */ + unsigned long nEntriesLost; + + /** + * A list of all channels that are registered with the MultiLog. + */ + LinkedList *lChannel; + +public: + + /** Sends info to the logfile. + *@param nLevel The type of data being logged (error, info, etc.) + *@param lpFormat The data to send to the log. + *@author Mike Buland + */ + //void Log( int nLevel, const char *lpFormat, ...); + + /** Sends info to the logfile with extra information, including the files + * that it was called from and the line in the code. Besides that, it's + * exactly the same as Log. Please use the LineLog macro to make DetailLog + * really easy to use. It operates exacly like Log, but inserts the + * builtin macros as the lpFile and nLine parameters. + *@param nLevel The type of data being logged (error, info, etc.) + *@param lpFile The name of the file that called the log function. + *@param nLine The line in the file that this log function was called from. + *@param lpFunction The name of the function that called the log function. + *@param lpFormat The data to send to the log. + *@author Mike Buland + */ + void DetailLog( int nLevel, const char *lpFile, int nLine, const char *lpFunction, const char *lpFormat, ...); + + /** + * Adds a logging channel to the MultiLog channel chain. Every added + * channel will automatically receive a complete log of everything that + * happened before the channel was added as well as all future messages. + *@param pChannel A pointer to the pre-contructed channel object to add. + */ + void addChannel( class MultiLogChannel *pChannel ); + + /** The various pre-defined levels available to use when logging. + * The person logging can make up their own, just make sure to remember + * which value is which (all levels are integers). + *@author Mike Buland + */ + enum Levels + { + LError, + LWarning, + LInfo, + LStatus + }; +}; + +#endif diff --git a/src/old/multilogchannel.cpp b/src/old/multilogchannel.cpp new file mode 100644 index 0000000..ee4c9bf --- /dev/null +++ b/src/old/multilogchannel.cpp @@ -0,0 +1,13 @@ +// +// C++ Implementation: multilogchannel +// +// Description: +// +// +// Author: Mike Buland , (C) 2005 +// +// Copyright: See COPYING file that comes with this distribution +// +// +#include "multilogchannel.h" + diff --git a/src/old/multilogchannel.h b/src/old/multilogchannel.h new file mode 100644 index 0000000..d891a65 --- /dev/null +++ b/src/old/multilogchannel.h @@ -0,0 +1,46 @@ +#ifndef MULTILOGCHANNEL_H +#define MULTILOGCHANNEL_H + +#include "multilog.h" + +/** + * The baseclass for any MultiLog output channel. Any class that implements + * all of these functions can be put in the log chain and will be sent + * messages from active MultiLoggers. + *@author Mike Buland + */ +class MultiLogChannel +{ +public: + /** + * Deconstruct a MultiLogChannel. + */ + virtual ~MultiLogChannel() {}; + + /** + * Should perform any operations that need to take place in order to start + * the output of data into this channel. This will be called once by the + * MultiLog when the MultiLogChannel is registered. + *@returns True means that everything can go as planned. False means that + * the MultiLog should remove this channel from the list and delete it. + */ + virtual bool openLog() = 0; + + /** + * Should append a log entry to the long, by whatever means are necesarry. + *@param pEntry The LogEntry to append. + *@returns True means that everything can go as planned. False means that + * the MultiLog should remove this channel from the list and delete it. + */ + virtual bool append( MultiLog::LogEntry *pEntry ) = 0; + + /** + * Should perform any operations that need to take place in order to safely + * close and cleanup the log. + *@returns True means that everything can go as planned. False means that + * the MultiLog should remove this channel from the list and delete it. + */ + virtual bool closeLog() = 0; +}; + +#endif diff --git a/src/old/multilogtext.cpp b/src/old/multilogtext.cpp new file mode 100644 index 0000000..4337cc9 --- /dev/null +++ b/src/old/multilogtext.cpp @@ -0,0 +1,188 @@ +#include +#include +#include +#include +#include +#include +#include "multilogtext.h" +/* +bool fileexists( const char *sPath ) +{ + int nFileDesc = open( sPath, O_RDONLY ); + if( nFileDesc < 0 ) + { + return false; + } + else + { + close( nFileDesc ); + return true; + } +}*/ + +MultiLogText::MultiLogText( const char *sFileName, const char *lpFormat, bool bRotateLog, int nMaxLogs ) +{ + this->lpFormat = NULL; + /* + if( bRotateLog ) + { + if( fileexists( sFileName ) == false ) + { + return; + } + + int nLen = strlen( sFileName ); + char *buf = new char[nLen+6]; + sprintf( buf, "%s.", sFileName ); + + for( int j = 1; j < nMaxLogs; j++ ) + { + sprintf( &buf[nLen+1], "%d", j ); + if( !fileexists( buf ) ) + { + rename( sFileName, buf ); + break; + } + } + }*/ + + nFD = open( sFileName, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH ); + setLogFormat( lpFormat ); +} + +MultiLogText::MultiLogText( int nFileDesc, const char *lpFormat ) +{ + this->lpFormat = NULL; + nFD = nFileDesc; + setLogFormat( lpFormat ); +} + +MultiLogText::~MultiLogText() +{ + if( nFD != -1 ) + { + close( nFD ); + } + + delete[] lpFormat; +} + +bool MultiLogText::setLogFormat( const char *lpFormat ) +{ + char buf[200]; + int k = 0; + static char fmts[10][4]={ + {'y', 'd', '0', '1'}, + {'m', 'd', '0', '2'}, + {'d', 'd', '0', '3'}, + {'h', 'd', '0', '4'}, + {'M', 'd', '0', '5'}, + {'s', 'd', '0', '6'}, + {'l', 'd', '0', '7'}, + {'f', 's', '0', '8'}, + {'L', 'd', '0', '9'}, + {'t', 's', '1', '0'}, + }; + + for( int j = 0; lpFormat[j] != '\0'; j++ ) + { + if( lpFormat[j] == '%' ) + { + buf[k++] = '%'; + int nPlace = k++; + k++; + buf[k++] = '$'; + bool bDone = false; + for( j++; bDone == false; j++ ) + { + int l; + for( l = 0; l < 10; l++ ) + { + if( lpFormat[j] == fmts[l][0] ) + { + buf[nPlace] = fmts[l][2]; + buf[nPlace+1] = fmts[l][3]; + buf[k++] = fmts[l][1]; + bDone = true; + break; + } + } + if( l == 10 ) + { + buf[k++] = lpFormat[j]; + } + } + j--; + } + else + { + buf[k++] = lpFormat[j]; + } + } + buf[k++] = '\n'; + buf[k] = '\0'; + + if( this->lpFormat != NULL ) + { + delete[] this->lpFormat; + } + this->lpFormat = new char[k+1]; + strcpy( this->lpFormat, buf ); + + return true; +} + +bool MultiLogText::openLog() +{ + if( nFD == -1 ) + { + return false; + } + return true; +} + +bool MultiLogText::append( MultiLog::LogEntry *pEntry ) +{ + if( nFD == -1 ) + { + return false; + } + + char *line = NULL; + struct tm *pTime; + pTime = localtime( &pEntry->xTime ); + asprintf( + &line, + lpFormat, + pTime->tm_year+1900, + pTime->tm_mon+1, + pTime->tm_mday, + pTime->tm_hour, + pTime->tm_min, + pTime->tm_sec, + pEntry->nLevel, + pEntry->lpFile, + pEntry->nLine, + pEntry->lpText + ); + write( nFD, line, strlen(line) ); + free( line ); + + return true; +} + +bool MultiLogText::closeLog() +{ + if( nFD == -1 ) + { + return false; + } + // Don't close it if it's sdtout or errorout + if( nFD > 2 ) + { + close( nFD ); + } + nFD = -1; + return true; +} + diff --git a/src/old/multilogtext.h b/src/old/multilogtext.h new file mode 100644 index 0000000..197aef1 --- /dev/null +++ b/src/old/multilogtext.h @@ -0,0 +1,70 @@ +#ifndef MULTILOGTEXT_H +#define MULTILOGTEXT_H + +#include "multilogchannel.h" + +/** + * Simple MultiLogChannel that takes the logdata, formats it textually, and + * writes it to a text device, either a file or the screen, yay! This takes + * the place of the old standard logging facility. + * The entries in the format follow the standard printf % style, and are as + * follows: + *
    + *
  • %y - current year
    • + *
  • %m - current month
    • + *
  • %d - current day
    • + *
  • %h - current hour (24-hour format)
    • + *
  • %M - current minute
    • + *
  • %s - current seccond
    • + *
  • %l - Loglevel (numerical)
    • + *
  • %f - Filename
    • + *
  • %L - Line number
    • + *
  • %t - Full text of the log entry
    • + *
+ *@author Mike Buland + */ +class MultiLogText : public MultiLogChannel +{ +public: + /** + * Construct a MultiLogText object around a specific filename and format. + * The file named by sFileName will be opened for writting in text+append + * mode. No existing data will be destroyed. + *@param sFileName The file to output log-data to. + *@param lpFormat The format using the above specifications to be used for + * every log entry. + */ + MultiLogText( const char *sFileName, const char *lpFormat, bool bRotateLog=false, int nMaxLogs=0 ); + + /** + * Construct a MultiLogText object around a specific file and format. + * The file descriptor passed in should describe an already opened and set- + * up file or device. This could easily be a socket or stdout or stderr. + *@param nFileDesc The already opened descriptor to send data to. + *@param lpFormat The format using the above specifications to be used for + * every log entry. + */ + MultiLogText( int nFileDesc, const char *lpFormat ); + + /** + * Destroy the object. + */ + virtual ~MultiLogText(); + + bool openLog(); + bool append( MultiLog::LogEntry *pEntry ); + bool closeLog(); + + /** + * Change the log format on the fly. + *@param lpFormat The new format to use for all future log entries. + *@returns True if everything was fine, false for catastrophic failure. + */ + bool setLogFormat( const char *lpFormat ); + +private: + int nFD; /**< The file descriptor we're writing to. */ + char *lpFormat; /**< The format that we're using, converted for printf. */ +}; + +#endif diff --git a/src/old/ordhash.cpp b/src/old/ordhash.cpp new file mode 100644 index 0000000..77cbd61 --- /dev/null +++ b/src/old/ordhash.cpp @@ -0,0 +1 @@ +#include "ordhash.h" diff --git a/src/old/ordhash.h b/src/old/ordhash.h new file mode 100644 index 0000000..e946f95 --- /dev/null +++ b/src/old/ordhash.h @@ -0,0 +1,104 @@ +#ifndef ORD_HASH_H +#define ORD_HASH_H + +#include "hash.h" +#include "tqsort.h" + +template, typename valuealloc = std::allocator, typename challoc = std::allocator > +class OrdHash : public Hash +{ +public: + OrdHash() : + bSorted( false ), + aData( NULL ) + { + } + + virtual ~OrdHash() + { + } + +protected: + virtual void invalidate() + { + bSorted = false; + delete[] aData; + aData = NULL; + } + + virtual void onInsert() + { + invalidate(); + } + + virtual void onUpdate() + { + invalidate(); + } + + virtual void onDelete() + { + invalidate(); + } + + virtual void onReHash() + { + invalidate(); + } + + virtual std::pair getAtPos( uint32_t nPos ) + { + return Hash::getAtPos( aData[nPos].nIndex ); + } + + virtual void buildIndex() + { + aData = new struct ind[this->nFilled]; + uint32_t k = 0; + for( uint32_t j = 0; j < this->nCapacity; j++ ) + { + if( this->isFilled( j ) ) + { + if( !this->isDeleted( j ) ) + { + aData[k].pVal = &(this->aValues[j]); + aData[k].nIndex = j; + k++; + } + } + } + + tqsort::ind, cmpfnc, value **>( aData, this->nFilled ); + + bSorted = true; + } + + virtual uint32_t getFirstPos( bool &bFinished ) + { + if( bSorted == false ) + buildIndex(); + + return 0; + } + + virtual uint32_t getNextPos( uint32_t nPos, bool &bFinished ) + { + if( nPos+1 >= this->nFilled ) + { + bFinished = true; + return 0; + } + return ++nPos; + } +public: + typedef struct ind + { + value *pVal; + uint32_t nIndex; + } ind; +private: + bool bSorted; + ind *aData; +}; + +#endif diff --git a/src/old/paramproc.cpp b/src/old/paramproc.cpp new file mode 100644 index 0000000..a352e66 --- /dev/null +++ b/src/old/paramproc.cpp @@ -0,0 +1,514 @@ +#include "paramproc.h" +#include + +#define ptrtype( iitype, iiname ) \ + ParamProc::ParamPtr::ParamPtr( iitype *iiname ) : \ + type( vt ##iiname ) { val.iiname = iiname; } + +ParamProc::ParamPtr::ParamPtr() +{ + val.str = NULL; + type = vtunset; +} + +ptrtype( std::string, str ); +ptrtype( uint64_t, uint64 ); +ptrtype( uint32_t, uint32 ); +ptrtype( uint16_t, uint16 ); +ptrtype( uint8_t, uint8 ); +ptrtype( int64_t, int64 ); +ptrtype( int32_t, int32 ); +ptrtype( int16_t, int16 ); +ptrtype( int8_t, int8 ); +ptrtype( float, float32 ); +ptrtype( double, float64 ); +ptrtype( long double, float96 ); +ptrtype( bool, bln ); + +ParamProc::ParamPtr &ParamProc::ParamPtr::operator=( ParamProc::ParamPtr &ptr ) +{ + val = ptr.val; + type = ptr.type; + + return *this; +} + +bool ParamProc::ParamPtr::isSet() +{ + return type != vtunset; +} + +ParamProc::ParamPtr &ParamProc::ParamPtr::operator=( const char *str ) +{ + if( !isSet() ) return *this; + switch( type ) + { + case vtstr: + (*val.str) = str; + break; + + case vtuint64: + (*val.uint64) = strtoull( str, NULL, 10 ); + break; + + case vtuint32: + (*val.uint32) = strtoul( str, NULL, 10 ); + break; + + case vtuint16: + (*val.uint16) = (uint16_t)strtoul( str, NULL, 10 ); + break; + + case vtuint8: + (*val.uint8) = (uint8_t)strtoul( str, NULL, 10 ); + break; + + case vtint64: + (*val.int64) = strtoll( str, NULL, 10 ); + break; + + case vtint32: + (*val.int32) = strtol( str, NULL, 10 ); + break; + + case vtint16: + (*val.int16) = (int16_t)strtol( str, NULL, 10 ); + break; + + case vtint8: + (*val.int8) = (int8_t)strtol( str, NULL, 10 ); + break; + + case vtfloat32: + (*val.float32) = strtof( str, NULL ); + break; + + case vtfloat64: + (*val.float64) = strtod( str, NULL ); + break; + + case vtfloat96: + (*val.float96) = strtold( str, NULL ); + break; + + case vtbln: + if( strcasecmp("yes", str ) == 0 || + strcasecmp("true", str ) == 0 ) + { + (*val.bln) = true; + } + else + { + (*val.bln) = false; + } + break; + } + + return *this; +} + +ParamProc::ParamProc() +{ +} + +ParamProc::~ParamProc() +{ + for( std::list::iterator i = lArg.begin(); + i != lArg.end(); i++ ) + { + delete *i; + } + + for( std::list::iterator i = lBan.begin(); + i != lBan.end(); i++ ) + { + delete *i; + } + +} +/* +void ParamProc::addParam( const char *lpWord, char cChar, Proc proc, ParamPtr val ) +{ + printf("Calling callback...\n"); + val = "Hello there, this is set in the ParamProc"; + (this->*proc)(); +}*/ + +void ParamProc::addParam( const char *lpWord, char cChar, Proc proc, + ParamPtr val, const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + ArgSpec *as = new ArgSpec; + if( lpWord ) + as->sWord = lpWord; + + as->cChar = cChar; + as->proc = proc; + as->val = val; + if( lpDesc ) + as->sDesc = lpDesc; + if( lpExtra ) + as->sExtra = lpExtra; + if( lpValue ) + as->sValue = lpValue; + + lArg.push_back( as ); + + if( !lBan.empty() ) + { + if( lBan.back()->pBefore == NULL ) + lBan.back()->pBefore = as; + } +} + +void ParamProc::addParam( const char *lpWord, char cChar, Proc proc, + const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + addParam( lpWord, cChar, proc, ParamPtr(), lpDesc, lpExtra, lpValue ); +} + +void ParamProc::addParam( const char *lpWord, char cChar, ParamPtr val, + const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + addParam( lpWord, cChar, NULL, val, lpDesc, lpExtra, lpValue ); +} + +void ParamProc::addParam( const char *lpWord, Proc proc, ParamPtr val, + const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + addParam( lpWord, '\0', proc, val, lpDesc, lpExtra, lpValue ); +} + +void ParamProc::addParam( const char *lpWord, Proc proc, + const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + addParam( lpWord, '\0', proc, ParamPtr(), lpDesc, lpExtra, lpValue ); +} + +void ParamProc::addParam( const char *lpWord, ParamPtr val, + const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + addParam( lpWord, '\0', NULL, val, lpDesc, lpExtra, lpValue ); +} + +void ParamProc::addParam( char cChar, Proc proc, ParamPtr val, + const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + addParam( NULL, cChar, proc, val, lpDesc, lpExtra, lpValue ); +} + +void ParamProc::addParam( char cChar, Proc proc, + const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + addParam( NULL, cChar, proc, ParamPtr(), lpDesc, lpExtra, lpValue ); +} + +void ParamProc::addParam( char cChar, ParamPtr val, + const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + addParam( NULL, cChar, NULL, val, lpDesc, lpExtra, lpValue ); +} + +void ParamProc::process( int argc, char *argv[] ) +{ + for( int arg = 1; arg < argc; arg++ ) + { + //printf(":::%d:::%s\n", arg, argv[arg] ); + if( argv[arg][0] == '-' ) + { + if( argv[arg][1] == '-' ) + { + ArgSpec *s = checkWord( argv[arg]+2 ); + if( s ) + { + if( argv[arg][s->sWord.getLength()+2] == '=' ) + { + if( s->val.isSet() ) + { + if( s->sValue.getString() == NULL ) + { + s->val = argv[arg]+s->sWord.getLength()+3; + } + else + { + s->val = s->sValue.getString(); + } + } + if( s->proc ) + { + char **tmp = new char*[argc-arg]; + tmp[0] = argv[arg]+s->sWord.getLength()+3; + for( int k = 1; k < argc-arg; k++ ) + tmp[k] = argv[arg+k]; + int ret = (this->*s->proc)( argc-arg, tmp ); + if( ret > 0 ) + { + arg += ret-1; + } + delete tmp; + } + } + else + { + int add = 0; + if( s->val.isSet() ) + { + if( s->sValue.getString() == NULL ) + { + if( arg+1 >= argc ) + { + return; + } + s->val = argv[arg+1]; + add++; + } + else + { + s->val = s->sValue.getString(); + } + } + if( s->proc ) + { + int ret = (this->*s->proc)( + argc-arg-1, argv+arg+1 ); + + if( ret > add ) + add = 0; + else + add -= ret; + arg += ret; + } + arg += add; + } + continue; + } + else + { + unknownParam( argc-arg, argv+arg ); + } + } + else + { + for( int chr = 1; argv[arg][chr]; chr++ ) + { + ArgSpec *s = checkLetr( argv[arg][chr] ); + if( s ) + { + if( argv[arg][chr+1] != '\0' ) + { + bool bUsed = false; + if( s->val.isSet() ) + { + if( s->sValue.getString() == NULL ) + { + s->val = argv[arg]+chr+1; + bUsed = true; + } + else + { + s->val = s->sValue.getString(); + } + } + if( s->proc ) + { + char **tmp = new char*[argc-arg]; + tmp[0] = argv[arg]+chr+1; + for( int k = 1; k < argc-arg; k++ ) + tmp[k] = argv[arg+k]; + int ret = (this->*s->proc)( argc-arg, tmp ); + if( ret > 0 ) + { + arg += ret - 1; + delete tmp; + break; + } + delete tmp; + } + if( bUsed ) + { + break; + } + } + else + { + bool bUsed = false; + if( s->val.isSet() ) + { + if( s->sValue.getString() == NULL ) + { + s->val = argv[arg+1]; + bUsed = true; + } + else + { + s->val = s->sValue.getString(); + } + } + if( s->proc ) + { + int ret = (this->*s->proc)( + argc-arg-1, argv+arg+1 + ); + if( ret > 0 ) + { + arg += ret; + break; + } + } + if( bUsed ) + { + arg++; + break; + } + } + } + else + { + unknownParam( argc-arg, argv+arg ); + } + } + } + } + else + { + cmdParam( argc-arg, argv+arg ); + } + } +} + +ParamProc::ArgSpec *ParamProc::checkWord( const char *arg ) +{ + //printf("Checking \"%s\"...\n", arg ); + std::list::const_iterator i; + for( i = lArg.begin(); i != lArg.end(); i++ ) + { + if( (*i)->sWord.getString() == NULL ) + continue; + + if( !strcmp( (*i)->sWord, arg ) ) + return *i; + + if( (*i)->val.isSet() ) + { + if( !strncmp( (*i)->sWord, arg, (*i)->sWord.getLength() ) && + arg[(*i)->sWord.getLength()] == '=' ) + { + return *i; + } + } + } + + return NULL; +} + +ParamProc::ArgSpec *ParamProc::checkLetr( const char arg ) +{ + //printf("Checking \'%c\'...\n", arg ); + std::list::const_iterator i; + for( i = lArg.begin(); i != lArg.end(); i++ ) + { + if( (*i)->cChar == '\0' ) + continue; + + if( (*i)->cChar == arg ) + { + return *i; + } + } + + return NULL; +} + +int ParamProc::cmdParam( int argc, char *argv[] ) +{ + printf("Unhandled command parameter \"%s\" found!\n", argv[0] ); + return 0; +} + +int ParamProc::unknownParam( int argc, char *argv[] ) +{ + printf("Unknown parameter \"%s\" found!\n", argv[0] ); + return 0; +} + +int ParamProc::help( int argc, char *argv[] ) +{ + std::list::const_iterator b = lBan.begin(); + std::list::const_iterator i; + int len=0; + for( i = lArg.begin(); i != lArg.end(); i++ ) + { + if( len < (*i)->sWord.getLength() + (*i)->sExtra.getLength() ) + len = (*i)->sWord.getLength() + (*i)->sExtra.getLength(); + } + char fmt[10]; + sprintf( fmt, "%%-%ds ", len ); + + for( i = lArg.begin(); i != lArg.end(); i++ ) + { + if( b != lBan.end() ) + { + if( (*b)->pBefore == (*i) ) + { + printf( (*b)->sBanner.getString() ); + b++; + } + } + printf(" "); + if( (*i)->cChar ) + { + if( (*i)->sWord.getString() ) + { + printf("-%c, ", (*i)->cChar ); + } + else + { + printf("-%c ", (*i)->cChar ); + } + } + else + { + printf(" "); + } + if( (*i)->sWord.getString() ) + { + printf("--"); + std::string sTmp = (*i)->sWord.getString(); + if( (*i)->sExtra.getString() ) + sTmp += (*i)->sExtra.getString(); + printf( fmt, sTmp.c_str() ); + } + else + { + printf(" "); + printf(fmt, "" ); + } + printf("%s\n", (*i)->sDesc.getString() ); + } + if( b != lBan.end() ) + { + if( (*b)->pBefore == NULL ) + { + printf( (*b)->sBanner.getString() ); + } + } + + exit( 0 ); +} + +void ParamProc::addHelpBanner( const char *sHelpBanner ) +{ + Banner *pBan = new Banner; + pBan->sBanner = sHelpBanner; + pBan->pBefore = NULL; + lBan.push_back( pBan ); +} + diff --git a/src/old/paramproc.h b/src/old/paramproc.h new file mode 100644 index 0000000..d857193 --- /dev/null +++ b/src/old/paramproc.h @@ -0,0 +1,153 @@ +#ifndef PARAM_PROC_H +#define PARAM_PROC_H + +#include +#include +#include +#include "staticstring.h" + +class ParamProc +{ +public: + class ParamPtr + { + public: + ParamPtr(); + ParamPtr( std::string *str ); + ParamPtr( uint64_t *uint64 ); + ParamPtr( uint32_t *uint32 ); + ParamPtr( uint16_t *uint16 ); + ParamPtr( uint8_t *uint8 ); + ParamPtr( int64_t *int64 ); + ParamPtr( int32_t *int32 ); + ParamPtr( int16_t *int16 ); + ParamPtr( int8_t *int8 ); + ParamPtr( float *float32 ); + ParamPtr( double *float64 ); + ParamPtr( long double *float96 ); + ParamPtr( bool *bln ); + + enum + { + vtunset, + vtstr, + vtuint64, + vtuint32, + vtuint16, + vtuint8, + vtint64, + vtint32, + vtint16, + vtint8, + vtfloat32, + vtfloat64, + vtfloat96, + vtbln, + }; + ParamPtr &operator=( ParamPtr &ptr ); + ParamPtr &operator=( const char *str ); + + bool isSet(); + + private: + int type; + union + { + std::string *str; + uint64_t *uint64; + uint32_t *uint32; + uint16_t *uint16; + uint8_t *uint8; + int64_t *int64; + int32_t *int32; + int16_t *int16; + int8_t *int8; + float *float32; + double *float64; + long double *float96; + bool *bln; + } val; + }; + + typedef int (ParamProc::*Proc)( int, char *[] ); + + typedef struct ArgSpec + { + uint8_t nFlags; + StaticString sWord; + char cChar; + Proc proc; + ParamProc::ParamPtr val; + StaticString sExtra; + StaticString sDesc; + StaticString sValue; + } ArgSpec; + +public: + ParamProc(); + virtual ~ParamProc(); + + void addParam( const char *lpWord, char cChar, Proc proc, ParamPtr val, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + void addParam( const char *lpWord, char cChar, Proc proc, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + void addParam( const char *lpWord, char cChar, ParamPtr val, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + + void addParam( const char *lpWord, Proc proc, ParamPtr val, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + void addParam( const char *lpWord, Proc proc, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + void addParam( const char *lpWord, ParamPtr val, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + + void addParam( char cChar, Proc proc, ParamPtr val, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + void addParam( char cChar, Proc proc, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + void addParam( char cChar, ParamPtr val, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + + void process( int argc, char *argv[] ); + void addHelpBanner( const char *sHelpBanner ); + +private: + ArgSpec *checkWord( const char *arg ); + ArgSpec *checkLetr( const char arg ); + +public: + virtual int cmdParam( int argc, char *argv[] ); + virtual int unknownParam( int argc, char *argv[] ); + virtual int help( int argc, char *argv[] ); + +private: + typedef struct Banner + { + StaticString sBanner; + ArgSpec *pBefore; + } Banner; + std::list lBan; + std::list lArg; +}; + +#define mkproc( cls ) static_cast(&cls) + +#endif diff --git a/src/old/plugger.cpp b/src/old/plugger.cpp new file mode 100644 index 0000000..f3bfa67 --- /dev/null +++ b/src/old/plugger.cpp @@ -0,0 +1 @@ +#include "plugger.h" diff --git a/src/old/plugger.h b/src/old/plugger.h new file mode 100644 index 0000000..d92f194 --- /dev/null +++ b/src/old/plugger.h @@ -0,0 +1,198 @@ +#ifndef PLUGGER_H +#define PLUGGER_H + + +#include "hashtable.h" +#include "list" +#include "hashfunctionstring.h" +#include "hashfunctionint.h" +#include "dlfcn.h" +#include "exceptions.h" + +typedef struct PluginInfo +{ + const char *sID; + const char *sAuthor; + unsigned short nVersion; + unsigned short nRevision; + void *(*createPlugin)(); + void (*destroyPlugin)( void * ); +} PluginInfo; + +typedef struct PluginReg +{ + bool bBuiltin; + void *dlHandle; + PluginInfo *pInfo; +} PluginReg; + +#define PluginInterface( classname, baseclass, name, ver, rev ) \ +extern "C" { \ + baseclass *create ##classname() \ + { \ + return new classname(); \ + } \ + void destroy ##classname( baseclass *pCls ) \ + { \ + delete pCls; \ + } \ + PluginInfo classname = { \ + #classname, name, ver, rev, \ + create ##classname, destroy ##classname }; \ +} + +#define PluginInterface2( pluginname, classname, baseclass, name, ver, rev ) \ +extern "C" { \ + baseclass *create ##classname() \ + { \ + return new classname(); \ + } \ + void destroy ##classname( baseclass *pCls ) \ + { \ + delete pCls; \ + } \ + PluginInfo pluginname = { \ + #pluginname, name, ver, rev, \ + (void *(*)())(create ##classname), \ + (void (*)( void * ))(destroy ##classname) }; \ +} + +#define PluginInterface3( structname, pluginname, classname, baseclass, name, ver, rev ) \ +extern "C" { \ + baseclass *create ##classname() \ + { \ + return new classname(); \ + } \ + void destroy ##classname( baseclass *pCls ) \ + { \ + delete pCls; \ + } \ + PluginInfo structname = { \ + #pluginname, name, ver, rev, \ + (void *(*)())(create ##classname), \ + (void (*)( void * ))(destroy ##classname) }; \ +} + +template +class Plugger +{ +public: + +public: + Plugger() : + hPlugin( new HashFunctionString(), 11 ), + hObj( new HashFunctionInt(), 11 ) + { + } + + virtual ~Plugger() + { + void *pos = hObj.getFirstItemPos(); + while( (pos = hObj.getNextItemPos( pos )) ) + { + T *pPlug = (T *)hObj.getItemID( pos ); + PluginReg *pReg = (PluginReg *)hObj.getItemData( pos ); + pReg->pInfo->destroyPlugin( pPlug ); + } + + std::list::iterator i; + for( i = lPlugin.begin(); i != lPlugin.end(); i++ ) + { + if( (*i)->bBuiltin == false ) + { + dlclose( (*i)->dlHandle ); + } + delete (*i); + } + } + + void registerBuiltinPlugin( PluginInfo *pInfo ) + { + PluginReg *pReg = new PluginReg; + pReg->bBuiltin = true; + pReg->pInfo = pInfo; + lPlugin.insert( lPlugin.end(), pReg ); + hPlugin.insert( pInfo->sID, pReg ); + } + + void registerExternalPlugin( const char *sFName, const char *sPluginName ) + { + PluginReg *pReg = (PluginReg *)hPlugin[sPluginName]; + if( pReg != NULL ) + { + hPlugin.del( sPluginName ); + dlclose( pReg->dlHandle ); + delete pReg; + pReg = NULL; + } + + pReg = new PluginReg; + + pReg->bBuiltin = false; + pReg->dlHandle = dlopen( sFName, RTLD_NOW ); + if( pReg->dlHandle == NULL ) + { + throw PluginException( 1, "Error on %s: %s", sFName, dlerror() ); + } + pReg->pInfo = (PluginInfo *)dlsym( pReg->dlHandle, sPluginName ); + if( pReg->pInfo == NULL ) + { + throw PluginException( 2, "Error on %s: %s", sFName, dlerror() ); + } + hPlugin.insert( pReg->pInfo->sID, pReg ); + lPlugin.insert( lPlugin.end(), pReg ); + } + + T *instantiate( const char *lpName ) + { + PluginReg *pReg = (PluginReg *)hPlugin[lpName]; + if( pReg == NULL ) + return NULL; + + T *p = (T *)pReg->pInfo->createPlugin(); + hObj.insert( p, pReg ); + //printf("pReg: %08X, pPlug: %08X\n", pReg, p ); + + return p; + } + + bool hasPlugin( const char *lpName ) + { + if( hPlugin[lpName] == NULL ) + return false; + return true; + } + + void destroy( T *pPlug ) + { + PluginReg *pReg = (PluginReg *)hObj[pPlug]; + //printf("pReg: %08X, pPlug: %08X\n", pReg, pPlug ); + if( pReg == NULL ) + return; + + pReg->pInfo->destroyPlugin( pPlug ); + + hObj.del( pPlug ); + } + + void unloadAll() + { + std::list::iterator i; + for( i = lPlugin.begin(); i != lPlugin.end(); i++ ) + { + if( (*i)->bBuiltin == false ) + { + dlclose( (*i)->dlHandle ); + } + delete (*i); + } + hPlugin.clear(); + } + +private: + std::list lPlugin; + HashTable hPlugin; + HashTable hObj; +}; + +#endif diff --git a/src/old/pqueue.cpp b/src/old/pqueue.cpp new file mode 100644 index 0000000..1f0b8b5 --- /dev/null +++ b/src/old/pqueue.cpp @@ -0,0 +1,33 @@ +#include "pqueue.h" + +PQueue::PQueue( int nNewNumQueues ) +{ + nNumQueues = nNewNumQueues; + aQueue = new Queue[nNumQueues]; +} + +PQueue::~PQueue() +{ + delete[] aQueue; +} + +void PQueue::enqueue( void *pData, int nQueueLevel ) +{ + if( nQueueLevel < 0 || nQueueLevel >= nNumQueues ) + return; + + aQueue[nQueueLevel].enqueue( pData ); +} + +void *PQueue::dequeue() +{ + for( int j = 0; j < nNumQueues; j++ ) + { + if( aQueue[j].isEmpty() == false ) + { + return aQueue[j].dequeue(); + } + } + + return NULL; +} diff --git a/src/old/pqueue.h b/src/old/pqueue.h new file mode 100644 index 0000000..8307d56 --- /dev/null +++ b/src/old/pqueue.h @@ -0,0 +1,48 @@ +#ifndef PQUEUE_H +#define PQUEUE_H + +#include "queue.h" + +/** Priority queue. This is just like a queue, but something with a higher + * priority will always come off the queue before something with a lower + * priority, even if it's added after. Otherwise works just like a queue. + *@author Mike Buland + */ +class PQueue +{ +public: + /** Create a queue with any number of different priorities. + *@param nNewNumQueues The number of queues, the default is 3 + */ + PQueue( int nNewNumQueues=3 ); + + /** + * Cleanup all contained queues. + */ + virtual ~PQueue(); + + /** Add a new item to the queue at the specified priority. A lower + * number means a higher priority! + *@param pData A pointer to the data to add to the queue + *@param nQueueLevel The priority to set the new data to + */ + void enqueue( void *pData, int nQueueLevel ); + + /** Pull the next item off the queue, high priority first. + *@returns A pointer to the data that was next in the priority queue + */ + void *dequeue(); + +private: + /** + * The queues we use for real data storage. + */ + Queue *aQueue; + + /** + * The number of priorities or queus that we need. + */ + int nNumQueues; +}; + +#endif diff --git a/src/old/programchain.cpp b/src/old/programchain.cpp new file mode 100644 index 0000000..6120d58 --- /dev/null +++ b/src/old/programchain.cpp @@ -0,0 +1,96 @@ +#include +#include "programchain.h" + +ProgramChain::ProgramChain() : + xLog( MultiLog::getInstance() ) +{ + xLog.LineLog( MultiLog::LStatus, "Program Chain Initialized." ); +} + +ProgramChain::~ProgramChain() +{ +} + +bool ProgramChain::addLink( ProgramLink *pLink ) +{ + if( pLink->init() == false ) + { + emergencyShutdown(); + return false; + } + + lLink.append( pLink ); + + pLink->setChain( this ); + + return true; +} + +ProgramLink *ProgramChain::getLink( const char *lpName ) +{ + char a; + a = lpName[0]; + return NULL; +} + +ProgramLink *ProgramChain::getBaseLink() +{ + return NULL; +} + +bool ProgramChain::execChainOnce() +{ + int nLen = lLink.getSize(); + for( int j = 0; j < nLen; j++ ) + { + if( ((ProgramLink *)lLink[j])->timeSlice() == false ) + { + xLog.LineLog( MultiLog::LInfo, "Shutting down due to signal from link #%d", j ); + emergencyShutdown(); + return false; + } + } + + return true; +} + +bool ProgramChain::enterChainLoop() +{ + for(;;) + { + if( execChainOnce() == false ) + { + return false; + } + } + + return true; +} + +void ProgramChain::emergencyShutdown() +{ + int nLen = lLink.getSize(); + for( int j = 0; j < nLen; j++ ) + { + ((ProgramLink *)lLink[j])->deInit(); + delete (ProgramLink *)lLink[j]; + } + lLink.empty(); +} + +LinkMessage *ProgramChain::broadcastIRM( LinkMessage *pMsgOut, ProgramLink *pSender ) +{ + int nLen = lLink.getSize(); + for( int j = 0; j < nLen; j++ ) + { + LinkMessage *pMsg = ((ProgramLink *)lLink[j])->processIRM( pMsgOut ); + if( pMsg != NULL ) + { + delete pMsgOut; + return pMsg; + } + } + + delete pMsgOut; + return NULL; +} diff --git a/src/old/programchain.h b/src/old/programchain.h new file mode 100644 index 0000000..2bdfeee --- /dev/null +++ b/src/old/programchain.h @@ -0,0 +1,95 @@ +#ifndef PROGRAMCHAIN_H +#define PROGRAMCHAIN_H + +#include "linkedlist.h" +#include "multilog.h" +#include "programlink.h" + +/** + * The Program Chain links together program "chunks" to more easily facilitate + * a generalized program loop with modular extensions. + *@author Mike Buland + */ +class ProgramChain +{ +public: + /** + * Construct an empty chain. + */ + ProgramChain(); + + /** + * Destroy your chain. + */ + virtual ~ProgramChain(); + + /** + * Adds a link to the end of the chain. + *@param pLink A pointer to the link to add to the chain. + *@returns True if adding the link was successful, otherwise false + *@author Mike Buland + */ + bool addLink( ProgramLink *pLink ); + + /** + * Gets a link by name. + *@param lpName The name of the link you're looking for. Every link has a + * name, apparently. + *@returns A pointer to the specified ProgramLink, or NULL if none were + * found matching your criteria. + *@author Mike Buland + */ + class ProgramLink *getLink( const char *lpName ); + + /** + * Gets the very first link in the chain. + *@returns A pointer to the first link in the chain. + *@author Mike Buland + */ + class ProgramLink *getBaseLink(); + + /** + * Runs through the chain once. Useful if you want to have more control + * over the operation of the chain. + *@returns true if every link returned true. If at least one link returns + * false, then returns false. + *@author Mike Buland + */ + bool execChainOnce(); + + /** + * Enters the master chain loop, looping over the entire chain and + * executing every link's TimeSlice routine in order, over and over, until + * a link returns a false value. + *@returns False, always. It returns true unless a link returned false, + * but loops until a link does return false. + *@author Mike Buland + **/ + bool enterChainLoop(); + + /** + * Broadcasts an Immediate Response Message to all active links, save the + * sender. Whatever link first responds with a non-null response message + * will have it's messages sent back to the broadcasting link as the returns + * of this function call. Therefore it is very important that all message + * processing code is handled in a fairly timely fasion. + *@param pMsgOut The message to broadcast in hopes of a response. + *@param pSender The message that sent out the message and doesn't want to + * receive it's own message. This should always just be "this". + *@returns The message that was returned by the first link to return a + * non-null response. If all messages return null responses then this also + * returns null. Please note that whoever calls this will be responsible + * for deleting the message returned by it, if non-null. + */ + class LinkMessage *broadcastIRM( LinkMessage *pMsgOut, ProgramLink *pSender ); + +private: + /** + * Shuts down all operation no matter what point in the operation we were. + */ + void emergencyShutdown(); + MultiLog &xLog; /**< A reference to the log. */ + LinkedList lLink; /**< The linked list that contains all of the links. */ +}; + +#endif diff --git a/src/old/programlink.cpp b/src/old/programlink.cpp new file mode 100644 index 0000000..21c6fe4 --- /dev/null +++ b/src/old/programlink.cpp @@ -0,0 +1,54 @@ +#include "programlink.h" +#include "programchain.h" + +ProgramLink::ProgramLink() +{ +} + +ProgramLink::~ProgramLink() +{ +} + +LinkMessage *ProgramLink::sendIRM( LinkMessage *pMsgOut ) +{ + return pChain->broadcastIRM( pMsgOut, this ); +} + +void ProgramLink::setChain( ProgramChain *pNewChain ) +{ + pChain = pNewChain; +} + +/* +void ProgramLink::postMessage( LinkMessage *pMsg, int nLvl ) +{ + if( nLvl == msgToChain ) + { + qMsgToChain.enqueue( pMsg ); + } + else if( nLvl == msgToLink ) + { + qMsgToLink.enqueue( pMsg ); + } + else + { + // ERROR! + } +} + +LinkMessage *ProgramLink::getMessage( int nLvl ) +{ + if( nLvl == msgToChain ) + { + return (LinkMessage *)qMsgToChain.dequeue(); + } + else if( nLvl == msgToLink ) + { + return (LinkMessage *)qMsgToLink.dequeue(); + } + else + { + // ERROR! + } +} +*/ diff --git a/src/old/programlink.h b/src/old/programlink.h new file mode 100644 index 0000000..f93edcc --- /dev/null +++ b/src/old/programlink.h @@ -0,0 +1,99 @@ +#ifndef PROGRAMLINK_H +#define PROGRAMLINK_H + +class ProgramLink; +#include "queue.h" +#include "linkmessage.h" +#include "programchain.h" + +/** + * Program Link is the base class for any object that will be a piece of the + * main program chain loop. + *@author Mike Buland + */ +class ProgramLink +{ +friend class ProgramChain; +public: + /** + * Construct a program link. + */ + ProgramLink(); + + /** + * Deconstruct. + */ + virtual ~ProgramLink(); + + /** + * Initialization code required for a link that wasn't performed in the + * constructor. + *@returns true if initialization was successful. A false value will halt + * the chain. + */ + virtual bool init()=0; + + /** + * DeInitialization code that should happen, but doesn't belong in the + * destructor. + *@returns true means everything worked, false means failure, but is + * meaningless. + */ + virtual bool deInit()=0; + + /** + * Executed once per link per chain pass. Contains the guts of the program. + *@returns true if everything went well. A false value will halt the chain. + */ + virtual bool timeSlice()=0; + + /** + * This must be handled in order to process Instant Response Messages. + * This function should return null on all messages that it doesn't + * understand how to handle, and construct new messages to return to sender + * in the cases where it does understand. + *@param pMsgIn The message that must be processed. + *@returns Either a new message in cases where a response is required, + * or null if nothing needs to be done by this link. + */ + virtual LinkMessage *processIRM( LinkMessage *pMsgIn ) = 0; + + /** + * Broadcast a LinkMessage to all other links in the system. Each other + * link will get a call of their processIRM function. If the message gets + * a response then you will regain control immediately, otherwise the system + * will give all other Links a chance to respond before returning NULL. + *@param pMsgOut The message to broadcast. + *@returns The message response, or NULL if no Link understood your message. + */ + LinkMessage *sendIRM( LinkMessage *pMsgOut ); + +private: + /** + * Set which chain we're assosiated with. This is how IRM messages make + * it out to the rest of the world. + *@param pNewChain A pointer to the containing program chain. + */ + void setChain( class ProgramChain *pNewChain ); + + /** + * The pointer to the containing chain. + */ + class ProgramChain *pChain; +/* + void postMessage( LinkMessage *pMsg, int nLvl ); + LinkMessage *getMessage( int nLvl ); + + enum + { + msgToChain, + msgToLink + }; + +private: + Queue qMsgToChain; + Queue qMsgToLink; +*/ +}; + +#endif diff --git a/src/old/protocol.cpp b/src/old/protocol.cpp new file mode 100644 index 0000000..78b3ee2 --- /dev/null +++ b/src/old/protocol.cpp @@ -0,0 +1,20 @@ +#include "protocol.h" + +Protocol::Protocol() +{ + pConnection = NULL; +} + +Protocol::~Protocol() +{ +} + +void Protocol::setConnection( Connection *pNewConnection ) +{ + pConnection = pNewConnection; +} + +Connection *Protocol::getConnection() +{ + return pConnection; +} diff --git a/src/old/protocol.h b/src/old/protocol.h new file mode 100644 index 0000000..09e1c98 --- /dev/null +++ b/src/old/protocol.h @@ -0,0 +1,62 @@ +#ifndef PROTOCOL_H +#define PROTOCOL_H + +#include "connection.h" + +/** This is the template for a class that handles specialized input and output + * to connections of different types with different protocols. + *@author Mike Buland + */ +class Protocol +{ +public: + /** Constructor */ + Protocol(); + /** Deconstructor */ + virtual ~Protocol(); + + /** + * Function is called every time there is new data on the line. This is + * called directly from the Connection class to process data. This is not + * called whever there is pending data on the input, but every time new data + * is added to the input buffer. + *@returns True if processing went alright, false if something went wrong, + * I suppose. In truth this value is thrown away right now. + *@todo Either make a return value of false mean something, or make these + * void. + */ + virtual bool onNewData()=0; + + /** + * Function is called when there is a new connection. This should only + * happen once per Protocol object, but gives each protocol object a + * chance to perform connection handshaking and initialization at a point + * where they know that they have a handle to an active Connection. + *@returns See onNewData + */ + virtual bool onNewConnection()=0; + + virtual void onNewClientConnection(){}; + + virtual void poll(){}; + + /** + * Sets the Protocol's Connection object. This is rather important, and + * handled usually by the ConnectionManager. + *@param pNewConnection The Connection object that this protocol will use to + * deal with the outside world. + */ + void setConnection( class Connection *pNewConnection ); + + /** + * Get a pointer to this object's Connection object, or NULL if one was + * never set. If used with the ConnectionManager that should never happen. + *@returns A pointer to the active Connection. + */ + Connection *getConnection(); + +private: + class Connection *pConnection; /**< The pointer to the Connection. */ +}; + +#endif diff --git a/src/old/protocoltelnet.cpp b/src/old/protocoltelnet.cpp new file mode 100644 index 0000000..b169a51 --- /dev/null +++ b/src/old/protocoltelnet.cpp @@ -0,0 +1,316 @@ +#include "protocoltelnet.h" +#include + +ProtocolTelnet::ProtocolTelnet() +{ + nTermType = termUnInited; + bEchoOn = true; +} + +ProtocolTelnet::~ProtocolTelnet() +{ +} + +bool ProtocolTelnet::onNewConnection() +{ + Connection *pCon = getConnection(); + + pCon->appendOutput( (char)IAC ); + pCon->appendOutput( (char)WILL ); + pCon->appendOutput( (char)SUPPRESSGA ); + + pCon->appendOutput( (char)IAC ); + pCon->appendOutput( (char)DO ); + pCon->appendOutput( (char)SUPPRESSGA ); + + pCon->appendOutput( (char)IAC ); + pCon->appendOutput( (char)DONT ); + pCon->appendOutput( (char)TERMTYPE ); + +// pCon->appendOutput( IAC ); +// pCon->appendOutput( SB ); +// pCon->appendOutput( TERMTYPE ); +// pCon->appendOutput( 1 ); +// pCon->appendOutput( IAC ); +// pCon->appendOutput( SE ); + + pCon->appendOutput( (char)IAC ); + pCon->appendOutput( (char)DONT ); + pCon->appendOutput( (char)ECHO ); + + pCon->appendOutput( (char)IAC ); + pCon->appendOutput( (char)WILL ); + pCon->appendOutput( (char)ECHO ); + +// 255(IAC),251(WILL),3 + return true; +} + +bool ProtocolTelnet::onNewData() +{ + Connection *pCon = getConnection(); + if( !pCon->hasInput() ) + { + return true; + } + + int nInSize = pCon->getInputAmnt(); + char *lpInStr = (char *)pCon->getInput(); + + // Here we interpret the basic commands and un-encapsulate them, so to + // speak. We'll allow this, even if the terminal is in raw mode, we + // just won't send anything in response... + for( int j = 0; j < nInSize; j++ ) + { + switch( (unsigned char)lpInStr[j] ) + { + case '\r': + fbEdited.appendData('\n'); + if( bEchoOn ) pCon->appendOutput("\n\r"); + break; + + case '\n': + break; + + case '\177': // backspace + if( fbEdited.getLength() > 0 ) + { + fbEdited.usedData( -1 ); // Delete one char from the end + if( bEchoOn ) pCon->appendOutput(ESC "[D"); // Move the cursor back one + if( bEchoOn ) pCon->appendOutput(ESC "[P"); // Delete one character + } + break; + + case '\x1B': // escape sequence + if( (unsigned char)lpInStr[j+1] == '[' ) + { + switch( (unsigned char)lpInStr[j+2] ) + { + case 'A': // Up + break; + + case 'B': // Down + break; + + case 'C': // Right + break; + + case 'D': // Left + break; + } + j+=2; + } + break; + + case 0: // NOP: No operation + break; + + case IAC: // IAC: Interpret as command + switch( lpInStr[j+1] ) + { + case SE: // SE: End of subnegotiation parameters. + break; + + case NOP: // NOP: No operation + break; + + case DM: // DM: Data mark. Indicates the position of a Synch event within the data stream. This should always be accompanied by a TCP urgent notification. + break; + + case BRK: // BRK: Break. Indicates that the "break" or "attention" key was hit. + break; + + case IP: // IP: Suspend, interrupt or abort the process to which the NVT is connected. + break; + + case AO: // AO: Abort output. Allows the current process to run to completion but do not send its output to the user. + break; + + case AYT: // AYT: Are you there. Send back to the NVT some visible evidence that the AYT was received. + break; + + case EC: // EC: Erase character. The receiver should delete the last preceding undeleted character from the data stream. + break; + + case EL: // EL: Erase line. Delete characters from the data stream back to but not including the previous CRLF. + break; + + case GA: // GA: Go ahead. Used, under certain circumstances, to tell the other end that it can transmit. + break; + + case SB: // SB: Subnegotiation of the indicated option follows. + switch( lpInStr[j+2] ) + { + case TERMTYPE: + if( lpInStr[j+3] == 0 ) + { + for( int k = 0; j+4+k < nInSize; k++ ) + { + if( (unsigned char)lpInStr[j+4+k] == IAC && + (unsigned char)lpInStr[j+5+k] == SE ) + { + lpInStr[j+4+k] = 0; + //@TODO: Do something with the term type... + printf("Term type: %s\n", &lpInStr[j+4] ); + j += 5+k; + } + } + } + else + { + } + break; + + default: + //printf("unknown subnegotiation parameters! (%d)\n", lpInStr[j+2] ); + break; + } + break; + + case WILL: // WILL: Indicates the desire to begin performing + switch( lpInStr[j+2] ) + { + case SUPPRESSGA: + j += 2; +// pCon->usedInput( 3 ); + break; + + case TERMTYPE: + j += 2; +// pCon->usedInput( 3 ); + break; + + case ECHO: + j += 2; +// pCon->usedInput( 3 ); + break; + + case NAWS: + default: + pCon->appendOutput( (char)ESC[0] ); + pCon->appendOutput( (char)DONT ); + pCon->appendOutput( lpInStr[j+2] ); + //printf("unknown will command used! (%d)\n", lpInStr[j+2] ); + j += 2; + break; + } + break; + + case WONT: // WONT: Indicates the refusal to perform + switch( lpInStr[j+2] ) + { + case ECHO: + j += 2; +// pCon->usedInput( 3 ); + break; + + default: + //printf("unknown wont command used! (%d)\n", lpInStr[j+2] ); + j += 2; + break; + } + break; + + case DO: // DO: Indicates the request that the other party perform + switch( lpInStr[j+2] ) + { + case ECHO: + j += 2; + break; + + case SUPPRESSGA: + j += 2; + break; + + default: + pCon->appendOutput( (char)ESC[0] ); + pCon->appendOutput( (char)DONT ); + pCon->appendOutput( lpInStr[j+2] ); + //printf("unknown do command used! (%d)\n", lpInStr[j+2] ); + j += 2; + break; + } +// pCon->usedInput( 3 ); + break; + + case DONT: // DONT: Indicates the demand that the other party stop performing + switch( lpInStr[j+2] ) + { + case ECHO: + j += 2; +// pCon->usedInput( 3 ); + break; + + default: + printf("unknown dont command used! (%d)\n", lpInStr[j+2] ); + j += 2; + break; + } + break; + } + break; + + default: + fbEdited.appendData( lpInStr[j] ); + if( bEchoOn ) pCon->appendOutput( lpInStr[j] ); + break; + } + } + + pCon->usedInput( pCon->getInputAmnt() ); + + return true; +} + +char *ProtocolTelnet::getLine( bool bFullOnly ) +{ + int i = fbEdited.findChar('\n'); + + if( i < 0 ) + { + if( bFullOnly == false ) + { + i = fbEdited.getLength(); + } + else + { + return NULL; + } + } + + char *lpStr = new char[i+1]; + strncpy( lpStr, fbEdited.getData(), i ); + lpStr[i] = '\0'; + + fbEdited.usedData( i+1 ); + + return lpStr; +} + +char *ProtocolTelnet::peekLine( bool bFullOnly ) +{ + int i = fbEdited.findChar('\n'); + + if( i < 0 ) + { + if( bFullOnly == false ) + { + i = fbEdited.getLength(); + } + else + { + return NULL; + } + } + + char *lpStr = new char[i+1]; + strncpy( lpStr, fbEdited.getData(), i ); + lpStr[i] = '\0'; + + return lpStr; +} + +void ProtocolTelnet::setEcho( bool bEchoOn ) +{ + this->bEchoOn = bEchoOn; +} diff --git a/src/old/protocoltelnet.h b/src/old/protocoltelnet.h new file mode 100644 index 0000000..a6d2e49 --- /dev/null +++ b/src/old/protocoltelnet.h @@ -0,0 +1,77 @@ +#ifndef PROTOCOLTELNET_H +#define PROTOCOLTELNET_H + +#include "protocol.h" +#include "flexbuf.h" + +#define ESC "\x1B" /**< A telnet escape code. */ + +/** Handles all specialized protocol actions related to the telnet protocol. + * This includes setting modes, non-scrollable regions, and so on. + *@author Mike Buland + */ +class ProtocolTelnet : public Protocol +{ +public: + ProtocolTelnet(); + virtual ~ProtocolTelnet(); + + bool onNewData(); + bool onNewConnection(); + + char *getLine( bool bFullOnly = true ); + char *peekLine( bool bFullOnly = true ); + + void setEcho( bool bEchoOn = true ); + + enum + { + termUnInited, + termRaw, + termUnknown, + termVT220, + termXTerm + }; + + enum + { + SE = 240, // SE: End of subnegotiation parameters. + NOP = 241, // NOP: No operation + DM = 242, // DM: Data mark. Indicates the position of a Synch event within the data stream. This should always be accompanied by a TCP urgent notification. + BRK = 243, // BRK: Break. Indicates that the "break" or "attention" key was hit. + IP = 244, // IP: Suspend, interrupt or abort the process to which the NVT is connected. + AO = 245, // AO: Abort output. Allows the current process to run to completion but do not send its output to the user. + AYT = 246, // AYT: Are you there. Send back to the NVT some visible evidence that the AYT was received. + EC = 247, // EC: Erase character. The receiver should delete the last preceding undeleted character from the data stream. + EL = 248, // EL: Erase line. Delete characters from the data stream back to but not including the previous CRLF. + GA = 249, // GA: Go ahead. Used, under certain circumstances, to tell the other end that it can transmit. + SB = 250, // SB: Subnegotiation of the indicated option follows. + WILL = 251, // WILL: Indicates the desire to begin performing, or confirmation that you are now performing, the indicated option. + WONT = 252, // WONT: Indicates the refusal to perform, or continue performing, the indicated option. + DO = 253, // DO: Indicates the request that the other party perform, or confirmation that you are expecting the other party to perform, the indicated option. + DONT = 254, // DONT: Indicates the demand that the other party stop performing, or confirmation that you are no longer expecting the other party to perform, the indicated option. + IAC = 255 // IAC: Interpret as command + }; + + enum + { + ECHO = 1, // Explain who'll echo + SUPPRESSGA = 3, // Suppress Go Ahead + TERMTYPE = 24, // Terminal Type + NAWS = 31, // Window size + TERMSPEED = 32, // Terminal Speed + LINEMODE = 34 // Linemode + }; + +private: + int nTermType; + + int nTermWidth; + int nTermHeight; + + FlexBuf fbEdited; + + bool bEchoOn; +}; + +#endif diff --git a/src/old/queue.cpp b/src/old/queue.cpp new file mode 100644 index 0000000..42999fe --- /dev/null +++ b/src/old/queue.cpp @@ -0,0 +1,26 @@ +#include "queue.h" + +void Queue::enqueue( void *data ) +{ + lQueueData.append( data ); +} + +void *Queue::dequeue() +{ + void *dat = lQueueData[0]; + if( dat != NULL ) + { + lQueueData.deleteAt( 0 ); + } + return dat; +} + +bool Queue::isEmpty() +{ + return lQueueData.isEmpty(); +} + +void Queue::empty() +{ + lQueueData.empty(); +} diff --git a/src/old/queue.h b/src/old/queue.h new file mode 100644 index 0000000..692f5d8 --- /dev/null +++ b/src/old/queue.h @@ -0,0 +1,45 @@ +#ifndef QUEUE_H +#define QUEUE_H +#include "linkedlist.h" + +/** + * An ultra-simple queue implementation. It just uses a linked list as it's + * container so we don't have to worry about anything! + *@author Mike Buland + */ +class Queue +{ +public: + /** + * Puts a new item at the end of the queue. + *@param data A new value to put at the end of the queue. + */ + void enqueue( void *data ); + + /** + * Gets the begining item of the queue off and returns it. + *@returns The value at the front of the queue. + */ + void *dequeue(); + + /** + * Checks if the queueu is empty. + *@returns True if the queueu is empty, and false if it has things in it. + */ + bool isEmpty(); + + /** + * Empty the queue. + */ + void empty(); + + /** + * Get a pointer to the internal list object. + *@returns A pointer to the internal list object. + */ + LinkedList *getList() { return &lQueueData; }; + +private: + LinkedList lQueueData; /**< Where all of the real data is stored. */ +}; +#endif diff --git a/src/old/ringlist.cpp b/src/old/ringlist.cpp new file mode 100644 index 0000000..9efbbc4 --- /dev/null +++ b/src/old/ringlist.cpp @@ -0,0 +1,106 @@ +// +// C++ Implementation: ringlist +// +// Description: +// +// +// Author: Mike Buland , (C) 2005 +// +// Copyright: See COPYING file that comes with this distribution +// +// +#include + +#include "ringlist.h" + +RingList::RingList( int nInitSize ) + : List() +{ + nFirstIndex = 0; + nRealLength = nInitSize; + nDataLength = 0; + apData = new void*[nInitSize]; + pPushBuf = NULL; +} + +RingList::~RingList() +{ + delete[] apData; +} + +void *RingList::getAt( int nIndex ) +{ + if( nIndex < 0 || nIndex >= nDataLength ) + { + return NULL; + } + + return apData[(nFirstIndex+nIndex)%nRealLength]; +} + +void RingList::append( void *pData ) +{ + int nIndex = (nFirstIndex+nDataLength)%nRealLength; + + pPushBuf = apData[nIndex]; + apData[nIndex] = pData; + + if( nDataLength == nRealLength ) + { + nFirstIndex = (nFirstIndex+1)%nRealLength; + } + else + { + nDataLength++; + // We really didn't need it this time... + pPushBuf = NULL; + } +} + +void RingList::insertBefore( void *pData, int nPos ) +{ + // Not implemented right now, don't even try it! +} + +int RingList::getSize() +{ + return nDataLength; +} + +bool RingList::isEmpty() +{ + return nDataLength==0; +} + +void RingList::deleteAt( int nIndex ) +{ + // Also not implemented yet +} + +void RingList::empty() +{ + nFirstIndex = 0; + nDataLength = 0; +} + +void RingList::setSize( int nNewSize ) +{ + if( apData ) + { + delete[] apData; + } + nFirstIndex = 0; + nRealLength = nNewSize; + nDataLength = 0; + apData = new void*[nNewSize]; +} + +void RingList::setAt( int nIndex, void *pData ) +{ + apData[(nIndex+nFirstIndex)%nRealLength] = pData; +} + +void *RingList::getPushBuf() +{ + return pPushBuf; +} diff --git a/src/old/ringlist.h b/src/old/ringlist.h new file mode 100644 index 0000000..bc069f3 --- /dev/null +++ b/src/old/ringlist.h @@ -0,0 +1,112 @@ +#ifndef RINGLIST_H +#define RINGLIST_H + +#include "list.h" + +/** + * A RingList or Ring Buffer implementation. This is a list that never grows in + * size once it is created, but instead once it is full new items added to the + * RingList replace the oldest items and the zero-index is virtually shifted. + * Since no data is actually moved when zero-index moves, this is very + * efficient. + *
+ * The items removed are not actually deleted by the RingList, so instead they + * are first moved into a temporary "Push Buffer" that can be accessed so that + * elements pushed off the edge of the RingList can be accessed for cleanup. + *@author Mike Buland + */ +class RingList : public List +{ +public: + /** + * Construct a RingList with a fixed initial size. This size never changes + * unless setSize is called later during normal operation. + *@param nInitSize The number of elements to allocate. + */ + RingList( int nInitSize ); + + /** + * Clean up the data structures, but not the contained elements. + */ + virtual ~RingList(); + + /** + * Get an element at the specified index. + *@param nIndex The index of the element to retreive. + *@returns A pointer to the requested element, or NULL if the element is + * not found or not initialized yet. + */ + void *getAt( int nIndex ); + + /** + * Append an element to the end of the list, overwriting the begining if + * necesarry. + *@param pData The pointer to append to the RingList. + */ + void append( void *pData ); + + /** + * Insert an element before another in the RingList, pushing all after it + * down the list. + *@param pData The data to insert. + *@param nPos The position that new the element should occupy in the list. + */ + void insertBefore( void *pData, int nPos = 0 ); + + /** + * Get the size of the array. + */ + int getSize(); + + /** + * Is the RingList empty? + *@returns True if it is empty, false otherwise. + */ + bool isEmpty(); + + /** + * Delete an element in the list, moving all later elements down one index. + *@param nIndex The index of the element to delete. + */ + void deleteAt( int nIndex ); + + /** + * Remove all elements from the RingList. + */ + void empty(); + + /** + * Set a new size for the RingList. Be careful with this one, if shrinking + * this may quietly create a memory leak. + *@param nNewSize The new size to set the RingList to. + *@todo Either fix this memory leak somehow or remove this function. + */ + void setSize( int nNewSize ); + + /** + * Set a specific element to a new value. + *@param nIndex The zero-based index to change the value of. + *@param pData The data to put at the location specified by nIndex. + */ + void setAt( int nIndex, void *pData ); + + /** + * Retrieve the contents of the push buffer. This is the data that is + * pushed off the end of the array if you append data and the list is full. + * This should be checked after every append operation to be sure there + * isn't anything that needs deleting. + *@returns The last value pushed off the RingList, or NULL if nothing was + * pushed off. + */ + void *getPushBuf(); + +private: + int nFirstIndex; /**< The index to be translated as zero. */ + int nRealLength; /**< The Amount of storage space available. */ + int nDataLength; /**< The number of elements filled in. */ + void **apData; /**< The actual data storage. */ + void *pPushBuf; /**< The push buffer. */ + +}; + +#endif diff --git a/src/old/sbuffer.cpp b/src/old/sbuffer.cpp new file mode 100644 index 0000000..f84f8a3 --- /dev/null +++ b/src/old/sbuffer.cpp @@ -0,0 +1,67 @@ +#include +#include "sbuffer.h" + +SBuffer::SBuffer() : + nPos( 0 ), + bOpen( true ) +{ +} + +SBuffer::~SBuffer() +{ +} + +void SBuffer::close() +{ + bOpen = false; + fbData.clearData(); +} + +size_t SBuffer::read( char *pBuf, size_t nBytes ) +{ + size_t nLeft = fbData.getLength() - nPos; + if( nBytes > nLeft ) + nBytes = nLeft; + + if( nLeft == 0 ) + return 0; + + memcpy( pBuf, fbData.getData()+nPos, nBytes ); + nPos += nBytes; + + return nBytes; +} + +size_t SBuffer::write( const char *pBuf, size_t nBytes ) +{ + fbData.appendData( pBuf, nBytes ); + nPos += nBytes; + + return nBytes; +} + +long SBuffer::tell() +{ + return nPos; +} + +void SBuffer::seek( long offset ) +{ + nPos += offset; +} + +void SBuffer::setPos( long pos ) +{ + nPos = pos; +} + +void SBuffer::setPosEnd( long pos ) +{ + nPos = fbData.getLength() - pos; +} + +bool SBuffer::isEOS() +{ + return nPos == fbData.getLength(); +} + diff --git a/src/old/sbuffer.h b/src/old/sbuffer.h new file mode 100644 index 0000000..65feb71 --- /dev/null +++ b/src/old/sbuffer.h @@ -0,0 +1,40 @@ +#ifndef S_BUFFER_H +#define S_BUFFER_H + +#include + +#include "stream.h" +#include "flexbuf.h" + +class SBuffer : public Stream +{ +public: + SBuffer(); + virtual ~SBuffer(); + + virtual void close(); + virtual size_t read( char *pBuf, size_t nBytes ); + + /** + *@todo Update this to write at nPos, not just append data. + */ + virtual size_t write( const char *pBuf, size_t nBytes ); + + virtual long tell(); + virtual void seek( long offset ); + virtual void setPos( long pos ); + virtual void setPosEnd( long pos ); + virtual bool isEOS(); + + FlexBuf &getBuffer() + { + return fbData; + } + +private: + long nPos; + bool bOpen; + FlexBuf fbData; +}; + +#endif diff --git a/src/old/serializable.cpp b/src/old/serializable.cpp new file mode 100644 index 0000000..fd50943 --- /dev/null +++ b/src/old/serializable.cpp @@ -0,0 +1,8 @@ +#include "serializable.h" + +Serializable::Serializable() +{ +} +Serializable::~Serializable() +{ +} diff --git a/src/old/serializable.h b/src/old/serializable.h new file mode 100644 index 0000000..06def29 --- /dev/null +++ b/src/old/serializable.h @@ -0,0 +1,34 @@ +#ifndef SERIALIZER_H +#define SERIALIZER_H + +//#include "serializer.h" + +/** + * The base class for any class you want to serialize. Simply include this as + * a base class, implement the purely virtual serialize function and you've got + * an easily serializable class. + */ +class Serializable +{ +public: + /** + * Does nothing, here for completeness. + */ + Serializable(); + + /** + * Here to ensure the deconstructor is virtual. + */ + virtual ~Serializable(); + + /** + * This is the main workhorse of the serialization system, just override and + * you've got a serializable class. A reference to the Serializer archive + * used is passed in as your only parameter, query it to discover if you are + * loading or saving. + * @param ar A reference to the Serializer object to use. + */ + virtual void serialize( class Serializer &ar )=0; +}; + +#endif diff --git a/src/old/serializer.cpp b/src/old/serializer.cpp new file mode 100644 index 0000000..636224e --- /dev/null +++ b/src/old/serializer.cpp @@ -0,0 +1,338 @@ +#include "serializer.h" +#include "serializable.h" +#include + +Serializer::Serializer(bool bLoading): + bLoading(bLoading) +{ +} +Serializer::~Serializer() +{ +} + +bool Serializer::isLoading() +{ + return bLoading; +} +Serializer &Serializer::operator<<(bool p) +{ + write( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator<<(int8_t p) +{ + write( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator<<(int16_t p) +{ + write( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator<<(int32_t p) +{ + write( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator<<(int64_t p) +{ + write( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator<<(uint8_t p) +{ + write( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator<<(uint16_t p) +{ + write( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator<<(uint32_t p) +{ + write( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator<<(uint64_t p) +{ + write( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator<<(long p) +{ + write( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator<<(float p) +{ + write( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator<<(double p) +{ + write( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator<<(long double p) +{ + write( &p, sizeof(p) ); + return *this; +} + +Serializer &Serializer::operator>>(bool &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator>>(int8_t &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator>>(int16_t &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator>>(int32_t &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator>>(int64_t &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator>>(uint8_t &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator>>(uint16_t &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator>>(uint32_t &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator>>(uint64_t &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator>>(long &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator>>(float &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator>>(double &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Serializer &Serializer::operator>>(long double &p) +{ + read( &p, sizeof(p) ); + return *this; +} + +Serializer &Serializer::operator&&(bool &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Serializer &Serializer::operator&&(int8_t &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Serializer &Serializer::operator&&(int16_t &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Serializer &Serializer::operator&&(int32_t &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Serializer &Serializer::operator&&(int64_t &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Serializer &Serializer::operator&&(uint8_t &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Serializer &Serializer::operator&&(uint16_t &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Serializer &Serializer::operator&&(uint32_t &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Serializer &Serializer::operator&&(uint64_t &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Serializer &Serializer::operator&&(float &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Serializer &Serializer::operator&&(double &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Serializer &Serializer::operator&&(long double &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + + +Serializer &operator<<(Serializer &s, Serializable &p) +{ + p.serialize( s ); + return s; +} + +Serializer &operator>>(Serializer &s, Serializable &p) +{ + p.serialize( s ); + return s; +} + +Serializer &operator&&(Serializer &s, Serializable &p) +{ + if (s.isLoading()) + { + return s >> p; + } + else + { + return s << p; + } +} + +Serializer &operator<<( Serializer &ar, std::string &s ) +{ + ar << (uint32_t)s.length(); + ar.write( s.c_str(), s.length() ); + + return ar; +} + +Serializer &operator>>( Serializer &ar, std::string &s ) +{ + uint32_t l; + ar >> l; + char *tmp = new char[l+1]; + tmp[l] = '\0'; + ar.read( tmp, l ); + s = tmp; + delete[] tmp; + + return ar; +} + diff --git a/src/old/serializer.h b/src/old/serializer.h new file mode 100644 index 0000000..3af489c --- /dev/null +++ b/src/old/serializer.h @@ -0,0 +1,80 @@ +#ifndef SERIALIZABLE_H +#define SERIALIZABLE_H + +#include +#include +#include +//#include "serializable.h" + +class Serializer +{ +private: + bool bLoading; +public: + bool isLoading(); + + enum + { + load = true, + save = false + }; + + Serializer(bool bLoading); + virtual ~Serializer(); + virtual void close()=0; + + virtual void write(const void *, int32_t)=0; + virtual void read(void *, int32_t)=0; + + virtual Serializer &operator<<(bool); + virtual Serializer &operator<<(int8_t); + virtual Serializer &operator<<(int16_t); + virtual Serializer &operator<<(int32_t); + virtual Serializer &operator<<(int64_t); + virtual Serializer &operator<<(uint8_t); + virtual Serializer &operator<<(uint16_t); + virtual Serializer &operator<<(uint32_t); + virtual Serializer &operator<<(uint64_t); + virtual Serializer &operator<<(long); + virtual Serializer &operator<<(float); + virtual Serializer &operator<<(double); + virtual Serializer &operator<<(long double); + + virtual Serializer &operator>>(bool &); + virtual Serializer &operator>>(int8_t &); + virtual Serializer &operator>>(int16_t &); + virtual Serializer &operator>>(int32_t &); + virtual Serializer &operator>>(int64_t &); + virtual Serializer &operator>>(uint8_t &); + virtual Serializer &operator>>(uint16_t &); + virtual Serializer &operator>>(uint32_t &); + virtual Serializer &operator>>(uint64_t &); + virtual Serializer &operator>>(long &); + virtual Serializer &operator>>(float &); + virtual Serializer &operator>>(double &); + virtual Serializer &operator>>(long double &); + + virtual Serializer &operator&&(bool &); + virtual Serializer &operator&&(int8_t &); + virtual Serializer &operator&&(int16_t &); + virtual Serializer &operator&&(int32_t &); + virtual Serializer &operator&&(int64_t &); + virtual Serializer &operator&&(uint8_t &); + virtual Serializer &operator&&(uint16_t &); + virtual Serializer &operator&&(uint32_t &); + virtual Serializer &operator&&(uint64_t &); + virtual Serializer &operator&&(float &); + virtual Serializer &operator&&(double &); + virtual Serializer &operator&&(long double &); + + //virtual Serializer &operator&(Serializable &); +}; + +Serializer &operator<<(Serializer &, class Serializable &); +Serializer &operator>>(Serializer &, class Serializable &); +Serializer &operator&&(Serializer &s, class Serializable &p); + +Serializer &operator<<(Serializer &, std::string &); +Serializer &operator>>(Serializer &, std::string &); + +#endif diff --git a/src/old/serializerbinary.cpp b/src/old/serializerbinary.cpp new file mode 100644 index 0000000..ea7ed93 --- /dev/null +++ b/src/old/serializerbinary.cpp @@ -0,0 +1,63 @@ +#include "serializerbinary.h" +#include "serializable.h" +#include "exceptions.h" + +SerializerBinary::SerializerBinary(FILE *fhFile, bool bLoading): + Serializer(bLoading), + fhFile(fhFile), + bCloseFile(false) +{ +} + +SerializerBinary::SerializerBinary(const char *sFileName, bool bLoading): + Serializer(bLoading), + bCloseFile(true) +{ + if (bLoading) + { + fhFile = fopen(sFileName, "rb"); + if( fhFile == NULL ) + throw FileException("Unable to open file: %s", sFileName ); + } + else + { + fhFile = fopen(sFileName, "wb"); + if( fhFile == NULL ) + throw FileException("Unable to open file: %s", sFileName ); + } +} + +SerializerBinary::~SerializerBinary() +{ + close(); +} + +void SerializerBinary::close() +{ + if (fhFile != NULL && bCloseFile ) + { + fclose(fhFile); + fhFile = NULL; + } +} + +void SerializerBinary::write(const void * pData, int32_t nSize) +{ + if( nSize == 0 ) + return; + + fwrite(pData, nSize, 1, fhFile); +} + +void SerializerBinary::read(void * pData, int32_t nSize) +{ + if( nSize == 0 ) + return; + + uint32_t nRead = fread(pData, nSize, 1, fhFile); + if( nRead < 1 ) + { + throw FileException( excodeEOF, "End of file read"); + } +} + diff --git a/src/old/serializerbinary.h b/src/old/serializerbinary.h new file mode 100644 index 0000000..8510fcd --- /dev/null +++ b/src/old/serializerbinary.h @@ -0,0 +1,24 @@ +#ifndef SERIALIZER_BINARY_H +#define SERIALIZER_BINARY_H + +#include "serializer.h" +#include + +class SerializerBinary : public Serializer +{ +public: + SerializerBinary(FILE *fhFile, bool bLoading); + SerializerBinary(const char *sFileName, bool bLoading); + virtual ~SerializerBinary(); + + virtual void close(); + + virtual void write(const void *, int32_t); + virtual void read(void *, int32_t); + +private: + FILE *fhFile; + bool bCloseFile; +}; + +#endif diff --git a/src/old/serializerbzip2.cpp b/src/old/serializerbzip2.cpp new file mode 100644 index 0000000..bafabc8 --- /dev/null +++ b/src/old/serializerbzip2.cpp @@ -0,0 +1,88 @@ +#include "serializerbzip2.h" +#include "serializable.h" + +#include + +SerializerBZip2::SerializerBZip2(FILE *fhFile, bool bLoading): + Serializer(bLoading), + fhFile(fhFile), + bCloseFile(false) +{ + if( bLoading ) + { + bzFile = BZ2_bzReadOpen( &bzerror, fhFile, 0, 0, NULL, 0 ); + checkBZError(); + } + else + { + bzFile = BZ2_bzWriteOpen( &bzerror, fhFile, 9, 0, 0 ); + checkBZError(); + } +} + +SerializerBZip2::SerializerBZip2(char *sFileName, bool bLoading): + Serializer(bLoading), + bCloseFile(true) +{ + if (bLoading) + { + fhFile = fopen(sFileName, "rb"); + bzFile = BZ2_bzReadOpen( &bzerror, fhFile, 0, 0, NULL, 0 ); + checkBZError(); + } + else + { + fhFile = fopen(sFileName, "wb"); + bzFile = BZ2_bzWriteOpen( &bzerror, fhFile, 9, 0, 0 ); + checkBZError(); + } +} + +SerializerBZip2::~SerializerBZip2() +{ + close(); +} + +void SerializerBZip2::checkBZError() +{ +} + +void SerializerBZip2::close() +{ + if( bzFile != NULL ) + { + if( isLoading() ) + { + void *unused; + int nUnused; + BZ2_bzReadGetUnused( &bzerror, bzFile, &unused, &nUnused ); + BZ2_bzReadClose( &bzerror, bzFile ); + if( nUnused ) + fseek( fhFile, -nUnused, SEEK_CUR ); + } + else + { + BZ2_bzWriteClose( &bzerror, bzFile, 0, 0, 0 ); + } + checkBZError(); + bzFile = NULL; + } + if( fhFile != NULL && bCloseFile ) + { + fclose(fhFile); + fhFile = NULL; + } +} + +void SerializerBZip2::write(const void * pData, int32_t nSize) +{ + BZ2_bzWrite( &bzerror, bzFile, (void *)pData, nSize ); + checkBZError(); +} + +void SerializerBZip2::read(void * pData, int32_t nSize) +{ + BZ2_bzRead( &bzerror, bzFile, pData, nSize ); + checkBZError(); +} + diff --git a/src/old/serializerbzip2.h b/src/old/serializerbzip2.h new file mode 100644 index 0000000..4aeb22e --- /dev/null +++ b/src/old/serializerbzip2.h @@ -0,0 +1,27 @@ +#ifndef SERIALIZER_BINARY_H +#define SERIALIZER_BINARY_H + +#include "serializer.h" +#include + +class SerializerBZip2 : public Serializer +{ +public: + SerializerBZip2(FILE *fhFile, bool bLoading); + SerializerBZip2(char *sFileName, bool bLoading); + virtual ~SerializerBZip2(); + + virtual void close(); + + virtual void write(const void *, int32_t); + virtual void read(void *, int32_t); + +private: + void checkBZError(); + FILE *fhFile; + void *bzFile; + bool bCloseFile; + int bzerror; +}; + +#endif diff --git a/src/old/serializerconnection.cpp b/src/old/serializerconnection.cpp new file mode 100644 index 0000000..2934c8b --- /dev/null +++ b/src/old/serializerconnection.cpp @@ -0,0 +1,15 @@ +#include "serializerconnection.h" + +SerializerConnection::SerializerConnection( + Connection *pCon, bool bIO, int nTimeSec, int nTimeUSec ) : + Serializer( bIO ), + pCon( pCon ), + nTimeSec( nTimeSec ), + nTimeUSec( nTimeUSec ) +{ +} + +SerializerConnection::~SerializerConnection() +{ +} + diff --git a/src/old/serializerconnection.h b/src/old/serializerconnection.h new file mode 100644 index 0000000..e8d85c6 --- /dev/null +++ b/src/old/serializerconnection.h @@ -0,0 +1,24 @@ +#ifndef SERIALIZER_CONNECTION_H +#define SERIALIZER_CONNECTION_H + +#include + +#include "serializer.h" +#include "connection.h" + +/** + * + */ +class SerializerConnection : public Serializer +{ +public: + SerializerConnection( Connection *pCon, bool bIO, int nTimeSec, int nTimeUSec ); + virtual ~SerializerConnection(); + +private: + Connection *pCon; + int nTimeSec; + int nTimeUSec; +}; + +#endif diff --git a/src/old/serializertext.cpp b/src/old/serializertext.cpp new file mode 100644 index 0000000..9cf4394 --- /dev/null +++ b/src/old/serializertext.cpp @@ -0,0 +1,170 @@ +#include "serializertext.h" + +SerializerText::SerializerText(FILE *fhFile, bool bLoading): + Serializer(bLoading), + fhFile(fhFile), + bCloseFile(false) +{ +} + +SerializerText::SerializerText(const char *sFileName, bool bLoading): + Serializer(bLoading), + bCloseFile(true) +{ + if (bLoading) + { + fhFile = fopen(sFileName, "rt"); + } + else + { + fhFile = fopen(sFileName, "wt"); + } +} + +SerializerText::~SerializerText() +{ + close(); +} + +void SerializerText::close() +{ + if (fhFile != NULL) + { + fclose(fhFile); + fhFile = NULL; + } +} + +void SerializerText::write(const void * pData, int32_t nSize) +{ + fwrite(pData, nSize, 1, fhFile); + fprintf(fhFile, "\n"); +} + +void SerializerText::read(void * pData, int32_t nSize) +{ + fread(pData, nSize, 1, fhFile); + fgetc(fhFile); +} + +Serializer &SerializerText::operator<<(bool p) +{ + fprintf(fhFile, "%hhd\n", p); + return *this; +} +Serializer &SerializerText::operator<<(int8_t p) +{ + fprintf(fhFile, "%hhd\n", p); + return *this; +} +Serializer &SerializerText::operator<<(int16_t p) +{ + fprintf(fhFile, "%hd\n", p); + return *this; +} +Serializer &SerializerText::operator<<(int32_t p) +{ + fprintf(fhFile, "%d\n", p); + return *this; +} +Serializer &SerializerText::operator<<(int64_t p) +{ + fprintf(fhFile, "%lld\n", p); + return *this; +} +Serializer &SerializerText::operator<<(uint8_t p) +{ + fprintf(fhFile, "%hhu\n", p); + return *this; +} +Serializer &SerializerText::operator<<(uint16_t p) +{ + fprintf(fhFile, "%hu\n", p); + return *this; +} +Serializer &SerializerText::operator<<(uint32_t p) +{ + fprintf(fhFile, "%u\n", p); + return *this; +} +Serializer &SerializerText::operator<<(uint64_t p) +{ + fprintf(fhFile, "%llu\n", p); + return *this; +} +Serializer &SerializerText::operator<<(float p) +{ + fprintf(fhFile, "%f\n", p); + return *this; +} +Serializer &SerializerText::operator<<(double p) +{ + fprintf(fhFile, "%f\n", p); + return *this; +} +Serializer &SerializerText::operator<<(long double p) +{ + fprintf(fhFile, "%Lf\n", p); + return *this; +} + +Serializer &SerializerText::operator>>(bool &p) +{ + fscanf(fhFile, "%hhd\n", ((signed char *)&p)); + return *this; +} +Serializer &SerializerText::operator>>(int8_t &p) +{ + fscanf(fhFile, "%hhd\n", &p); + return *this; +} +Serializer &SerializerText::operator>>(int16_t &p) +{ + fscanf(fhFile, "%hd\n", &p); + return *this; +} +Serializer &SerializerText::operator>>(int32_t &p) +{ + fscanf(fhFile, "%d\n", &p); + return *this; +} +Serializer &SerializerText::operator>>(int64_t &p) +{ + fscanf(fhFile, "%lld\n", &p); + return *this; +} +Serializer &SerializerText::operator>>(uint8_t &p) +{ + fscanf(fhFile, "%hhu\n", &p); + return *this; +} +Serializer &SerializerText::operator>>(uint16_t &p) +{ + fscanf(fhFile, "%hu\n", &p); + return *this; +} +Serializer &SerializerText::operator>>(uint32_t &p) +{ + fscanf(fhFile, "%u\n", &p); + return *this; +} +Serializer &SerializerText::operator>>(uint64_t &p) +{ + fscanf(fhFile, "%llu\n", &p); + return *this; +} +Serializer &SerializerText::operator>>(float &p) +{ + fscanf(fhFile, "%f\n", &p); + return *this; +} +Serializer &SerializerText::operator>>(double &p) +{ + fscanf(fhFile, "%lf\n", &p); + return *this; +} +Serializer &SerializerText::operator>>(long double &p) +{ + fscanf(fhFile, "%Lf\n", &p); + return *this; +} diff --git a/src/old/serializertext.h b/src/old/serializertext.h new file mode 100644 index 0000000..01b7f7b --- /dev/null +++ b/src/old/serializertext.h @@ -0,0 +1,49 @@ +#ifndef SERIALIZER_TEXT_H +#define SERIALIZER_TEXT_H + +#include "serializer.h" +#include + +class SerializerText : public Serializer +{ +public: + SerializerText(FILE *fhFile, bool bLoading); + SerializerText(const char *sFileName, bool bLoading); + virtual ~SerializerText(); + + virtual void close(); + + virtual void write(const void *, int32_t); + virtual void read(void *, int32_t); + + virtual Serializer &operator<<(bool); + virtual Serializer &operator<<(int8_t); + virtual Serializer &operator<<(int16_t); + virtual Serializer &operator<<(int32_t); + virtual Serializer &operator<<(int64_t); + virtual Serializer &operator<<(uint8_t); + virtual Serializer &operator<<(uint16_t); + virtual Serializer &operator<<(uint32_t); + virtual Serializer &operator<<(uint64_t); + virtual Serializer &operator<<(float); + virtual Serializer &operator<<(double); + virtual Serializer &operator<<(long double); + + virtual Serializer &operator>>(bool &); + virtual Serializer &operator>>(int8_t &); + virtual Serializer &operator>>(int16_t &); + virtual Serializer &operator>>(int32_t &); + virtual Serializer &operator>>(int64_t &); + virtual Serializer &operator>>(uint8_t &); + virtual Serializer &operator>>(uint16_t &); + virtual Serializer &operator>>(uint32_t &); + virtual Serializer &operator>>(uint64_t &); + virtual Serializer &operator>>(float &); + virtual Serializer &operator>>(double &); + virtual Serializer &operator>>(long double &); +private: + FILE *fhFile; + bool bCloseFile; +}; + +#endif diff --git a/src/old/sfile.cpp b/src/old/sfile.cpp new file mode 100644 index 0000000..f1de03c --- /dev/null +++ b/src/old/sfile.cpp @@ -0,0 +1,74 @@ +#include "sfile.h" +#include "exceptions.h" + +SFile::SFile( const char *sName, const char *sFlags ) +{ + fh = fopen( sName, sFlags ); +} + +SFile::~SFile() +{ +} + +void SFile::close() +{ + if( fh ) + { + fclose( fh ); + fh = NULL; + } +} + +size_t SFile::read( char *pBuf, size_t nBytes ) +{ + if( !fh ) + throw FileException("File not open."); + + return fread( pBuf, 1, nBytes, fh ); +} + +size_t SFile::write( const char *pBuf, size_t nBytes ) +{ + if( !fh ) + throw FileException("File not open."); + + return fwrite( pBuf, 1, nBytes, fh ); +} + +long SFile::tell() +{ + if( !fh ) + throw FileException("File not open."); + + return ftell( fh ); +} + +void SFile::seek( long offset ) +{ + if( !fh ) + throw FileException("File not open."); + + fseek( fh, offset, SEEK_CUR ); +} + +void SFile::setPos( long pos ) +{ + if( !fh ) + throw FileException("File not open."); + + fseek( fh, pos, SEEK_SET ); +} + +void SFile::setPosEnd( long pos ) +{ + if( !fh ) + throw FileException("File not open."); + + fseek( fh, pos, SEEK_END ); +} + +bool SFile::isEOS() +{ + return feof( fh ); +} + diff --git a/src/old/sfile.h b/src/old/sfile.h new file mode 100644 index 0000000..b51e5bc --- /dev/null +++ b/src/old/sfile.h @@ -0,0 +1,29 @@ +#ifndef SFILE_H +#define SFILE_H + +#include + +#include "stream.h" + +class SFile : public Stream +{ +public: + SFile( const char *sName, const char *sFlags ); + virtual ~SFile(); + + virtual void close(); + virtual size_t read( char *pBuf, size_t nBytes ); + virtual size_t write( const char *pBuf, size_t nBytes ); + + virtual long tell(); + virtual void seek( long offset ); + virtual void setPos( long pos ); + virtual void setPosEnd( long pos ); + virtual bool isEOS(); + +private: + FILE *fh; + +}; + +#endif diff --git a/src/old/sha1.cpp b/src/old/sha1.cpp new file mode 100644 index 0000000..8270c3b --- /dev/null +++ b/src/old/sha1.cpp @@ -0,0 +1,161 @@ +#include +#include +#include + +#include "sha1.h" + +Sha1::Sha1() : + H0( 0x67452301 ), + H1( 0xefcdab89 ), + H2( 0x98badcfe ), + H3( 0x10325476 ), + H4( 0xc3d2e1f0 ), + unprocessedBytes( 0 ), + size( 0 ) +{ +} + +Sha1::~Sha1() +{ +} + +void Sha1::process() +{ + int t; + uint32_t a, b, c, d, e, K, f, W[80]; + + // starting values + a = H0; + b = H1; + c = H2; + d = H3; + e = H4; + + // copy and expand the message block + for( t = 0; t < 16; t++ ) W[t] = (bytes[t*4] << 24) + +(bytes[t*4 + 1] << 16) + +(bytes[t*4 + 2] << 8) + + bytes[t*4 + 3]; + for(; t< 80; t++ ) W[t] = lrot( W[t-3]^W[t-8]^W[t-14]^W[t-16], 1 ); + + /* main loop */ + uint32_t temp; + for( t = 0; t < 80; t++ ) + { + if( t < 20 ) { + K = 0x5a827999; + f = (b & c) | ((~b) & d); + } else if( t < 40 ) { + K = 0x6ed9eba1; + f = b ^ c ^ d; + } else if( t < 60 ) { + K = 0x8f1bbcdc; + f = (b & c) | (b & d) | (c & d); + } else { + K = 0xca62c1d6; + f = b ^ c ^ d; + } + temp = lrot(a,5) + f + e + W[t] + K; + e = d; + d = c; + c = lrot(b,30); + b = a; + a = temp; + //printf( "t=%d %08x %08x %08x %08x %08x\n",t,a,b,c,d,e ); + } + + /* add variables */ + H0 += a; + H1 += b; + H2 += c; + H3 += d; + H4 += e; + + //printf( "Current: %08x %08x %08x %08x %08x\n",H0,H1,H2,H3,H4 ); + /* all bytes have been processed */ + unprocessedBytes = 0; +} + +void Sha1::update( const char* data, int num ) +{ + // add these bytes to the running total + size += num; + + // repeat until all data is processed + while( num > 0 ) + { + // number of bytes required to complete block + int needed = 64 - unprocessedBytes; + + // number of bytes to copy (use smaller of two) + int toCopy = (num < needed) ? num : needed; + + // Copy the bytes + memcpy( bytes + unprocessedBytes, data, toCopy ); + + // Bytes have been copied + num -= toCopy; + data += toCopy; + unprocessedBytes += toCopy; + + // there is a full block + if( unprocessedBytes == 64 ) process(); + } +} + +unsigned char* Sha1::getDigest() +{ + // save the message size + uint32_t totalBitsL = size << 3; + uint32_t totalBitsH = size >> 29; + + // add 0x80 to the message + update( "\x80", 1 ); + + unsigned char footer[64] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + + // block has no room for 8-byte filesize, so finish it + if( unprocessedBytes > 56 ) + update( (char*)footer, 64 - unprocessedBytes); + + // how many zeros do we need + int neededZeros = 56 - unprocessedBytes; + + // store file size (in bits) in big-endian format + toBigEndian( totalBitsH, footer + neededZeros ); + toBigEndian( totalBitsL, footer + neededZeros + 4 ); + + // finish the final block + update( (char*)footer, neededZeros + 8 ); + + // allocate memory for the digest bytes + unsigned char* digest = new unsigned char[20]; + + // copy the digest bytes + toBigEndian( H0, digest ); + toBigEndian( H1, digest + 4 ); + toBigEndian( H2, digest + 8 ); + toBigEndian( H3, digest + 12 ); + toBigEndian( H4, digest + 16 ); + + // return the digest + return digest; +} + +uint32_t Sha1::lrot( uint32_t x, int bits ) +{ + return (x<>(32 - bits)); +}; + +void Sha1::toBigEndian( uint32_t num, unsigned char* byte ) +{ + byte[0] = (unsigned char)(num>>24); + byte[1] = (unsigned char)(num>>16); + byte[2] = (unsigned char)(num>>8); + byte[3] = (unsigned char)num; +} + diff --git a/src/old/sha1.h b/src/old/sha1.h new file mode 100644 index 0000000..ab6081d --- /dev/null +++ b/src/old/sha1.h @@ -0,0 +1,42 @@ +/* sha1.h + +Copyright (c) 2005 Michael D. Leonhard + +http://tamale.net/ + +This file is licensed under the terms described in the +accompanying LICENSE file. +*/ + +#ifndef SHA1_H +#define SHA1_H + +#include + +/** + * Calculates SHA-1 sums. This is based strongly on code from Michael D. + * Leonhard who released his code under the terms of the MIT license, thank you! + */ +class Sha1 +{ +public: + Sha1(); + ~Sha1(); + + void update( const char* data, int num ); + unsigned char* getDigest(); + + // utility methods + static uint32_t lrot( uint32_t x, int bits ); + static void toBigEndian( uint32_t in, unsigned char* out ); + +private: + // fields + uint32_t H0, H1, H2, H3, H4; + unsigned char bytes[64]; + int unprocessedBytes; + uint32_t size; + void process(); +}; + +#endif diff --git a/src/old/singleton.h b/src/old/singleton.h new file mode 100644 index 0000000..47adbd5 --- /dev/null +++ b/src/old/singleton.h @@ -0,0 +1,59 @@ +#ifndef SINGLETON_H +#define SINGLETON_H + +#include + +/** + * Provides singleton functionality in a modular sort of way. Make this the + * base class of any other class and you immediately gain singleton + * functionality. Be sure to make your constructor and various functions use + * intellegent scoping. Cleanup and instantiation are performed automatically + * for you at first use and program exit. There are two things that you must + * do when using this template, first is to inherit from it with the name of + * your class filling in for T and then make this class a friend of your class. + *@code + * // Making the Single Singleton: + * class Single : public Singleton + * { + * friend class Singleton; + * protected: + * Single(); + * ... + * }; + @endcode + * You can still add public functions and variables to your new Singleton child + * class, but your constructor should be protected (hence the need for the + * friend decleration). + *@author Mike Buland + */ +template +class Singleton +{ +protected: + /** + * Private constructor. This constructor is empty but has a body so that + * you can make your own override of it. Be sure that you're override is + * also protected. + */ + Singleton() {}; + +private: + /** + * Copy constructor, defined so that you could write your own as well. + */ + Singleton( const Singleton& ); + +public: + /** + * Get a handle to the contained instance of the contained class. It is + * a reference. + *@returns A reference to the contained object. + */ + static T &getInstance() + { + static T i; + return i; + } +}; + +#endif diff --git a/src/old/sptr.cpp b/src/old/sptr.cpp new file mode 100644 index 0000000..7f5e894 --- /dev/null +++ b/src/old/sptr.cpp @@ -0,0 +1 @@ +#include "sptr.h" diff --git a/src/old/sptr.h b/src/old/sptr.h new file mode 100644 index 0000000..deae94d --- /dev/null +++ b/src/old/sptr.h @@ -0,0 +1,99 @@ +#ifndef SPTR_H +#define SPTR_H + +#include +#include + +template +class SPtr +{ +public: + SPtr() : + pRefCnt( NULL ), + pData( NULL ) + { + } + + ~SPtr() + { + decCount(); + } + + SPtr( const SPtr &src ) : + pRefCnt( src.pRefCnt ), + pData( src.pData ) + { + if( pRefCnt ) + (*pRefCnt) += 1; + } + + SPtr( T *pSrc ) : + pRefCnt( NULL ), + pData( pSrc ) + { + pRefCnt = new int32_t; + (*pRefCnt) = 1; + } + + int32_t count() + { + return *pRefCnt; + } + + T *operator->() const + { + return pData; + } + + T *operator*() const + { + return pData; + } + + SPtr operator=( const SPtr &src ) + { + decCount(); + pRefCnt = src.pRefCnt; + pData = src.pData; + (*pRefCnt) += 1; + + return *this; + } + + bool operator==( const SPtr &src ) + { + return pData == src.pData; + } + + operator bool() + { + return pRefCnt != NULL; + } + + bool isSet() + { + return pRefCnt != NULL; + } + +private: + void decCount() + { + if( pRefCnt ) + { + (*pRefCnt) -= 1; + //printf("Decrementing ref-count to %d\n", *pRefCnt ); + if( (*pRefCnt) == 0 ) + { + delete pRefCnt; + delete pData; + pRefCnt = NULL; + pData = NULL; + } + } + } + + int32_t *pRefCnt; + T *pData; +}; + +#endif diff --git a/src/old/stack.cpp b/src/old/stack.cpp new file mode 100644 index 0000000..8d9565c --- /dev/null +++ b/src/old/stack.cpp @@ -0,0 +1,33 @@ +#include "stack.h" + +void Stack::push( void *data ) +{ + lStackData.append( data ); +} + +void *Stack::top() +{ + return lStackData.getAt( lStackData.getSize()-1 ); +} + +void Stack::pop() +{ + lStackData.deleteAt( lStackData.getSize()-1 ); +} + +void *Stack::poptop() +{ + void *dat = top(); + pop(); + return dat; +} + +bool Stack::isEmpty() +{ + return lStackData.isEmpty(); +} + +void Stack::empty() +{ + lStackData.empty(); +} diff --git a/src/old/stack.h b/src/old/stack.h new file mode 100644 index 0000000..30e2a19 --- /dev/null +++ b/src/old/stack.h @@ -0,0 +1,50 @@ +#ifndef STACK_H +#define STACK_H +#include "linkedlist.h" + +/** An ultra-simple stack implementation that just uses a linked list. + *@author Mike Buland + */ +class Stack +{ +public: + /** Pushes a new value onto the top of the stack. + *@param data A new value for the stack. + *@author Mike Buland + */ + void push( void *data ); + + /** Returns the top value off of the stack, but doesn't remove it from the + * stack. + *@returns The value at the top of the stack. + *@author Mike Buland + */ + void *top(); + + /** Pops the top item off of the stack. + *@author Mike Buland + */ + void pop(); + + /** Gets the top item off of the stack, pops it off the stack, and returns + * it. + *@returns The value at the top of the stack. + *@author Mike Buland + */ + void *poptop(); + + /** Checks if the stack is empty. + *@returns True if the stack is empty, and false if it has things in it. + *@author Mike Buland + */ + bool isEmpty(); + + /** Empty the stack. + *@author Mike Buland + */ + void empty(); + +private: + LinkedList lStackData; /**< The actual stack data. */ +}; +#endif diff --git a/src/old/staticstring.cpp b/src/old/staticstring.cpp new file mode 100644 index 0000000..60f130f --- /dev/null +++ b/src/old/staticstring.cpp @@ -0,0 +1,282 @@ +#include "staticstring.h" +#include "serializer.h" + +#include +#include +#include + +StaticString::StaticString() +{ + lpStr = NULL; + nLen = 0; +} + +StaticString::StaticString( int nLength ) +{ + lpStr = new char[nLength+1]; + nLen = nLength; + memset( lpStr, 0, nLength+1 ); +} + +StaticString::StaticString( const char *lpNewStr, int nNewLen ) +{ + lpStr = NULL; + nLen = 0; + setString( lpNewStr, nNewLen ); +} + +StaticString::StaticString( const char *lpNewStr ) +{ + lpStr = NULL; + nLen = 0; + setString( lpNewStr, -1 ); +} + +StaticString::StaticString( StaticString &xSrcStr, int nNewLen ) +{ + lpStr = NULL; + nLen = 0; + setString( xSrcStr, nNewLen ); +} + +StaticString::StaticString( StaticString &xSrcStr ) +{ + lpStr = NULL; + nLen = 0; + setString( xSrcStr, -1 ); +} + +StaticString::StaticString( const StaticString &xSrcStr ) +{ + nLen = xSrcStr.getLength(); + lpStr = new char[nLen]; + memcpy( lpStr, xSrcStr.getString(), nLen ); +} + +StaticString::~StaticString() +{ + if( lpStr != NULL ) delete[] lpStr; +} + +char *StaticString::getString() +{ + return lpStr; +} + +const char *StaticString::getString() const +{ + return lpStr; +} + +int StaticString::getLength() const +{ + return nLen; +} + +void StaticString::setLength( int nNewLength ) +{ + char *lpNewStr = new char[nNewLength+1]; + if( lpStr != NULL ) + { + strncpy( lpNewStr, lpStr, nNewLength ); + } + lpNewStr[nNewLength] = '\0'; + if( lpStr ) + { + delete[] lpStr; + } + lpStr = lpNewStr; + nLen = nNewLength; +} + +void StaticString::setString( const char *lpNewStr, int nNewLen ) +{ + if( lpStr ) + { + delete[] lpStr; + lpStr = NULL; + nLen = 0; + } + if( nNewLen < 0 ) + { + if( lpNewStr == NULL ) return; + nLen = strlen( lpNewStr ); + lpStr = new char[nLen+1]; + strcpy( lpStr, lpNewStr ); + } + else + { + nLen = nNewLen; + lpStr = new char[nLen+1]; + memset( lpStr, 0, nLen+1 ); + if( lpNewStr ) + strncpy( lpStr, lpNewStr, nNewLen ); + } +} + +void StaticString::setString( StaticString &sNewStr, int nNewLen ) +{ + if( lpStr ) + { + delete[] lpStr; + lpStr = NULL; + nLen = 0; + } + if( nNewLen < 0 ) + { + if( sNewStr.lpStr == NULL ) return; + nLen = sNewStr.nLen; + lpStr = new char[nLen+1]; + strcpy( lpStr, sNewStr.lpStr ); + } + else + { + nLen = nNewLen; + lpStr = new char[nLen+1]; + memset( lpStr, 0, nLen+1 ); + if( sNewStr.lpStr ) + strncpy( lpStr, sNewStr.lpStr, nNewLen ); + } +} + +StaticString &StaticString::operator=( StaticString &lpOtherStr ) +{ + setString( lpOtherStr ); + + return *this; +} + +StaticString &StaticString::operator=( std::string &lpOtherStr ) +{ + setString( lpOtherStr.c_str() ); + + return *this; +} + +StaticString &StaticString::operator=( const char *lpNewStr ) +{ + setString( lpNewStr ); + + return *this; +} + +StaticString::operator const char *() +{ + return lpStr; +} + +char StaticString::getAt( unsigned int nIndex ) +{ + if( nIndex < 0 || nIndex >= nLen ) + return '\0'; + + return lpStr[nIndex]; +} + +void StaticString::setAt( unsigned int nIndex, char cVal ) +{ + if( nIndex < 0 || nIndex >= nLen ) + return; + + lpStr[nIndex] = cVal; +} + +char &StaticString::operator[]( unsigned int nIndex ) +{ + if( nIndex < 0 || nIndex >= nLen ) + return lpStr[0]; + + return lpStr[nIndex]; +} + +StaticString::operator int() +{ + return nLen; +} + +char *StaticString::operator+( int nAmnt ) +{ + return lpStr + nAmnt; +} + +char *StaticString::operator-( int nAmnt ) +{ + return lpStr - nAmnt; +} + +void StaticString::clear() +{ + memset( lpStr, 0, nLen+1 ); +} + +void StaticString::serialize( Serializer &ar ) +{ + if( ar.isLoading() ) + { + ar >> nLen; + setLength( nLen ); + ar.read( lpStr, nLen ); + } + else + { + ar << nLen; + ar.write( lpStr, nLen ); + } +} + +bool StaticString::operator==( const char *str ) +{ + const char *a = str, *b = lpStr; + for(; *a == *b; a++, b++ ) if( *a == '\0' && *b == '\0' ) return true; + return false; +} + +bool StaticString::operator==( StaticString &str ) +{ + const char *a = str.lpStr, *b = lpStr; + for(; *a == *b; a++, b++ ) if( *a == '\0' && *b == '\0' ) return true; + return false; +} + +bool StaticString::operator!=( const char *str ) +{ + const char *a = str, *b = lpStr; + for(; *a == *b; a++, b++ ) if( *a == '\0' && *b == '\0' ) return false; + return true; +} + +bool StaticString::operator!=( StaticString &str ) +{ + const char *a = str.lpStr, *b = lpStr; + for(; *a == *b; a++, b++ ) if( *a == '\0' && *b == '\0' ) return false; + return true; +} +/* +unsigned long int StaticString::getHashCode() +{ + unsigned long int nPos = nLen; + unsigned long int j = 0; + for( const char *s = (const char *)lpStr; j< nLen; s++, j++ ) + { + nPos = *s + (nPos << 6) + (nPos << 16) - nPos; + } + return nPos; +} + +bool StaticString::compareForHash( Hashable &other ) +{ + if( ((StaticString &)other).nLen != nLen ) + return false; + + const char *a = ((StaticString &)other).lpStr; + const char *b = lpStr; + if( a == b ) + return true; + + for( unsigned long j = 0; j < nLen; j++, a++, b++ ) + if( *a != *b ) + return false; + + return true; +} +*/ diff --git a/src/old/staticstring.h b/src/old/staticstring.h new file mode 100644 index 0000000..4c3f7b8 --- /dev/null +++ b/src/old/staticstring.h @@ -0,0 +1,63 @@ +#ifndef STATIC_STRING_H +#define STATIC_STRING_H + +#include +#include "serializable.h" +//#include "hashable.h" + +/** + * Simple string managing class. Allows for dynamically allocated string data + * along with some minor caching to speed things up when accessing your + * string data. Really designed for making copies of strings easy and safe, + * and making accessing meta-info like length fast and reliable as well. + *@author Mike Buland + */ +class StaticString : public Serializable/*, public Hashable*/ +{ +public: + StaticString(); + StaticString( const char *lpNewStr, int nNewLen ); + StaticString( const char *lpNewStr ); + StaticString( StaticString &xSrcStr, int nNewLen ); + StaticString( StaticString &xSrcStr ); + StaticString( const StaticString &xSrcStr ); + StaticString( int nLength ); + virtual ~StaticString(); + + char *getString(); + const char *getString() const; + int getLength() const; + void setLength( int nNewLength ); + + void setString( const char *lpNewStr, int nNewLen=-1 ); + void setString( StaticString &sNewStr, int nNewLen=-1 ); + + char getAt( unsigned int nIndex ); + void setAt( unsigned int nIndex, char cVal ); + + class StaticString &operator=( class StaticString &lpOtherStr ); + class StaticString &operator=( std::string &lpOtherStr ); + class StaticString &operator=( const char *lpNewStr ); + operator const char *(); + char &operator[]( unsigned int nIndex ); + operator int(); + char *operator+( int nAmnt ); + char *operator-( int nAmnt ); + bool operator==( const char *str ); + bool operator==( StaticString &str ); + bool operator!=( const char *str ); + bool operator!=( StaticString &str ); + + void clear(); + + virtual void serialize( class Serializer &ar ); + + //virtual unsigned long int getHashCode(); + //virtual bool compareForHash( Hashable &other ); + +private: + char *lpStr; + uint32_t nLen; +}; + +#endif diff --git a/src/old/stream.cpp b/src/old/stream.cpp new file mode 100644 index 0000000..856a58d --- /dev/null +++ b/src/old/stream.cpp @@ -0,0 +1,10 @@ +#include "stream.h" + +Stream::Stream() +{ +} + +Stream::~Stream() +{ +} + diff --git a/src/old/stream.h b/src/old/stream.h new file mode 100644 index 0000000..e086e28 --- /dev/null +++ b/src/old/stream.h @@ -0,0 +1,27 @@ +#ifndef STREAM_H +#define STREAM_H + +#include +#include + +class Stream +{ +public: + Stream(); + virtual ~Stream(); + + virtual void close() = 0; + virtual size_t read( char *pBuf, size_t nBytes ) = 0; + virtual size_t write( const char *pBuf, size_t nBytes ) = 0; + + virtual long tell() = 0; + virtual void seek( long offset ) = 0; + virtual void setPos( long pos ) = 0; + virtual void setPosEnd( long pos ) = 0; + virtual bool isEOS() = 0; + +private: + +}; + +#endif diff --git a/src/old/stringrep.cpp b/src/old/stringrep.cpp new file mode 100644 index 0000000..a505f8a --- /dev/null +++ b/src/old/stringrep.cpp @@ -0,0 +1,19 @@ +#include "stringrep.h" + +int32_t stringlen( const char *s ) +{ + for( int32_t i = 0;; i++ ) + if( !s[i] ) + return i; +} + +char *stringdup( const char *s ) +{ + int len = stringlen( s ); + char *r = new char[len+1]; + for( int j = 0; j <= len; j++ ) + r[j] = s[j]; + + return r; +} + diff --git a/src/old/stringrep.h b/src/old/stringrep.h new file mode 100644 index 0000000..eaa4a12 --- /dev/null +++ b/src/old/stringrep.h @@ -0,0 +1,17 @@ +#ifndef STRING_REP_H +#define STRING_REP_H + +#include + +/** + * Calculates the length of a string. + */ +int32_t stringlen( const char *s ); + +/** + * Identicle to strdup, which isn't available everywhere, but uses c++ memory + * facilities. Remember to use delete[] when freeing the returned string. + */ +char *stringdup( const char *s ); + +#endif diff --git a/src/old/tests/clistress.cpp b/src/old/tests/clistress.cpp new file mode 100644 index 0000000..6b0ac66 --- /dev/null +++ b/src/old/tests/clistress.cpp @@ -0,0 +1,20 @@ +#include "connection.h" + +int main() +{ + Connection c; + + c.open("localhost", 4001 ); + + c.appendOutput("w"); + c.writeOutput(); + + c.waitForInput( 6, 5, 0 ); + + printf("read: %s\n", c.getInput() ); + + c.close(); + + return 0; +} + diff --git a/src/old/tests/confpair.cpp b/src/old/tests/confpair.cpp new file mode 100644 index 0000000..fb1b0d3 --- /dev/null +++ b/src/old/tests/confpair.cpp @@ -0,0 +1,19 @@ +#include "confpair.h" +#include + +using namespace std; + +int main() +{ + ConfPair p1("DebugMode"); + p1.value() = 12; + cout << p1.value() << "\n"; + p1.value() = 55; + cout << p1.value() << "\n"; + + ConfPairBase &p = p1; + + p = "33.12"; + cout << p.getAsString(); +} + diff --git a/src/old/tests/connect.cpp b/src/old/tests/connect.cpp new file mode 100644 index 0000000..a9fca64 --- /dev/null +++ b/src/old/tests/connect.cpp @@ -0,0 +1,38 @@ +#include +#include +#include +#include +#include "connection.h" + +int main() +{ + Connection c; + c.open("127.0.0.1", 12457 ); + + { + int newSocket = c.getSocket(); + int flags; + + flags = fcntl(newSocket, F_GETFL, 0); + flags |= O_NONBLOCK; + if (fcntl(newSocket, F_SETFL, flags) < 0) + { + return false; + } + } + + for( int i = 0; i < 50; i++ ) + { + usleep( 100000 ); + int nbytes = c.readInput(); + if( nbytes == 0 ) + printf("0 bytes, EOF?\n"); + else + printf("Got %d bytes, whacky...\n", nbytes ); + } + + c.close(); + + return 0; +} + diff --git a/src/old/tests/exception.cpp b/src/old/tests/exception.cpp new file mode 100644 index 0000000..6417692 --- /dev/null +++ b/src/old/tests/exception.cpp @@ -0,0 +1,16 @@ +#include +#include "exceptions.h" + +int main() +{ + try + { + throw ExceptionBase( 42, "There was an error on line: %d", __LINE__ ); + } + catch( ExceptionBase &e ) + { + std::cout << "Error "<< e.getErrorCode() << ": " << e.what() << "\n"; + } + + throw ExceptionBase( 112, "This exception wasn't caught!"); +} diff --git a/src/old/tests/formula.cpp b/src/old/tests/formula.cpp new file mode 100644 index 0000000..976b039 --- /dev/null +++ b/src/old/tests/formula.cpp @@ -0,0 +1,13 @@ +#include "formula.h" + +int main( int argc, char *argv[] ) +{ + if( argc < 2 ) return 0; + + Formula f; + double dOut = f.run( argv[1] ); + printf("%s = %f\n", argv[1], dOut ); + + return 0; +} + diff --git a/src/old/tests/fstring.cpp b/src/old/tests/fstring.cpp new file mode 100644 index 0000000..271738c --- /dev/null +++ b/src/old/tests/fstring.cpp @@ -0,0 +1,48 @@ +#include "hash.h" +#include "fstring.h" + +FString genThing() +{ + FString bob; + bob.append("ab "); + bob += "cd "; + bob += "efg"; + + printf("---bob------\n%08X: %s\n", (unsigned int)bob.c_str(), bob.c_str() ); + return bob; +} + +void thing( FString str ) +{ + printf("Hey: %s\n", str.c_str() ); +} + +#define pem printf("---------\n%08X: %s\n%08X: %s\n", (unsigned int)str.c_str(), str.c_str(), (unsigned int)str2.c_str(), str2.c_str() ); +int main( int argc, char *argv ) +{ + FString str("th"); + + str.prepend("Hello "); + str.append("ere."); + + FString str2( str ); + pem; + str += " What's up?"; + pem; + str2 += " How are you?"; + pem; + str = str2; + pem; + + str2 = genThing(); + pem; + + str = str2; + pem; + + thing( str2 ); + thing("test."); + + printf("%d == %d\n", __calcHashCode( str ), __calcHashCode( str.c_str() ) ); +} + diff --git a/src/old/tests/hash.cpp b/src/old/tests/hash.cpp new file mode 100644 index 0000000..2fc6968 --- /dev/null +++ b/src/old/tests/hash.cpp @@ -0,0 +1,116 @@ +#include "hash.h" +#include "staticstring.h" + +int main() +{ + const char *names[]={ + "Homer the Great", + "And Maggie Makes Three", + "Bart's Comet", + "Homie The Clown", + "Bart Vs Australia", + "Homer vs Patty and Selma", + "A star is burns", + "Lisa's Wedding", + "Two Dozen and One Greyhounds", + "The PTA Disbands", + "Round Springfield", + "The Springfield connection", + "Lemon of Troy", + "Who Shot Mr. Burns (Pt. 1)", + "Who Shot Mr. Burns (pt. 2)", + "Radioactive Man", + "Home Sweet Homediddly-dum-doodly", + "Bart Sells His Soul", + "Lisa the Vegetarian", + "Treehouse of horror VI", + "King Size Homer", + "Mother Simpson", + "Sideshow Bob's Last Gleaming", + "The Simpson's 138th Show Spectacular", + "Marge Be Not Proud", + "Team Homer", + "Two Bad Neighbors", + "Scenes From the Class Struggle in Springfield", + "Bart the Fink", + "Lisa the Iconoclast", + "Homer the Smithers", + "The Day the Violence Died", + "A Fish Called Selma", + "Bart on the road", + "22 Short Films about Springfield", + "The Curse of the Flying Hellfish", + "Much Apu about Nothing", + "Homerpalooza", + "The Summer of 4 Ft 2", + "Treehouse of Horror VII", + "You Only Move Twice", + "The Homer They Fall", + "Burns Baby Burns", + "Bart After Dark", + "A Millhouse Divided", + "Lisas Date With Destiny", + "Hurricane Neddy", + "The Mysterious Voyage of Our Homer", + "The Springfield Files", + "The Twisted World of Marge Simpson", + "Mountain of Madness", + NULL + }; + + Hash sTest; + + printf("Inserting\n-------------------\n\n"); + for( int j = 0; j < 33; j++ ) + { + sTest[names[j]] = j; + } + + printf("Test1: %d, Test2: %d\n", sTest.has("Lemon of Troy"), sTest.has(std::string("Lemon of Troy").c_str() ) ); + + sTest.has(std::string("Lemon of Troy").c_str() ); + + printf("Getting\n-------------------\n\n"); + + sTest.erase("Homer the Great"); + sTest["Bart's Comet"].erase(); + + for( Hash::iterator i = sTest.begin(); + i != sTest.end(); i++ ) + { + Hash::iterator j = i; + printf("%d: %s\n", (*j).second, (*j).first ); + } + + printf("Testing\n-------------------\n\n"); + for( int j = 0; j < 33; j++ ) + { + if( sTest.has(names[j]) ) + { + if( sTest[names[j]] != j ) + { + printf("'%s' should be %d, is %d\n", + names[j], j, + sTest[names[j]].value() + ); + } + } + else + { + printf("Missing element %d, '%s'\n", j, names[j] ); + } + } + + printf("Clearing\n-------------------\n\n"); + + sTest.clear(); + + for( Hash::iterator i = sTest.begin(); + i != sTest.end(); i++ ) + { + Hash::iterator j = i; + printf("%d: %s\n", (*j).second, (*j).first ); + } + +} + diff --git a/src/old/tests/hashtest.cpp b/src/old/tests/hashtest.cpp new file mode 100644 index 0000000..eaa84a0 --- /dev/null +++ b/src/old/tests/hashtest.cpp @@ -0,0 +1,107 @@ +#include +#include +#include "hashtable.h" +#include "hashfunctioncasestring.h" + +int main() +{ + const char *names[]={ + "Homer the Great", + "And Maggie Makes Three", + "Bart's Comet", + "Homie The Clown", + "Bart Vs Australia", + "Homer vs Patty and Selma", + "A star is burns", + "Lisa's Wedding", + "Two Dozen and One Greyhounds", + "The PTA Disbands", + "Round Springfield", + "The Springfield connection", + "Lemon of Troy", + "Who Shot Mr. Burns (Pt. 1)", + "Who Shot Mr. Burns (pt. 2)", + "Radioactive Man", + "Home Sweet Homediddly-dum-doodly", + "Bart Sells His Soul", + "Lisa the Vegetarian", + "Treehouse of horror VI", + "King Size Homer", + "Mother Simpson", + "Sideshow Bob's Last Gleaming", + "The Simpson's 138th Show Spectacular", + "Marge Be Not Proud", + "Team Homer", + "Two Bad Neighbors", + "Scenes From the Class Struggle in Springfield", + "Bart the Fink", + "Lisa the Iconoclast", + "Homer the Smithers", + "The Day the Violence Died", + "A Fish Called Selma", + "Bart on the road", + "22 Short Films about Springfield", + "The Curse of the Flying Hellfish", + "Much Apu about Nothing", + "Homerpalooza", + "The Summer of 4 Ft 2", + "Treehouse of Horror VII", + "You Only Move Twice", + "The Homer They Fall", + "Burns Baby Burns", + "Bart After Dark", + "A Millhouse Divided", + "Lisas Date With Destiny", + "Hurricane Neddy", + "The Mysterious Voyage of Our Homer", + "The Springfield Files", + "The Twisted World of Marge Simpson", + "Mountain of Madness", + NULL + }; + + HashTable h( new HashFunctionCaseString(), 5, false ); + + int j; + printf("Inserting...\n"); + for( j = 0; j < 10; j++ ) + { + h.insert( names[j], (void *)(j+1) ); + h.insert( names[j], (void *)(j+1) ); + printf("Capacity: %lu, Size: %lu, Load: %f\n", + h.getCapacity(), + h.getSize(), + h.getLoad() + ); + } + + for( j = 0; j < 10; j++ ) + { + printf("\"%s\" = %d\n", names[j], (int)h[names[j]] ); + } + + printf("\nDeleting some...\n"); + + for( int k = 0; k < 7; k++ ) + { + h.del( names[k] ); + //h.insert( names[j], (void *)(j+1) ); + printf("Capacity: %lu, Size: %lu, Load: %f\n", + h.getCapacity(), + h.getSize(), + h.getLoad() + ); + } + + printf("\nInserting more...\n"); + + for( ; names[j] != NULL; j++ ) + { + h.insert( names[j], (void *)(j+1) ); + printf("Capacity: %lu, Size: %lu, Load: %f\n", + h.getCapacity(), + h.getSize(), + h.getLoad() + ); + } +} diff --git a/src/old/tests/hashtest2.cpp b/src/old/tests/hashtest2.cpp new file mode 100644 index 0000000..74700fd --- /dev/null +++ b/src/old/tests/hashtest2.cpp @@ -0,0 +1,15 @@ +#include "hash.h" +#include + +int main() +{ + char *a, *b; + a = new char[10]; + b = new char[10]; + strcpy( a, "Hey there"); + strcpy( b, "Hey there"); + printf("Same: %s\n", __cmpHashKeys( a, b )?"yes":"no"); + + return 0; +} + diff --git a/src/old/tests/httpsrv/httpconnectionmonitor.cpp b/src/old/tests/httpsrv/httpconnectionmonitor.cpp new file mode 100644 index 0000000..51d82f3 --- /dev/null +++ b/src/old/tests/httpsrv/httpconnectionmonitor.cpp @@ -0,0 +1,88 @@ +#include "httpconnectionmonitor.h" +#include "http.h" +#include "exceptions.h" +#include + +HttpConnectionMonitor::HttpConnectionMonitor() +{ +} + +HttpConnectionMonitor::~HttpConnectionMonitor() +{ +} + +bool HttpConnectionMonitor::onNewConnection( Connection *pCon, int nPort ) +{ + printf("Got connection on port %d\n", nPort ); + + try + { + pCon->readInput( 60, 0 ); + printf("#######################\n%s\n#######################\n", pCon->getInput() ); + + Http hp( pCon ); + while( hp.parseRequest() == false ); + printf("Done parsing.\n\n"); + + if( hp.getRequestType() == Http::reqGet ) + { + printf("\"\"\"%s\"\"\"\n", hp.getRequestURI() ); + if( !strcmp( hp.getRequestURI(), "/" ) ) + { + std::string content("Server Test</test></head><body>This is a test of a new system where all the pages will be more or less dynamic...<br>If you want to try to login, you can do that here:<br><form method=\"post\" action=\"showvars\" enctype=\"multipart/form-data\">Name: <input type=\"text\" name=\"name\"><br>Password: <input type=\"password\" name=\"pass\"><br><input type=\"submit\" name=\"action\" value=\"login\"></form></body></html>"); + hp.buildResponse(); + hp.setResponseContent( + "text/html", + content.c_str(), + content.size() + ); + hp.sendResponse(); + } + else + { + std::string content("<html><head><title>URL Not Found</test></head><body>There is no content mapped to the URL you requested. Please try another one.</body></html>"); + hp.buildResponse( 404, "File not found."); + hp.setResponseContent( + "text/html", + content.c_str(), + content.size() + ); + hp.sendResponse(); + } + } + else + { + printf("Non get: %s\n", hp.getRequestTypeStr() ); + pCon->appendOutput("HTTP/1.1 100 Continue\r\n\r\n"); + } + pCon->writeOutput(); + //for( int j = 0; j < 50; j++ ) + { + pCon->readInput( 1, 0 ); + //printf("Size so far: %d\n", pCon->getInputAmnt() ); + } + + if( pCon->hasInput() ) + { + std::string s( pCon->getInput(), pCon->getInputAmnt() ); + + pCon->printInputDebug(); + //printf("Reamining data\n==============\n%s\n==============\n", + // s.c_str() ); + } + + pCon->disconnect(); + } + catch( ConnectionException &e ) + { + printf("Connection: %s\n", e.what() ); + } + + return true; +} + +bool HttpConnectionMonitor::onClosedConnection( Connection *pCon ) +{ + return true; +} + diff --git a/src/old/tests/httpsrv/httpconnectionmonitor.h b/src/old/tests/httpsrv/httpconnectionmonitor.h new file mode 100644 index 0000000..30c0afd --- /dev/null +++ b/src/old/tests/httpsrv/httpconnectionmonitor.h @@ -0,0 +1,16 @@ +#ifndef HTTPCONNECTIONMONITOR_H +#define HTTPCONNECTIONMONITOR_H + +#include "connectionmonitor.h" + +class HttpConnectionMonitor : public ConnectionMonitor +{ +public: + HttpConnectionMonitor(); + ~HttpConnectionMonitor(); + + bool onNewConnection( Connection *pCon, int nPort ); + bool onClosedConnection( Connection *pCon ); +}; + +#endif diff --git a/src/old/tests/httpsrv/main.cpp b/src/old/tests/httpsrv/main.cpp new file mode 100644 index 0000000..2f1563c --- /dev/null +++ b/src/old/tests/httpsrv/main.cpp @@ -0,0 +1,22 @@ +#include "connectionmanager.h" +#include "httpconnectionmonitor.h" + +int main() +{ + printf("Starting server...\n"); + + ConnectionManager srv; + HttpConnectionMonitor http; + + srv.setConnectionMonitor( &http ); + + printf("Listening on port 7331\n"); + srv.startServer( 7331 ); + + for(;;) + { + srv.scanConnections( 5000, false ); + } + + return 0; +} diff --git a/src/old/tests/log.cpp b/src/old/tests/log.cpp new file mode 100644 index 0000000..d7cfa0b --- /dev/null +++ b/src/old/tests/log.cpp @@ -0,0 +1,29 @@ +#include <stdio.h> +#include <stdlib.h> +#include <iostream> +#include "multilog.h" +#include "multilogtext.h" + +class Test +{ +public: + Test() + { + MultiLineLog( 4, "Test init'd\n"); + } +}; + +int main() +{ + MultiLog &xLog = MultiLog::getInstance(); + + xLog.LineLog( 2, "Hello again"); + + MultiLog::getInstance().addChannel( + new MultiLogText( STDOUT_FILENO, "%02y-%02m-%02d %02h:%02M:%02s: %t" ) + ); + + MultiLineLog( MultiLog::LError, "Hi there!"); + Test t; +} + diff --git a/src/old/tests/md5test.cpp b/src/old/tests/md5test.cpp new file mode 100644 index 0000000..6f832df --- /dev/null +++ b/src/old/tests/md5test.cpp @@ -0,0 +1,19 @@ +#include <stdio.h> +#include <string.h> +#include "md5.h" + +int main() +{ + md5 mproc; + md5sum sum; + char hexstr[33]; + + memset( hexstr, 0, 33 ); + + mproc.sumString( &sum, "qwertyuiopasdfgh" ); + mproc.sumToHex( &sum, hexstr ); + printf("sum: %s\n", hexstr ); + printf("chk: 1ebfc043d8880b758b13ddc8aa1638ef\n"); + + return 0; +} diff --git a/src/old/tests/ordhash.cpp b/src/old/tests/ordhash.cpp new file mode 100644 index 0000000..f1d96ec --- /dev/null +++ b/src/old/tests/ordhash.cpp @@ -0,0 +1,48 @@ +#include "ordhash.h" +#include <string> + +typedef struct eldef +{ + eldef( int a, int b, const std::string &c ) : + id( a ), nSequence( b ), sName( c ) {} + int id; + int nSequence; + std::string sName; +} eldef; + +struct seqcmp +{ + bool operator()( eldef **a, eldef **b ) + { + return (*a)->nSequence < (*b)->nSequence; + } +}; + +struct namcmp +{ + bool operator()( eldef **a, eldef **b ) + { + return (*a)->sName < (*b)->sName; + } +}; + +typedef OrdHash<int, eldef, seqcmp> AHash; +//typedef OrdHash<int, eldef, namcmp> AHash; + +int main() +{ + AHash hsh; + hsh[1] = eldef( 0, 43, "Bob"); + hsh[4] = eldef( 1, 443, "Abby"); + hsh[2] = eldef( 2, 1, "Name"); + hsh[5] = eldef( 3, 0, "Catagory"); + hsh[32] = eldef( 4, 12, "Epilogue"); + + for( AHash::iterator i = hsh.begin(); i != hsh.end(); i++ ) + { + eldef e = (*i).second; + printf("%d, %d, %s\n", e.id, e.nSequence, e.sName.c_str() ); + } + +} + diff --git a/src/old/tests/param.cpp b/src/old/tests/param.cpp new file mode 100644 index 0000000..a4d2824 --- /dev/null +++ b/src/old/tests/param.cpp @@ -0,0 +1,46 @@ +#include "param.h" +#include <stdio.h> + +Param::Param() +{ + addHelpBanner("param - A test of the libbu++ parameter systems\n" + "Enjoy with care and caution\n\nTest stuff:\n"); + addParam( "name", 's', mkproc( Param::printStuff ), &str, "Test a param param" ); + //addParam( "name", &str ); + addParam( "job", 'U', mkproc( Param::printStuff ), "Test a paramless param" ); + + addHelpBanner("\nInformational:\n"); + addParam( "help", mkproc( ParamProc::help ), "Help!" ); + + addHelpBanner("\nThanks for trying my test!\n\n"); +} + +Param::~Param() +{ +} + +int Param::printStuff( int argc, char *argv[] ) +{ + printf("------------%02d-------------\n", argc ); + for( int j = 0; j < argc; j++ ) + { + printf("%d: %s\n", j, argv[j] ); + } + printf("---------------------------\n" ); + printf("SETVAR===\"%s\"\n", str.c_str() ); + + return 1; +} + +int main( int argc, char *argv[] ) +{ + if( argc == 1 ) + { + printf("You have to enter some parameter, try '--help'\n\n"); + return 0; + } + + Param p; + p.process( argc, argv ); +} + diff --git a/src/old/tests/param.h b/src/old/tests/param.h new file mode 100644 index 0000000..2756b69 --- /dev/null +++ b/src/old/tests/param.h @@ -0,0 +1,21 @@ +#ifndef PARAM_H +#define PARAM_H + +#include <stdint.h> + +#include "paramproc.h" + +class Param : public ParamProc +{ +public: + Param(); + virtual ~Param(); + +private: + int printStuff( int argc, char *argv[] ); + + std::string str; + uint32_t uint32; +}; + +#endif diff --git a/src/old/tests/plugin/main.cpp b/src/old/tests/plugin/main.cpp new file mode 100644 index 0000000..51c8390 --- /dev/null +++ b/src/old/tests/plugin/main.cpp @@ -0,0 +1,14 @@ +#include "plugger.h" +#include "plugin.h" + +int main() +{ + Plugger<Plugin> p; + + p.registerExternalPlugin( "./guy.so", "Guy" ); + + Plugin *t = p.instantiate( "Guy" ); + + p.destroy( t ); +} + diff --git a/src/old/tests/plugin/plugin.cpp b/src/old/tests/plugin/plugin.cpp new file mode 100644 index 0000000..ea558fd --- /dev/null +++ b/src/old/tests/plugin/plugin.cpp @@ -0,0 +1,10 @@ +#include "plugin.h" + +Plugin::Plugin() +{ +} + +Plugin::~Plugin() +{ +} + diff --git a/src/old/tests/plugin/plugin.h b/src/old/tests/plugin/plugin.h new file mode 100644 index 0000000..f726867 --- /dev/null +++ b/src/old/tests/plugin/plugin.h @@ -0,0 +1,14 @@ +#ifndef PLUGIN_H +#define PLUGIN_H + +class Plugin +{ +public: + Plugin(); + virtual ~Plugin(); + +private: + +}; + +#endif diff --git a/src/old/tests/qsort.cpp b/src/old/tests/qsort.cpp new file mode 100644 index 0000000..28c6f03 --- /dev/null +++ b/src/old/tests/qsort.cpp @@ -0,0 +1,228 @@ +#define _QSORT_SWAP(a, b, t) ((void)((t = *a), (*a = *b), (*b = t))) + +/* Discontinue quicksort algorithm when partition gets below this size. + This particular magic number was chosen to work best on a Sun 4/260. */ +#define _QSORT_MAX_THRESH 4 + +/* Stack node declarations used to store unfulfilled partition obligations + * (inlined in QSORT). +typedef struct { + QSORT_TYPE *_lo, *_hi; +} qsort_stack_node; + */ + +/* The next 4 #defines implement a very fast in-line stack abstraction. */ +/* The stack needs log (total_elements) entries (we could even subtract + log(MAX_THRESH)). Since total_elements has type unsigned, we get as + upper bound for log (total_elements): + bits per byte (CHAR_BIT) * sizeof(unsigned). */ +#define _QSORT_STACK_SIZE (8 * sizeof(unsigned)) +#define _QSORT_PUSH(top, low, high) \ + (((top->_lo = (low)), (top->_hi = (high)), ++top)) +#define _QSORT_POP(low, high, top) \ + ((--top, (low = top->_lo), (high = top->_hi))) +#define _QSORT_STACK_NOT_EMPTY (_stack < _top) + + +/* Order size using quicksort. This implementation incorporates + four optimizations discussed in Sedgewick: + + 1. Non-recursive, using an explicit stack of pointer that store the + next array partition to sort. To save time, this maximum amount + of space required to store an array of SIZE_MAX is allocated on the + stack. Assuming a 32-bit (64 bit) integer for size_t, this needs + only 32 * sizeof(stack_node) == 256 bytes (for 64 bit: 1024 bytes). + Pretty cheap, actually. + + 2. Chose the pivot element using a median-of-three decision tree. + This reduces the probability of selecting a bad pivot value and + eliminates certain extraneous comparisons. + + 3. Only quicksorts TOTAL_ELEMS / MAX_THRESH partitions, leaving + insertion sort to order the MAX_THRESH items within each partition. + This is a big win, since insertion sort is faster for small, mostly + sorted array segments. + + 4. The larger of the two sub-partitions is always pushed onto the + stack first, with the algorithm then concentrating on the + smaller partition. This *guarantees* no more than log (total_elems) + stack size is needed (actually O(1) in this case)! */ + +/* The main code starts here... */ + +template<typename QSORT_TYPE, typename QSORT_LTT> +void qsrt( QSORT_TYPE *QSORT_BASE, int QSORT_NELT ) +{ + QSORT_LTT QSORT_LT; + QSORT_TYPE *const _base = (QSORT_BASE); + const unsigned _elems = (QSORT_NELT); + QSORT_TYPE _hold; + + /* Don't declare two variables of type QSORT_TYPE in a single + * statement: eg `TYPE a, b;', in case if TYPE is a pointer, + * expands to `type* a, b;' wich isn't what we want. + */ + + if (_elems > _QSORT_MAX_THRESH) { + QSORT_TYPE *_lo = _base; + QSORT_TYPE *_hi = _lo + _elems - 1; + struct { + QSORT_TYPE *_hi; QSORT_TYPE *_lo; + } _stack[_QSORT_STACK_SIZE], *_top = _stack + 1; + + while (_QSORT_STACK_NOT_EMPTY) { + QSORT_TYPE *_left_ptr; QSORT_TYPE *_right_ptr; + + /* Select median value from among LO, MID, and HI. Rearrange + LO and HI so the three values are sorted. This lowers the + probability of picking a pathological pivot value and + skips a comparison for both the LEFT_PTR and RIGHT_PTR in + the while loops. */ + + QSORT_TYPE *_mid = _lo + ((_hi - _lo) >> 1); + + if (QSORT_LT (_mid, _lo)) + _QSORT_SWAP (_mid, _lo, _hold); + if (QSORT_LT (_hi, _mid)) + _QSORT_SWAP (_mid, _hi, _hold); + else + goto _jump_over; + if (QSORT_LT (_mid, _lo)) + _QSORT_SWAP (_mid, _lo, _hold); + _jump_over:; + + _left_ptr = _lo + 1; + _right_ptr = _hi - 1; + + /* Here's the famous ``collapse the walls'' section of quicksort. + Gotta like those tight inner loops! They are the main reason + that this algorithm runs much faster than others. */ + do { + while (QSORT_LT (_left_ptr, _mid)) + ++_left_ptr; + + while (QSORT_LT (_mid, _right_ptr)) + --_right_ptr; + + if (_left_ptr < _right_ptr) { + _QSORT_SWAP (_left_ptr, _right_ptr, _hold); + if (_mid == _left_ptr) + _mid = _right_ptr; + else if (_mid == _right_ptr) + _mid = _left_ptr; + ++_left_ptr; + --_right_ptr; + } + else if (_left_ptr == _right_ptr) { + ++_left_ptr; + --_right_ptr; + break; + } + } while (_left_ptr <= _right_ptr); + + /* Set up pointers for next iteration. First determine whether + left and right partitions are below the threshold size. If so, + ignore one or both. Otherwise, push the larger partition's + bounds on the stack and continue sorting the smaller one. */ + + if (_right_ptr - _lo <= _QSORT_MAX_THRESH) { + if (_hi - _left_ptr <= _QSORT_MAX_THRESH) + /* Ignore both small partitions. */ + _QSORT_POP (_lo, _hi, _top); + else + /* Ignore small left partition. */ + _lo = _left_ptr; + } + else if (_hi - _left_ptr <= _QSORT_MAX_THRESH) + /* Ignore small right partition. */ + _hi = _right_ptr; + else if (_right_ptr - _lo > _hi - _left_ptr) { + /* Push larger left partition indices. */ + _QSORT_PUSH (_top, _lo, _right_ptr); + _lo = _left_ptr; + } + else { + /* Push larger right partition indices. */ + _QSORT_PUSH (_top, _left_ptr, _hi); + _hi = _right_ptr; + } + } + } + + /* Once the BASE array is partially sorted by quicksort the rest + is completely sorted using insertion sort, since this is efficient + for partitions below MAX_THRESH size. BASE points to the + beginning of the array to sort, and END_PTR points at the very + last element in the array (*not* one beyond it!). */ + + { + QSORT_TYPE *const _end_ptr = _base + _elems - 1; + QSORT_TYPE *_tmp_ptr = _base; + register QSORT_TYPE *_run_ptr; + QSORT_TYPE *_thresh; + + _thresh = _base + _QSORT_MAX_THRESH; + if (_thresh > _end_ptr) + _thresh = _end_ptr; + + /* Find smallest element in first threshold and place it at the + array's beginning. This is the smallest array element, + and the operation speeds up insertion sort's inner loop. */ + + for (_run_ptr = _tmp_ptr + 1; _run_ptr <= _thresh; ++_run_ptr) + if (QSORT_LT (_run_ptr, _tmp_ptr)) + _tmp_ptr = _run_ptr; + + if (_tmp_ptr != _base) + _QSORT_SWAP (_tmp_ptr, _base, _hold); + + /* Insertion sort, running from left-hand-side + * up to right-hand-side. */ + + _run_ptr = _base + 1; + while (++_run_ptr <= _end_ptr) { + _tmp_ptr = _run_ptr - 1; + while (QSORT_LT (_run_ptr, _tmp_ptr)) + --_tmp_ptr; + + ++_tmp_ptr; + if (_tmp_ptr != _run_ptr) { + QSORT_TYPE *_trav = _run_ptr + 1; + while (--_trav >= _run_ptr) { + QSORT_TYPE *_hi; QSORT_TYPE *_lo; + _hold = *_trav; + + for (_hi = _lo = _trav; --_lo >= _tmp_ptr; _hi = _lo) + *_hi = *_lo; + *_hi = _hold; + } + } + } + } + +} + + +struct cc +{ + bool operator()( int *a, int *b ) + { + return *a < *b; + } +}; + +#include <stdio.h> + +int main() +{ + int lst[] = { 43, 1, 342, 12, 491, 32, 12321, 32, 3, -3 }; + + for( int j = 0; j < 10; j++ ) + printf("%s%d", (j>0)?", ":"", lst[j] ); + printf("\n"); + qsrt<int, cc>( lst, 10 ); + for( int j = 0; j < 10; j++ ) + printf("%s%d", (j>0)?", ":"", lst[j] ); + printf("\n"); +} + diff --git a/src/old/tests/sbuffer.cpp b/src/old/tests/sbuffer.cpp new file mode 100644 index 0000000..02798cb --- /dev/null +++ b/src/old/tests/sbuffer.cpp @@ -0,0 +1,27 @@ +#include "sbuffer.h" + +int main() +{ + SBuffer buf; + + buf.write("abcdefg", 7 ); + + printf("tell: %ld\n", buf.tell() ); + + char abuf[6]; + int nRead; + nRead = buf.read( abuf, 5 ); + abuf[nRead] = '\0'; + printf("Read %d bytes \"%s\"\n", nRead, abuf ); + + buf.setPos( 0 ); + nRead = buf.read( abuf, 5 ); + abuf[nRead] = '\0'; + printf("Read %d bytes \"%s\"\n", nRead, abuf ); + + nRead = buf.read( abuf, 5 ); + abuf[nRead] = '\0'; + printf("Read %d bytes \"%s\"\n", nRead, abuf ); + +} + diff --git a/src/old/tests/serialize.cpp b/src/old/tests/serialize.cpp new file mode 100644 index 0000000..e233704 --- /dev/null +++ b/src/old/tests/serialize.cpp @@ -0,0 +1,30 @@ +#include "serializerbinary.h" +#include "staticstring.h" +#include <stdio.h> +#include <string> + +int main() +{ + int32_t one; + double two; + bool three; + StaticString s("Test string!"); + std::string ss("Another test string"); + SerializerBinary ar("hello.dat", false); + ar << (int)85; + ar << (double)2.63434; + ar << false; + ar << ss; + ar.close(); + + one = 0; two = 0; three = true; s = "die"; + + SerializerBinary ar2("hello.dat", true); + ar2 >> one; + ar2 >> two; + ar2 >> three; + ar2 >> s; + + printf("we got %d - %f - %s - \"%s\"\n", one, two, (three ? "true":"false"), s.getString() ); + return 0; +} diff --git a/src/old/tests/serializetext.cpp b/src/old/tests/serializetext.cpp new file mode 100644 index 0000000..f6be7d3 --- /dev/null +++ b/src/old/tests/serializetext.cpp @@ -0,0 +1,28 @@ +#include "serializertext.h" +#include "staticstring.h" +#include <iostream> + +int main() +{ + StaticString s("You're a dog!!"); + SerializerText ar("hello.dat", false); + + ar << 4 << 3.993 << true << s; + + ar.close(); + + int one=0;float two=0.0;bool three=false; s = ""; + + SerializerText ar2("hello.dat", true); + + ar2 >> one; + ar2 >> two; + ar2 >> three; + ar2 >> s; + + //printf("out: %d, %f, %s, \"%s\"\n", one, two, (three ? "true" : "false"), s.getString()); + std::cout << one << ", " << two << ", " << three << ", " << s.getString() << "\n"; + + return 0; +} + diff --git a/src/old/tests/sha1.cpp b/src/old/tests/sha1.cpp new file mode 100644 index 0000000..df3113c --- /dev/null +++ b/src/old/tests/sha1.cpp @@ -0,0 +1,44 @@ +#include "sha1.h" +#include "sfile.h" + +#define BS 1024 + +int main( int argc, char *argv[] ) +{ + argc--; argv++; + + if( argc == 0 ) + { + printf("Provide a filename.\n"); + return 0; + } + + char buf[BS]; + + Sha1 s; + SFile fin( *argv, "rb" ); + for(;;) + { + int nRead = fin.read( buf, BS ); + if( nRead == 0 ) + break; + + s.update( buf, nRead ); + if( nRead < BS ) + break; + } + + unsigned char *dig = s.getDigest(); + + char val[]={"0123456789ABCDEF"}; + + for( int j = 0; j < 20; j++ ) + { + putchar( val[dig[j]>>4] ); + putchar( val[dig[j]&0x0F] ); + } + putchar('\n'); + + delete[] dig; +} + diff --git a/src/old/tests/sptr.cpp b/src/old/tests/sptr.cpp new file mode 100644 index 0000000..38d3675 --- /dev/null +++ b/src/old/tests/sptr.cpp @@ -0,0 +1,55 @@ +#include <stdio.h> +#include "sptr.h" + +class Annoy +{ +public: + Annoy() : nCnt( 0 ) + { + printf("Created.\n"); + } + + ~Annoy() + { + printf("Destroyed.\n"); + } + + void go() + { + printf("%d: I'm annoying.\n", ++nCnt); + } + + int nCnt; +}; + +void beAnnoying( SPtr<Annoy> bob ) +{ + printf("bob-Count: %d\n", bob.count() ); + bob->go(); +} + +int main() +{ + SPtr<Annoy> pt( new Annoy ); + printf("Count: %d\n", pt.count() ); + pt->go(); + + { + SPtr<Annoy> pt2 = pt; + printf("Count: %d\n", pt2.count() ); + + pt2->go(); + + { + SPtr<Annoy> pt3( pt2 ); + printf("Count: %d\n", pt3.count() ); + + pt3->go(); + + beAnnoying( pt3 ); + } + printf("Count: %d\n", pt.count() ); + } + printf("Count: %d\n", pt.count() ); +} + diff --git a/src/old/tests/srvstress.cpp b/src/old/tests/srvstress.cpp new file mode 100644 index 0000000..d9a9a1c --- /dev/null +++ b/src/old/tests/srvstress.cpp @@ -0,0 +1,91 @@ +#include "connectionmanager.h" +#include "programlink.h" +#include "linkedlist.h" +#include "protocol.h" + +class StressProtocol : public Protocol +{ +public: + bool onNewData() + { + switch( getConnection()->getInput()[0] ) + { + case 'd': + throw "Hello"; + break; + + case 'w': + getConnection()->appendOutput("Hello"); + break; + }; + + return true; + } + + bool onNewConnection() + { + return true; + } +}; + +class StressMonitor : public ConnectionMonitor, public ProgramLink +{ +public: + bool init() + { + return true; + } + + bool deInit() + { + return true; + } + + bool timeSlice() + { + return true; + } + + bool onNewConnection( Connection *pCon, int nPort ) + { + StressProtocol *sp = new StressProtocol(); + pCon->setProtocol( sp ); + + printf(" sys: New connection: socket(%d), port(%d)\n", + pCon->getSocket(), nPort ); + + return true; + } + + bool onClosedConnection( Connection *pCon ) + { + printf(" sys: Closed connection: socket(%d)\n", + pCon->getSocket() ); + + return true; + } + + LinkMessage *processIRM( LinkMessage *pMsg ) + { + return NULL; + } +}; + +int main() +{ + printf("Starting server...\n"); + + ConnectionManager srv; + StressMonitor telnet; + + srv.setConnectionMonitor( &telnet ); + + srv.startServer( 4001 ); + + for(;;) + { + srv.scanConnections( 5000, false ); + } + + return 0; +} diff --git a/src/old/tests/strhash.cpp b/src/old/tests/strhash.cpp new file mode 100644 index 0000000..f6528ca --- /dev/null +++ b/src/old/tests/strhash.cpp @@ -0,0 +1,12 @@ +#include <stdio.h> +#include "hashfunctionstring.h" + +int main( int argc, char *argv[] ) +{ + HashFunctionString h; + + printf("\"%s\": %lu\n", argv[1], h.hash( argv[1] ) ); + + return 0; +} + diff --git a/src/old/tests/teltest/main.cpp b/src/old/tests/teltest/main.cpp new file mode 100644 index 0000000..5d3ec26 --- /dev/null +++ b/src/old/tests/teltest/main.cpp @@ -0,0 +1,21 @@ +#include "connectionmanager.h" +#include "telnetmonitor.h" + +int main() +{ + printf("Starting server...\n"); + + ConnectionManager srv; + TelnetMonitor telnet; + + srv.setConnectionMonitor( &telnet ); + + srv.startServer( 4001 ); + + for(;;) + { + srv.scanConnections( 5000, false ); + } + + return 0; +} diff --git a/src/old/tests/teltest/telnetmonitor.cpp b/src/old/tests/teltest/telnetmonitor.cpp new file mode 100644 index 0000000..65954eb --- /dev/null +++ b/src/old/tests/teltest/telnetmonitor.cpp @@ -0,0 +1,54 @@ +#include "telnetmonitor.h" +#include "protocoltelnet.h" +#include <sys/stat.h> + +TelnetMonitor::TelnetMonitor() +{ +} + +TelnetMonitor::~TelnetMonitor() +{ +} + +bool TelnetMonitor::init() +{ + return true; +} + +bool TelnetMonitor::deInit() +{ + return true; +} + +bool TelnetMonitor::timeSlice() +{ + for( int j = 0; j < lCon.getSize(); j++ ) + { + if( ((Connection *)lCon[j])->hasInput() ) + { + printf("%s\n", ((Connection *)lCon[j])->getInput() ); + } + } + return true; +} + +LinkMessage* TelnetMonitor::processIRM( LinkMessage *pMsg ) +{ + return NULL; +} + +bool TelnetMonitor::onNewConnection( Connection *pCon, int nPort ) +{ + ProtocolTelnet *pt = new ProtocolTelnet(); + pCon->setProtocol( pt ); + + lCon.append( pt ); + + return true; +} + +bool TelnetMonitor::onClosedConnection( Connection *pCon ) +{ + return true; +} + diff --git a/src/old/tests/teltest/telnetmonitor.h b/src/old/tests/teltest/telnetmonitor.h new file mode 100644 index 0000000..ba5761e --- /dev/null +++ b/src/old/tests/teltest/telnetmonitor.h @@ -0,0 +1,26 @@ +#ifndef HTTPCONNECTIONMONITOR_H +#define HTTPCONNECTIONMONITOR_H + +#include "connectionmonitor.h" +#include "programlink.h" +#include "linkedlist.h" + +class TelnetMonitor : public ConnectionMonitor, public ProgramLink +{ +public: + TelnetMonitor(); + ~TelnetMonitor(); + + bool init(); + bool deInit(); + bool timeSlice(); + LinkMessage* processIRM( LinkMessage *pMsgIn ); + + bool onNewConnection( Connection *pCon, int nPort ); + bool onClosedConnection( Connection *pCon ); + +private: + LinkedList lCon; +}; + +#endif diff --git a/src/old/tests/xmlreadtest.cpp b/src/old/tests/xmlreadtest.cpp new file mode 100644 index 0000000..d061810 --- /dev/null +++ b/src/old/tests/xmlreadtest.cpp @@ -0,0 +1,29 @@ +#include "xmlfilereader.h" +#include "xmlstringreader.h" +#include "xmlfilewriter.h" + +int main( int argc, char *argv[] ) +{ + if( argc < 4 ) + { + printf("Usage: %s f <file in> <file out>\n", argv[0] ); + printf(" %s s <xml string> <file out>\n\n", argv[0] ); + return 0; + } + + if( argv[1][0] == 'f' ) + { + XmlFileReader r( argv[2], true ); +// XmlFileWriter w( argv[3], "\t", r.detatchRoot() ); +// w.write(); + } + else if( argv[1][0] == 's' ) + { + XmlStringReader r( argv[2], true ); + XmlFileWriter w(stdout, "\t", r.detatchRoot() ); + w.write(); + } + + return 0; +} + diff --git a/src/old/tests/xmlrepltest.cpp b/src/old/tests/xmlrepltest.cpp new file mode 100644 index 0000000..9667705 --- /dev/null +++ b/src/old/tests/xmlrepltest.cpp @@ -0,0 +1,31 @@ +#include "xmlwriter.h" + +int main() +{ + printf("Testing Xml Replacement...\n"); + XmlDocument w; + + w.addNode("text"); + w.setContent("this text is before the node. "); + w.addNode("keepme", "This one we keep...", true ); + w.setContent("this text is after."); + w.addNode("deleteme", "This one we don't...", true ); + w.setContent("this is last..." ); + w.closeNode(); + + //XmlWriter::writeNode( stdout, w.getRoot(), 0, NULL ); + + printf("\n\n"); + + //XmlNode *xNode = w.getRoot()->detatchNode( 1 ); + + //XmlWriter::writeNode( stdout, w.getRoot(), 0, NULL ); + + printf("\n\n"); + + //XmlWriter::writeNode( stdout, xNode, 0, NULL ); + + printf("\n\n"); + + return 0; +} diff --git a/src/old/tests/xmlwritetest.cpp b/src/old/tests/xmlwritetest.cpp new file mode 100644 index 0000000..a22d19d --- /dev/null +++ b/src/old/tests/xmlwritetest.cpp @@ -0,0 +1,48 @@ +#include "xmlfilewriter.h" +#include "xmlstringwriter.h" +#include "xmlstringreader.h" + +void fillItIn( XmlWriter &w ) +{ + w.addNode("thinglist"); + + w.addNode("thing"); + w.addProperty("type", " ±î´<M-F6><M-F6>³¸®°êòì¯"); + + w.addNode("id", "Klophin²³±¹¸·µ´äêíëã Staff", true ); + w.addNode("name", "Klophin Staff", true ); + w.addNode("durability", "0.01", true ); + w.addNode("size", "0.1", true ); + + w.addNode("config"); + w.addNode("damage", "3d6+4", true ); + w.addNode("class", "melee", true ); + w.addNode("type", "bludgeon", true ); + w.addNode("damagedesc", "club/clubs", true ); + w.closeNode(); + + w.closeNode(); + + w.closeNode(); +} + +int main() +{ + printf("Testing XmlWriter...\n"); + + //XmlStringReader *xsr = new XmlStringReader("<stuff/>"); + + //printf("%08X\n%08X\n%08X\n", xsr, (XmlReader *)xsr, (XmlDocument *)xsr ); + + //delete (XmlDocument *)xsr; + XmlFileWriter wf("test.xml", "\t"); + + fillItIn( wf ); + + XmlStringWriter ws("\t"); + fillItIn( ws ); + + printf("Now the string version:\n\n%s\n", ws.getString().c_str() ); + + return 0; +} diff --git a/src/old/tokenstring.cpp b/src/old/tokenstring.cpp new file mode 100644 index 0000000..e57ba69 --- /dev/null +++ b/src/old/tokenstring.cpp @@ -0,0 +1,163 @@ +#include "tokenstring.h" +#include <string.h> + +TokenString::TokenString( const char *lpNewTokenString ) +{ + lpTokenString = NULL; + if( lpNewTokenString ) + { + parseLine( lpNewTokenString ); + } +} + +TokenString::~TokenString() +{ + delete[] lpTokenString; + for( int j = 0; j < lToken.getSize(); j++ ) + { + delete[] (((Token *)lToken[j])->lpToken); + delete ((Token *)lToken[j]); + } +} + +void TokenString::parseLine( const char *lpNewTokenString ) +{ + if( lpTokenString != NULL ) + { + delete[] lpTokenString; + lpTokenString = NULL; + for( int j = 0; j < lToken.getSize(); j++ ) + { + delete[] (((Token *)lToken[j])->lpToken); + delete ((Token *)lToken[j]); + } + lToken.empty(); + } + if( lpNewTokenString == NULL ) + { + lpTokenString = new char[1]; + lpTokenString[0] = '\0'; + lToken.setSize(0); + return; + } + // First order of business, make an internal copy so someone can get it + // if they want to. + int nLen = strlen(lpNewTokenString); + lpTokenString = new char[nLen+1]; + strcpy( lpTokenString, lpNewTokenString ); + + // Now we do a preliminary parse. This could be effected by later + // editing and aliasing, but we'll see... + int nTkStart, nTkEnd; + int mode=0; // 0 = startSearch, 1=endSearch + for( int j = 0; j <= nLen; j++ ) + { + if( mode == 0 ) + { + if( lpTokenString[j] != ' ' && + lpTokenString[j] != '\t' ) + { + nTkStart = j; + mode = 1; + } + } + else + { + if( lpTokenString[j] == ' ' || + lpTokenString[j] == '\t' || + lpTokenString[j] == '\0' ) + { + nTkEnd = j-1; + mode = 0; + + appendToken( nTkStart, nTkEnd ); + } + } + } +} + +void TokenString::appendToken( int nStart, int nEnd ) +{ + Token *pToken = new Token; + pToken->lpOrig = &lpTokenString[nStart]; + + // nStart and nEnd are inclusive, we must add two for the end, and the null + pToken->lpToken = new char[nEnd-nStart+2]; + memcpy( pToken->lpToken, &lpTokenString[nStart], nEnd-nStart+1 ); + pToken->lpToken[nEnd-nStart+1] = '\0'; + +// printf("%s\n", pToken->lpToken ); + lToken.append( pToken ); +} + +void TokenString::insertToken( int nStart, int nEnd, char *lpOldOrig, const char *lpNewToken, int nIndex ) +{ + Token *pToken = new Token; + pToken->lpOrig = lpOldOrig; + + // nStart and nEnd are inclusive, we must add two for the end, and the null + pToken->lpToken = new char[nEnd-nStart+2]; + memcpy( pToken->lpToken, &lpNewToken[nStart], nEnd-nStart+1 ); + pToken->lpToken[nEnd-nStart+1] = '\0'; + + lToken.insertBefore( pToken, nIndex ); +} + +int TokenString::getNumTokens() +{ + return lToken.getSize(); +} + +char *TokenString::getToken( int nIndex ) +{ + if( nIndex >= lToken.getSize() ) return NULL; + return (char *)(((Token *)lToken[nIndex])->lpToken); +} + +char *TokenString::getTokenString( int nIndex ) +{ + if( nIndex >= lToken.getSize() ) return NULL; + return (char *)(((Token *)lToken[nIndex])->lpOrig); +} + +void TokenString::expandTokenTo( int nIndex, char *lpNewToken ) +{ + // First, we delete the token at nIndex, then we keep inserting + // at that position... + // We also have to remember the index to the original string, + // since most of what we're expanding to won't be in the origingal + // we need to keep these indexes updated in order to make other parts + // of the system happy. + char *lpOldOrig = ((Token *)lToken[nIndex])->lpOrig; + delete[] ((Token *)lToken[nIndex])->lpToken; + delete ((Token *)lToken[nIndex]); + lToken.deleteAt( nIndex ); + + // We'll do this just like we did above, but instead we'll + // do tricky things when we find tokens... + int nLen = strlen(lpNewToken); + int nTkStart, nTkEnd, nNewIndex=nIndex; + int mode=0; // 0 = startSearch, 1=endSearch + for( int j = 0; j <= nLen; j++ ) + { + if( mode == 0 ) + { + if( lpNewToken[j] != ' ' && lpNewToken[j] != '\t' ) + { + nTkStart = j; + mode = 1; + } + } + else + { + if( lpNewToken[j] == ' ' || lpNewToken[j] == '\t' || lpNewToken[j] == '\0' ) + { + nTkEnd = j-1; + mode = 0; + + insertToken( nTkStart, nTkEnd, lpOldOrig, lpNewToken, nNewIndex ); + nNewIndex++; + } + } + } +} diff --git a/src/old/tokenstring.h b/src/old/tokenstring.h new file mode 100644 index 0000000..42f7309 --- /dev/null +++ b/src/old/tokenstring.h @@ -0,0 +1,114 @@ +#ifndef TOKENSTRING_H +#define TOKENSTRING_H + +#include "linkedlist.h" + +/** A single tokenized command line. Contains all information necesarry to + * nicely access a stand-alone command line and to perform alias expansion + * inside of that command line. + * When expanding a token, the original command line is left intact, so any + * command usng a command line verbatum (getTokenString not getToken) will get + * the original, and not the expanded version. + * Since indexing into the original command line is also done by token, it + * means that using getTokenString( 0 ) will not always get you the first + * character of the command line, it will get you the first non-whitespace + * character. + * Furthermore, when expanding the expantion string is tokenized as well, + * but since the original string is unchanged, all tokens that expand any + * given index will all retain the same index into the original command line. + *@todo Update this to allow it to break on different types of token + * delimiters. + *@author Mike Buland + */ +class TokenString{ +public: + /** Automatically call parseLine when created. + *@param lpNewTokenString The command line to tokenize + *@author Mike Buland + */ + TokenString( const char *lpNewTokenString=NULL ); + virtual ~TokenString(); + + /** Performs a tokenizing parse on the given command line, setting it as + * the internal command line for all future tokenizing (excluding + * expansion) + *@param lpNewTokenString The new command line to set to this object. + *@author Mike Buland + */ + void parseLine( const char *lpNewTokenString ); + + /** Appends a token to the list of available tokens. This references the + * internal pointer to the command line, so no token string must be + * specified. + *@param nStart The first character of the token to insert. + *@param nEnd The last character of the token to insert. + *@author Mike Buland + */ + void appendToken( int nStart, int nEnd ); + + /** Gets the number of tokens. This is particularly useful post-aliasing + * since the number of tokens may not match what is percieved from the + * original command line. + *@returns The number of available tokens. + *@author Mike Buland + */ + int getNumTokens(); + + /** Gets a processed token specified by index. + *@param nIndex The index of the token to retrieve. + *@returns A pointer to the requested token. Please note that these tokens + * may not match the original command line. + *@author Mike Buland + */ + char *getToken( int nIndex ); + + /** Gets the original command line based on tokens. Use this if you want + * to perform your own processing on parts of the command line, without + * resorting to tokens. + * The first character in the returned string will always be + * non-whitespace. + *@param nIndex The index of the token to start at, zero gets you the whole + * command line. + *@returns A pointer to the internal original command line string, starting + * at the position of the first non-whitespace character of the token + * specified. + *@author Mike Buland + */ + char *getTokenString( int nIndex=0 ); + + /** Expands a token, replacing it with the string lpNewToken, but + * processing the new string for tokens before performing the replacement + *@param nIndex Which token should be replaced. + *@param lpNewToken The string to replace the token with. + *@author Mike Buland + */ + void expandTokenTo( int nIndex, char *lpNewToken ); + + /** Inserts a token at any position in the command line. This does not + * effect the original command line. + *@param nStart The start of the token in the string lpNewToken. (inclusive) + *@param nEnd The end of the token in the string lpToken. (inclusive) + *@param lpOldOrig The pointer to the position in the orginal command + * line where this new token should point. + *@param lpNewToken The string containing the new token. May contain more + * than just one token. + *@param nIndex The position to insert the token to. + *@author Mike Buland + */ + void insertToken( int nStart, int nEnd, char *lpOldOrig, const char *lpNewToken, int nIndex ); + +private: + char *lpTokenString; /**< The original text that this string came from */ + LinkedList lToken; /**< The list of tokens. */ + + /** + * A single token within the token string. + */ + typedef struct Token + { + char *lpOrig; /**< This is just a pointer back to lpTokenString */ + char *lpToken; /**< This is really a whole token */ + } Token; +}; + +#endif diff --git a/src/old/tqsort.h b/src/old/tqsort.h new file mode 100644 index 0000000..c836b4f --- /dev/null +++ b/src/old/tqsort.h @@ -0,0 +1,207 @@ +#ifndef T_QSORT_H +#define T_QSORT_H + +#define _QSORT_SWAP(a, b, t) ((void)((t = *a), (*a = *b), (*b = t))) + +/* Discontinue quicksort algorithm when partition gets below this size. + This particular magic number was chosen to work best on a Sun 4/260. */ +#define _QSORT_MAX_THRESH 4 + +/* Stack node declarations used to store unfulfilled partition obligations + * (inlined in QSORT). +typedef struct { + QSORT_TYPE *_lo, *_hi; +} qsort_stack_node; + */ + +/* The next 4 #defines implement a very fast in-line stack abstraction. */ +/* The stack needs log (total_elements) entries (we could even subtract + log(MAX_THRESH)). Since total_elements has type unsigned, we get as + upper bound for log (total_elements): + bits per byte (CHAR_BIT) * sizeof(unsigned). */ +#define _QSORT_STACK_SIZE (8 * sizeof(unsigned)) +#define _QSORT_PUSH(top, low, high) \ + (((top->_lo = (low)), (top->_hi = (high)), ++top)) +#define _QSORT_POP(low, high, top) \ + ((--top, (low = top->_lo), (high = top->_hi))) +#define _QSORT_STACK_NOT_EMPTY (_stack < _top) + + +/* Order size using quicksort. This implementation incorporates + four optimizations discussed in Sedgewick: + + 1. Non-recursive, using an explicit stack of pointer that store the + next array partition to sort. To save time, this maximum amount + of space required to store an array of SIZE_MAX is allocated on the + stack. Assuming a 32-bit (64 bit) integer for size_t, this needs + only 32 * sizeof(stack_node) == 256 bytes (for 64 bit: 1024 bytes). + Pretty cheap, actually. + + 2. Chose the pivot element using a median-of-three decision tree. + This reduces the probability of selecting a bad pivot value and + eliminates certain extraneous comparisons. + + 3. Only quicksorts TOTAL_ELEMS / MAX_THRESH partitions, leaving + insertion sort to order the MAX_THRESH items within each partition. + This is a big win, since insertion sort is faster for small, mostly + sorted array segments. + + 4. The larger of the two sub-partitions is always pushed onto the + stack first, with the algorithm then concentrating on the + smaller partition. This *guarantees* no more than log (total_elems) + stack size is needed (actually O(1) in this case)! */ + +/* The main code starts here... */ + +template<typename QSORT_TYPE, typename QSORT_LTT, typename CST> +void tqsort( QSORT_TYPE *QSORT_BASE, int QSORT_NELT ) +{ + QSORT_LTT QSORT_LT; + QSORT_TYPE *const _base = (QSORT_BASE); + const unsigned _elems = (QSORT_NELT); + QSORT_TYPE _hold; + + /* Don't declare two variables of type QSORT_TYPE in a single + * statement: eg `TYPE a, b;', in case if TYPE is a pointer, + * expands to `type* a, b;' wich isn't what we want. + */ + + if (_elems > _QSORT_MAX_THRESH) { + QSORT_TYPE *_lo = _base; + QSORT_TYPE *_hi = _lo + _elems - 1; + struct { + QSORT_TYPE *_hi; QSORT_TYPE *_lo; + } _stack[_QSORT_STACK_SIZE], *_top = _stack + 1; + + while (_QSORT_STACK_NOT_EMPTY) { + QSORT_TYPE *_left_ptr; QSORT_TYPE *_right_ptr; + + /* Select median value from among LO, MID, and HI. Rearrange + LO and HI so the three values are sorted. This lowers the + probability of picking a pathological pivot value and + skips a comparison for both the LEFT_PTR and RIGHT_PTR in + the while loops. */ + + QSORT_TYPE *_mid = _lo + ((_hi - _lo) >> 1); + + if (QSORT_LT ((CST)(_mid), (CST)(_lo))) + _QSORT_SWAP (_mid, _lo, _hold); + if (QSORT_LT ((CST)(_hi), (CST)(_mid))) + _QSORT_SWAP (_mid, _hi, _hold); + else + goto _jump_over; + if (QSORT_LT ((CST)(_mid), (CST)(_lo))) + _QSORT_SWAP (_mid, _lo, _hold); + _jump_over:; + + _left_ptr = _lo + 1; + _right_ptr = _hi - 1; + + /* Here's the famous ``collapse the walls'' section of quicksort. + Gotta like those tight inner loops! They are the main reason + that this algorithm runs much faster than others. */ + do { + while (QSORT_LT ((CST)(_left_ptr), (CST)(_mid))) + ++_left_ptr; + + while (QSORT_LT ((CST)(_mid), (CST)(_right_ptr))) + --_right_ptr; + + if (_left_ptr < _right_ptr) { + _QSORT_SWAP (_left_ptr, _right_ptr, _hold); + if (_mid == _left_ptr) + _mid = _right_ptr; + else if (_mid == _right_ptr) + _mid = _left_ptr; + ++_left_ptr; + --_right_ptr; + } + else if (_left_ptr == _right_ptr) { + ++_left_ptr; + --_right_ptr; + break; + } + } while (_left_ptr <= _right_ptr); + + /* Set up pointers for next iteration. First determine whether + left and right partitions are below the threshold size. If so, + ignore one or both. Otherwise, push the larger partition's + bounds on the stack and continue sorting the smaller one. */ + + if (_right_ptr - _lo <= _QSORT_MAX_THRESH) { + if (_hi - _left_ptr <= _QSORT_MAX_THRESH) + /* Ignore both small partitions. */ + _QSORT_POP (_lo, _hi, _top); + else + /* Ignore small left partition. */ + _lo = _left_ptr; + } + else if (_hi - _left_ptr <= _QSORT_MAX_THRESH) + /* Ignore small right partition. */ + _hi = _right_ptr; + else if (_right_ptr - _lo > _hi - _left_ptr) { + /* Push larger left partition indices. */ + _QSORT_PUSH (_top, _lo, _right_ptr); + _lo = _left_ptr; + } + else { + /* Push larger right partition indices. */ + _QSORT_PUSH (_top, _left_ptr, _hi); + _hi = _right_ptr; + } + } + } + + /* Once the BASE array is partially sorted by quicksort the rest + is completely sorted using insertion sort, since this is efficient + for partitions below MAX_THRESH size. BASE points to the + beginning of the array to sort, and END_PTR points at the very + last element in the array (*not* one beyond it!). */ + + { + QSORT_TYPE *const _end_ptr = _base + _elems - 1; + QSORT_TYPE *_tmp_ptr = _base; + register QSORT_TYPE *_run_ptr; + QSORT_TYPE *_thresh; + + _thresh = _base + _QSORT_MAX_THRESH; + if (_thresh > _end_ptr) + _thresh = _end_ptr; + + /* Find smallest element in first threshold and place it at the + array's beginning. This is the smallest array element, + and the operation speeds up insertion sort's inner loop. */ + + for (_run_ptr = _tmp_ptr + 1; _run_ptr <= _thresh; ++_run_ptr) + if (QSORT_LT ((CST)(_run_ptr), (CST)(_tmp_ptr))) + _tmp_ptr = _run_ptr; + + if (_tmp_ptr != _base) + _QSORT_SWAP (_tmp_ptr, _base, _hold); + + /* Insertion sort, running from left-hand-side + * up to right-hand-side. */ + + _run_ptr = _base + 1; + while (++_run_ptr <= _end_ptr) { + _tmp_ptr = _run_ptr - 1; + while (QSORT_LT ((CST)(_run_ptr), (CST)(_tmp_ptr))) + --_tmp_ptr; + + ++_tmp_ptr; + if (_tmp_ptr != _run_ptr) { + QSORT_TYPE *_trav = _run_ptr + 1; + while (--_trav >= _run_ptr) { + QSORT_TYPE *_hi; QSORT_TYPE *_lo; + _hold = *_trav; + + for (_hi = _lo = _trav; --_lo >= _tmp_ptr; _hi = _lo) + *_hi = *_lo; + *_hi = _hold; + } + } + } + } +} + +#endif diff --git a/src/old/unit/hashtable/hashtable.cpp b/src/old/unit/hashtable/hashtable.cpp new file mode 100644 index 0000000..b2e1cf5 --- /dev/null +++ b/src/old/unit/hashtable/hashtable.cpp @@ -0,0 +1,107 @@ +#include <cstdlib> +#include <cstring> +#include <iostream> +#include <cpptest.h> +#include <string.h> +#include <set> +#include <map> + +#include "hashfunctionstring.h" +#include "hashfunctioncasestring.h" +#include "hashfunctionint.h" + +class HashFunctionSuite : public Test::Suite +{ +public: + HashFunctionSuite() + { + TEST_ADD( HashFunctionSuite::functionString ) + TEST_ADD( HashFunctionSuite::functionCaseString ) + TEST_ADD( HashFunctionSuite::functionInt ) + } + +private: + void functionStringWorker( HashFunction &hf, std::set<unsigned long> &sCodes, char *str, int nLevel, int nMax ) + { + for( char let = 'A'; let <= 'z'; let += 3 ) + { + str[nLevel+1] = '\0'; + str[nLevel] = let; + unsigned long x = hf.hash( str ); + TEST_ASSERT( sCodes.find( x ) == sCodes.end() ); + TEST_ASSERT( hf.cmpIDs( str, str ) ); + sCodes.insert( x ); + + if( nLevel < nMax ) + functionStringWorker( hf, sCodes, str, nLevel+1, nMax ); + } + } + + void functionString() + { + HashFunctionString hf; + char str[10]; + + std::set<unsigned long> sCodes; + + functionStringWorker( hf, sCodes, str, 0, 3 ); + } + + void functionCaseStringWorker( HashFunction &hf, std::map<unsigned long, char *> &sCodes, char *str, int nLevel, int nMax ) + { + for( char let = 'A'; let <= 'z'; let += 3 ) + { + str[nLevel+1] = '\0'; + str[nLevel] = let; + unsigned long x = hf.hash( str ); + std::map<unsigned long, char *>::iterator i = sCodes.find( x ); + if( i == sCodes.end() ) + { + sCodes[x] = strdup( str ); + } + else + { + TEST_ASSERT( strcasecmp( (*i).second, str ) == 0 ); + TEST_ASSERT( hf.cmpIDs( (*i).second, str ) == true ); + } + + if( nLevel < nMax ) + functionCaseStringWorker( hf, sCodes, str, nLevel+1, nMax ); + } + } + + void functionCaseString() + { + HashFunctionCaseString hf; + char str[10]; + + std::map<unsigned long, char *> sCodes; + + functionCaseStringWorker( hf, sCodes, str, 0, 3 ); + + std::map<unsigned long, char *>::iterator i; + for( i = sCodes.begin(); i != sCodes.end(); i++ ) + { + free( (*i).second ); + } + } + + void functionInt() + { + HashFunctionInt hf; + + for( long i = -100000; i <= 100000; i += 100 ) + { + TEST_ASSERT( ((long)hf.hash( (void *)i )) == i ); + TEST_ASSERT( ((long)hf.cmpIDs( (void *)i, (void *)i )) ); + } + } +}; + +int main( int argc, char *argv[] ) +{ + Test::TextOutput output( Test::TextOutput::Verbose ); + HashFunctionSuite ts; + return ts.run( output ) ? EXIT_SUCCESS : EXIT_FAILURE; +} + diff --git a/src/old/unit/xml/xml.cpp b/src/old/unit/xml/xml.cpp new file mode 100644 index 0000000..e4d779c --- /dev/null +++ b/src/old/unit/xml/xml.cpp @@ -0,0 +1,59 @@ +#include <cstdlib> +#include <cstring> +#include <iostream> +#include <cpptest.h> +#include <string.h> + +#include "xmlstringreader.h" +#include "xmlexception.h" + +class XmlCoreTestSuite : public Test::Suite +{ +public: + XmlCoreTestSuite() + { + TEST_ADD( XmlCoreTestSuite::badXml01 ) + TEST_ADD( XmlCoreTestSuite::badXml02 ) + TEST_ADD( XmlCoreTestSuite::badXml03 ) + + TEST_ADD( XmlCoreTestSuite::entityBuiltin01 ) + + TEST_ADD( XmlCoreTestSuite::entityDoc01 ) + } + +private: + void badXml01() + { + TEST_THROWS( XmlStringReader r("<hello></bye>"), XmlException & ); + } + + void badXml02() + { + TEST_THROWS( XmlStringReader r("<hello>"), XmlException & ); + } + + void badXml03() + { + TEST_THROWS( XmlStringReader r("<hello param=\"stuff?"), XmlException & ); + } + + void entityBuiltin01() + { + XmlStringReader r("<hello>><&'"</hello>"); + TEST_ASSERT( strcmp( r.getRoot()->getContent(), "><&\'\"" ) == 0 ); + } + + void entityDoc01() + { + XmlStringReader r("<!ENTITY name \"bob the man\"><hello>"&name;"</hello>"); + TEST_ASSERT( strcmp( r.getRoot()->getContent(), "\"bob the man\"" ) == 0 ); + } +}; + +int main( int argc, char *argv[] ) +{ + Test::TextOutput output( Test::TextOutput::Verbose ); + XmlCoreTestSuite ts; + return ts.run( output ) ? EXIT_SUCCESS : EXIT_FAILURE; +} + diff --git a/src/old/xmldocument.cpp b/src/old/xmldocument.cpp new file mode 100644 index 0000000..d7867d5 --- /dev/null +++ b/src/old/xmldocument.cpp @@ -0,0 +1,149 @@ +#include <stdio.h> +#include <stdlib.h> +#include "xmlwriter.h" + +XmlDocument::XmlDocument( XmlNode *pRoot ) +{ + this->pRoot = pRoot; + pCurrent = NULL; + bCompleted = (pRoot!=NULL); +} + +XmlDocument::~XmlDocument() +{ + if( pRoot ) + { + delete pRoot; + } +} + +void XmlDocument::addNode( const char *sName, const char *sContent, bool bClose ) +{ + if( pRoot == NULL ) + { + // This is the first node, so ignore position and just insert it. + pCurrent = pRoot = new XmlNode( sName, NULL, sContent ); + } + else + { + pCurrent = pCurrent->addChild( sName, sContent ); + } + + if( bClose ) + { + closeNode(); + } +} + +void XmlDocument::setName( const char *sName ) +{ + pCurrent->setName( sName ); +} + +bool XmlDocument::isCompleted() +{ + return bCompleted; +} + +XmlNode *XmlDocument::getRoot() +{ + return pRoot; +} + +XmlNode *XmlDocument::detatchRoot() +{ + XmlNode *pTemp = pRoot; + pRoot = NULL; + return pTemp; +} + +XmlNode *XmlDocument::getCurrent() +{ + return pCurrent; +} + +void XmlDocument::closeNode() +{ + if( pCurrent != NULL ) + { + pCurrent = pCurrent->getParent(); + + if( pCurrent == NULL ) + { + bCompleted = true; + } + } +} + +void XmlDocument::addProperty( const char *sName, const char *sValue ) +{ + if( pCurrent ) + { + pCurrent->addProperty( sName, sValue ); + } +} + +void XmlDocument::addProperty( const char *sName, const unsigned char nValue ) +{ + char buf[12]; + sprintf( buf, "%hhi", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const char nValue ) +{ + char buf[12]; + sprintf( buf, "%hhi", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const unsigned short nValue ) +{ + char buf[12]; + sprintf( buf, "%hi", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const short nValue ) +{ + char buf[12]; + sprintf( buf, "%hi", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const int nValue ) +{ + char buf[12]; + sprintf( buf, "%d", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const unsigned long nValue ) +{ + char buf[12]; + sprintf( buf, "%li", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const long nValue ) +{ + char buf[12]; + sprintf( buf, "%li", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const double dValue ) +{ + char buf[40]; + sprintf( buf, "%f", dValue ); + addProperty( sName, buf ); +} + +void XmlDocument::setContent( const char *sContent ) +{ + if( pCurrent ) + { + pCurrent->setContent( sContent ); + } +} + diff --git a/src/old/xmldocument.h b/src/old/xmldocument.h new file mode 100644 index 0000000..6671c41 --- /dev/null +++ b/src/old/xmldocument.h @@ -0,0 +1,171 @@ +#ifndef XMLDOCUMENT +#define XMLDOCUMENT + +#include "xmlnode.h" + +/** + * Keeps track of an easily managed set of XmlNode information. Allows simple + * operations for logical writing to and reading from XML structures. Using + * already formed structures is simply done through the XmlNode structures, + * and the getRoot function here. Creation is performed through a simple set + * of operations that creates the data in a stream type format. + *@author Mike Buland + */ +class XmlDocument +{ +public: + /** + * Construct either a blank XmlDocuemnt or construct a document around an + * existing XmlNode. Be careful, once an XmlNode is passed into a document + * the document takes over ownership and will delete it when the XmlDocument + * is deleted. + *@param pRoot The XmlNode to use as the root of this document, or NULL if + * you want to start a new document. + */ + XmlDocument( XmlNode *pRoot=NULL ); + + /** + * Destroy all contained nodes. + */ + virtual ~XmlDocument(); + + /** + * Add a new node to the document. The new node is appended to the end of + * the current context, i.e. XmlNode, and the new node, provided it isn't + * close as part of this operation, will become the current context. + *@param sName The name of the new node to add. + *@param sContent A content string to be placed inside of the new node. + *@param bClose Set this to true to close the node immediately after adding + * the node and setting the content and name. If this is set to true the + * node is appended, but the context node doesn't change. + */ + void addNode( const char *sName=NULL, const char *sContent=NULL, bool bClose=false ); + + /** + * Set the name of the current node context. + *@param sName The new name of the node. + */ + void setName( const char *sName ); + + /** + * Close the current node context. This will move the current context to + * the parent node of the former current node. If the current node was the + * root then the "completed" flag is set and no more operations are allowed. + */ + void closeNode(); + + /** + * Change the content of the current node at the current position between + * nodes. + *@param sContent The new content of the current node. + */ + void setContent( const char *sContent ); + + /** + * Add a named property to the current context node. + *@param sName The name of the property to add. + *@param sValue The string value of the property. + */ + void addProperty( const char *sName, const char *sValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const unsigned char nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const char nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const unsigned short nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const short nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const unsigned long nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const long nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const int nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param dValue The numerical value to add. + */ + void addProperty( const char *sName, const double dValue ); + + /** + * The XmlDocuemnt is considered completed if the root node has been closed. + * Once an XmlDocument has been completed, you can no longer perform + * operations on it. + *@return True if completed, false if still in progress. + */ + bool isCompleted(); + + /** + * Get a pointer to the root object of this XmlDocument. + *@returns A pointer to an internally owned XmlNode. Do not delete this + * XmlNode. + */ + XmlNode *getRoot(); + + /** + * Get a pointer to the root object of this XmlDocument, and remove the + * ownership from this object. + *@returns A pointer to an internally owned XmlNode. Do not delete this + * XmlNode. + */ + XmlNode *detatchRoot(); + + /** + * Get the current context node, which could be the same as the root node. + *@returns A pointer to an internally owned XmlNode. Do not delete this + * XmlNode. + */ + XmlNode *getCurrent(); + +private: + XmlNode *pRoot; /**< The root node. */ + XmlNode *pCurrent; /**< The current node. */ + bool bCompleted; /**< Is it completed? */ +}; + +#endif diff --git a/src/old/xmlfilereader.cpp b/src/old/xmlfilereader.cpp new file mode 100644 index 0000000..ed674a8 --- /dev/null +++ b/src/old/xmlfilereader.cpp @@ -0,0 +1,58 @@ +#include "xmlfilereader.h" +#include "exceptions.h" +#include <string.h> + +XmlFileReader::XmlFileReader( const char *sFile, bool bStrip ) + : XmlReader( bStrip ) +{ + fh = fopen( sFile, "rt" ); + + if( fh == NULL ) + { + throw XmlException("Couldn't open file: %s", sFile ); + //nError = 1; + } + else + { + buildDoc(); + } +} + +XmlFileReader::~XmlFileReader() +{ +} + +char XmlFileReader::getChar( int nIndex ) +{ + // Make sure we always have a little data left in the buffer + if( fbDataIn.getLength() <= nIndex+1 && fh ) + { + int nBytes = fbDataIn.getCapacity()-1; + char *buf = new char[nBytes]; + int nRead = fread( buf, 1, nBytes, fh ); + fbDataIn.appendData( buf, nRead ); + delete[] buf; + + if( nRead < nBytes ) + { + fclose( fh ); + fh = NULL; + } + } + if( fbDataIn.getLength() >= nIndex+1 ) + { + return fbDataIn.getData()[nIndex]; + } + else + { + throw XmlException("End of XML stream read."); + } +} + +void XmlFileReader::usedChar( int nAmnt ) +{ + if( fbDataIn.getLength()-nAmnt >= 0 ) + { + fbDataIn.usedData( nAmnt ); + } +} diff --git a/src/old/xmlfilereader.h b/src/old/xmlfilereader.h new file mode 100644 index 0000000..e3e02c2 --- /dev/null +++ b/src/old/xmlfilereader.h @@ -0,0 +1,47 @@ +#ifndef XMLFILEREADER +#define XMLFILEREADER + +#include <stdio.h> +#include "xmlreader.h" +#include "flexbuf.h" + +/** + * Takes care of reading in xml formatted data from a file. This could/should + * be made more arbitrary in the future so that we can read the data from any + * source. This is actually made quite simple already since all data read in + * is handled by one single helper function and then palced into a FlexBuf for + * easy access by the other functions. The FlexBuf also allows for block + * reading from disk, which improves speed by a noticable amount. + * <br> + * There are also some extra features implemented that allow you to break the + * standard XML reader specs and eliminate leading and trailing whitespace in + * all read content. This is useful in situations where you allow additional + * whitespace in the files to make them easily human readable. The resturned + * content will be NULL in sitautions where all content between nodes was + * stripped. + *@author Mike Buland + */ +class XmlFileReader : public XmlReader +{ +public: + /** + * Construct an XmlReader around an xml file on your file system. + *@param sFile The file to read. + *@param bStrip Set to true to strip out leading and trailing whitespace in + * node contents. + */ + XmlFileReader( const char *sFile, bool bStrip=false ); + + /** + * Destroy the reader and cleanup. + */ + virtual ~XmlFileReader(); + +private: + char getChar( int nIndex = 0 ); + void usedChar( int nAmnt = 1 ); + FILE *fh; /**< The file handle. */ + FlexBuf fbDataIn; /**< The input buffer. */ +}; + +#endif diff --git a/src/old/xmlfilewriter.cpp b/src/old/xmlfilewriter.cpp new file mode 100644 index 0000000..3c6fb41 --- /dev/null +++ b/src/old/xmlfilewriter.cpp @@ -0,0 +1,28 @@ +#include <stdio.h> +#include <stdlib.h> +#include "xmlfilewriter.h" + +XmlFileWriter::XmlFileWriter( const char *sFileName, const char *sIndent, XmlNode *pRoot ) : + XmlWriter( sIndent, pRoot ) +{ + this->sFileName = sFileName; + fh = fopen( sFileName, "wt"); + fprintf( fh, "<?xml version=\"1.0\"?>\n"); +} + +XmlFileWriter::XmlFileWriter( FILE *fh, const char *sIndent, XmlNode *pRoot ) : + XmlWriter( sIndent, pRoot ), + fh( fh ) +{ +} + +XmlFileWriter::~XmlFileWriter() +{ + fclose( fh ); +} + +void XmlFileWriter::writeString( const char *sString ) +{ + fputs( sString, fh ); +} + diff --git a/src/old/xmlfilewriter.h b/src/old/xmlfilewriter.h new file mode 100644 index 0000000..e328f96 --- /dev/null +++ b/src/old/xmlfilewriter.h @@ -0,0 +1,45 @@ +#ifndef XML_FILE_WRITER +#define XML_FILE_WRITER + +#include "xmlnode.h" +#include "xmlwriter.h" + +/** + * Implements xml writing in the XML standard format. Also allows you to + * break that format and auto-indent your exported xml data for ease of + * reading. The auto-indenting will only be applied to sections that + * have no content of their own already. This means that except for + * whitespace all of your data will be preserved perfectly. + * You can create an XmlWriter object around a file, or access the static + * write function directly and just hand it a filename and a root XmlNode. + * When using an XmlWriter object the interface is identicle to that of + * the XmlDocument class, so reference that class for API info. However + * when the initial (or root) node is closed, and the document is finished + * the file will be created and written to automatically. The user can + * check to see if this is actually true by calling the isFinished + * function in the XmlDocument class. + *@author Mike Buland + */ +class XmlFileWriter : public XmlWriter +{ +public: + /** + * Construct a file writer around a given file. + *@param sFileName The file to create or overwrite and write XML into. + *@param sIndent The indent text to use, if any. + */ + XmlFileWriter( const char *sFileName, const char *sIndent=NULL, XmlNode *pRoot=NULL ); + XmlFileWriter( FILE *fh, const char *sIndent=NULL, XmlNode *pRoot=NULL ); + + /** + * Destroy the writer. + */ + virtual ~XmlFileWriter(); + +private: + void writeString( const char *sString ); + std::string sFileName; /**< The filename to write to. */ + FILE *fh; /**< The file handle to the open file. */ +}; + +#endif diff --git a/src/old/xmlnode.cpp b/src/old/xmlnode.cpp new file mode 100644 index 0000000..b1ed9a9 --- /dev/null +++ b/src/old/xmlnode.cpp @@ -0,0 +1,445 @@ +#include "xmlnode.h" +#include "hashfunctionstring.h" + +XmlNode::XmlNode( const char *sName, XmlNode *pParent, const char *sContent ) : + hProperties( new HashFunctionString(), 53, false ), + hChildren( new HashFunctionString(), 53, true ) +{ + this->pParent = pParent; + if( sName != NULL ) + { + setName( sName ); + } + if( sContent != NULL ) + { + this->sPreContent = new std::string( sContent ); + } + else + { + this->sPreContent = NULL; + } + nCurContent = 0; +} + +XmlNode::~XmlNode() +{ + for( int j = 0; j < lChildren.getSize(); j++ ) + { + delete (XmlNode *)lChildren[j]; + } + for( int j = 0; j < lPropNames.getSize(); j++ ) + { + delete (std::string *)lPropNames[j]; + } + for( int j = 0; j < lPropValues.getSize(); j++ ) + { + delete (std::string *)lPropValues[j]; + } + for( int j = 0; j < lPostContent.getSize(); j++ ) + { + if( lPostContent[j] != NULL ) + { + delete (std::string *)lPostContent[j]; + } + } + if( sPreContent ) + { + delete sPreContent; + } +} + +void XmlNode::setName( const char *sName ) +{ + if( pParent ) + { + if( this->sName.size() == 0 ) + { + // We're not in the hash yet, so add us + this->sName = sName; + pParent->hChildren.insert( this->sName.c_str(), this ); + } + else + { + // Slightly more tricky, delete us, then add us... + pParent->hChildren.del( this->sName.c_str() ); + this->sName = sName; + pParent->hChildren.insert( this->sName.c_str(), this ); + } + } + else + { + // If we have no parent, then just set the name string, we don't need + // to worry about hashing. + this->sName = sName; + } +} + +void XmlNode::setContent( const char *sContent, int nIndex ) +{ + if( nIndex == -1 ) + { + nIndex = nCurContent; + } + if( nIndex == 0 ) + { + if( this->sPreContent ) + { + delete this->sPreContent; + } + + this->sPreContent = new std::string( sContent ); + } + else + { + nIndex--; + if( lPostContent[nIndex] ) + { + delete (std::string *)lPostContent[nIndex]; + } + + lPostContent.setAt( nIndex, new std::string( sContent ) ); + } +} + +const char *XmlNode::getContent( int nIndex ) +{ + if( nIndex == 0 ) + { + if( sPreContent ) + { + return sPreContent->c_str(); + } + } + else + { + nIndex--; + if( lPostContent[nIndex] ) + { + return ((std::string *)lPostContent[nIndex])->c_str(); + } + } + + return NULL; +} + +XmlNode *XmlNode::addChild( const char *sName, const char *sContent ) +{ + return addChild( new XmlNode( sName, this, sContent ) ); +} + +XmlNode *XmlNode::addChild( XmlNode *pNode ) +{ + lChildren.append( pNode ); + lPostContent.append( NULL ); + nCurContent++; + pNode->pParent = this; + + return pNode; +} + +XmlNode *XmlNode::getParent() +{ + return pParent; +} + +void XmlNode::addProperty( const char *sName, const char *sValue ) +{ + std::string *pName = new std::string( sName ); + std::string *pValue = new std::string( sValue ); + + hProperties.insert( pName->c_str(), pValue->c_str() ); + lPropNames.append( pName ); + lPropValues.append( pValue ); +} + +int XmlNode::getNumProperties() +{ + return lPropNames.getSize(); +} + +const char *XmlNode::getPropertyName( int nIndex ) +{ + std::string *tmp = ((std::string *)lPropNames[nIndex]); + if( tmp == NULL ) + return NULL; + return tmp->c_str(); +} + +const char *XmlNode::getProperty( int nIndex ) +{ + std::string *tmp = ((std::string *)lPropValues[nIndex]); + if( tmp == NULL ) + return NULL; + return tmp->c_str(); +} + +const char *XmlNode::getProperty( const char *sName ) +{ + const char *tmp = (const char *)hProperties[sName]; + if( tmp == NULL ) + return NULL; + return tmp; +} + +void XmlNode::deleteProperty( int nIndex ) +{ + hProperties.del( ((std::string *)lPropNames[nIndex])->c_str() ); + + delete (std::string *)lPropNames[nIndex]; + delete (std::string *)lPropValues[nIndex]; + + lPropNames.deleteAt( nIndex ); + lPropValues.deleteAt( nIndex ); +} + +bool XmlNode::hasChildren() +{ + return lChildren.getSize()>0; +} + +int XmlNode::getNumChildren() +{ + return lChildren.getSize(); +} + +XmlNode *XmlNode::getChild( int nIndex ) +{ + return (XmlNode *)lChildren[nIndex]; +} + +XmlNode *XmlNode::getChild( const char *sName, int nSkip ) +{ + return (XmlNode *)hChildren.get( sName, nSkip ); +} + +const char *XmlNode::getName() +{ + return sName.c_str(); +} + +void XmlNode::deleteNode( int nIndex, const char *sReplacementText ) +{ + XmlNode *xRet = detatchNode( nIndex, sReplacementText ); + + if( xRet != NULL ) + { + delete xRet; + } +} + +XmlNode *XmlNode::detatchNode( int nIndex, const char *sReplacementText ) +{ + if( nIndex < 0 || nIndex >= lChildren.getSize() ) + return NULL; + + // The real trick when deleteing a node isn't actually deleting it, it's + // reforming the content around the node that's now missing...hmmm... + + if( nIndex == 0 ) + { + // If the index is zero we have to deal with the pre-content + if( sReplacementText ) + { + if( sPreContent == NULL ) + { + sPreContent = new std::string( sReplacementText ); + } + else + { + *sPreContent += sReplacementText; + } + } + if( lPostContent.getSize() > 0 ) + { + if( lPostContent[0] != NULL ) + { + if( sPreContent == NULL ) + { + sPreContent = new std::string( + ((std::string *)lPostContent[0])->c_str() + ); + } + else + { + *sPreContent += + ((std::string *)lPostContent[0])->c_str(); + } + } + delete (std::string *)lPostContent[0]; + lPostContent.deleteAt( 0 ); + } + } + else + { + int nCont = nIndex-1; + // If it's above zero we deal with the post-content only + if( sReplacementText ) + { + if( lPostContent[nCont] == NULL ) + { + lPostContent.setAt( nCont, new std::string( sReplacementText ) ); + } + else + { + *((std::string *)lPostContent[nCont]) += sReplacementText; + } + } + if( lPostContent.getSize() > nIndex ) + { + if( lPostContent[nIndex] != NULL ) + { + if( lPostContent[nCont] == NULL ) + { + lPostContent.setAt( nCont, new std::string( + ((std::string *)lPostContent[nIndex])->c_str() + ) ); + } + else + { + *((std::string *)lPostContent[nCont]) += + ((std::string *)lPostContent[nIndex])->c_str(); + } + } + delete (std::string *)lPostContent[nIndex]; + lPostContent.deleteAt( nIndex ); + } + } + + XmlNode *xRet = (XmlNode *)lChildren[nIndex]; + hChildren.del( ((XmlNode *)lChildren[nIndex])->getName() ); + lChildren.deleteAt( nIndex ); + + return xRet; +} + +void XmlNode::replaceNode( int nIndex, XmlNode *pNewNode ) +{ + if( nIndex < 0 || nIndex >= lChildren.getSize() ) + return; //TODO: throw an exception + + delete (XmlNode *)lChildren[nIndex]; + lChildren.setAt( nIndex, pNewNode ); + pNewNode->pParent = this; +} + +XmlNode *XmlNode::getCopy() +{ + XmlNode *pNew = new XmlNode(); + + pNew->sName = sName; + if( sPreContent ) + { + pNew->sPreContent = new std::string( sPreContent->c_str() ); + } + else + { + pNew->sPreContent = NULL; + } + pNew->nCurContent = 0; + + int nSize = lPostContent.getSize(); + pNew->lPostContent.setSize( nSize ); + for( int j = 0; j < nSize; j++ ) + { + if( lPostContent[j] ) + { + pNew->lPostContent.setAt( + j, new std::string( + ((std::string *)lPostContent[j])->c_str() + ) + ); + } + else + { + pNew->lPostContent.setAt( j, NULL ); + } + } + + nSize = lChildren.getSize(); + pNew->lChildren.setSize( nSize ); + for( int j = 0; j < nSize; j++ ) + { + XmlNode *pChild = ((XmlNode *)lChildren[j])->getCopy(); + pNew->lChildren.setAt( j, pChild ); + pChild->pParent = pNew; + pNew->hChildren.insert( pChild->getName(), pChild ); + } + + nSize = lPropNames.getSize(); + pNew->lPropNames.setSize( nSize ); + pNew->lPropValues.setSize( nSize ); + for( int j = 0; j < nSize; j++ ) + { + std::string *pProp = new std::string( ((std::string *)lPropNames[j])->c_str() ); + std::string *pVal = new std::string( ((std::string *)lPropValues[j])->c_str() ); + pNew->lPropNames.setAt( j, pProp ); + pNew->lPropValues.setAt( j, pVal ); + pNew->hProperties.insert( pProp->c_str(), pVal->c_str() ); + pNew->nCurContent++; + } + + return pNew; +} + +void XmlNode::deleteNodeKeepChildren( int nIndex ) +{ + // This is a tricky one...we need to do some patching to keep things all + // even... + XmlNode *xRet = (XmlNode *)lChildren[nIndex]; + + if( xRet == NULL ) + { + return; + } + else + { + if( getContent( nIndex ) ) + { + std::string sBuf( getContent( nIndex ) ); + sBuf += xRet->getContent( 0 ); + setContent( sBuf.c_str(), nIndex ); + } + else + { + setContent( xRet->getContent( 0 ), nIndex ); + } + + int nSize = xRet->lChildren.getSize(); + for( int j = 0; j < nSize; j++ ) + { + XmlNode *pCopy = ((XmlNode *)xRet->lChildren[j])->getCopy(); + pCopy->pParent = this; + lChildren.insertBefore( pCopy, nIndex+j ); + + if( xRet->lPostContent[j] ) + { + lPostContent.insertBefore( + new std::string( ((std::string *)xRet->lPostContent[j])->c_str() ), + nIndex+j + ); + } + else + { + lPostContent.insertBefore( NULL, nIndex+j ); + } + } + + if( getContent( nIndex+nSize ) ) + { + //SString sBuf( getContent( nIndex+nSize ) ); + //sBuf.catfrom( xRet->getContent( nSize ) ); + //setContent( sBuf, nIndex+nSize ); + } + else + { + setContent( xRet->getContent( nSize ), nIndex+nSize ); + } + + deleteNode( nIndex+nSize ); + } +} + +void XmlNode::replaceNodeWithChildren( int nIndex, XmlNode *pNewNode ) +{ +} + diff --git a/src/old/xmlnode.h b/src/old/xmlnode.h new file mode 100644 index 0000000..7525306 --- /dev/null +++ b/src/old/xmlnode.h @@ -0,0 +1,236 @@ +#ifndef XMLNODE +#define XMLNODE + +#include <iostream> +#include "linkedlist.h" +#include "hashtable.h" + +/** + * Maintains all data pertient to an XML node, including sub-nodes and content. + * All child nodes can be accessed through index and through name via a hash + * table. This makes it very easy to gain simple and fast access to all of + * your data. For most applications, the memory footprint is also rather + * small. While XmlNode objects can be used directly to create XML structures + * it is highly reccomended that all operations be performed through the + * XmlDocument class. + *@author Mike Buland + */ +class XmlNode +{ +public: + /** + * Construct a new XmlNode. + *@param sName The name of the node. + *@param pParent The parent node. + *@param sContent The initial content string. + */ + XmlNode( + const char *sName=NULL, + XmlNode *pParent = NULL, + const char *sContent=NULL + ); + + /** + * Delete the node and cleanup all memory. + */ + virtual ~XmlNode(); + + /** + * Change the name of the node. + *@param sName The new name of the node. + */ + void setName( const char *sName ); + + /** + * Construct a new node and add it as a child to this node, also return a + * pointer to the newly constructed node. + *@param sName The name of the new node. + *@param sContent The initial content of the new node. + *@returns A pointer to the newly created child node. + */ + XmlNode *addChild( const char *sName, const char *sContent=NULL ); + + /** + * Add an already created XmlNode as a child to this node. The new child + * XmlNode's parent will be changed appropriately and the parent XmlNode + * will take ownership of the child. + *@param pChild The child XmlNode to add to this XmlNode. + *@returns A pointer to the child node that was just added. + */ + XmlNode *addChild( XmlNode *pChild ); + + /** + * Add a new property to the XmlNode. Properties are name/value pairs. + *@param sName The name of the property. Specifying a name that's already + * in use will overwrite that property. + *@param sValue The textual value of the property. + */ + void addProperty( const char *sName, const char *sValue ); + + /** + * Get a pointer to the parent node, if any. + *@returns A pointer to the node's parent, or NULL if there isn't one. + */ + XmlNode *getParent(); + + /** + * Tells you if this node has children. + *@returns True if this node has at least one child, false otherwise. + */ + bool hasChildren(); + + /** + * Tells you how many children this node has. + *@returns The number of children this node has. + */ + int getNumChildren(); + + /** + * Get a child node at a specific index. + *@param nIndex The zero-based index of the child to retreive. + *@returns A pointer to the child, or NULL if you requested an invalid + * index. + */ + XmlNode *getChild( int nIndex ); + + /** + * Get a child with the specified name, and possibly skip value. For an + * explination of skip values see the HashTable. + *@param sName The name of the child to find. + *@param nSkip The number of nodes with that name to skip. + *@returns A pointer to the child, or NULL if no child with that name was + * found. + */ + XmlNode *getChild( const char *sName, int nSkip=0 ); + + /** + * Get a pointer to the name of this node. Do not change this, use setName + * instead. + *@returns A pointer to the name of this node. + */ + const char *getName(); + + /** + * Set the content of this node, optionally at a specific index. Using the + * default of -1 will set the content after the last added node. + *@param sContent The content string to use. + *@param nIndex The index of the content. + */ + void setContent( const char *sContent, int nIndex=-1 ); + + /** + * Get the content string at a given index, or zero for initial content. + *@param nIndex The index of the content. + *@returns A pointer to the content at that location. + */ + const char *getContent( int nIndex = 0 ); + + /** + * Get the number of properties in this node. + *@returns The number of properties in this node. + */ + int getNumProperties(); + + /** + * Get a property's name by index. + *@param nIndex The index of the property to examine. + *@returns A pointer to the name of the property specified, or NULL if none + * found. + */ + const char *getPropertyName( int nIndex ); + + /** + * Get a proprty's value by index. + *@param nIndex The index of the property to examine. + *@returns A pointer to the value of the property specified, or NULL if none + * found. + */ + const char *getProperty( int nIndex ); + + /** + * Get a propery's value by name. + *@param sName The name of the property to examine. + *@returns A pointer to the value of the property specified, or NULL if none + * found. + */ + const char *getProperty( const char *sName ); + + /** + * Delete a property by index. + *@param nIndex The index of the property to delete. + *@returns True if the property was found and deleted, false if it wasn't + * found. + */ + void deleteProperty( int nIndex ); + + /** + * Delete a child node, possibly replacing it with some text. This actually + * fixes all content strings around the newly deleted child node. + *@param nIndex The index of the node to delete. + *@param sReplacementText The optional text to replace the node with. + *@returns True of the node was found, and deleted, false if it wasn't + * found. + */ + void deleteNode( int nIndex, const char *sReplacementText = NULL ); + + /** + * Delete a given node, but move all of it's children and content up to + * replace the deleted node. All of the content of the child node is + * spliced seamlessly into place with the parent node's content. + *@param nIndex The node to delete. + *@returns True if the node was found and deleted, false if it wasn't. + */ + void deleteNodeKeepChildren( int nIndex ); + + /** + * Detatch a given child node from this node. This effectively works just + * like a deleteNode, except that instead of deleting the node it is removed + * and returned, and all ownership is given up. + *@param nIndex The index of the node to detatch. + *@param sReplacementText The optional text to replace the detatched node + * with. + *@returns A pointer to the newly detatched node, which then passes + * ownership to the caller. + */ + XmlNode *detatchNode( int nIndex, const char *sReplacementText = NULL ); + + /** + * Replace a given node with a different node that is not currently owned by + * this XmlNode or any ancestor. + *@param nIndex The index of the node to replace. + *@param pNewNode The new node to replace the old node with. + *@returns True if the node was found and replaced, false if it wasn't. + */ + void replaceNode( int nIndex, XmlNode *pNewNode ); + + /** + * Replace a given node with the children and content of a given node. + *@param nIndex The index of the node to replace. + *@param pNewNode The node that contains the children and content that will + * replace the node specified by nIndex. + *@returns True if the node was found and replaced, false if it wasn't. + */ + void replaceNodeWithChildren( int nIndex, XmlNode *pNewNode ); + + /** + * Get a copy of this node and all children. getCopy is recursive, so + * beware copying large trees of xml. + *@returns A newly created copy of this node and all of it's children. + */ + XmlNode *getCopy(); + +private: + std::string sName; /**< The name of the node. */ + std::string *sPreContent; /**< The content that goes before any node. */ + LinkedList lChildren; /**< The children. */ + LinkedList lPostContent; /**< The content that comes after children. */ + HashTable hProperties; /**< Property hashtable. */ + HashTable hChildren; /**< Children hashtable. */ + LinkedList lPropNames; /**< List of property names. */ + LinkedList lPropValues; /**< List of property values. */ + XmlNode *pParent; /**< A pointer to the parent of this node. */ + int nCurContent; /**< The current content we're on, for using the -1 on + setContent. */ +}; + +#endif diff --git a/src/old/xmlreader.cpp b/src/old/xmlreader.cpp new file mode 100644 index 0000000..18df69c --- /dev/null +++ b/src/old/xmlreader.cpp @@ -0,0 +1,602 @@ +#include "xmlreader.h" +#include "exceptions.h" +#include <string.h> +#include "hashfunctionstring.h" + +XmlReader::XmlReader( bool bStrip ) : + bStrip( bStrip ), + htEntity( new HashFunctionString(), 11 ) +{ +} + +XmlReader::~XmlReader() +{ + void *i = htEntity.getFirstItemPos(); + while( (i = htEntity.getNextItemPos( i ) ) ) + { + free( (char *)(htEntity.getItemID( i )) ); + delete (StaticString *)htEntity.getItemData( i ); + } +} + +void XmlReader::addEntity( const char *name, const char *value ) +{ + if( htEntity[name] ) return; + + char *sName = strdup( name ); + StaticString *sValue = new StaticString( value ); + + htEntity.insert( sName, sValue ); +} + +#define gcall( x ) if( x == false ) return false; + +bool XmlReader::isws( char chr ) +{ + return ( chr == ' ' || chr == '\t' || chr == '\n' || chr == '\r' ); +} + +bool XmlReader::ws() +{ + while( true ) + { + char chr = getChar(); + if( isws( chr ) ) + { + usedChar(); + } + else + { + return true; + } + } + return true; +} + +bool XmlReader::buildDoc() +{ + // take care of initial whitespace + gcall( ws() ); + textDecl(); + entity(); + addEntity("gt", ">"); + addEntity("lt", "<"); + addEntity("amp", "&"); + addEntity("apos", "\'"); + addEntity("quot", "\""); + gcall( node() ); + + return true; +} + +void XmlReader::textDecl() +{ + if( getChar() == '<' && getChar( 1 ) == '?' ) + { + usedChar( 2 ); + for(;;) + { + if( getChar() == '?' ) + { + if( getChar( 1 ) == '>' ) + { + usedChar( 2 ); + return; + } + } + usedChar(); + } + } +} + +void XmlReader::entity() +{ + for(;;) + { + ws(); + + if( getChar() == '<' && getChar( 1 ) == '!' ) + { + usedChar( 2 ); + ws(); + std::string buf; + for(;;) + { + char chr = getChar(); + usedChar(); + if( isws( chr ) ) break; + buf += chr; + } + + if( strcmp( buf.c_str(), "ENTITY") == 0 ) + { + ws(); + std::string name; + for(;;) + { + char chr = getChar(); + usedChar(); + if( isws( chr ) ) break; + name += chr; + } + ws(); + char quot = getChar(); + usedChar(); + if( quot != '\'' && quot != '\"' ) + { + throw XmlException( + "Only quoted entity values are supported." + ); + } + std::string value; + for(;;) + { + char chr = getChar(); + usedChar(); + if( chr == '&' ) + { + StaticString *tmp = getEscape(); + if( tmp == NULL ) throw XmlException("Entity thing"); + value += tmp->getString(); + delete tmp; + } + else if( chr == quot ) + { + break; + } + else + { + value += chr; + } + } + ws(); + if( getChar() == '>' ) + { + usedChar(); + + addEntity( name.c_str(), value.c_str() ); + } + else + { + throw XmlException( + "Malformed ENTITY: unexpected '%c' found.", + getChar() + ); + } + } + else + { + throw XmlException( + "Unsupported header symbol: %s", + buf.c_str() + ); + } + } + else + { + return; + } + } +} + +bool XmlReader::node() +{ + gcall( startNode() ) + + // At this point, we are closing the startNode + char chr = getChar(); + if( chr == '>' ) + { + usedChar(); + + // Now we process the guts of the node. + gcall( content() ); + } + else if( chr == '/' ) + { + // This is the tricky one, one more validation, then we close the node. + usedChar(); + if( getChar() == '>' ) + { + closeNode(); + usedChar(); + } + else + { + throw XmlException("Close node in singleNode malformed!"); + } + } + else + { + throw XmlException("Close node expected, but not found."); + return false; + } + + return true; +} + +bool XmlReader::startNode() +{ + if( getChar() == '<' ) + { + usedChar(); + + if( getChar() == '/' ) + { + // Heh, it's actually a close node, go figure + FlexBuf fbName; + usedChar(); + gcall( ws() ); + + while( true ) + { + char chr = getChar(); + if( isws( chr ) || chr == '>' ) + { + // Here we actually compare the name we got to the name + // we already set, they have to match exactly. + if( !strcasecmp( getCurrent()->getName(), fbName.getData() ) ) + { + closeNode(); + break; + } + else + { + throw XmlException("Got a mismatched node close tag."); + } + } + else + { + fbName.appendData( chr ); + usedChar(); + } + } + + gcall( ws() ); + if( getChar() == '>' ) + { + // Everything is cool. + usedChar(); + } + else + { + throw XmlException("Got extra junk data instead of node close tag."); + } + } + else + { + // We're good, format is consistant + addNode(); + + // Skip extra whitespace + gcall( ws() ); + gcall( name() ); + gcall( ws() ); + gcall( paramlist() ); + gcall( ws() ); + } + } + else + { + throw XmlException("Expected to find node opening char, '<'."); + } + + return true; +} + +bool XmlReader::name() +{ + FlexBuf fbName; + + while( true ) + { + char chr = getChar(); + if( isws( chr ) || chr == '>' || chr == '/' ) + { + setName( fbName.getData() ); + return true; + } + else + { + fbName.appendData( chr ); + usedChar(); + } + } + + return true; +} + +bool XmlReader::paramlist() +{ + while( true ) + { + char chr = getChar(); + if( chr == '/' || chr == '>' ) + { + return true; + } + else + { + gcall( param() ); + gcall( ws() ); + } + } + + return true; +} + +StaticString *XmlReader::getEscape() +{ + if( getChar( 1 ) == '#' ) + { + // If the entity starts with a # it's a character escape code + int base = 10; + usedChar( 2 ); + if( getChar() == 'x' ) + { + base = 16; + usedChar(); + } + char buf[4]; + int j = 0; + for( j = 0; getChar() != ';'; j++ ) + { + buf[j] = getChar(); + usedChar(); + } + usedChar(); + buf[j] = '\0'; + buf[0] = (char)strtol( buf, (char **)NULL, base ); + buf[1] = '\0'; + + return new StaticString( buf ); + } + else + { + // ...otherwise replace with the appropriate string... + std::string buf; + usedChar(); + for(;;) + { + char cbuf = getChar(); + usedChar(); + if( cbuf == ';' ) break; + buf += cbuf; + } + + StaticString *tmp = (StaticString *)htEntity[buf.c_str()]; + if( tmp == NULL ) return NULL; + + StaticString *ret = new StaticString( *tmp ); + return ret; + } +} + +bool XmlReader::param() +{ + FlexBuf fbName; + FlexBuf fbValue; + + while( true ) + { + char chr = getChar(); + if( isws( chr ) || chr == '=' ) + { + break; + } + else + { + fbName.appendData( chr ); + usedChar(); + } + } + + gcall( ws() ); + + if( getChar() == '=' ) + { + usedChar(); + + gcall( ws() ); + + char chr = getChar(); + if( chr == '"' ) + { + // Better quoted rhs + usedChar(); + + while( true ) + { + chr = getChar(); + if( chr == '"' ) + { + usedChar(); + addProperty( fbName.getData(), fbValue.getData() ); + return true; + } + else + { + if( chr == '&' ) + { + StaticString *tmp = getEscape(); + if( tmp == NULL ) return false; + fbValue.appendData( tmp->getString() ); + delete tmp; + } + else + { + fbValue.appendData( chr ); + usedChar(); + } + } + } + } + else + { + // Simple one-word rhs + while( true ) + { + chr = getChar(); + if( isws( chr ) || chr == '/' || chr == '>' ) + { + addProperty( fbName.getData(), fbValue.getData() ); + return true; + } + else + { + if( chr == '&' ) + { + StaticString *tmp = getEscape(); + if( tmp == NULL ) return false; + fbValue.appendData( tmp->getString() ); + delete tmp; + } + else + { + fbValue.appendData( chr ); + usedChar(); + } + } + } + } + } + else + { + throw XmlException("Expected an equals to seperate the params."); + return false; + } + + return true; +} + +bool XmlReader::content() +{ + FlexBuf fbContent; + + if( bStrip ) gcall( ws() ); + + while( true ) + { + char chr = getChar(); + if( chr == '<' ) + { + if( getChar(1) == '/' ) + { + if( fbContent.getLength() > 0 ) + { + if( bStrip ) + { + int j; + for( j = fbContent.getLength()-1; isws(fbContent.getData()[j]); j-- ); + ((char *)fbContent.getData())[j+1] = '\0'; + } + setContent( fbContent.getData() ); + } + usedChar( 2 ); + gcall( ws() ); + FlexBuf fbName; + while( true ) + { + chr = getChar(); + if( isws( chr ) || chr == '>' ) + { + if( !strcasecmp( getCurrent()->getName(), fbName.getData() ) ) + { + closeNode(); + break; + } + else + { + throw XmlException("Mismatched close tag found: <%s> to <%s>.", getCurrent()->getName(), fbName.getData() ); + } + } + else + { + fbName.appendData( chr ); + usedChar(); + } + } + gcall( ws() ); + if( getChar() == '>' ) + { + usedChar(); + return true; + } + else + { + throw XmlException("Malformed close tag."); + } + } + else if( getChar(1) == '!' ) + { + // We know it's a comment, let's see if it's proper + if( getChar(2) != '-' || + getChar(3) != '-' ) + { + // Not a valid XML comment + throw XmlException("Malformed comment start tag found."); + } + + usedChar( 4 ); + + // Now burn text until we find the close tag + for(;;) + { + if( getChar() == '-' ) + { + if( getChar( 1 ) == '-' ) + { + // The next one has to be a '>' now + if( getChar( 2 ) != '>' ) + { + throw XmlException("Malformed comment close tag found. You cannot have a '--' that isn't followed by a '>' in a comment."); + } + usedChar( 3 ); + break; + } + else + { + // Found a dash followed by a non dash, that's ok... + usedChar( 2 ); + } + } + else + { + // Burn comment chars + usedChar(); + } + } + } + else + { + if( fbContent.getLength() > 0 ) + { + if( bStrip ) + { + int j; + for( j = fbContent.getLength()-1; isws(fbContent.getData()[j]); j-- ); + ((char *)fbContent.getData())[j+1] = '\0'; + } + setContent( fbContent.getData() ); + fbContent.clearData(); + } + gcall( node() ); + } + + if( bStrip ) gcall( ws() ); + } + else if( chr == '&' ) + { + StaticString *tmp = getEscape(); + if( tmp == NULL ) return false; + fbContent.appendData( tmp->getString() ); + delete tmp; + } + else + { + fbContent.appendData( chr ); + usedChar(); + } + } +} + diff --git a/src/old/xmlreader.h b/src/old/xmlreader.h new file mode 100644 index 0000000..c8f7202 --- /dev/null +++ b/src/old/xmlreader.h @@ -0,0 +1,141 @@ +#ifndef XMLREADER +#define XMLREADER + +#include <stdio.h> +#include "xmldocument.h" +#include "flexbuf.h" +#include "hashtable.h" +#include "staticstring.h" + +/** + * Takes care of reading in xml formatted data from a file. This could/should + * be made more arbitrary in the future so that we can read the data from any + * source. This is actually made quite simple already since all data read in + * is handled by one single helper function and then palced into a FlexBuf for + * easy access by the other functions. The FlexBuf also allows for block + * reading from disk, which improves speed by a noticable amount. + * <br> + * There are also some extra features implemented that allow you to break the + * standard XML reader specs and eliminate leading and trailing whitespace in + * all read content. This is useful in situations where you allow additional + * whitespace in the files to make them easily human readable. The resturned + * content will be NULL in sitautions where all content between nodes was + * stripped. + *@author Mike Buland + */ +class XmlReader : public XmlDocument +{ +public: + /** + * Create a standard XmlReader. The optional parameter bStrip allows you to + * create a reader that will strip out all leading and trailing whitespace + * in content, a-la html. + *@param bStrip Strip out leading and trailing whitespace? + */ + XmlReader( bool bStrip=false ); + + /** + * Destroy this XmlReader. + */ + virtual ~XmlReader(); + + /** + * Build a document based on some kind of input. This is called + * automatically by the constructor. + */ + bool buildDoc(); + +private: + /** + * This is called by the low level automoton in order to get the next + * character. This function should return a character at the current + * position plus nIndex, but does not increment the current character. + *@param nIndex The index of the character from the current stream position. + *@returns A single character at the requested position, or 0 for end of + * stream. + */ + virtual char getChar( int nIndex = 0 ) = 0; + + /** + * Called to increment the current stream position by a single character. + */ + virtual void usedChar( int nAmnt = 1) = 0; + + /** + * Automoton function: is whitespace. + *@param chr A character + *@returns True if chr is whitespace, false otherwise. + */ + bool isws( char chr ); + + /** + * Automoton function: ws. Skips sections of whitespace. + *@returns True if everything was ok, False for end of stream. + */ + bool ws(); + + /** + * Automoton function: node. Processes an XmlNode + *@returns True if everything was ok, False for end of stream. + */ + bool node(); + + /** + * Automoton function: startNode. Processes the begining of a node. + *@returns True if everything was ok, False for end of stream. + */ + bool startNode(); + + /** + * Automoton function: name. Processes the name of a node. + *@returns True if everything was ok, False for end of stream. + */ + bool name(); + + /** + * Automoton function: textDecl. Processes the xml text decleration, if + * there is one. + */ + void textDecl(); + + /** + * Automoton function: entity. Processes an entity from the header. + */ + void entity(); + + /** + * Adds an entity to the list, if it doesn't already exist. + *@param name The name of the entity + *@param value The value of the entity + */ + void addEntity( const char *name, const char *value ); + + StaticString *getEscape(); + + /** + * Automoton function: paramlist. Processes a list of node params. + *@returns True if everything was ok, False for end of stream. + */ + bool paramlist(); + + /** + * Automoton function: param. Processes a single parameter. + *@returns True if everything was ok, False for end of stream. + */ + bool param(); + + /** + * Automoton function: content. Processes node content. + *@returns True if everything was ok, False for end of stream. + */ + bool content(); + + FlexBuf fbContent; /**< buffer for the current node's content. */ + FlexBuf fbParamName; /**< buffer for the current param's name. */ + FlexBuf fbParamValue; /**< buffer for the current param's value. */ + bool bStrip; /**< Are we stripping whitespace? */ + + HashTable htEntity; /**< Entity type definitions. */ +}; + +#endif diff --git a/src/old/xmlstringreader.cpp b/src/old/xmlstringreader.cpp new file mode 100644 index 0000000..3956ff3 --- /dev/null +++ b/src/old/xmlstringreader.cpp @@ -0,0 +1,38 @@ +#include "xmlstringreader.h" +#include "exceptions.h" +#include <string.h> + +XmlStringReader::XmlStringReader( const char *sString, bool bStrip ) + : XmlReader( bStrip ) +{ + this->sString = sString; + + nIndex = 0; + nLength = strlen( sString ); + + buildDoc(); +} + +XmlStringReader::~XmlStringReader() +{ +} + +char XmlStringReader::getChar( int nAdd ) +{ + if( nLength >= nIndex+nAdd+1 ) + { + return sString[nIndex+nAdd]; + } + else + { + throw XmlException("End of XML stream read."); + } +} + +void XmlStringReader::usedChar( int nAmnt ) +{ + if( nLength >= nIndex+nAmnt ) + { + nIndex += nAmnt; + } +} diff --git a/src/old/xmlstringreader.h b/src/old/xmlstringreader.h new file mode 100644 index 0000000..1239ef4 --- /dev/null +++ b/src/old/xmlstringreader.h @@ -0,0 +1,49 @@ +#ifndef XMLSTRINGREADER +#define XMLSTRINGREADER + +#include <stdio.h> +#include "xmlreader.h" +#include "flexbuf.h" + +/** + * Takes care of reading in xml formatted data from a file. This could/should + * be made more arbitrary in the future so that we can read the data from any + * source. This is actually made quite simple already since all data read in + * is handled by one single helper function and then palced into a FlexBuf for + * easy access by the other functions. The FlexBuf also allows for block + * reading from disk, which improves speed by a noticable amount. + * <br> + * There are also some extra features implemented that allow you to break the + * standard XML reader specs and eliminate leading and trailing whitespace in + * all read content. This is useful in situations where you allow additional + * whitespace in the files to make them easily human readable. The resturned + * content will be NULL in sitautions where all content between nodes was + * stripped. + *@author Mike Buland + */ +class XmlStringReader : public XmlReader +{ +public: + /** + * Create a new string reader around an already created and formatted + * null-terminated string. + *@param sString A pointer to the string data that will be used. This data + * is not changed during processing. + *@param bStrip Strip out leading and trailing whitespace. + */ + XmlStringReader( const char *sString, bool bStrip=false ); + + /** + * Destroy this string reader. + */ + virtual ~XmlStringReader(); + +private: + char getChar( int nIndex = 0 ); + void usedChar( int nAmnt = 1 ); + const char *sString; /**< Internal pointer to the input string. */ + int nIndex; /**< Our index into the string */ + int nLength; /**< The computed length of the string */ +}; + +#endif diff --git a/src/old/xmlstringwriter.cpp b/src/old/xmlstringwriter.cpp new file mode 100644 index 0000000..adeed6a --- /dev/null +++ b/src/old/xmlstringwriter.cpp @@ -0,0 +1,23 @@ +#include <stdio.h> +#include <stdlib.h> +#include "xmlstringwriter.h" + +XmlStringWriter::XmlStringWriter( const char *sIndent ) : + XmlWriter( sIndent ) +{ +} + +XmlStringWriter::~XmlStringWriter() +{ +} + +void XmlStringWriter::writeString( const char *sString ) +{ + sXml += sString; +} + +std::string &XmlStringWriter::getString() +{ + return sXml; +} + diff --git a/src/old/xmlstringwriter.h b/src/old/xmlstringwriter.h new file mode 100644 index 0000000..0d567b9 --- /dev/null +++ b/src/old/xmlstringwriter.h @@ -0,0 +1,50 @@ +#ifndef XML_STRING_WRITER +#define XML_STRING_WRITER + +#include "xmlnode.h" +#include "xmlwriter.h" + +/** + * Implements xml writing in the XML standard format. Also allows you to + * break that format and auto-indent your exported xml data for ease of + * reading. The auto-indenting will only be applied to sections that + * have no content of their own already. This means that except for + * whitespace all of your data will be preserved perfectly. + * You can create an XmlWriter object around a file, or access the static + * write function directly and just hand it a filename and a root XmlNode. + * When using an XmlWriter object the interface is identicle to that of + * the XmlDocument class, so reference that class for API info. However + * when the initial (or root) node is closed, and the document is finished + * the file will be created and written to automatically. The user can + * check to see if this is actually true by calling the isFinished + * function in the XmlDocument class. + *@author Mike Buland + */ +class XmlStringWriter : public XmlWriter +{ +public: + /** + * Construct a string writer using an internal string buffer. + *@param sIndent Optional indent to add to each line. + */ + XmlStringWriter( const char *sIndent=NULL ); + + /** + * Destroy the string writer and the internal string. + */ + virtual ~XmlStringWriter(); + + /** + * Get the string that was built. This is only valid after the document has + * been completed, so check isCompleted or be sure your addNode and + * closeNode calls match up. + *@returns A reference to the internal string object. + */ + std::string &getString(); + +private: + void writeString( const char *sString ); + std::string sXml; /**< The string object we "write" to. */ +}; + +#endif diff --git a/src/old/xmlwriter.cpp b/src/old/xmlwriter.cpp new file mode 100644 index 0000000..56880b6 --- /dev/null +++ b/src/old/xmlwriter.cpp @@ -0,0 +1,173 @@ +#include <stdio.h> +#include <stdlib.h> +#include "xmlwriter.h" + +XmlWriter::XmlWriter( const char *sIndent, XmlNode *pRoot ) : + XmlDocument( pRoot ) +{ + if( sIndent == NULL ) + { + this->sIndent = ""; + } + else + { + this->sIndent = sIndent; + } +} + +XmlWriter::~XmlWriter() +{ +} + +void XmlWriter::write() +{ + write( getRoot(), sIndent.c_str() ); +} + +void XmlWriter::write( XmlNode *pRoot, const char *sIndent ) +{ + writeNode( pRoot, 0, sIndent ); +} + +void XmlWriter::closeNode() +{ + XmlDocument::closeNode(); + + if( isCompleted() ) + { + write( getRoot(), sIndent.c_str() ); + } +} + +void XmlWriter::writeIndent( int nIndent, const char *sIndent ) +{ + if( sIndent == NULL ) return; + for( int j = 0; j < nIndent; j++ ) + { + writeString( sIndent ); + } +} + +std::string XmlWriter::escape( std::string sIn ) +{ + std::string sOut; + + std::string::const_iterator i; + for( i = sIn.begin(); i != sIn.end(); i++ ) + { + if( ((*i >= ' ' && *i <= '9') || + (*i >= 'a' && *i <= 'z') || + (*i >= 'A' && *i <= 'Z') ) && + (*i != '\"' && *i != '\'' && *i != '&') + ) + { + sOut += *i; + } + else + { + sOut += "&#"; + char buf[4]; + sprintf( buf, "%u", (unsigned char)*i ); + sOut += buf; + sOut += ';'; + } + } + + return sOut; +} + +void XmlWriter::writeNodeProps( XmlNode *pNode, int nIndent, const char *sIndent ) +{ + for( int j = 0; j < pNode->getNumProperties(); j++ ) + { + writeString(" "); + writeString( pNode->getPropertyName( j ) ); + writeString("=\""); + writeString( escape( pNode->getProperty( j ) ).c_str() ); + writeString("\""); + } +} + +void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const char *sIndent ) +{ + if( pNode->hasChildren() ) + { + writeIndent( nIndent, sIndent ); + writeString("<"); + writeString( pNode->getName() ); + writeNodeProps( pNode, nIndent, sIndent ); + if( sIndent ) + writeString(">\n"); + else + writeString(">"); + + if( pNode->getContent( 0 ) ) + { + writeIndent( nIndent+1, sIndent ); + if( sIndent ) + { + writeString( pNode->getContent( 0 ) ); + writeString("\n"); + } + else + writeString( pNode->getContent( 0 ) ); + } + + int nNumChildren = pNode->getNumChildren(); + for( int j = 0; j < nNumChildren; j++ ) + { + writeNode( pNode->getChild( j ), nIndent+1, sIndent ); + if( pNode->getContent( j+1 ) ) + { + writeIndent( nIndent+1, sIndent ); + if( sIndent ) + { + writeString( pNode->getContent( j+1 ) ); + writeString("\n"); + } + else + writeString( pNode->getContent( j+1 ) ); + } + } + + writeIndent( nIndent, sIndent ); + if( sIndent ) + { + writeString("</"); + writeString( pNode->getName() ); + writeString(">\n"); + } + else + { + writeString("</"); + writeString( pNode->getName() ); + writeString(">"); + } + } + else if( pNode->getContent() ) + { + writeIndent( nIndent, sIndent ); + writeString("<"); + writeString( pNode->getName() ); + writeNodeProps( pNode, nIndent, sIndent ); + writeString(">"); + writeString( pNode->getContent() ); + writeString("</"); + writeString( pNode->getName() ); + writeString(">"); + if( sIndent ) + writeString("\n"); + } + else + { + writeIndent( nIndent, sIndent ); + writeString("<"); + writeString( pNode->getName() ); + writeNodeProps( pNode, nIndent, sIndent ); + if( sIndent ) + writeString("/>\n"); + else + writeString("/>"); + } +} + diff --git a/src/old/xmlwriter.h b/src/old/xmlwriter.h new file mode 100644 index 0000000..c48e810 --- /dev/null +++ b/src/old/xmlwriter.h @@ -0,0 +1,96 @@ +#ifndef XMLWRITER +#define XMLWRITER + +#include "xmlnode.h" +#include "xmldocument.h" + +/** + * Implements xml writing in the XML standard format. Also allows you to + * break that format and auto-indent your exported xml data for ease of + * reading. The auto-indenting will only be applied to sections that + * have no content of their own already. This means that except for + * whitespace all of your data will be preserved perfectly. + * You can create an XmlWriter object around a file, or access the static + * write function directly and just hand it a filename and a root XmlNode. + * When using an XmlWriter object the interface is identicle to that of + * the XmlDocument class, so reference that class for API info. However + * when the initial (or root) node is closed, and the document is finished + * the file will be created and written to automatically. The user can + * check to see if this is actually true by calling the isFinished + * function in the XmlDocument class. + *@author Mike Buland + */ +class XmlWriter : public XmlDocument +{ +public: + /** + * Construct a standard XmlWriter. + *@param sIndent Set this to something other than NULL to include it as an + * indent before each node in the output that doesn't already have content. + * If you are using the whitespace stripping option in the XmlReader and set + * this to a tab or some spaces it will never effect the content of your + * file. + */ + XmlWriter( const char *sIndent=NULL, XmlNode *pRoot=NULL ); + + /** + * Destroy the writer. + */ + virtual ~XmlWriter(); + + /** + * This override of the parent class closeNode function calls the parent + * class, but also triggers a write operation when the final node is closed. + * This means that by checking the isCompleted() function the user may also + * check to see if their file has been written or not. + */ + void closeNode(); + + void write(); + +private: + std::string sIndent; /**< The indent string */ + + std::string escape( std::string sIn ); + + /** + * Write the file. + *@param pNode The root node + *@param sIndent The indent text. + */ + void write( XmlNode *pNode, const char *sIndent=NULL ); + + /** + * Write a node in the file, including children. + *@param pNode The node to write. + *@param nIndent The indent level (the number of times to include sIndent) + *@param sIndent The indent text. + */ + void writeNode( XmlNode *pNode, int nIndent, const char *sIndent ); + + /** + * Write the properties of a node. + *@param pNode The node who's properties to write. + *@param nIndent The indent level of the containing node + *@param sIndent The indent text. + */ + void writeNodeProps( XmlNode *pNode, int nIndent, const char *sIndent ); + + /** + * Called to write the actual indent. + *@param nIndent The indent level. + *@param sIndent The indent text. + */ + void writeIndent( int nIndent, const char *sIndent ); + + /** + * This is the function that must be overridden in order to use this class. + * It must write the null-terminated string sString, minus the mull, + * verbatum to it's output device. Adding extra characters for any reason + * will break the XML formatting. + *@param sString The string data to write to the output. + */ + virtual void writeString( const char *sString ) = 0; +}; + +#endif diff --git a/src/ordhash.cpp b/src/ordhash.cpp deleted file mode 100644 index 77cbd61..0000000 --- a/src/ordhash.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "ordhash.h" diff --git a/src/ordhash.h b/src/ordhash.h deleted file mode 100644 index e946f95..0000000 --- a/src/ordhash.h +++ /dev/null @@ -1,104 +0,0 @@ -#ifndef ORD_HASH_H -#define ORD_HASH_H - -#include "hash.h" -#include "tqsort.h" - -template<typename key, typename value, typename cmpfnc, typename sizecalc = __calcNextTSize_fast, typename keyalloc = std::allocator<key>, typename valuealloc = std::allocator<value>, typename challoc = std::allocator<uint32_t> > -class OrdHash : public Hash<key, value, sizecalc, keyalloc, valuealloc, challoc> -{ -public: - OrdHash() : - bSorted( false ), - aData( NULL ) - { - } - - virtual ~OrdHash() - { - } - -protected: - virtual void invalidate() - { - bSorted = false; - delete[] aData; - aData = NULL; - } - - virtual void onInsert() - { - invalidate(); - } - - virtual void onUpdate() - { - invalidate(); - } - - virtual void onDelete() - { - invalidate(); - } - - virtual void onReHash() - { - invalidate(); - } - - virtual std::pair<key,value> getAtPos( uint32_t nPos ) - { - return Hash<key, value, sizecalc, keyalloc, valuealloc, challoc>::getAtPos( aData[nPos].nIndex ); - } - - virtual void buildIndex() - { - aData = new struct ind[this->nFilled]; - uint32_t k = 0; - for( uint32_t j = 0; j < this->nCapacity; j++ ) - { - if( this->isFilled( j ) ) - { - if( !this->isDeleted( j ) ) - { - aData[k].pVal = &(this->aValues[j]); - aData[k].nIndex = j; - k++; - } - } - } - - tqsort<typename OrdHash<key, value, cmpfnc, sizecalc, keyalloc, valuealloc, challoc>::ind, cmpfnc, value **>( aData, this->nFilled ); - - bSorted = true; - } - - virtual uint32_t getFirstPos( bool &bFinished ) - { - if( bSorted == false ) - buildIndex(); - - return 0; - } - - virtual uint32_t getNextPos( uint32_t nPos, bool &bFinished ) - { - if( nPos+1 >= this->nFilled ) - { - bFinished = true; - return 0; - } - return ++nPos; - } -public: - typedef struct ind - { - value *pVal; - uint32_t nIndex; - } ind; -private: - bool bSorted; - ind *aData; -}; - -#endif diff --git a/src/paramproc.cpp b/src/paramproc.cpp deleted file mode 100644 index a352e66..0000000 --- a/src/paramproc.cpp +++ /dev/null @@ -1,514 +0,0 @@ -#include "paramproc.h" -#include <stdio.h> - -#define ptrtype( iitype, iiname ) \ - ParamProc::ParamPtr::ParamPtr( iitype *iiname ) : \ - type( vt ##iiname ) { val.iiname = iiname; } - -ParamProc::ParamPtr::ParamPtr() -{ - val.str = NULL; - type = vtunset; -} - -ptrtype( std::string, str ); -ptrtype( uint64_t, uint64 ); -ptrtype( uint32_t, uint32 ); -ptrtype( uint16_t, uint16 ); -ptrtype( uint8_t, uint8 ); -ptrtype( int64_t, int64 ); -ptrtype( int32_t, int32 ); -ptrtype( int16_t, int16 ); -ptrtype( int8_t, int8 ); -ptrtype( float, float32 ); -ptrtype( double, float64 ); -ptrtype( long double, float96 ); -ptrtype( bool, bln ); - -ParamProc::ParamPtr &ParamProc::ParamPtr::operator=( ParamProc::ParamPtr &ptr ) -{ - val = ptr.val; - type = ptr.type; - - return *this; -} - -bool ParamProc::ParamPtr::isSet() -{ - return type != vtunset; -} - -ParamProc::ParamPtr &ParamProc::ParamPtr::operator=( const char *str ) -{ - if( !isSet() ) return *this; - switch( type ) - { - case vtstr: - (*val.str) = str; - break; - - case vtuint64: - (*val.uint64) = strtoull( str, NULL, 10 ); - break; - - case vtuint32: - (*val.uint32) = strtoul( str, NULL, 10 ); - break; - - case vtuint16: - (*val.uint16) = (uint16_t)strtoul( str, NULL, 10 ); - break; - - case vtuint8: - (*val.uint8) = (uint8_t)strtoul( str, NULL, 10 ); - break; - - case vtint64: - (*val.int64) = strtoll( str, NULL, 10 ); - break; - - case vtint32: - (*val.int32) = strtol( str, NULL, 10 ); - break; - - case vtint16: - (*val.int16) = (int16_t)strtol( str, NULL, 10 ); - break; - - case vtint8: - (*val.int8) = (int8_t)strtol( str, NULL, 10 ); - break; - - case vtfloat32: - (*val.float32) = strtof( str, NULL ); - break; - - case vtfloat64: - (*val.float64) = strtod( str, NULL ); - break; - - case vtfloat96: - (*val.float96) = strtold( str, NULL ); - break; - - case vtbln: - if( strcasecmp("yes", str ) == 0 || - strcasecmp("true", str ) == 0 ) - { - (*val.bln) = true; - } - else - { - (*val.bln) = false; - } - break; - } - - return *this; -} - -ParamProc::ParamProc() -{ -} - -ParamProc::~ParamProc() -{ - for( std::list<ArgSpec *>::iterator i = lArg.begin(); - i != lArg.end(); i++ ) - { - delete *i; - } - - for( std::list<Banner *>::iterator i = lBan.begin(); - i != lBan.end(); i++ ) - { - delete *i; - } - -} -/* -void ParamProc::addParam( const char *lpWord, char cChar, Proc proc, ParamPtr val ) -{ - printf("Calling callback...\n"); - val = "Hello there, this is set in the ParamProc"; - (this->*proc)(); -}*/ - -void ParamProc::addParam( const char *lpWord, char cChar, Proc proc, - ParamPtr val, const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - ArgSpec *as = new ArgSpec; - if( lpWord ) - as->sWord = lpWord; - - as->cChar = cChar; - as->proc = proc; - as->val = val; - if( lpDesc ) - as->sDesc = lpDesc; - if( lpExtra ) - as->sExtra = lpExtra; - if( lpValue ) - as->sValue = lpValue; - - lArg.push_back( as ); - - if( !lBan.empty() ) - { - if( lBan.back()->pBefore == NULL ) - lBan.back()->pBefore = as; - } -} - -void ParamProc::addParam( const char *lpWord, char cChar, Proc proc, - const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - addParam( lpWord, cChar, proc, ParamPtr(), lpDesc, lpExtra, lpValue ); -} - -void ParamProc::addParam( const char *lpWord, char cChar, ParamPtr val, - const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - addParam( lpWord, cChar, NULL, val, lpDesc, lpExtra, lpValue ); -} - -void ParamProc::addParam( const char *lpWord, Proc proc, ParamPtr val, - const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - addParam( lpWord, '\0', proc, val, lpDesc, lpExtra, lpValue ); -} - -void ParamProc::addParam( const char *lpWord, Proc proc, - const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - addParam( lpWord, '\0', proc, ParamPtr(), lpDesc, lpExtra, lpValue ); -} - -void ParamProc::addParam( const char *lpWord, ParamPtr val, - const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - addParam( lpWord, '\0', NULL, val, lpDesc, lpExtra, lpValue ); -} - -void ParamProc::addParam( char cChar, Proc proc, ParamPtr val, - const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - addParam( NULL, cChar, proc, val, lpDesc, lpExtra, lpValue ); -} - -void ParamProc::addParam( char cChar, Proc proc, - const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - addParam( NULL, cChar, proc, ParamPtr(), lpDesc, lpExtra, lpValue ); -} - -void ParamProc::addParam( char cChar, ParamPtr val, - const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - addParam( NULL, cChar, NULL, val, lpDesc, lpExtra, lpValue ); -} - -void ParamProc::process( int argc, char *argv[] ) -{ - for( int arg = 1; arg < argc; arg++ ) - { - //printf(":::%d:::%s\n", arg, argv[arg] ); - if( argv[arg][0] == '-' ) - { - if( argv[arg][1] == '-' ) - { - ArgSpec *s = checkWord( argv[arg]+2 ); - if( s ) - { - if( argv[arg][s->sWord.getLength()+2] == '=' ) - { - if( s->val.isSet() ) - { - if( s->sValue.getString() == NULL ) - { - s->val = argv[arg]+s->sWord.getLength()+3; - } - else - { - s->val = s->sValue.getString(); - } - } - if( s->proc ) - { - char **tmp = new char*[argc-arg]; - tmp[0] = argv[arg]+s->sWord.getLength()+3; - for( int k = 1; k < argc-arg; k++ ) - tmp[k] = argv[arg+k]; - int ret = (this->*s->proc)( argc-arg, tmp ); - if( ret > 0 ) - { - arg += ret-1; - } - delete tmp; - } - } - else - { - int add = 0; - if( s->val.isSet() ) - { - if( s->sValue.getString() == NULL ) - { - if( arg+1 >= argc ) - { - return; - } - s->val = argv[arg+1]; - add++; - } - else - { - s->val = s->sValue.getString(); - } - } - if( s->proc ) - { - int ret = (this->*s->proc)( - argc-arg-1, argv+arg+1 ); - - if( ret > add ) - add = 0; - else - add -= ret; - arg += ret; - } - arg += add; - } - continue; - } - else - { - unknownParam( argc-arg, argv+arg ); - } - } - else - { - for( int chr = 1; argv[arg][chr]; chr++ ) - { - ArgSpec *s = checkLetr( argv[arg][chr] ); - if( s ) - { - if( argv[arg][chr+1] != '\0' ) - { - bool bUsed = false; - if( s->val.isSet() ) - { - if( s->sValue.getString() == NULL ) - { - s->val = argv[arg]+chr+1; - bUsed = true; - } - else - { - s->val = s->sValue.getString(); - } - } - if( s->proc ) - { - char **tmp = new char*[argc-arg]; - tmp[0] = argv[arg]+chr+1; - for( int k = 1; k < argc-arg; k++ ) - tmp[k] = argv[arg+k]; - int ret = (this->*s->proc)( argc-arg, tmp ); - if( ret > 0 ) - { - arg += ret - 1; - delete tmp; - break; - } - delete tmp; - } - if( bUsed ) - { - break; - } - } - else - { - bool bUsed = false; - if( s->val.isSet() ) - { - if( s->sValue.getString() == NULL ) - { - s->val = argv[arg+1]; - bUsed = true; - } - else - { - s->val = s->sValue.getString(); - } - } - if( s->proc ) - { - int ret = (this->*s->proc)( - argc-arg-1, argv+arg+1 - ); - if( ret > 0 ) - { - arg += ret; - break; - } - } - if( bUsed ) - { - arg++; - break; - } - } - } - else - { - unknownParam( argc-arg, argv+arg ); - } - } - } - } - else - { - cmdParam( argc-arg, argv+arg ); - } - } -} - -ParamProc::ArgSpec *ParamProc::checkWord( const char *arg ) -{ - //printf("Checking \"%s\"...\n", arg ); - std::list<ArgSpec *>::const_iterator i; - for( i = lArg.begin(); i != lArg.end(); i++ ) - { - if( (*i)->sWord.getString() == NULL ) - continue; - - if( !strcmp( (*i)->sWord, arg ) ) - return *i; - - if( (*i)->val.isSet() ) - { - if( !strncmp( (*i)->sWord, arg, (*i)->sWord.getLength() ) && - arg[(*i)->sWord.getLength()] == '=' ) - { - return *i; - } - } - } - - return NULL; -} - -ParamProc::ArgSpec *ParamProc::checkLetr( const char arg ) -{ - //printf("Checking \'%c\'...\n", arg ); - std::list<ArgSpec *>::const_iterator i; - for( i = lArg.begin(); i != lArg.end(); i++ ) - { - if( (*i)->cChar == '\0' ) - continue; - - if( (*i)->cChar == arg ) - { - return *i; - } - } - - return NULL; -} - -int ParamProc::cmdParam( int argc, char *argv[] ) -{ - printf("Unhandled command parameter \"%s\" found!\n", argv[0] ); - return 0; -} - -int ParamProc::unknownParam( int argc, char *argv[] ) -{ - printf("Unknown parameter \"%s\" found!\n", argv[0] ); - return 0; -} - -int ParamProc::help( int argc, char *argv[] ) -{ - std::list<Banner *>::const_iterator b = lBan.begin(); - std::list<ArgSpec *>::const_iterator i; - int len=0; - for( i = lArg.begin(); i != lArg.end(); i++ ) - { - if( len < (*i)->sWord.getLength() + (*i)->sExtra.getLength() ) - len = (*i)->sWord.getLength() + (*i)->sExtra.getLength(); - } - char fmt[10]; - sprintf( fmt, "%%-%ds ", len ); - - for( i = lArg.begin(); i != lArg.end(); i++ ) - { - if( b != lBan.end() ) - { - if( (*b)->pBefore == (*i) ) - { - printf( (*b)->sBanner.getString() ); - b++; - } - } - printf(" "); - if( (*i)->cChar ) - { - if( (*i)->sWord.getString() ) - { - printf("-%c, ", (*i)->cChar ); - } - else - { - printf("-%c ", (*i)->cChar ); - } - } - else - { - printf(" "); - } - if( (*i)->sWord.getString() ) - { - printf("--"); - std::string sTmp = (*i)->sWord.getString(); - if( (*i)->sExtra.getString() ) - sTmp += (*i)->sExtra.getString(); - printf( fmt, sTmp.c_str() ); - } - else - { - printf(" "); - printf(fmt, "" ); - } - printf("%s\n", (*i)->sDesc.getString() ); - } - if( b != lBan.end() ) - { - if( (*b)->pBefore == NULL ) - { - printf( (*b)->sBanner.getString() ); - } - } - - exit( 0 ); -} - -void ParamProc::addHelpBanner( const char *sHelpBanner ) -{ - Banner *pBan = new Banner; - pBan->sBanner = sHelpBanner; - pBan->pBefore = NULL; - lBan.push_back( pBan ); -} - diff --git a/src/paramproc.h b/src/paramproc.h deleted file mode 100644 index d857193..0000000 --- a/src/paramproc.h +++ /dev/null @@ -1,153 +0,0 @@ -#ifndef PARAM_PROC_H -#define PARAM_PROC_H - -#include <stdint.h> -#include <string> -#include <list> -#include "staticstring.h" - -class ParamProc -{ -public: - class ParamPtr - { - public: - ParamPtr(); - ParamPtr( std::string *str ); - ParamPtr( uint64_t *uint64 ); - ParamPtr( uint32_t *uint32 ); - ParamPtr( uint16_t *uint16 ); - ParamPtr( uint8_t *uint8 ); - ParamPtr( int64_t *int64 ); - ParamPtr( int32_t *int32 ); - ParamPtr( int16_t *int16 ); - ParamPtr( int8_t *int8 ); - ParamPtr( float *float32 ); - ParamPtr( double *float64 ); - ParamPtr( long double *float96 ); - ParamPtr( bool *bln ); - - enum - { - vtunset, - vtstr, - vtuint64, - vtuint32, - vtuint16, - vtuint8, - vtint64, - vtint32, - vtint16, - vtint8, - vtfloat32, - vtfloat64, - vtfloat96, - vtbln, - }; - ParamPtr &operator=( ParamPtr &ptr ); - ParamPtr &operator=( const char *str ); - - bool isSet(); - - private: - int type; - union - { - std::string *str; - uint64_t *uint64; - uint32_t *uint32; - uint16_t *uint16; - uint8_t *uint8; - int64_t *int64; - int32_t *int32; - int16_t *int16; - int8_t *int8; - float *float32; - double *float64; - long double *float96; - bool *bln; - } val; - }; - - typedef int (ParamProc::*Proc)( int, char *[] ); - - typedef struct ArgSpec - { - uint8_t nFlags; - StaticString sWord; - char cChar; - Proc proc; - ParamProc::ParamPtr val; - StaticString sExtra; - StaticString sDesc; - StaticString sValue; - } ArgSpec; - -public: - ParamProc(); - virtual ~ParamProc(); - - void addParam( const char *lpWord, char cChar, Proc proc, ParamPtr val, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - void addParam( const char *lpWord, char cChar, Proc proc, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - void addParam( const char *lpWord, char cChar, ParamPtr val, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - - void addParam( const char *lpWord, Proc proc, ParamPtr val, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - void addParam( const char *lpWord, Proc proc, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - void addParam( const char *lpWord, ParamPtr val, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - - void addParam( char cChar, Proc proc, ParamPtr val, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - void addParam( char cChar, Proc proc, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - void addParam( char cChar, ParamPtr val, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - - void process( int argc, char *argv[] ); - void addHelpBanner( const char *sHelpBanner ); - -private: - ArgSpec *checkWord( const char *arg ); - ArgSpec *checkLetr( const char arg ); - -public: - virtual int cmdParam( int argc, char *argv[] ); - virtual int unknownParam( int argc, char *argv[] ); - virtual int help( int argc, char *argv[] ); - -private: - typedef struct Banner - { - StaticString sBanner; - ArgSpec *pBefore; - } Banner; - std::list<Banner *> lBan; - std::list<ArgSpec *> lArg; -}; - -#define mkproc( cls ) static_cast<int (ParamProc::*)( int, char *[])>(&cls) - -#endif diff --git a/src/plugger.cpp b/src/plugger.cpp deleted file mode 100644 index f3bfa67..0000000 --- a/src/plugger.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "plugger.h" diff --git a/src/plugger.h b/src/plugger.h deleted file mode 100644 index d92f194..0000000 --- a/src/plugger.h +++ /dev/null @@ -1,198 +0,0 @@ -#ifndef PLUGGER_H -#define PLUGGER_H - - -#include "hashtable.h" -#include "list" -#include "hashfunctionstring.h" -#include "hashfunctionint.h" -#include "dlfcn.h" -#include "exceptions.h" - -typedef struct PluginInfo -{ - const char *sID; - const char *sAuthor; - unsigned short nVersion; - unsigned short nRevision; - void *(*createPlugin)(); - void (*destroyPlugin)( void * ); -} PluginInfo; - -typedef struct PluginReg -{ - bool bBuiltin; - void *dlHandle; - PluginInfo *pInfo; -} PluginReg; - -#define PluginInterface( classname, baseclass, name, ver, rev ) \ -extern "C" { \ - baseclass *create ##classname() \ - { \ - return new classname(); \ - } \ - void destroy ##classname( baseclass *pCls ) \ - { \ - delete pCls; \ - } \ - PluginInfo classname = { \ - #classname, name, ver, rev, \ - create ##classname, destroy ##classname }; \ -} - -#define PluginInterface2( pluginname, classname, baseclass, name, ver, rev ) \ -extern "C" { \ - baseclass *create ##classname() \ - { \ - return new classname(); \ - } \ - void destroy ##classname( baseclass *pCls ) \ - { \ - delete pCls; \ - } \ - PluginInfo pluginname = { \ - #pluginname, name, ver, rev, \ - (void *(*)())(create ##classname), \ - (void (*)( void * ))(destroy ##classname) }; \ -} - -#define PluginInterface3( structname, pluginname, classname, baseclass, name, ver, rev ) \ -extern "C" { \ - baseclass *create ##classname() \ - { \ - return new classname(); \ - } \ - void destroy ##classname( baseclass *pCls ) \ - { \ - delete pCls; \ - } \ - PluginInfo structname = { \ - #pluginname, name, ver, rev, \ - (void *(*)())(create ##classname), \ - (void (*)( void * ))(destroy ##classname) }; \ -} - -template<class T> -class Plugger -{ -public: - -public: - Plugger() : - hPlugin( new HashFunctionString(), 11 ), - hObj( new HashFunctionInt(), 11 ) - { - } - - virtual ~Plugger() - { - void *pos = hObj.getFirstItemPos(); - while( (pos = hObj.getNextItemPos( pos )) ) - { - T *pPlug = (T *)hObj.getItemID( pos ); - PluginReg *pReg = (PluginReg *)hObj.getItemData( pos ); - pReg->pInfo->destroyPlugin( pPlug ); - } - - std::list<PluginReg *>::iterator i; - for( i = lPlugin.begin(); i != lPlugin.end(); i++ ) - { - if( (*i)->bBuiltin == false ) - { - dlclose( (*i)->dlHandle ); - } - delete (*i); - } - } - - void registerBuiltinPlugin( PluginInfo *pInfo ) - { - PluginReg *pReg = new PluginReg; - pReg->bBuiltin = true; - pReg->pInfo = pInfo; - lPlugin.insert( lPlugin.end(), pReg ); - hPlugin.insert( pInfo->sID, pReg ); - } - - void registerExternalPlugin( const char *sFName, const char *sPluginName ) - { - PluginReg *pReg = (PluginReg *)hPlugin[sPluginName]; - if( pReg != NULL ) - { - hPlugin.del( sPluginName ); - dlclose( pReg->dlHandle ); - delete pReg; - pReg = NULL; - } - - pReg = new PluginReg; - - pReg->bBuiltin = false; - pReg->dlHandle = dlopen( sFName, RTLD_NOW ); - if( pReg->dlHandle == NULL ) - { - throw PluginException( 1, "Error on %s: %s", sFName, dlerror() ); - } - pReg->pInfo = (PluginInfo *)dlsym( pReg->dlHandle, sPluginName ); - if( pReg->pInfo == NULL ) - { - throw PluginException( 2, "Error on %s: %s", sFName, dlerror() ); - } - hPlugin.insert( pReg->pInfo->sID, pReg ); - lPlugin.insert( lPlugin.end(), pReg ); - } - - T *instantiate( const char *lpName ) - { - PluginReg *pReg = (PluginReg *)hPlugin[lpName]; - if( pReg == NULL ) - return NULL; - - T *p = (T *)pReg->pInfo->createPlugin(); - hObj.insert( p, pReg ); - //printf("pReg: %08X, pPlug: %08X\n", pReg, p ); - - return p; - } - - bool hasPlugin( const char *lpName ) - { - if( hPlugin[lpName] == NULL ) - return false; - return true; - } - - void destroy( T *pPlug ) - { - PluginReg *pReg = (PluginReg *)hObj[pPlug]; - //printf("pReg: %08X, pPlug: %08X\n", pReg, pPlug ); - if( pReg == NULL ) - return; - - pReg->pInfo->destroyPlugin( pPlug ); - - hObj.del( pPlug ); - } - - void unloadAll() - { - std::list<PluginReg *>::iterator i; - for( i = lPlugin.begin(); i != lPlugin.end(); i++ ) - { - if( (*i)->bBuiltin == false ) - { - dlclose( (*i)->dlHandle ); - } - delete (*i); - } - hPlugin.clear(); - } - -private: - std::list<PluginReg *> lPlugin; - HashTable hPlugin; - HashTable hObj; -}; - -#endif diff --git a/src/pqueue.cpp b/src/pqueue.cpp deleted file mode 100644 index 1f0b8b5..0000000 --- a/src/pqueue.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include "pqueue.h" - -PQueue::PQueue( int nNewNumQueues ) -{ - nNumQueues = nNewNumQueues; - aQueue = new Queue[nNumQueues]; -} - -PQueue::~PQueue() -{ - delete[] aQueue; -} - -void PQueue::enqueue( void *pData, int nQueueLevel ) -{ - if( nQueueLevel < 0 || nQueueLevel >= nNumQueues ) - return; - - aQueue[nQueueLevel].enqueue( pData ); -} - -void *PQueue::dequeue() -{ - for( int j = 0; j < nNumQueues; j++ ) - { - if( aQueue[j].isEmpty() == false ) - { - return aQueue[j].dequeue(); - } - } - - return NULL; -} diff --git a/src/pqueue.h b/src/pqueue.h deleted file mode 100644 index 8307d56..0000000 --- a/src/pqueue.h +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef PQUEUE_H -#define PQUEUE_H - -#include "queue.h" - -/** Priority queue. This is just like a queue, but something with a higher - * priority will always come off the queue before something with a lower - * priority, even if it's added after. Otherwise works just like a queue. - *@author Mike Buland - */ -class PQueue -{ -public: - /** Create a queue with any number of different priorities. - *@param nNewNumQueues The number of queues, the default is 3 - */ - PQueue( int nNewNumQueues=3 ); - - /** - * Cleanup all contained queues. - */ - virtual ~PQueue(); - - /** Add a new item to the queue at the specified priority. A lower - * number means a higher priority! - *@param pData A pointer to the data to add to the queue - *@param nQueueLevel The priority to set the new data to - */ - void enqueue( void *pData, int nQueueLevel ); - - /** Pull the next item off the queue, high priority first. - *@returns A pointer to the data that was next in the priority queue - */ - void *dequeue(); - -private: - /** - * The queues we use for real data storage. - */ - Queue *aQueue; - - /** - * The number of priorities or queus that we need. - */ - int nNumQueues; -}; - -#endif diff --git a/src/programchain.cpp b/src/programchain.cpp deleted file mode 100644 index 6120d58..0000000 --- a/src/programchain.cpp +++ /dev/null @@ -1,96 +0,0 @@ -#include <stdlib.h> -#include "programchain.h" - -ProgramChain::ProgramChain() : - xLog( MultiLog::getInstance() ) -{ - xLog.LineLog( MultiLog::LStatus, "Program Chain Initialized." ); -} - -ProgramChain::~ProgramChain() -{ -} - -bool ProgramChain::addLink( ProgramLink *pLink ) -{ - if( pLink->init() == false ) - { - emergencyShutdown(); - return false; - } - - lLink.append( pLink ); - - pLink->setChain( this ); - - return true; -} - -ProgramLink *ProgramChain::getLink( const char *lpName ) -{ - char a; - a = lpName[0]; - return NULL; -} - -ProgramLink *ProgramChain::getBaseLink() -{ - return NULL; -} - -bool ProgramChain::execChainOnce() -{ - int nLen = lLink.getSize(); - for( int j = 0; j < nLen; j++ ) - { - if( ((ProgramLink *)lLink[j])->timeSlice() == false ) - { - xLog.LineLog( MultiLog::LInfo, "Shutting down due to signal from link #%d", j ); - emergencyShutdown(); - return false; - } - } - - return true; -} - -bool ProgramChain::enterChainLoop() -{ - for(;;) - { - if( execChainOnce() == false ) - { - return false; - } - } - - return true; -} - -void ProgramChain::emergencyShutdown() -{ - int nLen = lLink.getSize(); - for( int j = 0; j < nLen; j++ ) - { - ((ProgramLink *)lLink[j])->deInit(); - delete (ProgramLink *)lLink[j]; - } - lLink.empty(); -} - -LinkMessage *ProgramChain::broadcastIRM( LinkMessage *pMsgOut, ProgramLink *pSender ) -{ - int nLen = lLink.getSize(); - for( int j = 0; j < nLen; j++ ) - { - LinkMessage *pMsg = ((ProgramLink *)lLink[j])->processIRM( pMsgOut ); - if( pMsg != NULL ) - { - delete pMsgOut; - return pMsg; - } - } - - delete pMsgOut; - return NULL; -} diff --git a/src/programchain.h b/src/programchain.h deleted file mode 100644 index 2bdfeee..0000000 --- a/src/programchain.h +++ /dev/null @@ -1,95 +0,0 @@ -#ifndef PROGRAMCHAIN_H -#define PROGRAMCHAIN_H - -#include "linkedlist.h" -#include "multilog.h" -#include "programlink.h" - -/** - * The Program Chain links together program "chunks" to more easily facilitate - * a generalized program loop with modular extensions. - *@author Mike Buland - */ -class ProgramChain -{ -public: - /** - * Construct an empty chain. - */ - ProgramChain(); - - /** - * Destroy your chain. - */ - virtual ~ProgramChain(); - - /** - * Adds a link to the end of the chain. - *@param pLink A pointer to the link to add to the chain. - *@returns True if adding the link was successful, otherwise false - *@author Mike Buland - */ - bool addLink( ProgramLink *pLink ); - - /** - * Gets a link by name. - *@param lpName The name of the link you're looking for. Every link has a - * name, apparently. - *@returns A pointer to the specified ProgramLink, or NULL if none were - * found matching your criteria. - *@author Mike Buland - */ - class ProgramLink *getLink( const char *lpName ); - - /** - * Gets the very first link in the chain. - *@returns A pointer to the first link in the chain. - *@author Mike Buland - */ - class ProgramLink *getBaseLink(); - - /** - * Runs through the chain once. Useful if you want to have more control - * over the operation of the chain. - *@returns true if every link returned true. If at least one link returns - * false, then returns false. - *@author Mike Buland - */ - bool execChainOnce(); - - /** - * Enters the master chain loop, looping over the entire chain and - * executing every link's TimeSlice routine in order, over and over, until - * a link returns a false value. - *@returns False, always. It returns true unless a link returned false, - * but loops until a link does return false. - *@author Mike Buland - **/ - bool enterChainLoop(); - - /** - * Broadcasts an Immediate Response Message to all active links, save the - * sender. Whatever link first responds with a non-null response message - * will have it's messages sent back to the broadcasting link as the returns - * of this function call. Therefore it is very important that all message - * processing code is handled in a fairly timely fasion. - *@param pMsgOut The message to broadcast in hopes of a response. - *@param pSender The message that sent out the message and doesn't want to - * receive it's own message. This should always just be "this". - *@returns The message that was returned by the first link to return a - * non-null response. If all messages return null responses then this also - * returns null. Please note that whoever calls this will be responsible - * for deleting the message returned by it, if non-null. - */ - class LinkMessage *broadcastIRM( LinkMessage *pMsgOut, ProgramLink *pSender ); - -private: - /** - * Shuts down all operation no matter what point in the operation we were. - */ - void emergencyShutdown(); - MultiLog &xLog; /**< A reference to the log. */ - LinkedList lLink; /**< The linked list that contains all of the links. */ -}; - -#endif diff --git a/src/programlink.cpp b/src/programlink.cpp deleted file mode 100644 index 21c6fe4..0000000 --- a/src/programlink.cpp +++ /dev/null @@ -1,54 +0,0 @@ -#include "programlink.h" -#include "programchain.h" - -ProgramLink::ProgramLink() -{ -} - -ProgramLink::~ProgramLink() -{ -} - -LinkMessage *ProgramLink::sendIRM( LinkMessage *pMsgOut ) -{ - return pChain->broadcastIRM( pMsgOut, this ); -} - -void ProgramLink::setChain( ProgramChain *pNewChain ) -{ - pChain = pNewChain; -} - -/* -void ProgramLink::postMessage( LinkMessage *pMsg, int nLvl ) -{ - if( nLvl == msgToChain ) - { - qMsgToChain.enqueue( pMsg ); - } - else if( nLvl == msgToLink ) - { - qMsgToLink.enqueue( pMsg ); - } - else - { - // ERROR! - } -} - -LinkMessage *ProgramLink::getMessage( int nLvl ) -{ - if( nLvl == msgToChain ) - { - return (LinkMessage *)qMsgToChain.dequeue(); - } - else if( nLvl == msgToLink ) - { - return (LinkMessage *)qMsgToLink.dequeue(); - } - else - { - // ERROR! - } -} -*/ diff --git a/src/programlink.h b/src/programlink.h deleted file mode 100644 index f93edcc..0000000 --- a/src/programlink.h +++ /dev/null @@ -1,99 +0,0 @@ -#ifndef PROGRAMLINK_H -#define PROGRAMLINK_H - -class ProgramLink; -#include "queue.h" -#include "linkmessage.h" -#include "programchain.h" - -/** - * Program Link is the base class for any object that will be a piece of the - * main program chain loop. - *@author Mike Buland - */ -class ProgramLink -{ -friend class ProgramChain; -public: - /** - * Construct a program link. - */ - ProgramLink(); - - /** - * Deconstruct. - */ - virtual ~ProgramLink(); - - /** - * Initialization code required for a link that wasn't performed in the - * constructor. - *@returns true if initialization was successful. A false value will halt - * the chain. - */ - virtual bool init()=0; - - /** - * DeInitialization code that should happen, but doesn't belong in the - * destructor. - *@returns true means everything worked, false means failure, but is - * meaningless. - */ - virtual bool deInit()=0; - - /** - * Executed once per link per chain pass. Contains the guts of the program. - *@returns true if everything went well. A false value will halt the chain. - */ - virtual bool timeSlice()=0; - - /** - * This must be handled in order to process Instant Response Messages. - * This function should return null on all messages that it doesn't - * understand how to handle, and construct new messages to return to sender - * in the cases where it does understand. - *@param pMsgIn The message that must be processed. - *@returns Either a new message in cases where a response is required, - * or null if nothing needs to be done by this link. - */ - virtual LinkMessage *processIRM( LinkMessage *pMsgIn ) = 0; - - /** - * Broadcast a LinkMessage to all other links in the system. Each other - * link will get a call of their processIRM function. If the message gets - * a response then you will regain control immediately, otherwise the system - * will give all other Links a chance to respond before returning NULL. - *@param pMsgOut The message to broadcast. - *@returns The message response, or NULL if no Link understood your message. - */ - LinkMessage *sendIRM( LinkMessage *pMsgOut ); - -private: - /** - * Set which chain we're assosiated with. This is how IRM messages make - * it out to the rest of the world. - *@param pNewChain A pointer to the containing program chain. - */ - void setChain( class ProgramChain *pNewChain ); - - /** - * The pointer to the containing chain. - */ - class ProgramChain *pChain; -/* - void postMessage( LinkMessage *pMsg, int nLvl ); - LinkMessage *getMessage( int nLvl ); - - enum - { - msgToChain, - msgToLink - }; - -private: - Queue qMsgToChain; - Queue qMsgToLink; -*/ -}; - -#endif diff --git a/src/protocol.cpp b/src/protocol.cpp deleted file mode 100644 index 78b3ee2..0000000 --- a/src/protocol.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "protocol.h" - -Protocol::Protocol() -{ - pConnection = NULL; -} - -Protocol::~Protocol() -{ -} - -void Protocol::setConnection( Connection *pNewConnection ) -{ - pConnection = pNewConnection; -} - -Connection *Protocol::getConnection() -{ - return pConnection; -} diff --git a/src/protocol.h b/src/protocol.h deleted file mode 100644 index 09e1c98..0000000 --- a/src/protocol.h +++ /dev/null @@ -1,62 +0,0 @@ -#ifndef PROTOCOL_H -#define PROTOCOL_H - -#include "connection.h" - -/** This is the template for a class that handles specialized input and output - * to connections of different types with different protocols. - *@author Mike Buland - */ -class Protocol -{ -public: - /** Constructor */ - Protocol(); - /** Deconstructor */ - virtual ~Protocol(); - - /** - * Function is called every time there is new data on the line. This is - * called directly from the Connection class to process data. This is not - * called whever there is pending data on the input, but every time new data - * is added to the input buffer. - *@returns True if processing went alright, false if something went wrong, - * I suppose. In truth this value is thrown away right now. - *@todo Either make a return value of false mean something, or make these - * void. - */ - virtual bool onNewData()=0; - - /** - * Function is called when there is a new connection. This should only - * happen once per Protocol object, but gives each protocol object a - * chance to perform connection handshaking and initialization at a point - * where they know that they have a handle to an active Connection. - *@returns See onNewData - */ - virtual bool onNewConnection()=0; - - virtual void onNewClientConnection(){}; - - virtual void poll(){}; - - /** - * Sets the Protocol's Connection object. This is rather important, and - * handled usually by the ConnectionManager. - *@param pNewConnection The Connection object that this protocol will use to - * deal with the outside world. - */ - void setConnection( class Connection *pNewConnection ); - - /** - * Get a pointer to this object's Connection object, or NULL if one was - * never set. If used with the ConnectionManager that should never happen. - *@returns A pointer to the active Connection. - */ - Connection *getConnection(); - -private: - class Connection *pConnection; /**< The pointer to the Connection. */ -}; - -#endif diff --git a/src/protocoltelnet.cpp b/src/protocoltelnet.cpp deleted file mode 100644 index b169a51..0000000 --- a/src/protocoltelnet.cpp +++ /dev/null @@ -1,316 +0,0 @@ -#include "protocoltelnet.h" -#include <string.h> - -ProtocolTelnet::ProtocolTelnet() -{ - nTermType = termUnInited; - bEchoOn = true; -} - -ProtocolTelnet::~ProtocolTelnet() -{ -} - -bool ProtocolTelnet::onNewConnection() -{ - Connection *pCon = getConnection(); - - pCon->appendOutput( (char)IAC ); - pCon->appendOutput( (char)WILL ); - pCon->appendOutput( (char)SUPPRESSGA ); - - pCon->appendOutput( (char)IAC ); - pCon->appendOutput( (char)DO ); - pCon->appendOutput( (char)SUPPRESSGA ); - - pCon->appendOutput( (char)IAC ); - pCon->appendOutput( (char)DONT ); - pCon->appendOutput( (char)TERMTYPE ); - -// pCon->appendOutput( IAC ); -// pCon->appendOutput( SB ); -// pCon->appendOutput( TERMTYPE ); -// pCon->appendOutput( 1 ); -// pCon->appendOutput( IAC ); -// pCon->appendOutput( SE ); - - pCon->appendOutput( (char)IAC ); - pCon->appendOutput( (char)DONT ); - pCon->appendOutput( (char)ECHO ); - - pCon->appendOutput( (char)IAC ); - pCon->appendOutput( (char)WILL ); - pCon->appendOutput( (char)ECHO ); - -// 255(IAC),251(WILL),3 - return true; -} - -bool ProtocolTelnet::onNewData() -{ - Connection *pCon = getConnection(); - if( !pCon->hasInput() ) - { - return true; - } - - int nInSize = pCon->getInputAmnt(); - char *lpInStr = (char *)pCon->getInput(); - - // Here we interpret the basic commands and un-encapsulate them, so to - // speak. We'll allow this, even if the terminal is in raw mode, we - // just won't send anything in response... - for( int j = 0; j < nInSize; j++ ) - { - switch( (unsigned char)lpInStr[j] ) - { - case '\r': - fbEdited.appendData('\n'); - if( bEchoOn ) pCon->appendOutput("\n\r"); - break; - - case '\n': - break; - - case '\177': // backspace - if( fbEdited.getLength() > 0 ) - { - fbEdited.usedData( -1 ); // Delete one char from the end - if( bEchoOn ) pCon->appendOutput(ESC "[D"); // Move the cursor back one - if( bEchoOn ) pCon->appendOutput(ESC "[P"); // Delete one character - } - break; - - case '\x1B': // escape sequence - if( (unsigned char)lpInStr[j+1] == '[' ) - { - switch( (unsigned char)lpInStr[j+2] ) - { - case 'A': // Up - break; - - case 'B': // Down - break; - - case 'C': // Right - break; - - case 'D': // Left - break; - } - j+=2; - } - break; - - case 0: // NOP: No operation - break; - - case IAC: // IAC: Interpret as command - switch( lpInStr[j+1] ) - { - case SE: // SE: End of subnegotiation parameters. - break; - - case NOP: // NOP: No operation - break; - - case DM: // DM: Data mark. Indicates the position of a Synch event within the data stream. This should always be accompanied by a TCP urgent notification. - break; - - case BRK: // BRK: Break. Indicates that the "break" or "attention" key was hit. - break; - - case IP: // IP: Suspend, interrupt or abort the process to which the NVT is connected. - break; - - case AO: // AO: Abort output. Allows the current process to run to completion but do not send its output to the user. - break; - - case AYT: // AYT: Are you there. Send back to the NVT some visible evidence that the AYT was received. - break; - - case EC: // EC: Erase character. The receiver should delete the last preceding undeleted character from the data stream. - break; - - case EL: // EL: Erase line. Delete characters from the data stream back to but not including the previous CRLF. - break; - - case GA: // GA: Go ahead. Used, under certain circumstances, to tell the other end that it can transmit. - break; - - case SB: // SB: Subnegotiation of the indicated option follows. - switch( lpInStr[j+2] ) - { - case TERMTYPE: - if( lpInStr[j+3] == 0 ) - { - for( int k = 0; j+4+k < nInSize; k++ ) - { - if( (unsigned char)lpInStr[j+4+k] == IAC && - (unsigned char)lpInStr[j+5+k] == SE ) - { - lpInStr[j+4+k] = 0; - //@TODO: Do something with the term type... - printf("Term type: %s\n", &lpInStr[j+4] ); - j += 5+k; - } - } - } - else - { - } - break; - - default: - //printf("unknown subnegotiation parameters! (%d)\n", lpInStr[j+2] ); - break; - } - break; - - case WILL: // WILL: Indicates the desire to begin performing - switch( lpInStr[j+2] ) - { - case SUPPRESSGA: - j += 2; -// pCon->usedInput( 3 ); - break; - - case TERMTYPE: - j += 2; -// pCon->usedInput( 3 ); - break; - - case ECHO: - j += 2; -// pCon->usedInput( 3 ); - break; - - case NAWS: - default: - pCon->appendOutput( (char)ESC[0] ); - pCon->appendOutput( (char)DONT ); - pCon->appendOutput( lpInStr[j+2] ); - //printf("unknown will command used! (%d)\n", lpInStr[j+2] ); - j += 2; - break; - } - break; - - case WONT: // WONT: Indicates the refusal to perform - switch( lpInStr[j+2] ) - { - case ECHO: - j += 2; -// pCon->usedInput( 3 ); - break; - - default: - //printf("unknown wont command used! (%d)\n", lpInStr[j+2] ); - j += 2; - break; - } - break; - - case DO: // DO: Indicates the request that the other party perform - switch( lpInStr[j+2] ) - { - case ECHO: - j += 2; - break; - - case SUPPRESSGA: - j += 2; - break; - - default: - pCon->appendOutput( (char)ESC[0] ); - pCon->appendOutput( (char)DONT ); - pCon->appendOutput( lpInStr[j+2] ); - //printf("unknown do command used! (%d)\n", lpInStr[j+2] ); - j += 2; - break; - } -// pCon->usedInput( 3 ); - break; - - case DONT: // DONT: Indicates the demand that the other party stop performing - switch( lpInStr[j+2] ) - { - case ECHO: - j += 2; -// pCon->usedInput( 3 ); - break; - - default: - printf("unknown dont command used! (%d)\n", lpInStr[j+2] ); - j += 2; - break; - } - break; - } - break; - - default: - fbEdited.appendData( lpInStr[j] ); - if( bEchoOn ) pCon->appendOutput( lpInStr[j] ); - break; - } - } - - pCon->usedInput( pCon->getInputAmnt() ); - - return true; -} - -char *ProtocolTelnet::getLine( bool bFullOnly ) -{ - int i = fbEdited.findChar('\n'); - - if( i < 0 ) - { - if( bFullOnly == false ) - { - i = fbEdited.getLength(); - } - else - { - return NULL; - } - } - - char *lpStr = new char[i+1]; - strncpy( lpStr, fbEdited.getData(), i ); - lpStr[i] = '\0'; - - fbEdited.usedData( i+1 ); - - return lpStr; -} - -char *ProtocolTelnet::peekLine( bool bFullOnly ) -{ - int i = fbEdited.findChar('\n'); - - if( i < 0 ) - { - if( bFullOnly == false ) - { - i = fbEdited.getLength(); - } - else - { - return NULL; - } - } - - char *lpStr = new char[i+1]; - strncpy( lpStr, fbEdited.getData(), i ); - lpStr[i] = '\0'; - - return lpStr; -} - -void ProtocolTelnet::setEcho( bool bEchoOn ) -{ - this->bEchoOn = bEchoOn; -} diff --git a/src/protocoltelnet.h b/src/protocoltelnet.h deleted file mode 100644 index a6d2e49..0000000 --- a/src/protocoltelnet.h +++ /dev/null @@ -1,77 +0,0 @@ -#ifndef PROTOCOLTELNET_H -#define PROTOCOLTELNET_H - -#include "protocol.h" -#include "flexbuf.h" - -#define ESC "\x1B" /**< A telnet escape code. */ - -/** Handles all specialized protocol actions related to the telnet protocol. - * This includes setting modes, non-scrollable regions, and so on. - *@author Mike Buland - */ -class ProtocolTelnet : public Protocol -{ -public: - ProtocolTelnet(); - virtual ~ProtocolTelnet(); - - bool onNewData(); - bool onNewConnection(); - - char *getLine( bool bFullOnly = true ); - char *peekLine( bool bFullOnly = true ); - - void setEcho( bool bEchoOn = true ); - - enum - { - termUnInited, - termRaw, - termUnknown, - termVT220, - termXTerm - }; - - enum - { - SE = 240, // SE: End of subnegotiation parameters. - NOP = 241, // NOP: No operation - DM = 242, // DM: Data mark. Indicates the position of a Synch event within the data stream. This should always be accompanied by a TCP urgent notification. - BRK = 243, // BRK: Break. Indicates that the "break" or "attention" key was hit. - IP = 244, // IP: Suspend, interrupt or abort the process to which the NVT is connected. - AO = 245, // AO: Abort output. Allows the current process to run to completion but do not send its output to the user. - AYT = 246, // AYT: Are you there. Send back to the NVT some visible evidence that the AYT was received. - EC = 247, // EC: Erase character. The receiver should delete the last preceding undeleted character from the data stream. - EL = 248, // EL: Erase line. Delete characters from the data stream back to but not including the previous CRLF. - GA = 249, // GA: Go ahead. Used, under certain circumstances, to tell the other end that it can transmit. - SB = 250, // SB: Subnegotiation of the indicated option follows. - WILL = 251, // WILL: Indicates the desire to begin performing, or confirmation that you are now performing, the indicated option. - WONT = 252, // WONT: Indicates the refusal to perform, or continue performing, the indicated option. - DO = 253, // DO: Indicates the request that the other party perform, or confirmation that you are expecting the other party to perform, the indicated option. - DONT = 254, // DONT: Indicates the demand that the other party stop performing, or confirmation that you are no longer expecting the other party to perform, the indicated option. - IAC = 255 // IAC: Interpret as command - }; - - enum - { - ECHO = 1, // Explain who'll echo - SUPPRESSGA = 3, // Suppress Go Ahead - TERMTYPE = 24, // Terminal Type - NAWS = 31, // Window size - TERMSPEED = 32, // Terminal Speed - LINEMODE = 34 // Linemode - }; - -private: - int nTermType; - - int nTermWidth; - int nTermHeight; - - FlexBuf fbEdited; - - bool bEchoOn; -}; - -#endif diff --git a/src/queue.cpp b/src/queue.cpp deleted file mode 100644 index 42999fe..0000000 --- a/src/queue.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "queue.h" - -void Queue::enqueue( void *data ) -{ - lQueueData.append( data ); -} - -void *Queue::dequeue() -{ - void *dat = lQueueData[0]; - if( dat != NULL ) - { - lQueueData.deleteAt( 0 ); - } - return dat; -} - -bool Queue::isEmpty() -{ - return lQueueData.isEmpty(); -} - -void Queue::empty() -{ - lQueueData.empty(); -} diff --git a/src/queue.h b/src/queue.h deleted file mode 100644 index 692f5d8..0000000 --- a/src/queue.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef QUEUE_H -#define QUEUE_H -#include "linkedlist.h" - -/** - * An ultra-simple queue implementation. It just uses a linked list as it's - * container so we don't have to worry about anything! - *@author Mike Buland - */ -class Queue -{ -public: - /** - * Puts a new item at the end of the queue. - *@param data A new value to put at the end of the queue. - */ - void enqueue( void *data ); - - /** - * Gets the begining item of the queue off and returns it. - *@returns The value at the front of the queue. - */ - void *dequeue(); - - /** - * Checks if the queueu is empty. - *@returns True if the queueu is empty, and false if it has things in it. - */ - bool isEmpty(); - - /** - * Empty the queue. - */ - void empty(); - - /** - * Get a pointer to the internal list object. - *@returns A pointer to the internal list object. - */ - LinkedList *getList() { return &lQueueData; }; - -private: - LinkedList lQueueData; /**< Where all of the real data is stored. */ -}; -#endif diff --git a/src/ringlist.cpp b/src/ringlist.cpp deleted file mode 100644 index 9efbbc4..0000000 --- a/src/ringlist.cpp +++ /dev/null @@ -1,106 +0,0 @@ -// -// C++ Implementation: ringlist -// -// Description: -// -// -// Author: Mike Buland <eichlan@yf-soft.com>, (C) 2005 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#include <stdlib.h> - -#include "ringlist.h" - -RingList::RingList( int nInitSize ) - : List() -{ - nFirstIndex = 0; - nRealLength = nInitSize; - nDataLength = 0; - apData = new void*[nInitSize]; - pPushBuf = NULL; -} - -RingList::~RingList() -{ - delete[] apData; -} - -void *RingList::getAt( int nIndex ) -{ - if( nIndex < 0 || nIndex >= nDataLength ) - { - return NULL; - } - - return apData[(nFirstIndex+nIndex)%nRealLength]; -} - -void RingList::append( void *pData ) -{ - int nIndex = (nFirstIndex+nDataLength)%nRealLength; - - pPushBuf = apData[nIndex]; - apData[nIndex] = pData; - - if( nDataLength == nRealLength ) - { - nFirstIndex = (nFirstIndex+1)%nRealLength; - } - else - { - nDataLength++; - // We really didn't need it this time... - pPushBuf = NULL; - } -} - -void RingList::insertBefore( void *pData, int nPos ) -{ - // Not implemented right now, don't even try it! -} - -int RingList::getSize() -{ - return nDataLength; -} - -bool RingList::isEmpty() -{ - return nDataLength==0; -} - -void RingList::deleteAt( int nIndex ) -{ - // Also not implemented yet -} - -void RingList::empty() -{ - nFirstIndex = 0; - nDataLength = 0; -} - -void RingList::setSize( int nNewSize ) -{ - if( apData ) - { - delete[] apData; - } - nFirstIndex = 0; - nRealLength = nNewSize; - nDataLength = 0; - apData = new void*[nNewSize]; -} - -void RingList::setAt( int nIndex, void *pData ) -{ - apData[(nIndex+nFirstIndex)%nRealLength] = pData; -} - -void *RingList::getPushBuf() -{ - return pPushBuf; -} diff --git a/src/ringlist.h b/src/ringlist.h deleted file mode 100644 index bc069f3..0000000 --- a/src/ringlist.h +++ /dev/null @@ -1,112 +0,0 @@ -#ifndef RINGLIST_H -#define RINGLIST_H - -#include "list.h" - -/** - * A RingList or Ring Buffer implementation. This is a list that never grows in - * size once it is created, but instead once it is full new items added to the - * RingList replace the oldest items and the zero-index is virtually shifted. - * Since no data is actually moved when zero-index moves, this is very - * efficient. - * <br> - * The items removed are not actually deleted by the RingList, so instead they - * are first moved into a temporary "Push Buffer" that can be accessed so that - * elements pushed off the edge of the RingList can be accessed for cleanup. - *@author Mike Buland - */ -class RingList : public List -{ -public: - /** - * Construct a RingList with a fixed initial size. This size never changes - * unless setSize is called later during normal operation. - *@param nInitSize The number of elements to allocate. - */ - RingList( int nInitSize ); - - /** - * Clean up the data structures, but not the contained elements. - */ - virtual ~RingList(); - - /** - * Get an element at the specified index. - *@param nIndex The index of the element to retreive. - *@returns A pointer to the requested element, or NULL if the element is - * not found or not initialized yet. - */ - void *getAt( int nIndex ); - - /** - * Append an element to the end of the list, overwriting the begining if - * necesarry. - *@param pData The pointer to append to the RingList. - */ - void append( void *pData ); - - /** - * Insert an element before another in the RingList, pushing all after it - * down the list. - *@param pData The data to insert. - *@param nPos The position that new the element should occupy in the list. - */ - void insertBefore( void *pData, int nPos = 0 ); - - /** - * Get the size of the array. - */ - int getSize(); - - /** - * Is the RingList empty? - *@returns True if it is empty, false otherwise. - */ - bool isEmpty(); - - /** - * Delete an element in the list, moving all later elements down one index. - *@param nIndex The index of the element to delete. - */ - void deleteAt( int nIndex ); - - /** - * Remove all elements from the RingList. - */ - void empty(); - - /** - * Set a new size for the RingList. Be careful with this one, if shrinking - * this may quietly create a memory leak. - *@param nNewSize The new size to set the RingList to. - *@todo Either fix this memory leak somehow or remove this function. - */ - void setSize( int nNewSize ); - - /** - * Set a specific element to a new value. - *@param nIndex The zero-based index to change the value of. - *@param pData The data to put at the location specified by nIndex. - */ - void setAt( int nIndex, void *pData ); - - /** - * Retrieve the contents of the push buffer. This is the data that is - * pushed off the end of the array if you append data and the list is full. - * This should be checked after every append operation to be sure there - * isn't anything that needs deleting. - *@returns The last value pushed off the RingList, or NULL if nothing was - * pushed off. - */ - void *getPushBuf(); - -private: - int nFirstIndex; /**< The index to be translated as zero. */ - int nRealLength; /**< The Amount of storage space available. */ - int nDataLength; /**< The number of elements filled in. */ - void **apData; /**< The actual data storage. */ - void *pPushBuf; /**< The push buffer. */ - -}; - -#endif diff --git a/src/sbuffer.cpp b/src/sbuffer.cpp deleted file mode 100644 index f84f8a3..0000000 --- a/src/sbuffer.cpp +++ /dev/null @@ -1,67 +0,0 @@ -#include <string.h> -#include "sbuffer.h" - -SBuffer::SBuffer() : - nPos( 0 ), - bOpen( true ) -{ -} - -SBuffer::~SBuffer() -{ -} - -void SBuffer::close() -{ - bOpen = false; - fbData.clearData(); -} - -size_t SBuffer::read( char *pBuf, size_t nBytes ) -{ - size_t nLeft = fbData.getLength() - nPos; - if( nBytes > nLeft ) - nBytes = nLeft; - - if( nLeft == 0 ) - return 0; - - memcpy( pBuf, fbData.getData()+nPos, nBytes ); - nPos += nBytes; - - return nBytes; -} - -size_t SBuffer::write( const char *pBuf, size_t nBytes ) -{ - fbData.appendData( pBuf, nBytes ); - nPos += nBytes; - - return nBytes; -} - -long SBuffer::tell() -{ - return nPos; -} - -void SBuffer::seek( long offset ) -{ - nPos += offset; -} - -void SBuffer::setPos( long pos ) -{ - nPos = pos; -} - -void SBuffer::setPosEnd( long pos ) -{ - nPos = fbData.getLength() - pos; -} - -bool SBuffer::isEOS() -{ - return nPos == fbData.getLength(); -} - diff --git a/src/sbuffer.h b/src/sbuffer.h deleted file mode 100644 index 65feb71..0000000 --- a/src/sbuffer.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef S_BUFFER_H -#define S_BUFFER_H - -#include <stdint.h> - -#include "stream.h" -#include "flexbuf.h" - -class SBuffer : public Stream -{ -public: - SBuffer(); - virtual ~SBuffer(); - - virtual void close(); - virtual size_t read( char *pBuf, size_t nBytes ); - - /** - *@todo Update this to write at nPos, not just append data. - */ - virtual size_t write( const char *pBuf, size_t nBytes ); - - virtual long tell(); - virtual void seek( long offset ); - virtual void setPos( long pos ); - virtual void setPosEnd( long pos ); - virtual bool isEOS(); - - FlexBuf &getBuffer() - { - return fbData; - } - -private: - long nPos; - bool bOpen; - FlexBuf fbData; -}; - -#endif diff --git a/src/serializable.cpp b/src/serializable.cpp deleted file mode 100644 index fd50943..0000000 --- a/src/serializable.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "serializable.h" - -Serializable::Serializable() -{ -} -Serializable::~Serializable() -{ -} diff --git a/src/serializable.h b/src/serializable.h deleted file mode 100644 index 06def29..0000000 --- a/src/serializable.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef SERIALIZER_H -#define SERIALIZER_H - -//#include "serializer.h" - -/** - * The base class for any class you want to serialize. Simply include this as - * a base class, implement the purely virtual serialize function and you've got - * an easily serializable class. - */ -class Serializable -{ -public: - /** - * Does nothing, here for completeness. - */ - Serializable(); - - /** - * Here to ensure the deconstructor is virtual. - */ - virtual ~Serializable(); - - /** - * This is the main workhorse of the serialization system, just override and - * you've got a serializable class. A reference to the Serializer archive - * used is passed in as your only parameter, query it to discover if you are - * loading or saving. - * @param ar A reference to the Serializer object to use. - */ - virtual void serialize( class Serializer &ar )=0; -}; - -#endif diff --git a/src/serializer.cpp b/src/serializer.cpp deleted file mode 100644 index 636224e..0000000 --- a/src/serializer.cpp +++ /dev/null @@ -1,338 +0,0 @@ -#include "serializer.h" -#include "serializable.h" -#include <list> - -Serializer::Serializer(bool bLoading): - bLoading(bLoading) -{ -} -Serializer::~Serializer() -{ -} - -bool Serializer::isLoading() -{ - return bLoading; -} -Serializer &Serializer::operator<<(bool p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(int8_t p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(int16_t p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(int32_t p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(int64_t p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(uint8_t p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(uint16_t p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(uint32_t p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(uint64_t p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(long p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(float p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(double p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(long double p) -{ - write( &p, sizeof(p) ); - return *this; -} - -Serializer &Serializer::operator>>(bool &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(int8_t &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(int16_t &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(int32_t &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(int64_t &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(uint8_t &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(uint16_t &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(uint32_t &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(uint64_t &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(long &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(float &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(double &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(long double &p) -{ - read( &p, sizeof(p) ); - return *this; -} - -Serializer &Serializer::operator&&(bool &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(int8_t &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(int16_t &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(int32_t &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(int64_t &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(uint8_t &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(uint16_t &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(uint32_t &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(uint64_t &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(float &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(double &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(long double &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - - -Serializer &operator<<(Serializer &s, Serializable &p) -{ - p.serialize( s ); - return s; -} - -Serializer &operator>>(Serializer &s, Serializable &p) -{ - p.serialize( s ); - return s; -} - -Serializer &operator&&(Serializer &s, Serializable &p) -{ - if (s.isLoading()) - { - return s >> p; - } - else - { - return s << p; - } -} - -Serializer &operator<<( Serializer &ar, std::string &s ) -{ - ar << (uint32_t)s.length(); - ar.write( s.c_str(), s.length() ); - - return ar; -} - -Serializer &operator>>( Serializer &ar, std::string &s ) -{ - uint32_t l; - ar >> l; - char *tmp = new char[l+1]; - tmp[l] = '\0'; - ar.read( tmp, l ); - s = tmp; - delete[] tmp; - - return ar; -} - diff --git a/src/serializer.h b/src/serializer.h deleted file mode 100644 index 3af489c..0000000 --- a/src/serializer.h +++ /dev/null @@ -1,80 +0,0 @@ -#ifndef SERIALIZABLE_H -#define SERIALIZABLE_H - -#include <stdint.h> -#include <string> -#include <list> -//#include "serializable.h" - -class Serializer -{ -private: - bool bLoading; -public: - bool isLoading(); - - enum - { - load = true, - save = false - }; - - Serializer(bool bLoading); - virtual ~Serializer(); - virtual void close()=0; - - virtual void write(const void *, int32_t)=0; - virtual void read(void *, int32_t)=0; - - virtual Serializer &operator<<(bool); - virtual Serializer &operator<<(int8_t); - virtual Serializer &operator<<(int16_t); - virtual Serializer &operator<<(int32_t); - virtual Serializer &operator<<(int64_t); - virtual Serializer &operator<<(uint8_t); - virtual Serializer &operator<<(uint16_t); - virtual Serializer &operator<<(uint32_t); - virtual Serializer &operator<<(uint64_t); - virtual Serializer &operator<<(long); - virtual Serializer &operator<<(float); - virtual Serializer &operator<<(double); - virtual Serializer &operator<<(long double); - - virtual Serializer &operator>>(bool &); - virtual Serializer &operator>>(int8_t &); - virtual Serializer &operator>>(int16_t &); - virtual Serializer &operator>>(int32_t &); - virtual Serializer &operator>>(int64_t &); - virtual Serializer &operator>>(uint8_t &); - virtual Serializer &operator>>(uint16_t &); - virtual Serializer &operator>>(uint32_t &); - virtual Serializer &operator>>(uint64_t &); - virtual Serializer &operator>>(long &); - virtual Serializer &operator>>(float &); - virtual Serializer &operator>>(double &); - virtual Serializer &operator>>(long double &); - - virtual Serializer &operator&&(bool &); - virtual Serializer &operator&&(int8_t &); - virtual Serializer &operator&&(int16_t &); - virtual Serializer &operator&&(int32_t &); - virtual Serializer &operator&&(int64_t &); - virtual Serializer &operator&&(uint8_t &); - virtual Serializer &operator&&(uint16_t &); - virtual Serializer &operator&&(uint32_t &); - virtual Serializer &operator&&(uint64_t &); - virtual Serializer &operator&&(float &); - virtual Serializer &operator&&(double &); - virtual Serializer &operator&&(long double &); - - //virtual Serializer &operator&(Serializable &); -}; - -Serializer &operator<<(Serializer &, class Serializable &); -Serializer &operator>>(Serializer &, class Serializable &); -Serializer &operator&&(Serializer &s, class Serializable &p); - -Serializer &operator<<(Serializer &, std::string &); -Serializer &operator>>(Serializer &, std::string &); - -#endif diff --git a/src/serializerbinary.cpp b/src/serializerbinary.cpp deleted file mode 100644 index ea7ed93..0000000 --- a/src/serializerbinary.cpp +++ /dev/null @@ -1,63 +0,0 @@ -#include "serializerbinary.h" -#include "serializable.h" -#include "exceptions.h" - -SerializerBinary::SerializerBinary(FILE *fhFile, bool bLoading): - Serializer(bLoading), - fhFile(fhFile), - bCloseFile(false) -{ -} - -SerializerBinary::SerializerBinary(const char *sFileName, bool bLoading): - Serializer(bLoading), - bCloseFile(true) -{ - if (bLoading) - { - fhFile = fopen(sFileName, "rb"); - if( fhFile == NULL ) - throw FileException("Unable to open file: %s", sFileName ); - } - else - { - fhFile = fopen(sFileName, "wb"); - if( fhFile == NULL ) - throw FileException("Unable to open file: %s", sFileName ); - } -} - -SerializerBinary::~SerializerBinary() -{ - close(); -} - -void SerializerBinary::close() -{ - if (fhFile != NULL && bCloseFile ) - { - fclose(fhFile); - fhFile = NULL; - } -} - -void SerializerBinary::write(const void * pData, int32_t nSize) -{ - if( nSize == 0 ) - return; - - fwrite(pData, nSize, 1, fhFile); -} - -void SerializerBinary::read(void * pData, int32_t nSize) -{ - if( nSize == 0 ) - return; - - uint32_t nRead = fread(pData, nSize, 1, fhFile); - if( nRead < 1 ) - { - throw FileException( excodeEOF, "End of file read"); - } -} - diff --git a/src/serializerbinary.h b/src/serializerbinary.h deleted file mode 100644 index 8510fcd..0000000 --- a/src/serializerbinary.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef SERIALIZER_BINARY_H -#define SERIALIZER_BINARY_H - -#include "serializer.h" -#include <stdio.h> - -class SerializerBinary : public Serializer -{ -public: - SerializerBinary(FILE *fhFile, bool bLoading); - SerializerBinary(const char *sFileName, bool bLoading); - virtual ~SerializerBinary(); - - virtual void close(); - - virtual void write(const void *, int32_t); - virtual void read(void *, int32_t); - -private: - FILE *fhFile; - bool bCloseFile; -}; - -#endif diff --git a/src/serializerbzip2.cpp b/src/serializerbzip2.cpp deleted file mode 100644 index bafabc8..0000000 --- a/src/serializerbzip2.cpp +++ /dev/null @@ -1,88 +0,0 @@ -#include "serializerbzip2.h" -#include "serializable.h" - -#include <bzlib.h> - -SerializerBZip2::SerializerBZip2(FILE *fhFile, bool bLoading): - Serializer(bLoading), - fhFile(fhFile), - bCloseFile(false) -{ - if( bLoading ) - { - bzFile = BZ2_bzReadOpen( &bzerror, fhFile, 0, 0, NULL, 0 ); - checkBZError(); - } - else - { - bzFile = BZ2_bzWriteOpen( &bzerror, fhFile, 9, 0, 0 ); - checkBZError(); - } -} - -SerializerBZip2::SerializerBZip2(char *sFileName, bool bLoading): - Serializer(bLoading), - bCloseFile(true) -{ - if (bLoading) - { - fhFile = fopen(sFileName, "rb"); - bzFile = BZ2_bzReadOpen( &bzerror, fhFile, 0, 0, NULL, 0 ); - checkBZError(); - } - else - { - fhFile = fopen(sFileName, "wb"); - bzFile = BZ2_bzWriteOpen( &bzerror, fhFile, 9, 0, 0 ); - checkBZError(); - } -} - -SerializerBZip2::~SerializerBZip2() -{ - close(); -} - -void SerializerBZip2::checkBZError() -{ -} - -void SerializerBZip2::close() -{ - if( bzFile != NULL ) - { - if( isLoading() ) - { - void *unused; - int nUnused; - BZ2_bzReadGetUnused( &bzerror, bzFile, &unused, &nUnused ); - BZ2_bzReadClose( &bzerror, bzFile ); - if( nUnused ) - fseek( fhFile, -nUnused, SEEK_CUR ); - } - else - { - BZ2_bzWriteClose( &bzerror, bzFile, 0, 0, 0 ); - } - checkBZError(); - bzFile = NULL; - } - if( fhFile != NULL && bCloseFile ) - { - fclose(fhFile); - fhFile = NULL; - } -} - -void SerializerBZip2::write(const void * pData, int32_t nSize) -{ - BZ2_bzWrite( &bzerror, bzFile, (void *)pData, nSize ); - checkBZError(); -} - -void SerializerBZip2::read(void * pData, int32_t nSize) -{ - BZ2_bzRead( &bzerror, bzFile, pData, nSize ); - checkBZError(); -} - diff --git a/src/serializerbzip2.h b/src/serializerbzip2.h deleted file mode 100644 index 4aeb22e..0000000 --- a/src/serializerbzip2.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef SERIALIZER_BINARY_H -#define SERIALIZER_BINARY_H - -#include "serializer.h" -#include <stdio.h> - -class SerializerBZip2 : public Serializer -{ -public: - SerializerBZip2(FILE *fhFile, bool bLoading); - SerializerBZip2(char *sFileName, bool bLoading); - virtual ~SerializerBZip2(); - - virtual void close(); - - virtual void write(const void *, int32_t); - virtual void read(void *, int32_t); - -private: - void checkBZError(); - FILE *fhFile; - void *bzFile; - bool bCloseFile; - int bzerror; -}; - -#endif diff --git a/src/serializerconnection.cpp b/src/serializerconnection.cpp deleted file mode 100644 index 2934c8b..0000000 --- a/src/serializerconnection.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "serializerconnection.h" - -SerializerConnection::SerializerConnection( - Connection *pCon, bool bIO, int nTimeSec, int nTimeUSec ) : - Serializer( bIO ), - pCon( pCon ), - nTimeSec( nTimeSec ), - nTimeUSec( nTimeUSec ) -{ -} - -SerializerConnection::~SerializerConnection() -{ -} - diff --git a/src/serializerconnection.h b/src/serializerconnection.h deleted file mode 100644 index e8d85c6..0000000 --- a/src/serializerconnection.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef SERIALIZER_CONNECTION_H -#define SERIALIZER_CONNECTION_H - -#include <stdint.h> - -#include "serializer.h" -#include "connection.h" - -/** - * - */ -class SerializerConnection : public Serializer -{ -public: - SerializerConnection( Connection *pCon, bool bIO, int nTimeSec, int nTimeUSec ); - virtual ~SerializerConnection(); - -private: - Connection *pCon; - int nTimeSec; - int nTimeUSec; -}; - -#endif diff --git a/src/serializertext.cpp b/src/serializertext.cpp deleted file mode 100644 index 9cf4394..0000000 --- a/src/serializertext.cpp +++ /dev/null @@ -1,170 +0,0 @@ -#include "serializertext.h" - -SerializerText::SerializerText(FILE *fhFile, bool bLoading): - Serializer(bLoading), - fhFile(fhFile), - bCloseFile(false) -{ -} - -SerializerText::SerializerText(const char *sFileName, bool bLoading): - Serializer(bLoading), - bCloseFile(true) -{ - if (bLoading) - { - fhFile = fopen(sFileName, "rt"); - } - else - { - fhFile = fopen(sFileName, "wt"); - } -} - -SerializerText::~SerializerText() -{ - close(); -} - -void SerializerText::close() -{ - if (fhFile != NULL) - { - fclose(fhFile); - fhFile = NULL; - } -} - -void SerializerText::write(const void * pData, int32_t nSize) -{ - fwrite(pData, nSize, 1, fhFile); - fprintf(fhFile, "\n"); -} - -void SerializerText::read(void * pData, int32_t nSize) -{ - fread(pData, nSize, 1, fhFile); - fgetc(fhFile); -} - -Serializer &SerializerText::operator<<(bool p) -{ - fprintf(fhFile, "%hhd\n", p); - return *this; -} -Serializer &SerializerText::operator<<(int8_t p) -{ - fprintf(fhFile, "%hhd\n", p); - return *this; -} -Serializer &SerializerText::operator<<(int16_t p) -{ - fprintf(fhFile, "%hd\n", p); - return *this; -} -Serializer &SerializerText::operator<<(int32_t p) -{ - fprintf(fhFile, "%d\n", p); - return *this; -} -Serializer &SerializerText::operator<<(int64_t p) -{ - fprintf(fhFile, "%lld\n", p); - return *this; -} -Serializer &SerializerText::operator<<(uint8_t p) -{ - fprintf(fhFile, "%hhu\n", p); - return *this; -} -Serializer &SerializerText::operator<<(uint16_t p) -{ - fprintf(fhFile, "%hu\n", p); - return *this; -} -Serializer &SerializerText::operator<<(uint32_t p) -{ - fprintf(fhFile, "%u\n", p); - return *this; -} -Serializer &SerializerText::operator<<(uint64_t p) -{ - fprintf(fhFile, "%llu\n", p); - return *this; -} -Serializer &SerializerText::operator<<(float p) -{ - fprintf(fhFile, "%f\n", p); - return *this; -} -Serializer &SerializerText::operator<<(double p) -{ - fprintf(fhFile, "%f\n", p); - return *this; -} -Serializer &SerializerText::operator<<(long double p) -{ - fprintf(fhFile, "%Lf\n", p); - return *this; -} - -Serializer &SerializerText::operator>>(bool &p) -{ - fscanf(fhFile, "%hhd\n", ((signed char *)&p)); - return *this; -} -Serializer &SerializerText::operator>>(int8_t &p) -{ - fscanf(fhFile, "%hhd\n", &p); - return *this; -} -Serializer &SerializerText::operator>>(int16_t &p) -{ - fscanf(fhFile, "%hd\n", &p); - return *this; -} -Serializer &SerializerText::operator>>(int32_t &p) -{ - fscanf(fhFile, "%d\n", &p); - return *this; -} -Serializer &SerializerText::operator>>(int64_t &p) -{ - fscanf(fhFile, "%lld\n", &p); - return *this; -} -Serializer &SerializerText::operator>>(uint8_t &p) -{ - fscanf(fhFile, "%hhu\n", &p); - return *this; -} -Serializer &SerializerText::operator>>(uint16_t &p) -{ - fscanf(fhFile, "%hu\n", &p); - return *this; -} -Serializer &SerializerText::operator>>(uint32_t &p) -{ - fscanf(fhFile, "%u\n", &p); - return *this; -} -Serializer &SerializerText::operator>>(uint64_t &p) -{ - fscanf(fhFile, "%llu\n", &p); - return *this; -} -Serializer &SerializerText::operator>>(float &p) -{ - fscanf(fhFile, "%f\n", &p); - return *this; -} -Serializer &SerializerText::operator>>(double &p) -{ - fscanf(fhFile, "%lf\n", &p); - return *this; -} -Serializer &SerializerText::operator>>(long double &p) -{ - fscanf(fhFile, "%Lf\n", &p); - return *this; -} diff --git a/src/serializertext.h b/src/serializertext.h deleted file mode 100644 index 01b7f7b..0000000 --- a/src/serializertext.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef SERIALIZER_TEXT_H -#define SERIALIZER_TEXT_H - -#include "serializer.h" -#include <stdio.h> - -class SerializerText : public Serializer -{ -public: - SerializerText(FILE *fhFile, bool bLoading); - SerializerText(const char *sFileName, bool bLoading); - virtual ~SerializerText(); - - virtual void close(); - - virtual void write(const void *, int32_t); - virtual void read(void *, int32_t); - - virtual Serializer &operator<<(bool); - virtual Serializer &operator<<(int8_t); - virtual Serializer &operator<<(int16_t); - virtual Serializer &operator<<(int32_t); - virtual Serializer &operator<<(int64_t); - virtual Serializer &operator<<(uint8_t); - virtual Serializer &operator<<(uint16_t); - virtual Serializer &operator<<(uint32_t); - virtual Serializer &operator<<(uint64_t); - virtual Serializer &operator<<(float); - virtual Serializer &operator<<(double); - virtual Serializer &operator<<(long double); - - virtual Serializer &operator>>(bool &); - virtual Serializer &operator>>(int8_t &); - virtual Serializer &operator>>(int16_t &); - virtual Serializer &operator>>(int32_t &); - virtual Serializer &operator>>(int64_t &); - virtual Serializer &operator>>(uint8_t &); - virtual Serializer &operator>>(uint16_t &); - virtual Serializer &operator>>(uint32_t &); - virtual Serializer &operator>>(uint64_t &); - virtual Serializer &operator>>(float &); - virtual Serializer &operator>>(double &); - virtual Serializer &operator>>(long double &); -private: - FILE *fhFile; - bool bCloseFile; -}; - -#endif diff --git a/src/sfile.cpp b/src/sfile.cpp deleted file mode 100644 index f1de03c..0000000 --- a/src/sfile.cpp +++ /dev/null @@ -1,74 +0,0 @@ -#include "sfile.h" -#include "exceptions.h" - -SFile::SFile( const char *sName, const char *sFlags ) -{ - fh = fopen( sName, sFlags ); -} - -SFile::~SFile() -{ -} - -void SFile::close() -{ - if( fh ) - { - fclose( fh ); - fh = NULL; - } -} - -size_t SFile::read( char *pBuf, size_t nBytes ) -{ - if( !fh ) - throw FileException("File not open."); - - return fread( pBuf, 1, nBytes, fh ); -} - -size_t SFile::write( const char *pBuf, size_t nBytes ) -{ - if( !fh ) - throw FileException("File not open."); - - return fwrite( pBuf, 1, nBytes, fh ); -} - -long SFile::tell() -{ - if( !fh ) - throw FileException("File not open."); - - return ftell( fh ); -} - -void SFile::seek( long offset ) -{ - if( !fh ) - throw FileException("File not open."); - - fseek( fh, offset, SEEK_CUR ); -} - -void SFile::setPos( long pos ) -{ - if( !fh ) - throw FileException("File not open."); - - fseek( fh, pos, SEEK_SET ); -} - -void SFile::setPosEnd( long pos ) -{ - if( !fh ) - throw FileException("File not open."); - - fseek( fh, pos, SEEK_END ); -} - -bool SFile::isEOS() -{ - return feof( fh ); -} - diff --git a/src/sfile.h b/src/sfile.h deleted file mode 100644 index b51e5bc..0000000 --- a/src/sfile.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef SFILE_H -#define SFILE_H - -#include <stdint.h> - -#include "stream.h" - -class SFile : public Stream -{ -public: - SFile( const char *sName, const char *sFlags ); - virtual ~SFile(); - - virtual void close(); - virtual size_t read( char *pBuf, size_t nBytes ); - virtual size_t write( const char *pBuf, size_t nBytes ); - - virtual long tell(); - virtual void seek( long offset ); - virtual void setPos( long pos ); - virtual void setPosEnd( long pos ); - virtual bool isEOS(); - -private: - FILE *fh; - -}; - -#endif diff --git a/src/sha1.cpp b/src/sha1.cpp deleted file mode 100644 index 8270c3b..0000000 --- a/src/sha1.cpp +++ /dev/null @@ -1,161 +0,0 @@ -#include <stdio.h> -#include <string.h> -#include <stdlib.h> - -#include "sha1.h" - -Sha1::Sha1() : - H0( 0x67452301 ), - H1( 0xefcdab89 ), - H2( 0x98badcfe ), - H3( 0x10325476 ), - H4( 0xc3d2e1f0 ), - unprocessedBytes( 0 ), - size( 0 ) -{ -} - -Sha1::~Sha1() -{ -} - -void Sha1::process() -{ - int t; - uint32_t a, b, c, d, e, K, f, W[80]; - - // starting values - a = H0; - b = H1; - c = H2; - d = H3; - e = H4; - - // copy and expand the message block - for( t = 0; t < 16; t++ ) W[t] = (bytes[t*4] << 24) - +(bytes[t*4 + 1] << 16) - +(bytes[t*4 + 2] << 8) - + bytes[t*4 + 3]; - for(; t< 80; t++ ) W[t] = lrot( W[t-3]^W[t-8]^W[t-14]^W[t-16], 1 ); - - /* main loop */ - uint32_t temp; - for( t = 0; t < 80; t++ ) - { - if( t < 20 ) { - K = 0x5a827999; - f = (b & c) | ((~b) & d); - } else if( t < 40 ) { - K = 0x6ed9eba1; - f = b ^ c ^ d; - } else if( t < 60 ) { - K = 0x8f1bbcdc; - f = (b & c) | (b & d) | (c & d); - } else { - K = 0xca62c1d6; - f = b ^ c ^ d; - } - temp = lrot(a,5) + f + e + W[t] + K; - e = d; - d = c; - c = lrot(b,30); - b = a; - a = temp; - //printf( "t=%d %08x %08x %08x %08x %08x\n",t,a,b,c,d,e ); - } - - /* add variables */ - H0 += a; - H1 += b; - H2 += c; - H3 += d; - H4 += e; - - //printf( "Current: %08x %08x %08x %08x %08x\n",H0,H1,H2,H3,H4 ); - /* all bytes have been processed */ - unprocessedBytes = 0; -} - -void Sha1::update( const char* data, int num ) -{ - // add these bytes to the running total - size += num; - - // repeat until all data is processed - while( num > 0 ) - { - // number of bytes required to complete block - int needed = 64 - unprocessedBytes; - - // number of bytes to copy (use smaller of two) - int toCopy = (num < needed) ? num : needed; - - // Copy the bytes - memcpy( bytes + unprocessedBytes, data, toCopy ); - - // Bytes have been copied - num -= toCopy; - data += toCopy; - unprocessedBytes += toCopy; - - // there is a full block - if( unprocessedBytes == 64 ) process(); - } -} - -unsigned char* Sha1::getDigest() -{ - // save the message size - uint32_t totalBitsL = size << 3; - uint32_t totalBitsH = size >> 29; - - // add 0x80 to the message - update( "\x80", 1 ); - - unsigned char footer[64] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - - // block has no room for 8-byte filesize, so finish it - if( unprocessedBytes > 56 ) - update( (char*)footer, 64 - unprocessedBytes); - - // how many zeros do we need - int neededZeros = 56 - unprocessedBytes; - - // store file size (in bits) in big-endian format - toBigEndian( totalBitsH, footer + neededZeros ); - toBigEndian( totalBitsL, footer + neededZeros + 4 ); - - // finish the final block - update( (char*)footer, neededZeros + 8 ); - - // allocate memory for the digest bytes - unsigned char* digest = new unsigned char[20]; - - // copy the digest bytes - toBigEndian( H0, digest ); - toBigEndian( H1, digest + 4 ); - toBigEndian( H2, digest + 8 ); - toBigEndian( H3, digest + 12 ); - toBigEndian( H4, digest + 16 ); - - // return the digest - return digest; -} - -uint32_t Sha1::lrot( uint32_t x, int bits ) -{ - return (x<<bits) | (x>>(32 - bits)); -}; - -void Sha1::toBigEndian( uint32_t num, unsigned char* byte ) -{ - byte[0] = (unsigned char)(num>>24); - byte[1] = (unsigned char)(num>>16); - byte[2] = (unsigned char)(num>>8); - byte[3] = (unsigned char)num; -} - diff --git a/src/sha1.h b/src/sha1.h deleted file mode 100644 index ab6081d..0000000 --- a/src/sha1.h +++ /dev/null @@ -1,42 +0,0 @@ -/* sha1.h - -Copyright (c) 2005 Michael D. Leonhard - -http://tamale.net/ - -This file is licensed under the terms described in the -accompanying LICENSE file. -*/ - -#ifndef SHA1_H -#define SHA1_H - -#include <stdint.h> - -/** - * Calculates SHA-1 sums. This is based strongly on code from Michael D. - * Leonhard who released his code under the terms of the MIT license, thank you! - */ -class Sha1 -{ -public: - Sha1(); - ~Sha1(); - - void update( const char* data, int num ); - unsigned char* getDigest(); - - // utility methods - static uint32_t lrot( uint32_t x, int bits ); - static void toBigEndian( uint32_t in, unsigned char* out ); - -private: - // fields - uint32_t H0, H1, H2, H3, H4; - unsigned char bytes[64]; - int unprocessedBytes; - uint32_t size; - void process(); -}; - -#endif diff --git a/src/singleton.h b/src/singleton.h deleted file mode 100644 index 47adbd5..0000000 --- a/src/singleton.h +++ /dev/null @@ -1,59 +0,0 @@ -#ifndef SINGLETON_H -#define SINGLETON_H - -#include <stdio.h> - -/** - * Provides singleton functionality in a modular sort of way. Make this the - * base class of any other class and you immediately gain singleton - * functionality. Be sure to make your constructor and various functions use - * intellegent scoping. Cleanup and instantiation are performed automatically - * for you at first use and program exit. There are two things that you must - * do when using this template, first is to inherit from it with the name of - * your class filling in for T and then make this class a friend of your class. - *@code - * // Making the Single Singleton: - * class Single : public Singleton<Single> - * { - * friend class Singleton<Single>; - * protected: - * Single(); - * ... - * }; - @endcode - * You can still add public functions and variables to your new Singleton child - * class, but your constructor should be protected (hence the need for the - * friend decleration). - *@author Mike Buland - */ -template <class T> -class Singleton -{ -protected: - /** - * Private constructor. This constructor is empty but has a body so that - * you can make your own override of it. Be sure that you're override is - * also protected. - */ - Singleton() {}; - -private: - /** - * Copy constructor, defined so that you could write your own as well. - */ - Singleton( const Singleton& ); - -public: - /** - * Get a handle to the contained instance of the contained class. It is - * a reference. - *@returns A reference to the contained object. - */ - static T &getInstance() - { - static T i; - return i; - } -}; - -#endif diff --git a/src/sptr.cpp b/src/sptr.cpp deleted file mode 100644 index 7f5e894..0000000 --- a/src/sptr.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "sptr.h" diff --git a/src/sptr.h b/src/sptr.h deleted file mode 100644 index deae94d..0000000 --- a/src/sptr.h +++ /dev/null @@ -1,99 +0,0 @@ -#ifndef SPTR_H -#define SPTR_H - -#include <stdint.h> -#include <stdio.h> - -template<typename T> -class SPtr -{ -public: - SPtr() : - pRefCnt( NULL ), - pData( NULL ) - { - } - - ~SPtr() - { - decCount(); - } - - SPtr( const SPtr<T> &src ) : - pRefCnt( src.pRefCnt ), - pData( src.pData ) - { - if( pRefCnt ) - (*pRefCnt) += 1; - } - - SPtr( T *pSrc ) : - pRefCnt( NULL ), - pData( pSrc ) - { - pRefCnt = new int32_t; - (*pRefCnt) = 1; - } - - int32_t count() - { - return *pRefCnt; - } - - T *operator->() const - { - return pData; - } - - T *operator*() const - { - return pData; - } - - SPtr<T> operator=( const SPtr<T> &src ) - { - decCount(); - pRefCnt = src.pRefCnt; - pData = src.pData; - (*pRefCnt) += 1; - - return *this; - } - - bool operator==( const SPtr<T> &src ) - { - return pData == src.pData; - } - - operator bool() - { - return pRefCnt != NULL; - } - - bool isSet() - { - return pRefCnt != NULL; - } - -private: - void decCount() - { - if( pRefCnt ) - { - (*pRefCnt) -= 1; - //printf("Decrementing ref-count to %d\n", *pRefCnt ); - if( (*pRefCnt) == 0 ) - { - delete pRefCnt; - delete pData; - pRefCnt = NULL; - pData = NULL; - } - } - } - - int32_t *pRefCnt; - T *pData; -}; - -#endif diff --git a/src/stack.cpp b/src/stack.cpp deleted file mode 100644 index 8d9565c..0000000 --- a/src/stack.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include "stack.h" - -void Stack::push( void *data ) -{ - lStackData.append( data ); -} - -void *Stack::top() -{ - return lStackData.getAt( lStackData.getSize()-1 ); -} - -void Stack::pop() -{ - lStackData.deleteAt( lStackData.getSize()-1 ); -} - -void *Stack::poptop() -{ - void *dat = top(); - pop(); - return dat; -} - -bool Stack::isEmpty() -{ - return lStackData.isEmpty(); -} - -void Stack::empty() -{ - lStackData.empty(); -} diff --git a/src/stack.h b/src/stack.h deleted file mode 100644 index 30e2a19..0000000 --- a/src/stack.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef STACK_H -#define STACK_H -#include "linkedlist.h" - -/** An ultra-simple stack implementation that just uses a linked list. - *@author Mike Buland - */ -class Stack -{ -public: - /** Pushes a new value onto the top of the stack. - *@param data A new value for the stack. - *@author Mike Buland - */ - void push( void *data ); - - /** Returns the top value off of the stack, but doesn't remove it from the - * stack. - *@returns The value at the top of the stack. - *@author Mike Buland - */ - void *top(); - - /** Pops the top item off of the stack. - *@author Mike Buland - */ - void pop(); - - /** Gets the top item off of the stack, pops it off the stack, and returns - * it. - *@returns The value at the top of the stack. - *@author Mike Buland - */ - void *poptop(); - - /** Checks if the stack is empty. - *@returns True if the stack is empty, and false if it has things in it. - *@author Mike Buland - */ - bool isEmpty(); - - /** Empty the stack. - *@author Mike Buland - */ - void empty(); - -private: - LinkedList lStackData; /**< The actual stack data. */ -}; -#endif diff --git a/src/staticstring.cpp b/src/staticstring.cpp deleted file mode 100644 index 60f130f..0000000 --- a/src/staticstring.cpp +++ /dev/null @@ -1,282 +0,0 @@ -#include "staticstring.h" -#include "serializer.h" - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> - -StaticString::StaticString() -{ - lpStr = NULL; - nLen = 0; -} - -StaticString::StaticString( int nLength ) -{ - lpStr = new char[nLength+1]; - nLen = nLength; - memset( lpStr, 0, nLength+1 ); -} - -StaticString::StaticString( const char *lpNewStr, int nNewLen ) -{ - lpStr = NULL; - nLen = 0; - setString( lpNewStr, nNewLen ); -} - -StaticString::StaticString( const char *lpNewStr ) -{ - lpStr = NULL; - nLen = 0; - setString( lpNewStr, -1 ); -} - -StaticString::StaticString( StaticString &xSrcStr, int nNewLen ) -{ - lpStr = NULL; - nLen = 0; - setString( xSrcStr, nNewLen ); -} - -StaticString::StaticString( StaticString &xSrcStr ) -{ - lpStr = NULL; - nLen = 0; - setString( xSrcStr, -1 ); -} - -StaticString::StaticString( const StaticString &xSrcStr ) -{ - nLen = xSrcStr.getLength(); - lpStr = new char[nLen]; - memcpy( lpStr, xSrcStr.getString(), nLen ); -} - -StaticString::~StaticString() -{ - if( lpStr != NULL ) delete[] lpStr; -} - -char *StaticString::getString() -{ - return lpStr; -} - -const char *StaticString::getString() const -{ - return lpStr; -} - -int StaticString::getLength() const -{ - return nLen; -} - -void StaticString::setLength( int nNewLength ) -{ - char *lpNewStr = new char[nNewLength+1]; - if( lpStr != NULL ) - { - strncpy( lpNewStr, lpStr, nNewLength ); - } - lpNewStr[nNewLength] = '\0'; - if( lpStr ) - { - delete[] lpStr; - } - lpStr = lpNewStr; - nLen = nNewLength; -} - -void StaticString::setString( const char *lpNewStr, int nNewLen ) -{ - if( lpStr ) - { - delete[] lpStr; - lpStr = NULL; - nLen = 0; - } - if( nNewLen < 0 ) - { - if( lpNewStr == NULL ) return; - nLen = strlen( lpNewStr ); - lpStr = new char[nLen+1]; - strcpy( lpStr, lpNewStr ); - } - else - { - nLen = nNewLen; - lpStr = new char[nLen+1]; - memset( lpStr, 0, nLen+1 ); - if( lpNewStr ) - strncpy( lpStr, lpNewStr, nNewLen ); - } -} - -void StaticString::setString( StaticString &sNewStr, int nNewLen ) -{ - if( lpStr ) - { - delete[] lpStr; - lpStr = NULL; - nLen = 0; - } - if( nNewLen < 0 ) - { - if( sNewStr.lpStr == NULL ) return; - nLen = sNewStr.nLen; - lpStr = new char[nLen+1]; - strcpy( lpStr, sNewStr.lpStr ); - } - else - { - nLen = nNewLen; - lpStr = new char[nLen+1]; - memset( lpStr, 0, nLen+1 ); - if( sNewStr.lpStr ) - strncpy( lpStr, sNewStr.lpStr, nNewLen ); - } -} - -StaticString &StaticString::operator=( StaticString &lpOtherStr ) -{ - setString( lpOtherStr ); - - return *this; -} - -StaticString &StaticString::operator=( std::string &lpOtherStr ) -{ - setString( lpOtherStr.c_str() ); - - return *this; -} - -StaticString &StaticString::operator=( const char *lpNewStr ) -{ - setString( lpNewStr ); - - return *this; -} - -StaticString::operator const char *() -{ - return lpStr; -} - -char StaticString::getAt( unsigned int nIndex ) -{ - if( nIndex < 0 || nIndex >= nLen ) - return '\0'; - - return lpStr[nIndex]; -} - -void StaticString::setAt( unsigned int nIndex, char cVal ) -{ - if( nIndex < 0 || nIndex >= nLen ) - return; - - lpStr[nIndex] = cVal; -} - -char &StaticString::operator[]( unsigned int nIndex ) -{ - if( nIndex < 0 || nIndex >= nLen ) - return lpStr[0]; - - return lpStr[nIndex]; -} - -StaticString::operator int() -{ - return nLen; -} - -char *StaticString::operator+( int nAmnt ) -{ - return lpStr + nAmnt; -} - -char *StaticString::operator-( int nAmnt ) -{ - return lpStr - nAmnt; -} - -void StaticString::clear() -{ - memset( lpStr, 0, nLen+1 ); -} - -void StaticString::serialize( Serializer &ar ) -{ - if( ar.isLoading() ) - { - ar >> nLen; - setLength( nLen ); - ar.read( lpStr, nLen ); - } - else - { - ar << nLen; - ar.write( lpStr, nLen ); - } -} - -bool StaticString::operator==( const char *str ) -{ - const char *a = str, *b = lpStr; - for(; *a == *b; a++, b++ ) if( *a == '\0' && *b == '\0' ) return true; - return false; -} - -bool StaticString::operator==( StaticString &str ) -{ - const char *a = str.lpStr, *b = lpStr; - for(; *a == *b; a++, b++ ) if( *a == '\0' && *b == '\0' ) return true; - return false; -} - -bool StaticString::operator!=( const char *str ) -{ - const char *a = str, *b = lpStr; - for(; *a == *b; a++, b++ ) if( *a == '\0' && *b == '\0' ) return false; - return true; -} - -bool StaticString::operator!=( StaticString &str ) -{ - const char *a = str.lpStr, *b = lpStr; - for(; *a == *b; a++, b++ ) if( *a == '\0' && *b == '\0' ) return false; - return true; -} -/* -unsigned long int StaticString::getHashCode() -{ - unsigned long int nPos = nLen; - unsigned long int j = 0; - for( const char *s = (const char *)lpStr; j< nLen; s++, j++ ) - { - nPos = *s + (nPos << 6) + (nPos << 16) - nPos; - } - return nPos; -} - -bool StaticString::compareForHash( Hashable &other ) -{ - if( ((StaticString &)other).nLen != nLen ) - return false; - - const char *a = ((StaticString &)other).lpStr; - const char *b = lpStr; - if( a == b ) - return true; - - for( unsigned long j = 0; j < nLen; j++, a++, b++ ) - if( *a != *b ) - return false; - - return true; -} -*/ diff --git a/src/staticstring.h b/src/staticstring.h deleted file mode 100644 index 4c3f7b8..0000000 --- a/src/staticstring.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef STATIC_STRING_H -#define STATIC_STRING_H - -#include <string> -#include "serializable.h" -//#include "hashable.h" - -/** - * Simple string managing class. Allows for dynamically allocated string data - * along with some minor caching to speed things up when accessing your - * string data. Really designed for making copies of strings easy and safe, - * and making accessing meta-info like length fast and reliable as well. - *@author Mike Buland - */ -class StaticString : public Serializable/*, public Hashable*/ -{ -public: - StaticString(); - StaticString( const char *lpNewStr, int nNewLen ); - StaticString( const char *lpNewStr ); - StaticString( StaticString &xSrcStr, int nNewLen ); - StaticString( StaticString &xSrcStr ); - StaticString( const StaticString &xSrcStr ); - StaticString( int nLength ); - virtual ~StaticString(); - - char *getString(); - const char *getString() const; - int getLength() const; - void setLength( int nNewLength ); - - void setString( const char *lpNewStr, int nNewLen=-1 ); - void setString( StaticString &sNewStr, int nNewLen=-1 ); - - char getAt( unsigned int nIndex ); - void setAt( unsigned int nIndex, char cVal ); - - class StaticString &operator=( class StaticString &lpOtherStr ); - class StaticString &operator=( std::string &lpOtherStr ); - class StaticString &operator=( const char *lpNewStr ); - operator const char *(); - char &operator[]( unsigned int nIndex ); - operator int(); - char *operator+( int nAmnt ); - char *operator-( int nAmnt ); - bool operator==( const char *str ); - bool operator==( StaticString &str ); - bool operator!=( const char *str ); - bool operator!=( StaticString &str ); - - void clear(); - - virtual void serialize( class Serializer &ar ); - - //virtual unsigned long int getHashCode(); - //virtual bool compareForHash( Hashable &other ); - -private: - char *lpStr; - uint32_t nLen; -}; - -#endif diff --git a/src/stream.cpp b/src/stream.cpp deleted file mode 100644 index 856a58d..0000000 --- a/src/stream.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "stream.h" - -Stream::Stream() -{ -} - -Stream::~Stream() -{ -} - diff --git a/src/stream.h b/src/stream.h deleted file mode 100644 index e086e28..0000000 --- a/src/stream.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef STREAM_H -#define STREAM_H - -#include <stdint.h> -#include <stdio.h> - -class Stream -{ -public: - Stream(); - virtual ~Stream(); - - virtual void close() = 0; - virtual size_t read( char *pBuf, size_t nBytes ) = 0; - virtual size_t write( const char *pBuf, size_t nBytes ) = 0; - - virtual long tell() = 0; - virtual void seek( long offset ) = 0; - virtual void setPos( long pos ) = 0; - virtual void setPosEnd( long pos ) = 0; - virtual bool isEOS() = 0; - -private: - -}; - -#endif diff --git a/src/stringrep.cpp b/src/stringrep.cpp deleted file mode 100644 index a505f8a..0000000 --- a/src/stringrep.cpp +++ /dev/null @@ -1,19 +0,0 @@ -#include "stringrep.h" - -int32_t stringlen( const char *s ) -{ - for( int32_t i = 0;; i++ ) - if( !s[i] ) - return i; -} - -char *stringdup( const char *s ) -{ - int len = stringlen( s ); - char *r = new char[len+1]; - for( int j = 0; j <= len; j++ ) - r[j] = s[j]; - - return r; -} - diff --git a/src/stringrep.h b/src/stringrep.h deleted file mode 100644 index eaa4a12..0000000 --- a/src/stringrep.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef STRING_REP_H -#define STRING_REP_H - -#include <stdint.h> - -/** - * Calculates the length of a string. - */ -int32_t stringlen( const char *s ); - -/** - * Identicle to strdup, which isn't available everywhere, but uses c++ memory - * facilities. Remember to use delete[] when freeing the returned string. - */ -char *stringdup( const char *s ); - -#endif diff --git a/src/tests/clistress.cpp b/src/tests/clistress.cpp deleted file mode 100644 index 6b0ac66..0000000 --- a/src/tests/clistress.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "connection.h" - -int main() -{ - Connection c; - - c.open("localhost", 4001 ); - - c.appendOutput("w"); - c.writeOutput(); - - c.waitForInput( 6, 5, 0 ); - - printf("read: %s\n", c.getInput() ); - - c.close(); - - return 0; -} - diff --git a/src/tests/confpair.cpp b/src/tests/confpair.cpp deleted file mode 100644 index fb1b0d3..0000000 --- a/src/tests/confpair.cpp +++ /dev/null @@ -1,19 +0,0 @@ -#include "confpair.h" -#include <iostream> - -using namespace std; - -int main() -{ - ConfPair<float> p1("DebugMode"); - p1.value() = 12; - cout << p1.value() << "\n"; - p1.value() = 55; - cout << p1.value() << "\n"; - - ConfPairBase &p = p1; - - p = "33.12"; - cout << p.getAsString(); -} - diff --git a/src/tests/connect.cpp b/src/tests/connect.cpp deleted file mode 100644 index a9fca64..0000000 --- a/src/tests/connect.cpp +++ /dev/null @@ -1,38 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <fcntl.h> -#include "connection.h" - -int main() -{ - Connection c; - c.open("127.0.0.1", 12457 ); - - { - int newSocket = c.getSocket(); - int flags; - - flags = fcntl(newSocket, F_GETFL, 0); - flags |= O_NONBLOCK; - if (fcntl(newSocket, F_SETFL, flags) < 0) - { - return false; - } - } - - for( int i = 0; i < 50; i++ ) - { - usleep( 100000 ); - int nbytes = c.readInput(); - if( nbytes == 0 ) - printf("0 bytes, EOF?\n"); - else - printf("Got %d bytes, whacky...\n", nbytes ); - } - - c.close(); - - return 0; -} - diff --git a/src/tests/exception.cpp b/src/tests/exception.cpp deleted file mode 100644 index 6417692..0000000 --- a/src/tests/exception.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include <iostream> -#include "exceptions.h" - -int main() -{ - try - { - throw ExceptionBase( 42, "There was an error on line: %d", __LINE__ ); - } - catch( ExceptionBase &e ) - { - std::cout << "Error "<< e.getErrorCode() << ": " << e.what() << "\n"; - } - - throw ExceptionBase( 112, "This exception wasn't caught!"); -} diff --git a/src/tests/formula.cpp b/src/tests/formula.cpp deleted file mode 100644 index 976b039..0000000 --- a/src/tests/formula.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "formula.h" - -int main( int argc, char *argv[] ) -{ - if( argc < 2 ) return 0; - - Formula f; - double dOut = f.run( argv[1] ); - printf("%s = %f\n", argv[1], dOut ); - - return 0; -} - diff --git a/src/tests/fstring.cpp b/src/tests/fstring.cpp deleted file mode 100644 index 271738c..0000000 --- a/src/tests/fstring.cpp +++ /dev/null @@ -1,48 +0,0 @@ -#include "hash.h" -#include "fstring.h" - -FString genThing() -{ - FString bob; - bob.append("ab "); - bob += "cd "; - bob += "efg"; - - printf("---bob------\n%08X: %s\n", (unsigned int)bob.c_str(), bob.c_str() ); - return bob; -} - -void thing( FString str ) -{ - printf("Hey: %s\n", str.c_str() ); -} - -#define pem printf("---------\n%08X: %s\n%08X: %s\n", (unsigned int)str.c_str(), str.c_str(), (unsigned int)str2.c_str(), str2.c_str() ); -int main( int argc, char *argv ) -{ - FString str("th"); - - str.prepend("Hello "); - str.append("ere."); - - FString str2( str ); - pem; - str += " What's up?"; - pem; - str2 += " How are you?"; - pem; - str = str2; - pem; - - str2 = genThing(); - pem; - - str = str2; - pem; - - thing( str2 ); - thing("test."); - - printf("%d == %d\n", __calcHashCode( str ), __calcHashCode( str.c_str() ) ); -} - diff --git a/src/tests/hash.cpp b/src/tests/hash.cpp deleted file mode 100644 index 2fc6968..0000000 --- a/src/tests/hash.cpp +++ /dev/null @@ -1,116 +0,0 @@ -#include "hash.h" -#include "staticstring.h" - -int main() -{ - const char *names[]={ - "Homer the Great", - "And Maggie Makes Three", - "Bart's Comet", - "Homie The Clown", - "Bart Vs Australia", - "Homer vs Patty and Selma", - "A star is burns", - "Lisa's Wedding", - "Two Dozen and One Greyhounds", - "The PTA Disbands", - "Round Springfield", - "The Springfield connection", - "Lemon of Troy", - "Who Shot Mr. Burns (Pt. 1)", - "Who Shot Mr. Burns (pt. 2)", - "Radioactive Man", - "Home Sweet Homediddly-dum-doodly", - "Bart Sells His Soul", - "Lisa the Vegetarian", - "Treehouse of horror VI", - "King Size Homer", - "Mother Simpson", - "Sideshow Bob's Last Gleaming", - "The Simpson's 138th Show Spectacular", - "Marge Be Not Proud", - "Team Homer", - "Two Bad Neighbors", - "Scenes From the Class Struggle in Springfield", - "Bart the Fink", - "Lisa the Iconoclast", - "Homer the Smithers", - "The Day the Violence Died", - "A Fish Called Selma", - "Bart on the road", - "22 Short Films about Springfield", - "The Curse of the Flying Hellfish", - "Much Apu about Nothing", - "Homerpalooza", - "The Summer of 4 Ft 2", - "Treehouse of Horror VII", - "You Only Move Twice", - "The Homer They Fall", - "Burns Baby Burns", - "Bart After Dark", - "A Millhouse Divided", - "Lisas Date With Destiny", - "Hurricane Neddy", - "The Mysterious Voyage of Our Homer", - "The Springfield Files", - "The Twisted World of Marge Simpson", - "Mountain of Madness", - NULL - }; - - Hash<const char *, int> sTest; - - printf("Inserting\n-------------------\n\n"); - for( int j = 0; j < 33; j++ ) - { - sTest[names[j]] = j; - } - - printf("Test1: %d, Test2: %d\n", sTest.has("Lemon of Troy"), sTest.has(std::string("Lemon of Troy").c_str() ) ); - - sTest.has(std::string("Lemon of Troy").c_str() ); - - printf("Getting\n-------------------\n\n"); - - sTest.erase("Homer the Great"); - sTest["Bart's Comet"].erase(); - - for( Hash<const char *, int>::iterator i = sTest.begin(); - i != sTest.end(); i++ ) - { - Hash<const char *, int>::iterator j = i; - printf("%d: %s\n", (*j).second, (*j).first ); - } - - printf("Testing\n-------------------\n\n"); - for( int j = 0; j < 33; j++ ) - { - if( sTest.has(names[j]) ) - { - if( sTest[names[j]] != j ) - { - printf("'%s' should be %d, is %d\n", - names[j], j, - sTest[names[j]].value() - ); - } - } - else - { - printf("Missing element %d, '%s'\n", j, names[j] ); - } - } - - printf("Clearing\n-------------------\n\n"); - - sTest.clear(); - - for( Hash<const char *, int>::iterator i = sTest.begin(); - i != sTest.end(); i++ ) - { - Hash<const char *, int>::iterator j = i; - printf("%d: %s\n", (*j).second, (*j).first ); - } - -} - diff --git a/src/tests/hashtest.cpp b/src/tests/hashtest.cpp deleted file mode 100644 index eaa84a0..0000000 --- a/src/tests/hashtest.cpp +++ /dev/null @@ -1,107 +0,0 @@ -#include <stdio.h> -#include <iostream> -#include "hashtable.h" -#include "hashfunctioncasestring.h" - -int main() -{ - const char *names[]={ - "Homer the Great", - "And Maggie Makes Three", - "Bart's Comet", - "Homie The Clown", - "Bart Vs Australia", - "Homer vs Patty and Selma", - "A star is burns", - "Lisa's Wedding", - "Two Dozen and One Greyhounds", - "The PTA Disbands", - "Round Springfield", - "The Springfield connection", - "Lemon of Troy", - "Who Shot Mr. Burns (Pt. 1)", - "Who Shot Mr. Burns (pt. 2)", - "Radioactive Man", - "Home Sweet Homediddly-dum-doodly", - "Bart Sells His Soul", - "Lisa the Vegetarian", - "Treehouse of horror VI", - "King Size Homer", - "Mother Simpson", - "Sideshow Bob's Last Gleaming", - "The Simpson's 138th Show Spectacular", - "Marge Be Not Proud", - "Team Homer", - "Two Bad Neighbors", - "Scenes From the Class Struggle in Springfield", - "Bart the Fink", - "Lisa the Iconoclast", - "Homer the Smithers", - "The Day the Violence Died", - "A Fish Called Selma", - "Bart on the road", - "22 Short Films about Springfield", - "The Curse of the Flying Hellfish", - "Much Apu about Nothing", - "Homerpalooza", - "The Summer of 4 Ft 2", - "Treehouse of Horror VII", - "You Only Move Twice", - "The Homer They Fall", - "Burns Baby Burns", - "Bart After Dark", - "A Millhouse Divided", - "Lisas Date With Destiny", - "Hurricane Neddy", - "The Mysterious Voyage of Our Homer", - "The Springfield Files", - "The Twisted World of Marge Simpson", - "Mountain of Madness", - NULL - }; - - HashTable h( new HashFunctionCaseString(), 5, false ); - - int j; - printf("Inserting...\n"); - for( j = 0; j < 10; j++ ) - { - h.insert( names[j], (void *)(j+1) ); - h.insert( names[j], (void *)(j+1) ); - printf("Capacity: %lu, Size: %lu, Load: %f\n", - h.getCapacity(), - h.getSize(), - h.getLoad() - ); - } - - for( j = 0; j < 10; j++ ) - { - printf("\"%s\" = %d\n", names[j], (int)h[names[j]] ); - } - - printf("\nDeleting some...\n"); - - for( int k = 0; k < 7; k++ ) - { - h.del( names[k] ); - //h.insert( names[j], (void *)(j+1) ); - printf("Capacity: %lu, Size: %lu, Load: %f\n", - h.getCapacity(), - h.getSize(), - h.getLoad() - ); - } - - printf("\nInserting more...\n"); - - for( ; names[j] != NULL; j++ ) - { - h.insert( names[j], (void *)(j+1) ); - printf("Capacity: %lu, Size: %lu, Load: %f\n", - h.getCapacity(), - h.getSize(), - h.getLoad() - ); - } -} diff --git a/src/tests/hashtest2.cpp b/src/tests/hashtest2.cpp deleted file mode 100644 index 74700fd..0000000 --- a/src/tests/hashtest2.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "hash.h" -#include <string.h> - -int main() -{ - char *a, *b; - a = new char[10]; - b = new char[10]; - strcpy( a, "Hey there"); - strcpy( b, "Hey there"); - printf("Same: %s\n", __cmpHashKeys( a, b )?"yes":"no"); - - return 0; -} - diff --git a/src/tests/httpsrv/httpconnectionmonitor.cpp b/src/tests/httpsrv/httpconnectionmonitor.cpp deleted file mode 100644 index 51d82f3..0000000 --- a/src/tests/httpsrv/httpconnectionmonitor.cpp +++ /dev/null @@ -1,88 +0,0 @@ -#include "httpconnectionmonitor.h" -#include "http.h" -#include "exceptions.h" -#include <sys/stat.h> - -HttpConnectionMonitor::HttpConnectionMonitor() -{ -} - -HttpConnectionMonitor::~HttpConnectionMonitor() -{ -} - -bool HttpConnectionMonitor::onNewConnection( Connection *pCon, int nPort ) -{ - printf("Got connection on port %d\n", nPort ); - - try - { - pCon->readInput( 60, 0 ); - printf("#######################\n%s\n#######################\n", pCon->getInput() ); - - Http hp( pCon ); - while( hp.parseRequest() == false ); - printf("Done parsing.\n\n"); - - if( hp.getRequestType() == Http::reqGet ) - { - printf("\"\"\"%s\"\"\"\n", hp.getRequestURI() ); - if( !strcmp( hp.getRequestURI(), "/" ) ) - { - std::string content("<html><head><title>Server Test</test></head><body>This is a test of a new system where all the pages will be more or less dynamic...<br>If you want to try to login, you can do that here:<br><form method=\"post\" action=\"showvars\" enctype=\"multipart/form-data\">Name: <input type=\"text\" name=\"name\"><br>Password: <input type=\"password\" name=\"pass\"><br><input type=\"submit\" name=\"action\" value=\"login\"></form></body></html>"); - hp.buildResponse(); - hp.setResponseContent( - "text/html", - content.c_str(), - content.size() - ); - hp.sendResponse(); - } - else - { - std::string content("<html><head><title>URL Not Found</test></head><body>There is no content mapped to the URL you requested. Please try another one.</body></html>"); - hp.buildResponse( 404, "File not found."); - hp.setResponseContent( - "text/html", - content.c_str(), - content.size() - ); - hp.sendResponse(); - } - } - else - { - printf("Non get: %s\n", hp.getRequestTypeStr() ); - pCon->appendOutput("HTTP/1.1 100 Continue\r\n\r\n"); - } - pCon->writeOutput(); - //for( int j = 0; j < 50; j++ ) - { - pCon->readInput( 1, 0 ); - //printf("Size so far: %d\n", pCon->getInputAmnt() ); - } - - if( pCon->hasInput() ) - { - std::string s( pCon->getInput(), pCon->getInputAmnt() ); - - pCon->printInputDebug(); - //printf("Reamining data\n==============\n%s\n==============\n", - // s.c_str() ); - } - - pCon->disconnect(); - } - catch( ConnectionException &e ) - { - printf("Connection: %s\n", e.what() ); - } - - return true; -} - -bool HttpConnectionMonitor::onClosedConnection( Connection *pCon ) -{ - return true; -} - diff --git a/src/tests/httpsrv/httpconnectionmonitor.h b/src/tests/httpsrv/httpconnectionmonitor.h deleted file mode 100644 index 30c0afd..0000000 --- a/src/tests/httpsrv/httpconnectionmonitor.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef HTTPCONNECTIONMONITOR_H -#define HTTPCONNECTIONMONITOR_H - -#include "connectionmonitor.h" - -class HttpConnectionMonitor : public ConnectionMonitor -{ -public: - HttpConnectionMonitor(); - ~HttpConnectionMonitor(); - - bool onNewConnection( Connection *pCon, int nPort ); - bool onClosedConnection( Connection *pCon ); -}; - -#endif diff --git a/src/tests/httpsrv/main.cpp b/src/tests/httpsrv/main.cpp deleted file mode 100644 index 2f1563c..0000000 --- a/src/tests/httpsrv/main.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "connectionmanager.h" -#include "httpconnectionmonitor.h" - -int main() -{ - printf("Starting server...\n"); - - ConnectionManager srv; - HttpConnectionMonitor http; - - srv.setConnectionMonitor( &http ); - - printf("Listening on port 7331\n"); - srv.startServer( 7331 ); - - for(;;) - { - srv.scanConnections( 5000, false ); - } - - return 0; -} diff --git a/src/tests/log.cpp b/src/tests/log.cpp deleted file mode 100644 index d7cfa0b..0000000 --- a/src/tests/log.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <iostream> -#include "multilog.h" -#include "multilogtext.h" - -class Test -{ -public: - Test() - { - MultiLineLog( 4, "Test init'd\n"); - } -}; - -int main() -{ - MultiLog &xLog = MultiLog::getInstance(); - - xLog.LineLog( 2, "Hello again"); - - MultiLog::getInstance().addChannel( - new MultiLogText( STDOUT_FILENO, "%02y-%02m-%02d %02h:%02M:%02s: %t" ) - ); - - MultiLineLog( MultiLog::LError, "Hi there!"); - Test t; -} - diff --git a/src/tests/md5test.cpp b/src/tests/md5test.cpp deleted file mode 100644 index 6f832df..0000000 --- a/src/tests/md5test.cpp +++ /dev/null @@ -1,19 +0,0 @@ -#include <stdio.h> -#include <string.h> -#include "md5.h" - -int main() -{ - md5 mproc; - md5sum sum; - char hexstr[33]; - - memset( hexstr, 0, 33 ); - - mproc.sumString( &sum, "qwertyuiopasdfgh" ); - mproc.sumToHex( &sum, hexstr ); - printf("sum: %s\n", hexstr ); - printf("chk: 1ebfc043d8880b758b13ddc8aa1638ef\n"); - - return 0; -} diff --git a/src/tests/ordhash.cpp b/src/tests/ordhash.cpp deleted file mode 100644 index f1d96ec..0000000 --- a/src/tests/ordhash.cpp +++ /dev/null @@ -1,48 +0,0 @@ -#include "ordhash.h" -#include <string> - -typedef struct eldef -{ - eldef( int a, int b, const std::string &c ) : - id( a ), nSequence( b ), sName( c ) {} - int id; - int nSequence; - std::string sName; -} eldef; - -struct seqcmp -{ - bool operator()( eldef **a, eldef **b ) - { - return (*a)->nSequence < (*b)->nSequence; - } -}; - -struct namcmp -{ - bool operator()( eldef **a, eldef **b ) - { - return (*a)->sName < (*b)->sName; - } -}; - -typedef OrdHash<int, eldef, seqcmp> AHash; -//typedef OrdHash<int, eldef, namcmp> AHash; - -int main() -{ - AHash hsh; - hsh[1] = eldef( 0, 43, "Bob"); - hsh[4] = eldef( 1, 443, "Abby"); - hsh[2] = eldef( 2, 1, "Name"); - hsh[5] = eldef( 3, 0, "Catagory"); - hsh[32] = eldef( 4, 12, "Epilogue"); - - for( AHash::iterator i = hsh.begin(); i != hsh.end(); i++ ) - { - eldef e = (*i).second; - printf("%d, %d, %s\n", e.id, e.nSequence, e.sName.c_str() ); - } - -} - diff --git a/src/tests/param.cpp b/src/tests/param.cpp deleted file mode 100644 index a4d2824..0000000 --- a/src/tests/param.cpp +++ /dev/null @@ -1,46 +0,0 @@ -#include "param.h" -#include <stdio.h> - -Param::Param() -{ - addHelpBanner("param - A test of the libbu++ parameter systems\n" - "Enjoy with care and caution\n\nTest stuff:\n"); - addParam( "name", 's', mkproc( Param::printStuff ), &str, "Test a param param" ); - //addParam( "name", &str ); - addParam( "job", 'U', mkproc( Param::printStuff ), "Test a paramless param" ); - - addHelpBanner("\nInformational:\n"); - addParam( "help", mkproc( ParamProc::help ), "Help!" ); - - addHelpBanner("\nThanks for trying my test!\n\n"); -} - -Param::~Param() -{ -} - -int Param::printStuff( int argc, char *argv[] ) -{ - printf("------------%02d-------------\n", argc ); - for( int j = 0; j < argc; j++ ) - { - printf("%d: %s\n", j, argv[j] ); - } - printf("---------------------------\n" ); - printf("SETVAR===\"%s\"\n", str.c_str() ); - - return 1; -} - -int main( int argc, char *argv[] ) -{ - if( argc == 1 ) - { - printf("You have to enter some parameter, try '--help'\n\n"); - return 0; - } - - Param p; - p.process( argc, argv ); -} - diff --git a/src/tests/param.h b/src/tests/param.h deleted file mode 100644 index 2756b69..0000000 --- a/src/tests/param.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef PARAM_H -#define PARAM_H - -#include <stdint.h> - -#include "paramproc.h" - -class Param : public ParamProc -{ -public: - Param(); - virtual ~Param(); - -private: - int printStuff( int argc, char *argv[] ); - - std::string str; - uint32_t uint32; -}; - -#endif diff --git a/src/tests/plugin/main.cpp b/src/tests/plugin/main.cpp deleted file mode 100644 index 51c8390..0000000 --- a/src/tests/plugin/main.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "plugger.h" -#include "plugin.h" - -int main() -{ - Plugger<Plugin> p; - - p.registerExternalPlugin( "./guy.so", "Guy" ); - - Plugin *t = p.instantiate( "Guy" ); - - p.destroy( t ); -} - diff --git a/src/tests/plugin/plugin.cpp b/src/tests/plugin/plugin.cpp deleted file mode 100644 index ea558fd..0000000 --- a/src/tests/plugin/plugin.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "plugin.h" - -Plugin::Plugin() -{ -} - -Plugin::~Plugin() -{ -} - diff --git a/src/tests/plugin/plugin.h b/src/tests/plugin/plugin.h deleted file mode 100644 index f726867..0000000 --- a/src/tests/plugin/plugin.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef PLUGIN_H -#define PLUGIN_H - -class Plugin -{ -public: - Plugin(); - virtual ~Plugin(); - -private: - -}; - -#endif diff --git a/src/tests/qsort.cpp b/src/tests/qsort.cpp deleted file mode 100644 index 28c6f03..0000000 --- a/src/tests/qsort.cpp +++ /dev/null @@ -1,228 +0,0 @@ -#define _QSORT_SWAP(a, b, t) ((void)((t = *a), (*a = *b), (*b = t))) - -/* Discontinue quicksort algorithm when partition gets below this size. - This particular magic number was chosen to work best on a Sun 4/260. */ -#define _QSORT_MAX_THRESH 4 - -/* Stack node declarations used to store unfulfilled partition obligations - * (inlined in QSORT). -typedef struct { - QSORT_TYPE *_lo, *_hi; -} qsort_stack_node; - */ - -/* The next 4 #defines implement a very fast in-line stack abstraction. */ -/* The stack needs log (total_elements) entries (we could even subtract - log(MAX_THRESH)). Since total_elements has type unsigned, we get as - upper bound for log (total_elements): - bits per byte (CHAR_BIT) * sizeof(unsigned). */ -#define _QSORT_STACK_SIZE (8 * sizeof(unsigned)) -#define _QSORT_PUSH(top, low, high) \ - (((top->_lo = (low)), (top->_hi = (high)), ++top)) -#define _QSORT_POP(low, high, top) \ - ((--top, (low = top->_lo), (high = top->_hi))) -#define _QSORT_STACK_NOT_EMPTY (_stack < _top) - - -/* Order size using quicksort. This implementation incorporates - four optimizations discussed in Sedgewick: - - 1. Non-recursive, using an explicit stack of pointer that store the - next array partition to sort. To save time, this maximum amount - of space required to store an array of SIZE_MAX is allocated on the - stack. Assuming a 32-bit (64 bit) integer for size_t, this needs - only 32 * sizeof(stack_node) == 256 bytes (for 64 bit: 1024 bytes). - Pretty cheap, actually. - - 2. Chose the pivot element using a median-of-three decision tree. - This reduces the probability of selecting a bad pivot value and - eliminates certain extraneous comparisons. - - 3. Only quicksorts TOTAL_ELEMS / MAX_THRESH partitions, leaving - insertion sort to order the MAX_THRESH items within each partition. - This is a big win, since insertion sort is faster for small, mostly - sorted array segments. - - 4. The larger of the two sub-partitions is always pushed onto the - stack first, with the algorithm then concentrating on the - smaller partition. This *guarantees* no more than log (total_elems) - stack size is needed (actually O(1) in this case)! */ - -/* The main code starts here... */ - -template<typename QSORT_TYPE, typename QSORT_LTT> -void qsrt( QSORT_TYPE *QSORT_BASE, int QSORT_NELT ) -{ - QSORT_LTT QSORT_LT; - QSORT_TYPE *const _base = (QSORT_BASE); - const unsigned _elems = (QSORT_NELT); - QSORT_TYPE _hold; - - /* Don't declare two variables of type QSORT_TYPE in a single - * statement: eg `TYPE a, b;', in case if TYPE is a pointer, - * expands to `type* a, b;' wich isn't what we want. - */ - - if (_elems > _QSORT_MAX_THRESH) { - QSORT_TYPE *_lo = _base; - QSORT_TYPE *_hi = _lo + _elems - 1; - struct { - QSORT_TYPE *_hi; QSORT_TYPE *_lo; - } _stack[_QSORT_STACK_SIZE], *_top = _stack + 1; - - while (_QSORT_STACK_NOT_EMPTY) { - QSORT_TYPE *_left_ptr; QSORT_TYPE *_right_ptr; - - /* Select median value from among LO, MID, and HI. Rearrange - LO and HI so the three values are sorted. This lowers the - probability of picking a pathological pivot value and - skips a comparison for both the LEFT_PTR and RIGHT_PTR in - the while loops. */ - - QSORT_TYPE *_mid = _lo + ((_hi - _lo) >> 1); - - if (QSORT_LT (_mid, _lo)) - _QSORT_SWAP (_mid, _lo, _hold); - if (QSORT_LT (_hi, _mid)) - _QSORT_SWAP (_mid, _hi, _hold); - else - goto _jump_over; - if (QSORT_LT (_mid, _lo)) - _QSORT_SWAP (_mid, _lo, _hold); - _jump_over:; - - _left_ptr = _lo + 1; - _right_ptr = _hi - 1; - - /* Here's the famous ``collapse the walls'' section of quicksort. - Gotta like those tight inner loops! They are the main reason - that this algorithm runs much faster than others. */ - do { - while (QSORT_LT (_left_ptr, _mid)) - ++_left_ptr; - - while (QSORT_LT (_mid, _right_ptr)) - --_right_ptr; - - if (_left_ptr < _right_ptr) { - _QSORT_SWAP (_left_ptr, _right_ptr, _hold); - if (_mid == _left_ptr) - _mid = _right_ptr; - else if (_mid == _right_ptr) - _mid = _left_ptr; - ++_left_ptr; - --_right_ptr; - } - else if (_left_ptr == _right_ptr) { - ++_left_ptr; - --_right_ptr; - break; - } - } while (_left_ptr <= _right_ptr); - - /* Set up pointers for next iteration. First determine whether - left and right partitions are below the threshold size. If so, - ignore one or both. Otherwise, push the larger partition's - bounds on the stack and continue sorting the smaller one. */ - - if (_right_ptr - _lo <= _QSORT_MAX_THRESH) { - if (_hi - _left_ptr <= _QSORT_MAX_THRESH) - /* Ignore both small partitions. */ - _QSORT_POP (_lo, _hi, _top); - else - /* Ignore small left partition. */ - _lo = _left_ptr; - } - else if (_hi - _left_ptr <= _QSORT_MAX_THRESH) - /* Ignore small right partition. */ - _hi = _right_ptr; - else if (_right_ptr - _lo > _hi - _left_ptr) { - /* Push larger left partition indices. */ - _QSORT_PUSH (_top, _lo, _right_ptr); - _lo = _left_ptr; - } - else { - /* Push larger right partition indices. */ - _QSORT_PUSH (_top, _left_ptr, _hi); - _hi = _right_ptr; - } - } - } - - /* Once the BASE array is partially sorted by quicksort the rest - is completely sorted using insertion sort, since this is efficient - for partitions below MAX_THRESH size. BASE points to the - beginning of the array to sort, and END_PTR points at the very - last element in the array (*not* one beyond it!). */ - - { - QSORT_TYPE *const _end_ptr = _base + _elems - 1; - QSORT_TYPE *_tmp_ptr = _base; - register QSORT_TYPE *_run_ptr; - QSORT_TYPE *_thresh; - - _thresh = _base + _QSORT_MAX_THRESH; - if (_thresh > _end_ptr) - _thresh = _end_ptr; - - /* Find smallest element in first threshold and place it at the - array's beginning. This is the smallest array element, - and the operation speeds up insertion sort's inner loop. */ - - for (_run_ptr = _tmp_ptr + 1; _run_ptr <= _thresh; ++_run_ptr) - if (QSORT_LT (_run_ptr, _tmp_ptr)) - _tmp_ptr = _run_ptr; - - if (_tmp_ptr != _base) - _QSORT_SWAP (_tmp_ptr, _base, _hold); - - /* Insertion sort, running from left-hand-side - * up to right-hand-side. */ - - _run_ptr = _base + 1; - while (++_run_ptr <= _end_ptr) { - _tmp_ptr = _run_ptr - 1; - while (QSORT_LT (_run_ptr, _tmp_ptr)) - --_tmp_ptr; - - ++_tmp_ptr; - if (_tmp_ptr != _run_ptr) { - QSORT_TYPE *_trav = _run_ptr + 1; - while (--_trav >= _run_ptr) { - QSORT_TYPE *_hi; QSORT_TYPE *_lo; - _hold = *_trav; - - for (_hi = _lo = _trav; --_lo >= _tmp_ptr; _hi = _lo) - *_hi = *_lo; - *_hi = _hold; - } - } - } - } - -} - - -struct cc -{ - bool operator()( int *a, int *b ) - { - return *a < *b; - } -}; - -#include <stdio.h> - -int main() -{ - int lst[] = { 43, 1, 342, 12, 491, 32, 12321, 32, 3, -3 }; - - for( int j = 0; j < 10; j++ ) - printf("%s%d", (j>0)?", ":"", lst[j] ); - printf("\n"); - qsrt<int, cc>( lst, 10 ); - for( int j = 0; j < 10; j++ ) - printf("%s%d", (j>0)?", ":"", lst[j] ); - printf("\n"); -} - diff --git a/src/tests/sbuffer.cpp b/src/tests/sbuffer.cpp deleted file mode 100644 index 02798cb..0000000 --- a/src/tests/sbuffer.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "sbuffer.h" - -int main() -{ - SBuffer buf; - - buf.write("abcdefg", 7 ); - - printf("tell: %ld\n", buf.tell() ); - - char abuf[6]; - int nRead; - nRead = buf.read( abuf, 5 ); - abuf[nRead] = '\0'; - printf("Read %d bytes \"%s\"\n", nRead, abuf ); - - buf.setPos( 0 ); - nRead = buf.read( abuf, 5 ); - abuf[nRead] = '\0'; - printf("Read %d bytes \"%s\"\n", nRead, abuf ); - - nRead = buf.read( abuf, 5 ); - abuf[nRead] = '\0'; - printf("Read %d bytes \"%s\"\n", nRead, abuf ); - -} - diff --git a/src/tests/serialize.cpp b/src/tests/serialize.cpp deleted file mode 100644 index e233704..0000000 --- a/src/tests/serialize.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "serializerbinary.h" -#include "staticstring.h" -#include <stdio.h> -#include <string> - -int main() -{ - int32_t one; - double two; - bool three; - StaticString s("Test string!"); - std::string ss("Another test string"); - SerializerBinary ar("hello.dat", false); - ar << (int)85; - ar << (double)2.63434; - ar << false; - ar << ss; - ar.close(); - - one = 0; two = 0; three = true; s = "die"; - - SerializerBinary ar2("hello.dat", true); - ar2 >> one; - ar2 >> two; - ar2 >> three; - ar2 >> s; - - printf("we got %d - %f - %s - \"%s\"\n", one, two, (three ? "true":"false"), s.getString() ); - return 0; -} diff --git a/src/tests/serializetext.cpp b/src/tests/serializetext.cpp deleted file mode 100644 index f6be7d3..0000000 --- a/src/tests/serializetext.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include "serializertext.h" -#include "staticstring.h" -#include <iostream> - -int main() -{ - StaticString s("You're a dog!!"); - SerializerText ar("hello.dat", false); - - ar << 4 << 3.993 << true << s; - - ar.close(); - - int one=0;float two=0.0;bool three=false; s = ""; - - SerializerText ar2("hello.dat", true); - - ar2 >> one; - ar2 >> two; - ar2 >> three; - ar2 >> s; - - //printf("out: %d, %f, %s, \"%s\"\n", one, two, (three ? "true" : "false"), s.getString()); - std::cout << one << ", " << two << ", " << three << ", " << s.getString() << "\n"; - - return 0; -} - diff --git a/src/tests/sha1.cpp b/src/tests/sha1.cpp deleted file mode 100644 index df3113c..0000000 --- a/src/tests/sha1.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include "sha1.h" -#include "sfile.h" - -#define BS 1024 - -int main( int argc, char *argv[] ) -{ - argc--; argv++; - - if( argc == 0 ) - { - printf("Provide a filename.\n"); - return 0; - } - - char buf[BS]; - - Sha1 s; - SFile fin( *argv, "rb" ); - for(;;) - { - int nRead = fin.read( buf, BS ); - if( nRead == 0 ) - break; - - s.update( buf, nRead ); - if( nRead < BS ) - break; - } - - unsigned char *dig = s.getDigest(); - - char val[]={"0123456789ABCDEF"}; - - for( int j = 0; j < 20; j++ ) - { - putchar( val[dig[j]>>4] ); - putchar( val[dig[j]&0x0F] ); - } - putchar('\n'); - - delete[] dig; -} - diff --git a/src/tests/sptr.cpp b/src/tests/sptr.cpp deleted file mode 100644 index 38d3675..0000000 --- a/src/tests/sptr.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#include <stdio.h> -#include "sptr.h" - -class Annoy -{ -public: - Annoy() : nCnt( 0 ) - { - printf("Created.\n"); - } - - ~Annoy() - { - printf("Destroyed.\n"); - } - - void go() - { - printf("%d: I'm annoying.\n", ++nCnt); - } - - int nCnt; -}; - -void beAnnoying( SPtr<Annoy> bob ) -{ - printf("bob-Count: %d\n", bob.count() ); - bob->go(); -} - -int main() -{ - SPtr<Annoy> pt( new Annoy ); - printf("Count: %d\n", pt.count() ); - pt->go(); - - { - SPtr<Annoy> pt2 = pt; - printf("Count: %d\n", pt2.count() ); - - pt2->go(); - - { - SPtr<Annoy> pt3( pt2 ); - printf("Count: %d\n", pt3.count() ); - - pt3->go(); - - beAnnoying( pt3 ); - } - printf("Count: %d\n", pt.count() ); - } - printf("Count: %d\n", pt.count() ); -} - diff --git a/src/tests/srvstress.cpp b/src/tests/srvstress.cpp deleted file mode 100644 index d9a9a1c..0000000 --- a/src/tests/srvstress.cpp +++ /dev/null @@ -1,91 +0,0 @@ -#include "connectionmanager.h" -#include "programlink.h" -#include "linkedlist.h" -#include "protocol.h" - -class StressProtocol : public Protocol -{ -public: - bool onNewData() - { - switch( getConnection()->getInput()[0] ) - { - case 'd': - throw "Hello"; - break; - - case 'w': - getConnection()->appendOutput("Hello"); - break; - }; - - return true; - } - - bool onNewConnection() - { - return true; - } -}; - -class StressMonitor : public ConnectionMonitor, public ProgramLink -{ -public: - bool init() - { - return true; - } - - bool deInit() - { - return true; - } - - bool timeSlice() - { - return true; - } - - bool onNewConnection( Connection *pCon, int nPort ) - { - StressProtocol *sp = new StressProtocol(); - pCon->setProtocol( sp ); - - printf(" sys: New connection: socket(%d), port(%d)\n", - pCon->getSocket(), nPort ); - - return true; - } - - bool onClosedConnection( Connection *pCon ) - { - printf(" sys: Closed connection: socket(%d)\n", - pCon->getSocket() ); - - return true; - } - - LinkMessage *processIRM( LinkMessage *pMsg ) - { - return NULL; - } -}; - -int main() -{ - printf("Starting server...\n"); - - ConnectionManager srv; - StressMonitor telnet; - - srv.setConnectionMonitor( &telnet ); - - srv.startServer( 4001 ); - - for(;;) - { - srv.scanConnections( 5000, false ); - } - - return 0; -} diff --git a/src/tests/strhash.cpp b/src/tests/strhash.cpp deleted file mode 100644 index f6528ca..0000000 --- a/src/tests/strhash.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include <stdio.h> -#include "hashfunctionstring.h" - -int main( int argc, char *argv[] ) -{ - HashFunctionString h; - - printf("\"%s\": %lu\n", argv[1], h.hash( argv[1] ) ); - - return 0; -} - diff --git a/src/tests/teltest/main.cpp b/src/tests/teltest/main.cpp deleted file mode 100644 index 5d3ec26..0000000 --- a/src/tests/teltest/main.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "connectionmanager.h" -#include "telnetmonitor.h" - -int main() -{ - printf("Starting server...\n"); - - ConnectionManager srv; - TelnetMonitor telnet; - - srv.setConnectionMonitor( &telnet ); - - srv.startServer( 4001 ); - - for(;;) - { - srv.scanConnections( 5000, false ); - } - - return 0; -} diff --git a/src/tests/teltest/telnetmonitor.cpp b/src/tests/teltest/telnetmonitor.cpp deleted file mode 100644 index 65954eb..0000000 --- a/src/tests/teltest/telnetmonitor.cpp +++ /dev/null @@ -1,54 +0,0 @@ -#include "telnetmonitor.h" -#include "protocoltelnet.h" -#include <sys/stat.h> - -TelnetMonitor::TelnetMonitor() -{ -} - -TelnetMonitor::~TelnetMonitor() -{ -} - -bool TelnetMonitor::init() -{ - return true; -} - -bool TelnetMonitor::deInit() -{ - return true; -} - -bool TelnetMonitor::timeSlice() -{ - for( int j = 0; j < lCon.getSize(); j++ ) - { - if( ((Connection *)lCon[j])->hasInput() ) - { - printf("%s\n", ((Connection *)lCon[j])->getInput() ); - } - } - return true; -} - -LinkMessage* TelnetMonitor::processIRM( LinkMessage *pMsg ) -{ - return NULL; -} - -bool TelnetMonitor::onNewConnection( Connection *pCon, int nPort ) -{ - ProtocolTelnet *pt = new ProtocolTelnet(); - pCon->setProtocol( pt ); - - lCon.append( pt ); - - return true; -} - -bool TelnetMonitor::onClosedConnection( Connection *pCon ) -{ - return true; -} - diff --git a/src/tests/teltest/telnetmonitor.h b/src/tests/teltest/telnetmonitor.h deleted file mode 100644 index ba5761e..0000000 --- a/src/tests/teltest/telnetmonitor.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef HTTPCONNECTIONMONITOR_H -#define HTTPCONNECTIONMONITOR_H - -#include "connectionmonitor.h" -#include "programlink.h" -#include "linkedlist.h" - -class TelnetMonitor : public ConnectionMonitor, public ProgramLink -{ -public: - TelnetMonitor(); - ~TelnetMonitor(); - - bool init(); - bool deInit(); - bool timeSlice(); - LinkMessage* processIRM( LinkMessage *pMsgIn ); - - bool onNewConnection( Connection *pCon, int nPort ); - bool onClosedConnection( Connection *pCon ); - -private: - LinkedList lCon; -}; - -#endif diff --git a/src/tests/xmlreadtest.cpp b/src/tests/xmlreadtest.cpp deleted file mode 100644 index d061810..0000000 --- a/src/tests/xmlreadtest.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "xmlfilereader.h" -#include "xmlstringreader.h" -#include "xmlfilewriter.h" - -int main( int argc, char *argv[] ) -{ - if( argc < 4 ) - { - printf("Usage: %s f <file in> <file out>\n", argv[0] ); - printf(" %s s <xml string> <file out>\n\n", argv[0] ); - return 0; - } - - if( argv[1][0] == 'f' ) - { - XmlFileReader r( argv[2], true ); -// XmlFileWriter w( argv[3], "\t", r.detatchRoot() ); -// w.write(); - } - else if( argv[1][0] == 's' ) - { - XmlStringReader r( argv[2], true ); - XmlFileWriter w(stdout, "\t", r.detatchRoot() ); - w.write(); - } - - return 0; -} - diff --git a/src/tests/xmlrepltest.cpp b/src/tests/xmlrepltest.cpp deleted file mode 100644 index 9667705..0000000 --- a/src/tests/xmlrepltest.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "xmlwriter.h" - -int main() -{ - printf("Testing Xml Replacement...\n"); - XmlDocument w; - - w.addNode("text"); - w.setContent("this text is before the node. "); - w.addNode("keepme", "This one we keep...", true ); - w.setContent("this text is after."); - w.addNode("deleteme", "This one we don't...", true ); - w.setContent("this is last..." ); - w.closeNode(); - - //XmlWriter::writeNode( stdout, w.getRoot(), 0, NULL ); - - printf("\n\n"); - - //XmlNode *xNode = w.getRoot()->detatchNode( 1 ); - - //XmlWriter::writeNode( stdout, w.getRoot(), 0, NULL ); - - printf("\n\n"); - - //XmlWriter::writeNode( stdout, xNode, 0, NULL ); - - printf("\n\n"); - - return 0; -} diff --git a/src/tests/xmlwritetest.cpp b/src/tests/xmlwritetest.cpp deleted file mode 100644 index a22d19d..0000000 --- a/src/tests/xmlwritetest.cpp +++ /dev/null @@ -1,48 +0,0 @@ -#include "xmlfilewriter.h" -#include "xmlstringwriter.h" -#include "xmlstringreader.h" - -void fillItIn( XmlWriter &w ) -{ - w.addNode("thinglist"); - - w.addNode("thing"); - w.addProperty("type", " ±î´<M-F6><M-F6>³¸®°êòì¯"); - - w.addNode("id", "Klophin²³±¹¸·µ´äêíëã Staff", true ); - w.addNode("name", "Klophin Staff", true ); - w.addNode("durability", "0.01", true ); - w.addNode("size", "0.1", true ); - - w.addNode("config"); - w.addNode("damage", "3d6+4", true ); - w.addNode("class", "melee", true ); - w.addNode("type", "bludgeon", true ); - w.addNode("damagedesc", "club/clubs", true ); - w.closeNode(); - - w.closeNode(); - - w.closeNode(); -} - -int main() -{ - printf("Testing XmlWriter...\n"); - - //XmlStringReader *xsr = new XmlStringReader("<stuff/>"); - - //printf("%08X\n%08X\n%08X\n", xsr, (XmlReader *)xsr, (XmlDocument *)xsr ); - - //delete (XmlDocument *)xsr; - XmlFileWriter wf("test.xml", "\t"); - - fillItIn( wf ); - - XmlStringWriter ws("\t"); - fillItIn( ws ); - - printf("Now the string version:\n\n%s\n", ws.getString().c_str() ); - - return 0; -} diff --git a/src/tokenstring.cpp b/src/tokenstring.cpp deleted file mode 100644 index e57ba69..0000000 --- a/src/tokenstring.cpp +++ /dev/null @@ -1,163 +0,0 @@ -#include "tokenstring.h" -#include <string.h> - -TokenString::TokenString( const char *lpNewTokenString ) -{ - lpTokenString = NULL; - if( lpNewTokenString ) - { - parseLine( lpNewTokenString ); - } -} - -TokenString::~TokenString() -{ - delete[] lpTokenString; - for( int j = 0; j < lToken.getSize(); j++ ) - { - delete[] (((Token *)lToken[j])->lpToken); - delete ((Token *)lToken[j]); - } -} - -void TokenString::parseLine( const char *lpNewTokenString ) -{ - if( lpTokenString != NULL ) - { - delete[] lpTokenString; - lpTokenString = NULL; - for( int j = 0; j < lToken.getSize(); j++ ) - { - delete[] (((Token *)lToken[j])->lpToken); - delete ((Token *)lToken[j]); - } - lToken.empty(); - } - if( lpNewTokenString == NULL ) - { - lpTokenString = new char[1]; - lpTokenString[0] = '\0'; - lToken.setSize(0); - return; - } - // First order of business, make an internal copy so someone can get it - // if they want to. - int nLen = strlen(lpNewTokenString); - lpTokenString = new char[nLen+1]; - strcpy( lpTokenString, lpNewTokenString ); - - // Now we do a preliminary parse. This could be effected by later - // editing and aliasing, but we'll see... - int nTkStart, nTkEnd; - int mode=0; // 0 = startSearch, 1=endSearch - for( int j = 0; j <= nLen; j++ ) - { - if( mode == 0 ) - { - if( lpTokenString[j] != ' ' && - lpTokenString[j] != '\t' ) - { - nTkStart = j; - mode = 1; - } - } - else - { - if( lpTokenString[j] == ' ' || - lpTokenString[j] == '\t' || - lpTokenString[j] == '\0' ) - { - nTkEnd = j-1; - mode = 0; - - appendToken( nTkStart, nTkEnd ); - } - } - } -} - -void TokenString::appendToken( int nStart, int nEnd ) -{ - Token *pToken = new Token; - pToken->lpOrig = &lpTokenString[nStart]; - - // nStart and nEnd are inclusive, we must add two for the end, and the null - pToken->lpToken = new char[nEnd-nStart+2]; - memcpy( pToken->lpToken, &lpTokenString[nStart], nEnd-nStart+1 ); - pToken->lpToken[nEnd-nStart+1] = '\0'; - -// printf("%s\n", pToken->lpToken ); - lToken.append( pToken ); -} - -void TokenString::insertToken( int nStart, int nEnd, char *lpOldOrig, const char *lpNewToken, int nIndex ) -{ - Token *pToken = new Token; - pToken->lpOrig = lpOldOrig; - - // nStart and nEnd are inclusive, we must add two for the end, and the null - pToken->lpToken = new char[nEnd-nStart+2]; - memcpy( pToken->lpToken, &lpNewToken[nStart], nEnd-nStart+1 ); - pToken->lpToken[nEnd-nStart+1] = '\0'; - - lToken.insertBefore( pToken, nIndex ); -} - -int TokenString::getNumTokens() -{ - return lToken.getSize(); -} - -char *TokenString::getToken( int nIndex ) -{ - if( nIndex >= lToken.getSize() ) return NULL; - return (char *)(((Token *)lToken[nIndex])->lpToken); -} - -char *TokenString::getTokenString( int nIndex ) -{ - if( nIndex >= lToken.getSize() ) return NULL; - return (char *)(((Token *)lToken[nIndex])->lpOrig); -} - -void TokenString::expandTokenTo( int nIndex, char *lpNewToken ) -{ - // First, we delete the token at nIndex, then we keep inserting - // at that position... - // We also have to remember the index to the original string, - // since most of what we're expanding to won't be in the origingal - // we need to keep these indexes updated in order to make other parts - // of the system happy. - char *lpOldOrig = ((Token *)lToken[nIndex])->lpOrig; - delete[] ((Token *)lToken[nIndex])->lpToken; - delete ((Token *)lToken[nIndex]); - lToken.deleteAt( nIndex ); - - // We'll do this just like we did above, but instead we'll - // do tricky things when we find tokens... - int nLen = strlen(lpNewToken); - int nTkStart, nTkEnd, nNewIndex=nIndex; - int mode=0; // 0 = startSearch, 1=endSearch - for( int j = 0; j <= nLen; j++ ) - { - if( mode == 0 ) - { - if( lpNewToken[j] != ' ' && lpNewToken[j] != '\t' ) - { - nTkStart = j; - mode = 1; - } - } - else - { - if( lpNewToken[j] == ' ' || lpNewToken[j] == '\t' || lpNewToken[j] == '\0' ) - { - nTkEnd = j-1; - mode = 0; - - insertToken( nTkStart, nTkEnd, lpOldOrig, lpNewToken, nNewIndex ); - nNewIndex++; - } - } - } -} diff --git a/src/tokenstring.h b/src/tokenstring.h deleted file mode 100644 index 42f7309..0000000 --- a/src/tokenstring.h +++ /dev/null @@ -1,114 +0,0 @@ -#ifndef TOKENSTRING_H -#define TOKENSTRING_H - -#include "linkedlist.h" - -/** A single tokenized command line. Contains all information necesarry to - * nicely access a stand-alone command line and to perform alias expansion - * inside of that command line. - * When expanding a token, the original command line is left intact, so any - * command usng a command line verbatum (getTokenString not getToken) will get - * the original, and not the expanded version. - * Since indexing into the original command line is also done by token, it - * means that using getTokenString( 0 ) will not always get you the first - * character of the command line, it will get you the first non-whitespace - * character. - * Furthermore, when expanding the expantion string is tokenized as well, - * but since the original string is unchanged, all tokens that expand any - * given index will all retain the same index into the original command line. - *@todo Update this to allow it to break on different types of token - * delimiters. - *@author Mike Buland - */ -class TokenString{ -public: - /** Automatically call parseLine when created. - *@param lpNewTokenString The command line to tokenize - *@author Mike Buland - */ - TokenString( const char *lpNewTokenString=NULL ); - virtual ~TokenString(); - - /** Performs a tokenizing parse on the given command line, setting it as - * the internal command line for all future tokenizing (excluding - * expansion) - *@param lpNewTokenString The new command line to set to this object. - *@author Mike Buland - */ - void parseLine( const char *lpNewTokenString ); - - /** Appends a token to the list of available tokens. This references the - * internal pointer to the command line, so no token string must be - * specified. - *@param nStart The first character of the token to insert. - *@param nEnd The last character of the token to insert. - *@author Mike Buland - */ - void appendToken( int nStart, int nEnd ); - - /** Gets the number of tokens. This is particularly useful post-aliasing - * since the number of tokens may not match what is percieved from the - * original command line. - *@returns The number of available tokens. - *@author Mike Buland - */ - int getNumTokens(); - - /** Gets a processed token specified by index. - *@param nIndex The index of the token to retrieve. - *@returns A pointer to the requested token. Please note that these tokens - * may not match the original command line. - *@author Mike Buland - */ - char *getToken( int nIndex ); - - /** Gets the original command line based on tokens. Use this if you want - * to perform your own processing on parts of the command line, without - * resorting to tokens. - * The first character in the returned string will always be - * non-whitespace. - *@param nIndex The index of the token to start at, zero gets you the whole - * command line. - *@returns A pointer to the internal original command line string, starting - * at the position of the first non-whitespace character of the token - * specified. - *@author Mike Buland - */ - char *getTokenString( int nIndex=0 ); - - /** Expands a token, replacing it with the string lpNewToken, but - * processing the new string for tokens before performing the replacement - *@param nIndex Which token should be replaced. - *@param lpNewToken The string to replace the token with. - *@author Mike Buland - */ - void expandTokenTo( int nIndex, char *lpNewToken ); - - /** Inserts a token at any position in the command line. This does not - * effect the original command line. - *@param nStart The start of the token in the string lpNewToken. (inclusive) - *@param nEnd The end of the token in the string lpToken. (inclusive) - *@param lpOldOrig The pointer to the position in the orginal command - * line where this new token should point. - *@param lpNewToken The string containing the new token. May contain more - * than just one token. - *@param nIndex The position to insert the token to. - *@author Mike Buland - */ - void insertToken( int nStart, int nEnd, char *lpOldOrig, const char *lpNewToken, int nIndex ); - -private: - char *lpTokenString; /**< The original text that this string came from */ - LinkedList lToken; /**< The list of tokens. */ - - /** - * A single token within the token string. - */ - typedef struct Token - { - char *lpOrig; /**< This is just a pointer back to lpTokenString */ - char *lpToken; /**< This is really a whole token */ - } Token; -}; - -#endif diff --git a/src/tqsort.h b/src/tqsort.h deleted file mode 100644 index c836b4f..0000000 --- a/src/tqsort.h +++ /dev/null @@ -1,207 +0,0 @@ -#ifndef T_QSORT_H -#define T_QSORT_H - -#define _QSORT_SWAP(a, b, t) ((void)((t = *a), (*a = *b), (*b = t))) - -/* Discontinue quicksort algorithm when partition gets below this size. - This particular magic number was chosen to work best on a Sun 4/260. */ -#define _QSORT_MAX_THRESH 4 - -/* Stack node declarations used to store unfulfilled partition obligations - * (inlined in QSORT). -typedef struct { - QSORT_TYPE *_lo, *_hi; -} qsort_stack_node; - */ - -/* The next 4 #defines implement a very fast in-line stack abstraction. */ -/* The stack needs log (total_elements) entries (we could even subtract - log(MAX_THRESH)). Since total_elements has type unsigned, we get as - upper bound for log (total_elements): - bits per byte (CHAR_BIT) * sizeof(unsigned). */ -#define _QSORT_STACK_SIZE (8 * sizeof(unsigned)) -#define _QSORT_PUSH(top, low, high) \ - (((top->_lo = (low)), (top->_hi = (high)), ++top)) -#define _QSORT_POP(low, high, top) \ - ((--top, (low = top->_lo), (high = top->_hi))) -#define _QSORT_STACK_NOT_EMPTY (_stack < _top) - - -/* Order size using quicksort. This implementation incorporates - four optimizations discussed in Sedgewick: - - 1. Non-recursive, using an explicit stack of pointer that store the - next array partition to sort. To save time, this maximum amount - of space required to store an array of SIZE_MAX is allocated on the - stack. Assuming a 32-bit (64 bit) integer for size_t, this needs - only 32 * sizeof(stack_node) == 256 bytes (for 64 bit: 1024 bytes). - Pretty cheap, actually. - - 2. Chose the pivot element using a median-of-three decision tree. - This reduces the probability of selecting a bad pivot value and - eliminates certain extraneous comparisons. - - 3. Only quicksorts TOTAL_ELEMS / MAX_THRESH partitions, leaving - insertion sort to order the MAX_THRESH items within each partition. - This is a big win, since insertion sort is faster for small, mostly - sorted array segments. - - 4. The larger of the two sub-partitions is always pushed onto the - stack first, with the algorithm then concentrating on the - smaller partition. This *guarantees* no more than log (total_elems) - stack size is needed (actually O(1) in this case)! */ - -/* The main code starts here... */ - -template<typename QSORT_TYPE, typename QSORT_LTT, typename CST> -void tqsort( QSORT_TYPE *QSORT_BASE, int QSORT_NELT ) -{ - QSORT_LTT QSORT_LT; - QSORT_TYPE *const _base = (QSORT_BASE); - const unsigned _elems = (QSORT_NELT); - QSORT_TYPE _hold; - - /* Don't declare two variables of type QSORT_TYPE in a single - * statement: eg `TYPE a, b;', in case if TYPE is a pointer, - * expands to `type* a, b;' wich isn't what we want. - */ - - if (_elems > _QSORT_MAX_THRESH) { - QSORT_TYPE *_lo = _base; - QSORT_TYPE *_hi = _lo + _elems - 1; - struct { - QSORT_TYPE *_hi; QSORT_TYPE *_lo; - } _stack[_QSORT_STACK_SIZE], *_top = _stack + 1; - - while (_QSORT_STACK_NOT_EMPTY) { - QSORT_TYPE *_left_ptr; QSORT_TYPE *_right_ptr; - - /* Select median value from among LO, MID, and HI. Rearrange - LO and HI so the three values are sorted. This lowers the - probability of picking a pathological pivot value and - skips a comparison for both the LEFT_PTR and RIGHT_PTR in - the while loops. */ - - QSORT_TYPE *_mid = _lo + ((_hi - _lo) >> 1); - - if (QSORT_LT ((CST)(_mid), (CST)(_lo))) - _QSORT_SWAP (_mid, _lo, _hold); - if (QSORT_LT ((CST)(_hi), (CST)(_mid))) - _QSORT_SWAP (_mid, _hi, _hold); - else - goto _jump_over; - if (QSORT_LT ((CST)(_mid), (CST)(_lo))) - _QSORT_SWAP (_mid, _lo, _hold); - _jump_over:; - - _left_ptr = _lo + 1; - _right_ptr = _hi - 1; - - /* Here's the famous ``collapse the walls'' section of quicksort. - Gotta like those tight inner loops! They are the main reason - that this algorithm runs much faster than others. */ - do { - while (QSORT_LT ((CST)(_left_ptr), (CST)(_mid))) - ++_left_ptr; - - while (QSORT_LT ((CST)(_mid), (CST)(_right_ptr))) - --_right_ptr; - - if (_left_ptr < _right_ptr) { - _QSORT_SWAP (_left_ptr, _right_ptr, _hold); - if (_mid == _left_ptr) - _mid = _right_ptr; - else if (_mid == _right_ptr) - _mid = _left_ptr; - ++_left_ptr; - --_right_ptr; - } - else if (_left_ptr == _right_ptr) { - ++_left_ptr; - --_right_ptr; - break; - } - } while (_left_ptr <= _right_ptr); - - /* Set up pointers for next iteration. First determine whether - left and right partitions are below the threshold size. If so, - ignore one or both. Otherwise, push the larger partition's - bounds on the stack and continue sorting the smaller one. */ - - if (_right_ptr - _lo <= _QSORT_MAX_THRESH) { - if (_hi - _left_ptr <= _QSORT_MAX_THRESH) - /* Ignore both small partitions. */ - _QSORT_POP (_lo, _hi, _top); - else - /* Ignore small left partition. */ - _lo = _left_ptr; - } - else if (_hi - _left_ptr <= _QSORT_MAX_THRESH) - /* Ignore small right partition. */ - _hi = _right_ptr; - else if (_right_ptr - _lo > _hi - _left_ptr) { - /* Push larger left partition indices. */ - _QSORT_PUSH (_top, _lo, _right_ptr); - _lo = _left_ptr; - } - else { - /* Push larger right partition indices. */ - _QSORT_PUSH (_top, _left_ptr, _hi); - _hi = _right_ptr; - } - } - } - - /* Once the BASE array is partially sorted by quicksort the rest - is completely sorted using insertion sort, since this is efficient - for partitions below MAX_THRESH size. BASE points to the - beginning of the array to sort, and END_PTR points at the very - last element in the array (*not* one beyond it!). */ - - { - QSORT_TYPE *const _end_ptr = _base + _elems - 1; - QSORT_TYPE *_tmp_ptr = _base; - register QSORT_TYPE *_run_ptr; - QSORT_TYPE *_thresh; - - _thresh = _base + _QSORT_MAX_THRESH; - if (_thresh > _end_ptr) - _thresh = _end_ptr; - - /* Find smallest element in first threshold and place it at the - array's beginning. This is the smallest array element, - and the operation speeds up insertion sort's inner loop. */ - - for (_run_ptr = _tmp_ptr + 1; _run_ptr <= _thresh; ++_run_ptr) - if (QSORT_LT ((CST)(_run_ptr), (CST)(_tmp_ptr))) - _tmp_ptr = _run_ptr; - - if (_tmp_ptr != _base) - _QSORT_SWAP (_tmp_ptr, _base, _hold); - - /* Insertion sort, running from left-hand-side - * up to right-hand-side. */ - - _run_ptr = _base + 1; - while (++_run_ptr <= _end_ptr) { - _tmp_ptr = _run_ptr - 1; - while (QSORT_LT ((CST)(_run_ptr), (CST)(_tmp_ptr))) - --_tmp_ptr; - - ++_tmp_ptr; - if (_tmp_ptr != _run_ptr) { - QSORT_TYPE *_trav = _run_ptr + 1; - while (--_trav >= _run_ptr) { - QSORT_TYPE *_hi; QSORT_TYPE *_lo; - _hold = *_trav; - - for (_hi = _lo = _trav; --_lo >= _tmp_ptr; _hi = _lo) - *_hi = *_lo; - *_hi = _hold; - } - } - } - } -} - -#endif diff --git a/src/unit/hashtable/hashtable.cpp b/src/unit/hashtable/hashtable.cpp deleted file mode 100644 index b2e1cf5..0000000 --- a/src/unit/hashtable/hashtable.cpp +++ /dev/null @@ -1,107 +0,0 @@ -#include <cstdlib> -#include <cstring> -#include <iostream> -#include <cpptest.h> -#include <string.h> -#include <set> -#include <map> - -#include "hashfunctionstring.h" -#include "hashfunctioncasestring.h" -#include "hashfunctionint.h" - -class HashFunctionSuite : public Test::Suite -{ -public: - HashFunctionSuite() - { - TEST_ADD( HashFunctionSuite::functionString ) - TEST_ADD( HashFunctionSuite::functionCaseString ) - TEST_ADD( HashFunctionSuite::functionInt ) - } - -private: - void functionStringWorker( HashFunction &hf, std::set<unsigned long> &sCodes, char *str, int nLevel, int nMax ) - { - for( char let = 'A'; let <= 'z'; let += 3 ) - { - str[nLevel+1] = '\0'; - str[nLevel] = let; - unsigned long x = hf.hash( str ); - TEST_ASSERT( sCodes.find( x ) == sCodes.end() ); - TEST_ASSERT( hf.cmpIDs( str, str ) ); - sCodes.insert( x ); - - if( nLevel < nMax ) - functionStringWorker( hf, sCodes, str, nLevel+1, nMax ); - } - } - - void functionString() - { - HashFunctionString hf; - char str[10]; - - std::set<unsigned long> sCodes; - - functionStringWorker( hf, sCodes, str, 0, 3 ); - } - - void functionCaseStringWorker( HashFunction &hf, std::map<unsigned long, char *> &sCodes, char *str, int nLevel, int nMax ) - { - for( char let = 'A'; let <= 'z'; let += 3 ) - { - str[nLevel+1] = '\0'; - str[nLevel] = let; - unsigned long x = hf.hash( str ); - std::map<unsigned long, char *>::iterator i = sCodes.find( x ); - if( i == sCodes.end() ) - { - sCodes[x] = strdup( str ); - } - else - { - TEST_ASSERT( strcasecmp( (*i).second, str ) == 0 ); - TEST_ASSERT( hf.cmpIDs( (*i).second, str ) == true ); - } - - if( nLevel < nMax ) - functionCaseStringWorker( hf, sCodes, str, nLevel+1, nMax ); - } - } - - void functionCaseString() - { - HashFunctionCaseString hf; - char str[10]; - - std::map<unsigned long, char *> sCodes; - - functionCaseStringWorker( hf, sCodes, str, 0, 3 ); - - std::map<unsigned long, char *>::iterator i; - for( i = sCodes.begin(); i != sCodes.end(); i++ ) - { - free( (*i).second ); - } - } - - void functionInt() - { - HashFunctionInt hf; - - for( long i = -100000; i <= 100000; i += 100 ) - { - TEST_ASSERT( ((long)hf.hash( (void *)i )) == i ); - TEST_ASSERT( ((long)hf.cmpIDs( (void *)i, (void *)i )) ); - } - } -}; - -int main( int argc, char *argv[] ) -{ - Test::TextOutput output( Test::TextOutput::Verbose ); - HashFunctionSuite ts; - return ts.run( output ) ? EXIT_SUCCESS : EXIT_FAILURE; -} - diff --git a/src/unit/xml/xml.cpp b/src/unit/xml/xml.cpp deleted file mode 100644 index e4d779c..0000000 --- a/src/unit/xml/xml.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include <cstdlib> -#include <cstring> -#include <iostream> -#include <cpptest.h> -#include <string.h> - -#include "xmlstringreader.h" -#include "xmlexception.h" - -class XmlCoreTestSuite : public Test::Suite -{ -public: - XmlCoreTestSuite() - { - TEST_ADD( XmlCoreTestSuite::badXml01 ) - TEST_ADD( XmlCoreTestSuite::badXml02 ) - TEST_ADD( XmlCoreTestSuite::badXml03 ) - - TEST_ADD( XmlCoreTestSuite::entityBuiltin01 ) - - TEST_ADD( XmlCoreTestSuite::entityDoc01 ) - } - -private: - void badXml01() - { - TEST_THROWS( XmlStringReader r("<hello></bye>"), XmlException & ); - } - - void badXml02() - { - TEST_THROWS( XmlStringReader r("<hello>"), XmlException & ); - } - - void badXml03() - { - TEST_THROWS( XmlStringReader r("<hello param=\"stuff?"), XmlException & ); - } - - void entityBuiltin01() - { - XmlStringReader r("<hello>><&'"</hello>"); - TEST_ASSERT( strcmp( r.getRoot()->getContent(), "><&\'\"" ) == 0 ); - } - - void entityDoc01() - { - XmlStringReader r("<!ENTITY name \"bob the man\"><hello>"&name;"</hello>"); - TEST_ASSERT( strcmp( r.getRoot()->getContent(), "\"bob the man\"" ) == 0 ); - } -}; - -int main( int argc, char *argv[] ) -{ - Test::TextOutput output( Test::TextOutput::Verbose ); - XmlCoreTestSuite ts; - return ts.run( output ) ? EXIT_SUCCESS : EXIT_FAILURE; -} - diff --git a/src/xmldocument.cpp b/src/xmldocument.cpp deleted file mode 100644 index d7867d5..0000000 --- a/src/xmldocument.cpp +++ /dev/null @@ -1,149 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include "xmlwriter.h" - -XmlDocument::XmlDocument( XmlNode *pRoot ) -{ - this->pRoot = pRoot; - pCurrent = NULL; - bCompleted = (pRoot!=NULL); -} - -XmlDocument::~XmlDocument() -{ - if( pRoot ) - { - delete pRoot; - } -} - -void XmlDocument::addNode( const char *sName, const char *sContent, bool bClose ) -{ - if( pRoot == NULL ) - { - // This is the first node, so ignore position and just insert it. - pCurrent = pRoot = new XmlNode( sName, NULL, sContent ); - } - else - { - pCurrent = pCurrent->addChild( sName, sContent ); - } - - if( bClose ) - { - closeNode(); - } -} - -void XmlDocument::setName( const char *sName ) -{ - pCurrent->setName( sName ); -} - -bool XmlDocument::isCompleted() -{ - return bCompleted; -} - -XmlNode *XmlDocument::getRoot() -{ - return pRoot; -} - -XmlNode *XmlDocument::detatchRoot() -{ - XmlNode *pTemp = pRoot; - pRoot = NULL; - return pTemp; -} - -XmlNode *XmlDocument::getCurrent() -{ - return pCurrent; -} - -void XmlDocument::closeNode() -{ - if( pCurrent != NULL ) - { - pCurrent = pCurrent->getParent(); - - if( pCurrent == NULL ) - { - bCompleted = true; - } - } -} - -void XmlDocument::addProperty( const char *sName, const char *sValue ) -{ - if( pCurrent ) - { - pCurrent->addProperty( sName, sValue ); - } -} - -void XmlDocument::addProperty( const char *sName, const unsigned char nValue ) -{ - char buf[12]; - sprintf( buf, "%hhi", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const char nValue ) -{ - char buf[12]; - sprintf( buf, "%hhi", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const unsigned short nValue ) -{ - char buf[12]; - sprintf( buf, "%hi", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const short nValue ) -{ - char buf[12]; - sprintf( buf, "%hi", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const int nValue ) -{ - char buf[12]; - sprintf( buf, "%d", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const unsigned long nValue ) -{ - char buf[12]; - sprintf( buf, "%li", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const long nValue ) -{ - char buf[12]; - sprintf( buf, "%li", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const double dValue ) -{ - char buf[40]; - sprintf( buf, "%f", dValue ); - addProperty( sName, buf ); -} - -void XmlDocument::setContent( const char *sContent ) -{ - if( pCurrent ) - { - pCurrent->setContent( sContent ); - } -} - diff --git a/src/xmldocument.h b/src/xmldocument.h deleted file mode 100644 index 6671c41..0000000 --- a/src/xmldocument.h +++ /dev/null @@ -1,171 +0,0 @@ -#ifndef XMLDOCUMENT -#define XMLDOCUMENT - -#include "xmlnode.h" - -/** - * Keeps track of an easily managed set of XmlNode information. Allows simple - * operations for logical writing to and reading from XML structures. Using - * already formed structures is simply done through the XmlNode structures, - * and the getRoot function here. Creation is performed through a simple set - * of operations that creates the data in a stream type format. - *@author Mike Buland - */ -class XmlDocument -{ -public: - /** - * Construct either a blank XmlDocuemnt or construct a document around an - * existing XmlNode. Be careful, once an XmlNode is passed into a document - * the document takes over ownership and will delete it when the XmlDocument - * is deleted. - *@param pRoot The XmlNode to use as the root of this document, or NULL if - * you want to start a new document. - */ - XmlDocument( XmlNode *pRoot=NULL ); - - /** - * Destroy all contained nodes. - */ - virtual ~XmlDocument(); - - /** - * Add a new node to the document. The new node is appended to the end of - * the current context, i.e. XmlNode, and the new node, provided it isn't - * close as part of this operation, will become the current context. - *@param sName The name of the new node to add. - *@param sContent A content string to be placed inside of the new node. - *@param bClose Set this to true to close the node immediately after adding - * the node and setting the content and name. If this is set to true the - * node is appended, but the context node doesn't change. - */ - void addNode( const char *sName=NULL, const char *sContent=NULL, bool bClose=false ); - - /** - * Set the name of the current node context. - *@param sName The new name of the node. - */ - void setName( const char *sName ); - - /** - * Close the current node context. This will move the current context to - * the parent node of the former current node. If the current node was the - * root then the "completed" flag is set and no more operations are allowed. - */ - void closeNode(); - - /** - * Change the content of the current node at the current position between - * nodes. - *@param sContent The new content of the current node. - */ - void setContent( const char *sContent ); - - /** - * Add a named property to the current context node. - *@param sName The name of the property to add. - *@param sValue The string value of the property. - */ - void addProperty( const char *sName, const char *sValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const unsigned char nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const char nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const unsigned short nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const short nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const unsigned long nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const long nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const int nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param dValue The numerical value to add. - */ - void addProperty( const char *sName, const double dValue ); - - /** - * The XmlDocuemnt is considered completed if the root node has been closed. - * Once an XmlDocument has been completed, you can no longer perform - * operations on it. - *@return True if completed, false if still in progress. - */ - bool isCompleted(); - - /** - * Get a pointer to the root object of this XmlDocument. - *@returns A pointer to an internally owned XmlNode. Do not delete this - * XmlNode. - */ - XmlNode *getRoot(); - - /** - * Get a pointer to the root object of this XmlDocument, and remove the - * ownership from this object. - *@returns A pointer to an internally owned XmlNode. Do not delete this - * XmlNode. - */ - XmlNode *detatchRoot(); - - /** - * Get the current context node, which could be the same as the root node. - *@returns A pointer to an internally owned XmlNode. Do not delete this - * XmlNode. - */ - XmlNode *getCurrent(); - -private: - XmlNode *pRoot; /**< The root node. */ - XmlNode *pCurrent; /**< The current node. */ - bool bCompleted; /**< Is it completed? */ -}; - -#endif diff --git a/src/xmlfilereader.cpp b/src/xmlfilereader.cpp deleted file mode 100644 index ed674a8..0000000 --- a/src/xmlfilereader.cpp +++ /dev/null @@ -1,58 +0,0 @@ -#include "xmlfilereader.h" -#include "exceptions.h" -#include <string.h> - -XmlFileReader::XmlFileReader( const char *sFile, bool bStrip ) - : XmlReader( bStrip ) -{ - fh = fopen( sFile, "rt" ); - - if( fh == NULL ) - { - throw XmlException("Couldn't open file: %s", sFile ); - //nError = 1; - } - else - { - buildDoc(); - } -} - -XmlFileReader::~XmlFileReader() -{ -} - -char XmlFileReader::getChar( int nIndex ) -{ - // Make sure we always have a little data left in the buffer - if( fbDataIn.getLength() <= nIndex+1 && fh ) - { - int nBytes = fbDataIn.getCapacity()-1; - char *buf = new char[nBytes]; - int nRead = fread( buf, 1, nBytes, fh ); - fbDataIn.appendData( buf, nRead ); - delete[] buf; - - if( nRead < nBytes ) - { - fclose( fh ); - fh = NULL; - } - } - if( fbDataIn.getLength() >= nIndex+1 ) - { - return fbDataIn.getData()[nIndex]; - } - else - { - throw XmlException("End of XML stream read."); - } -} - -void XmlFileReader::usedChar( int nAmnt ) -{ - if( fbDataIn.getLength()-nAmnt >= 0 ) - { - fbDataIn.usedData( nAmnt ); - } -} diff --git a/src/xmlfilereader.h b/src/xmlfilereader.h deleted file mode 100644 index e3e02c2..0000000 --- a/src/xmlfilereader.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef XMLFILEREADER -#define XMLFILEREADER - -#include <stdio.h> -#include "xmlreader.h" -#include "flexbuf.h" - -/** - * Takes care of reading in xml formatted data from a file. This could/should - * be made more arbitrary in the future so that we can read the data from any - * source. This is actually made quite simple already since all data read in - * is handled by one single helper function and then palced into a FlexBuf for - * easy access by the other functions. The FlexBuf also allows for block - * reading from disk, which improves speed by a noticable amount. - * <br> - * There are also some extra features implemented that allow you to break the - * standard XML reader specs and eliminate leading and trailing whitespace in - * all read content. This is useful in situations where you allow additional - * whitespace in the files to make them easily human readable. The resturned - * content will be NULL in sitautions where all content between nodes was - * stripped. - *@author Mike Buland - */ -class XmlFileReader : public XmlReader -{ -public: - /** - * Construct an XmlReader around an xml file on your file system. - *@param sFile The file to read. - *@param bStrip Set to true to strip out leading and trailing whitespace in - * node contents. - */ - XmlFileReader( const char *sFile, bool bStrip=false ); - - /** - * Destroy the reader and cleanup. - */ - virtual ~XmlFileReader(); - -private: - char getChar( int nIndex = 0 ); - void usedChar( int nAmnt = 1 ); - FILE *fh; /**< The file handle. */ - FlexBuf fbDataIn; /**< The input buffer. */ -}; - -#endif diff --git a/src/xmlfilewriter.cpp b/src/xmlfilewriter.cpp deleted file mode 100644 index 3c6fb41..0000000 --- a/src/xmlfilewriter.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include "xmlfilewriter.h" - -XmlFileWriter::XmlFileWriter( const char *sFileName, const char *sIndent, XmlNode *pRoot ) : - XmlWriter( sIndent, pRoot ) -{ - this->sFileName = sFileName; - fh = fopen( sFileName, "wt"); - fprintf( fh, "<?xml version=\"1.0\"?>\n"); -} - -XmlFileWriter::XmlFileWriter( FILE *fh, const char *sIndent, XmlNode *pRoot ) : - XmlWriter( sIndent, pRoot ), - fh( fh ) -{ -} - -XmlFileWriter::~XmlFileWriter() -{ - fclose( fh ); -} - -void XmlFileWriter::writeString( const char *sString ) -{ - fputs( sString, fh ); -} - diff --git a/src/xmlfilewriter.h b/src/xmlfilewriter.h deleted file mode 100644 index e328f96..0000000 --- a/src/xmlfilewriter.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef XML_FILE_WRITER -#define XML_FILE_WRITER - -#include "xmlnode.h" -#include "xmlwriter.h" - -/** - * Implements xml writing in the XML standard format. Also allows you to - * break that format and auto-indent your exported xml data for ease of - * reading. The auto-indenting will only be applied to sections that - * have no content of their own already. This means that except for - * whitespace all of your data will be preserved perfectly. - * You can create an XmlWriter object around a file, or access the static - * write function directly and just hand it a filename and a root XmlNode. - * When using an XmlWriter object the interface is identicle to that of - * the XmlDocument class, so reference that class for API info. However - * when the initial (or root) node is closed, and the document is finished - * the file will be created and written to automatically. The user can - * check to see if this is actually true by calling the isFinished - * function in the XmlDocument class. - *@author Mike Buland - */ -class XmlFileWriter : public XmlWriter -{ -public: - /** - * Construct a file writer around a given file. - *@param sFileName The file to create or overwrite and write XML into. - *@param sIndent The indent text to use, if any. - */ - XmlFileWriter( const char *sFileName, const char *sIndent=NULL, XmlNode *pRoot=NULL ); - XmlFileWriter( FILE *fh, const char *sIndent=NULL, XmlNode *pRoot=NULL ); - - /** - * Destroy the writer. - */ - virtual ~XmlFileWriter(); - -private: - void writeString( const char *sString ); - std::string sFileName; /**< The filename to write to. */ - FILE *fh; /**< The file handle to the open file. */ -}; - -#endif diff --git a/src/xmlnode.cpp b/src/xmlnode.cpp deleted file mode 100644 index b1ed9a9..0000000 --- a/src/xmlnode.cpp +++ /dev/null @@ -1,445 +0,0 @@ -#include "xmlnode.h" -#include "hashfunctionstring.h" - -XmlNode::XmlNode( const char *sName, XmlNode *pParent, const char *sContent ) : - hProperties( new HashFunctionString(), 53, false ), - hChildren( new HashFunctionString(), 53, true ) -{ - this->pParent = pParent; - if( sName != NULL ) - { - setName( sName ); - } - if( sContent != NULL ) - { - this->sPreContent = new std::string( sContent ); - } - else - { - this->sPreContent = NULL; - } - nCurContent = 0; -} - -XmlNode::~XmlNode() -{ - for( int j = 0; j < lChildren.getSize(); j++ ) - { - delete (XmlNode *)lChildren[j]; - } - for( int j = 0; j < lPropNames.getSize(); j++ ) - { - delete (std::string *)lPropNames[j]; - } - for( int j = 0; j < lPropValues.getSize(); j++ ) - { - delete (std::string *)lPropValues[j]; - } - for( int j = 0; j < lPostContent.getSize(); j++ ) - { - if( lPostContent[j] != NULL ) - { - delete (std::string *)lPostContent[j]; - } - } - if( sPreContent ) - { - delete sPreContent; - } -} - -void XmlNode::setName( const char *sName ) -{ - if( pParent ) - { - if( this->sName.size() == 0 ) - { - // We're not in the hash yet, so add us - this->sName = sName; - pParent->hChildren.insert( this->sName.c_str(), this ); - } - else - { - // Slightly more tricky, delete us, then add us... - pParent->hChildren.del( this->sName.c_str() ); - this->sName = sName; - pParent->hChildren.insert( this->sName.c_str(), this ); - } - } - else - { - // If we have no parent, then just set the name string, we don't need - // to worry about hashing. - this->sName = sName; - } -} - -void XmlNode::setContent( const char *sContent, int nIndex ) -{ - if( nIndex == -1 ) - { - nIndex = nCurContent; - } - if( nIndex == 0 ) - { - if( this->sPreContent ) - { - delete this->sPreContent; - } - - this->sPreContent = new std::string( sContent ); - } - else - { - nIndex--; - if( lPostContent[nIndex] ) - { - delete (std::string *)lPostContent[nIndex]; - } - - lPostContent.setAt( nIndex, new std::string( sContent ) ); - } -} - -const char *XmlNode::getContent( int nIndex ) -{ - if( nIndex == 0 ) - { - if( sPreContent ) - { - return sPreContent->c_str(); - } - } - else - { - nIndex--; - if( lPostContent[nIndex] ) - { - return ((std::string *)lPostContent[nIndex])->c_str(); - } - } - - return NULL; -} - -XmlNode *XmlNode::addChild( const char *sName, const char *sContent ) -{ - return addChild( new XmlNode( sName, this, sContent ) ); -} - -XmlNode *XmlNode::addChild( XmlNode *pNode ) -{ - lChildren.append( pNode ); - lPostContent.append( NULL ); - nCurContent++; - pNode->pParent = this; - - return pNode; -} - -XmlNode *XmlNode::getParent() -{ - return pParent; -} - -void XmlNode::addProperty( const char *sName, const char *sValue ) -{ - std::string *pName = new std::string( sName ); - std::string *pValue = new std::string( sValue ); - - hProperties.insert( pName->c_str(), pValue->c_str() ); - lPropNames.append( pName ); - lPropValues.append( pValue ); -} - -int XmlNode::getNumProperties() -{ - return lPropNames.getSize(); -} - -const char *XmlNode::getPropertyName( int nIndex ) -{ - std::string *tmp = ((std::string *)lPropNames[nIndex]); - if( tmp == NULL ) - return NULL; - return tmp->c_str(); -} - -const char *XmlNode::getProperty( int nIndex ) -{ - std::string *tmp = ((std::string *)lPropValues[nIndex]); - if( tmp == NULL ) - return NULL; - return tmp->c_str(); -} - -const char *XmlNode::getProperty( const char *sName ) -{ - const char *tmp = (const char *)hProperties[sName]; - if( tmp == NULL ) - return NULL; - return tmp; -} - -void XmlNode::deleteProperty( int nIndex ) -{ - hProperties.del( ((std::string *)lPropNames[nIndex])->c_str() ); - - delete (std::string *)lPropNames[nIndex]; - delete (std::string *)lPropValues[nIndex]; - - lPropNames.deleteAt( nIndex ); - lPropValues.deleteAt( nIndex ); -} - -bool XmlNode::hasChildren() -{ - return lChildren.getSize()>0; -} - -int XmlNode::getNumChildren() -{ - return lChildren.getSize(); -} - -XmlNode *XmlNode::getChild( int nIndex ) -{ - return (XmlNode *)lChildren[nIndex]; -} - -XmlNode *XmlNode::getChild( const char *sName, int nSkip ) -{ - return (XmlNode *)hChildren.get( sName, nSkip ); -} - -const char *XmlNode::getName() -{ - return sName.c_str(); -} - -void XmlNode::deleteNode( int nIndex, const char *sReplacementText ) -{ - XmlNode *xRet = detatchNode( nIndex, sReplacementText ); - - if( xRet != NULL ) - { - delete xRet; - } -} - -XmlNode *XmlNode::detatchNode( int nIndex, const char *sReplacementText ) -{ - if( nIndex < 0 || nIndex >= lChildren.getSize() ) - return NULL; - - // The real trick when deleteing a node isn't actually deleting it, it's - // reforming the content around the node that's now missing...hmmm... - - if( nIndex == 0 ) - { - // If the index is zero we have to deal with the pre-content - if( sReplacementText ) - { - if( sPreContent == NULL ) - { - sPreContent = new std::string( sReplacementText ); - } - else - { - *sPreContent += sReplacementText; - } - } - if( lPostContent.getSize() > 0 ) - { - if( lPostContent[0] != NULL ) - { - if( sPreContent == NULL ) - { - sPreContent = new std::string( - ((std::string *)lPostContent[0])->c_str() - ); - } - else - { - *sPreContent += - ((std::string *)lPostContent[0])->c_str(); - } - } - delete (std::string *)lPostContent[0]; - lPostContent.deleteAt( 0 ); - } - } - else - { - int nCont = nIndex-1; - // If it's above zero we deal with the post-content only - if( sReplacementText ) - { - if( lPostContent[nCont] == NULL ) - { - lPostContent.setAt( nCont, new std::string( sReplacementText ) ); - } - else - { - *((std::string *)lPostContent[nCont]) += sReplacementText; - } - } - if( lPostContent.getSize() > nIndex ) - { - if( lPostContent[nIndex] != NULL ) - { - if( lPostContent[nCont] == NULL ) - { - lPostContent.setAt( nCont, new std::string( - ((std::string *)lPostContent[nIndex])->c_str() - ) ); - } - else - { - *((std::string *)lPostContent[nCont]) += - ((std::string *)lPostContent[nIndex])->c_str(); - } - } - delete (std::string *)lPostContent[nIndex]; - lPostContent.deleteAt( nIndex ); - } - } - - XmlNode *xRet = (XmlNode *)lChildren[nIndex]; - hChildren.del( ((XmlNode *)lChildren[nIndex])->getName() ); - lChildren.deleteAt( nIndex ); - - return xRet; -} - -void XmlNode::replaceNode( int nIndex, XmlNode *pNewNode ) -{ - if( nIndex < 0 || nIndex >= lChildren.getSize() ) - return; //TODO: throw an exception - - delete (XmlNode *)lChildren[nIndex]; - lChildren.setAt( nIndex, pNewNode ); - pNewNode->pParent = this; -} - -XmlNode *XmlNode::getCopy() -{ - XmlNode *pNew = new XmlNode(); - - pNew->sName = sName; - if( sPreContent ) - { - pNew->sPreContent = new std::string( sPreContent->c_str() ); - } - else - { - pNew->sPreContent = NULL; - } - pNew->nCurContent = 0; - - int nSize = lPostContent.getSize(); - pNew->lPostContent.setSize( nSize ); - for( int j = 0; j < nSize; j++ ) - { - if( lPostContent[j] ) - { - pNew->lPostContent.setAt( - j, new std::string( - ((std::string *)lPostContent[j])->c_str() - ) - ); - } - else - { - pNew->lPostContent.setAt( j, NULL ); - } - } - - nSize = lChildren.getSize(); - pNew->lChildren.setSize( nSize ); - for( int j = 0; j < nSize; j++ ) - { - XmlNode *pChild = ((XmlNode *)lChildren[j])->getCopy(); - pNew->lChildren.setAt( j, pChild ); - pChild->pParent = pNew; - pNew->hChildren.insert( pChild->getName(), pChild ); - } - - nSize = lPropNames.getSize(); - pNew->lPropNames.setSize( nSize ); - pNew->lPropValues.setSize( nSize ); - for( int j = 0; j < nSize; j++ ) - { - std::string *pProp = new std::string( ((std::string *)lPropNames[j])->c_str() ); - std::string *pVal = new std::string( ((std::string *)lPropValues[j])->c_str() ); - pNew->lPropNames.setAt( j, pProp ); - pNew->lPropValues.setAt( j, pVal ); - pNew->hProperties.insert( pProp->c_str(), pVal->c_str() ); - pNew->nCurContent++; - } - - return pNew; -} - -void XmlNode::deleteNodeKeepChildren( int nIndex ) -{ - // This is a tricky one...we need to do some patching to keep things all - // even... - XmlNode *xRet = (XmlNode *)lChildren[nIndex]; - - if( xRet == NULL ) - { - return; - } - else - { - if( getContent( nIndex ) ) - { - std::string sBuf( getContent( nIndex ) ); - sBuf += xRet->getContent( 0 ); - setContent( sBuf.c_str(), nIndex ); - } - else - { - setContent( xRet->getContent( 0 ), nIndex ); - } - - int nSize = xRet->lChildren.getSize(); - for( int j = 0; j < nSize; j++ ) - { - XmlNode *pCopy = ((XmlNode *)xRet->lChildren[j])->getCopy(); - pCopy->pParent = this; - lChildren.insertBefore( pCopy, nIndex+j ); - - if( xRet->lPostContent[j] ) - { - lPostContent.insertBefore( - new std::string( ((std::string *)xRet->lPostContent[j])->c_str() ), - nIndex+j - ); - } - else - { - lPostContent.insertBefore( NULL, nIndex+j ); - } - } - - if( getContent( nIndex+nSize ) ) - { - //SString sBuf( getContent( nIndex+nSize ) ); - //sBuf.catfrom( xRet->getContent( nSize ) ); - //setContent( sBuf, nIndex+nSize ); - } - else - { - setContent( xRet->getContent( nSize ), nIndex+nSize ); - } - - deleteNode( nIndex+nSize ); - } -} - -void XmlNode::replaceNodeWithChildren( int nIndex, XmlNode *pNewNode ) -{ -} - diff --git a/src/xmlnode.h b/src/xmlnode.h deleted file mode 100644 index 7525306..0000000 --- a/src/xmlnode.h +++ /dev/null @@ -1,236 +0,0 @@ -#ifndef XMLNODE -#define XMLNODE - -#include <iostream> -#include "linkedlist.h" -#include "hashtable.h" - -/** - * Maintains all data pertient to an XML node, including sub-nodes and content. - * All child nodes can be accessed through index and through name via a hash - * table. This makes it very easy to gain simple and fast access to all of - * your data. For most applications, the memory footprint is also rather - * small. While XmlNode objects can be used directly to create XML structures - * it is highly reccomended that all operations be performed through the - * XmlDocument class. - *@author Mike Buland - */ -class XmlNode -{ -public: - /** - * Construct a new XmlNode. - *@param sName The name of the node. - *@param pParent The parent node. - *@param sContent The initial content string. - */ - XmlNode( - const char *sName=NULL, - XmlNode *pParent = NULL, - const char *sContent=NULL - ); - - /** - * Delete the node and cleanup all memory. - */ - virtual ~XmlNode(); - - /** - * Change the name of the node. - *@param sName The new name of the node. - */ - void setName( const char *sName ); - - /** - * Construct a new node and add it as a child to this node, also return a - * pointer to the newly constructed node. - *@param sName The name of the new node. - *@param sContent The initial content of the new node. - *@returns A pointer to the newly created child node. - */ - XmlNode *addChild( const char *sName, const char *sContent=NULL ); - - /** - * Add an already created XmlNode as a child to this node. The new child - * XmlNode's parent will be changed appropriately and the parent XmlNode - * will take ownership of the child. - *@param pChild The child XmlNode to add to this XmlNode. - *@returns A pointer to the child node that was just added. - */ - XmlNode *addChild( XmlNode *pChild ); - - /** - * Add a new property to the XmlNode. Properties are name/value pairs. - *@param sName The name of the property. Specifying a name that's already - * in use will overwrite that property. - *@param sValue The textual value of the property. - */ - void addProperty( const char *sName, const char *sValue ); - - /** - * Get a pointer to the parent node, if any. - *@returns A pointer to the node's parent, or NULL if there isn't one. - */ - XmlNode *getParent(); - - /** - * Tells you if this node has children. - *@returns True if this node has at least one child, false otherwise. - */ - bool hasChildren(); - - /** - * Tells you how many children this node has. - *@returns The number of children this node has. - */ - int getNumChildren(); - - /** - * Get a child node at a specific index. - *@param nIndex The zero-based index of the child to retreive. - *@returns A pointer to the child, or NULL if you requested an invalid - * index. - */ - XmlNode *getChild( int nIndex ); - - /** - * Get a child with the specified name, and possibly skip value. For an - * explination of skip values see the HashTable. - *@param sName The name of the child to find. - *@param nSkip The number of nodes with that name to skip. - *@returns A pointer to the child, or NULL if no child with that name was - * found. - */ - XmlNode *getChild( const char *sName, int nSkip=0 ); - - /** - * Get a pointer to the name of this node. Do not change this, use setName - * instead. - *@returns A pointer to the name of this node. - */ - const char *getName(); - - /** - * Set the content of this node, optionally at a specific index. Using the - * default of -1 will set the content after the last added node. - *@param sContent The content string to use. - *@param nIndex The index of the content. - */ - void setContent( const char *sContent, int nIndex=-1 ); - - /** - * Get the content string at a given index, or zero for initial content. - *@param nIndex The index of the content. - *@returns A pointer to the content at that location. - */ - const char *getContent( int nIndex = 0 ); - - /** - * Get the number of properties in this node. - *@returns The number of properties in this node. - */ - int getNumProperties(); - - /** - * Get a property's name by index. - *@param nIndex The index of the property to examine. - *@returns A pointer to the name of the property specified, or NULL if none - * found. - */ - const char *getPropertyName( int nIndex ); - - /** - * Get a proprty's value by index. - *@param nIndex The index of the property to examine. - *@returns A pointer to the value of the property specified, or NULL if none - * found. - */ - const char *getProperty( int nIndex ); - - /** - * Get a propery's value by name. - *@param sName The name of the property to examine. - *@returns A pointer to the value of the property specified, or NULL if none - * found. - */ - const char *getProperty( const char *sName ); - - /** - * Delete a property by index. - *@param nIndex The index of the property to delete. - *@returns True if the property was found and deleted, false if it wasn't - * found. - */ - void deleteProperty( int nIndex ); - - /** - * Delete a child node, possibly replacing it with some text. This actually - * fixes all content strings around the newly deleted child node. - *@param nIndex The index of the node to delete. - *@param sReplacementText The optional text to replace the node with. - *@returns True of the node was found, and deleted, false if it wasn't - * found. - */ - void deleteNode( int nIndex, const char *sReplacementText = NULL ); - - /** - * Delete a given node, but move all of it's children and content up to - * replace the deleted node. All of the content of the child node is - * spliced seamlessly into place with the parent node's content. - *@param nIndex The node to delete. - *@returns True if the node was found and deleted, false if it wasn't. - */ - void deleteNodeKeepChildren( int nIndex ); - - /** - * Detatch a given child node from this node. This effectively works just - * like a deleteNode, except that instead of deleting the node it is removed - * and returned, and all ownership is given up. - *@param nIndex The index of the node to detatch. - *@param sReplacementText The optional text to replace the detatched node - * with. - *@returns A pointer to the newly detatched node, which then passes - * ownership to the caller. - */ - XmlNode *detatchNode( int nIndex, const char *sReplacementText = NULL ); - - /** - * Replace a given node with a different node that is not currently owned by - * this XmlNode or any ancestor. - *@param nIndex The index of the node to replace. - *@param pNewNode The new node to replace the old node with. - *@returns True if the node was found and replaced, false if it wasn't. - */ - void replaceNode( int nIndex, XmlNode *pNewNode ); - - /** - * Replace a given node with the children and content of a given node. - *@param nIndex The index of the node to replace. - *@param pNewNode The node that contains the children and content that will - * replace the node specified by nIndex. - *@returns True if the node was found and replaced, false if it wasn't. - */ - void replaceNodeWithChildren( int nIndex, XmlNode *pNewNode ); - - /** - * Get a copy of this node and all children. getCopy is recursive, so - * beware copying large trees of xml. - *@returns A newly created copy of this node and all of it's children. - */ - XmlNode *getCopy(); - -private: - std::string sName; /**< The name of the node. */ - std::string *sPreContent; /**< The content that goes before any node. */ - LinkedList lChildren; /**< The children. */ - LinkedList lPostContent; /**< The content that comes after children. */ - HashTable hProperties; /**< Property hashtable. */ - HashTable hChildren; /**< Children hashtable. */ - LinkedList lPropNames; /**< List of property names. */ - LinkedList lPropValues; /**< List of property values. */ - XmlNode *pParent; /**< A pointer to the parent of this node. */ - int nCurContent; /**< The current content we're on, for using the -1 on - setContent. */ -}; - -#endif diff --git a/src/xmlreader.cpp b/src/xmlreader.cpp deleted file mode 100644 index 18df69c..0000000 --- a/src/xmlreader.cpp +++ /dev/null @@ -1,602 +0,0 @@ -#include "xmlreader.h" -#include "exceptions.h" -#include <string.h> -#include "hashfunctionstring.h" - -XmlReader::XmlReader( bool bStrip ) : - bStrip( bStrip ), - htEntity( new HashFunctionString(), 11 ) -{ -} - -XmlReader::~XmlReader() -{ - void *i = htEntity.getFirstItemPos(); - while( (i = htEntity.getNextItemPos( i ) ) ) - { - free( (char *)(htEntity.getItemID( i )) ); - delete (StaticString *)htEntity.getItemData( i ); - } -} - -void XmlReader::addEntity( const char *name, const char *value ) -{ - if( htEntity[name] ) return; - - char *sName = strdup( name ); - StaticString *sValue = new StaticString( value ); - - htEntity.insert( sName, sValue ); -} - -#define gcall( x ) if( x == false ) return false; - -bool XmlReader::isws( char chr ) -{ - return ( chr == ' ' || chr == '\t' || chr == '\n' || chr == '\r' ); -} - -bool XmlReader::ws() -{ - while( true ) - { - char chr = getChar(); - if( isws( chr ) ) - { - usedChar(); - } - else - { - return true; - } - } - return true; -} - -bool XmlReader::buildDoc() -{ - // take care of initial whitespace - gcall( ws() ); - textDecl(); - entity(); - addEntity("gt", ">"); - addEntity("lt", "<"); - addEntity("amp", "&"); - addEntity("apos", "\'"); - addEntity("quot", "\""); - gcall( node() ); - - return true; -} - -void XmlReader::textDecl() -{ - if( getChar() == '<' && getChar( 1 ) == '?' ) - { - usedChar( 2 ); - for(;;) - { - if( getChar() == '?' ) - { - if( getChar( 1 ) == '>' ) - { - usedChar( 2 ); - return; - } - } - usedChar(); - } - } -} - -void XmlReader::entity() -{ - for(;;) - { - ws(); - - if( getChar() == '<' && getChar( 1 ) == '!' ) - { - usedChar( 2 ); - ws(); - std::string buf; - for(;;) - { - char chr = getChar(); - usedChar(); - if( isws( chr ) ) break; - buf += chr; - } - - if( strcmp( buf.c_str(), "ENTITY") == 0 ) - { - ws(); - std::string name; - for(;;) - { - char chr = getChar(); - usedChar(); - if( isws( chr ) ) break; - name += chr; - } - ws(); - char quot = getChar(); - usedChar(); - if( quot != '\'' && quot != '\"' ) - { - throw XmlException( - "Only quoted entity values are supported." - ); - } - std::string value; - for(;;) - { - char chr = getChar(); - usedChar(); - if( chr == '&' ) - { - StaticString *tmp = getEscape(); - if( tmp == NULL ) throw XmlException("Entity thing"); - value += tmp->getString(); - delete tmp; - } - else if( chr == quot ) - { - break; - } - else - { - value += chr; - } - } - ws(); - if( getChar() == '>' ) - { - usedChar(); - - addEntity( name.c_str(), value.c_str() ); - } - else - { - throw XmlException( - "Malformed ENTITY: unexpected '%c' found.", - getChar() - ); - } - } - else - { - throw XmlException( - "Unsupported header symbol: %s", - buf.c_str() - ); - } - } - else - { - return; - } - } -} - -bool XmlReader::node() -{ - gcall( startNode() ) - - // At this point, we are closing the startNode - char chr = getChar(); - if( chr == '>' ) - { - usedChar(); - - // Now we process the guts of the node. - gcall( content() ); - } - else if( chr == '/' ) - { - // This is the tricky one, one more validation, then we close the node. - usedChar(); - if( getChar() == '>' ) - { - closeNode(); - usedChar(); - } - else - { - throw XmlException("Close node in singleNode malformed!"); - } - } - else - { - throw XmlException("Close node expected, but not found."); - return false; - } - - return true; -} - -bool XmlReader::startNode() -{ - if( getChar() == '<' ) - { - usedChar(); - - if( getChar() == '/' ) - { - // Heh, it's actually a close node, go figure - FlexBuf fbName; - usedChar(); - gcall( ws() ); - - while( true ) - { - char chr = getChar(); - if( isws( chr ) || chr == '>' ) - { - // Here we actually compare the name we got to the name - // we already set, they have to match exactly. - if( !strcasecmp( getCurrent()->getName(), fbName.getData() ) ) - { - closeNode(); - break; - } - else - { - throw XmlException("Got a mismatched node close tag."); - } - } - else - { - fbName.appendData( chr ); - usedChar(); - } - } - - gcall( ws() ); - if( getChar() == '>' ) - { - // Everything is cool. - usedChar(); - } - else - { - throw XmlException("Got extra junk data instead of node close tag."); - } - } - else - { - // We're good, format is consistant - addNode(); - - // Skip extra whitespace - gcall( ws() ); - gcall( name() ); - gcall( ws() ); - gcall( paramlist() ); - gcall( ws() ); - } - } - else - { - throw XmlException("Expected to find node opening char, '<'."); - } - - return true; -} - -bool XmlReader::name() -{ - FlexBuf fbName; - - while( true ) - { - char chr = getChar(); - if( isws( chr ) || chr == '>' || chr == '/' ) - { - setName( fbName.getData() ); - return true; - } - else - { - fbName.appendData( chr ); - usedChar(); - } - } - - return true; -} - -bool XmlReader::paramlist() -{ - while( true ) - { - char chr = getChar(); - if( chr == '/' || chr == '>' ) - { - return true; - } - else - { - gcall( param() ); - gcall( ws() ); - } - } - - return true; -} - -StaticString *XmlReader::getEscape() -{ - if( getChar( 1 ) == '#' ) - { - // If the entity starts with a # it's a character escape code - int base = 10; - usedChar( 2 ); - if( getChar() == 'x' ) - { - base = 16; - usedChar(); - } - char buf[4]; - int j = 0; - for( j = 0; getChar() != ';'; j++ ) - { - buf[j] = getChar(); - usedChar(); - } - usedChar(); - buf[j] = '\0'; - buf[0] = (char)strtol( buf, (char **)NULL, base ); - buf[1] = '\0'; - - return new StaticString( buf ); - } - else - { - // ...otherwise replace with the appropriate string... - std::string buf; - usedChar(); - for(;;) - { - char cbuf = getChar(); - usedChar(); - if( cbuf == ';' ) break; - buf += cbuf; - } - - StaticString *tmp = (StaticString *)htEntity[buf.c_str()]; - if( tmp == NULL ) return NULL; - - StaticString *ret = new StaticString( *tmp ); - return ret; - } -} - -bool XmlReader::param() -{ - FlexBuf fbName; - FlexBuf fbValue; - - while( true ) - { - char chr = getChar(); - if( isws( chr ) || chr == '=' ) - { - break; - } - else - { - fbName.appendData( chr ); - usedChar(); - } - } - - gcall( ws() ); - - if( getChar() == '=' ) - { - usedChar(); - - gcall( ws() ); - - char chr = getChar(); - if( chr == '"' ) - { - // Better quoted rhs - usedChar(); - - while( true ) - { - chr = getChar(); - if( chr == '"' ) - { - usedChar(); - addProperty( fbName.getData(), fbValue.getData() ); - return true; - } - else - { - if( chr == '&' ) - { - StaticString *tmp = getEscape(); - if( tmp == NULL ) return false; - fbValue.appendData( tmp->getString() ); - delete tmp; - } - else - { - fbValue.appendData( chr ); - usedChar(); - } - } - } - } - else - { - // Simple one-word rhs - while( true ) - { - chr = getChar(); - if( isws( chr ) || chr == '/' || chr == '>' ) - { - addProperty( fbName.getData(), fbValue.getData() ); - return true; - } - else - { - if( chr == '&' ) - { - StaticString *tmp = getEscape(); - if( tmp == NULL ) return false; - fbValue.appendData( tmp->getString() ); - delete tmp; - } - else - { - fbValue.appendData( chr ); - usedChar(); - } - } - } - } - } - else - { - throw XmlException("Expected an equals to seperate the params."); - return false; - } - - return true; -} - -bool XmlReader::content() -{ - FlexBuf fbContent; - - if( bStrip ) gcall( ws() ); - - while( true ) - { - char chr = getChar(); - if( chr == '<' ) - { - if( getChar(1) == '/' ) - { - if( fbContent.getLength() > 0 ) - { - if( bStrip ) - { - int j; - for( j = fbContent.getLength()-1; isws(fbContent.getData()[j]); j-- ); - ((char *)fbContent.getData())[j+1] = '\0'; - } - setContent( fbContent.getData() ); - } - usedChar( 2 ); - gcall( ws() ); - FlexBuf fbName; - while( true ) - { - chr = getChar(); - if( isws( chr ) || chr == '>' ) - { - if( !strcasecmp( getCurrent()->getName(), fbName.getData() ) ) - { - closeNode(); - break; - } - else - { - throw XmlException("Mismatched close tag found: <%s> to <%s>.", getCurrent()->getName(), fbName.getData() ); - } - } - else - { - fbName.appendData( chr ); - usedChar(); - } - } - gcall( ws() ); - if( getChar() == '>' ) - { - usedChar(); - return true; - } - else - { - throw XmlException("Malformed close tag."); - } - } - else if( getChar(1) == '!' ) - { - // We know it's a comment, let's see if it's proper - if( getChar(2) != '-' || - getChar(3) != '-' ) - { - // Not a valid XML comment - throw XmlException("Malformed comment start tag found."); - } - - usedChar( 4 ); - - // Now burn text until we find the close tag - for(;;) - { - if( getChar() == '-' ) - { - if( getChar( 1 ) == '-' ) - { - // The next one has to be a '>' now - if( getChar( 2 ) != '>' ) - { - throw XmlException("Malformed comment close tag found. You cannot have a '--' that isn't followed by a '>' in a comment."); - } - usedChar( 3 ); - break; - } - else - { - // Found a dash followed by a non dash, that's ok... - usedChar( 2 ); - } - } - else - { - // Burn comment chars - usedChar(); - } - } - } - else - { - if( fbContent.getLength() > 0 ) - { - if( bStrip ) - { - int j; - for( j = fbContent.getLength()-1; isws(fbContent.getData()[j]); j-- ); - ((char *)fbContent.getData())[j+1] = '\0'; - } - setContent( fbContent.getData() ); - fbContent.clearData(); - } - gcall( node() ); - } - - if( bStrip ) gcall( ws() ); - } - else if( chr == '&' ) - { - StaticString *tmp = getEscape(); - if( tmp == NULL ) return false; - fbContent.appendData( tmp->getString() ); - delete tmp; - } - else - { - fbContent.appendData( chr ); - usedChar(); - } - } -} - diff --git a/src/xmlreader.h b/src/xmlreader.h deleted file mode 100644 index c8f7202..0000000 --- a/src/xmlreader.h +++ /dev/null @@ -1,141 +0,0 @@ -#ifndef XMLREADER -#define XMLREADER - -#include <stdio.h> -#include "xmldocument.h" -#include "flexbuf.h" -#include "hashtable.h" -#include "staticstring.h" - -/** - * Takes care of reading in xml formatted data from a file. This could/should - * be made more arbitrary in the future so that we can read the data from any - * source. This is actually made quite simple already since all data read in - * is handled by one single helper function and then palced into a FlexBuf for - * easy access by the other functions. The FlexBuf also allows for block - * reading from disk, which improves speed by a noticable amount. - * <br> - * There are also some extra features implemented that allow you to break the - * standard XML reader specs and eliminate leading and trailing whitespace in - * all read content. This is useful in situations where you allow additional - * whitespace in the files to make them easily human readable. The resturned - * content will be NULL in sitautions where all content between nodes was - * stripped. - *@author Mike Buland - */ -class XmlReader : public XmlDocument -{ -public: - /** - * Create a standard XmlReader. The optional parameter bStrip allows you to - * create a reader that will strip out all leading and trailing whitespace - * in content, a-la html. - *@param bStrip Strip out leading and trailing whitespace? - */ - XmlReader( bool bStrip=false ); - - /** - * Destroy this XmlReader. - */ - virtual ~XmlReader(); - - /** - * Build a document based on some kind of input. This is called - * automatically by the constructor. - */ - bool buildDoc(); - -private: - /** - * This is called by the low level automoton in order to get the next - * character. This function should return a character at the current - * position plus nIndex, but does not increment the current character. - *@param nIndex The index of the character from the current stream position. - *@returns A single character at the requested position, or 0 for end of - * stream. - */ - virtual char getChar( int nIndex = 0 ) = 0; - - /** - * Called to increment the current stream position by a single character. - */ - virtual void usedChar( int nAmnt = 1) = 0; - - /** - * Automoton function: is whitespace. - *@param chr A character - *@returns True if chr is whitespace, false otherwise. - */ - bool isws( char chr ); - - /** - * Automoton function: ws. Skips sections of whitespace. - *@returns True if everything was ok, False for end of stream. - */ - bool ws(); - - /** - * Automoton function: node. Processes an XmlNode - *@returns True if everything was ok, False for end of stream. - */ - bool node(); - - /** - * Automoton function: startNode. Processes the begining of a node. - *@returns True if everything was ok, False for end of stream. - */ - bool startNode(); - - /** - * Automoton function: name. Processes the name of a node. - *@returns True if everything was ok, False for end of stream. - */ - bool name(); - - /** - * Automoton function: textDecl. Processes the xml text decleration, if - * there is one. - */ - void textDecl(); - - /** - * Automoton function: entity. Processes an entity from the header. - */ - void entity(); - - /** - * Adds an entity to the list, if it doesn't already exist. - *@param name The name of the entity - *@param value The value of the entity - */ - void addEntity( const char *name, const char *value ); - - StaticString *getEscape(); - - /** - * Automoton function: paramlist. Processes a list of node params. - *@returns True if everything was ok, False for end of stream. - */ - bool paramlist(); - - /** - * Automoton function: param. Processes a single parameter. - *@returns True if everything was ok, False for end of stream. - */ - bool param(); - - /** - * Automoton function: content. Processes node content. - *@returns True if everything was ok, False for end of stream. - */ - bool content(); - - FlexBuf fbContent; /**< buffer for the current node's content. */ - FlexBuf fbParamName; /**< buffer for the current param's name. */ - FlexBuf fbParamValue; /**< buffer for the current param's value. */ - bool bStrip; /**< Are we stripping whitespace? */ - - HashTable htEntity; /**< Entity type definitions. */ -}; - -#endif diff --git a/src/xmlstringreader.cpp b/src/xmlstringreader.cpp deleted file mode 100644 index 3956ff3..0000000 --- a/src/xmlstringreader.cpp +++ /dev/null @@ -1,38 +0,0 @@ -#include "xmlstringreader.h" -#include "exceptions.h" -#include <string.h> - -XmlStringReader::XmlStringReader( const char *sString, bool bStrip ) - : XmlReader( bStrip ) -{ - this->sString = sString; - - nIndex = 0; - nLength = strlen( sString ); - - buildDoc(); -} - -XmlStringReader::~XmlStringReader() -{ -} - -char XmlStringReader::getChar( int nAdd ) -{ - if( nLength >= nIndex+nAdd+1 ) - { - return sString[nIndex+nAdd]; - } - else - { - throw XmlException("End of XML stream read."); - } -} - -void XmlStringReader::usedChar( int nAmnt ) -{ - if( nLength >= nIndex+nAmnt ) - { - nIndex += nAmnt; - } -} diff --git a/src/xmlstringreader.h b/src/xmlstringreader.h deleted file mode 100644 index 1239ef4..0000000 --- a/src/xmlstringreader.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef XMLSTRINGREADER -#define XMLSTRINGREADER - -#include <stdio.h> -#include "xmlreader.h" -#include "flexbuf.h" - -/** - * Takes care of reading in xml formatted data from a file. This could/should - * be made more arbitrary in the future so that we can read the data from any - * source. This is actually made quite simple already since all data read in - * is handled by one single helper function and then palced into a FlexBuf for - * easy access by the other functions. The FlexBuf also allows for block - * reading from disk, which improves speed by a noticable amount. - * <br> - * There are also some extra features implemented that allow you to break the - * standard XML reader specs and eliminate leading and trailing whitespace in - * all read content. This is useful in situations where you allow additional - * whitespace in the files to make them easily human readable. The resturned - * content will be NULL in sitautions where all content between nodes was - * stripped. - *@author Mike Buland - */ -class XmlStringReader : public XmlReader -{ -public: - /** - * Create a new string reader around an already created and formatted - * null-terminated string. - *@param sString A pointer to the string data that will be used. This data - * is not changed during processing. - *@param bStrip Strip out leading and trailing whitespace. - */ - XmlStringReader( const char *sString, bool bStrip=false ); - - /** - * Destroy this string reader. - */ - virtual ~XmlStringReader(); - -private: - char getChar( int nIndex = 0 ); - void usedChar( int nAmnt = 1 ); - const char *sString; /**< Internal pointer to the input string. */ - int nIndex; /**< Our index into the string */ - int nLength; /**< The computed length of the string */ -}; - -#endif diff --git a/src/xmlstringwriter.cpp b/src/xmlstringwriter.cpp deleted file mode 100644 index adeed6a..0000000 --- a/src/xmlstringwriter.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include "xmlstringwriter.h" - -XmlStringWriter::XmlStringWriter( const char *sIndent ) : - XmlWriter( sIndent ) -{ -} - -XmlStringWriter::~XmlStringWriter() -{ -} - -void XmlStringWriter::writeString( const char *sString ) -{ - sXml += sString; -} - -std::string &XmlStringWriter::getString() -{ - return sXml; -} - diff --git a/src/xmlstringwriter.h b/src/xmlstringwriter.h deleted file mode 100644 index 0d567b9..0000000 --- a/src/xmlstringwriter.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef XML_STRING_WRITER -#define XML_STRING_WRITER - -#include "xmlnode.h" -#include "xmlwriter.h" - -/** - * Implements xml writing in the XML standard format. Also allows you to - * break that format and auto-indent your exported xml data for ease of - * reading. The auto-indenting will only be applied to sections that - * have no content of their own already. This means that except for - * whitespace all of your data will be preserved perfectly. - * You can create an XmlWriter object around a file, or access the static - * write function directly and just hand it a filename and a root XmlNode. - * When using an XmlWriter object the interface is identicle to that of - * the XmlDocument class, so reference that class for API info. However - * when the initial (or root) node is closed, and the document is finished - * the file will be created and written to automatically. The user can - * check to see if this is actually true by calling the isFinished - * function in the XmlDocument class. - *@author Mike Buland - */ -class XmlStringWriter : public XmlWriter -{ -public: - /** - * Construct a string writer using an internal string buffer. - *@param sIndent Optional indent to add to each line. - */ - XmlStringWriter( const char *sIndent=NULL ); - - /** - * Destroy the string writer and the internal string. - */ - virtual ~XmlStringWriter(); - - /** - * Get the string that was built. This is only valid after the document has - * been completed, so check isCompleted or be sure your addNode and - * closeNode calls match up. - *@returns A reference to the internal string object. - */ - std::string &getString(); - -private: - void writeString( const char *sString ); - std::string sXml; /**< The string object we "write" to. */ -}; - -#endif diff --git a/src/xmlwriter.cpp b/src/xmlwriter.cpp deleted file mode 100644 index 56880b6..0000000 --- a/src/xmlwriter.cpp +++ /dev/null @@ -1,173 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include "xmlwriter.h" - -XmlWriter::XmlWriter( const char *sIndent, XmlNode *pRoot ) : - XmlDocument( pRoot ) -{ - if( sIndent == NULL ) - { - this->sIndent = ""; - } - else - { - this->sIndent = sIndent; - } -} - -XmlWriter::~XmlWriter() -{ -} - -void XmlWriter::write() -{ - write( getRoot(), sIndent.c_str() ); -} - -void XmlWriter::write( XmlNode *pRoot, const char *sIndent ) -{ - writeNode( pRoot, 0, sIndent ); -} - -void XmlWriter::closeNode() -{ - XmlDocument::closeNode(); - - if( isCompleted() ) - { - write( getRoot(), sIndent.c_str() ); - } -} - -void XmlWriter::writeIndent( int nIndent, const char *sIndent ) -{ - if( sIndent == NULL ) return; - for( int j = 0; j < nIndent; j++ ) - { - writeString( sIndent ); - } -} - -std::string XmlWriter::escape( std::string sIn ) -{ - std::string sOut; - - std::string::const_iterator i; - for( i = sIn.begin(); i != sIn.end(); i++ ) - { - if( ((*i >= ' ' && *i <= '9') || - (*i >= 'a' && *i <= 'z') || - (*i >= 'A' && *i <= 'Z') ) && - (*i != '\"' && *i != '\'' && *i != '&') - ) - { - sOut += *i; - } - else - { - sOut += "&#"; - char buf[4]; - sprintf( buf, "%u", (unsigned char)*i ); - sOut += buf; - sOut += ';'; - } - } - - return sOut; -} - -void XmlWriter::writeNodeProps( XmlNode *pNode, int nIndent, const char *sIndent ) -{ - for( int j = 0; j < pNode->getNumProperties(); j++ ) - { - writeString(" "); - writeString( pNode->getPropertyName( j ) ); - writeString("=\""); - writeString( escape( pNode->getProperty( j ) ).c_str() ); - writeString("\""); - } -} - -void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const char *sIndent ) -{ - if( pNode->hasChildren() ) - { - writeIndent( nIndent, sIndent ); - writeString("<"); - writeString( pNode->getName() ); - writeNodeProps( pNode, nIndent, sIndent ); - if( sIndent ) - writeString(">\n"); - else - writeString(">"); - - if( pNode->getContent( 0 ) ) - { - writeIndent( nIndent+1, sIndent ); - if( sIndent ) - { - writeString( pNode->getContent( 0 ) ); - writeString("\n"); - } - else - writeString( pNode->getContent( 0 ) ); - } - - int nNumChildren = pNode->getNumChildren(); - for( int j = 0; j < nNumChildren; j++ ) - { - writeNode( pNode->getChild( j ), nIndent+1, sIndent ); - if( pNode->getContent( j+1 ) ) - { - writeIndent( nIndent+1, sIndent ); - if( sIndent ) - { - writeString( pNode->getContent( j+1 ) ); - writeString("\n"); - } - else - writeString( pNode->getContent( j+1 ) ); - } - } - - writeIndent( nIndent, sIndent ); - if( sIndent ) - { - writeString("</"); - writeString( pNode->getName() ); - writeString(">\n"); - } - else - { - writeString("</"); - writeString( pNode->getName() ); - writeString(">"); - } - } - else if( pNode->getContent() ) - { - writeIndent( nIndent, sIndent ); - writeString("<"); - writeString( pNode->getName() ); - writeNodeProps( pNode, nIndent, sIndent ); - writeString(">"); - writeString( pNode->getContent() ); - writeString("</"); - writeString( pNode->getName() ); - writeString(">"); - if( sIndent ) - writeString("\n"); - } - else - { - writeIndent( nIndent, sIndent ); - writeString("<"); - writeString( pNode->getName() ); - writeNodeProps( pNode, nIndent, sIndent ); - if( sIndent ) - writeString("/>\n"); - else - writeString("/>"); - } -} - diff --git a/src/xmlwriter.h b/src/xmlwriter.h deleted file mode 100644 index c48e810..0000000 --- a/src/xmlwriter.h +++ /dev/null @@ -1,96 +0,0 @@ -#ifndef XMLWRITER -#define XMLWRITER - -#include "xmlnode.h" -#include "xmldocument.h" - -/** - * Implements xml writing in the XML standard format. Also allows you to - * break that format and auto-indent your exported xml data for ease of - * reading. The auto-indenting will only be applied to sections that - * have no content of their own already. This means that except for - * whitespace all of your data will be preserved perfectly. - * You can create an XmlWriter object around a file, or access the static - * write function directly and just hand it a filename and a root XmlNode. - * When using an XmlWriter object the interface is identicle to that of - * the XmlDocument class, so reference that class for API info. However - * when the initial (or root) node is closed, and the document is finished - * the file will be created and written to automatically. The user can - * check to see if this is actually true by calling the isFinished - * function in the XmlDocument class. - *@author Mike Buland - */ -class XmlWriter : public XmlDocument -{ -public: - /** - * Construct a standard XmlWriter. - *@param sIndent Set this to something other than NULL to include it as an - * indent before each node in the output that doesn't already have content. - * If you are using the whitespace stripping option in the XmlReader and set - * this to a tab or some spaces it will never effect the content of your - * file. - */ - XmlWriter( const char *sIndent=NULL, XmlNode *pRoot=NULL ); - - /** - * Destroy the writer. - */ - virtual ~XmlWriter(); - - /** - * This override of the parent class closeNode function calls the parent - * class, but also triggers a write operation when the final node is closed. - * This means that by checking the isCompleted() function the user may also - * check to see if their file has been written or not. - */ - void closeNode(); - - void write(); - -private: - std::string sIndent; /**< The indent string */ - - std::string escape( std::string sIn ); - - /** - * Write the file. - *@param pNode The root node - *@param sIndent The indent text. - */ - void write( XmlNode *pNode, const char *sIndent=NULL ); - - /** - * Write a node in the file, including children. - *@param pNode The node to write. - *@param nIndent The indent level (the number of times to include sIndent) - *@param sIndent The indent text. - */ - void writeNode( XmlNode *pNode, int nIndent, const char *sIndent ); - - /** - * Write the properties of a node. - *@param pNode The node who's properties to write. - *@param nIndent The indent level of the containing node - *@param sIndent The indent text. - */ - void writeNodeProps( XmlNode *pNode, int nIndent, const char *sIndent ); - - /** - * Called to write the actual indent. - *@param nIndent The indent level. - *@param sIndent The indent text. - */ - void writeIndent( int nIndent, const char *sIndent ); - - /** - * This is the function that must be overridden in order to use this class. - * It must write the null-terminated string sString, minus the mull, - * verbatum to it's output device. Adding extra characters for any reason - * will break the XML formatting. - *@param sString The string data to write to the output. - */ - virtual void writeString( const char *sString ) = 0; -}; - -#endif -- cgit v1.2.3 From da89e6d30e57bd6dbb10b4d36b093ce9bbf5c666 Mon Sep 17 00:00:00 2001 From: Mike Buland <eichlan@xagasoft.com> Date: Tue, 3 Apr 2007 04:50:36 +0000 Subject: The first batch seem to have made it alright. Unfortunately the Archive class isn't done yet, I'm going to make it rely on streams, so those will be next, then we can make it work all sortsa' well. --- src/archable.cpp | 10 + src/archable.h | 35 +++ src/archive.cpp | 337 +++++++++++++++++++++ src/archive.h | 93 ++++++ src/exceptionbase.cpp | 70 +++++ src/exceptionbase.h | 114 +++++++ src/exceptions.cpp | 10 + src/exceptions.h | 28 ++ src/fstring.cpp | 14 + src/fstring.h | 653 ++++++++++++++++++++++++++++++++++++++++ src/hash.cpp | 101 +++++++ src/hash.h | 745 ++++++++++++++++++++++++++++++++++++++++++++++ src/old/exceptionbase.cpp | 70 ----- src/old/exceptionbase.h | 105 ------- src/old/exceptions.cpp | 8 - src/old/exceptions.h | 25 -- src/old/fstring.cpp | 13 - src/old/fstring.h | 651 ---------------------------------------- src/old/hash.cpp | 113 ------- src/old/hash.h | 744 --------------------------------------------- src/old/hashable.cpp | 1 - src/old/hashable.h | 12 - src/old/serializable.cpp | 8 - src/old/serializable.h | 34 --- src/old/serializer.cpp | 338 --------------------- src/old/serializer.h | 80 ----- src/old/stream.cpp | 10 - src/old/stream.h | 27 -- src/stream.cpp | 10 + src/stream.h | 34 +++ src/tests/archive.cpp | 7 + tests/comments.xml | 12 - tests/guy.cpp | 22 -- tests/makeplugin.sh | 3 - 34 files changed, 2261 insertions(+), 2276 deletions(-) create mode 100644 src/archable.cpp create mode 100644 src/archable.h create mode 100644 src/archive.cpp create mode 100644 src/archive.h create mode 100644 src/exceptionbase.cpp create mode 100644 src/exceptionbase.h create mode 100644 src/exceptions.cpp create mode 100644 src/exceptions.h create mode 100644 src/fstring.cpp create mode 100644 src/fstring.h create mode 100644 src/hash.cpp create mode 100644 src/hash.h delete mode 100644 src/old/exceptionbase.cpp delete mode 100644 src/old/exceptionbase.h delete mode 100644 src/old/exceptions.cpp delete mode 100644 src/old/exceptions.h delete mode 100644 src/old/fstring.cpp delete mode 100644 src/old/fstring.h delete mode 100644 src/old/hash.cpp delete mode 100644 src/old/hash.h delete mode 100644 src/old/hashable.cpp delete mode 100644 src/old/hashable.h delete mode 100644 src/old/serializable.cpp delete mode 100644 src/old/serializable.h delete mode 100644 src/old/serializer.cpp delete mode 100644 src/old/serializer.h delete mode 100644 src/old/stream.cpp delete mode 100644 src/old/stream.h create mode 100644 src/stream.cpp create mode 100644 src/stream.h create mode 100644 src/tests/archive.cpp delete mode 100644 tests/comments.xml delete mode 100644 tests/guy.cpp delete mode 100755 tests/makeplugin.sh diff --git a/src/archable.cpp b/src/archable.cpp new file mode 100644 index 0000000..38fc31f --- /dev/null +++ b/src/archable.cpp @@ -0,0 +1,10 @@ +#include "archable.h" + +Bu::Archable::Archable() +{ +} + +Bu::Archable::~Archable() +{ +} + diff --git a/src/archable.h b/src/archable.h new file mode 100644 index 0000000..ed05a78 --- /dev/null +++ b/src/archable.h @@ -0,0 +1,35 @@ +#ifndef ARCHABLE_H +#define ARCHABLE_H + +namespace Bu +{ + /** + * The base class for any class you want to archive. Simply include this as + * a base class, implement the purely virtual archive function and you've + * got an easily archiveable class. + */ + class Archable + { + public: + /** + * Does nothing, here for completeness. + */ + Archable(); + + /** + * Here to ensure the deconstructor is virtual. + */ + virtual ~Archable(); + + /** + * This is the main workhorse of the archive system, just override and + * you've got a archiveable class. A reference to the Archive + * used is passed in as your only parameter, query it to discover if + * you are loading or saving. + * @param ar A reference to the Archive object to use. + */ + virtual void archive( class Archive &ar )=0; + }; +} + +#endif diff --git a/src/archive.cpp b/src/archive.cpp new file mode 100644 index 0000000..5f5145c --- /dev/null +++ b/src/archive.cpp @@ -0,0 +1,337 @@ +#include "archive.h" + +Bu::Archive::Archive(bool bLoading): + bLoading(bLoading) +{ +} +Bu::Archive::~Archive() +{ +} + +bool Bu::Archive::isLoading() +{ + return bLoading; +} +Bu::Archive &Bu::Archive::operator<<(bool p) +{ + write( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator<<(int8_t p) +{ + write( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator<<(int16_t p) +{ + write( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator<<(int32_t p) +{ + write( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator<<(int64_t p) +{ + write( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator<<(uint8_t p) +{ + write( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator<<(uint16_t p) +{ + write( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator<<(uint32_t p) +{ + write( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator<<(uint64_t p) +{ + write( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator<<(long p) +{ + write( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator<<(float p) +{ + write( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator<<(double p) +{ + write( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator<<(long double p) +{ + write( &p, sizeof(p) ); + return *this; +} + +Bu::Archive &Bu::Archive::operator>>(bool &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator>>(int8_t &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator>>(int16_t &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator>>(int32_t &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator>>(int64_t &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator>>(uint8_t &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator>>(uint16_t &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator>>(uint32_t &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator>>(uint64_t &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator>>(long &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator>>(float &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator>>(double &p) +{ + read( &p, sizeof(p) ); + return *this; +} +Bu::Archive &Bu::Archive::operator>>(long double &p) +{ + read( &p, sizeof(p) ); + return *this; +} + +Bu::Archive &Bu::Archive::operator&&(bool &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Bu::Archive &Bu::Archive::operator&&(int8_t &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Bu::Archive &Bu::Archive::operator&&(int16_t &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Bu::Archive &Bu::Archive::operator&&(int32_t &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Bu::Archive &Bu::Archive::operator&&(int64_t &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Bu::Archive &Bu::Archive::operator&&(uint8_t &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Bu::Archive &Bu::Archive::operator&&(uint16_t &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Bu::Archive &Bu::Archive::operator&&(uint32_t &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Bu::Archive &Bu::Archive::operator&&(uint64_t &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Bu::Archive &Bu::Archive::operator&&(float &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Bu::Archive &Bu::Archive::operator&&(double &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + +Bu::Archive &Bu::Archive::operator&&(long double &p) +{ + if (bLoading) + { + return *this >> p; + } + else + { + return *this << p; + } +} + + +Bu::Archive &Bu::operator<<(Bu::Archive &s, Bu::Archable &p) +{ + p.archive( s ); + return s; +} + +Bu::Archive &Bu::operator>>(Bu::Archive &s, Bu::Archable &p) +{ + p.archive( s ); + return s; +} + +/* +Bu::Archive &Bu::operator&&(Bu::Archive &s, Bu::Archable &p) +{ + if (s.isLoading()) + { + return s >> p; + } + else + { + return s << p; + } +}*/ + +Bu::Archive &Bu::operator<<( Bu::Archive &ar, std::string &s ) +{ + ar << (uint32_t)s.length(); + ar.write( s.c_str(), s.length() ); + + return ar; +} + +Bu::Archive &Bu::operator>>( Bu::Archive &ar, std::string &s ) +{ + uint32_t l; + ar >> l; + char *tmp = new char[l+1]; + tmp[l] = '\0'; + ar.read( tmp, l ); + s = tmp; + delete[] tmp; + + return ar; +} + diff --git a/src/archive.h b/src/archive.h new file mode 100644 index 0000000..7de9220 --- /dev/null +++ b/src/archive.h @@ -0,0 +1,93 @@ +#ifndef ARCHIVE_H +#define ARCHIVE_H + +#include <stdint.h> +#include <string> +#include "archable.h" + +namespace Bu +{ + class Archive + { + private: + bool bLoading; + public: + bool isLoading(); + + enum + { + load = true, + save = false + }; + + Archive( bool bLoading ); + virtual ~Archive(); + virtual void close()=0; + + virtual void write(const void *, int32_t)=0; + virtual void read(void *, int32_t)=0; + + virtual Archive &operator<<(bool); + virtual Archive &operator<<(int8_t); + virtual Archive &operator<<(int16_t); + virtual Archive &operator<<(int32_t); + virtual Archive &operator<<(int64_t); + virtual Archive &operator<<(uint8_t); + virtual Archive &operator<<(uint16_t); + virtual Archive &operator<<(uint32_t); + virtual Archive &operator<<(uint64_t); + virtual Archive &operator<<(long); + virtual Archive &operator<<(float); + virtual Archive &operator<<(double); + virtual Archive &operator<<(long double); + + virtual Archive &operator>>(bool &); + virtual Archive &operator>>(int8_t &); + virtual Archive &operator>>(int16_t &); + virtual Archive &operator>>(int32_t &); + virtual Archive &operator>>(int64_t &); + virtual Archive &operator>>(uint8_t &); + virtual Archive &operator>>(uint16_t &); + virtual Archive &operator>>(uint32_t &); + virtual Archive &operator>>(uint64_t &); + virtual Archive &operator>>(long &); + virtual Archive &operator>>(float &); + virtual Archive &operator>>(double &); + virtual Archive &operator>>(long double &); + + virtual Archive &operator&&(bool &); + virtual Archive &operator&&(int8_t &); + virtual Archive &operator&&(int16_t &); + virtual Archive &operator&&(int32_t &); + virtual Archive &operator&&(int64_t &); + virtual Archive &operator&&(uint8_t &); + virtual Archive &operator&&(uint16_t &); + virtual Archive &operator&&(uint32_t &); + virtual Archive &operator&&(uint64_t &); + virtual Archive &operator&&(float &); + virtual Archive &operator&&(double &); + virtual Archive &operator&&(long double &); + }; + + Archive &operator<<(Archive &, class Bu::Archable &); + Archive &operator>>(Archive &, class Bu::Archable &); + //Archive &operator&&(Archive &s, class Bu::Archable &p); + + Archive &operator<<(Archive &, std::string &); + Archive &operator>>(Archive &, std::string &); + //Archive &operator&&(Archive &, std::string &); + + template<typename T> Archive &operator&&( Archive &ar, T &dat ) + { + if( ar.isLoading() ) + { + return ar >> dat; + } + else + { + return ar << dat; + } + } +} + +#endif diff --git a/src/exceptionbase.cpp b/src/exceptionbase.cpp new file mode 100644 index 0000000..f6ec625 --- /dev/null +++ b/src/exceptionbase.cpp @@ -0,0 +1,70 @@ +#include "exceptionbase.h" +#include <stdarg.h> + +Bu::ExceptionBase::ExceptionBase( const char *lpFormat, ... ) throw() : + nErrorCode( 0 ), + sWhat( NULL ) +{ + va_list ap; + + va_start(ap, lpFormat); + setWhat( lpFormat, ap ); + va_end(ap); +} + +Bu::ExceptionBase::ExceptionBase( int nCode, const char *lpFormat, ... ) throw() : + nErrorCode( nCode ), + sWhat( NULL ) +{ + va_list ap; + + va_start(ap, lpFormat); + setWhat( lpFormat, ap ); + va_end(ap); +} + +Bu::ExceptionBase::ExceptionBase( int nCode ) throw() : + nErrorCode( nCode ), + sWhat( NULL ) +{ +} + +Bu::ExceptionBase::~ExceptionBase() throw() +{ + if( sWhat ) + { + delete[] sWhat; + sWhat = NULL; + } +} + +void Bu::ExceptionBase::setWhat( const char *lpFormat, va_list &vargs ) +{ + if( sWhat ) delete[] sWhat; + int nSize; + + nSize = vsnprintf( NULL, 0, lpFormat, vargs ); + sWhat = new char[nSize+1]; + vsnprintf( sWhat, nSize+1, lpFormat, vargs ); +} + +void Bu::ExceptionBase::setWhat( const char *lpText ) +{ + if( sWhat ) delete[] sWhat; + int nSize; + + nSize = strlen( lpText ); + sWhat = new char[nSize+1]; + strcpy( sWhat, lpText ); +} + +const char *Bu::ExceptionBase::what() const throw() +{ + return sWhat; +} + +int Bu::ExceptionBase::getErrorCode() +{ + return nErrorCode; +} + diff --git a/src/exceptionbase.h b/src/exceptionbase.h new file mode 100644 index 0000000..fd78089 --- /dev/null +++ b/src/exceptionbase.h @@ -0,0 +1,114 @@ +#ifndef EXCEPTION_BASE_H +#define EXCEPTION_BASE_H + +#include <string> +#include <exception> +#include <stdarg.h> + +namespace Bu +{ + /** + * A generalized Exception base class. This is nice for making general and + * flexible child classes that can create new error code classes. + * + * In order to create your own exception class use these two lines. + * + * in your header: subExceptionDecl( NewClassName ); + * + * in your source: subExcpetienDef( NewClassName ); + */ + class ExceptionBase : public std::exception + { + public: + /** + * Construct an exception with an error code of zero, but with a + * description. The use of this is not reccomended most of the time, + * it's generally best to include an error code with the exception so + * your program can handle the exception in a better way. + * @param sFormat The format of the text. See printf for more info. + */ + ExceptionBase( const char *sFormat, ... ) throw(); + + /** + * + * @param nCode + * @param sFormat + */ + ExceptionBase( int nCode, const char *sFormat, ... ) throw(); + + /** + * + * @param nCode + * @return + */ + ExceptionBase( int nCode=0 ) throw(); + + /** + * + * @return + */ + virtual ~ExceptionBase() throw(); + + /** + * + * @return + */ + virtual const char *what() const throw(); + + /** + * + * @return + */ + int getErrorCode(); + + /** + * + * @param lpFormat + * @param vargs + */ + void setWhat( const char *lpFormat, va_list &vargs ); + + /** + * + * @param lpText + */ + void setWhat( const char *lpText ); + + private: + int nErrorCode; /**< The code for the error that occured. */ + char *sWhat; /**< The text string telling people what went wrong. */ + }; +} + +#define subExceptionDecl( name ) \ +class name : public ExceptionBase \ +{ \ + public: \ + name( const char *sFormat, ... ) throw (); \ + name( int nCode, const char *sFormat, ... ) throw(); \ + name( int nCode=0 ) throw (); \ +}; + +#define subExceptionDef( name ) \ +name::name( const char *lpFormat, ... ) throw() : \ + ExceptionBase( 0 ) \ +{ \ + va_list ap; \ + va_start( ap, lpFormat ); \ + setWhat( lpFormat, ap ); \ + va_end( ap ); \ +} \ +name::name( int nCode, const char *lpFormat, ... ) throw() : \ + ExceptionBase( nCode ) \ +{ \ + va_list ap; \ + va_start( ap, lpFormat ); \ + setWhat( lpFormat, ap ); \ + va_end( ap ); \ +} \ +name::name( int nCode ) throw() : \ + ExceptionBase( nCode ) \ +{ \ +} + +#endif diff --git a/src/exceptions.cpp b/src/exceptions.cpp new file mode 100644 index 0000000..37f09a4 --- /dev/null +++ b/src/exceptions.cpp @@ -0,0 +1,10 @@ +#include "exceptions.h" +#include <stdarg.h> + +namespace Bu +{ + subExceptionDef( XmlException ) + subExceptionDef( FileException ) + subExceptionDef( ConnectionException ) + subExceptionDef( PluginException ) +} diff --git a/src/exceptions.h b/src/exceptions.h new file mode 100644 index 0000000..b28d292 --- /dev/null +++ b/src/exceptions.h @@ -0,0 +1,28 @@ +#ifndef EXCEPTIONS_H +#define EXCEPTIONS_H + +#include "exceptionbase.h" +#include <stdarg.h> + +namespace Bu +{ + subExceptionDecl( XmlException ) + subExceptionDecl( FileException ) + subExceptionDecl( ConnectionException ) + subExceptionDecl( PluginException ) + + enum eFileException + { + excodeEOF + }; + + enum eConnectionException + { + excodeReadError, + excodeBadReadError, + excodeConnectionClosed, + excodeSocketTimeout + }; +} + +#endif diff --git a/src/fstring.cpp b/src/fstring.cpp new file mode 100644 index 0000000..56d2173 --- /dev/null +++ b/src/fstring.cpp @@ -0,0 +1,14 @@ +#include "fstring.h" +#include "hash.h" + +template<> uint32_t Bu::__calcHashCode<Bu::FString>( const Bu::FString &k ) +{ + return __calcHashCode( k.c_str() ); +} + +template<> bool Bu::__cmpHashKeys<Bu::FString>( + const Bu::FString &a, const Bu::FString &b ) +{ + return a == b; +} + diff --git a/src/fstring.h b/src/fstring.h new file mode 100644 index 0000000..717068f --- /dev/null +++ b/src/fstring.h @@ -0,0 +1,653 @@ +#ifndef F_STRING_H +#define F_STRING_H + +#include <stdint.h> +#include <memory> +#include "archable.h" +#include "archive.h" +#include "hash.h" + +namespace Bu +{ + template< typename chr > + struct FStringChunk + { + long nLength; + chr *pData; + FStringChunk *pNext; + }; + + /** + * Flexible String class. This class was designed with string passing and + * generation in mind. Like the standard string class you can specify what + * datatype to use for each character. Unlike the standard string class, + * collection of appended and prepended terms is done lazily, making long + * operations that involve many appends very inexpensive. In addition internal + * ref-counting means that if you pass strings around between functions there's + * almost no overhead in time or memory since a reference is created and no + * data is actually copied. This also means that you never need to put any + * FBasicString into a ref-counting container class. + */ + template< typename chr, typename chralloc=std::allocator<chr>, typename chunkalloc=std::allocator<struct FStringChunk<chr> > > + class FBasicString : public Archable + { +#ifndef VALTEST +#define cpy( dest, src, size ) memcpy( dest, src, size*sizeof(chr) ) +#endif + private: + typedef struct FStringChunk<chr> Chunk; + typedef struct FBasicString<chr, chralloc, chunkalloc> MyType; + + public: + FBasicString() : + nLength( 0 ), + pnRefs( NULL ), + pFirst( NULL ), + pLast( NULL ) + { + } + + FBasicString( const chr *pData ) : + nLength( 0 ), + pnRefs( NULL ), + pFirst( NULL ), + pLast( NULL ) + { + append( pData ); + } + + FBasicString( const chr *pData, long nLength ) : + nLength( 0 ), + pnRefs( NULL ), + pFirst( NULL ), + pLast( NULL ) + { + append( pData, nLength ); + } + + FBasicString( const MyType &rSrc ) : + nLength( 0 ), + pnRefs( NULL ), + pFirst( NULL ), + pLast( NULL ) + { + // Here we have no choice but to copy, since the other guy is a const. + // In the case that the source were flat, we could get a reference, it + // would make some things faster, but not matter in many other cases. + + joinShare( rSrc ); + //copyFrom( rSrc ); + } + + FBasicString( const MyType &rSrc, long nLength ) : + nLength( 0 ), + pnRefs( NULL ), + pFirst( NULL ), + pLast( NULL ) + { + append( rSrc.pFirst->pData, nLength ); + } + + FBasicString( const MyType &rSrc, long nStart, long nLength ) : + nLength( 0 ), + pnRefs( NULL ), + pFirst( NULL ), + pLast( NULL ) + { + append( rSrc.pFirst->pData+nStart, nLength ); + } + + FBasicString( long nSize ) : + nLength( nSize ), + pnRefs( NULL ), + pFirst( NULL ), + pLast( NULL ) + { + pFirst = pLast = newChunk( nSize ); + } + + virtual ~FBasicString() + { + clear(); + } + + void append( const chr *pData ) + { + long nLen; + for( nLen = 0; pData[nLen] != (chr)0; nLen++ ); + + Chunk *pNew = newChunk( nLen ); + cpy( pNew->pData, pData, nLen ); + + appendChunk( pNew ); + } + + void append( const chr *pData, long nLen ) + { + Chunk *pNew = newChunk( nLen ); + + cpy( pNew->pData, pData, nLen ); + + appendChunk( pNew ); + } + + void prepend( const chr *pData ) + { + long nLen; + for( nLen = 0; pData[nLen] != (chr)0; nLen++ ); + + Chunk *pNew = newChunk( nLen ); + cpy( pNew->pData, pData, nLen ); + + prependChunk( pNew ); + } + + void prepend( const chr *pData, long nLen ) + { + Chunk *pNew = newChunk( nLen ); + + cpy( pNew->pData, pData, nLen ); + + prependChunk( pNew ); + } + + void clear() + { + realClear(); + } + + void resize( long nNewSize ) + { + if( nLength == nNewSize ) + return; + + flatten(); + + Chunk *pNew = newChunk( nNewSize ); + long nNewLen = (nNewSize<nLength)?(nNewSize):(nLength); + cpy( pNew->pData, pFirst->pData, nNewLen ); + pNew->pData[nNewLen] = (chr)0; + aChr.deallocate( pFirst->pData, pFirst->nLength+1 ); + aChunk.deallocate( pFirst, 1 ); + pFirst = pLast = pNew; + nLength = nNewSize; + } + + long getSize() const + { + return nLength; + } + + chr *getStr() + { + if( pFirst == NULL ) + return NULL; + + flatten(); + return pFirst->pData; + } + + const chr *getStr() const + { + if( pFirst == NULL ) + return NULL; + + flatten(); + return pFirst->pData; + } + + chr *c_str() + { + if( pFirst == NULL ) + return NULL; + + flatten(); + return pFirst->pData; + } + + const chr *c_str() const + { + if( pFirst == NULL ) + return NULL; + + flatten(); + return pFirst->pData; + } + + MyType &operator +=( const chr *pData ) + { + append( pData ); + + return (*this); + } + + MyType &operator +=( const MyType &rSrc ) + { + rSrc.flatten(); + append( rSrc.pFirst->pData, rSrc.nLength ); + + return (*this); + } + + MyType &operator +=( const chr pData ) + { + chr tmp[2] = { pData, (chr)0 }; + append( tmp ); + + return (*this); + } + + MyType &operator =( const chr *pData ) + { + clear(); + append( pData ); + + return (*this); + } + + MyType &operator =( const MyType &rSrc ) + { + //if( rSrc.isFlat() ) + //{ + joinShare( rSrc ); + //} + //else + //{ + // copyFrom( rSrc ); + //} + // + + return (*this); + } + + bool operator ==( const chr *pData ) const + { + if( pFirst == NULL ) { + if( pData == NULL ) + return true; + return false; + } + + flatten(); + const chr *a = pData; + chr *b = pFirst->pData; + for( ; *a!=(chr)0; a++, b++ ) + { + if( *a != *b ) + return false; + } + + return true; + } + + bool operator ==( const MyType &pData ) const + { + if( pFirst == pData.pFirst ) + return true; + if( pFirst == NULL ) + return false; + + flatten(); + pData.flatten(); + const chr *a = pData.pFirst->pData; + chr *b = pFirst->pData; + for( ; *a!=(chr)0; a++, b++ ) + { + if( *a != *b ) + return false; + } + + return true; + } + + bool operator !=(const chr *pData ) const + { + return !(*this == pData); + } + + bool operator !=(const MyType &pData ) const + { + return !(*this == pData); + } + + chr &operator[]( long nIndex ) + { + flatten(); + + return pFirst->pData[nIndex]; + } + + const chr &operator[]( long nIndex ) const + { + flatten(); + + return pFirst->pData[nIndex]; + } + + bool isWS( long nIndex ) const + { + flatten(); + + return pFirst->pData[nIndex]==' ' || pFirst->pData[nIndex]=='\t' + || pFirst->pData[nIndex]=='\r' || pFirst->pData[nIndex]=='\n'; + } + + bool isAlpha( long nIndex ) const + { + flatten(); + + return (pFirst->pData[nIndex] >= 'a' && pFirst->pData[nIndex] <= 'z') + || (pFirst->pData[nIndex] >= 'A' && pFirst->pData[nIndex] <= 'Z'); + } + + void toLower() + { + flatten(); + unShare(); + + for( long j = 0; j < nLength; j++ ) + { + if( pFirst->pData[j] >= 'A' && pFirst->pData[j] <= 'Z' ) + pFirst->pData[j] -= 'A'-'a'; + } + } + + void toUpper() + { + flatten(); + unShare(); + + for( long j = 0; j < nLength; j++ ) + { + if( pFirst->pData[j] >= 'a' && pFirst->pData[j] <= 'z' ) + pFirst->pData[j] += 'A'-'a'; + } + } + + void archive( class Archive &ar ) + { + if( ar.isLoading() ) + { + clear(); + long nLen; + ar >> nLen; + + Chunk *pNew = newChunk( nLen ); + ar.read( pNew->pData, nLen*sizeof(chr) ); + appendChunk( pNew ); + } + else + { + flatten(); + + ar << nLength; + ar.write( pFirst->pData, nLength*sizeof(chr) ); + } + } + + private: + void flatten() const + { + if( isFlat() ) + return; + + if( pFirst == NULL ) + return; + + unShare(); + + Chunk *pNew = newChunk( nLength ); + chr *pos = pNew->pData; + Chunk *i = pFirst; + for(;;) + { + cpy( pos, i->pData, i->nLength ); + pos += i->nLength; + i = i->pNext; + if( i == NULL ) + break; + } + realClear(); + + pLast = pFirst = pNew; + nLength = pNew->nLength; + } + + void realClear() const + { + if( pFirst == NULL ) + return; + + if( isShared() ) + { + decRefs(); + } + else + { + Chunk *i = pFirst; + for(;;) + { + Chunk *n = i->pNext; + aChr.deallocate( i->pData, i->nLength+1 ); + aChunk.deallocate( i, 1 ); + if( n == NULL ) + break; + i = n; + } + pFirst = pLast = NULL; + nLength = 0; + } + } + + void copyFrom( const FBasicString<chr, chralloc, chunkalloc> &rSrc ) + { + if( rSrc.pFirst == NULL ) + return; + + decRefs(); + + Chunk *pNew = newChunk( rSrc.nLength ); + chr *pos = pNew->pData; + Chunk *i = rSrc.pFirst; + for(;;) + { + cpy( pos, i->pData, i->nLength ); + pos += i->nLength; + i = i->pNext; + if( i == NULL ) + break; + } + clear(); + + appendChunk( pNew ); + } + + bool isFlat() const + { + return (pFirst == pLast); + } + + bool isShared() const + { + return (pnRefs != NULL); + } + + Chunk *newChunk() const + { + Chunk *pNew = aChunk.allocate( 1 ); + pNew->pNext = NULL; + return pNew; + } + + Chunk *newChunk( long nLen ) const + { + Chunk *pNew = aChunk.allocate( 1 ); + pNew->pNext = NULL; + pNew->nLength = nLen; + pNew->pData = aChr.allocate( nLen+1 ); + pNew->pData[nLen] = (chr)0; + return pNew; + } + + void appendChunk( Chunk *pNewChunk ) + { + unShare(); + + if( pFirst == NULL ) + pLast = pFirst = pNewChunk; + else + { + pLast->pNext = pNewChunk; + pLast = pNewChunk; + } + + nLength += pNewChunk->nLength; + } + + void prependChunk( Chunk *pNewChunk ) + { + unShare(); + + if( pFirst == NULL ) + pLast = pFirst = pNewChunk; + else + { + pNewChunk->pNext = pFirst; + pFirst = pNewChunk; + } + + nLength += pNewChunk->nLength; + } + + void joinShare( MyType &rSrc ) + { + clear(); + + if( !rSrc.isFlat() ) + rSrc.flatten(); + + rSrc.initCount(); + pnRefs = rSrc.pnRefs; + (*pnRefs)++; + nLength = rSrc.nLength; + pFirst = rSrc.pFirst; + pLast = rSrc.pLast; + } + + void joinShare( const MyType &rSrc ) + { + clear(); + + rSrc.flatten(); + + if( !rSrc.isShared() ) + { + rSrc.pnRefs = new uint32_t; + (*rSrc.pnRefs) = 1; + } + pnRefs = rSrc.pnRefs; + (*pnRefs)++; + nLength = rSrc.nLength; + pFirst = rSrc.pFirst; + pLast = rSrc.pLast; + } + + /** + * This takes an object that was shared and makes a copy of the base data + * that was being shared so that this copy can be changed. This should be + * added before any call that will change this object; + */ + void unShare() const + { + if( isShared() == false ) + return; + + Chunk *pNew = newChunk( nLength ); + chr *pos = pNew->pData; + Chunk *i = pFirst; + for(;;) + { + cpy( pos, i->pData, i->nLength ); + pos += i->nLength; + i = i->pNext; + if( i == NULL ) + break; + } + decRefs(); + pLast = pFirst = pNew; + nLength = pNew->nLength; + } + + /** + * This decrements our ref count and pulls us out of the share. If the ref + * count hits zero because of this, it destroys the share. This is not + * safe to call on it's own, it's much better to call unShare. + */ + void decRefs() const + { + if( isShared() ) + { + (*pnRefs)--; + if( (*pnRefs) == 0 ) + destroyShare(); + else + { + pnRefs = NULL; + pFirst = NULL; + pLast = NULL; + nLength = 0; + } + } + } + + /** + * While the unShare function removes an instance from a share, this + * function destroys the data that was in the share, removing the share + * itself. This should only be called when the refcount for the share has + * or is about to reach zero. + */ + void destroyShare() const + { + delete pnRefs; + pnRefs = NULL; + realClear(); + } + +#ifdef VALTEST + void cpy( chr *dest, const chr *src, long count ) const + { + for( int j = 0; j < count; j++ ) + { + *dest = *src; + dest++; + src++; + } + } +#endif + + void initCount() const + { + if( !isShared() ) + { + pnRefs = new uint32_t; + (*pnRefs) = 1; + } + } + + private: + mutable long nLength; + mutable uint32_t *pnRefs; + mutable Chunk *pFirst; + mutable Chunk *pLast; + + mutable chralloc aChr; + mutable chunkalloc aChunk; + }; + + typedef FBasicString<char> FString; + + template<> uint32_t __calcHashCode<FString>( const FString &k ); + template<> bool __cmpHashKeys<FString>( const FString &a, const FString &b ); +} + +#endif diff --git a/src/hash.cpp b/src/hash.cpp new file mode 100644 index 0000000..a207c29 --- /dev/null +++ b/src/hash.cpp @@ -0,0 +1,101 @@ +#include "hash.h" + +namespace Bu { subExceptionDef( HashException ) } + +template<> uint32_t Bu::__calcHashCode<int>( const int &k ) +{ + return k; +} + +template<> bool Bu::__cmpHashKeys<int>( const int &a, const int &b ) +{ + return a == b; +} + +template<> uint32_t Bu::__calcHashCode<unsigned int>( const unsigned int &k ) +{ + return k; +} + +template<> bool Bu::__cmpHashKeys<unsigned int>( const unsigned int &a, const unsigned int &b ) +{ + return a == b; +} + +template<> +uint32_t Bu::__calcHashCode<const char *>( const char * const &k ) +{ + if (k == NULL) + { + return 0; + } + + unsigned long int nPos = 0; + for( const char *s = k; *s; s++ ) + { + nPos = *s + (nPos << 6) + (nPos << 16) - nPos; + } + + return nPos; +} + +template<> bool Bu::__cmpHashKeys<const char *>( const char * const &a, const char * const &b ) +{ + if( a == b ) + return true; + + for(int j=0; a[j] == b[j]; j++ ) + if( a[j] == '\0' ) + return true; + + return false; +} + +template<> +uint32_t Bu::__calcHashCode<char *>( char * const &k ) +{ + if (k == NULL) + { + return 0; + } + + unsigned long int nPos = 0; + for( const char *s = k; *s; s++ ) + { + nPos = *s + (nPos << 6) + (nPos << 16) - nPos; + } + + return nPos; +} + +template<> bool Bu::__cmpHashKeys<char *>( char * const &a, char * const &b ) +{ + if( a == b ) + return true; + + for(int j=0; a[j] == b[j]; j++ ) + if( a[j] == '\0' ) + return true; + + return false; +} + +template<> uint32_t Bu::__calcHashCode<std::string>( const std::string &k ) +{ + std::string::size_type j, sz = k.size(); + const char *s = k.c_str(); + + unsigned long int nPos = 0; + for( j = 0; j < sz; j++, s++ ) + { + nPos = *s + (nPos << 6) + (nPos << 16) - nPos; + } + + return nPos; +} + +template<> bool Bu::__cmpHashKeys<std::string>( const std::string &a, const std::string &b ) +{ + return a == b; +} + diff --git a/src/hash.h b/src/hash.h new file mode 100644 index 0000000..9e498f1 --- /dev/null +++ b/src/hash.h @@ -0,0 +1,745 @@ +#ifndef HASH_H +#define HASH_H + +#include <stddef.h> +#include <string.h> +#include <memory> +#include <iostream> +#include <list> +#include <utility> +#include "exceptionbase.h" +#include "archable.h" +#include "archive.h" + +#define bitsToBytes( n ) (n/32+(n%32>0 ? 1 : 0)) + +namespace Bu +{ + subExceptionDecl( HashException ) + + enum eHashException + { + excodeNotFilled + }; + + template<typename T> + uint32_t __calcHashCode( const T &k ); + + template<typename T> + bool __cmpHashKeys( const T &a, const T &b ); + + struct __calcNextTSize_fast + { + uint32_t operator()( uint32_t nCapacity, uint32_t nFill, uint32_t nDeleted ) const + { + if( nDeleted >= nCapacity/2 ) + return nCapacity; + return nCapacity*2+1; + } + }; + + template<typename key, typename value, typename sizecalc = __calcNextTSize_fast, typename keyalloc = std::allocator<key>, typename valuealloc = std::allocator<value>, typename challoc = std::allocator<uint32_t> > + class Hash; + + template< typename key, typename _value, typename sizecalc = __calcNextTSize_fast, typename keyalloc = std::allocator<key>, typename valuealloc = std::allocator<_value>, typename challoc = std::allocator<uint32_t> > + struct HashProxy + { + friend class Hash<key, _value, sizecalc, keyalloc, valuealloc, challoc>; + private: + HashProxy( Hash<key, _value, sizecalc, keyalloc, valuealloc, challoc> &h, key *k, uint32_t nPos, uint32_t hash ) : + hsh( h ), + pKey( k ), + nPos( nPos ), + hash( hash ), + bFilled( false ) + { + } + + HashProxy( Hash<key, _value, sizecalc, keyalloc, valuealloc, challoc> &h, uint32_t nPos, _value *pValue ) : + hsh( h ), + nPos( nPos ), + pValue( pValue ), + bFilled( true ) + { + } + + Hash<key, _value, sizecalc, keyalloc, valuealloc, challoc> &hsh; + key *pKey; + uint32_t nPos; + _value *pValue; + uint32_t hash; + bool bFilled; + + public: + operator _value &() + { + if( bFilled == false ) + throw HashException( + excodeNotFilled, + "No data assosiated with that key." + ); + return *pValue; + } + + _value &value() + { + if( bFilled == false ) + throw HashException( + excodeNotFilled, + "No data assosiated with that key." + ); + return *pValue; + } + + bool isFilled() + { + return bFilled; + } + + void erase() + { + if( bFilled ) + { + hsh._erase( nPos ); + hsh.onDelete(); + } + } + + _value operator=( _value nval ) + { + if( bFilled ) + { + hsh.va.destroy( pValue ); + hsh.va.construct( pValue, nval ); + hsh.onUpdate(); + } + else + { + hsh.fill( nPos, *pKey, nval, hash ); + hsh.onInsert(); + } + + return nval; + } + + _value *operator->() + { + if( bFilled == false ) + throw HashException( + excodeNotFilled, + "No data assosiated with that key." + ); + return pValue; + } + }; + + template<typename key, typename value, typename sizecalc, typename keyalloc, typename valuealloc, typename challoc > + class Hash + { + friend struct HashProxy<key, value, sizecalc, keyalloc, valuealloc, challoc>; + public: + Hash() : + nCapacity( 11 ), + nFilled( 0 ), + nDeleted( 0 ), + bFilled( NULL ), + bDeleted( NULL ), + aKeys( NULL ), + aValues( NULL ), + aHashCodes( NULL ) + { + nKeysSize = bitsToBytes( nCapacity ); + bFilled = ca.allocate( nKeysSize ); + bDeleted = ca.allocate( nKeysSize ); + clearBits(); + + aHashCodes = ca.allocate( nCapacity ); + aKeys = ka.allocate( nCapacity ); + aValues = va.allocate( nCapacity ); + } + + Hash( const Hash &src ) : + nCapacity( src.nCapacity ), + nFilled( 0 ), + nDeleted( 0 ), + bFilled( NULL ), + bDeleted( NULL ), + aKeys( NULL ), + aValues( NULL ), + aHashCodes( NULL ) + { + nKeysSize = bitsToBytes( nCapacity ); + bFilled = ca.allocate( nKeysSize ); + bDeleted = ca.allocate( nKeysSize ); + clearBits(); + + aHashCodes = ca.allocate( nCapacity ); + aKeys = ka.allocate( nCapacity ); + aValues = va.allocate( nCapacity ); + + for( uint32_t j = 0; j < src.nCapacity; j++ ) + { + if( src.isFilled( j ) ) + { + insert( src.aKeys[j], src.aValues[j] ); + } + } + } + + Hash &operator=( const Hash &src ) + { + for( uint32_t j = 0; j < nCapacity; j++ ) + { + if( isFilled( j ) ) + if( !isDeleted( j ) ) + { + va.destroy( &aValues[j] ); + ka.destroy( &aKeys[j] ); + } + } + va.deallocate( aValues, nCapacity ); + ka.deallocate( aKeys, nCapacity ); + ca.deallocate( bFilled, nKeysSize ); + ca.deallocate( bDeleted, nKeysSize ); + ca.deallocate( aHashCodes, nCapacity ); + + nFilled = 0; + nDeleted = 0; + nCapacity = src.nCapacity; + nKeysSize = bitsToBytes( nCapacity ); + bFilled = ca.allocate( nKeysSize ); + bDeleted = ca.allocate( nKeysSize ); + clearBits(); + + aHashCodes = ca.allocate( nCapacity ); + aKeys = ka.allocate( nCapacity ); + aValues = va.allocate( nCapacity ); + + for( uint32_t j = 0; j < src.nCapacity; j++ ) + { + if( src.isFilled( j ) ) + { + insert( src.aKeys[j], src.aValues[j] ); + } + } + + return *this; + } + + virtual ~Hash() + { + for( uint32_t j = 0; j < nCapacity; j++ ) + { + if( isFilled( j ) ) + if( !isDeleted( j ) ) + { + va.destroy( &aValues[j] ); + ka.destroy( &aKeys[j] ); + } + } + va.deallocate( aValues, nCapacity ); + ka.deallocate( aKeys, nCapacity ); + ca.deallocate( bFilled, nKeysSize ); + ca.deallocate( bDeleted, nKeysSize ); + ca.deallocate( aHashCodes, nCapacity ); + } + + uint32_t getCapacity() + { + return nCapacity; + } + + uint32_t getFill() + { + return nFilled; + } + + uint32_t size() + { + return nFilled-nDeleted; + } + + uint32_t getDeleted() + { + return nDeleted; + } + + virtual HashProxy<key, value, sizecalc, keyalloc, valuealloc, challoc> operator[]( key k ) + { + uint32_t hash = __calcHashCode( k ); + bool bFill; + uint32_t nPos = probe( hash, k, bFill ); + + if( bFill ) + { + return HashProxy<key, value, sizecalc, keyalloc, valuealloc, challoc>( *this, nPos, &aValues[nPos] ); + } + else + { + return HashProxy<key, value, sizecalc, keyalloc, valuealloc, challoc>( *this, &k, nPos, hash ); + } + } + + virtual void insert( key k, value v ) + { + uint32_t hash = __calcHashCode( k ); + bool bFill; + uint32_t nPos = probe( hash, k, bFill ); + + if( bFill ) + { + va.destroy( &aValues[nPos] ); + va.construct( &aValues[nPos], v ); + onUpdate(); + } + else + { + fill( nPos, k, v, hash ); + onInsert(); + } + } + + virtual void erase( key k ) + { + uint32_t hash = __calcHashCode( k ); + bool bFill; + uint32_t nPos = probe( hash, k, bFill ); + + if( bFill ) + { + _erase( nPos ); + onDelete(); + } + } + + struct iterator; + virtual void erase( struct iterator &i ) + { + if( this != &i.hsh ) + throw HashException("This iterator didn't come from this Hash."); + if( isFilled( i.nPos ) && !isDeleted( i.nPos ) ) + { + _erase( i.nPos ); + onDelete(); + } + } + + virtual void clear() + { + for( uint32_t j = 0; j < nCapacity; j++ ) + { + if( isFilled( j ) ) + if( !isDeleted( j ) ) + { + va.destroy( &aValues[j] ); + ka.destroy( &aKeys[j] ); + onDelete(); + } + } + + clearBits(); + } + + virtual value &get( key k ) + { + uint32_t hash = __calcHashCode( k ); + bool bFill; + uint32_t nPos = probe( hash, k, bFill ); + + if( bFill ) + { + return aValues[nPos]; + } + else + { + throw HashException( + excodeNotFilled, + "No data assosiated with that key." + ); + } + } + + virtual bool has( key k ) + { + bool bFill; + probe( __calcHashCode( k ), k, bFill, false ); + + return bFill; + } + + typedef struct iterator + { + friend class Hash<key, value, sizecalc, keyalloc, valuealloc, challoc>; + private: + iterator( Hash<key, value, sizecalc, keyalloc, valuealloc, challoc> &hsh ) : + hsh( hsh ), + nPos( 0 ), + bFinished( false ) + { + nPos = hsh.getFirstPos( bFinished ); + } + + iterator( Hash<key, value, sizecalc, keyalloc, valuealloc, challoc> &hsh, bool bDone ) : + hsh( hsh ), + nPos( 0 ), + bFinished( bDone ) + { + } + + Hash<key, value, sizecalc, keyalloc, valuealloc, challoc> &hsh; + uint32_t nPos; + bool bFinished; + + public: + iterator operator++( int ) + { + if( bFinished == false ) + nPos = hsh.getNextPos( nPos, bFinished ); + + return *this; + } + + iterator operator++() + { + if( bFinished == false ) + nPos = hsh.getNextPos( nPos, bFinished ); + + return *this; + } + + bool operator==( const iterator &oth ) + { + if( bFinished != oth.bFinished ) + return false; + if( bFinished == true ) + { + return true; + } + else + { + if( oth.nPos == nPos ) + return true; + return false; + } + } + + bool operator!=( const iterator &oth ) + { + return !(*this == oth ); + } + + iterator operator=( const iterator &oth ) + { + if( &hsh != &oth.hsh ) + throw HashException( + "Cannot mix iterators from different hash objects."); + nPos = oth.nPos; + bFinished = oth.bFinished; + } + + std::pair<key,value> operator *() + { + return hsh.getAtPos( nPos ); + } + + key &getKey() + { + return hsh.getKeyAtPos( nPos ); + } + + value &getValue() + { + return hsh.getValueAtPos( nPos ); + } + }; + + iterator begin() + { + return iterator( *this ); + } + + iterator end() + { + return iterator( *this, true ); + } + + std::list<key> getKeys() + { + std::list<key> lKeys; + + for( uint32_t j = 0; j < nCapacity; j++ ) + { + if( isFilled( j ) ) + { + if( !isDeleted( j ) ) + { + lKeys.push_back( aKeys[j] ); + } + } + } + + return lKeys; + } + + protected: + virtual void onInsert() {} + virtual void onUpdate() {} + virtual void onDelete() {} + virtual void onReHash() {} + + virtual void clearBits() + { + for( uint32_t j = 0; j < nKeysSize; j++ ) + { + bFilled[j] = bDeleted[j] = 0; + } + } + + virtual void fill( uint32_t loc, key &k, value &v, uint32_t hash ) + { + bFilled[loc/32] |= (1<<(loc%32)); + va.construct( &aValues[loc], v ); + ka.construct( &aKeys[loc], k ); + aHashCodes[loc] = hash; + nFilled++; + //printf("Filled: %d, Deleted: %d, Capacity: %d\n", + // nFilled, nDeleted, nCapacity ); + } + + virtual void _erase( uint32_t loc ) + { + bDeleted[loc/32] |= (1<<(loc%32)); + va.destroy( &aValues[loc] ); + ka.destroy( &aKeys[loc] ); + nDeleted++; + //printf("Filled: %d, Deleted: %d, Capacity: %d\n", + // nFilled, nDeleted, nCapacity ); + } + + virtual std::pair<key,value> getAtPos( uint32_t nPos ) + { + return std::pair<key,value>(aKeys[nPos],aValues[nPos]); + } + + virtual key &getKeyAtPos( uint32_t nPos ) + { + return aKeys[nPos]; + } + + virtual value &getValueAtPos( uint32_t nPos ) + { + return aValues[nPos]; + } + + virtual uint32_t getFirstPos( bool &bFinished ) + { + for( uint32_t j = 0; j < nCapacity; j++ ) + { + if( isFilled( j ) ) + if( !isDeleted( j ) ) + return j; + } + + bFinished = true; + return 0; + } + + virtual uint32_t getNextPos( uint32_t nPos, bool &bFinished ) + { + for( uint32_t j = nPos+1; j < nCapacity; j++ ) + { + if( isFilled( j ) ) + if( !isDeleted( j ) ) + return j; + } + + bFinished = true; + return 0; + } + + uint32_t probe( uint32_t hash, key k, bool &bFill, bool rehash=true ) + { + uint32_t nCur = hash%nCapacity; + + // First we scan to see if the key is already there, abort if we + // run out of probing room, or we find a non-filled entry + for( int8_t j = 0; + isFilled( nCur ) && j < 32; + nCur = (nCur + (1<<j))%nCapacity, j++ + ) + { + // Is this the same hash code we were looking for? + if( hash == aHashCodes[nCur] ) + { + // Skip over deleted entries. Deleted entries are also filled, + // so we only have to do this check here. + if( isDeleted( nCur ) ) + continue; + + // Is it really the same key? (for safety) + if( __cmpHashKeys( aKeys[nCur], k ) == true ) + { + bFill = true; + return nCur; + } + } + } + + // This is our insurance, if the table is full, then go ahead and + // rehash, then try again. + if( isFilled( nCur ) && rehash == true ) + { + reHash( szCalc(getCapacity(), getFill(), getDeleted()) ); + + // This is potentially dangerous, and could cause an infinite loop. + // Be careful writing probe, eh? + return probe( hash, k, bFill ); + } + + bFill = false; + return nCur; + } + + void reHash( uint32_t nNewSize ) + { + //printf("---REHASH---"); + //printf("Filled: %d, Deleted: %d, Capacity: %d\n", + // nFilled, nDeleted, nCapacity ); + + // Save all the old data + uint32_t nOldCapacity = nCapacity; + uint32_t *bOldFilled = bFilled; + uint32_t *aOldHashCodes = aHashCodes; + uint32_t nOldKeysSize = nKeysSize; + uint32_t *bOldDeleted = bDeleted; + value *aOldValues = aValues; + key *aOldKeys = aKeys; + + // Calculate new sizes + nCapacity = nNewSize; + nKeysSize = bitsToBytes( nCapacity ); + + // Allocate new memory + prep + bFilled = ca.allocate( nKeysSize ); + bDeleted = ca.allocate( nKeysSize ); + clearBits(); + + aHashCodes = ca.allocate( nCapacity ); + aKeys = ka.allocate( nCapacity ); + aValues = va.allocate( nCapacity ); + + nDeleted = nFilled = 0; + + // Re-insert all of the old data (except deleted items) + for( uint32_t j = 0; j < nOldCapacity; j++ ) + { + if( (bOldFilled[j/32]&(1<<(j%32)))!=0 && + (bOldDeleted[j/32]&(1<<(j%32)))==0 ) + { + insert( aOldKeys[j], aOldValues[j] ); + } + } + + // Delete all of the old data + for( uint32_t j = 0; j < nOldCapacity; j++ ) + { + if( (bOldFilled[j/32]&(1<<(j%32)))!=0 ) + { + va.destroy( &aOldValues[j] ); + ka.destroy( &aOldKeys[j] ); + } + } + va.deallocate( aOldValues, nOldCapacity ); + ka.deallocate( aOldKeys, nOldCapacity ); + ca.deallocate( bOldFilled, nOldKeysSize ); + ca.deallocate( bOldDeleted, nOldKeysSize ); + ca.deallocate( aOldHashCodes, nOldCapacity ); + } + + virtual bool isFilled( uint32_t loc ) const + { + return (bFilled[loc/32]&(1<<(loc%32)))!=0; + } + + virtual bool isDeleted( uint32_t loc ) + { + return (bDeleted[loc/32]&(1<<(loc%32)))!=0; + } + + protected: + uint32_t nCapacity; + uint32_t nFilled; + uint32_t nDeleted; + uint32_t *bFilled; + uint32_t *bDeleted; + uint32_t nKeysSize; + key *aKeys; + value *aValues; + uint32_t *aHashCodes; + valuealloc va; + keyalloc ka; + challoc ca; + sizecalc szCalc; + }; + + template<> uint32_t __calcHashCode<int>( const int &k ); + template<> bool __cmpHashKeys<int>( const int &a, const int &b ); + + template<> uint32_t __calcHashCode<unsigned int>( const unsigned int &k ); + template<> bool __cmpHashKeys<unsigned int>( const unsigned int &a, const unsigned int &b ); + + template<> uint32_t __calcHashCode<const char *>( const char * const &k ); + template<> bool __cmpHashKeys<const char *>( const char * const &a, const char * const &b ); + + template<> uint32_t __calcHashCode<char *>( char * const &k ); + template<> bool __cmpHashKeys<char *>( char * const &a, char * const &b ); + + template<> uint32_t __calcHashCode<std::string>( const std::string &k ); + template<> bool __cmpHashKeys<std::string>( const std::string &a, const std::string &b ); + + template<typename key, typename value> + Archive &operator<<( Archive &ar, Hash<key,value> &h ) + { + ar << h.size(); + for( typename Hash<key,value>::iterator i = h.begin(); i != h.end(); i++ ) + { + std::pair<key,value> p = *i; + ar << p.first << p.second; + } + + return ar; + } + + template<typename key, typename value> + Archive &operator>>( Archive &ar, Hash<key,value> &h ) + { + h.clear(); + uint32_t nSize; + ar >> nSize; + + for( uint32_t j = 0; j < nSize; j++ ) + { + key k; value v; + ar >> k >> v; + h.insert( k, v ); + } + + return ar; + } + + /* + template<typename key, typename value> + Serializer &operator&&( Serializer &ar, Hash<key,value> &h ) + { + if( ar.isLoading() ) + { + return ar >> h; + } + else + { + return ar << h; + } + }*/ +} + +#endif diff --git a/src/old/exceptionbase.cpp b/src/old/exceptionbase.cpp deleted file mode 100644 index f3d22da..0000000 --- a/src/old/exceptionbase.cpp +++ /dev/null @@ -1,70 +0,0 @@ -#include "exceptionbase.h" -#include <stdarg.h> - -ExceptionBase::ExceptionBase( const char *lpFormat, ... ) throw() : - nErrorCode( 0 ), - sWhat( NULL ) -{ - va_list ap; - - va_start(ap, lpFormat); - setWhat( lpFormat, ap ); - va_end(ap); -} - -ExceptionBase::ExceptionBase( int nCode, const char *lpFormat, ... ) throw() : - nErrorCode( nCode ), - sWhat( NULL ) -{ - va_list ap; - - va_start(ap, lpFormat); - setWhat( lpFormat, ap ); - va_end(ap); -} - -ExceptionBase::ExceptionBase( int nCode ) throw() : - nErrorCode( nCode ), - sWhat( NULL ) -{ -} - -ExceptionBase::~ExceptionBase() throw() -{ - if( sWhat ) - { - delete[] sWhat; - sWhat = NULL; - } -} - -void ExceptionBase::setWhat( const char *lpFormat, va_list &vargs ) -{ - if( sWhat ) delete[] sWhat; - int nSize; - - nSize = vsnprintf( NULL, 0, lpFormat, vargs ); - sWhat = new char[nSize+1]; - vsnprintf( sWhat, nSize+1, lpFormat, vargs ); -} - -void ExceptionBase::setWhat( const char *lpText ) -{ - if( sWhat ) delete[] sWhat; - int nSize; - - nSize = strlen( lpText ); - sWhat = new char[nSize+1]; - strcpy( sWhat, lpText ); -} - -const char *ExceptionBase::what() const throw() -{ - return sWhat; -} - -int ExceptionBase::getErrorCode() -{ - return nErrorCode; -} - diff --git a/src/old/exceptionbase.h b/src/old/exceptionbase.h deleted file mode 100644 index 6f1eca7..0000000 --- a/src/old/exceptionbase.h +++ /dev/null @@ -1,105 +0,0 @@ -#ifndef EXCEPTION_BASE_H -#define EXCEPTION_BASE_H - -#include <string> -#include <exception> -#include <stdarg.h> - -/** - * A generalized Exception base class. This is nice for making general and - * flexible child classes that can create new error code classes. - */ -class ExceptionBase : public std::exception -{ -public: - /** - * Construct an exception with an error code of zero, but with a - * description. The use of this is not reccomended most of the time, it's - * generally best to include an error code with the exception so your - * program can handle the exception in a better way. - * @param sFormat The format of the text. See printf for more info. - */ - ExceptionBase( const char *sFormat, ... ) throw(); - - /** - * - * @param nCode - * @param sFormat - */ - ExceptionBase( int nCode, const char *sFormat, ... ) throw(); - - /** - * - * @param nCode - * @return - */ - ExceptionBase( int nCode=0 ) throw(); - - /** - * - * @return - */ - virtual ~ExceptionBase() throw(); - - /** - * - * @return - */ - virtual const char *what() const throw(); - - /** - * - * @return - */ - int getErrorCode(); - - /** - * - * @param lpFormat - * @param vargs - */ - void setWhat( const char *lpFormat, va_list &vargs ); - - /** - * - * @param lpText - */ - void setWhat( const char *lpText ); - -private: - int nErrorCode; /**< The code for the error that occured. */ - char *sWhat; /**< The text string telling people what went wrong. */ -}; - -#define subExceptionDecl( name ) \ -class name : public ExceptionBase \ -{ \ - public: \ - name( const char *sFormat, ... ) throw (); \ - name( int nCode, const char *sFormat, ... ) throw(); \ - name( int nCode=0 ) throw (); \ -}; - -#define subExceptionDef( name ) \ -name::name( const char *lpFormat, ... ) throw() : \ - ExceptionBase( 0 ) \ -{ \ - va_list ap; \ - va_start( ap, lpFormat ); \ - setWhat( lpFormat, ap ); \ - va_end( ap ); \ -} \ -name::name( int nCode, const char *lpFormat, ... ) throw() : \ - ExceptionBase( nCode ) \ -{ \ - va_list ap; \ - va_start( ap, lpFormat ); \ - setWhat( lpFormat, ap ); \ - va_end( ap ); \ -} \ -name::name( int nCode ) throw() : \ - ExceptionBase( nCode ) \ -{ \ -} - -#endif diff --git a/src/old/exceptions.cpp b/src/old/exceptions.cpp deleted file mode 100644 index ce79a5e..0000000 --- a/src/old/exceptions.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "exceptions.h" -#include <stdarg.h> - -subExceptionDef( XmlException ) -subExceptionDef( FileException ) -subExceptionDef( ConnectionException ) -subExceptionDef( PluginException ) - diff --git a/src/old/exceptions.h b/src/old/exceptions.h deleted file mode 100644 index 0ab2b15..0000000 --- a/src/old/exceptions.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef EXCEPTIONS_H -#define EXCEPTIONS_H - -#include "exceptionbase.h" -#include <stdarg.h> - -subExceptionDecl( XmlException ) -subExceptionDecl( FileException ) -subExceptionDecl( ConnectionException ) -subExceptionDecl( PluginException ) - -enum eFileException -{ - excodeEOF -}; - -enum eConnectionException -{ - excodeReadError, - excodeBadReadError, - excodeConnectionClosed, - excodeSocketTimeout -}; - -#endif diff --git a/src/old/fstring.cpp b/src/old/fstring.cpp deleted file mode 100644 index 82d024d..0000000 --- a/src/old/fstring.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "fstring.h" -#include "hash.h" - -template<> uint32_t __calcHashCode<FString>( const FString &k ) -{ - return __calcHashCode( k.c_str() ); -} - -template<> bool __cmpHashKeys<FString>( const FString &a, const FString &b ) -{ - return a == b; -} - diff --git a/src/old/fstring.h b/src/old/fstring.h deleted file mode 100644 index c5397cc..0000000 --- a/src/old/fstring.h +++ /dev/null @@ -1,651 +0,0 @@ -#ifndef F_STRING_H -#define F_STRING_H - -#include <stdint.h> -#include <memory> -#include "serializable.h" -#include "serializer.h" - -template< typename chr > -struct FStringChunk -{ - long nLength; - chr *pData; - FStringChunk *pNext; -}; - -/** - * Flexible String class. This class was designed with string passing and - * generation in mind. Like the standard string class you can specify what - * datatype to use for each character. Unlike the standard string class, - * collection of appended and prepended terms is done lazily, making long - * operations that involve many appends very inexpensive. In addition internal - * ref-counting means that if you pass strings around between functions there's - * almost no overhead in time or memory since a reference is created and no - * data is actually copied. This also means that you never need to put any - * FBasicString into a ref-counting container class. - */ -template< typename chr, typename chralloc=std::allocator<chr>, typename chunkalloc=std::allocator<struct FStringChunk<chr> > > -class FBasicString : public Serializable -{ -#ifndef VALTEST -#define cpy( dest, src, size ) memcpy( dest, src, size*sizeof(chr) ) -#endif -private: - typedef struct FStringChunk<chr> Chunk; - typedef struct FBasicString<chr, chralloc, chunkalloc> MyType; - -public: - FBasicString() : - nLength( 0 ), - pnRefs( NULL ), - pFirst( NULL ), - pLast( NULL ) - { - } - - FBasicString( const chr *pData ) : - nLength( 0 ), - pnRefs( NULL ), - pFirst( NULL ), - pLast( NULL ) - { - append( pData ); - } - - FBasicString( const chr *pData, long nLength ) : - nLength( 0 ), - pnRefs( NULL ), - pFirst( NULL ), - pLast( NULL ) - { - append( pData, nLength ); - } - - FBasicString( const MyType &rSrc ) : - nLength( 0 ), - pnRefs( NULL ), - pFirst( NULL ), - pLast( NULL ) - { - // Here we have no choice but to copy, since the other guy is a const. - // In the case that the source were flat, we could get a reference, it - // would make some things faster, but not matter in many other cases. - - joinShare( rSrc ); - //copyFrom( rSrc ); - } - - FBasicString( const MyType &rSrc, long nLength ) : - nLength( 0 ), - pnRefs( NULL ), - pFirst( NULL ), - pLast( NULL ) - { - append( rSrc.pFirst->pData, nLength ); - } - - FBasicString( const MyType &rSrc, long nStart, long nLength ) : - nLength( 0 ), - pnRefs( NULL ), - pFirst( NULL ), - pLast( NULL ) - { - append( rSrc.pFirst->pData+nStart, nLength ); - } - - FBasicString( long nSize ) : - nLength( nSize ), - pnRefs( NULL ), - pFirst( NULL ), - pLast( NULL ) - { - pFirst = pLast = newChunk( nSize ); - } - - virtual ~FBasicString() - { - clear(); - } - - void append( const chr *pData ) - { - long nLen; - for( nLen = 0; pData[nLen] != (chr)0; nLen++ ); - - Chunk *pNew = newChunk( nLen ); - cpy( pNew->pData, pData, nLen ); - - appendChunk( pNew ); - } - - void append( const chr *pData, long nLen ) - { - Chunk *pNew = newChunk( nLen ); - - cpy( pNew->pData, pData, nLen ); - - appendChunk( pNew ); - } - - void prepend( const chr *pData ) - { - long nLen; - for( nLen = 0; pData[nLen] != (chr)0; nLen++ ); - - Chunk *pNew = newChunk( nLen ); - cpy( pNew->pData, pData, nLen ); - - prependChunk( pNew ); - } - - void prepend( const chr *pData, long nLen ) - { - Chunk *pNew = newChunk( nLen ); - - cpy( pNew->pData, pData, nLen ); - - prependChunk( pNew ); - } - - void clear() - { - realClear(); - } - - void resize( long nNewSize ) - { - if( nLength == nNewSize ) - return; - - flatten(); - - Chunk *pNew = newChunk( nNewSize ); - long nNewLen = (nNewSize<nLength)?(nNewSize):(nLength); - cpy( pNew->pData, pFirst->pData, nNewLen ); - pNew->pData[nNewLen] = (chr)0; - aChr.deallocate( pFirst->pData, pFirst->nLength+1 ); - aChunk.deallocate( pFirst, 1 ); - pFirst = pLast = pNew; - nLength = nNewSize; - } - - long getSize() const - { - return nLength; - } - - chr *getStr() - { - if( pFirst == NULL ) - return NULL; - - flatten(); - return pFirst->pData; - } - - const chr *getStr() const - { - if( pFirst == NULL ) - return NULL; - - flatten(); - return pFirst->pData; - } - - chr *c_str() - { - if( pFirst == NULL ) - return NULL; - - flatten(); - return pFirst->pData; - } - - const chr *c_str() const - { - if( pFirst == NULL ) - return NULL; - - flatten(); - return pFirst->pData; - } - - MyType &operator +=( const chr *pData ) - { - append( pData ); - - return (*this); - } - - MyType &operator +=( const MyType &rSrc ) - { - rSrc.flatten(); - append( rSrc.pFirst->pData, rSrc.nLength ); - - return (*this); - } - - MyType &operator +=( const chr pData ) - { - chr tmp[2] = { pData, (chr)0 }; - append( tmp ); - - return (*this); - } - - MyType &operator =( const chr *pData ) - { - clear(); - append( pData ); - - return (*this); - } - - MyType &operator =( const MyType &rSrc ) - { - //if( rSrc.isFlat() ) - //{ - joinShare( rSrc ); - //} - //else - //{ - // copyFrom( rSrc ); - //} - // - - return (*this); - } - - bool operator ==( const chr *pData ) const - { - if( pFirst == NULL ) { - if( pData == NULL ) - return true; - return false; - } - - flatten(); - const chr *a = pData; - chr *b = pFirst->pData; - for( ; *a!=(chr)0; a++, b++ ) - { - if( *a != *b ) - return false; - } - - return true; - } - - bool operator ==( const MyType &pData ) const - { - if( pFirst == pData.pFirst ) - return true; - if( pFirst == NULL ) - return false; - - flatten(); - pData.flatten(); - const chr *a = pData.pFirst->pData; - chr *b = pFirst->pData; - for( ; *a!=(chr)0; a++, b++ ) - { - if( *a != *b ) - return false; - } - - return true; - } - - bool operator !=(const chr *pData ) const - { - return !(*this == pData); - } - - bool operator !=(const MyType &pData ) const - { - return !(*this == pData); - } - - chr &operator[]( long nIndex ) - { - flatten(); - - return pFirst->pData[nIndex]; - } - - const chr &operator[]( long nIndex ) const - { - flatten(); - - return pFirst->pData[nIndex]; - } - - bool isWS( long nIndex ) const - { - flatten(); - - return pFirst->pData[nIndex]==' ' || pFirst->pData[nIndex]=='\t' - || pFirst->pData[nIndex]=='\r' || pFirst->pData[nIndex]=='\n'; - } - - bool isAlpha( long nIndex ) const - { - flatten(); - - return (pFirst->pData[nIndex] >= 'a' && pFirst->pData[nIndex] <= 'z') - || (pFirst->pData[nIndex] >= 'A' && pFirst->pData[nIndex] <= 'Z'); - } - - void toLower() - { - flatten(); - unShare(); - - for( long j = 0; j < nLength; j++ ) - { - if( pFirst->pData[j] >= 'A' && pFirst->pData[j] <= 'Z' ) - pFirst->pData[j] -= 'A'-'a'; - } - } - - void toUpper() - { - flatten(); - unShare(); - - for( long j = 0; j < nLength; j++ ) - { - if( pFirst->pData[j] >= 'a' && pFirst->pData[j] <= 'z' ) - pFirst->pData[j] += 'A'-'a'; - } - } - - void serialize( class Serializer &ar ) - { - if( ar.isLoading() ) - { - clear(); - long nLen; - ar >> nLen; - - Chunk *pNew = newChunk( nLen ); - ar.read( pNew->pData, nLen*sizeof(chr) ); - appendChunk( pNew ); - } - else - { - flatten(); - - ar << nLength; - ar.write( pFirst->pData, nLength*sizeof(chr) ); - } - } - -private: - void flatten() const - { - if( isFlat() ) - return; - - if( pFirst == NULL ) - return; - - unShare(); - - Chunk *pNew = newChunk( nLength ); - chr *pos = pNew->pData; - Chunk *i = pFirst; - for(;;) - { - cpy( pos, i->pData, i->nLength ); - pos += i->nLength; - i = i->pNext; - if( i == NULL ) - break; - } - realClear(); - - pLast = pFirst = pNew; - nLength = pNew->nLength; - } - - void realClear() const - { - if( pFirst == NULL ) - return; - - if( isShared() ) - { - decRefs(); - } - else - { - Chunk *i = pFirst; - for(;;) - { - Chunk *n = i->pNext; - aChr.deallocate( i->pData, i->nLength+1 ); - aChunk.deallocate( i, 1 ); - if( n == NULL ) - break; - i = n; - } - pFirst = pLast = NULL; - nLength = 0; - } - } - - void copyFrom( const FBasicString<chr, chralloc, chunkalloc> &rSrc ) - { - if( rSrc.pFirst == NULL ) - return; - - decRefs(); - - Chunk *pNew = newChunk( rSrc.nLength ); - chr *pos = pNew->pData; - Chunk *i = rSrc.pFirst; - for(;;) - { - cpy( pos, i->pData, i->nLength ); - pos += i->nLength; - i = i->pNext; - if( i == NULL ) - break; - } - clear(); - - appendChunk( pNew ); - } - - bool isFlat() const - { - return (pFirst == pLast); - } - - bool isShared() const - { - return (pnRefs != NULL); - } - - Chunk *newChunk() const - { - Chunk *pNew = aChunk.allocate( 1 ); - pNew->pNext = NULL; - return pNew; - } - - Chunk *newChunk( long nLen ) const - { - Chunk *pNew = aChunk.allocate( 1 ); - pNew->pNext = NULL; - pNew->nLength = nLen; - pNew->pData = aChr.allocate( nLen+1 ); - pNew->pData[nLen] = (chr)0; - return pNew; - } - - void appendChunk( Chunk *pNewChunk ) - { - unShare(); - - if( pFirst == NULL ) - pLast = pFirst = pNewChunk; - else - { - pLast->pNext = pNewChunk; - pLast = pNewChunk; - } - - nLength += pNewChunk->nLength; - } - - void prependChunk( Chunk *pNewChunk ) - { - unShare(); - - if( pFirst == NULL ) - pLast = pFirst = pNewChunk; - else - { - pNewChunk->pNext = pFirst; - pFirst = pNewChunk; - } - - nLength += pNewChunk->nLength; - } - - void joinShare( MyType &rSrc ) - { - clear(); - - if( !rSrc.isFlat() ) - rSrc.flatten(); - - rSrc.initCount(); - pnRefs = rSrc.pnRefs; - (*pnRefs)++; - nLength = rSrc.nLength; - pFirst = rSrc.pFirst; - pLast = rSrc.pLast; - } - - void joinShare( const MyType &rSrc ) - { - clear(); - - rSrc.flatten(); - - if( !rSrc.isShared() ) - { - rSrc.pnRefs = new uint32_t; - (*rSrc.pnRefs) = 1; - } - pnRefs = rSrc.pnRefs; - (*pnRefs)++; - nLength = rSrc.nLength; - pFirst = rSrc.pFirst; - pLast = rSrc.pLast; - } - - /** - * This takes an object that was shared and makes a copy of the base data - * that was being shared so that this copy can be changed. This should be - * added before any call that will change this object; - */ - void unShare() const - { - if( isShared() == false ) - return; - - Chunk *pNew = newChunk( nLength ); - chr *pos = pNew->pData; - Chunk *i = pFirst; - for(;;) - { - cpy( pos, i->pData, i->nLength ); - pos += i->nLength; - i = i->pNext; - if( i == NULL ) - break; - } - decRefs(); - pLast = pFirst = pNew; - nLength = pNew->nLength; - } - - /** - * This decrements our ref count and pulls us out of the share. If the ref - * count hits zero because of this, it destroys the share. This is not - * safe to call on it's own, it's much better to call unShare. - */ - void decRefs() const - { - if( isShared() ) - { - (*pnRefs)--; - if( (*pnRefs) == 0 ) - destroyShare(); - else - { - pnRefs = NULL; - pFirst = NULL; - pLast = NULL; - nLength = 0; - } - } - } - - /** - * While the unShare function removes an instance from a share, this - * function destroys the data that was in the share, removing the share - * itself. This should only be called when the refcount for the share has - * or is about to reach zero. - */ - void destroyShare() const - { - delete pnRefs; - pnRefs = NULL; - realClear(); - } - -#ifdef VALTEST - void cpy( chr *dest, const chr *src, long count ) const - { - for( int j = 0; j < count; j++ ) - { - *dest = *src; - dest++; - src++; - } - } -#endif - - void initCount() const - { - if( !isShared() ) - { - pnRefs = new uint32_t; - (*pnRefs) = 1; - } - } - -private: - mutable long nLength; - mutable uint32_t *pnRefs; - mutable Chunk *pFirst; - mutable Chunk *pLast; - - mutable chralloc aChr; - mutable chunkalloc aChunk; -}; - -typedef FBasicString<char> FString; - -#include "hash.h" -template<> uint32_t __calcHashCode<FString>( const FString &k ); -template<> bool __cmpHashKeys<FString>( const FString &a, const FString &b ); - - -#endif diff --git a/src/old/hash.cpp b/src/old/hash.cpp deleted file mode 100644 index c52e6b1..0000000 --- a/src/old/hash.cpp +++ /dev/null @@ -1,113 +0,0 @@ -#include "hash.h" - -subExceptionDef( HashException ) - -template<> uint32_t __calcHashCode<int>( const int &k ) -{ - return k; -} - -template<> bool __cmpHashKeys<int>( const int &a, const int &b ) -{ - return a == b; -} - -template<> uint32_t __calcHashCode<unsigned int>( const unsigned int &k ) -{ - return k; -} - -template<> bool __cmpHashKeys<unsigned int>( const unsigned int &a, const unsigned int &b ) -{ - return a == b; -} - -template<> -uint32_t __calcHashCode<const char *>( const char * const &k ) -{ - if (k == NULL) - { - return 0; - } - - unsigned long int nPos = 0; - for( const char *s = k; *s; s++ ) - { - nPos = *s + (nPos << 6) + (nPos << 16) - nPos; - } - - return nPos; -} - -template<> bool __cmpHashKeys<const char *>( const char * const &a, const char * const &b ) -{ - if( a == b ) - return true; - - for(int j=0; a[j] == b[j]; j++ ) - if( a[j] == '\0' ) - return true; - - return false; -} - -template<> -uint32_t __calcHashCode<char *>( char * const &k ) -{ - if (k == NULL) - { - return 0; - } - - unsigned long int nPos = 0; - for( const char *s = k; *s; s++ ) - { - nPos = *s + (nPos << 6) + (nPos << 16) - nPos; - } - - return nPos; -} - -template<> bool __cmpHashKeys<char *>( char * const &a, char * const &b ) -{ - if( a == b ) - return true; - - for(int j=0; a[j] == b[j]; j++ ) - if( a[j] == '\0' ) - return true; - - return false; -} - -template<> uint32_t __calcHashCode<std::string>( const std::string &k ) -{ - std::string::size_type j, sz = k.size(); - const char *s = k.c_str(); - - unsigned long int nPos = 0; - for( j = 0; j < sz; j++, s++ ) - { - nPos = *s + (nPos << 6) + (nPos << 16) - nPos; - } - - return nPos; -} - -template<> bool __cmpHashKeys<std::string>( const std::string &a, const std::string &b ) -{ - return a == b; -} - -template<> uint32_t __calcHashCode<Hashable>( const Hashable &k ) -{ - return 0; - //return k.getHashCode(); -} - -template<> bool __cmpHashKeys<Hashable>( const Hashable &a, const Hashable &b ) -{ - return false; - //return a.compareForHash( b ); -} - diff --git a/src/old/hash.h b/src/old/hash.h deleted file mode 100644 index e819379..0000000 --- a/src/old/hash.h +++ /dev/null @@ -1,744 +0,0 @@ -#ifndef HASH_H -#define HASH_H - -#include <stddef.h> -#include <string.h> -#include <memory> -#include <iostream> -#include <list> -#include "exceptionbase.h" -#include "hashable.h" -#include "serializable.h" -#include "serializer.h" - -#define bitsToBytes( n ) (n/32+(n%32>0 ? 1 : 0)) - -subExceptionDecl( HashException ) - -enum eHashException -{ - excodeNotFilled -}; - -template<typename T> -uint32_t __calcHashCode( const T &k ); - -template<typename T> -bool __cmpHashKeys( const T &a, const T &b ); - -struct __calcNextTSize_fast -{ - uint32_t operator()( uint32_t nCapacity, uint32_t nFill, uint32_t nDeleted ) const - { - if( nDeleted >= nCapacity/2 ) - return nCapacity; - return nCapacity*2+1; - } -}; - -template<typename key, typename value, typename sizecalc = __calcNextTSize_fast, typename keyalloc = std::allocator<key>, typename valuealloc = std::allocator<value>, typename challoc = std::allocator<uint32_t> > -class Hash; - -template< typename key, typename _value, typename sizecalc = __calcNextTSize_fast, typename keyalloc = std::allocator<key>, typename valuealloc = std::allocator<_value>, typename challoc = std::allocator<uint32_t> > -struct HashProxy -{ - friend class Hash<key, _value, sizecalc, keyalloc, valuealloc, challoc>; -private: - HashProxy( Hash<key, _value, sizecalc, keyalloc, valuealloc, challoc> &h, key *k, uint32_t nPos, uint32_t hash ) : - hsh( h ), - pKey( k ), - nPos( nPos ), - hash( hash ), - bFilled( false ) - { - } - - HashProxy( Hash<key, _value, sizecalc, keyalloc, valuealloc, challoc> &h, uint32_t nPos, _value *pValue ) : - hsh( h ), - nPos( nPos ), - pValue( pValue ), - bFilled( true ) - { - } - - Hash<key, _value, sizecalc, keyalloc, valuealloc, challoc> &hsh; - key *pKey; - uint32_t nPos; - _value *pValue; - uint32_t hash; - bool bFilled; - -public: - operator _value &() - { - if( bFilled == false ) - throw HashException( - excodeNotFilled, - "No data assosiated with that key." - ); - return *pValue; - } - - _value &value() - { - if( bFilled == false ) - throw HashException( - excodeNotFilled, - "No data assosiated with that key." - ); - return *pValue; - } - - bool isFilled() - { - return bFilled; - } - - void erase() - { - if( bFilled ) - { - hsh._erase( nPos ); - hsh.onDelete(); - } - } - - _value operator=( _value nval ) - { - if( bFilled ) - { - hsh.va.destroy( pValue ); - hsh.va.construct( pValue, nval ); - hsh.onUpdate(); - } - else - { - hsh.fill( nPos, *pKey, nval, hash ); - hsh.onInsert(); - } - - return nval; - } - - _value *operator->() - { - if( bFilled == false ) - throw HashException( - excodeNotFilled, - "No data assosiated with that key." - ); - return pValue; - } -}; - -template<typename key, typename value, typename sizecalc, typename keyalloc, typename valuealloc, typename challoc > -class Hash -{ - friend struct HashProxy<key, value, sizecalc, keyalloc, valuealloc, challoc>; -public: - Hash() : - nCapacity( 11 ), - nFilled( 0 ), - nDeleted( 0 ), - bFilled( NULL ), - bDeleted( NULL ), - aKeys( NULL ), - aValues( NULL ), - aHashCodes( NULL ) - { - nKeysSize = bitsToBytes( nCapacity ); - bFilled = ca.allocate( nKeysSize ); - bDeleted = ca.allocate( nKeysSize ); - clearBits(); - - aHashCodes = ca.allocate( nCapacity ); - aKeys = ka.allocate( nCapacity ); - aValues = va.allocate( nCapacity ); - } - - Hash( const Hash &src ) : - nCapacity( src.nCapacity ), - nFilled( 0 ), - nDeleted( 0 ), - bFilled( NULL ), - bDeleted( NULL ), - aKeys( NULL ), - aValues( NULL ), - aHashCodes( NULL ) - { - nKeysSize = bitsToBytes( nCapacity ); - bFilled = ca.allocate( nKeysSize ); - bDeleted = ca.allocate( nKeysSize ); - clearBits(); - - aHashCodes = ca.allocate( nCapacity ); - aKeys = ka.allocate( nCapacity ); - aValues = va.allocate( nCapacity ); - - for( uint32_t j = 0; j < src.nCapacity; j++ ) - { - if( src.isFilled( j ) ) - { - insert( src.aKeys[j], src.aValues[j] ); - } - } - } - - Hash &operator=( const Hash &src ) - { - for( uint32_t j = 0; j < nCapacity; j++ ) - { - if( isFilled( j ) ) - if( !isDeleted( j ) ) - { - va.destroy( &aValues[j] ); - ka.destroy( &aKeys[j] ); - } - } - va.deallocate( aValues, nCapacity ); - ka.deallocate( aKeys, nCapacity ); - ca.deallocate( bFilled, nKeysSize ); - ca.deallocate( bDeleted, nKeysSize ); - ca.deallocate( aHashCodes, nCapacity ); - - nFilled = 0; - nDeleted = 0; - nCapacity = src.nCapacity; - nKeysSize = bitsToBytes( nCapacity ); - bFilled = ca.allocate( nKeysSize ); - bDeleted = ca.allocate( nKeysSize ); - clearBits(); - - aHashCodes = ca.allocate( nCapacity ); - aKeys = ka.allocate( nCapacity ); - aValues = va.allocate( nCapacity ); - - for( uint32_t j = 0; j < src.nCapacity; j++ ) - { - if( src.isFilled( j ) ) - { - insert( src.aKeys[j], src.aValues[j] ); - } - } - - return *this; - } - - virtual ~Hash() - { - for( uint32_t j = 0; j < nCapacity; j++ ) - { - if( isFilled( j ) ) - if( !isDeleted( j ) ) - { - va.destroy( &aValues[j] ); - ka.destroy( &aKeys[j] ); - } - } - va.deallocate( aValues, nCapacity ); - ka.deallocate( aKeys, nCapacity ); - ca.deallocate( bFilled, nKeysSize ); - ca.deallocate( bDeleted, nKeysSize ); - ca.deallocate( aHashCodes, nCapacity ); - } - - uint32_t getCapacity() - { - return nCapacity; - } - - uint32_t getFill() - { - return nFilled; - } - - uint32_t size() - { - return nFilled-nDeleted; - } - - uint32_t getDeleted() - { - return nDeleted; - } - - virtual HashProxy<key, value, sizecalc, keyalloc, valuealloc, challoc> operator[]( key k ) - { - uint32_t hash = __calcHashCode( k ); - bool bFill; - uint32_t nPos = probe( hash, k, bFill ); - - if( bFill ) - { - return HashProxy<key, value, sizecalc, keyalloc, valuealloc, challoc>( *this, nPos, &aValues[nPos] ); - } - else - { - return HashProxy<key, value, sizecalc, keyalloc, valuealloc, challoc>( *this, &k, nPos, hash ); - } - } - - virtual void insert( key k, value v ) - { - uint32_t hash = __calcHashCode( k ); - bool bFill; - uint32_t nPos = probe( hash, k, bFill ); - - if( bFill ) - { - va.destroy( &aValues[nPos] ); - va.construct( &aValues[nPos], v ); - onUpdate(); - } - else - { - fill( nPos, k, v, hash ); - onInsert(); - } - } - - virtual void erase( key k ) - { - uint32_t hash = __calcHashCode( k ); - bool bFill; - uint32_t nPos = probe( hash, k, bFill ); - - if( bFill ) - { - _erase( nPos ); - onDelete(); - } - } - - struct iterator; - virtual void erase( struct iterator &i ) - { - if( this != &i.hsh ) - throw HashException("This iterator didn't come from this Hash."); - if( isFilled( i.nPos ) && !isDeleted( i.nPos ) ) - { - _erase( i.nPos ); - onDelete(); - } - } - - virtual void clear() - { - for( uint32_t j = 0; j < nCapacity; j++ ) - { - if( isFilled( j ) ) - if( !isDeleted( j ) ) - { - va.destroy( &aValues[j] ); - ka.destroy( &aKeys[j] ); - onDelete(); - } - } - - clearBits(); - } - - virtual value &get( key k ) - { - uint32_t hash = __calcHashCode( k ); - bool bFill; - uint32_t nPos = probe( hash, k, bFill ); - - if( bFill ) - { - return aValues[nPos]; - } - else - { - throw HashException( - excodeNotFilled, - "No data assosiated with that key." - ); - } - } - - virtual bool has( key k ) - { - bool bFill; - probe( __calcHashCode( k ), k, bFill, false ); - - return bFill; - } - - typedef struct iterator - { - friend class Hash<key, value, sizecalc, keyalloc, valuealloc, challoc>; - private: - iterator( Hash<key, value, sizecalc, keyalloc, valuealloc, challoc> &hsh ) : - hsh( hsh ), - nPos( 0 ), - bFinished( false ) - { - nPos = hsh.getFirstPos( bFinished ); - } - - iterator( Hash<key, value, sizecalc, keyalloc, valuealloc, challoc> &hsh, bool bDone ) : - hsh( hsh ), - nPos( 0 ), - bFinished( bDone ) - { - } - - Hash<key, value, sizecalc, keyalloc, valuealloc, challoc> &hsh; - uint32_t nPos; - bool bFinished; - - public: - iterator operator++( int ) - { - if( bFinished == false ) - nPos = hsh.getNextPos( nPos, bFinished ); - - return *this; - } - - iterator operator++() - { - if( bFinished == false ) - nPos = hsh.getNextPos( nPos, bFinished ); - - return *this; - } - - bool operator==( const iterator &oth ) - { - if( bFinished != oth.bFinished ) - return false; - if( bFinished == true ) - { - return true; - } - else - { - if( oth.nPos == nPos ) - return true; - return false; - } - } - - bool operator!=( const iterator &oth ) - { - return !(*this == oth ); - } - - iterator operator=( const iterator &oth ) - { - if( &hsh != &oth.hsh ) - throw HashException( - "Cannot mix iterators from different hash objects."); - nPos = oth.nPos; - bFinished = oth.bFinished; - } - - std::pair<key,value> operator *() - { - return hsh.getAtPos( nPos ); - } - - key &getKey() - { - return hsh.getKeyAtPos( nPos ); - } - - value &getValue() - { - return hsh.getValueAtPos( nPos ); - } - }; - - iterator begin() - { - return iterator( *this ); - } - - iterator end() - { - return iterator( *this, true ); - } - - std::list<key> getKeys() - { - std::list<key> lKeys; - - for( uint32_t j = 0; j < nCapacity; j++ ) - { - if( isFilled( j ) ) - { - if( !isDeleted( j ) ) - { - lKeys.push_back( aKeys[j] ); - } - } - } - - return lKeys; - } - -protected: - virtual void onInsert() {} - virtual void onUpdate() {} - virtual void onDelete() {} - virtual void onReHash() {} - - virtual void clearBits() - { - for( uint32_t j = 0; j < nKeysSize; j++ ) - { - bFilled[j] = bDeleted[j] = 0; - } - } - - virtual void fill( uint32_t loc, key &k, value &v, uint32_t hash ) - { - bFilled[loc/32] |= (1<<(loc%32)); - va.construct( &aValues[loc], v ); - ka.construct( &aKeys[loc], k ); - aHashCodes[loc] = hash; - nFilled++; - //printf("Filled: %d, Deleted: %d, Capacity: %d\n", - // nFilled, nDeleted, nCapacity ); - } - - virtual void _erase( uint32_t loc ) - { - bDeleted[loc/32] |= (1<<(loc%32)); - va.destroy( &aValues[loc] ); - ka.destroy( &aKeys[loc] ); - nDeleted++; - //printf("Filled: %d, Deleted: %d, Capacity: %d\n", - // nFilled, nDeleted, nCapacity ); - } - - virtual std::pair<key,value> getAtPos( uint32_t nPos ) - { - return std::pair<key,value>(aKeys[nPos],aValues[nPos]); - } - - virtual key &getKeyAtPos( uint32_t nPos ) - { - return aKeys[nPos]; - } - - virtual value &getValueAtPos( uint32_t nPos ) - { - return aValues[nPos]; - } - - virtual uint32_t getFirstPos( bool &bFinished ) - { - for( uint32_t j = 0; j < nCapacity; j++ ) - { - if( isFilled( j ) ) - if( !isDeleted( j ) ) - return j; - } - - bFinished = true; - return 0; - } - - virtual uint32_t getNextPos( uint32_t nPos, bool &bFinished ) - { - for( uint32_t j = nPos+1; j < nCapacity; j++ ) - { - if( isFilled( j ) ) - if( !isDeleted( j ) ) - return j; - } - - bFinished = true; - return 0; - } - - uint32_t probe( uint32_t hash, key k, bool &bFill, bool rehash=true ) - { - uint32_t nCur = hash%nCapacity; - - // First we scan to see if the key is already there, abort if we - // run out of probing room, or we find a non-filled entry - for( int8_t j = 0; - isFilled( nCur ) && j < 32; - nCur = (nCur + (1<<j))%nCapacity, j++ - ) - { - // Is this the same hash code we were looking for? - if( hash == aHashCodes[nCur] ) - { - // Skip over deleted entries. Deleted entries are also filled, - // so we only have to do this check here. - if( isDeleted( nCur ) ) - continue; - - // Is it really the same key? (for safety) - if( __cmpHashKeys( aKeys[nCur], k ) == true ) - { - bFill = true; - return nCur; - } - } - } - - // This is our insurance, if the table is full, then go ahead and - // rehash, then try again. - if( isFilled( nCur ) && rehash == true ) - { - reHash( szCalc(getCapacity(), getFill(), getDeleted()) ); - - // This is potentially dangerous, and could cause an infinite loop. - // Be careful writing probe, eh? - return probe( hash, k, bFill ); - } - - bFill = false; - return nCur; - } - - void reHash( uint32_t nNewSize ) - { - //printf("---REHASH---"); - //printf("Filled: %d, Deleted: %d, Capacity: %d\n", - // nFilled, nDeleted, nCapacity ); - - // Save all the old data - uint32_t nOldCapacity = nCapacity; - uint32_t *bOldFilled = bFilled; - uint32_t *aOldHashCodes = aHashCodes; - uint32_t nOldKeysSize = nKeysSize; - uint32_t *bOldDeleted = bDeleted; - value *aOldValues = aValues; - key *aOldKeys = aKeys; - - // Calculate new sizes - nCapacity = nNewSize; - nKeysSize = bitsToBytes( nCapacity ); - - // Allocate new memory + prep - bFilled = ca.allocate( nKeysSize ); - bDeleted = ca.allocate( nKeysSize ); - clearBits(); - - aHashCodes = ca.allocate( nCapacity ); - aKeys = ka.allocate( nCapacity ); - aValues = va.allocate( nCapacity ); - - nDeleted = nFilled = 0; - - // Re-insert all of the old data (except deleted items) - for( uint32_t j = 0; j < nOldCapacity; j++ ) - { - if( (bOldFilled[j/32]&(1<<(j%32)))!=0 && - (bOldDeleted[j/32]&(1<<(j%32)))==0 ) - { - insert( aOldKeys[j], aOldValues[j] ); - } - } - - // Delete all of the old data - for( uint32_t j = 0; j < nOldCapacity; j++ ) - { - if( (bOldFilled[j/32]&(1<<(j%32)))!=0 ) - { - va.destroy( &aOldValues[j] ); - ka.destroy( &aOldKeys[j] ); - } - } - va.deallocate( aOldValues, nOldCapacity ); - ka.deallocate( aOldKeys, nOldCapacity ); - ca.deallocate( bOldFilled, nOldKeysSize ); - ca.deallocate( bOldDeleted, nOldKeysSize ); - ca.deallocate( aOldHashCodes, nOldCapacity ); - } - - virtual bool isFilled( uint32_t loc ) const - { - return (bFilled[loc/32]&(1<<(loc%32)))!=0; - } - - virtual bool isDeleted( uint32_t loc ) - { - return (bDeleted[loc/32]&(1<<(loc%32)))!=0; - } - -protected: - uint32_t nCapacity; - uint32_t nFilled; - uint32_t nDeleted; - uint32_t *bFilled; - uint32_t *bDeleted; - uint32_t nKeysSize; - key *aKeys; - value *aValues; - uint32_t *aHashCodes; - valuealloc va; - keyalloc ka; - challoc ca; - sizecalc szCalc; -}; - -template<> uint32_t __calcHashCode<int>( const int &k ); -template<> bool __cmpHashKeys<int>( const int &a, const int &b ); - -template<> uint32_t __calcHashCode<unsigned int>( const unsigned int &k ); -template<> bool __cmpHashKeys<unsigned int>( const unsigned int &a, const unsigned int &b ); - -template<> uint32_t __calcHashCode<const char *>( const char * const &k ); -template<> bool __cmpHashKeys<const char *>( const char * const &a, const char * const &b ); - -template<> uint32_t __calcHashCode<char *>( char * const &k ); -template<> bool __cmpHashKeys<char *>( char * const &a, char * const &b ); - -template<> uint32_t __calcHashCode<std::string>( const std::string &k ); -template<> bool __cmpHashKeys<std::string>( const std::string &a, const std::string &b ); - -template<> uint32_t __calcHashCode<Hashable>( const Hashable &k ); -template<> bool __cmpHashKeys<Hashable>( const Hashable &a, const Hashable &b ); - -template<typename key, typename value> -Serializer &operator<<( Serializer &ar, Hash<key,value> &h ) -{ - ar << h.size(); - for( typename Hash<key,value>::iterator i = h.begin(); i != h.end(); i++ ) - { - std::pair<key,value> p = *i; - ar << p.first << p.second; - } - - return ar; -} - -template<typename key, typename value> -Serializer &operator>>( Serializer &ar, Hash<key,value> &h ) -{ - h.clear(); - uint32_t nSize; - ar >> nSize; - - for( uint32_t j = 0; j < nSize; j++ ) - { - key k; value v; - ar >> k >> v; - h.insert( k, v ); - } - - return ar; -} - -template<typename key, typename value> -Serializer &operator&&( Serializer &ar, Hash<key,value> &h ) -{ - if( ar.isLoading() ) - { - return ar >> h; - } - else - { - return ar << h; - } -} - -#endif diff --git a/src/old/hashable.cpp b/src/old/hashable.cpp deleted file mode 100644 index 8565956..0000000 --- a/src/old/hashable.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "hashable.h" diff --git a/src/old/hashable.h b/src/old/hashable.h deleted file mode 100644 index 98643d5..0000000 --- a/src/old/hashable.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef HASHABLE_H -#define HASHABLE_H - -class Hashable -{ -public: - virtual ~Hashable() {}; - virtual unsigned long int getHashCode() = 0; - virtual bool compareForHash( Hashable &other ) = 0; -}; - -#endif diff --git a/src/old/serializable.cpp b/src/old/serializable.cpp deleted file mode 100644 index fd50943..0000000 --- a/src/old/serializable.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "serializable.h" - -Serializable::Serializable() -{ -} -Serializable::~Serializable() -{ -} diff --git a/src/old/serializable.h b/src/old/serializable.h deleted file mode 100644 index 06def29..0000000 --- a/src/old/serializable.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef SERIALIZER_H -#define SERIALIZER_H - -//#include "serializer.h" - -/** - * The base class for any class you want to serialize. Simply include this as - * a base class, implement the purely virtual serialize function and you've got - * an easily serializable class. - */ -class Serializable -{ -public: - /** - * Does nothing, here for completeness. - */ - Serializable(); - - /** - * Here to ensure the deconstructor is virtual. - */ - virtual ~Serializable(); - - /** - * This is the main workhorse of the serialization system, just override and - * you've got a serializable class. A reference to the Serializer archive - * used is passed in as your only parameter, query it to discover if you are - * loading or saving. - * @param ar A reference to the Serializer object to use. - */ - virtual void serialize( class Serializer &ar )=0; -}; - -#endif diff --git a/src/old/serializer.cpp b/src/old/serializer.cpp deleted file mode 100644 index 636224e..0000000 --- a/src/old/serializer.cpp +++ /dev/null @@ -1,338 +0,0 @@ -#include "serializer.h" -#include "serializable.h" -#include <list> - -Serializer::Serializer(bool bLoading): - bLoading(bLoading) -{ -} -Serializer::~Serializer() -{ -} - -bool Serializer::isLoading() -{ - return bLoading; -} -Serializer &Serializer::operator<<(bool p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(int8_t p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(int16_t p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(int32_t p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(int64_t p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(uint8_t p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(uint16_t p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(uint32_t p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(uint64_t p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(long p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(float p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(double p) -{ - write( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator<<(long double p) -{ - write( &p, sizeof(p) ); - return *this; -} - -Serializer &Serializer::operator>>(bool &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(int8_t &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(int16_t &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(int32_t &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(int64_t &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(uint8_t &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(uint16_t &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(uint32_t &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(uint64_t &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(long &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(float &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(double &p) -{ - read( &p, sizeof(p) ); - return *this; -} -Serializer &Serializer::operator>>(long double &p) -{ - read( &p, sizeof(p) ); - return *this; -} - -Serializer &Serializer::operator&&(bool &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(int8_t &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(int16_t &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(int32_t &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(int64_t &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(uint8_t &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(uint16_t &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(uint32_t &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(uint64_t &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(float &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(double &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - -Serializer &Serializer::operator&&(long double &p) -{ - if (bLoading) - { - return *this >> p; - } - else - { - return *this << p; - } -} - - -Serializer &operator<<(Serializer &s, Serializable &p) -{ - p.serialize( s ); - return s; -} - -Serializer &operator>>(Serializer &s, Serializable &p) -{ - p.serialize( s ); - return s; -} - -Serializer &operator&&(Serializer &s, Serializable &p) -{ - if (s.isLoading()) - { - return s >> p; - } - else - { - return s << p; - } -} - -Serializer &operator<<( Serializer &ar, std::string &s ) -{ - ar << (uint32_t)s.length(); - ar.write( s.c_str(), s.length() ); - - return ar; -} - -Serializer &operator>>( Serializer &ar, std::string &s ) -{ - uint32_t l; - ar >> l; - char *tmp = new char[l+1]; - tmp[l] = '\0'; - ar.read( tmp, l ); - s = tmp; - delete[] tmp; - - return ar; -} - diff --git a/src/old/serializer.h b/src/old/serializer.h deleted file mode 100644 index 3af489c..0000000 --- a/src/old/serializer.h +++ /dev/null @@ -1,80 +0,0 @@ -#ifndef SERIALIZABLE_H -#define SERIALIZABLE_H - -#include <stdint.h> -#include <string> -#include <list> -//#include "serializable.h" - -class Serializer -{ -private: - bool bLoading; -public: - bool isLoading(); - - enum - { - load = true, - save = false - }; - - Serializer(bool bLoading); - virtual ~Serializer(); - virtual void close()=0; - - virtual void write(const void *, int32_t)=0; - virtual void read(void *, int32_t)=0; - - virtual Serializer &operator<<(bool); - virtual Serializer &operator<<(int8_t); - virtual Serializer &operator<<(int16_t); - virtual Serializer &operator<<(int32_t); - virtual Serializer &operator<<(int64_t); - virtual Serializer &operator<<(uint8_t); - virtual Serializer &operator<<(uint16_t); - virtual Serializer &operator<<(uint32_t); - virtual Serializer &operator<<(uint64_t); - virtual Serializer &operator<<(long); - virtual Serializer &operator<<(float); - virtual Serializer &operator<<(double); - virtual Serializer &operator<<(long double); - - virtual Serializer &operator>>(bool &); - virtual Serializer &operator>>(int8_t &); - virtual Serializer &operator>>(int16_t &); - virtual Serializer &operator>>(int32_t &); - virtual Serializer &operator>>(int64_t &); - virtual Serializer &operator>>(uint8_t &); - virtual Serializer &operator>>(uint16_t &); - virtual Serializer &operator>>(uint32_t &); - virtual Serializer &operator>>(uint64_t &); - virtual Serializer &operator>>(long &); - virtual Serializer &operator>>(float &); - virtual Serializer &operator>>(double &); - virtual Serializer &operator>>(long double &); - - virtual Serializer &operator&&(bool &); - virtual Serializer &operator&&(int8_t &); - virtual Serializer &operator&&(int16_t &); - virtual Serializer &operator&&(int32_t &); - virtual Serializer &operator&&(int64_t &); - virtual Serializer &operator&&(uint8_t &); - virtual Serializer &operator&&(uint16_t &); - virtual Serializer &operator&&(uint32_t &); - virtual Serializer &operator&&(uint64_t &); - virtual Serializer &operator&&(float &); - virtual Serializer &operator&&(double &); - virtual Serializer &operator&&(long double &); - - //virtual Serializer &operator&(Serializable &); -}; - -Serializer &operator<<(Serializer &, class Serializable &); -Serializer &operator>>(Serializer &, class Serializable &); -Serializer &operator&&(Serializer &s, class Serializable &p); - -Serializer &operator<<(Serializer &, std::string &); -Serializer &operator>>(Serializer &, std::string &); - -#endif diff --git a/src/old/stream.cpp b/src/old/stream.cpp deleted file mode 100644 index 856a58d..0000000 --- a/src/old/stream.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "stream.h" - -Stream::Stream() -{ -} - -Stream::~Stream() -{ -} - diff --git a/src/old/stream.h b/src/old/stream.h deleted file mode 100644 index e086e28..0000000 --- a/src/old/stream.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef STREAM_H -#define STREAM_H - -#include <stdint.h> -#include <stdio.h> - -class Stream -{ -public: - Stream(); - virtual ~Stream(); - - virtual void close() = 0; - virtual size_t read( char *pBuf, size_t nBytes ) = 0; - virtual size_t write( const char *pBuf, size_t nBytes ) = 0; - - virtual long tell() = 0; - virtual void seek( long offset ) = 0; - virtual void setPos( long pos ) = 0; - virtual void setPosEnd( long pos ) = 0; - virtual bool isEOS() = 0; - -private: - -}; - -#endif diff --git a/src/stream.cpp b/src/stream.cpp new file mode 100644 index 0000000..267a7d1 --- /dev/null +++ b/src/stream.cpp @@ -0,0 +1,10 @@ +#include "stream.h" + +Bu::Stream::Stream() +{ +} + +Bu::Stream::~Stream() +{ +} + diff --git a/src/stream.h b/src/stream.h new file mode 100644 index 0000000..274f4fd --- /dev/null +++ b/src/stream.h @@ -0,0 +1,34 @@ +#ifndef STREAM_H +#define STREAM_H + +#include <stdint.h> +#include <stdio.h> + +namespace Bu +{ + class Stream + { + public: + Stream(); + virtual ~Stream(); + + virtual void close() = 0; + virtual size_t read( char *pBuf, size_t nBytes ) = 0; + virtual size_t write( const char *pBuf, size_t nBytes ) = 0; + + virtual long tell() = 0; + virtual void seek( long offset ) = 0; + virtual void setPos( long pos ) = 0; + virtual void setPosEnd( long pos ) = 0; + virtual bool isEOS() = 0; + + virtual bool canRead() = 0; + virtual bool canWrite() = 0; + virtual bool canSeek() = 0; + + private: + + }; +} + +#endif diff --git a/src/tests/archive.cpp b/src/tests/archive.cpp new file mode 100644 index 0000000..fb0d97c --- /dev/null +++ b/src/tests/archive.cpp @@ -0,0 +1,7 @@ +#include "archive.h" + +int main() +{ + //Archive +} + diff --git a/tests/comments.xml b/tests/comments.xml deleted file mode 100644 index df05b3b..0000000 --- a/tests/comments.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<test> - <!----><stuff/><guy> - <!-- euntaho esutnaho .rucaho. u - ao.rcuh aor uasrcoh - rohaor - c.uha - orchu - aroch.ua. - -->Aaaugh! - </guy> -</test> diff --git a/tests/guy.cpp b/tests/guy.cpp deleted file mode 100644 index 6510771..0000000 --- a/tests/guy.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "stdio.h" -#include "plugin.h" -#include "plugger.h" - -class Guy : public Plugin -{ -public: - Guy() - { - printf("I'm guy!\n"); - } - - virtual ~Guy() - { - printf("Guy is dead...\n"); - } - -private: -}; - -PluginInterface( Guy, Plugin, "Mike", 0, 1 ) - diff --git a/tests/makeplugin.sh b/tests/makeplugin.sh deleted file mode 100755 index 086fefd..0000000 --- a/tests/makeplugin.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -g++ -fPIC -shared -Wl,-soname,guy.so -o guy.so -I../src -I../src/test/plugin guy.cpp ../src/test/plugin/plugin.cpp -- cgit v1.2.3 From c884da672645231b5ec47706c886381dab1b391a Mon Sep 17 00:00:00 2001 From: Mike Buland <eichlan@xagasoft.com> Date: Tue, 3 Apr 2007 05:09:12 +0000 Subject: The file stream is imported and works, as does our first test, and the new tweaks to archive. The && operator is now a template function, and as such requires no special handling. It could be worth it to check this out for other types, yet dangerous, since it would let you archive anything, even a class, without writing the proper functions for it...we shall see what happens... --- src/archive.cpp | 27 ++++++++++++++-- src/archive.h | 12 ++++--- src/old/sfile.cpp | 74 ------------------------------------------ src/old/sfile.h | 29 ----------------- src/sfile.cpp | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/sfile.h | 36 +++++++++++++++++++++ src/tests/archive.cpp | 11 ++++++- 7 files changed, 169 insertions(+), 110 deletions(-) delete mode 100644 src/old/sfile.cpp delete mode 100644 src/old/sfile.h create mode 100644 src/sfile.cpp create mode 100644 src/sfile.h diff --git a/src/archive.cpp b/src/archive.cpp index 5f5145c..be06c0e 100644 --- a/src/archive.cpp +++ b/src/archive.cpp @@ -1,13 +1,36 @@ #include "archive.h" -Bu::Archive::Archive(bool bLoading): - bLoading(bLoading) +Bu::Archive::Archive( Stream &rStream, bool bLoading ) : + bLoading( bLoading ), + rStream( rStream ) { } + Bu::Archive::~Archive() { } +void Bu::Archive::write( const void *pData, int32_t nSize ) +{ + if( nSize == 0 || pData == NULL ) + return; + + rStream.write( (const char *)pData, nSize ); +} + +void Bu::Archive::read( void *pData, int32_t nSize ) +{ + if( nSize == 0 || pData == NULL ) + return; + + rStream.read( (char *)pData, nSize ); +} + +void Bu::Archive::close() +{ + rStream.close(); +} + bool Bu::Archive::isLoading() { return bLoading; diff --git a/src/archive.h b/src/archive.h index 7de9220..26e430b 100644 --- a/src/archive.h +++ b/src/archive.h @@ -4,6 +4,7 @@ #include <stdint.h> #include <string> #include "archable.h" +#include "stream.h" namespace Bu { @@ -20,12 +21,12 @@ namespace Bu save = false }; - Archive( bool bLoading ); + Archive( Stream &rStream, bool bLoading ); virtual ~Archive(); - virtual void close()=0; + virtual void close(); - virtual void write(const void *, int32_t)=0; - virtual void read(void *, int32_t)=0; + virtual void write(const void *, int32_t); + virtual void read(void *, int32_t); virtual Archive &operator<<(bool); virtual Archive &operator<<(int8_t); @@ -67,6 +68,9 @@ namespace Bu virtual Archive &operator&&(float &); virtual Archive &operator&&(double &); virtual Archive &operator&&(long double &); + + private: + Stream &rStream; }; Archive &operator<<(Archive &, class Bu::Archable &); diff --git a/src/old/sfile.cpp b/src/old/sfile.cpp deleted file mode 100644 index f1de03c..0000000 --- a/src/old/sfile.cpp +++ /dev/null @@ -1,74 +0,0 @@ -#include "sfile.h" -#include "exceptions.h" - -SFile::SFile( const char *sName, const char *sFlags ) -{ - fh = fopen( sName, sFlags ); -} - -SFile::~SFile() -{ -} - -void SFile::close() -{ - if( fh ) - { - fclose( fh ); - fh = NULL; - } -} - -size_t SFile::read( char *pBuf, size_t nBytes ) -{ - if( !fh ) - throw FileException("File not open."); - - return fread( pBuf, 1, nBytes, fh ); -} - -size_t SFile::write( const char *pBuf, size_t nBytes ) -{ - if( !fh ) - throw FileException("File not open."); - - return fwrite( pBuf, 1, nBytes, fh ); -} - -long SFile::tell() -{ - if( !fh ) - throw FileException("File not open."); - - return ftell( fh ); -} - -void SFile::seek( long offset ) -{ - if( !fh ) - throw FileException("File not open."); - - fseek( fh, offset, SEEK_CUR ); -} - -void SFile::setPos( long pos ) -{ - if( !fh ) - throw FileException("File not open."); - - fseek( fh, pos, SEEK_SET ); -} - -void SFile::setPosEnd( long pos ) -{ - if( !fh ) - throw FileException("File not open."); - - fseek( fh, pos, SEEK_END ); -} - -bool SFile::isEOS() -{ - return feof( fh ); -} - diff --git a/src/old/sfile.h b/src/old/sfile.h deleted file mode 100644 index b51e5bc..0000000 --- a/src/old/sfile.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef SFILE_H -#define SFILE_H - -#include <stdint.h> - -#include "stream.h" - -class SFile : public Stream -{ -public: - SFile( const char *sName, const char *sFlags ); - virtual ~SFile(); - - virtual void close(); - virtual size_t read( char *pBuf, size_t nBytes ); - virtual size_t write( const char *pBuf, size_t nBytes ); - - virtual long tell(); - virtual void seek( long offset ); - virtual void setPos( long pos ); - virtual void setPosEnd( long pos ); - virtual bool isEOS(); - -private: - FILE *fh; - -}; - -#endif diff --git a/src/sfile.cpp b/src/sfile.cpp new file mode 100644 index 0000000..d7c5c83 --- /dev/null +++ b/src/sfile.cpp @@ -0,0 +1,90 @@ +#include "sfile.h" +#include "exceptions.h" + +Bu::SFile::SFile( const char *sName, const char *sFlags ) +{ + fh = fopen( sName, sFlags ); +} + +Bu::SFile::~SFile() +{ + close(); +} + +void Bu::SFile::close() +{ + if( fh ) + { + fclose( fh ); + fh = NULL; + } +} + +size_t Bu::SFile::read( char *pBuf, size_t nBytes ) +{ + if( !fh ) + throw FileException("File not open."); + + return fread( pBuf, 1, nBytes, fh ); +} + +size_t Bu::SFile::write( const char *pBuf, size_t nBytes ) +{ + if( !fh ) + throw FileException("File not open."); + + return fwrite( pBuf, 1, nBytes, fh ); +} + +long Bu::SFile::tell() +{ + if( !fh ) + throw FileException("File not open."); + + return ftell( fh ); +} + +void Bu::SFile::seek( long offset ) +{ + if( !fh ) + throw FileException("File not open."); + + fseek( fh, offset, SEEK_CUR ); +} + +void Bu::SFile::setPos( long pos ) +{ + if( !fh ) + throw FileException("File not open."); + + fseek( fh, pos, SEEK_SET ); +} + +void Bu::SFile::setPosEnd( long pos ) +{ + if( !fh ) + throw FileException("File not open."); + + fseek( fh, pos, SEEK_END ); +} + +bool Bu::SFile::isEOS() +{ + return feof( fh ); +} + +bool Bu::SFile::canRead() +{ + return true; +} + +bool Bu::SFile::canWrite() +{ + return true; +} + +bool Bu::SFile::canSeek() +{ + return true; +} + diff --git a/src/sfile.h b/src/sfile.h new file mode 100644 index 0000000..304f6b7 --- /dev/null +++ b/src/sfile.h @@ -0,0 +1,36 @@ +#ifndef SFILE_H +#define SFILE_H + +#include <stdint.h> + +#include "stream.h" + +namespace Bu +{ + class SFile : public Bu::Stream + { + public: + SFile( const char *sName, const char *sFlags ); + virtual ~SFile(); + + virtual void close(); + virtual size_t read( char *pBuf, size_t nBytes ); + virtual size_t write( const char *pBuf, size_t nBytes ); + + virtual long tell(); + virtual void seek( long offset ); + virtual void setPos( long pos ); + virtual void setPosEnd( long pos ); + virtual bool isEOS(); + + virtual bool canRead(); + virtual bool canWrite(); + virtual bool canSeek(); + + private: + FILE *fh; + + }; +} + +#endif diff --git a/src/tests/archive.cpp b/src/tests/archive.cpp index fb0d97c..5b7e285 100644 --- a/src/tests/archive.cpp +++ b/src/tests/archive.cpp @@ -1,7 +1,16 @@ #include "archive.h" +#include "sfile.h" + +using namespace Bu; int main() { - //Archive + SFile f("test.dat", "wb"); + Archive ar( f, Archive::save ); + + std::string s("Hello there"); + ar << s; + + return 0; } -- cgit v1.2.3 From 997f13ec4791adcda91cd4db41cdb5962b73d47d Mon Sep 17 00:00:00 2001 From: Mike Buland <eichlan@xagasoft.com> Date: Tue, 3 Apr 2007 05:10:59 +0000 Subject: Just deleted a few things from old that definately have to go. --- src/old/arraylist.cpp | 100 --------- src/old/arraylist.h | 80 ------- src/old/hashfunction.cpp | 10 - src/old/hashfunction.h | 48 ----- src/old/hashfunctioncasestring.cpp | 39 ---- src/old/hashfunctioncasestring.h | 28 --- src/old/hashfunctionint.cpp | 20 -- src/old/hashfunctionint.h | 26 --- src/old/hashfunctionstring.cpp | 51 ----- src/old/hashfunctionstring.h | 27 --- src/old/hashtable.cpp | 424 ------------------------------------- src/old/hashtable.h | 308 --------------------------- 12 files changed, 1161 deletions(-) delete mode 100644 src/old/arraylist.cpp delete mode 100644 src/old/arraylist.h delete mode 100644 src/old/hashfunction.cpp delete mode 100644 src/old/hashfunction.h delete mode 100644 src/old/hashfunctioncasestring.cpp delete mode 100644 src/old/hashfunctioncasestring.h delete mode 100644 src/old/hashfunctionint.cpp delete mode 100644 src/old/hashfunctionint.h delete mode 100644 src/old/hashfunctionstring.cpp delete mode 100644 src/old/hashfunctionstring.h delete mode 100644 src/old/hashtable.cpp delete mode 100644 src/old/hashtable.h diff --git a/src/old/arraylist.cpp b/src/old/arraylist.cpp deleted file mode 100644 index ef21426..0000000 --- a/src/old/arraylist.cpp +++ /dev/null @@ -1,100 +0,0 @@ -#include "arraylist.h" -#include <stdlib.h> -#include <string.h> - -ArrayList::ArrayList( int initSize, int growByFactor ) -{ - apData = new void *[initSize]; - nSize = 0; - nCapacity = initSize; - nGrowByFactor = growByFactor; -} - -ArrayList::~ArrayList( ) -{ - delete[] apData; -} - -void *ArrayList::getAt( int index ) -{ - if( index < 0 || index > nSize ) - return NULL; - - return apData[index]; -} - -void ArrayList::append( void *data ) -{ - insertBefore( data, nSize ); -} - -void ArrayList::insertBefore( void *data, int pos ) -{ - if( pos < 0 || pos > nSize ) - return; - - checkResize(); - memmove( &apData[pos+1], &apData[pos], (nSize-pos)*sizeof(void*) ); - apData[pos] = data; - nSize++; -} - -int ArrayList::getSize( ) -{ - return nSize; -} - -bool ArrayList::isEmpty( ) -{ - return nSize==0; -} - -void ArrayList::deleteAt( int index ) -{ - if( index < 0 || index >= nSize ) - return; - - memmove( &apData[index], &apData[index+1], (nSize-index-1)*sizeof(void *) ); - nSize--; -} - -void ArrayList::empty() -{ - // Probably the easiest as far as things go. - nSize = 0; -} - -void ArrayList::resizeTo( int newSize ) -{ - void **apNew = new void *[newSize]; - memmove( apNew, apData, nSize*sizeof(void *) ); - nCapacity = newSize; - delete[] apData; - apData = apNew; -} - -void ArrayList::checkResize() -{ - if( nSize >= nCapacity ) - { - resizeTo( nCapacity + nGrowByFactor ); - } -} - -void ArrayList::setSize( int newSize ) -{ - if( newSize < 0 ) - return; - - nSize = newSize; - checkResize(); -} - -void ArrayList::setAt( int index, void *data ) -{ - if( index < 0 || index >= nSize ) - return; - - apData[index] = data; -} - diff --git a/src/old/arraylist.h b/src/old/arraylist.h deleted file mode 100644 index 0fda34a..0000000 --- a/src/old/arraylist.h +++ /dev/null @@ -1,80 +0,0 @@ -/** \file arraylist.h - * Describes the ArrayList class. - *@author Mike Buland - */ -#ifndef ARRAY_LIST_H -#define ARRAY_LIST_H - -#include "list.h" - -/** A simple list which uses an array. This is a great choice if you won't do - * a lot of adding and deleting and need a fast random access list. Otherwise - * use the LinkedList. - *@author Mike Buland - */ -class ArrayList : public List -{ -public: - /** Creates an arraylist with some pre-defined specs spelled out. - *@param initSize the inital number of elements to allocate. - *@param growByFactor How much to increase the size of the array by - * each time we run out of room. - */ - ArrayList( int initSize=100, int growByFactor=10 ); - /** - * Destroy the ArrayList - */ - virtual ~ArrayList(); - - void *getAt( int nIndex ); - void append( void *pData ); - void insertBefore( void *pData, int nPos = 0 ); - int getSize( ); - bool isEmpty( ); - void deleteAt( int nIndex ); - void empty(); - void setSize( int nNewSize ); - void setAt( int nIndex, void *pData ); - -private: - /** - * Checks to see if the system needs to be resized, if it does, this will - * automatically resize based on your parameters. - */ - void checkResize(); - - /** - * Resize the system to a specified size. If it is larger, then all data - * will be retained, if smaller the elements at the end will be cut off. - *@param newSize The number of elements to include after resizing. - */ - void resizeTo( int newSize ); - - /** - * Actual master array of pointers. This is done to follow the List specs. - * All data transactions are performed with pointers or compatable - * primitive data-types. - */ - void **apData; - - /** - * The number of filled in elements in the array. This is the practical - * real size of the ArrayList for all userspace applications. - */ - int nSize; - - /** - * The number of elements allocated in memory. Not all of these have to be - * filled in, and it is usually larger than nSize so that adding and - * deleting elements is fast and easy. - */ - int nCapacity; - - /** - * The amount to grow by whenever the array needs resizing. - */ - int nGrowByFactor; -}; - -#endif - diff --git a/src/old/hashfunction.cpp b/src/old/hashfunction.cpp deleted file mode 100644 index 51f2259..0000000 --- a/src/old/hashfunction.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "hashfunction.h" - -HashFunction::HashFunction() -{ -} - -HashFunction::~HashFunction() -{ -} - diff --git a/src/old/hashfunction.h b/src/old/hashfunction.h deleted file mode 100644 index cbcf70f..0000000 --- a/src/old/hashfunction.h +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef HASH_FUNCTION -#define HASH_FUNCTION - -/** This represents the shell of a hash function. It must be aggregated in - * order to be used. Please read about it's two functions for specificatins - * relating to what values will be passed to them and what they should return - * for creating your own hash functions. - *@author Mike Buland. - */ -class HashFunction -{ -public: - /** - * Standard Constructor. - */ - HashFunction(); - - /** - * Standard Deconstructor. - */ - virtual ~HashFunction(); - - /** Hashes the value represnted by id. This must return a fairly unique - * number in the range of 0-2^32 (or whatever the size of an unsigned long - * is on your system) based on the id given. The faster the number changes - * the better in a general sence. The return value will be the index - * (after probing takes place) to the data assosiated with an id, so this - * function should always produce the same number for any given id. - *@param id The identifier to use to create a unique numerical identifier. - *@returns A mostly unique numerical identifier generated using the given - * id. - */ - virtual unsigned long int hash( const void *id ) = 0; - - /** This function must compare two ids in the format that this hashfunction - * accepts. For example, if the hash function hashes strings it should - * probably { return strcmp( id1, id2 ) == 0 }. - *@param id1 One value to use in the comparison - *@param id2 Another value to use in the comparison - *@returns True if the two values match, otherwise false. - */ - virtual bool cmpIDs( const void *id1, const void *id2 ) = 0; - -// virtual void *createPersistantID( const void *id ) = 0; -// virtual void destroyPersistantID( const void *id ) = 0; -}; - -#endif diff --git a/src/old/hashfunctioncasestring.cpp b/src/old/hashfunctioncasestring.cpp deleted file mode 100644 index 6361f45..0000000 --- a/src/old/hashfunctioncasestring.cpp +++ /dev/null @@ -1,39 +0,0 @@ -#include <stdlib.h> -#include <string.h> -#include <ctype.h> -#include "hashfunctioncasestring.h" - -HashFunctionCaseString::HashFunctionCaseString() -{ -} - -HashFunctionCaseString::~HashFunctionCaseString() -{ -} - -unsigned long int HashFunctionCaseString::hash( const void *id ) -{ - const char *str = (const char *)id; - unsigned long int nPos = 0; - for( int j = 0; str[j] != '\0'; j++ ) - { - nPos = tolower(str[j]) + (nPos << 6) + (nPos << 16) - nPos; -// nPos += nPos<<16|(((unsigned long int)tolower(str[j]))<<((j*7)%24)); - } - return nPos; -} - -bool HashFunctionCaseString::cmpIDs( const void *id1, const void *id2 ) -{ - const char *str1 = (const char *)id1; - const char *str2 = (const char *)id2; - - int j; - for( j = 0; str1[j] != '\0' && str2[j] != '\0'; j++ ) - { - if( tolower(str1[j]) != tolower(str2[j]) ) - return false; - } - return (str1[j]==str2[j]); -} - diff --git a/src/old/hashfunctioncasestring.h b/src/old/hashfunctioncasestring.h deleted file mode 100644 index 7816a1b..0000000 --- a/src/old/hashfunctioncasestring.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef HASH_FUNCTION_CASE_STRING -#define HASH_FUNCTION_CASE_STRING - -#include "hashfunction.h" - -/** A hash function for string data. This hash function does strings, but is - * actually generalized to handle any binary stream of characters terminated - * by a null character. This is different than HashFunctionString in that - * this does comparisons without regaurd to case. - *@author Mike Buland. - */ -class HashFunctionCaseString : public HashFunction -{ -public: - /** - * Standard Constructor. - */ - HashFunctionCaseString(); - - /** - * Standard Deconstructor. - */ - virtual ~HashFunctionCaseString(); - unsigned long int hash( const void *id ); - bool cmpIDs( const void *id1, const void *id2 ); -}; - -#endif diff --git a/src/old/hashfunctionint.cpp b/src/old/hashfunctionint.cpp deleted file mode 100644 index 4bd0feb..0000000 --- a/src/old/hashfunctionint.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "hashfunctionint.h" - -HashFunctionInt::HashFunctionInt() -{ -} - -HashFunctionInt::~HashFunctionInt() -{ -} - -unsigned long int HashFunctionInt::hash( const void *id ) -{ - return (unsigned long)(id); -} - -bool HashFunctionInt::cmpIDs( const void *id1, const void *id2 ) -{ - return (unsigned long)(id1) == (unsigned long)(id2); -} - diff --git a/src/old/hashfunctionint.h b/src/old/hashfunctionint.h deleted file mode 100644 index 0fbc764..0000000 --- a/src/old/hashfunctionint.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef HASH_FUNCTION_INT -#define HASH_FUNCTION_INT - -#include "hashfunction.h" - -/** A hash function for integer data. Really, this does almost nothing except - * ensure we're dealing with positive indicies. - *@author Mike Buland. - */ -class HashFunctionInt : public HashFunction -{ -public: - /** - * Standard Constructor. - */ - HashFunctionInt(); - - /** - * Standard Deconstructor. - */ - virtual ~HashFunctionInt(); - unsigned long int hash( const void *id ); - bool cmpIDs( const void *id1, const void *id2 ); -}; - -#endif diff --git a/src/old/hashfunctionstring.cpp b/src/old/hashfunctionstring.cpp deleted file mode 100644 index bd14643..0000000 --- a/src/old/hashfunctionstring.cpp +++ /dev/null @@ -1,51 +0,0 @@ -#include "hashfunctionstring.h" -#ifndef NULL -#define NULL ((void *) 0) -#endif - -HashFunctionString::HashFunctionString() -{ -} - -HashFunctionString::~HashFunctionString() -{ -} - -unsigned long int HashFunctionString::hash( const void *id ) -{ - if (id == NULL) - { - return 0; - } - - unsigned long int nPos = 0; - for( const char *s = (const char *)id; *s; s++ ) - { - nPos = *s + (nPos << 6) + (nPos << 16) - nPos; - } - return nPos; -} - -bool HashFunctionString::cmpIDs( const void *id1, const void *id2 ) -{ - if (id1 == NULL || id2 == NULL) - { - return false; - } - if (id1 == id2) - { - return true; - } - - const char *str1 = (const char *)id1; - const char *str2 = (const char *)id2; - - int j; - for( j = 0; str1[j] != '\0' && str2[j] != '\0'; j++ ) - { - if( str1[j] != str2[j] ) - return false; - } - return (str1[j]==str2[j]); -} - diff --git a/src/old/hashfunctionstring.h b/src/old/hashfunctionstring.h deleted file mode 100644 index 7d2a1a6..0000000 --- a/src/old/hashfunctionstring.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef HASH_FUNCTION_STRING -#define HASH_FUNCTION_STRING - -#include "hashfunction.h" - -/** A hash function for string data. This hash function does strings, but is - * actually generalized to handle any binary stream of characters terminated - * by a null character. - *@author Mike Buland. - */ -class HashFunctionString : public HashFunction -{ -public: - /** - * Standard Constructor. - */ - HashFunctionString(); - - /** - * Standard Deconstructor. - */ - virtual ~HashFunctionString(); - unsigned long int hash( const void *id ); - bool cmpIDs( const void *id1, const void *id2 ); -}; - -#endif diff --git a/src/old/hashtable.cpp b/src/old/hashtable.cpp deleted file mode 100644 index dbcd964..0000000 --- a/src/old/hashtable.cpp +++ /dev/null @@ -1,424 +0,0 @@ -#include <string.h> -#include <stdio.h> -#include <math.h> - -#include "hashtable.h" - -HashTable::HashTable( HashFunction *hNewFunc, unsigned long int nInitSize, bool bAllowDupes ) -{ - hFunc = hNewFunc; - nTableSize = nextPrime( nInitSize ); - aTable = new HashNode[nTableSize]; - //for( int j = 0; j < nTableSize; j++ ) if( aTable[j].id || aTable[j].data || aTable[j].bDeleted ) printf("Unclean entry\n"); - nSize = 0; - nFilled = 0; - this->bAllowDupes = bAllowDupes; -} - -HashTable::~HashTable() -{ - delete[] aTable; - delete hFunc; -} - -void HashTable::set( int j, const void *newID, const void *newData ) -{ - if( newData == NULL ) - { - printf("Inserting NULL data is indestinguishable from uninserted data!\n"); - } - aTable[j].id = newID; - aTable[j].data = newData; -} - -void HashTable::clear() -{ - memset( aTable, 0, sizeof(HashNode) * nTableSize ); -} - -bool HashTable::isFilled( int j ) -{ - return (aTable[j].id != NULL)||(aTable[j].bDeleted); -} - -void HashTable::reHash( unsigned long int nNewSize ) -{ - HashNode *aOldTable = aTable; - unsigned long int oldSize = nTableSize; - - // If the table can still be used if we just get rid of deleted items, don't - // change the size of the table, otherwise, go ahead and use the number - // passed in. - if( nSize > nTableSize>>1 ) - { - nTableSize = nextPrime( nNewSize ); - } - - aTable = newTable( nTableSize ); - //for( int j = 0; j < nTableSize; j++ ) if( aTable[j].id || aTable[j].data || aTable[j].bDeleted ) printf("Unclean entry\n"); - - nSize = 0; - nFilled = 0; - - for( unsigned long int j = 0; j < oldSize; j++ ) - { - if( aOldTable[j].id != NULL && aOldTable[j].bDeleted == false ) - { - insert( aOldTable[j].id, aOldTable[j].data ); - } - } - - delete[] aOldTable; -} - -unsigned long int HashTable::probe( unsigned long int nStart, const void *id ) -{ - int nHash = nStart; - nStart = nStart%nTableSize; - if( bAllowDupes == true ) - { - for( - unsigned long int j=0; - isFilled( nStart ) && j < 32; - nStart = (nStart+(1<<j))%nTableSize, j++ - ); - - /** - * This is an ugly little hack. If the hash table is too full in allow- - * dups mode we have to fall back on a linear search, otherwise you can - * only get up to 32 entries with the same name. - */ - if( isFilled( nStart ) ) - { - unsigned long int nOldStart = nStart; - for( - nStart++; - isFilled( nStart ) && nStart != nOldStart; - nStart = (nStart+1)%nTableSize - ); - } - } - else - { - for( - unsigned long int j=0; - isFilled( nStart ) && j < 32; - nStart = (nStart+(1<<j))%nTableSize, j++ - ) - { - if( isFilled( nStart ) ) - { - if( hFunc->cmpIDs( aTable[nStart].id, id ) == true && - aTable[nStart].bDeleted == false ) - { - return nStart; - } - } - } - } - // This is our insurance, if the table is full, then go ahead and rehash, - // then try again. - if( isFilled( nStart ) ) - { - reHash( getCapacity()*2 ); - return probe( nHash, id ); - } - return nStart; -} - -HashTable::HashNode *HashTable::newTable( unsigned long int nNewSize ) -{ - return new HashNode[nNewSize]; -} - -#ifdef HASH_DEBUG_VIS -void HashTable::printDebugLine( const char *exData ) -{ - char *buf = new char[getCapacity()+3]; - int j; - buf[0] = '['; - for( j = 0; j < getCapacity(); j++ ) - { - buf[j+1] = (aTable[j].bDeleted)?('X'):((isFilled( j ))?('#'):('-')); - } - buf[j+1] = ']'; - buf[j+2] = '\0'; - printf("%s %s\n", buf, exData ); - delete[] buf; -} -#endif - -bool HashTable::insert( const void *id, const void *data ) -{ - unsigned long int nPos = probe( hFunc->hash( id ), id )%nTableSize; - - if( bAllowDupes == true ) - { - if( aTable[nPos].id == NULL && aTable[nPos].bDeleted == false ) - { - set( nPos, id, data ); -#ifdef HASH_DEBUG_VIS - printDebugLine( (const char *)id ); -#endif - nSize++; - nFilled++; - return true; - } - else - { - return false; - } - } - else - { - if( aTable[nPos].id == NULL && aTable[nPos].bDeleted == false ) - { - set( nPos, id, data ); -#ifdef HASH_DEBUG_VIS - printDebugLine( (const char *)id ); -#endif - nSize++; - nFilled++; - return true; - } - else if( hFunc->cmpIDs( aTable[nPos].id, id ) == true ) - { - set( nPos, id, data ); -#ifdef HASH_DEBUG_VIS - printDebugLine( (const char *)id ); -#endif - return true; - } - else - { - return false; - } - } -} - -const void *HashTable::get( const void *id, unsigned long int nSkip ) -{ - unsigned long int nPos = hFunc->hash( id )%nTableSize; - - for( unsigned long int j=0; j < 32; nPos = (nPos+(1<<j))%nTableSize, j++ ) - { - if( !isFilled( nPos ) ) return NULL; - if( aTable[nPos].bDeleted == false ) - { - if( hFunc->cmpIDs( id, aTable[nPos].id ) ) - { - if( nSkip == 0 ) - { - return aTable[nPos].data; - } - else - { - nSkip--; - } - } - } - } - - if( bAllowDupes ) - { - unsigned long int nOldPos = nPos; - for( nPos++; nPos != nOldPos; nPos=(nPos+1)%nTableSize ) - { - if( !isFilled( nPos ) ) return NULL; - if( aTable[nPos].bDeleted == false ) - { - if( hFunc->cmpIDs( id, aTable[nPos].id ) ) - { - if( nSkip == 0 ) - { - return aTable[nPos].data; - } - else - { - nSkip--; - } - } - } - } - } - - return NULL; -} - -const void *HashTable::getKey( const void *id, unsigned long int nSkip ) -{ - unsigned long int nPos = hFunc->hash( id )%nTableSize; - - for( unsigned long int j=0; j < 32; nPos = (nPos+(1<<j))%nTableSize, j++ ) - { - if( !isFilled( nPos ) ) return NULL; - if( aTable[nPos].bDeleted == false ) - { - if( hFunc->cmpIDs( id, aTable[nPos].id ) ) - { - if( nSkip == 0 ) - { - return aTable[nPos].id; - } - else - { - nSkip--; - } - } - } - } - - if( bAllowDupes ) - { - unsigned long int nOldPos = nPos; - for( nPos++; nPos != nOldPos; nPos=(nPos+1)%nTableSize ) - { - if( !isFilled( nPos ) ) return NULL; - if( aTable[nPos].bDeleted == false ) - { - if( hFunc->cmpIDs( id, aTable[nPos].id ) ) - { - if( nSkip == 0 ) - { - return aTable[nPos].id; - } - else - { - nSkip--; - } - } - } - } - } - - return NULL; -} - -void *HashTable::getFirstItemPos() -{ - HashPos *pos = new HashPos; - return pos; -} - -const void *HashTable::getItemData( void *xPos ) -{ - return aTable[((HashPos *)xPos)->nPos].data; -} - -const void *HashTable::getItemID( void *xPos ) -{ - return aTable[((HashPos *)xPos)->nPos].id; -} - -void *HashTable::getNextItemPos( void *xPos ) -{ - HashPos *pos = (HashPos *)xPos; - if( pos->bStarted == false ) - { - pos->bStarted = true; - pos->nPos = 0; - } - else - { - pos->nPos++; - } - if( pos->nPos < nTableSize ) - { - for( ; pos->nPos < nTableSize; pos->nPos++ ) - { - if( isFilled( pos->nPos ) && - aTable[pos->nPos].bDeleted == false ) - { - return xPos; - } - } - } - - delete pos; - - return NULL; -} - -// Big-O sqrt(n) -// Change this to be erethpothynies table with a storage -// lookup later on. -bool HashTable::isPrime (int num) -{ - if (num == 2) // the only even prime - return true; - else if (num % 2 == 0) // other even numbers are composite - return false; - else - { - //bool prime = true; - int divisor = 3; - int upperLimit = static_cast<int>(sqrt(num) + 1); - while (divisor <= upperLimit) - { - if (num % divisor == 0) - return false; - // prime = false; - divisor +=2; - } - return true; - } -} - -// Big-O n^(3/2) -int HashTable::nextPrime( int base ) -{ - int nPrime; - for( nPrime = base; isPrime( nPrime ) == false; nPrime++ ); - return nPrime; -} - -unsigned long int HashTable::getCapacity() -{ - return nTableSize; -} - -unsigned long int HashTable::getSize() -{ - return nSize; -} - -double HashTable::getLoad() -{ - return (double)(nFilled)/(double)(nTableSize); -} - -const void *HashTable::operator[](const void *id) -{ - return get( id ); -} - -bool HashTable::del( const void *id, int nSkip ) -{ - unsigned long int nPos = hFunc->hash( id )%nTableSize; - - for( unsigned long int j=0; j < 32; nPos = (nPos+(1<<j))%nTableSize, j++ ) - { - if( !isFilled( nPos ) ) return false; - //printf("0x%08X \"%s\" == 0x%08X \"%s\" (%d)\n", id, id, aTable[nPos].id, aTable[nPos].id, nPos ); - if( hFunc->cmpIDs( id, aTable[nPos].id ) && - aTable[nPos].bDeleted == false ) - { - if( nSkip == 0 ) - { - aTable[nPos].bDeleted = true; - nSize--; -#ifdef HASH_DEBUG_VIS - printDebugLine( (const char *)id ); -#endif - return true; - } - else - { - nSkip--; - } - } - } - - return false; -} - diff --git a/src/old/hashtable.h b/src/old/hashtable.h deleted file mode 100644 index 179b694..0000000 --- a/src/old/hashtable.h +++ /dev/null @@ -1,308 +0,0 @@ -/**\hashtable.h - * Describes the HashFunction, HashFunctionString, and HashTable classes. It - * was just easier to put them all in one set of files. - *@author Mike Buland - */ - -#ifndef HASH_TABLE_H -#define HASH_TABLE_H - -//Uncomment this line to see a cool text-mode visualization of what's going on -//#define HASH_DEBUG_VIS 1 - -#include <stdlib.h> -#include <string.h> -#include <ctype.h> - -#include "hashfunction.h" - -/** - * A simple yet flexable hash-table. This uses several tricks to help ensure - * that the table is always running at maximum efficiency. You no longer have - * to specify a "danger fill level" when more space is needed a rehash is - * automatically trigered. Deleting elements is fully supported, as well as - * duplicate elements. To work with and allow duplicates simple construct your - * HashTable the way you normally would, but when deleting or getting elements - * you can specify a skip value. This effectively allows you to treat elements - * with duplicate ID's as though they were in a zero-based array. The first - * element inserted with a given ID would be at skip zero, the next at skip 1 - * and so on. This allows you to quickly search for elements with duplicate - * names, just stop when you get a null for a skip number, i.e. - * <pre> - * for( int j = 0;; j++ ) - * { - * void *pData = hash.get( myID, j ); - * if( !pData ) break; - * // Do something interesting with pData - * } - * </pre> - * There are new features in this HashTable that also allow for memory saving - * when dealing with systems where many elements are being deleted from the - * table. In those cases the elements deleted cannot be simply deleted, instead - * they have to be marked as deleted and hidden from the user, but maintained in - * the table so that future hashing operations don't fail. When rehashing - * occurs all elements marked as deleted are quietly removed. In these cases, - * if the number of deleted items would free enough space in the table for the - * table to be used efficiently without resizing, it is left the same size and - * rehashing is performed effectively in place, allowing the deleted items to - * be removed. - * <br> - * For info on adding new hashing algorithms, please see the HashFunction class. - *@author Mike Buland - *@todo Fix probing for tables that allow duplicates, and delete an item, then - * insert an item with the same name. - */ -class HashTable -{ -public: - /** Constructs a hash table. - *@param hNewFunc A pointer to a hashfunction class to use. If this is - * null the default general string type will be used. - *@param nInitSize The initial size of the hashtable. - *@param bAllowDupes Setting this value to true allows the system to - * insert more than one copy of any given key. This can be tricky, and - * will require you to use the nSkip parameter on the get function. - */ - HashTable( HashFunction *hNewFunc, unsigned long int nInitSize, bool bAllowDupes=false ); - - /** - * Destroys the hashtable, cleaning up all internal storage, but not stored - * elements. Also deletes the HashFunction passed in in the constructor. - */ - virtual ~HashTable(); - - /** Inserts an item into the hashtable. This function will trigger a - * rehash if adding another item would force the table's load factor over - * the danger level. - *@param id used to find the data later. - *@param data The data item to insert into the table with the identifier - * id - *@returns True if insertion was successfull, and false if it failed. - */ - bool insert( const void *id, const void *data ); - - /** Gets an item in the hashtable based on the id of that item. If there - * is more than one item with the same id you can use the nSkip parameter - * to access all of them. - *@param id The id of the item you're trying to find. - *@param nSkip The number of items with that id to skip before returning - * with the requested item. - *@returns A pointer to the data stored at the given id. - */ - const void *get( const void *id, unsigned long int nSkip=0 ); - - const void *getKey( const void *id, unsigned long int nSkip=0 ); - - /** Gets the total capacity of the hashtable. This is actually the number - * of total positions available inside the hashtable at the moment. This - * will change when the hashtable's load exceeds the danger level. - * Please note that this is NOT the actual amount of space available. - * In reality you can only access about 45-50 percent of that space. - *@returns The total capacity. - */ - unsigned long int getCapacity(); - - /** Gets the number of filled in items in the hash table. This is roughly - * equivelent to the getSize function assosiated with the Lists. - *@returns The number of filled in items in the hash table. - */ - unsigned long int getSize(); - - /** Gets the load (percentage) of filled in items in the table. This is - * technically the size divided by the capacity, but is definately usefull - * since it's required to check if it's time to rehash. - *@returns The table load in the range 0.0 to 1.0 - */ - double getLoad(); - - /** Sets up an xPos object for use indexing the items in the table. Call - * this first and follow the directions for getNextItemPos below to - * iterate through every item in the table, while avoiding the empty - * spaces. - *@returns A pointer to a xPos object telling the hashtable where to find - * the item you're looking at. - */ - void *getFirstItemPos(); - - /** Get the item's data that is being pointed to by xPos. This is only - * valid after xPos was created using getFirstItemPos and getNextItemPos - * was called at least once. - *@param xPos supplied by getFirstItemPos. - *@returns The key value that was used to insert the data into the table. - */ - const void *getItemData( void *xPos ); - - /** Get the item's ID that is being pointed to by xPos. This is only - * valid after xPos was created using getFirstItemPos and getNextItemPos - * was called at least once. - *@param xPos supplied by getFirstItemPos. - *@returns The key value that was used to insert the data into the table. - */ - const void *getItemID( void *xPos ); - - /** Used for iterating through a hash table sequentially. This will - * update the xPos pointer to point to the next time, all ready to - * be accessed with getItemID and getItemData. This must be called at - * least once before xPos is meaningful, and will return a NULL when it - * has reached the last item. - *@param xPos This must be an object created by a call to the function - * getFirstItemPos, and is only meaningful to the internal routines. - * Aborting a call in the middle (not running to the end of the table) - * may result in a memory leak at the moment. - *@returns xPos if still iterating through the list, otherwise it will - * return NULL when the end has been reached and the xPos variable has - * been deleted. - */ - void *getNextItemPos( void *xPos ); - - /** A helpful operator to make accessing items easier. Please note that - * this simply returns a pointer to the data stored internally, and cannot - * be used like the STL operator to store new data, use insert for that. - *@param id The identifier used to store the requested item. - *@returns The data value assosiated with the given id, or NULL if it - * wasn't found in the table. - */ - const void *operator[](const void *id); - - /** - * Delete the specified item from the hashtable. This actually keeps the - * data and marks it deleted. For all intents and purposes to the user it - * is deleted, except that the space is still used until a rehash is forced. - * This means that in hashtables where elements are being inserted and - * deleted frequently you may run into a higher rate of expansion. - *@param id The ID to delete. - *@param nSkip The number of similar id's to skip before deleting in a - * hashtable that allows duplicates. - *@returns True if the element was found and deleted, false otherwise. - */ - bool del( const void *id, int nSkip=0 ); - - /** - * Deletes every entry in the hash table. See the notes on del to see what - * this means, except that since no data is being kept, the entire table is - * just marked as usable space. - */ - void clear(); - -private: - /** - * Contains info related to a position in the hashtable. Used for - * searching through hashtables one item at a time, in order. This class - * should never be created by anything but a HashTable, and should never - * be referenced directly. Instead the hashtable returns a void pointer, - * which is what should be passed back in next time you use a search - * function. Always finish a search, since the object is deleted at the - * end of the search. - *@author Mike Buland - */ - class HashPos - { - public: - /** Create a blank HashPos. */ - HashPos() { bStarted=false; nPos = 0; }; - /** Has the search been started? */ - bool bStarted; - /** The position (index) into the backend storage structure. */ - unsigned long int nPos; - }; - - /** - * All data related to a single element in the hashtable. This should - * really only be used and manipulated by the HashTable itself. - *@author Mike Buland - */ - typedef struct HashNode - { - public: - /** Create a new, empty HashNode. */ - HashNode() { id = NULL; data = NULL; bDeleted = false; }; - /** A pointer to the original ID that was used to key the data. */ - const void *id; - /** A pointer to the data stored along with the above ID. */ - const void *data; - /** Weather or not this data should really...exist */ - bool bDeleted; - } HashNode; - -private: - /** - * Just sets the values in the element to some friendly values. - *@param newID The new ID to store. - *@param newData The new Data to store. - */ - void set( int j, const void *newID, const void *newData ); - /** - * Tells you if the node is filled or not. - *@returns True=an ID has been stored here, False=no ID. - */ - bool isFilled( int j ); - /** - * This actually resizes, but since every resize requires a reHash to go - * along with it, that's the name. This actually creates a new buffer for - * all of the contained data and then pulls every old element that was in - * the old table out and performs the hashing placement calculations again. - * This function skips all data that was marked as deleted, so at this - * point it really will be. - *@param nNewSize The new size to set the table to while re-hashing. - *@returns True if the operation was successful, false otherwise. - */ - void reHash( unsigned long int nNewSize ); - - /** - * Helper function to allocate a new table. Really just does the memory - * allocation. - *@param nNewSize The size of the table to generate. - *@returns A new, blank array of HashNode objects the size you specified. - */ - HashNode *newTable( unsigned long int nNewSize ); - - /** - * This function is used once an actual hash code is obtained. nStart is - * the given hash code, which is then wrapped to the size of the table. If - * there is data at that location, tests are performed to see if it's the - * right one. If it is, then it is returned, otherwise a series of further - * tests based on a 2^n search pattern is performed. The position of the - * requested data in the back-end storage is returned if found, otherwise - * another less useful value is returned... - *@param nStart The initial hashcode of the ID testing for. - *@param id A pointer to the id that is being searched for. - *@returns The real location of the data requested. - */ - unsigned long int probe( unsigned long int nStart, const void *id ); - - /** - * Simple helper function to determine if a number is prime or not. - * This function runs in sqrt(n) time. - *@param num Number to test for prime-hood. - *@returns True if the number is prime, false otherwise. - */ - bool isPrime( int num ); - - /** - * Given any number, this function finds the first number after it that is - * prime. Since this number is a multiple internally it's rare that the - * starting number would be prime. - *@param base The number to start the prime search on. - *@returns The first prime after the number given. - */ - int nextPrime( int base ); - -#ifdef HASH_DEBUG_VIS - void printDebugLine( const char *exData ); -#endif - - /** A pointer to the HashFunction subclass instance to use. */ - HashFunction *hFunc; - /** The complete array of HashNode objects to store data in. */ - HashNode *aTable; - /** The actual size of the table, not how many elements are in it. */ - unsigned long int nTableSize; - /** The number of elements that are in the table. */ - unsigned long int nSize; - /** The number of elements that are unavailable now. */ - unsigned long int nFilled; - /** Allow duplicate ID's in the table. */ - bool bAllowDupes; -}; - -#endif -- cgit v1.2.3 From 5a0d7856dc265580cebaa833e0367d03ef21bbc3 Mon Sep 17 00:00:00 2001 From: Mike Buland <eichlan@xagasoft.com> Date: Tue, 10 Apr 2007 13:53:18 +0000 Subject: Woo, changed the name of Achable to Archival, I dig that, and added the ground- work for the SSocket, that should be cool. --- src/archable.cpp | 10 ---------- src/archable.h | 35 ----------------------------------- src/archival.cpp | 10 ++++++++++ src/archival.h | 38 ++++++++++++++++++++++++++++++++++++++ src/archive.cpp | 6 +++--- src/archive.h | 8 ++++---- src/fstring.h | 4 ++-- src/hash.h | 2 +- src/ssocket.cpp | 9 +++++++++ src/ssocket.h | 24 ++++++++++++++++++++++++ 10 files changed, 91 insertions(+), 55 deletions(-) delete mode 100644 src/archable.cpp delete mode 100644 src/archable.h create mode 100644 src/archival.cpp create mode 100644 src/archival.h create mode 100644 src/ssocket.cpp create mode 100644 src/ssocket.h diff --git a/src/archable.cpp b/src/archable.cpp deleted file mode 100644 index 38fc31f..0000000 --- a/src/archable.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "archable.h" - -Bu::Archable::Archable() -{ -} - -Bu::Archable::~Archable() -{ -} - diff --git a/src/archable.h b/src/archable.h deleted file mode 100644 index ed05a78..0000000 --- a/src/archable.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef ARCHABLE_H -#define ARCHABLE_H - -namespace Bu -{ - /** - * The base class for any class you want to archive. Simply include this as - * a base class, implement the purely virtual archive function and you've - * got an easily archiveable class. - */ - class Archable - { - public: - /** - * Does nothing, here for completeness. - */ - Archable(); - - /** - * Here to ensure the deconstructor is virtual. - */ - virtual ~Archable(); - - /** - * This is the main workhorse of the archive system, just override and - * you've got a archiveable class. A reference to the Archive - * used is passed in as your only parameter, query it to discover if - * you are loading or saving. - * @param ar A reference to the Archive object to use. - */ - virtual void archive( class Archive &ar )=0; - }; -} - -#endif diff --git a/src/archival.cpp b/src/archival.cpp new file mode 100644 index 0000000..79c28f1 --- /dev/null +++ b/src/archival.cpp @@ -0,0 +1,10 @@ +#include "archival.h" + +Bu::Archival::Archival() +{ +} + +Bu::Archival::~Archival() +{ +} + diff --git a/src/archival.h b/src/archival.h new file mode 100644 index 0000000..e2c803c --- /dev/null +++ b/src/archival.h @@ -0,0 +1,38 @@ +#ifndef ARCHIVAL_H +#define ARCHIVAL_H + +namespace Bu +{ + /** + * The base class for any class you want to archive. Simply include this as + * a base class, implement the purely virtual archive function and you've + * got an easily archiveable class. + * + * Archival: "of or pertaining to archives or valuable records; contained + * in or comprising such archives or records." + */ + class Archival + { + public: + /** + * Does nothing, here for completeness. + */ + Archival(); + + /** + * Here to ensure the deconstructor is virtual. + */ + virtual ~Archival(); + + /** + * This is the main workhorse of the archive system, just override and + * you've got a archiveable class. A reference to the Archive + * used is passed in as your only parameter, query it to discover if + * you are loading or saving. + * @param ar A reference to the Archive object to use. + */ + virtual void archive( class Archive &ar )=0; + }; +} + +#endif diff --git a/src/archive.cpp b/src/archive.cpp index be06c0e..edc8625 100644 --- a/src/archive.cpp +++ b/src/archive.cpp @@ -312,20 +312,20 @@ Bu::Archive &Bu::Archive::operator&&(long double &p) } -Bu::Archive &Bu::operator<<(Bu::Archive &s, Bu::Archable &p) +Bu::Archive &Bu::operator<<(Bu::Archive &s, Bu::Archival &p) { p.archive( s ); return s; } -Bu::Archive &Bu::operator>>(Bu::Archive &s, Bu::Archable &p) +Bu::Archive &Bu::operator>>(Bu::Archive &s, Bu::Archival &p) { p.archive( s ); return s; } /* -Bu::Archive &Bu::operator&&(Bu::Archive &s, Bu::Archable &p) +Bu::Archive &Bu::operator&&(Bu::Archive &s, Bu::Archival &p) { if (s.isLoading()) { diff --git a/src/archive.h b/src/archive.h index 26e430b..a8ce53e 100644 --- a/src/archive.h +++ b/src/archive.h @@ -3,7 +3,7 @@ #include <stdint.h> #include <string> -#include "archable.h" +#include "archival.h" #include "stream.h" namespace Bu @@ -73,9 +73,9 @@ namespace Bu Stream &rStream; }; - Archive &operator<<(Archive &, class Bu::Archable &); - Archive &operator>>(Archive &, class Bu::Archable &); - //Archive &operator&&(Archive &s, class Bu::Archable &p); + Archive &operator<<(Archive &, class Bu::Archival &); + Archive &operator>>(Archive &, class Bu::Archival &); + //Archive &operator&&(Archive &s, class Bu::Archival &p); Archive &operator<<(Archive &, std::string &); Archive &operator>>(Archive &, std::string &); diff --git a/src/fstring.h b/src/fstring.h index 717068f..0184301 100644 --- a/src/fstring.h +++ b/src/fstring.h @@ -3,7 +3,7 @@ #include <stdint.h> #include <memory> -#include "archable.h" +#include "archival.h" #include "archive.h" #include "hash.h" @@ -29,7 +29,7 @@ namespace Bu * FBasicString into a ref-counting container class. */ template< typename chr, typename chralloc=std::allocator<chr>, typename chunkalloc=std::allocator<struct FStringChunk<chr> > > - class FBasicString : public Archable + class FBasicString : public Archival { #ifndef VALTEST #define cpy( dest, src, size ) memcpy( dest, src, size*sizeof(chr) ) diff --git a/src/hash.h b/src/hash.h index 9e498f1..dc097df 100644 --- a/src/hash.h +++ b/src/hash.h @@ -8,7 +8,7 @@ #include <list> #include <utility> #include "exceptionbase.h" -#include "archable.h" +#include "archival.h" #include "archive.h" #define bitsToBytes( n ) (n/32+(n%32>0 ? 1 : 0)) diff --git a/src/ssocket.cpp b/src/ssocket.cpp new file mode 100644 index 0000000..bdaac24 --- /dev/null +++ b/src/ssocket.cpp @@ -0,0 +1,9 @@ +#include "ssocket.h" + +SSocket::SSocket() +{ +} + +SSocket::~SSocket() +{ +} diff --git a/src/ssocket.h b/src/ssocket.h new file mode 100644 index 0000000..ce02091 --- /dev/null +++ b/src/ssocket.h @@ -0,0 +1,24 @@ +#ifndef S_SOCKET_H +#define S_SOCKET_H + +#include <stdint.h> + +#include "stream.h" + +namespace Bu +{ + /** + * + */ + class SSocket : public Stream + { + public: + SSocket(); + virtual ~SSocket(); + + private: + + }; +} + +#endif -- cgit v1.2.3 From b6e100b94b12f3f92ec025dc2363eaf7c0ee6662 Mon Sep 17 00:00:00 2001 From: Mike Buland <eichlan@xagasoft.com> Date: Tue, 10 Apr 2007 16:02:07 +0000 Subject: Well, we've got the basis of a workable unit test harness thing. There should be a few more add-ons to it, but it works just fine, and eventually it should cover command line options and creating logs, and possibly even provide output functionality so that output from tests can be logged and kept track of well. --- build.conf | 16 +++++++++++++ src/fstring.h | 24 +++++++++++++++++++ src/ssocket.cpp | 4 ++-- src/unit/fstring.cpp | 28 ++++++++++++++++++++++ src/unit/sfile.cpp | 27 +++++++++++++++++++++ src/unitsuite.cpp | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/unitsuite.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 224 insertions(+), 2 deletions(-) create mode 100644 src/unit/fstring.cpp create mode 100644 src/unit/sfile.cpp create mode 100644 src/unitsuite.cpp create mode 100644 src/unitsuite.h diff --git a/build.conf b/build.conf index 5c4dbb6..bc186f9 100644 --- a/build.conf +++ b/build.conf @@ -30,6 +30,22 @@ filesIn("src/tests") filter regexp("^src/tests/(.*)\\.cpp$", "tests/{re:1}"): set "LDFLAGS" += "-L. -lbu++", input "src/{target}.cpp" +directoriesIn("src/unit","unit/"): + rule "exe", + target file, + requires "libbu++.a", + set "CXXFLAGS" += "-Isrc", + set "LDFLAGS" += "-L. -lbu++", + input filesIn("{fulldir}") filter regexp("^.*\\.cpp$") + +filesIn("src/unit") filter regexp("^src/unit/(.*)\\.cpp$", "unit/{re:1}"): + rule "exe", + target file, + requires "libbu++.a", + set "CXXFLAGS" += "-Isrc", + set "LDFLAGS" += "-L. -lbu++", + input "src/{target}.cpp" + "tests/plugin": set "LDFLAGS" += "-ldl" rule "exe": diff --git a/src/fstring.h b/src/fstring.h index 0184301..751beb8 100644 --- a/src/fstring.h +++ b/src/fstring.h @@ -364,6 +364,30 @@ namespace Bu } } + long find( const char *sText ) + { + long nTLen = strlen( sText ); + flatten(); + for( long j = 0; j < pFirst->nLength-nTLen; j++ ) + { + if( !strncmp( sText, pFirst->pData+j, nTLen ) ) + return j; + } + return -1; + } + + long rfind( const char *sText ) + { + long nTLen = strlen( sText ); + flatten(); + for( long j = pFirst->nLength-nTLen-1; j >= 0; j-- ) + { + if( !strncmp( sText, pFirst->pData+j, nTLen ) ) + return j; + } + return -1; + } + void archive( class Archive &ar ) { if( ar.isLoading() ) diff --git a/src/ssocket.cpp b/src/ssocket.cpp index bdaac24..85a2da0 100644 --- a/src/ssocket.cpp +++ b/src/ssocket.cpp @@ -1,9 +1,9 @@ #include "ssocket.h" -SSocket::SSocket() +Bu::SSocket::SSocket() { } -SSocket::~SSocket() +Bu::SSocket::~SSocket() { } diff --git a/src/unit/fstring.cpp b/src/unit/fstring.cpp new file mode 100644 index 0000000..72755eb --- /dev/null +++ b/src/unit/fstring.cpp @@ -0,0 +1,28 @@ +#include "fstring.h" +#include "unitsuite.h" + +class Unit : public Bu::UnitSuite +{ +public: + Unit() + { + setName("FString"); + addTest( Unit::test1 ); + } + + virtual ~Unit() + { + } + + void test1() + { + unitTest( 1 == 1 ); + unitTest( 1 == 0 ); + } +}; + +int main( int argc, char *argv[] ) +{ + return Unit().run( argc, argv ); +} + diff --git a/src/unit/sfile.cpp b/src/unit/sfile.cpp new file mode 100644 index 0000000..7b19942 --- /dev/null +++ b/src/unit/sfile.cpp @@ -0,0 +1,27 @@ +#include "unitsuite.h" + +class Unit : public Bu::UnitSuite +{ +public: + Unit() + { + setName("SFile"); + addTest( Unit::test ); + } + + virtual ~Unit() { } + + // + // Tests go here + // + void test() + { + unitTest( 1 == 1 ); + } +}; + +int main( int argc, char *argv[] ) +{ + return Unit().run( argc, argv ); +} + diff --git a/src/unitsuite.cpp b/src/unitsuite.cpp new file mode 100644 index 0000000..2a28eb5 --- /dev/null +++ b/src/unitsuite.cpp @@ -0,0 +1,67 @@ +#include "unitsuite.h" + +Bu::UnitSuite::UnitSuite() +{ +} + +Bu::UnitSuite::~UnitSuite() +{ +} + +int Bu::UnitSuite::run( int argc, char *argv[] ) +{ + for( TestList::iterator i = lTests.begin(); i != lTests.end(); i++ ) + { + printf("%s: ", i->sName.getStr() ); + fflush( stdout ); + try + { + (this->*(i->fTest))(); + printf("passed.\n"); + } + catch( Failed &e ) + { + if( e.bFile ) + { + printf("unitTest(%s) failed. (%s:%d)\n", + e.str.getStr(), + e.sFile.getStr(), + e.nLine + ); + } + else + { + printf("unitTest(%s) failed.\n", + e.str.getStr() + ); + } + } + catch( ... ) + { + printf("failed with external exception.\n"); + } + } + + return 0; +} + +void Bu::UnitSuite::add( Test fTest, Bu::FString sName ) +{ + TestInfo ti; + ti.sName = sName; + long index = ti.sName.rfind("::"); + if( index != -1 ) + { + FString tmp = sSuiteName; + tmp += ti.sName.getStr()+index; + ti.sName = tmp; + } + ti.fTest = fTest; + lTests.push_back( ti ); +} + +void Bu::UnitSuite::setName( const FString &sName ) +{ + sSuiteName = sName; +} + diff --git a/src/unitsuite.h b/src/unitsuite.h new file mode 100644 index 0000000..3502a1b --- /dev/null +++ b/src/unitsuite.h @@ -0,0 +1,60 @@ +#ifndef UNIT_SUITE_H +#define UNIT_SUITE_H + +#include <stdint.h> +#include <list> +#include "fstring.h" + +namespace Bu +{ + /** + * + */ + class UnitSuite + { + public: + UnitSuite(); + virtual ~UnitSuite(); + + int run( int argc=0, char *argv[]=NULL ); + + typedef void (UnitSuite::*Test)(); + + class Failed + { + public: + Failed() : str(""), bFile( false ) { } + Failed( const FString &s ) : str( s ), bFile( false ) { } + Failed( const FString &s, const FString &sFile, int nLine ) : + str( s ), sFile( sFile ), nLine( nLine ), bFile( true ) { } + + FString str; + FString sFile; + int nLine; + bool bFile; + }; + + protected: + void add( Test fTest, Bu::FString sName ); + void setName( const FString &sName ); + + private: + typedef struct TestInfo + { + FString sName; + Test fTest; + } TestInfo; + + typedef std::list<TestInfo> TestList; + TestList lTests; + FString sSuiteName; + }; +} + +#define addTest( fn ) add( static_cast<Bu::UnitSuite::Test>(&fn), #fn ) +#define unitTest( tst ) if( !(tst) ) \ +{ \ + throw Bu::UnitSuite::Failed( #tst, __FILE__, __LINE__ ); \ +} + +#endif -- cgit v1.2.3 From 903e7a1e3d4fe99e9de7f4adc1e401ba871caec9 Mon Sep 17 00:00:00 2001 From: Mike Buland <eichlan@xagasoft.com> Date: Tue, 10 Apr 2007 17:23:35 +0000 Subject: Wrote some cute file unit tests, and added some more error reporting to SFile. Also fixed the stream system to use void * pointers instead of char *. --- src/sfile.cpp | 16 +++++++++-- src/sfile.h | 4 +-- src/stream.h | 4 +-- src/unit/sfile.cpp | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- src/unitsuite.h | 1 + 5 files changed, 99 insertions(+), 10 deletions(-) diff --git a/src/sfile.cpp b/src/sfile.cpp index d7c5c83..529d8cd 100644 --- a/src/sfile.cpp +++ b/src/sfile.cpp @@ -1,9 +1,14 @@ #include "sfile.h" #include "exceptions.h" +#include <errno.h> Bu::SFile::SFile( const char *sName, const char *sFlags ) { fh = fopen( sName, sFlags ); + if( fh == NULL ) + { + throw Bu::FileException( errno, strerror(errno) ); + } } Bu::SFile::~SFile() @@ -20,15 +25,20 @@ void Bu::SFile::close() } } -size_t Bu::SFile::read( char *pBuf, size_t nBytes ) +size_t Bu::SFile::read( void *pBuf, size_t nBytes ) { if( !fh ) throw FileException("File not open."); - return fread( pBuf, 1, nBytes, fh ); + int nAmnt = fread( pBuf, 1, nBytes, fh ); + + if( nAmnt == 0 ) + throw FileException("End of file."); + + return nAmnt; } -size_t Bu::SFile::write( const char *pBuf, size_t nBytes ) +size_t Bu::SFile::write( const void *pBuf, size_t nBytes ) { if( !fh ) throw FileException("File not open."); diff --git a/src/sfile.h b/src/sfile.h index 304f6b7..f63b812 100644 --- a/src/sfile.h +++ b/src/sfile.h @@ -14,8 +14,8 @@ namespace Bu virtual ~SFile(); virtual void close(); - virtual size_t read( char *pBuf, size_t nBytes ); - virtual size_t write( const char *pBuf, size_t nBytes ); + virtual size_t read( void *pBuf, size_t nBytes ); + virtual size_t write( const void *pBuf, size_t nBytes ); virtual long tell(); virtual void seek( long offset ); diff --git a/src/stream.h b/src/stream.h index 274f4fd..ae94234 100644 --- a/src/stream.h +++ b/src/stream.h @@ -13,8 +13,8 @@ namespace Bu virtual ~Stream(); virtual void close() = 0; - virtual size_t read( char *pBuf, size_t nBytes ) = 0; - virtual size_t write( const char *pBuf, size_t nBytes ) = 0; + virtual size_t read( void *pBuf, size_t nBytes ) = 0; + virtual size_t write( const void *pBuf, size_t nBytes ) = 0; virtual long tell() = 0; virtual void seek( long offset ) = 0; diff --git a/src/unit/sfile.cpp b/src/unit/sfile.cpp index 7b19942..3f52272 100644 --- a/src/unit/sfile.cpp +++ b/src/unit/sfile.cpp @@ -1,4 +1,10 @@ #include "unitsuite.h" +#include "sfile.h" +#include "exceptions.h" + +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> class Unit : public Bu::UnitSuite { @@ -6,7 +12,10 @@ public: Unit() { setName("SFile"); - addTest( Unit::test ); + addTest( Unit::writeFull ); + addTest( Unit::readBlocks ); + addTest( Unit::readError1 ); + addTest( Unit::readError2 ); } virtual ~Unit() { } @@ -14,9 +23,78 @@ public: // // Tests go here // - void test() + void writeFull() + { + Bu::SFile sf("testfile1", "wb"); + for( int c = 0; c < 256; c++ ) + { + unsigned char ch = (unsigned char)c; + sf.write( &ch, 1 ); + unitTest( sf.tell() == c+1 ); + } + //unitTest( sf.canRead() == false ); + //unitTest( sf.canWrite() == true ); + //unitTest( sf.canSeek() == true ); + sf.close(); + struct stat sdat; + stat("testfile1", &sdat ); + unitTest( sdat.st_size == 256 ); + } + + void readBlocks() + { + Bu::SFile sf("testfile1", "rb"); + unsigned char buf[50]; + size_t total = 0; + for(;;) + { + size_t s = sf.read( buf, 50 ); + for( size_t c = 0; c < s; c++ ) + { + unitTest( buf[c] == (unsigned char)(c+total) ); + } + total += s; + if( s < 50 ) + { + unitTest( total == 256 ); + unitTest( sf.isEOS() == true ); + break; + } + } + sf.close(); + } + + void readError1() + { + try + { + Bu::SFile sf("doesn'texist", "rb"); + unitFailed("No exception thrown"); + } + catch( Bu::FileException &e ) + { + return; + } + } + + void readError2() { - unitTest( 1 == 1 ); + Bu::SFile sf("testfile1", "rb"); + char buf[256]; + int r = sf.read( buf, 256 ); + unitTest( r == 256 ); + // You have to read past the end to set the EOS flag. + unitTest( sf.isEOS() == false ); + try + { + int r = sf.read( buf, 5 ); + unitFailed("No exception thrown"); + } + catch( Bu::FileException &e ) + { + sf.close(); + return; + } } }; diff --git a/src/unitsuite.h b/src/unitsuite.h index 3502a1b..db249b2 100644 --- a/src/unitsuite.h +++ b/src/unitsuite.h @@ -56,5 +56,6 @@ namespace Bu { \ throw Bu::UnitSuite::Failed( #tst, __FILE__, __LINE__ ); \ } +#define unitFailed( msg ) throw Bu::UnitSuite::Failed(msg, __FILE__, __LINE__); #endif -- cgit v1.2.3 From e7ab7cb1604c04763bbdcece5885e6ce5aa100b4 Mon Sep 17 00:00:00 2001 From: Mike Buland <eichlan@xagasoft.com> Date: Tue, 10 Apr 2007 17:37:46 +0000 Subject: Fixed a warning in the SFile test, and added std::list support to the archive. I guess I should write a test for it too... I'm also thinking of removing the S from the front of the stream children. --- src/archive.cpp | 13 ------------- src/archive.h | 29 +++++++++++++++++++++++++++++ src/unit/sfile.cpp | 2 +- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/archive.cpp b/src/archive.cpp index edc8625..c759477 100644 --- a/src/archive.cpp +++ b/src/archive.cpp @@ -324,19 +324,6 @@ Bu::Archive &Bu::operator>>(Bu::Archive &s, Bu::Archival &p) return s; } -/* -Bu::Archive &Bu::operator&&(Bu::Archive &s, Bu::Archival &p) -{ - if (s.isLoading()) - { - return s >> p; - } - else - { - return s << p; - } -}*/ - Bu::Archive &Bu::operator<<( Bu::Archive &ar, std::string &s ) { ar << (uint32_t)s.length(); diff --git a/src/archive.h b/src/archive.h index a8ce53e..9ac3303 100644 --- a/src/archive.h +++ b/src/archive.h @@ -5,6 +5,7 @@ #include <string> #include "archival.h" #include "stream.h" +#include <list> namespace Bu { @@ -92,6 +93,34 @@ namespace Bu return ar << dat; } } + + template<typename T> Archive &operator<<( Archive &ar, std::list<T> &l ) + { + typename std::list<T>::size_type num = l.size(); + ar << num; + for( typename std::list<T>::const_iterator i = l.begin(); i != l.end(); + i++ ) + { + ar << *i; + } + + return ar; + } + + template<typename T> Archive &operator>>( Archive &ar, std::list<T> &l ) + { + typename std::list<T>::size_type num; + ar >> num; + + l.resize( num ); + for( typename std::list<T>::const_iterator i = l.begin(); + i != l.end(); i++ ) + { + ar >> *i; + } + + return ar; + } } #endif diff --git a/src/unit/sfile.cpp b/src/unit/sfile.cpp index 3f52272..2aff312 100644 --- a/src/unit/sfile.cpp +++ b/src/unit/sfile.cpp @@ -87,7 +87,7 @@ public: unitTest( sf.isEOS() == false ); try { - int r = sf.read( buf, 5 ); + sf.read( buf, 5 ); unitFailed("No exception thrown"); } catch( Bu::FileException &e ) -- cgit v1.2.3 From 070374dde0f53bff26078550997f7682e84412e5 Mon Sep 17 00:00:00 2001 From: Mike Buland <eichlan@xagasoft.com> Date: Tue, 10 Apr 2007 20:16:19 +0000 Subject: I did it, the streams don't start with an S now. --- src/file.cpp | 100 +++++++++++++++++++++++++++++++++++++++++++++++ src/file.h | 36 +++++++++++++++++ src/sfile.cpp | 100 ----------------------------------------------- src/sfile.h | 36 ----------------- src/socket.cpp | 10 +++++ src/socket.h | 24 ++++++++++++ src/ssocket.cpp | 9 ----- src/ssocket.h | 24 ------------ src/tests/archive.cpp | 4 +- src/unit/file.cpp | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/unit/sfile.cpp | 105 -------------------------------------------------- src/unitsuite.h | 35 +++++++++++++++++ 12 files changed, 312 insertions(+), 276 deletions(-) create mode 100644 src/file.cpp create mode 100644 src/file.h delete mode 100644 src/sfile.cpp delete mode 100644 src/sfile.h create mode 100644 src/socket.cpp create mode 100644 src/socket.h delete mode 100644 src/ssocket.cpp delete mode 100644 src/ssocket.h create mode 100644 src/unit/file.cpp delete mode 100644 src/unit/sfile.cpp diff --git a/src/file.cpp b/src/file.cpp new file mode 100644 index 0000000..5de5f6c --- /dev/null +++ b/src/file.cpp @@ -0,0 +1,100 @@ +#include "file.h" +#include "exceptions.h" +#include <errno.h> + +Bu::File::File( const char *sName, const char *sFlags ) +{ + fh = fopen( sName, sFlags ); + if( fh == NULL ) + { + throw Bu::FileException( errno, strerror(errno) ); + } +} + +Bu::File::~File() +{ + close(); +} + +void Bu::File::close() +{ + if( fh ) + { + fclose( fh ); + fh = NULL; + } +} + +size_t Bu::File::read( void *pBuf, size_t nBytes ) +{ + if( !fh ) + throw FileException("File not open."); + + int nAmnt = fread( pBuf, 1, nBytes, fh ); + + if( nAmnt == 0 ) + throw FileException("End of file."); + + return nAmnt; +} + +size_t Bu::File::write( const void *pBuf, size_t nBytes ) +{ + if( !fh ) + throw FileException("File not open."); + + return fwrite( pBuf, 1, nBytes, fh ); +} + +long Bu::File::tell() +{ + if( !fh ) + throw FileException("File not open."); + + return ftell( fh ); +} + +void Bu::File::seek( long offset ) +{ + if( !fh ) + throw FileException("File not open."); + + fseek( fh, offset, SEEK_CUR ); +} + +void Bu::File::setPos( long pos ) +{ + if( !fh ) + throw FileException("File not open."); + + fseek( fh, pos, SEEK_SET ); +} + +void Bu::File::setPosEnd( long pos ) +{ + if( !fh ) + throw FileException("File not open."); + + fseek( fh, pos, SEEK_END ); +} + +bool Bu::File::isEOS() +{ + return feof( fh ); +} + +bool Bu::File::canRead() +{ + return true; +} + +bool Bu::File::canWrite() +{ + return true; +} + +bool Bu::File::canSeek() +{ + return true; +} + diff --git a/src/file.h b/src/file.h new file mode 100644 index 0000000..bbc620c --- /dev/null +++ b/src/file.h @@ -0,0 +1,36 @@ +#ifndef FILE_H +#define FILE_H + +#include <stdint.h> + +#include "stream.h" + +namespace Bu +{ + class File : public Bu::Stream + { + public: + File( const char *sName, const char *sFlags ); + virtual ~File(); + + virtual void close(); + virtual size_t read( void *pBuf, size_t nBytes ); + virtual size_t write( const void *pBuf, size_t nBytes ); + + virtual long tell(); + virtual void seek( long offset ); + virtual void setPos( long pos ); + virtual void setPosEnd( long pos ); + virtual bool isEOS(); + + virtual bool canRead(); + virtual bool canWrite(); + virtual bool canSeek(); + + private: + FILE *fh; + + }; +} + +#endif diff --git a/src/sfile.cpp b/src/sfile.cpp deleted file mode 100644 index 529d8cd..0000000 --- a/src/sfile.cpp +++ /dev/null @@ -1,100 +0,0 @@ -#include "sfile.h" -#include "exceptions.h" -#include <errno.h> - -Bu::SFile::SFile( const char *sName, const char *sFlags ) -{ - fh = fopen( sName, sFlags ); - if( fh == NULL ) - { - throw Bu::FileException( errno, strerror(errno) ); - } -} - -Bu::SFile::~SFile() -{ - close(); -} - -void Bu::SFile::close() -{ - if( fh ) - { - fclose( fh ); - fh = NULL; - } -} - -size_t Bu::SFile::read( void *pBuf, size_t nBytes ) -{ - if( !fh ) - throw FileException("File not open."); - - int nAmnt = fread( pBuf, 1, nBytes, fh ); - - if( nAmnt == 0 ) - throw FileException("End of file."); - - return nAmnt; -} - -size_t Bu::SFile::write( const void *pBuf, size_t nBytes ) -{ - if( !fh ) - throw FileException("File not open."); - - return fwrite( pBuf, 1, nBytes, fh ); -} - -long Bu::SFile::tell() -{ - if( !fh ) - throw FileException("File not open."); - - return ftell( fh ); -} - -void Bu::SFile::seek( long offset ) -{ - if( !fh ) - throw FileException("File not open."); - - fseek( fh, offset, SEEK_CUR ); -} - -void Bu::SFile::setPos( long pos ) -{ - if( !fh ) - throw FileException("File not open."); - - fseek( fh, pos, SEEK_SET ); -} - -void Bu::SFile::setPosEnd( long pos ) -{ - if( !fh ) - throw FileException("File not open."); - - fseek( fh, pos, SEEK_END ); -} - -bool Bu::SFile::isEOS() -{ - return feof( fh ); -} - -bool Bu::SFile::canRead() -{ - return true; -} - -bool Bu::SFile::canWrite() -{ - return true; -} - -bool Bu::SFile::canSeek() -{ - return true; -} - diff --git a/src/sfile.h b/src/sfile.h deleted file mode 100644 index f63b812..0000000 --- a/src/sfile.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef SFILE_H -#define SFILE_H - -#include <stdint.h> - -#include "stream.h" - -namespace Bu -{ - class SFile : public Bu::Stream - { - public: - SFile( const char *sName, const char *sFlags ); - virtual ~SFile(); - - virtual void close(); - virtual size_t read( void *pBuf, size_t nBytes ); - virtual size_t write( const void *pBuf, size_t nBytes ); - - virtual long tell(); - virtual void seek( long offset ); - virtual void setPos( long pos ); - virtual void setPosEnd( long pos ); - virtual bool isEOS(); - - virtual bool canRead(); - virtual bool canWrite(); - virtual bool canSeek(); - - private: - FILE *fh; - - }; -} - -#endif diff --git a/src/socket.cpp b/src/socket.cpp new file mode 100644 index 0000000..c5c592b --- /dev/null +++ b/src/socket.cpp @@ -0,0 +1,10 @@ +#include "socket.h" + +Bu::Socket::Socket() +{ +} + +Bu::Socket::~Socket() +{ +} + diff --git a/src/socket.h b/src/socket.h new file mode 100644 index 0000000..8ccde71 --- /dev/null +++ b/src/socket.h @@ -0,0 +1,24 @@ +#ifndef SOCKET_H +#define SOCKET_H + +#include <stdint.h> + +#include "stream.h" + +namespace Bu +{ + /** + * + */ + class Socket : public Stream + { + public: + Socket(); + virtual ~Socket(); + + private: + + }; +} + +#endif diff --git a/src/ssocket.cpp b/src/ssocket.cpp deleted file mode 100644 index 85a2da0..0000000 --- a/src/ssocket.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "ssocket.h" - -Bu::SSocket::SSocket() -{ -} - -Bu::SSocket::~SSocket() -{ -} diff --git a/src/ssocket.h b/src/ssocket.h deleted file mode 100644 index ce02091..0000000 --- a/src/ssocket.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef S_SOCKET_H -#define S_SOCKET_H - -#include <stdint.h> - -#include "stream.h" - -namespace Bu -{ - /** - * - */ - class SSocket : public Stream - { - public: - SSocket(); - virtual ~SSocket(); - - private: - - }; -} - -#endif diff --git a/src/tests/archive.cpp b/src/tests/archive.cpp index 5b7e285..2035aa6 100644 --- a/src/tests/archive.cpp +++ b/src/tests/archive.cpp @@ -1,11 +1,11 @@ #include "archive.h" -#include "sfile.h" +#include "file.h" using namespace Bu; int main() { - SFile f("test.dat", "wb"); + File f("test.dat", "wb"); Archive ar( f, Archive::save ); std::string s("Hello there"); diff --git a/src/unit/file.cpp b/src/unit/file.cpp new file mode 100644 index 0000000..a45b8d7 --- /dev/null +++ b/src/unit/file.cpp @@ -0,0 +1,105 @@ +#include "unitsuite.h" +#include "file.h" +#include "exceptions.h" + +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> + +class Unit : public Bu::UnitSuite +{ +public: + Unit() + { + setName("File"); + addTest( Unit::writeFull ); + addTest( Unit::readBlocks ); + addTest( Unit::readError1 ); + addTest( Unit::readError2 ); + } + + virtual ~Unit() { } + + // + // Tests go here + // + void writeFull() + { + Bu::File sf("testfile1", "wb"); + for( int c = 0; c < 256; c++ ) + { + unsigned char ch = (unsigned char)c; + sf.write( &ch, 1 ); + unitTest( sf.tell() == c+1 ); + } + //unitTest( sf.canRead() == false ); + //unitTest( sf.canWrite() == true ); + //unitTest( sf.canSeek() == true ); + sf.close(); + struct stat sdat; + stat("testfile1", &sdat ); + unitTest( sdat.st_size == 256 ); + } + + void readBlocks() + { + Bu::File sf("testfile1", "rb"); + unsigned char buf[50]; + size_t total = 0; + for(;;) + { + size_t s = sf.read( buf, 50 ); + for( size_t c = 0; c < s; c++ ) + { + unitTest( buf[c] == (unsigned char)(c+total) ); + } + total += s; + if( s < 50 ) + { + unitTest( total == 256 ); + unitTest( sf.isEOS() == true ); + break; + } + } + sf.close(); + } + + void readError1() + { + try + { + Bu::File sf("doesn'texist", "rb"); + unitFailed("No exception thrown"); + } + catch( Bu::FileException &e ) + { + return; + } + } + + void readError2() + { + Bu::File sf("testfile1", "rb"); + char buf[256]; + int r = sf.read( buf, 256 ); + unitTest( r == 256 ); + // You have to read past the end to set the EOS flag. + unitTest( sf.isEOS() == false ); + try + { + sf.read( buf, 5 ); + unitFailed("No exception thrown"); + } + catch( Bu::FileException &e ) + { + sf.close(); + return; + } + } +}; + +int main( int argc, char *argv[] ) +{ + return Unit().run( argc, argv ); +} + diff --git a/src/unit/sfile.cpp b/src/unit/sfile.cpp deleted file mode 100644 index 2aff312..0000000 --- a/src/unit/sfile.cpp +++ /dev/null @@ -1,105 +0,0 @@ -#include "unitsuite.h" -#include "sfile.h" -#include "exceptions.h" - -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> - -class Unit : public Bu::UnitSuite -{ -public: - Unit() - { - setName("SFile"); - addTest( Unit::writeFull ); - addTest( Unit::readBlocks ); - addTest( Unit::readError1 ); - addTest( Unit::readError2 ); - } - - virtual ~Unit() { } - - // - // Tests go here - // - void writeFull() - { - Bu::SFile sf("testfile1", "wb"); - for( int c = 0; c < 256; c++ ) - { - unsigned char ch = (unsigned char)c; - sf.write( &ch, 1 ); - unitTest( sf.tell() == c+1 ); - } - //unitTest( sf.canRead() == false ); - //unitTest( sf.canWrite() == true ); - //unitTest( sf.canSeek() == true ); - sf.close(); - struct stat sdat; - stat("testfile1", &sdat ); - unitTest( sdat.st_size == 256 ); - } - - void readBlocks() - { - Bu::SFile sf("testfile1", "rb"); - unsigned char buf[50]; - size_t total = 0; - for(;;) - { - size_t s = sf.read( buf, 50 ); - for( size_t c = 0; c < s; c++ ) - { - unitTest( buf[c] == (unsigned char)(c+total) ); - } - total += s; - if( s < 50 ) - { - unitTest( total == 256 ); - unitTest( sf.isEOS() == true ); - break; - } - } - sf.close(); - } - - void readError1() - { - try - { - Bu::SFile sf("doesn'texist", "rb"); - unitFailed("No exception thrown"); - } - catch( Bu::FileException &e ) - { - return; - } - } - - void readError2() - { - Bu::SFile sf("testfile1", "rb"); - char buf[256]; - int r = sf.read( buf, 256 ); - unitTest( r == 256 ); - // You have to read past the end to set the EOS flag. - unitTest( sf.isEOS() == false ); - try - { - sf.read( buf, 5 ); - unitFailed("No exception thrown"); - } - catch( Bu::FileException &e ) - { - sf.close(); - return; - } - } -}; - -int main( int argc, char *argv[] ) -{ - return Unit().run( argc, argv ); -} - diff --git a/src/unitsuite.h b/src/unitsuite.h index db249b2..6e9270a 100644 --- a/src/unitsuite.h +++ b/src/unitsuite.h @@ -8,7 +8,42 @@ namespace Bu { /** + * Provides a unit testing framework. This is pretty easy to use, probably + * the best way to get started is to use ch to generate a template, or use + * the code below with appropriate tweaks: + *@code + * #include "unitsuite.h" + * + * class Unit : public Bu::UnitSuite + * { + * public: + * Unit() + * { + * setName("Example"); + * addTest( Unit::test ); + * } + * + * virtual ~Unit() { } + * + * // + * // Tests go here + * // + * void test() + * { + * unitTest( 1 == 1 ); + * } + * }; + * + * int main( int argc, char *argv[] ) + * { + * return Unit().run( argc, argv ); + * } * + @endcode + * The main function can contain other things, but using this one exactly + * makes all of the test suites work exactly the same. Using the optional + * setName at the top of the constructor replaces the class name with the + * chosen name when printing out stats and info. */ class UnitSuite { -- cgit v1.2.3 From 1fa3ca5f24c018126333ca2d6609730e1ae17386 Mon Sep 17 00:00:00 2001 From: Mike Buland <eichlan@xagasoft.com> Date: Tue, 10 Apr 2007 21:48:23 +0000 Subject: Added more comments, help, and socket actually reads and writes some, but it's not done. I need to decide how I want to do the buffering... --- src/archive.h | 47 +++++++++++ src/exceptions.cpp | 1 + src/exceptions.h | 2 + src/socket.cpp | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++++- src/socket.h | 23 +++++- src/stream.h | 10 +++ 6 files changed, 312 insertions(+), 3 deletions(-) diff --git a/src/archive.h b/src/archive.h index 9ac3303..2f782d3 100644 --- a/src/archive.h +++ b/src/archive.h @@ -9,6 +9,53 @@ namespace Bu { + /** + * Provides a framework for serialization of objects and primitives. The + * archive will handle any basic primitive, a few special types, like char * + * strings, as well as STL classes and anything that inherits from the + * Archival class. Each Archive operates on a Stream, so you can send the + * data using an Archive almost anywhere. + * + * In order to use an Archive to store something to a file, try something + * like: + *@code + * File sOut("output", "wb"); // This is a stream subclass + * Archive ar( sOut, Archive::save ); + * ar << myClass; + @endcode + * In this example myClass is any class that inherits from Archival. When + * the storage operator is called, the Archival::archive() function in the + * myClass object is called with a reference to the Archive. This can be + * handled in one of two ways: + *@code + * void MyClass::archive( Archive &ar ) + * { + * ar && sName && nAge && sJob; + * } + @endcode + * Here we don't worry about weather we're loading or saving by using the + * smart && operator. This allows us to write very consistent, very simple + * archive functions that really do a lot of work. If we wanted to do + * something different in the case of loading or saving we would do: + *@code + * void MyClass::archive( Archive &ar ) + * { + * if( ar.isLoading() ) + * { + * ar >> sName >> nAge >> sJob; + * } else + * { + * ar << sName << nAge << sJob; + * } + * } + @endcode + * Archive currently does not provide facility to make fully portable + * archives. For example, it will not convert between endianness for you, + * nor will it take into account differences between primitive sizes on + * different platforms. This, at the moment, is up to the user to ensure. + * One way of dealing with the latter problem is to make sure and use + * explicit primitive types from the stdint.h header, i.e. int32_t. + */ class Archive { private: diff --git a/src/exceptions.cpp b/src/exceptions.cpp index 37f09a4..a512105 100644 --- a/src/exceptions.cpp +++ b/src/exceptions.cpp @@ -7,4 +7,5 @@ namespace Bu subExceptionDef( FileException ) subExceptionDef( ConnectionException ) subExceptionDef( PluginException ) + subExceptionDef( UnsupportedException ) } diff --git a/src/exceptions.h b/src/exceptions.h index b28d292..3efa19f 100644 --- a/src/exceptions.h +++ b/src/exceptions.h @@ -10,6 +10,7 @@ namespace Bu subExceptionDecl( FileException ) subExceptionDecl( ConnectionException ) subExceptionDecl( PluginException ) + subExceptionDecl( UnsupportedException ) enum eFileException { @@ -19,6 +20,7 @@ namespace Bu enum eConnectionException { excodeReadError, + excodeWriteError, excodeBadReadError, excodeConnectionClosed, excodeSocketTimeout diff --git a/src/socket.cpp b/src/socket.cpp index c5c592b..e206bb5 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -1,10 +1,240 @@ +#include <string.h> +#include <stdio.h> +#include <errno.h> +#include <stdlib.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <sys/time.h> +#include <netinet/in.h> +#include <netdb.h> +#include <arpa/inet.h> +#include <errno.h> +#include <fcntl.h> #include "socket.h" +#include "exceptions.h" -Bu::Socket::Socket() +#define RBS (1024*2) + +Bu::Socket::Socket( int nSocket ) : + nSocket( nSocket ), + bActive( true ) { } +Bu::Socket::Socket( const Bu::FString &sAddr, int nPort, int nTimeout ) +{ + struct sockaddr_in xServerName; + bActive = false; + + /* Create the socket. */ + nSocket = socket( PF_INET, SOCK_STREAM, 0 ); + + if( nSocket < 0 ) + { + throw ExceptionBase("Couldn't create socket.\n"); + } + + // These lines set the socket to non-blocking, a good thing? + int flags; + flags = fcntl(nSocket, F_GETFL, 0); + flags |= O_NONBLOCK; + if (fcntl(nSocket, F_SETFL, flags) < 0) + { + throw ExceptionBase("Couldn't set socket options.\n"); + } + + /* Connect to the server. */ + //printf("Resolving hostname (%s)...\n", sAddr ); + { + struct hostent *hostinfo; + + xServerName.sin_family = AF_INET; + xServerName.sin_port = htons( nPort ); + hostinfo = gethostbyname( sAddr.getStr() ); + if (hostinfo == NULL) + { + throw ExceptionBase("Couldn't resolve hostname.\n"); + } + xServerName.sin_addr = *(struct in_addr *) hostinfo->h_addr; + } + + //printf("Making actual connection..."); + //fflush( stdout ); + connect( + nSocket, + (struct sockaddr *)&xServerName, + sizeof(xServerName) + ); + //printf("Connected.\n"); + + bActive = true; + + if( nTimeout > 0 ) + { + fd_set rfds, wfds, efds; + int retval; + + FD_ZERO(&rfds); + FD_SET(nSocket, &rfds); + FD_ZERO(&wfds); + FD_SET(nSocket, &wfds); + FD_ZERO(&efds); + FD_SET(nSocket, &efds); + + struct timeval tv; + tv.tv_sec = nTimeout; + tv.tv_usec = 0; + + retval = select( nSocket+1, &rfds, &wfds, &efds, &tv ); + + if( retval == 0 ) + { + close(); + throw ExceptionBase("Connection timeout.\n"); + } + + } +} + Bu::Socket::~Socket() { } +void Bu::Socket::close() +{ + if( bActive ) + { + fsync( nSocket ); + ::close( nSocket ); + } + bActive = false; + //xInputBuf.clearData(); + //xOutputBuf.clearData(); + //if( pProtocol != NULL ) + //{ + // delete pProtocol; + // pProtocol = NULL; + //} +} + +void Bu::Socket::read() +{ + char buffer[RBS]; + int nbytes; + int nTotalRead=0; + + for(;;) + { + //memset( buffer, 0, RBS ); + + nbytes = ::read( nSocket, buffer, RBS ); + if( nbytes < 0 && errno != 0 && errno != EAGAIN ) + { + //printf("errno: %d, %s\n", errno, strerror( errno ) ); + /* Read error. */ + //perror("readInput"); + throw ConnectionException( + excodeReadError, + "Read error: %s", + strerror( errno ) + ); + } + else + { + if( nbytes <= 0 ) + break; + nTotalRead += nbytes; + sReadBuf.append( buffer, nbytes ); + /* Data read. */ + if( nbytes < RBS ) + { + break; + } + + /* New test, if data is divisible by RBS bytes on some libs the + * read could block, this keeps it from happening. + */ + { + fd_set rfds; + FD_ZERO(&rfds); + FD_SET(nSocket, &rfds); + struct timeval tv = { 0, 0 }; + int retval = select( nSocket+1, &rfds, NULL, NULL, &tv ); + if( retval == -1 ) + throw ConnectionException( + excodeBadReadError, + "Bad Read error" + ); + if( !FD_ISSET( nSocket, &rfds ) ) + break; + } + } + } + + /* + if( pProtocol != NULL && nTotalRead > 0 ) + { + pProtocol->onNewData(); + }*/ +} + +size_t Bu::Socket::read( void *pBuf, size_t nBytes ) +{ + read(); + + + + return sReadBuf.getSize(); +} + +size_t Bu::Socket::write( const void *pBuf, size_t nBytes ) +{ + int nWrote = TEMP_FAILURE_RETRY( ::write( nSocket, pBuf, nBytes ) ); + if( nWrote < 0 ) + { + throw ConnectionException( excodeWriteError, strerror(errno) ); + } + return nWrote; +} + +long Bu::Socket::tell() +{ + throw UnsupportedException(); +} + +void Bu::Socket::seek( long offset ) +{ + throw UnsupportedException(); +} + +void Bu::Socket::setPos( long pos ) +{ + throw UnsupportedException(); +} + +void Bu::Socket::setPosEnd( long pos ) +{ + throw UnsupportedException(); +} + +bool Bu::Socket::isEOS() +{ + return !bActive; +} + +bool Bu::Socket::canRead() +{ + return true; +} + +bool Bu::Socket::canWrite() +{ + return true; +} + +bool Bu::Socket::canSeek() +{ + return false; +} + diff --git a/src/socket.h b/src/socket.h index 8ccde71..3d0125d 100644 --- a/src/socket.h +++ b/src/socket.h @@ -4,6 +4,7 @@ #include <stdint.h> #include "stream.h" +#include "fstring.h" namespace Bu { @@ -13,11 +14,29 @@ namespace Bu class Socket : public Stream { public: - Socket(); + Socket( int nSocket ); + Socket( const FString &sAddr, int nPort, int nTimeout=30 ); virtual ~Socket(); + + virtual void close(); + virtual void read(); + virtual size_t read( void *pBuf, size_t nBytes ); + virtual size_t write( const void *pBuf, size_t nBytes ); - private: + virtual long tell(); + virtual void seek( long offset ); + virtual void setPos( long pos ); + virtual void setPosEnd( long pos ); + virtual bool isEOS(); + + virtual bool canRead(); + virtual bool canWrite(); + virtual bool canSeek(); + private: + int nSocket; + bool bActive; + FString sReadBuf; }; } diff --git a/src/stream.h b/src/stream.h index ae94234..e640959 100644 --- a/src/stream.h +++ b/src/stream.h @@ -6,6 +6,16 @@ namespace Bu { + /** + * The basis for a completely general data transport mechanism. Anything + * that inherits from this should provide at least the basic read and/or + * write functions, and very probably the close function. Any functions + * that aren't supported should throw an exception if called. + * + * The constructor of a child class should pretty much universally be used + * to open the stream. I can't think of anything that should require an + * exception. + */ class Stream { public: -- cgit v1.2.3 From 066282ae6de25cf92780dbdaa2fd70a033e95659 Mon Sep 17 00:00:00 2001 From: Mike Buland <eichlan@xagasoft.com> Date: Fri, 20 Apr 2007 06:17:21 +0000 Subject: Fixed some goo in socket. --- src/socket.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/socket.cpp b/src/socket.cpp index e206bb5..c4f914b 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -181,11 +181,12 @@ void Bu::Socket::read() size_t Bu::Socket::read( void *pBuf, size_t nBytes ) { - read(); - - - - return sReadBuf.getSize(); + int nRead = TEMP_FAILURE_RETRY( ::read( nSocket, pBuf, nBytes ) ); + if( nRead < 0 ) + { + throw ConnectionException( excodeReadError, strerror(errno) ); + } + return nRead; } size_t Bu::Socket::write( const void *pBuf, size_t nBytes ) -- cgit v1.2.3 From 530014a3cce53e86dce8917e98a4e86d02f176aa Mon Sep 17 00:00:00 2001 From: Mike Buland <eichlan@xagasoft.com> Date: Thu, 26 Apr 2007 15:06:49 +0000 Subject: Merged Ito and put it in the BU namespace. I should probably clean up the formatting on the comments, some of the lines wrap, but I'm not too worried about it right now. I also fixed up the doxygen config and build.conf files so that everything is building nice and smooth now. --- Doxyfile | 4 +- build.conf | 26 ++++-- mkincs.sh | 5 ++ src/exceptions.cpp | 1 + src/exceptions.h | 1 + src/ito.cpp | 40 +++++++++ src/ito.h | 98 ++++++++++++++++++++ src/itoatom.h | 56 ++++++++++++ src/itocondition.cpp | 42 +++++++++ src/itocondition.h | 81 +++++++++++++++++ src/itomutex.cpp | 27 ++++++ src/itomutex.h | 61 +++++++++++++ src/itoqueue.h | 231 ++++++++++++++++++++++++++++++++++++++++++++++++ src/main.dox | 14 +++ src/serversocket.cpp | 148 +++++++++++++++++++++++++++++++ src/serversocket.h | 31 +++++++ src/socket.cpp | 16 +--- src/socket.h | 4 +- src/tests/itoqueue1.cpp | 110 +++++++++++++++++++++++ src/tests/itoqueue2.cpp | 83 +++++++++++++++++ 20 files changed, 1059 insertions(+), 20 deletions(-) create mode 100755 mkincs.sh create mode 100644 src/ito.cpp create mode 100644 src/ito.h create mode 100644 src/itoatom.h create mode 100644 src/itocondition.cpp create mode 100644 src/itocondition.h create mode 100644 src/itomutex.cpp create mode 100644 src/itomutex.h create mode 100644 src/itoqueue.h create mode 100644 src/main.dox create mode 100644 src/serversocket.cpp create mode 100644 src/serversocket.h create mode 100644 src/tests/itoqueue1.cpp create mode 100644 src/tests/itoqueue2.cpp diff --git a/Doxyfile b/Doxyfile index 6c7412e..c3168fa 100644 --- a/Doxyfile +++ b/Doxyfile @@ -74,9 +74,9 @@ QUIET = NO WARNINGS = YES WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES -WARN_NO_PARAMDOC = NO +WARN_NO_PARAMDOC = YES WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = +WARN_LOGFILE = Doxywarn #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- diff --git a/build.conf b/build.conf index bc186f9..c289205 100644 --- a/build.conf +++ b/build.conf @@ -1,13 +1,17 @@ # This is a build file for libbu++ -default action: check "libbu++.a" -"clean" action: clean targets() -"tests" action: check targets() filter regexp("^tests/.*$") -"all" action: check targets() -"fstring" action: check "tests/fstring" +default action: check group "lnhdrs", check "libbu++.a" +"tests" action: check group "lnhdrs", check group "tests" +"all" action: check group "lnhdrs", check targets() set "CXXFLAGS" += "-ggdb -Wall" +filesIn("src") filter regexp("^src/(.*)\\.h$", "src/bu/{re:1}.h"): + rule "hln", + group "lnhdrs", + target file, + input "src/{re:1}.h" + "libbu++.a": rule "lib", target file, @@ -17,6 +21,7 @@ set "CXXFLAGS" += "-ggdb -Wall" directoriesIn("src/tests","tests/"): rule "exe", target file, + group "tests", requires "libbu++.a", set "CXXFLAGS" += "-Isrc", set "LDFLAGS" += "-L. -lbu++", @@ -25,14 +30,18 @@ directoriesIn("src/tests","tests/"): filesIn("src/tests") filter regexp("^src/tests/(.*)\\.cpp$", "tests/{re:1}"): rule "exe", target file, + group "tests", requires "libbu++.a", set "CXXFLAGS" += "-Isrc", set "LDFLAGS" += "-L. -lbu++", input "src/{target}.cpp" +["tests/itoqueue1", "tests/itoqueue2"]: set "LDFLAGS" += "-lpthread" + directoriesIn("src/unit","unit/"): rule "exe", target file, + group "tests", requires "libbu++.a", set "CXXFLAGS" += "-Isrc", set "LDFLAGS" += "-L. -lbu++", @@ -41,6 +50,7 @@ directoriesIn("src/unit","unit/"): filesIn("src/unit") filter regexp("^src/unit/(.*)\\.cpp$", "unit/{re:1}"): rule "exe", target file, + group "tests", requires "libbu++.a", set "CXXFLAGS" += "-Isrc", set "LDFLAGS" += "-L. -lbu++", @@ -63,3 +73,9 @@ rule "cpp": produces "{re:1}.o", requires commandToList("g++ -M {CXXFLAGS} {match}", "make"), perform command("g++ {CXXFLAGS} -c -o {target} {match}") + +rule "hln": + matches regexp("src/(.*)\\.h"), + produces "src/bu/{re:1}.h", + perform command("ln -s ../{re:1}.h {target}") + diff --git a/mkincs.sh b/mkincs.sh new file mode 100755 index 0000000..6f72f89 --- /dev/null +++ b/mkincs.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +cd src/bu +rm * +for i in ../*.h; do ln -s $i; done diff --git a/src/exceptions.cpp b/src/exceptions.cpp index a512105..d9f4e70 100644 --- a/src/exceptions.cpp +++ b/src/exceptions.cpp @@ -5,6 +5,7 @@ namespace Bu { subExceptionDef( XmlException ) subExceptionDef( FileException ) + subExceptionDef( SocketException ) subExceptionDef( ConnectionException ) subExceptionDef( PluginException ) subExceptionDef( UnsupportedException ) diff --git a/src/exceptions.h b/src/exceptions.h index 3efa19f..f146b73 100644 --- a/src/exceptions.h +++ b/src/exceptions.h @@ -8,6 +8,7 @@ namespace Bu { subExceptionDecl( XmlException ) subExceptionDecl( FileException ) + subExceptionDecl( SocketException ) subExceptionDecl( ConnectionException ) subExceptionDecl( PluginException ) subExceptionDecl( UnsupportedException ) diff --git a/src/ito.cpp b/src/ito.cpp new file mode 100644 index 0000000..001ca06 --- /dev/null +++ b/src/ito.cpp @@ -0,0 +1,40 @@ +#include "ito.h" + +Bu::Ito::Ito() +{ +} + +Bu::Ito::~Ito() +{ +} + +bool Bu::Ito::start() +{ + nHandle = pthread_create( &ptHandle, NULL, threadRunner, this ); + + return true; +} + +bool Bu::Ito::stop() +{ + pthread_exit( &ptHandle ); + + return true; +} + +void *Bu::Ito::threadRunner( void *pThread ) +{ + return ((Ito *)pThread)->run(); +} + +bool Bu::Ito::join() +{ + pthread_join( ptHandle, NULL ); + return true; +} + +void Bu::Ito::yield() +{ + pthread_yield(); +} + diff --git a/src/ito.h b/src/ito.h new file mode 100644 index 0000000..01253f5 --- /dev/null +++ b/src/ito.h @@ -0,0 +1,98 @@ +#ifndef ITO_H +#define ITO_H + +#include <pthread.h> + +namespace Bu +{ + /** + * Simple thread class. This wraps the basic pthread (posix threads) system in + * an object oriented sort of way. It allows you to create a class with + * standard member variables and callable functions that can be run in it's own + * thread, one per class instance. + *@author Mike Buland + */ + class Ito + { + public: + /** + * Construct an Ito thread. + */ + Ito(); + + /** + * Destroy an Ito thread. + */ + virtual ~Ito(); + + /** + * Begin thread execution. This will call the overridden run function, + * which will simply execute in it's own thread until the function exits, + * the thread is killed, or the thread is cancelled (optionally). The + * thread started in this manner has access to all of it's class variables, + * but be sure to protect possible multiple-access with ItoMutex objects. + *@returns True if starting the thread was successful. False if something + * went wrong and the thread has not started. + */ + bool start(); + + /** + * Forcibly kill a thread. This is not generally considered a good thing to + * do, but in those rare cases you need it, it's invaluable. The problem + * with stopping (or killing) a thread is that it stops it the moment you + * call stop, no matter what it's doing. The object oriented approach to + * this will help clean up any class variables that were used, but anything + * not managed as a member variable will probably create a memory leak type + * of situation. Instead of stop, consider using cancel, which can be + * handled by the running thread in a graceful manner. + *@returns True if the thread was stopped, false otherwise. When this + * function returns the thread may not have stopped, to ensure that the + * thread has really stopped, call join. + */ + bool stop(); + + /** + * The workhorse of the Ito class. This is the function that will run in + * the thread, when this function exits the thread dies and is cleaned up + * by the system. Make sure to read up on ItoMutex, ItoCondition, and + * cancel to see how to control and protect everything you do in a safe way + * within this function. + *@returns I'm not sure right now, but this is the posix standard form. + */ + virtual void *run()=0; + + /** + * Join the thread in action. This function performs what is commonly + * called a thread join. That is that it effectively makes the calling + * thread an the Ito thread contained in the called object one in the same, + * and pauses the calling thread until the called thread exits. That is, + * when called from, say, your main(), mythread.join() will not return until + * the thread mythread has exited. This is very handy at the end of + * programs to ensure all of your data was cleaned up. + *@returns True if the thread was joined, false if the thread couldn't be + * joined, usually because it isn't running to begin with. + */ + bool join(); + + private: + pthread_t ptHandle; /**< Internal handle to the posix thread. */ + int nHandle; /**< Numeric handle to the posix thread. */ + + protected: + /** + * This is the hidden-heard of the thread system. While run is what the + * user gets to override, and everything said about it is true, this is + * the function that actually makes up the thread, it simply calls the + * run member function in an OO-friendly way. This is what allows us to + * use member variables from within the thread itself. + *@param Should always be this. + *@returns This is specified by posix, I'm not sure yet. + */ + static void *threadRunner( void *pThread ); + + void yield(); + + }; +} + +#endif diff --git a/src/itoatom.h b/src/itoatom.h new file mode 100644 index 0000000..96090f2 --- /dev/null +++ b/src/itoatom.h @@ -0,0 +1,56 @@ +#ifndef ITO_QUEUE_H +#define ITO_QUEUE_H + +#include <pthread.h> + +#include "itomutex.h" +#include "itocondition.h" + +/** + * A thread-safe wrapper class. + *@author Mike Buland + */ +template <class T> +class ItoAtom +{ +public: + /** + * Construct an empty queue. + */ + ItoAtom() + { + } + + ItoAtom( const T &src ) : + data( src ) + { + } + + ~ItoQueue() + { + } + + T get() + { + mOperate.lock(); + mOperate.unlock(); + return data; + } + + void set( const T &val ) + { + mOperate.lock(); + data = val; + cBlock.signal(); + mOperate.unlock(); + } + +private: + Item *pStart; /**< The start of the queue, the next element to dequeue. */ + Item *pEnd; /**< The end of the queue, the last element to dequeue. */ + + ItoMutex mOperate; /**< The master mutex, used on all operations. */ + ItoCondition cBlock; /**< The condition for blocking dequeues. */ +}; + +#endif diff --git a/src/itocondition.cpp b/src/itocondition.cpp new file mode 100644 index 0000000..d8f5375 --- /dev/null +++ b/src/itocondition.cpp @@ -0,0 +1,42 @@ +#include <sys/time.h> + +#include "itocondition.h" + +Bu::ItoCondition::ItoCondition() +{ + pthread_cond_init( &cond, NULL ); +} + +Bu::ItoCondition::~ItoCondition() +{ + pthread_cond_destroy( &cond ); +} + +int Bu::ItoCondition::wait() +{ + return pthread_cond_wait( &cond, &mutex ); +} + +int Bu::ItoCondition::wait( int nSec, int nUSec ) +{ + struct timeval now; + struct timespec timeout; + struct timezone tz; + + gettimeofday( &now, &tz ); + timeout.tv_sec = now.tv_sec + nSec + ((now.tv_usec + nUSec)/1000000); + timeout.tv_nsec = ((now.tv_usec + nUSec)%1000000)*1000; + + return pthread_cond_timedwait( &cond, &mutex, &timeout ); +} + +int Bu::ItoCondition::signal() +{ + return pthread_cond_signal( &cond ); +} + +int Bu::ItoCondition::broadcast() +{ + return pthread_cond_broadcast( &cond ); +} + diff --git a/src/itocondition.h b/src/itocondition.h new file mode 100644 index 0000000..4771b22 --- /dev/null +++ b/src/itocondition.h @@ -0,0 +1,81 @@ +#ifndef ITO_CONDITION_H +#define ITO_CONDITION_H + +#include <pthread.h> + +#include "itomutex.h" + +namespace Bu +{ + /** + * Ito condition. This is a fairly simple condition mechanism. As you may + * notice this class inherits from the ItoMutex class, this is because all + * conditions must be within a locked block. The standard usage of a condition + * is to pause one thread, perhaps indefinately, until another thread signals + * that it is alright to procede. + * <br> + * Standard usage for the thread that wants to wait is as follows: + * <pre> + * ItoCondition cond; + * ... // Perform setup and enter your run loop + * cond.lock(); + * while( !isFinished() ) // Could be anything you're waiting for + * cond.wait(); + * ... // Take care of what you have to. + * cond.unlock(); + * </pre> + * The usage for the triggering thread is much simpler, when it needs to tell + * the others that it's time to grab some data it calls either signal or + * broadcast. See both of those functions for the difference. + *@author Mike Buland + */ + class ItoCondition : public ItoMutex + { + public: + /** + * Create a condition. + */ + ItoCondition(); + + /** + * Destroy a condition. + */ + ~ItoCondition(); + + /** + * Wait forever, or until signalled. This has to be called from within a + * locked section, i.e. before calling this this object's lock function + * should be called. + */ + int wait(); + + /** + * Wait for a maximum of nSec seconds and nUSec micro-seconds or until + * signalled. This is a little more friendly function if you want to + * perform other operations in the thrad loop that calls this function. + * Like the other wait function, this must be inside a locked section. + *@param nSec The seconds to wait. + *@param nUSec the micro-seconds to wait. + */ + int wait( int nSec, int nUSec ); + + /** + * Notify the next thread waiting on this condition that they can go ahead. + * This only signals one thread, the next one in the condition queue, that + * it is safe to procede with whatever operation was being waited on. + */ + int signal(); + + /** + * Notify all threads waiting on this condition that they can go ahead now. + * This function is slower than signal, but more effective in certain + * situations where you may not know how many threads should be activated. + */ + int broadcast(); + + private: + pthread_cond_t cond; /**< Internal condition reference. */ + }; +} + +#endif diff --git a/src/itomutex.cpp b/src/itomutex.cpp new file mode 100644 index 0000000..dc51af9 --- /dev/null +++ b/src/itomutex.cpp @@ -0,0 +1,27 @@ +#include "itomutex.h" + +Bu::ItoMutex::ItoMutex() +{ + pthread_mutex_init( &mutex, NULL ); +} + +Bu::ItoMutex::~ItoMutex() +{ + pthread_mutex_destroy( &mutex ); +} + +int Bu::ItoMutex::lock() +{ + return pthread_mutex_lock( &mutex ); +} + +int Bu::ItoMutex::unlock() +{ + return pthread_mutex_unlock( &mutex ); +} + +int Bu::ItoMutex::trylock() +{ + return pthread_mutex_trylock( &mutex ); +} + diff --git a/src/itomutex.h b/src/itomutex.h new file mode 100644 index 0000000..80956b8 --- /dev/null +++ b/src/itomutex.h @@ -0,0 +1,61 @@ +#ifndef ITO_MUTEX_H +#define ITO_MUTEX_H + +#include <pthread.h> + +namespace Bu +{ + /** + * Simple mutex wrapper. Currently this doesn't do anything extra for you + * except keep all of the functionality together in an OO sorta' way and keep + * you from having to worry about cleaning up your mutexes properly, or initing + * them. + *@author Mike Buland + */ + class ItoMutex + { + public: + /** + * Create an unlocked mutex. + */ + ItoMutex(); + + /** + * Destroy a mutex. This can only be done when a mutex is unlocked. + * Failure to unlock before destroying a mutex object could cause it to + * wait for the mutex to unlock, the odds of which are usually farily low + * at deconstruction time. + */ + ~ItoMutex(); + + /** + * Lock the mutex. This causes all future calls to lock on this instance + * of mutex to block until the first thread that called mutex unlocks it. + * At that point the next thread that called lock will get a chance to go + * to work. Because of the nature of a mutex lock it is a very bad idea to + * do any kind of serious or rather time consuming computation within a + * locked section. This can cause thread-deadlock and your program may + * hang. + */ + int lock(); + + /** + * Unlock the mutex. This allows the next thread that asked for a lock to + * lock the mutex and continue with execution. + */ + int unlock(); + + /** + * Try to lock the mutex. This is the option to go with if you cannot avoid + * putting lengthy operations within a locked section. trylock will attempt + * to lock the mutex, if the mutex is already locked this function returns + * immediately with an error code. + */ + int trylock(); + + protected: + pthread_mutex_t mutex; /**< The internal mutex reference. */ + }; +} + +#endif diff --git a/src/itoqueue.h b/src/itoqueue.h new file mode 100644 index 0000000..322698d --- /dev/null +++ b/src/itoqueue.h @@ -0,0 +1,231 @@ +#ifndef ITO_QUEUE_H +#define ITO_QUEUE_H + +#include <pthread.h> + +#include "itomutex.h" +#include "itocondition.h" + +namespace Bu +{ + /** + * A thread-safe queue class. This class is a very simple queue with some cool + * extra functionality for use with the Ito system. The main extra that it + * provides is the option to either dequeue without blocking, with infinite + * blocking, or with timed blocking, which will return a value if something is + * enqueued within the specified time limit, or NULL if the time limit is + * exceded. + *@author Mike Buland + */ + template <class T> + class ItoQueue + { + private: + /** + * Helper struct. Keeps track of linked-list items for the queue data. + */ + typedef struct Item + { + T pData; + Item *pNext; + } Item; + + public: + /** + * Construct an empty queue. + */ + ItoQueue() : + pStart( NULL ), + pEnd( NULL ), + nSize( 0 ) + { + } + + /** + * Destroy the queue. This function will simply free all contained + * structures. If you stored pointers in the queue, this will lose the + * pointers without cleaning up the memory they pointed to. Make sure + * you're queue is empty before allowing it to be destroyed! + */ + ~ItoQueue() + { + Item *pCur = pStart; + while( pCur ) + { + Item *pTmp = pCur->pNext; + delete pCur; + pCur = pTmp; + } + } + + /** + * Enqueue a pieces of data. The new data will go at the end of the queue, + * and unless another piece of data is enqueued, will be the last piece of + * data to be dequeued. + *@param pData The data to enqueue. If this is not a primitive data type + * it's probably best to use a pointer type. + */ + void enqueue( T pData ) + { + mOperate.lock(); + + if( pStart == NULL ) + { + pStart = pEnd = new Item; + pStart->pData = pData; + pStart->pNext = NULL; + nSize++; + } + else + { + pEnd->pNext = new Item; + pEnd = pEnd->pNext; + pEnd->pData = pData; + pEnd->pNext = NULL; + nSize++; + } + + cBlock.signal(); + + mOperate.unlock(); + } + + /** + * Dequeue the first item from the queue. This function can operate in two + * different modes, blocking and non-blocking. In non-blocking mode it will + * return immediately weather there was data in the queue or not. If there + * was data it will remove it from the queue and return it to the caller. + * In blocking mode it will block forever wating for data to be enqueued. + * When data finally is enqueued this function will return immediately with + * the new data. The only way this function should ever return a null in + * blocking mode is if the calling thread was cancelled. It's probably a + * good idea to check for NULL return values even if you use blocking, just + * to be on the safe side. + *@param bBlock Set to true to enable blocking, leave as false to work in + * non-blocking mode. + *@returns The next piece of data in the queue, or NULL if no data was in + * the queue. + */ + T dequeue( bool bBlock=false ) + { + mOperate.lock(); + if( pStart == NULL ) + { + mOperate.unlock(); + + if( bBlock ) + { + cBlock.lock(); + + while( pStart == NULL ) + cBlock.wait(); + + T tmp = dequeue( false ); + + cBlock.unlock(); + return tmp; + + } + + return NULL; + } + else + { + T pTmp = pStart->pData; + Item *pDel = pStart; + pStart = pStart->pNext; + delete pDel; + nSize--; + + mOperate.unlock(); + return pTmp; + } + } + + /** + * Operates just like the other dequeue function in blocking mode with one + * twist. This function will block for at most nSec seconds and nUSec + * micro-seconds. If the timer is up and no data is available, this will + * just return NULL. If data is enqueued before the timeout expires, it + * will dequeue and exit immediately. + *@param nSec The number of seconds to wait, max. + *@param nUSec The number of micro-seconds to wait, max. + *@returns The next piece of data in the queue, or NULL if the timeout was + * exceeded. + */ + T dequeue( int nSec, int nUSec ) + { + mOperate.lock(); + if( pStart == NULL ) + { + mOperate.unlock(); + + cBlock.lock(); + + cBlock.wait( nSec, nUSec ); + + if( pStart == NULL ) + { + cBlock.unlock(); + return NULL; + } + + mOperate.lock(); + T pTmp = pStart->pData; + Item *pDel = pStart; + pStart = pStart->pNext; + delete pDel; + nSize--; + mOperate.unlock(); + + cBlock.unlock(); + return pTmp; + } + else + { + T pTmp = pStart->pData; + Item *pDel = pStart; + pStart = pStart->pNext; + delete pDel; + nSize--; + + mOperate.unlock(); + return pTmp; + } + } + + /** + * Checks to see if the queue has data in it or not. Note that there is no + * function to determine the length of the queue. This data isn't kept + * track of. If you really need to know, fix this. + *@returns True if the queue is empty, false if it has data in it. + */ + bool isEmpty() + { + mOperate.lock(); + bool bEmpty = (pStart == NULL ); + mOperate.unlock(); + + return bEmpty; + } + + long getSize() + { + mOperate.lock(); + long nRet = nSize; + mOperate.unlock(); + + return nRet; + } + + private: + Item *pStart; /**< The start of the queue, the next element to dequeue. */ + Item *pEnd; /**< The end of the queue, the last element to dequeue. */ + long nSize; /**< The number of items in the queue. */ + + ItoMutex mOperate; /**< The master mutex, used on all operations. */ + ItoCondition cBlock; /**< The condition for blocking dequeues. */ + }; +} + +#endif diff --git a/src/main.dox b/src/main.dox new file mode 100644 index 0000000..668d2e3 --- /dev/null +++ b/src/main.dox @@ -0,0 +1,14 @@ +/** + *@mainpage libbu++ utility library + * + *@section secIntro Introduction + * + * Libbu++ is a C++ library of general utility classes and functions. They + * cover a wide range of topics from streams and sockets to data structures to + * data serialization and xml handling to threading. + * + */ + +/** + *@namespace Bu The core libbu++ namespace, to ensure things don't get muddied. + */ diff --git a/src/serversocket.cpp b/src/serversocket.cpp new file mode 100644 index 0000000..c53c80d --- /dev/null +++ b/src/serversocket.cpp @@ -0,0 +1,148 @@ +#include <time.h> +#include <string.h> +#include <stdio.h> +#include <errno.h> +#include <stdlib.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <termios.h> +#include <netinet/in.h> +#include <netdb.h> +#include <arpa/inet.h> +#include <fcntl.h> +#include "serversocket.h" +#include "exceptions.h" + +Bu::ServerSocket::ServerSocket( int nPort, int nPoolSize ) : + nPort( nPort ) +{ + /* Create the socket and set it up to accept connections. */ + struct sockaddr_in name; + + /* Give the socket a name. */ + name.sin_family = AF_INET; + name.sin_port = htons( nPort ); + + // I think this specifies who we will accept connections from, + // a good thing to make configurable later on + name.sin_addr.s_addr = htonl( INADDR_ANY ); + + startServer( name, nPoolSize ); +} + +Bu::ServerSocket::ServerSocket(const FString &sAddr,int nPort, int nPoolSize) : + nPort( nPort ) +{ + /* Create the socket and set it up to accept connections. */ + struct sockaddr_in name; + + /* Give the socket a name. */ + name.sin_family = AF_INET; + name.sin_port = htons( nPort ); + + inet_aton( sAddr.getStr(), &name.sin_addr ); + + startServer( name, nPoolSize ); +} + +Bu::ServerSocket::~ServerSocket() +{ +} + +void Bu::ServerSocket::startServer( struct sockaddr_in &name, int nPoolSize ) +{ + /* Create the socket. */ + nServer = socket( PF_INET, SOCK_STREAM, 0 ); + if( nServer < 0 ) + { + throw Bu::SocketException("Couldn't create a listen socket."); + } + + int opt = 1; + setsockopt( + nServer, + SOL_SOCKET, + SO_REUSEADDR, + (char *)&opt, + sizeof( opt ) + ); + + if( bind( nServer, (struct sockaddr *) &name, sizeof(name) ) < 0 ) + { + throw Bu::SocketException("Couldn't bind to the listen socket."); + } + + if( listen( nServer, nPoolSize ) < 0 ) + { + throw Bu::SocketException( + "Couldn't begin listening to the server socket." + ); + } + + FD_ZERO( &fdActive ); + /* Initialize the set of active sockets. */ + FD_SET( nServer, &fdActive ); +} + +int Bu::ServerSocket::accept( int nTimeoutSec, int nTimeoutUSec ) +{ + fd_set fdRead = fdActive; + + struct timeval xT; + + xT.tv_sec = nTimeoutSec; + xT.tv_usec = nTimeoutUSec; + + if( TEMP_FAILURE_RETRY(select( nServer+1, &fdRead, NULL, NULL, &xT )) < 0 ) + { + throw SocketException( + "Error scanning for new connections: %s", strerror( errno ) + ); + } + + if( FD_ISSET( nServer, &fdRead ) ) + { + struct sockaddr_in clientname; + size_t size; + int nClient; + + size = sizeof( clientname ); +#ifdef __CYGWIN__ + nClient = ::accept( nServer, (struct sockaddr *)&clientname, + (int *)&size + ); +#else + nClient = ::accept( nServer, (struct sockaddr *)&clientname, &size ); +#endif + if( nClient < 0 ) + { + throw SocketException( + "Error accepting a new connection: %s", strerror( errno ) + ); + } + char tmpa[20]; + inet_ntop( AF_INET, (void *)&clientname.sin_addr, tmpa, 20 ); + //"New connection from host %s, port %hd.", + // tmpa, ntohs (clientname.sin_port) ); + + { + int flags; + + flags = fcntl( nClient, F_GETFL, 0 ); + flags |= O_NONBLOCK; + if( fcntl( nClient, F_SETFL, flags ) < 0) + { + throw SocketException( + "Error setting option on client socket: %s", + strerror( errno ) + ); + } + } + + return nClient; + } + + return -1; +} + diff --git a/src/serversocket.h b/src/serversocket.h new file mode 100644 index 0000000..9a26e2d --- /dev/null +++ b/src/serversocket.h @@ -0,0 +1,31 @@ +#ifndef SERVER_SOCKET_H +#define SERVER_SOCKET_H + +#include <stdint.h> +#include "fstring.h" +#include "socket.h" + +namespace Bu +{ + /** + * + */ + class ServerSocket + { + public: + ServerSocket( int nPort, int nPoolSize=40 ); + ServerSocket( const FString &sAddr, int nPort, int nPoolSize=40 ); + virtual ~ServerSocket(); + + int accept( int nTimeoutSec, int nTimeoutUSec ); + + private: + void startServer( struct sockaddr_in &name, int nPoolSize ); + + fd_set fdActive; + int nServer; + int nPort; + }; +} + +#endif diff --git a/src/socket.cpp b/src/socket.cpp index c4f914b..455b5c8 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -118,6 +118,7 @@ void Bu::Socket::close() //} } +/* void Bu::Socket::read() { char buffer[RBS]; @@ -132,7 +133,6 @@ void Bu::Socket::read() if( nbytes < 0 && errno != 0 && errno != EAGAIN ) { //printf("errno: %d, %s\n", errno, strerror( errno ) ); - /* Read error. */ //perror("readInput"); throw ConnectionException( excodeReadError, @@ -146,15 +146,13 @@ void Bu::Socket::read() break; nTotalRead += nbytes; sReadBuf.append( buffer, nbytes ); - /* Data read. */ if( nbytes < RBS ) { break; } - /* New test, if data is divisible by RBS bytes on some libs the - * read could block, this keeps it from happening. - */ + // New test, if data is divisible by RBS bytes on some libs the + // read could block, this keeps it from happening. { fd_set rfds; FD_ZERO(&rfds); @@ -171,13 +169,7 @@ void Bu::Socket::read() } } } - - /* - if( pProtocol != NULL && nTotalRead > 0 ) - { - pProtocol->onNewData(); - }*/ -} +}*/ size_t Bu::Socket::read( void *pBuf, size_t nBytes ) { diff --git a/src/socket.h b/src/socket.h index 3d0125d..568cad6 100644 --- a/src/socket.h +++ b/src/socket.h @@ -19,7 +19,7 @@ namespace Bu virtual ~Socket(); virtual void close(); - virtual void read(); + //virtual void read(); virtual size_t read( void *pBuf, size_t nBytes ); virtual size_t write( const void *pBuf, size_t nBytes ); @@ -33,6 +33,8 @@ namespace Bu virtual bool canWrite(); virtual bool canSeek(); + + private: int nSocket; bool bActive; diff --git a/src/tests/itoqueue1.cpp b/src/tests/itoqueue1.cpp new file mode 100644 index 0000000..f73f4d3 --- /dev/null +++ b/src/tests/itoqueue1.cpp @@ -0,0 +1,110 @@ +#include <string> +#include "bu/ito.h" +#include "bu/itoqueue.h" + +class Reader : public Bu::Ito +{ +public: + Reader( Bu::ItoQueue<std::string *> &q, int id ) : + q( q ), + id( id ) + { + } + + void *run() + { + for( int i = 0; i < 10; i++ ) + { + std::string *pStr = q.dequeue( true ); + if( pStr == NULL ) + { + printf("Null received...\n"); + } + else + { + printf("[%d] read: %s\n", id, pStr->c_str() ); + delete pStr; + } + usleep( (int)(((double)rand())/((double)RAND_MAX)*2000000.0) ); + } + + return NULL; + } + +private: + Bu::ItoQueue<std::string *> &q; + int id; +}; + +class Writer : public Bu::Ito +{ +public: + Writer( Bu::ItoQueue<std::string *> &q, int id, const char *strbase ) : + q( q ), + strbase( strbase ), + id( id ) + { + } + + void *run() + { + for( int i = 0; i < 11; i++ ) + { + usleep( (int)(((double)rand())/((double)RAND_MAX)*2000000.0) ); + q.enqueue( new std::string( strbase ) ); + printf("[%d] write: %s\n", id, strbase ); + } + + return NULL; + } + +private: + Bu::ItoQueue<std::string *> &q; + const char *strbase; + int id; +}; + +int main() +{ + Writer *wr[5]; + Reader *rd[5]; + const char bob[][7]={ + {"Test 1"}, + {"Test 2"}, + {"Test 3"}, + {"Test 4"}, + {"Test 5"} + }; + + Bu::ItoQueue<std::string *> q; + + for( int j = 0; j < 5; j++ ) + { + wr[j] = new Writer( q, j, bob[j] ); + rd[j] = new Reader( q, j ); + } + + for( int j = 0; j < 5; j++ ) + { + rd[j]->start(); + } + + for( int j = 0; j < 5; j++ ) + { + wr[j]->start(); + } + + for( int j = 0; j < 5; j++ ) + { + rd[j]->join(); + } + + for( int j = 0; j < 5; j++ ) + { + delete wr[j]; + delete rd[j]; + } + + return 0; +} + diff --git a/src/tests/itoqueue2.cpp b/src/tests/itoqueue2.cpp new file mode 100644 index 0000000..f4b5e19 --- /dev/null +++ b/src/tests/itoqueue2.cpp @@ -0,0 +1,83 @@ +#include <string> +#include "bu/ito.h" +#include "bu/itoqueue.h" +#include <errno.h> + +class Reader : public Bu::Ito +{ +public: + Reader( Bu::ItoQueue<std::string *> &q, int id ) : + q( q ), + id( id ) + { + } + + void *run() + { + for( int i = 0; i < 10; i++ ) + { + std::string *pStr = q.dequeue( 0, 500000 ); + if( pStr == NULL ) + { + printf("Null received...\n"); + i--; + } + else + { + printf("[%d] read: %s\n", id, pStr->c_str() ); + delete pStr; + } + } + + return NULL; + } + +private: + Bu::ItoQueue<std::string *> &q; + int id; +}; + +class Writer : public Bu::Ito +{ +public: + Writer( Bu::ItoQueue<std::string *> &q, int id, const char *strbase ) : + q( q ), + strbase( strbase ), + id( id ) + { + } + + void *run() + { + for( int i = 0; i < 11; i++ ) + { + sleep( 2 ); + printf("[%d] write: %s\n", id, strbase ); + q.enqueue( new std::string( strbase ) ); + } + + return NULL; + } + +private: + Bu::ItoQueue<std::string *> &q; + const char *strbase; + int id; +}; + +int main() +{ + printf("ETIMEDOUT: %d\n", ETIMEDOUT ); + Bu::ItoQueue<std::string *> q; + Writer wr( q, 0, "writer" ); + Reader rd( q, 0 ); + + rd.start(); + wr.start(); + + rd.join(); + wr.join(); + + return 0; +} + -- cgit v1.2.3 From 0f0be6146dc711f8d44db0348e8fe0d010a31ca7 Mon Sep 17 00:00:00 2001 From: Mike Buland <eichlan@xagasoft.com> Date: Mon, 7 May 2007 22:26:06 +0000 Subject: Added some more helpers to FString, now contemplating a cast operator to a const pointer version of the raw data. --- src/fstring.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/fstring.h b/src/fstring.h index 751beb8..877e5a7 100644 --- a/src/fstring.h +++ b/src/fstring.h @@ -245,6 +245,18 @@ namespace Bu return (*this); } + void set( const chr *pData ) + { + clear(); + append( pData ); + } + + void set( const chr *pData, long nSize ) + { + clear(); + append( pData, nSize ); + } + MyType &operator =( const MyType &rSrc ) { //if( rSrc.isFlat() ) -- cgit v1.2.3 From c17c4ebbab022de80a9f893115f2fd41e6a07c44 Mon Sep 17 00:00:00 2001 From: Mike Buland <eichlan@xagasoft.com> Date: Tue, 8 May 2007 06:31:33 +0000 Subject: Added the TAF format structures and XML format structures, I'm making up TAF (textual archive format), but named it wrong, this seemed easier than redoing it all. --- misc/w3c-xml-1.1.html | 1598 +++++++++++++++++++++++++++++++++++++++++++++++++ src/tests/xml.cpp | 15 + src/tsfdocument.cpp | 9 + src/tsfdocument.h | 22 + src/tsfnode.cpp | 9 + src/tsfnode.h | 21 + src/tsfreader.cpp | 9 + src/tsfreader.h | 22 + src/tsfwriter.cpp | 9 + src/tsfwriter.h | 22 + src/xmldocument.cpp | 9 + src/xmldocument.h | 22 + src/xmlnode.cpp | 9 + src/xmlnode.h | 22 + src/xmlreader.cpp | 108 ++++ src/xmlreader.h | 70 +++ src/xmlwriter.cpp | 9 + src/xmlwriter.h | 22 + 18 files changed, 2007 insertions(+) create mode 100644 misc/w3c-xml-1.1.html create mode 100644 src/tests/xml.cpp create mode 100644 src/tsfdocument.cpp create mode 100644 src/tsfdocument.h create mode 100644 src/tsfnode.cpp create mode 100644 src/tsfnode.h create mode 100644 src/tsfreader.cpp create mode 100644 src/tsfreader.h create mode 100644 src/tsfwriter.cpp create mode 100644 src/tsfwriter.h create mode 100644 src/xmldocument.cpp create mode 100644 src/xmldocument.h create mode 100644 src/xmlnode.cpp create mode 100644 src/xmlnode.h create mode 100644 src/xmlreader.cpp create mode 100644 src/xmlreader.h create mode 100644 src/xmlwriter.cpp create mode 100644 src/xmlwriter.h diff --git a/misc/w3c-xml-1.1.html b/misc/w3c-xml-1.1.html new file mode 100644 index 0000000..6a9211a --- /dev/null +++ b/misc/w3c-xml-1.1.html @@ -0,0 +1,1598 @@ +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="EN" xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8" /><title>Extensible Markup Language (XML) 1.1

W3C

+

Extensible Markup Language (XML) 1.1

+

W3C Recommendation 04 + February 2004, edited in place 15 April 2004

This version:
http://www.w3.org/TR/2004/REC-xml11-20040204/
Latest version:
http://www.w3.org/TR/xml11
Previous version:
http://www.w3.org/TR/2003/PR-xml11-20031105/
Editors:
Tim Bray, Textuality and Netscape <tbray@textuality.com>
Jean Paoli, Microsoft <jeanpa@microsoft.com>
C. M. Sperberg-McQueen, W3C <cmsmcq@w3.org>
Eve Maler, Sun Microsystems, Inc. <eve.maler@east.sun.com>
François Yergeau <fyergeau@alis.com>
John Cowan <cowan@ccil.org>

Please refer to the errata for this document, which may include some normative corrections.

This document is also available in these non-normative formats: XML and XHTML with color-coded revision indicators.

See also translations.

Copyright © 2004 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C liability, trademark, document use and software licensing rules apply.

Status of this Document

This section describes the status of this document at the time of its publication. Other documents may supersede this document. A list of current W3C publications and the latest revision of this technical report can be found in the W3C technical reports index at http://www.w3.org/TR/.

This document is a Recommendation of the W3C. +It has been reviewed by W3C Members and other interested parties, and has +been endorsed by the Director as a W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from another document. W3C's role in making the +Recommendation is to draw attention to the specification and to promote its widespread deployment. +This enhances the functionality and interoperability of the Web.

This document specifies a syntax created by subsetting an existing, widely +used international text processing standard (Standard Generalized Markup Language, +ISO 8879:1986(E) as amended and corrected) for use on the World Wide Web. +It is a product of the W3C XML + Activity.

+ +

On 15 April 2004, this document was edited in place to add two +missing spaces to production +[1] in section 2.1

+ +

The English version of this specification is the only normative version. However, +for translations of this document, see http://www.w3.org/2003/03/Translations/byTechnology?technology=xml11. +

Documentation of intellectual property possibly relevant to this recommendation +may be found at the Working Group's public +IPR disclosure page.

An implementation report for XML 1.1 is available at http://www.w3.org/XML/2002/09/xml11-implementation.html.

Please report errors in this document to xml-editor@w3.org; archives are available. The errata list for this edition is available +at http://www.w3.org/XML/xml-V11-1e-errata.

A Test Suite is maintained to help assessing conformance to this specification.

Table of Contents

1 Introduction
    1.1 Origin and Goals
    1.2 Terminology
    1.3 Rationale and list of changes for XML 1.1
2 Documents
    2.1 Well-Formed XML Documents
    2.2 Characters
    2.3 Common Syntactic Constructs
    2.4 Character Data and Markup
    2.5 Comments
    2.6 Processing Instructions
    2.7 CDATA Sections
    2.8 Prolog and Document Type Declaration
    2.9 Standalone Document Declaration
    2.10 White Space Handling
    2.11 End-of-Line Handling
    2.12 Language Identification
    2.13 Normalization Checking
3 Logical Structures
    3.1 Start-Tags, End-Tags, and Empty-Element Tags
    3.2 Element Type Declarations
        3.2.1 Element Content
        3.2.2 Mixed Content
    3.3 Attribute-List Declarations
        3.3.1 Attribute Types
        3.3.2 Attribute Defaults
        3.3.3 Attribute-Value Normalization
    3.4 Conditional Sections
4 Physical Structures
    4.1 Character and Entity References
    4.2 Entity Declarations
        4.2.1 Internal Entities
        4.2.2 External Entities
    4.3 Parsed Entities
        4.3.1 The Text Declaration
        4.3.2 Well-Formed Parsed Entities
        4.3.3 Character Encoding in Entities
        4.3.4 Version Information in Entities
    4.4 XML Processor Treatment of Entities and References
        4.4.1 Not Recognized
        4.4.2 Included
        4.4.3 Included If Validating
        4.4.4 Forbidden
        4.4.5 Included in Literal
        4.4.6 Notify
        4.4.7 Bypassed
        4.4.8 Included as PE
        4.4.9 Error
    4.5 Construction of Entity Replacement Text
    4.6 Predefined Entities
    4.7 Notation Declarations
    4.8 Document Entity
5 Conformance
    5.1 Validating and Non-Validating Processors
    5.2 Using XML Processors
6 Notation

Appendices

A References
    A.1 Normative References
    A.2 Other References
B Definitions for Character Normalization
C Expansion of Entity and Character References (Non-Normative)
D Deterministic Content Models (Non-Normative)
E Autodetection of Character Encodings (Non-Normative)
    E.1 Detection Without External Encoding Information
    E.2 Priorities in the Presence of External Encoding Information
F W3C XML Working Group (Non-Normative)
G W3C XML Core Working Group (Non-Normative)
H Production Notes (Non-Normative)
I Suggestions for XML Names (Non-Normative)

1 Introduction

Extensible Markup Language, abbreviated XML, describes a class of data +objects called XML documents and partially +describes the behavior of computer programs which process them. XML is an +application profile or restricted form of SGML, the Standard Generalized Markup +Language [ISO 8879]. By construction, XML documents are conforming +SGML documents.

XML documents are made up of storage units called entities, +which contain either parsed or unparsed data. Parsed data is made up of characters, some of which form character +data, and some of which form markup. +Markup encodes a description of the document's storage layout and logical +structure. XML provides a mechanism to impose constraints on the storage layout +and logical structure.

[Definition: A software module called +an XML processor is used to read XML documents and provide access +to their content and structure.] [Definition: It +is assumed that an XML processor is doing its work on behalf of another module, +called the application.] This specification describes +the required behavior of an XML processor in terms of how it must read XML +data and the information it must provide to the application.

1.1 Origin and Goals

XML was developed by an XML Working Group (originally known as the SGML +Editorial Review Board) formed under the auspices of the World Wide Web Consortium +(W3C) in 1996. It was chaired by Jon Bosak of Sun Microsystems with the active +participation of an XML Special Interest Group (previously known as the SGML +Working Group) also organized by the W3C. The membership of the XML Working +Group is given in an appendix. Dan Connolly served as the Working Group's contact with +the W3C.

The design goals for XML are:

  1. XML shall be straightforwardly usable over the Internet.

  2. XML shall support a wide variety of applications.

  3. XML shall be compatible with SGML.

  4. It shall be easy to write programs which process XML documents.

  5. The number of optional features in XML is to be kept to the absolute +minimum, ideally zero.

  6. XML documents should be human-legible and reasonably clear.

  7. The XML design should be prepared quickly.

  8. The design of XML shall be formal and concise.

  9. XML documents shall be easy to create.

  10. Terseness in XML markup is of minimal importance.

This specification, together with associated standards (Unicode +[Unicode] and ISO/IEC 10646 [ISO/IEC 10646] +for characters, Internet RFC 3066 [IETF RFC 3066] for +language identification tags, ISO 639 [ISO 639] +for language name codes, and ISO 3166 [ISO 3166] for +country name codes), provides all the information necessary to +understand XML Version 1.1 and construct computer +programs to process it.

This version of the XML specification may be distributed freely, as long as +all text and legal notices remain intact.

1.2 Terminology

The terminology used to describe XML documents is defined in the body of +this specification. The key words MUST, MUST NOT, REQUIRED, SHALL, SHALL NOT, SHOULD, SHOULD NOT, RECOMMENDED, MAY, and OPTIONAL, when EMPHASIZED, are to be interpreted as described in [IETF RFC 2119]. In addition, the terms defined in the following list are used in building +those definitions and in describing the actions of an XML processor:

error

[Definition: A violation of the rules of this specification; +results are undefined. Unless otherwise specified, failure to observe a prescription of this specification indicated by one of the keywords MUST, REQUIRED, MUST NOT, SHALL and SHALL NOT is an error. Conforming software MAY detect and report an error +and MAY recover from it.]

fatal error

[Definition: An error which a conforming XML processor MUST detect and report to the application. +After encountering a fatal error, the processor MAY continue processing the +data to search for further errors and MAY report such errors to the application. +In order to support correction of errors, the processor MAY make unprocessed +data from the document (with intermingled character data and markup) available +to the application. Once a fatal error is detected, however, the processor +MUST NOT continue normal processing (i.e., it MUST NOT continue to pass character +data and information about the document's logical structure to the application +in the normal way).]

at user option

[Definition: Conforming software +MAY or MUST (depending on the modal verb in the sentence) behave as described; +if it does, it MUST provide users a means to enable or disable the behavior +described.]

validity constraint

[Definition: A rule which applies to +all valid XML documents. Violations of validity +constraints are errors; they MUST, at user option, be reported by validating XML processors.]

well-formedness constraint

[Definition: A rule which applies +to all well-formed XML documents. Violations +of well-formedness constraints are fatal errors.]

match

[Definition: (Of strings or names:) Two strings +or names being compared MUST be identical. Characters with multiple possible +representations in Unicode (e.g. characters with both precomposed and +base+diacritic forms) match only if they have the same representation in both +strings. No +case folding is performed. (Of strings and rules in the grammar:) A string +matches a grammatical production if it belongs to the language generated by +that production. (Of content and content models:) An element matches its declaration +when it conforms in the fashion described in the constraint [VC: Element Valid].]

for compatibility

[Definition: Marks +a sentence describing a feature of XML included solely to ensure +that XML remains compatible with SGML.]

for interoperability

[Definition: Marks +a sentence describing a non-binding recommendation included to increase +the chances that XML documents can be processed by the existing installed +base of SGML processors which predate the WebSGML Adaptations Annex to ISO 8879.]

1.3 Rationale and list of changes for XML 1.1

The W3C's XML 1.0 Recommendation was first issued in 1998, and +despite the issuance of many errata culminating in a Third Edition +of 2004, has remained (by intention) unchanged with respect to what +is well-formed XML and what is not. This stability has been +extremely useful for interoperability. However, the Unicode +Standard on which XML 1.0 relies for character specifications has +not remained static, evolving from version 2.0 to version 4.0 and +beyond. Characters not present in Unicode 2.0 may already be used +in XML 1.0 character data. However, they are not allowed in XML +names such as element type names, attribute names, enumerated +attribute values, processing instruction targets, and so on. In +addition, some characters that should have been permitted in XML +names were not, due to oversights and inconsistencies in Unicode +2.0.

The overall philosophy of names has changed since XML 1.0. +Whereas XML 1.0 provided a rigid definition of names, wherein +everything that was not permitted was forbidden, XML 1.1 names are +designed so that everything that is not forbidden (for a specific +reason) is permitted. Since Unicode will continue to grow past +version 4.0, further changes to XML can be avoided by allowing +almost any character, including those not yet assigned, in +names.

In addition, XML 1.0 attempts to adapt to the line-end +conventions of various modern operating systems, but discriminates +against the conventions used on IBM and IBM-compatible mainframes. +As a result, XML documents on mainframes are not plain text files +according to the local conventions. XML 1.0 documents generated on +mainframes must either violate the local line-end conventions, or +employ otherwise unnecessary translation phases before parsing and +after generation. Allowing straightforward interoperability is +particularly important when data stores are shared between +mainframe and non-mainframe systems (as opposed to being copied +from one to the other). Therefore XML 1.1 adds NEL (#x85) to the +list of line-end characters. For completeness, the Unicode line +separator character, #x2028, is also supported. +

Finally, there is considerable demand to define a standard representation +of arbitrary Unicode characters in XML documents. Therefore, XML 1.1 +allows the use of character references to the control characters #x1 through +#x1F, most of which are forbidden in XML 1.0. For reasons of robustness, +however, these characters still cannot be used directly in documents. In +order to improve the robustness of character encoding detection, the additional +control characters #x7F through #x9F, which were freely allowed in XML 1.0 +documents, now must also appear only as character references. (Whitespace +characters are of course exempt.) The minor sacrifice of backward compatibility +is considered not significant. Due to potential problems with APIs, +#x0 is still forbidden both directly and as a character reference. +

Finally, XML 1.1 defines a set of constraints called "full +normalization" on XML documents, which document creators +SHOULD adhere to, and document processors +SHOULD verify. Using fully normalized documents +ensures that identity comparisons of names, attribute values, and +character content can be made correctly by simple binary comparison of +Unicode strings.

A new XML version, rather than a set of errata to XML 1.0, is +being created because the changes affect the definition of +well-formed documents. XML 1.0 processors must continue to reject +documents that contain new characters in XML names, new line-end +conventions, and references to control characters. The distinction between XML 1.0 and XML 1.1 documents +is indicated by the version number information in the XML +declaration at the start of each document. +

2 Documents

[Definition: A data object is an XML +document if it is well-formed, +as defined in this specification. A well-formed XML document MAY in addition +be valid if it meets certain further constraints.]

Each XML document has both a logical and a physical structure. Physically, +the document is composed of units called entities. +An entity MAY refer to other entities to +cause their inclusion in the document. A document begins in a "root" +or document entity. Logically, the document +is composed of declarations, elements, comments, character references, and +processing instructions, all of which are indicated in the document by explicit +markup. The logical and physical structures MUST nest properly, as described +in 4.3.2 Well-Formed Parsed Entities.

2.1 Well-Formed XML Documents

[Definition: A textual object is a well-formed +XML document if:]

  1. Taken as a whole, it matches the production labeled document.

  2. It meets all the well-formedness constraints given in this specification.

  3. Each of the parsed entities +which is referenced directly or indirectly within the document is well-formed.

Document
[1]   document   ::=   prolog element Misc* - Char* RestrictedChar Char*

Matching the document production implies that:

  1. It contains one or more elements.

  2. [Definition: There is exactly one element, +called the root, or document element, no part of which appears +in the content of any other element.] For +all other elements, if the start-tag is in +the content of another element, the end-tag +is in the content of the same element. More simply stated, the elements, +delimited by start- and end-tags, nest properly within each other.

[Definition: As a consequence of this, +for each non-root element C in the document, there is one other element P +in the document such that C is in the content of P, but +is not in the content of any other element that is in the content of P. P +is referred to as the parent of C, and C as +a child of P.]

2.2 Characters

[Definition: A parsed entity contains text, +a sequence of characters, which may +represent markup or character data.] [Definition: A character +is an atomic unit of text as specified by ISO/IEC 10646 [ISO/IEC 10646]. Legal characters are tab, carriage +return, line feed, and the legal characters +of Unicode and ISO/IEC 10646. The +versions of these standards cited in A.1 Normative References were +current at the time this document was prepared. New characters may be added +to these standards by amendments or new editions. Consequently, XML processors +MUST accept any character in the range specified for Char.]

Character Range
[2]   Char   ::=   [#x1-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]/* any Unicode character, excluding the surrogate blocks, FFFE, and FFFF. */
[2a]   RestrictedChar   ::=   [#x1-#x8] | [#xB-#xC] | [#xE-#x1F] | [#x7F-#x84] | [#x86-#x9F]

The mechanism for encoding character code points into bit patterns MAY +vary from entity to entity. All XML processors MUST accept the UTF-8 and UTF-16 +encodings of Unicode +[Unicode]; +the mechanisms for signaling which of the two is in use, +or for bringing other encodings into play, are discussed later, in 4.3.3 Character Encoding in Entities.

Note:

Document authors are encouraged to avoid +"compatibility characters", as defined +in Unicode [Unicode]. +The characters defined in the following ranges are also +discouraged. They are either control characters or permanently undefined Unicode +characters:

+[#x7F-#x84], [#x86-#x9F], [#xFDD0-#xFDDF],
+[#1FFFE-#x1FFFF], [#2FFFE-#x2FFFF], [#3FFFE-#x3FFFF],
+[#4FFFE-#x4FFFF], [#5FFFE-#x5FFFF], [#6FFFE-#x6FFFF],
+[#7FFFE-#x7FFFF], [#8FFFE-#x8FFFF], [#9FFFE-#x9FFFF],
+[#AFFFE-#xAFFFF], [#BFFFE-#xBFFFF], [#CFFFE-#xCFFFF],
+[#DFFFE-#xDFFFF], [#EFFFE-#xEFFFF], [#FFFFE-#xFFFFF],
+[#10FFFE-#x10FFFF].

2.3 Common Syntactic Constructs

This section defines some symbols used widely in the grammar.

S (white space) consists of one or more space (#x20) +characters, carriage returns, line feeds, or tabs.

White Space
[3]   S   ::=   (#x20 | #x9 | #xD | #xA)+

Note:

The presence of #xD in the above production is +maintained purely for backward compatibility with the +First Edition. +As explained in 2.11 End-of-Line Handling, +all #xD characters literally present in an XML document +are either removed or replaced by #xA characters before +any other processing is done. The only way to get a #xD character to match this production is to +use a character reference in an entity value literal.

[Definition: A Name is a token beginning +with a letter or one of a few punctuation characters, and continuing with +letters, digits, hyphens, underscores, colons, or full stops, together known +as name characters.] Names beginning with the string "xml", +or with any string which would match (('X'|'x') ('M'|'m') ('L'|'l')), +are reserved for standardization in this or future versions of this specification.

Note:

The +Namespaces in XML Recommendation [XML Names] assigns a meaning +to names containing colon characters. Therefore, authors should not use the +colon in XML names except for namespace purposes, but XML processors must +accept the colon as a name character.

An Nmtoken (name token) is any mixture of name +characters.

The first character of a Name MUST be a NameStartChar, and any +other characters MUST be NameChars; this mechanism is used to +prevent names from beginning with European (ASCII) digits or with +basic combining characters. Almost all characters are permitted in +names, except those which either are or reasonably could be used as +delimiters. The intention is to be inclusive rather than exclusive, +so that writing systems not yet encoded in Unicode can be used in +XML names. See I Suggestions for XML Names for suggestions on the creation of +names.

Document authors are encouraged to use names which are +meaningful words or combinations of words in natural languages, and +to avoid symbolic or white space characters in names. Note that +COLON, HYPHEN-MINUS, FULL STOP (period), LOW LINE (underscore), and +MIDDLE DOT are explicitly permitted.

The ASCII symbols and punctuation marks, along with a fairly +large group of Unicode symbol characters, are excluded from names +because they are more useful as delimiters in contexts where XML +names are used outside XML documents; providing this group gives +those contexts hard guarantees about what cannot be part of +an XML name. The character #x037E, GREEK QUESTION MARK, is excluded +because when normalized it becomes a semicolon, which could change +the meaning of entity references.

Names and Tokens
[4]   NameStartChar   ::=   ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] | [#x370-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF]
[4a]   NameChar   ::=   NameStartChar | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040]
[5]   Name   ::=   NameStartChar (NameChar)*
[6]   Names   ::=   Name (#x20 Name)*
[7]   Nmtoken   ::=   (NameChar)+
[8]   Nmtokens   ::=   Nmtoken (#x20 Nmtoken)*

Note:

The Names +and Nmtokens productions are used to define the validity +of tokenized attribute values after normalization (see 3.3.1 Attribute Types).

Literal data is any quoted string not containing the quotation mark used +as a delimiter for that string. Literals are used for specifying the content +of internal entities (EntityValue), the values +of attributes (AttValue), and external identifiers +(SystemLiteral). Note that a SystemLiteral +can be parsed without scanning for markup.

Literals
[9]   EntityValue   ::=   '"' ([^%&"] | PEReference +| Reference)* '"'
|  "'" ([^%&'] | PEReference | Reference)* "'"
[10]   AttValue   ::=   '"' ([^<&"] | Reference)* +'"'
|  "'" ([^<&'] | Reference)* +"'"
[11]   SystemLiteral   ::=   ('"' [^"]* '"') | ("'" [^']* "'")
[12]   PubidLiteral   ::=   '"' PubidChar* '"' +| "'" (PubidChar - "'")* "'"
[13]   PubidChar   ::=   #x20 | #xD | #xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%]

Note:

Although +the EntityValue production allows the definition +of a general entity consisting of a single explicit < in the literal +(e.g., <!ENTITY mylt "<">), it is strongly advised to avoid +this practice since any reference to that entity will cause a well-formedness +error.

2.4 Character Data and Markup

Text consists of intermingled character data and markup. [Definition: Markup takes the form of start-tags, end-tags, empty-element tags, entity references, character +references, comments, CDATA section delimiters, document +type declarations, processing instructions, XML declarations, text declarations, +and any white space that is at the top level of the document entity (that +is, outside the document element and not inside any other markup).]

[Definition: All text that is not markup +constitutes the character data of the document.]

The ampersand character (&) and the left angle bracket (<) MUST NOT appear +in their literal form, except when used as markup delimiters, or +within a comment, a processing +instruction, or a CDATA section. + +If they are needed elsewhere, they MUST be escaped +using either numeric character references +or the strings "&amp;" and "&lt;" +respectively. The right angle bracket (>) MAY be represented using the string "&gt;", +and MUST, for compatibility, be escaped +using either "&gt;" or a character reference when it +appears in the string "]]>" in content, when +that string is not marking the end of a CDATA +section.

In the content of elements, character data is any string of characters +which does not contain the start-delimiter of any markup or the +CDATA-section-close delimiter, +"]]>". +In a CDATA section, +character data is any string of characters not including the CDATA-section-close +delimiter.

To allow attribute values to contain both single and double quotes, the +apostrophe or single-quote character (') MAY be represented as "&apos;", +and the double-quote character (") as "&quot;".

Character Data
[14]   CharData   ::=   [^<&]* - ([^<&]* ']]>' [^<&]*)

2.5 Comments

[Definition: Comments MAY appear +anywhere in a document outside other markup; +in addition, they MAY appear within the document type declaration at places +allowed by the grammar. They are not part of the document's character +data; an XML processor MAY, but need not, make it possible for an +application to retrieve the text of comments. For +compatibility, the string "--" (double-hyphen) +MUST NOT occur within comments.] Parameter +entity references MUST NOT be recognized within comments.

Comments
[15]   Comment   ::=   '<!--' ((Char - '-') | ('-' +(Char - '-')))* '-->'

An example of a comment:

<!-- declarations for <head> & <body> -->

Note +that the grammar does not allow a comment ending in --->. The +following example is not well-formed.

<!-- B+, B, or B--->

2.6 Processing Instructions

[Definition: Processing instructions +(PIs) allow documents to contain instructions for applications.]

Processing Instructions
[16]   PI   ::=   '<?' PITarget (S +(Char* - (Char* '?>' Char*)))? '?>'
[17]   PITarget   ::=   Name - (('X' | 'x') ('M' | +'m') ('L' | 'l'))

PIs are not part of the document's character +data, but MUST be passed through to the application. The PI begins +with a target (PITarget) used to identify the application +to which the instruction is directed. The target names "XML", "xml", +and so on are reserved for standardization in this or future versions of this +specification. The XML Notation mechanism +MAY be used for formal declaration of PI targets. Parameter +entity references MUST NOT be recognized within processing instructions.

2.7 CDATA Sections

[Definition: CDATA sections MAY occur anywhere character data may occur; they are used to escape blocks +of text containing characters which would otherwise be recognized as markup. +CDATA sections begin with the string "<![CDATA[" +and end with the string "]]>":]

CDATA Sections
[18]   CDSect   ::=   CDStart CData CDEnd
[19]   CDStart   ::=   '<![CDATA['
[20]   CData   ::=   (Char* - (Char* +']]>' Char*))
[21]   CDEnd   ::=   ']]>'

Within a CDATA section, only the CDEnd string is +recognized as markup, so that left angle brackets and ampersands may occur +in their literal form; they need not (and cannot) be escaped using "&lt;" +and "&amp;". CDATA sections cannot nest.

An example of a CDATA section, in which "<greeting>" +and "</greeting>" are recognized as character data, not markup:

<![CDATA[<greeting>Hello, world!</greeting>]]>

2.8 Prolog and Document Type Declaration

[Definition: XML 1.1 documents MUST +begin with an XML declaration which specifies the version of +XML being used.] For example, the following is a complete XML 1.1 document, well-formed but not valid:

<?xml version="1.1"?>
+<greeting>Hello, world!</greeting>

but the following is an XML 1.0 document because it +does not have an XML declaration:

<greeting>Hello, world!</greeting>

The function of the markup in an XML document is to describe its storage and +logical structure and to associate attribute +name-value pairs with its logical structures. XML provides a mechanism, the +document +type declaration, to define constraints on the logical structure +and to support the use of predefined storage units. [Definition: An XML document is valid if it has an associated +document type declaration and if the document complies with the constraints +expressed in it.]

The document type declaration MUST appear before the first element +in the document.

Prolog
[22]   prolog   ::=   XMLDecl Misc* +(doctypedecl Misc*)?
[23]   XMLDecl   ::=   '<?xml' VersionInfo EncodingDecl? SDDecl? S?'?>'
[24]   VersionInfo   ::=   S 'version' Eq +("'" VersionNum "'" | '"' VersionNum +'"')
[25]   Eq   ::=   S? '=' S?
[26]   VersionNum   ::=   '1.1'
[27]   Misc   ::=   Comment | PI +| S

[Definition: The XML document +type declaration contains or points to markup +declarations that provide a grammar for a class of documents. This +grammar is known as a document type definition, or DTD. The document +type declaration can point to an external subset (a special kind of external entity) containing markup declarations, +or can contain the markup declarations directly in an internal subset, or +can do both. The DTD for a document consists of both subsets taken together.]

[Definition: A markup declaration +is an element type declaration, an attribute-list declaration, an entity +declaration, or a notation declaration.] +These declarations MAY be contained in whole or in part within parameter +entities, as described in the well-formedness and validity constraints +below. For further +information, see 4 Physical Structures.

Document Type Definition
[28]   doctypedecl   ::=   '<!DOCTYPE' S Name +(S ExternalID)? S? +('[' intSubset ']' S?)? '>'[VC: Root Element Type]
[WFC: External Subset]
[28a]   DeclSep   ::=   PEReference | S[WFC: PE Between Declarations]
[28b]   intSubset   ::=   (markupdecl | DeclSep)*
[29]   markupdecl   ::=   elementdecl | AttlistDecl | EntityDecl +| NotationDecl | PI | Comment[VC: Proper Declaration/PE Nesting]
[WFC: PEs in Internal Subset]

Note +that it is possible to construct a well-formed document containing a doctypedecl +that neither points to an external subset nor contains an internal subset.

The markup declarations MAY be made up in whole or in part of the replacement text of parameter +entities. The productions later in this specification for individual +nonterminals (elementdecl, AttlistDecl, +and so on) describe the declarations after all the parameter +entities have been included.

Parameter +entity references are recognized anywhere in the DTD (internal and external +subsets and external parameter entities), except in literals, processing instructions, +comments, and the contents of ignored conditional sections (see 3.4 Conditional Sections). +They are also recognized in entity value literals. The use of parameter entities +in the internal subset is restricted as described below.

Validity constraint: Root Element Type

The Name +in the document type declaration MUST match the element type of the root element.

Validity constraint: Proper Declaration/PE Nesting

Parameter-entity replacement text MUST be properly nested with markup declarations. That is to say, if either +the first character or the last character of a markup declaration (markupdecl +above) is contained in the replacement text for a parameter-entity +reference, both MUST be contained in the same replacement text.

Well-formedness constraint: PEs in Internal Subset

In +the internal DTD subset, parameter-entity references MUST NOT occur within markup declarations; they MAY occur where markup declarations can occur. +(This does not apply to references that occur in external parameter entities +or to the external subset.)

Well-formedness constraint: External Subset

The external subset, if any, MUST match the production for extSubset.

Well-formedness constraint: PE Between Declarations

The replacement text of a parameter entity reference +in a DeclSep MUST match the production extSubsetDecl.

Like the internal subset, the external subset and any external parameter +entities referenced +in a DeclSep MUST consist of a series of +complete markup declarations of the types allowed by the non-terminal symbol markupdecl, interspersed with white space or parameter-entity references. However, portions of +the contents of the external subset or of these +external parameter entities MAY conditionally be ignored by using the conditional section construct; this is not +allowed in the internal subset but is +allowed in external parameter entities referenced in the internal subset.

External Subset
[30]   extSubset   ::=   TextDecl? extSubsetDecl
[31]   extSubsetDecl   ::=   ( markupdecl | conditionalSect | DeclSep)*

The external subset and external parameter entities also differ from the +internal subset in that in them, parameter-entity +references are permitted within markup declarations, +not only between markup declarations.

An example of an XML document with a document type declaration:

<?xml version="1.1"?>
+<!DOCTYPE greeting SYSTEM "hello.dtd">
+<greeting>Hello, world!</greeting>

The system identifier "hello.dtd" +gives the address (a URI reference) of a DTD for the document.

The declarations can also be given locally, as in this example:

<?xml version="1.1" encoding="UTF-8" ?>
+<!DOCTYPE greeting [
+<!ELEMENT greeting (#PCDATA)>
+]>
+<greeting>Hello, world!</greeting>

If both the external and internal subsets are used, the internal subset +MUST be considered to occur before the external subset. +This has the effect that entity and attribute-list declarations in the internal +subset take precedence over those in the external subset.

XML 1.1 processors SHOULD accept XML 1.0 +documents as well. If a document is well-formed or valid XML 1.0, and provided it +does not contain any control characters +in the range [#x7F-#x9F] other than as character escapes, it may be +made well-formed or valid XML 1.1 respectively simply by changing the +version number.

2.9 Standalone Document Declaration

Markup declarations can affect the content of the document, as passed from +an XML processor to an application; examples +are attribute defaults and entity declarations. The standalone document declaration, +which MAY appear as a component of the XML declaration, signals whether or +not there are such declarations which appear external to the document +entity +or in parameter entities. [Definition: An external +markup declaration is defined as a markup declaration occurring in +the external subset or in a parameter entity (external or internal, the latter +being included because non-validating processors are not required to read +them).]

Standalone Document Declaration
[32]   SDDecl   ::=   #x20+ 'standalone' Eq +(("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"')) [VC: Standalone Document Declaration]

In a standalone document declaration, the value "yes" indicates +that there are no external markup declarations which +affect the information passed from the XML processor to the application. The +value "no" indicates that there are or may be such external +markup declarations. Note that the standalone document declaration only denotes +the presence of external declarations; the presence, in a document, +of references to external entities, when those entities are internally +declared, does not change its standalone status.

If there are no external markup declarations, the standalone document declaration +has no meaning. If there are external markup declarations but there is no +standalone document declaration, the value "no" is assumed.

Any XML document for which standalone="no" holds can be converted +algorithmically to a standalone document, which may be desirable for some +network delivery applications.

Validity constraint: Standalone Document Declaration

The +standalone document declaration MUST have the value "no" if +any external markup declarations contain declarations of:

  • attributes with default values, +if elements to which these attributes apply appear in the document without +specifications of values for these attributes, or

  • entities (other than amp, +lt, +gt, +apos, +quot), if references +to those entities appear in the document, or

  • attributes with +tokenized types, where the +attribute appears in the document with a value such that +normalization +will produce a different value from that which would be produced +in the absence of the declaration, or

  • element types with element content, +if white space occurs directly within any instance of those types.

An example XML declaration with a standalone document declaration:

<?xml version="1.1" standalone='yes'?>

2.10 White Space Handling

In editing XML documents, it is often convenient to use "white space" +(spaces, tabs, and blank lines) +to set apart the markup for greater readability. Such white space is typically +not intended for inclusion in the delivered version of the document. On the +other hand, "significant" white space that should be preserved +in the delivered version is common, for example in poetry and source code.

An XML processor MUST always pass +all characters in a document that are not markup through to the application. +A validating XML processor MUST also +inform the application which of these characters constitute white space appearing +in element content.

A special attribute named xml:space MAY be attached to an element to signal an intention that in that element, +white space should be preserved by applications. In valid documents, this +attribute, like any other, MUST be declared +if it is used. When declared, it MUST be given as an enumerated +type whose values +are one or both of "default" and "preserve". +For example:

<!ATTLIST poem  xml:space (default|preserve) 'preserve'>
+<!ATTLIST pre xml:space (preserve) #FIXED 'preserve'>

The value "default" signals that applications' default white-space +processing modes are acceptable for this element; the value "preserve" +indicates the intent that applications preserve all the white space. This +declared intent is considered to apply to all elements within the content +of the element where it is specified, unless overridden with +another instance of the xml:space attribute. This specification does not give meaning to any value of xml:space other than "default" and "preserve". It is an error for other values to be specified; the XML processor MAY report the error or MAY recover by ignoring the attribute specification or by reporting the (erroneous) value to the application. Applications may ignore or reject erroneous values.

The root element of any document is considered +to have signaled no intentions as regards application space handling, unless +it provides a value for this attribute or the attribute is declared with a +default value.

2.11 End-of-Line Handling

XML parsed entities are often stored +in computer files which, for editing convenience, are organized into lines. +These lines are typically separated by some combination of the characters +CARRIAGE RETURN (#xD) and LINE FEED (#xA).

To +simplify the tasks of applications, the +XML +processor MUST behave as if it normalized all line breaks in external parsed +entities (including the document entity) on input, before parsing, by translating + +all of the following to a single #xA character:

  1. the two-character sequence #xD #xA

  2. the two-character sequence #xD #x85

  3. the single character #x85

  4. the single character #x2028

  5. any #xD character that is not immediately followed by #xA or #x85.

The characters #x85 and #x2028 cannot be reliably recognized and +translated until an entity's encoding declaration (if present) has +been read. Therefore, it is a fatal error to use them within the XML +declaration or text declaration. +

2.12 Language Identification

In document processing, it is often useful to identify the natural or formal +language in which the content is written. A special attribute +named xml:lang MAY be inserted in documents to specify the language +used in the contents and attribute values of any element in an XML document. +In valid documents, this attribute, like any other, MUST be declared +if it is used. The +values of the attribute are language identifiers as defined by [IETF RFC 3066], Tags +for the Identification of Languages, or its successor; in addition, the empty string MAY be specified.

(Productions 33 through 38 have been removed.)

For example:

<p xml:lang="en">The quick brown fox jumps over the lazy dog.</p>
+<p xml:lang="en-GB">What colour is it?</p>
+<p xml:lang="en-US">What color is it?</p>
+<sp who="Faust" desc='leise' xml:lang="de">
+<l>Habe nun, ach! Philosophie,</l>
+<l>Juristerei, und Medizin</l>
+<l>und leider auch Theologie</l>
+<l>durchaus studiert mit hei&#xDF;em Bem&#xFC;h'n.</l>
+</sp>

The intent declared with xml:lang is considered to apply to +all attributes and content of the element where it is specified, unless overridden +with an instance of xml:lang on another element within that content. In particular, the empty value of xml:lang is used on an element B to override a specification of xml:lang on an enclosing element A, without specifying another language. Within B, it is considered that there is no language information available, just as if xml:lang had not been specified on B or any of its ancestors.

Note:

Language information may also be provided by external transport protocols (e.g. HTTP or +MIME). When available, this information may be used by XML applications, but the more local +information provided by xml:lang should be considered to override it. +

A simple declaration for xml:lang might take the form

xml:lang CDATA #IMPLIED

but specific default values MAY also be given, if appropriate. In a collection +of French poems for English students, with glosses and notes in English, the xml:lang +attribute might be declared this way:

<!ATTLIST poem   xml:lang CDATA 'fr'>
+<!ATTLIST gloss  xml:lang CDATA 'en'>
+<!ATTLIST note   xml:lang CDATA 'en'>

2.13 Normalization Checking

All XML parsed +entities (including document +entities) SHOULD be fully +normalized as per the definition of +B Definitions for Character Normalization supplemented by the following definitions of +relevant constructs for XML:

  1. The +replacement text of all parsed +entities

  2. All text matching, in context, one of the following +productions:

    1. +CData

    2. +CharData

    3. +content

    4. Name

    5. +Nmtoken

However, a document is still well-formed even if it is not +fully normalized. +XML processors SHOULD provide a user option to verify that the document being +processed is in fully normalized form, and report to the application whether +it is or not. The option to not verify SHOULD be chosen only when the +input text is certified, +as defined by B Definitions for Character Normalization.

The verification of full normalization MUST be carried out as if by +first verifying that the entity is in include-normalized +form as defined by B Definitions for Character Normalization and by then verifying that none of the relevant +constructs listed above begins (after character references are +expanded) with a composing character as defined by +B Definitions for Character Normalization. +Non-validating processors MUST ignore possible +denormalizations that would be caused by inclusion of external +entities that they do not read.

Note:

The composing character are all +Unicode characters of non-zero combining class, plus a small number +of class-zero characters that nevertheless take part as a +non-initial character in certain Unicode canonical +decompositions. Since these characters are meant to follow +base characters, restricting relevant constructs (including +content) from beginning with a composing character does not +meaningfully diminish the expressiveness of XML.

If, while verifying full normalization, a processor encounters +characters for which it cannot determine the normalization +properties (i.e., characters introduced in a version of Unicode [Unicode] +later than the one used in the implementation of the processor), +then the processor MAY, at user option, ignore any possible +denormalizations caused by these characters. The option to ignore +those denormalizations SHOULD NOT be chosen by applications when +reliability or security are critical.

XML processors MUST NOT transform the input to be in +fully normalized form. +XML applications that create XML 1.1 output +from either XML 1.1 or XML 1.0 input SHOULD ensure that the output +is fully normalized; it is not necessary for internal processing +forms to be fully normalized.

The purpose of this section is to strongly encourage XML +processors to ensure that the creators of XML documents have +properly normalized them, so that XML applications can make tests +such as identity comparisons of strings without having to worry +about the different possible "spellings" of strings which +Unicode allows. +

When entities are in a non-Unicode encoding, if the processor +transcodes them to Unicode, it SHOULD use a normalizing transcoder. +

3 Logical Structures

[Definition: Each XML +document contains one or more elements, the boundaries +of which are either delimited by start-tags +and end-tags, or, for empty +elements, by an empty-element tag. Each +element has a type, identified by name, sometimes called its "generic +identifier" (GI), and MAY have a set of attribute specifications.] +Each attribute specification has a name +and a value.

Element
[39]   element   ::=   EmptyElemTag
| STag content ETag[WFC: Element Type Match]
[VC: Element Valid]

This specification does not constrain the semantics, use, or (beyond syntax) +names of the element types and attributes, except that names beginning with +a match to (('X'|'x')('M'|'m')('L'|'l')) are reserved for standardization +in this or future versions of this specification.

Well-formedness constraint: Element Type Match

The Name +in an element's end-tag MUST match the element type in the start-tag.

Validity constraint: Element Valid

An element is valid +if there is a declaration matching elementdecl +where the Name matches the element type, and one of +the following holds:

  1. The declaration matches EMPTY and the element has no content (not even entity +references, comments, PIs or white space).

  2. The declaration matches children and the +sequence of child elements belongs +to the language generated by the regular expression in the content model, +with optional white space, comments and +PIs (i.e. markup matching production [27] Misc) between the +start-tag and the first child element, between child elements, or between +the last child element and the end-tag. Note that a CDATA section containing +only white space or a reference +to an entity whose replacement text is character references expanding to white +space do not +match the nonterminal S, and +hence cannot appear in these positions; however, a +reference to an internal entity with a literal value consisting of character +references expanding to white space does match S, since its +replacement text is the white space resulting from expansion of the character +references.

  3. The declaration matches Mixed and the content +(after replacing +any entity references with their replacement text) consists of +character data, +comments, PIs and child elements whose types match names in the +content model.

  4. The declaration matches ANY, and the +content +(after replacing +any entity references with their replacement text) +consists of character data and child elements +whose types +have been declared.

3.1 Start-Tags, End-Tags, and Empty-Element Tags

[Definition: The beginning of every non-empty +XML element is marked by a start-tag.]

Start-tag
[40]   STag   ::=   '<' Name (S Attribute)* S? '>'[WFC: Unique Att Spec]
[41]   Attribute   ::=   Name Eq AttValue[VC: Attribute Value Type]
[WFC: No External Entity References]
[WFC: No < in Attribute Values]

The Name in the start- and end-tags gives the element's type. [Definition: The Name-AttValue +pairs are referred to as the attribute specifications of the +element], [Definition: with the Name in each pair referred to as the attribute name] +and [Definition: the content of the AttValue (the text between the ' or " +delimiters) as the attribute value.] Note +that the order of attribute specifications in a start-tag or empty-element +tag is not significant.

Well-formedness constraint: Unique Att Spec

An attribute name +MUST NOT appear more than once in the same start-tag or empty-element tag.

Validity constraint: Attribute Value Type

The attribute MUST +have been declared; the value MUST be of the type declared for it. (For attribute +types, see 3.3 Attribute-List Declarations.)

Well-formedness constraint: No External Entity References

Attribute +values MUST NOT contain direct or indirect entity references to external entities.

Well-formedness constraint: No < in Attribute Values

The replacement text of any entity +referred to directly or indirectly in an attribute value MUST NOT contain a <.

An example of a start-tag:

<termdef id="dt-dog" term="dog">

[Definition: The end of every element that begins +with a start-tag MUST be marked by an end-tag containing a name +that echoes the element's type as given in the start-tag:]

End-tag
[42]   ETag   ::=   '</' Name S? +'>'

An example of an end-tag:

</termdef>

[Definition: The text +between the start-tag and end-tag is called the element's content:]

Content of Elements
[43]   content   ::=   CharData? ((element +| Reference | CDSect +| PI | Comment) CharData?)*

[Definition: An element +with no content is said to be empty.] The representation +of an empty element is either a start-tag immediately followed by an end-tag, +or an empty-element tag. [Definition: An empty-element +tag takes a special form:]

Tags for Empty Elements
[44]   EmptyElemTag   ::=   '<' Name (S Attribute)* S? '/>'[WFC: Unique Att Spec]

Empty-element tags MAY be used for any element which has no content, whether +or not it is declared using the keyword EMPTY. For +interoperability, the empty-element tag SHOULD +be used, and SHOULD only be used, for elements which are declared +EMPTY.

Examples of empty elements:

<IMG align="left"
+src="http://www.w3.org/Icons/WWW/w3c_home" />
+<br></br>
+<br/>

3.2 Element Type Declarations

The element structure of an XML document MAY, for validation +purposes, be constrained using element type and attribute-list declarations. +An element type declaration constrains the element's content.

Element type declarations often constrain which element types can appear +as children of the element. At user +option, an XML processor MAY issue a warning when a declaration mentions an +element type for which no declaration is provided, but this is not an error.

[Definition: An element +type declaration takes the form:]

Element Type Declaration
[45]   elementdecl   ::=   '<!ELEMENT' S Name S contentspec S? +'>'[VC: Unique Element Type Declaration]
[46]   contentspec   ::=   'EMPTY' | 'ANY' | Mixed +| children

where the Name gives the element type being declared.

Validity constraint: Unique Element Type Declaration

An element +type MUST NOT be declared more than once.

Examples of element type declarations:

<!ELEMENT br EMPTY>
+<!ELEMENT p (#PCDATA|emph)* >
+<!ELEMENT %name.para; %content.para; >
+<!ELEMENT container ANY>

3.2.1 Element Content

[Definition: An element type has element content when elements +of that type MUST contain only child +elements (no character data), optionally separated by white space (characters +matching the nonterminal S).] [Definition: In this case, the constraint includes a content +model, a simple grammar governing the allowed types of the +child elements and the order in which they are allowed to appear.] +The grammar is built on content particles (cps), which +consist of names, choice lists of content particles, or sequence lists of +content particles:

Element-content Models
[47]   children   ::=   (choice | seq) +('?' | '*' | '+')?
[48]   cp   ::=   (Name | choice +| seq) ('?' | '*' | '+')?
[49]   choice   ::=   '(' S? cp ( S? '|' S? cp )+ S? ')'[VC: Proper Group/PE Nesting]
[50]   seq   ::=   '(' S? cp ( S? ',' S? cp )* S? ')'[VC: Proper Group/PE Nesting]

where each Name is the type of an element which +MAY appear as a child. Any content +particle in a choice list MAY appear in the element +content at the location where the choice list appears in the grammar; +content particles occurring in a sequence list MUST each appear in the element content in the order given in the list. +The optional character following a name or list governs whether the element +or the content particles in the list may occur one or more (+), +zero or more (*), or zero or one times (?). The +absence of such an operator means that the element or content particle MUST +appear exactly once. This syntax and meaning are identical to those used in +the productions in this specification.

The content of an element matches a content model if and only if it is +possible to trace out a path through the content model, obeying the sequence, +choice, and repetition operators and matching each element in the content +against an element type in the content model. For +compatibility, it is an error if the content model +allows an element to match more than one occurrence of an element type in the +content model. For more information, see D Deterministic Content Models.

Validity constraint: Proper Group/PE Nesting

Parameter-entity replacement text MUST be properly nested with parenthesized +groups. That is to say, if either of the opening or closing parentheses in +a choice, seq, or Mixed +construct is contained in the replacement text for a parameter +entity, both MUST be contained in the same replacement text.

For interoperability, if a parameter-entity reference +appears in a choice, seq, or Mixed construct, its replacement text SHOULD contain at +least one non-blank character, and neither the first nor last non-blank character +of the replacement text SHOULD be a connector (| or ,).

Examples of element-content models:

<!ELEMENT spec (front, body, back?)>
+<!ELEMENT div1 (head, (p | list | note)*, div2*)>
+<!ELEMENT dictionary-body (%div.mix; | %dict.mix;)*>

3.2.2 Mixed Content

[Definition: An element type +has mixed content when elements of that type MAY contain character +data, optionally interspersed with child +elements.] In this case, the types of the child elements MAY be constrained, +but not their order or their number of occurrences:

Mixed-content Declaration
[51]   Mixed   ::=   '(' S? '#PCDATA' (S? +'|' S? Name)* S? +')*'
| '(' S? '#PCDATA' S? ')' [VC: Proper Group/PE Nesting]
[VC: No Duplicate Types]

where the Names give the types of elements that +may appear as children. The +keyword #PCDATA derives historically from the term "parsed +character data."

Validity constraint: No Duplicate Types

The +same name MUST NOT appear more than once in a single mixed-content declaration.

Examples of mixed content declarations:

<!ELEMENT p (#PCDATA|a|ul|b|i|em)*>
+<!ELEMENT p (#PCDATA | %font; | %phrase; | %special; | %form;)* >
+<!ELEMENT b (#PCDATA)>

3.3 Attribute-List Declarations

Attributes are used to associate name-value +pairs with elements. Attribute specifications +MUST NOT appear outside of start-tags and empty-element tags; thus, the productions used to +recognize them appear in 3.1 Start-Tags, End-Tags, and Empty-Element Tags. Attribute-list declarations +MAY be used:

  • To define the set of attributes pertaining to a given element type.

  • To establish type constraints for these attributes.

  • To provide default values for +attributes.

[Definition: Attribute-list +declarations specify the name, data type, and default value (if any) +of each attribute associated with a given element type:]

Attribute-list Declaration
[52]   AttlistDecl   ::=   '<!ATTLIST' S Name AttDef* S? '>'
[53]   AttDef   ::=   S Name S AttType S DefaultDecl

The Name in the AttlistDecl +rule is the type of an element. At user option, an XML processor MAY issue +a warning if attributes are declared for an element type not itself declared, +but this is not an error. The Name in the AttDef +rule is the name of the attribute.

When more than one AttlistDecl is provided +for a given element type, the contents of all those provided are merged. When +more than one definition is provided for the same attribute of a given element +type, the first declaration is binding and later declarations are ignored. For interoperability, writers of DTDs MAY choose +to provide at most one attribute-list declaration for a given element type, +at most one attribute definition for a given attribute name in an attribute-list +declaration, and at least one attribute definition in each attribute-list +declaration. For interoperability, an XML processor MAY at user option +issue a warning when more than one attribute-list declaration is provided +for a given element type, or more than one attribute definition is provided +for a given attribute, but this is not an error.

3.3.1 Attribute Types

XML attribute types are of three kinds: a string type, a set of tokenized +types, and enumerated types. The string type may take any literal string as +a value; the tokenized types have varying lexical and semantic constraints. +The validity constraints noted in the grammar are applied after the attribute +value has been normalized as described in 3.3.3 Attribute-Value Normalization.

Attribute Types
[54]   AttType   ::=   StringType | TokenizedType +| EnumeratedType
[55]   StringType   ::=   'CDATA'
[56]   TokenizedType   ::=   'ID'[VC: ID]
[VC: One ID per Element Type]
[VC: ID Attribute Default]
| 'IDREF'[VC: IDREF]
| 'IDREFS'[VC: IDREF]
| 'ENTITY'[VC: Entity Name]
| 'ENTITIES'[VC: Entity Name]
| 'NMTOKEN'[VC: Name Token]
| 'NMTOKENS'[VC: Name Token]

Validity constraint: ID

Values of type ID MUST match the Name production. A name MUST NOT appear more than once +in an XML document as a value of this type; i.e., ID values MUST uniquely +identify the elements which bear them.

Validity constraint: One ID per Element Type

An element +type MUST NOT have more than one ID attribute specified.

Validity constraint: ID Attribute Default

An ID attribute +MUST have a declared default of #IMPLIED or #REQUIRED.

Validity constraint: IDREF

Values of type IDREF MUST +match the Name production, and values of type IDREFS MUST match Names; each Name MUST match the value of an ID attribute on some element in the XML document; +i.e. IDREF values MUST match the value of some ID attribute.

Validity constraint: Entity Name

Values of type ENTITY MUST match the Name production, values of type ENTITIES MUST match Names; each Name MUST match the name of an unparsed entity +declared in the DTD.

Validity constraint: Name Token

Values of type NMTOKEN MUST match the Nmtoken production; values of type NMTOKENS MUST match Nmtokens.

[Definition: Enumerated attributes MUST take one of a list of values +provided in the declaration]. There are two kinds of enumerated types:

Enumerated Attribute Types
[57]   EnumeratedType   ::=   NotationType +| Enumeration
[58]   NotationType   ::=   'NOTATION' S '(' S? Name (S? '|' S? Name)* S? ')' [VC: Notation Attributes]
[VC: One Notation Per Element Type]
[VC: No Notation on Empty Element]
[VC: No Duplicate +Tokens]
[59]   Enumeration   ::=   '(' S? Nmtoken +(S? '|' S? Nmtoken)* S? ')'[VC: Enumeration]
[VC: No Duplicate +Tokens]

A NOTATION attribute identifies a notation, +declared in the DTD with associated system and/or public identifiers, to be +used in interpreting the element to which the attribute is attached.

Validity constraint: Notation Attributes

Values of this type +MUST match one of the notation names +included in the declaration; all notation names in the declaration MUST be +declared.

Validity constraint: One Notation Per Element Type

An element type MUST NOT have more than one NOTATION +attribute specified.

Validity constraint: No Notation on Empty Element

For compatibility, +an attribute of type NOTATION MUST NOT be declared on an element +declared EMPTY.

Validity constraint: No Duplicate +Tokens

The notation names in a single NotationType +attribute declaration, as well as the NmTokens in a single +Enumeration attribute declaration, MUST all be distinct.

Validity constraint: Enumeration

Values of this type MUST match +one of the Nmtoken tokens in the declaration.

For interoperability, the same Nmtoken SHOULD NOT occur more than once in the enumerated +attribute types of a single element type.

3.3.2 Attribute Defaults

An attribute declaration provides information +on whether the attribute's presence is REQUIRED, and if not, how an XML processor +is +to react if a declared attribute is absent in a document.

Attribute Defaults
[60]   DefaultDecl   ::=   '#REQUIRED' | '#IMPLIED'
| (('#FIXED' S)? AttValue)[VC: Required Attribute]
[VC: Attribute +Default Value Syntactically Correct]
[WFC: No < in Attribute Values]
[VC: Fixed Attribute Default]

In an attribute declaration, #REQUIRED means that the attribute +MUST always be provided, #IMPLIED that no default value is provided. +[Definition: If +the declaration is neither #REQUIRED nor #IMPLIED, then +the AttValue value contains the declared default +value; the #FIXED keyword states that the attribute MUST always have +the default value. +When an XML processor encounters +an element +without a specification for an attribute for which it has read a default +value declaration, it MUST report the attribute with the declared default +value to the application.]

Validity constraint: Required Attribute

If the default +declaration is the keyword #REQUIRED, then the attribute MUST be +specified for all elements of the type in the attribute-list declaration.

Validity constraint: Attribute +Default Value Syntactically Correct

The declared default value MUST meet the syntactic +constraints of the declared attribute type.

Note that only the +syntactic constraints of the type are required here; other constraints (e.g. +that the value be the name of a declared unparsed entity, for an attribute of +type ENTITY) may come into play if the declared default value is actually used +(an element without a specification for this attribute occurs).

Validity constraint: Fixed Attribute Default

If an attribute +has a default value declared with the #FIXED keyword, instances of +that attribute MUST match the default value.

Examples of attribute-list declarations:

<!ATTLIST termdef
+id      ID      #REQUIRED
+name    CDATA   #IMPLIED>
+<!ATTLIST list
+type    (bullets|ordered|glossary)  "ordered">
+<!ATTLIST form
+method  CDATA   #FIXED "POST">

3.3.3 Attribute-Value Normalization

Before the value of an attribute is passed to the application or checked +for validity, the XML processor MUST normalize the attribute value by applying +the algorithm below, or by using some other method such that the value passed +to the application is the same as that produced by the algorithm.

  1. All line breaks MUST have been normalized on input to #xA as described +in 2.11 End-of-Line Handling, so the rest of this algorithm operates +on text normalized in this way.

  2. Begin with a normalized value consisting of the empty string.

  3. For each character, entity reference, or character reference in the +unnormalized attribute value, beginning with the first and continuing to the +last, do the following:

    • For a character reference, append the referenced character to the +normalized value.

    • For an entity reference, recursively apply step 3 of this algorithm +to the replacement text of the entity.

    • For a white space character (#x20, #xD, #xA, #x9), append a space +character (#x20) to the normalized value.

    • For another character, append the character to the normalized value.

If the attribute type is not CDATA, then the XML processor MUST further +process the normalized attribute value by discarding any leading and trailing +space (#x20) characters, and by replacing sequences of space (#x20) characters +by a single space (#x20) character.

Note that if the unnormalized attribute value contains a character reference +to a white space character other than space (#x20), the normalized value contains +the referenced character itself (#xD, #xA or #x9). This contrasts with the +case where the unnormalized value contains a white space character (not a +reference), which is replaced with a space character (#x20) in the normalized +value and also contrasts with the case where the unnormalized value contains +an entity reference whose replacement text contains a white space character; +being recursively processed, the white space character is replaced with a +space character (#x20) in the normalized value.

All attributes for which no declaration has been read SHOULD be treated +by a non-validating processor as if declared CDATA.

It +is an error if an +attribute +value contains a reference to an +entity for which no declaration has been read.

Following are examples of attribute normalization. Given the following +declarations:

<!ENTITY d "&#xD;">
+<!ENTITY a "&#xA;">
+<!ENTITY da "&#xD;&#xA;">

the attribute specifications in the left column below would be normalized +to the character sequences of the middle column if the attribute a +is declared NMTOKENS and to those of the right columns if a +is declared CDATA.

Attribute specificationa is NMTOKENSa is CDATA
a="
+xyz"
x y z
#x20 #x20 x y z
a="&d;&d;A&a;&#x20;&a;B&da;"
A #x20 B
#x20 #x20 A #x20 #x20 #x20 B #x20 #x20
a=
+"&#xd;&#xd;A&#xa;&#xa;B&#xd;&#xa;"
#xD #xD A #xA #xA B #xD #xA
#xD #xD A #xA #xA B #xD #xA

Note that the last example is invalid (but well-formed) if a +is declared to be of type NMTOKENS.

3.4 Conditional Sections

[Definition: Conditional +sections are portions of the document type +declaration external subset or +of external parameter entities which are included in, or excluded from, +the logical structure of the DTD based on the keyword which governs them.]

Conditional Section
[61]   conditionalSect   ::=   includeSect | ignoreSect
[62]   includeSect   ::=   '<![' S? 'INCLUDE' S? '[' extSubsetDecl +']]>' [VC: Proper Conditional Section/PE Nesting]
[63]   ignoreSect   ::=   '<![' S? 'IGNORE' S? '[' ignoreSectContents* +']]>'[VC: Proper Conditional Section/PE Nesting]
[64]   ignoreSectContents   ::=   Ignore ('<![' ignoreSectContents ']]>' Ignore)*
[65]   Ignore   ::=   Char* - (Char* +('<![' | ']]>') Char*)

Validity constraint: Proper Conditional Section/PE Nesting

If any of the "<![", +"[", or "]]>" of a conditional section is contained +in the replacement text for a parameter-entity reference, all of them MUST +be contained in the same replacement text.

Like the internal and external DTD subsets, a conditional section may contain +one or more complete declarations, comments, processing instructions, or nested +conditional sections, intermingled with white space.

If the keyword of the conditional section is INCLUDE, then the +contents of the conditional section MUST be considered part of the DTD. If the keyword of +the conditional section is IGNORE, then the contents of the conditional +section MUST be considered as not logically part of the DTD. +If a conditional section with a keyword of INCLUDE occurs within +a larger conditional section with a keyword of IGNORE, both the outer +and the inner conditional sections MUST be ignored. The contents +of an ignored conditional section MUST be parsed by ignoring all characters after +the "[" following the keyword, except conditional section starts +"<![" and ends "]]>", until the matching conditional +section end is found. Parameter entity references MUST NOT be recognized in this +process.

If the keyword of the conditional section is a parameter-entity reference, +the parameter entity MUST be replaced by its content before the processor +decides whether to include or ignore the conditional section.

An example:

<!ENTITY % draft 'INCLUDE' >
+<!ENTITY % final 'IGNORE' >
+<![%draft;[
+<!ELEMENT book (comments*, title, body, supplements?)>
+]]>
+<![%final;[
+<!ELEMENT book (title, body, supplements?)>
+]]>

4 Physical Structures

[Definition: An XML document may consist of one +or many storage units. These +are called entities; they all have content and are +all (except for the document entity and +the external DTD subset) identified by +entity name.] Each XML document has one entity +called the document entity, which serves +as the starting point for the XML processor +and may contain the whole document.

Entities may be either parsed or unparsed. [Definition: The contents of a parsed +entity are referred to as its replacement +text; this text is considered an +integral part of the document.]

[Definition: An unparsed entity +is a resource whose contents may or may not be text, +and if text, may +be other than XML. Each unparsed entity has an associated notation, identified by name. Beyond a requirement +that an XML processor make the identifiers for the entity and notation available +to the application, XML places no constraints on the contents of unparsed +entities.]

Parsed entities are invoked by name using entity references; unparsed entities +by name, given in the value of ENTITY or ENTITIES attributes.

[Definition: General entities +are entities for use within the document content. In this specification, general +entities are sometimes referred to with the unqualified term entity +when this leads to no ambiguity.] [Definition: Parameter +entities are parsed entities for use within the DTD.] +These two types of entities use different forms of reference and are recognized +in different contexts. Furthermore, they occupy different namespaces; a parameter +entity and a general entity with the same name are two distinct entities.

4.1 Character and Entity References

[Definition: A character +reference refers to a specific character in the ISO/IEC 10646 character +set, for example one not directly accessible from available input devices.]

Character Reference
[66]   CharRef   ::=   '&#' [0-9]+ ';'
| '&#x' [0-9a-fA-F]+ ';'[WFC: Legal Character]

Well-formedness constraint: Legal Character

Characters referred +to using character references MUST match the production for Char.

If the character reference begins with "&#x", +the digits and letters up to the terminating ; provide a hexadecimal +representation of the character's code point in ISO/IEC 10646. If it begins +just with "&#", the digits up to the terminating ; +provide a decimal representation of the character's code point.

[Definition: An entity reference +refers to the content of a named entity.] [Definition: References to parsed general entities use +ampersand (&) and semicolon (;) as delimiters.] [Definition: Parameter-entity references +use percent-sign (%) and semicolon (;) as delimiters.]

Entity Reference
[67]   Reference   ::=   EntityRef | CharRef
[68]   EntityRef   ::=   '&' Name ';'[WFC: Entity Declared]
[VC: Entity Declared]
[WFC: Parsed Entity]
[WFC: No Recursion]
[69]   PEReference   ::=   '%' Name ';'[VC: Entity Declared]
[WFC: No Recursion]
[WFC: In DTD]

Well-formedness constraint: Entity Declared

In a document +without any DTD, a document with only an internal DTD subset which contains +no parameter entity references, or a document with "standalone='yes'", for +an entity reference that does not occur within the external subset or a parameter +entity, the Name given in the entity reference MUST match that in an entity +declaration that does not occur within the external subset or a +parameter entity, except that well-formed documents need not declare +any of the following entities: amp, +lt, +gt, +apos, +quot. The +declaration of a general entity MUST precede any reference to it which appears +in a default value in an attribute-list declaration.

Note +that non-validating processors are not +obligated to to read and process entity declarations occurring in parameter entities or in +the external subset; for such documents, +the rule that an entity must be declared is a well-formedness constraint only +if standalone='yes'.

Validity constraint: Entity Declared

In a document with +an external subset or external parameter entities with "standalone='no'", +the Name given in the entity reference MUST match that in an entity +declaration. For interoperability, valid documents SHOULD declare +the entities amp, +lt, +gt, +apos, +quot, in the form specified in 4.6 Predefined Entities. +The declaration of a parameter entity MUST precede any reference to it. Similarly, +the declaration of a general entity MUST precede any attribute-list +declaration containing a default value with a direct or indirect reference +to that general entity.

Well-formedness constraint: Parsed Entity

An entity reference MUST +NOT contain the name of an unparsed entity. +Unparsed entities may be referred to only in attribute +values declared to be of type ENTITY or ENTITIES.

Well-formedness constraint: No Recursion

A parsed entity MUST NOT contain a recursive reference to itself, either directly or indirectly.

Well-formedness constraint: In DTD

Parameter-entity references MUST NOT appear outside +the DTD.

Examples of character and entity references:

Type <key>less-than</key> (&#x3C;) to save options.
+This document was prepared on &docdate; and
+is classified &security-level;.

Example of a parameter-entity reference:

<!-- declare the parameter entity "ISOLat2"... -->
+<!ENTITY % ISOLat2
+SYSTEM "http://www.xml.com/iso/isolat2-xml.entities" >
+<!-- ... now reference it. -->
+%ISOLat2;

4.2 Entity Declarations

[Definition: Entities are declared +thus:]

Entity Declaration
[70]   EntityDecl   ::=   GEDecl | PEDecl
[71]   GEDecl   ::=   '<!ENTITY' S Name S EntityDef S? +'>'
[72]   PEDecl   ::=   '<!ENTITY' S '%' S Name S PEDef S? '>'
[73]   EntityDef   ::=   EntityValue| (ExternalID NDataDecl?)
[74]   PEDef   ::=   EntityValue | ExternalID

The Name identifies the entity in an entity +reference or, in the case of an unparsed entity, in the value of +an ENTITY or ENTITIES attribute. If the same entity is declared +more than once, the first declaration encountered is binding; at user option, +an XML processor MAY issue a warning if entities are declared multiple times.

4.2.1 Internal Entities

[Definition: If the +entity definition is an EntityValue, the defined +entity is called an internal entity. There is no separate physical +storage object, and the content of the entity is given in the declaration.] +Note that some processing of entity and character references in the literal entity value may be required to produce +the correct replacement text: see 4.5 Construction of Entity Replacement Text.

An internal entity is a parsed entity.

Example of an internal entity declaration:

<!ENTITY Pub-Status "This is a pre-release of the
+specification.">

4.2.2 External Entities

[Definition: If the entity is not internal, +it is an external entity, declared as follows:]

External Entity Declaration
[75]   ExternalID   ::=   'SYSTEM' S SystemLiteral
| 'PUBLIC' S PubidLiteral S SystemLiteral
[76]   NDataDecl   ::=   S 'NDATA' S Name[VC: Notation Declared]

If the NDataDecl is present, this is a general unparsed entity; otherwise it is a parsed entity.

Validity constraint: Notation Declared

The Name MUST match the declared name of a notation.

[Definition: The SystemLiteral is called the entity's system +identifier. It is meant to be +converted to a URI reference +(as defined in [IETF RFC 2396], updated by [IETF RFC 2732]), +as part of the +process of dereferencing it to obtain input for the XML processor to construct the +entity's replacement text.] It is an error for a fragment identifier +(beginning with a # character) to be part of a system identifier. +Unless otherwise provided by information outside the scope of this specification +(e.g. a special XML element type defined by a particular DTD, or a processing +instruction defined by a particular application specification), relative URIs +are relative to the location of the resource within which the entity declaration +occurs. This is defined to +be the external entity containing the '<' which starts the declaration, at the +point when it is parsed as a declaration. +A URI might thus be relative to the document +entity, to the entity containing the external +DTD subset, or to some other external parameter +entity. Attempts to +retrieve the resource identified by a URI MAY be redirected at the parser +level (for example, in an entity resolver) or below (at the protocol level, +for example, via an HTTP Location: header). In the absence of additional +information outside the scope of this specification within the resource, +the base URI of a resource is always the URI of the actual resource returned. +In other words, it is the URI of the resource retrieved after all redirection +has occurred.

System +identifiers (and other XML strings meant to be used as URI references) MAY contain +characters that, according to [IETF RFC 2396] and [IETF RFC 2732], +must be escaped before a URI can be used to retrieve the referenced resource. The +characters to be escaped are the control characters #x0 to #x1F and #x7F (most of +which cannot appear in XML), space #x20, the delimiters '<' #x3C, '>' #x3E and +'"' #x22, the unwise characters '{' #x7B, '}' #x7D, '|' #x7C, '\' #x5C, '^' #x5E and +'`' #x60, as well as all characters above #x7F. Since escaping is not always a fully +reversible process, it MUST be performed only when absolutely necessary and as late +as possible in a processing chain. In particular, neither the process of converting +a relative URI to an absolute one nor the process of passing a URI reference to a +process or software component responsible for dereferencing it SHOULD trigger escaping. +When escaping does occur, it MUST be performed as follows:

  1. Each +character to be escaped +is represented in +UTF-8 [Unicode] +as one or more bytes.

  2. The resulting bytes +are escaped with +the URI escaping mechanism (that is, converted to %HH, +where HH is the hexadecimal notation of the byte value).

  3. The original character is replaced by the resulting character sequence.

[Definition: In addition to a system +identifier, an external identifier MAY include a public identifier.] +An XML processor attempting to retrieve the entity's content MAY use +any combination of +the public and system identifiers as well as additional information outside the +scope of this specification to try to generate an alternative URI reference. +If the processor is unable to do so, it MUST use the URI +reference specified in the system literal. Before a match is attempted, +all strings of white space in the public identifier MUST be normalized to +single space characters (#x20), and leading and trailing white space MUST +be removed.

Examples of external entity declarations:

<!ENTITY open-hatch
+SYSTEM "http://www.textuality.com/boilerplate/OpenHatch.xml">
+<!ENTITY open-hatch
+PUBLIC "-//Textuality//TEXT Standard open-hatch boilerplate//EN"
+"http://www.textuality.com/boilerplate/OpenHatch.xml">
+<!ENTITY hatch-pic
+SYSTEM "../grafix/OpenHatch.gif"
+NDATA gif >

4.3 Parsed Entities

4.3.1 The Text Declaration

External parsed entities SHOULD each begin with a text declaration.

Text Declaration
[77]   TextDecl   ::=   '<?xml' VersionInfo? EncodingDecl S? '?>'

The text declaration MUST be provided literally, not by reference +to a parsed entity. The text declaration +MUST NOT appear at any +position other than the beginning of an external parsed entity. The text declaration +in an external parsed entity is not considered part of its replacement text.

4.3.2 Well-Formed Parsed Entities

The document entity is well-formed if it matches the production labeled document. An external general parsed entity is well-formed +if it matches the production labeled extParsedEnt. All +external parameter entities are well-formed by definition.

Well-Formed External Parsed Entity
[78]   extParsedEnt   ::=   TextDecl? content - Char* RestrictedChar Char*

An internal general parsed entity is well-formed if its replacement text +matches the production labeled content. All internal +parameter entities are well-formed by definition.

A consequence of well-formedness in general +entities is that the logical and physical +structures in an XML document are properly nested; no start-tag, end-tag, empty-element tag, element, comment, processing instruction, character +reference, or entity reference +can begin in one entity and end in another.

4.3.3 Character Encoding in Entities

Each external parsed entity in an XML document MAY use a different encoding +for its characters. All XML processors MUST be able to read entities in both +the UTF-8 and UTF-16 encodings. The terms "UTF-8" +and "UTF-16" in this specification do not apply to character +encodings with any other labels, even if the encodings or labels are very +similar to UTF-8 or UTF-16.

Entities encoded in UTF-16 MUST and entities +encoded in UTF-8 MAY begin with the Byte Order Mark described in +ISO/IEC 10646 [ISO/IEC 10646] or Unicode [Unicode] +(the ZERO WIDTH NO-BREAK SPACE character, #xFEFF). This is an encoding signature, +not part of either the markup or the character data of the XML document. XML +processors MUST be able to use this character to differentiate between UTF-8 +and UTF-16 encoded documents.

Although an XML processor is required to read only entities in the UTF-8 +and UTF-16 encodings, it is recognized that other encodings are used around +the world, and it may be desired for XML processors to read entities that +use them. In +the absence of external character encoding information (such as MIME headers), +parsed entities which are stored in an encoding other than UTF-8 or UTF-16 +MUST begin with a text declaration (see 4.3.1 The Text Declaration) containing +an encoding declaration:

Encoding Declaration
[80]   EncodingDecl   ::=   S 'encoding' Eq +('"' EncName '"' | "'" EncName +"'" )
[81]   EncName   ::=   [A-Za-z] ([A-Za-z0-9._] | '-')*/* Encoding +name contains only Latin characters */

In the document entity, the encoding +declaration is part of the XML declaration. +The EncName is the name of the encoding used.

In an encoding declaration, the values "UTF-8", "UTF-16", +"ISO-10646-UCS-2", and "ISO-10646-UCS-4" SHOULD be used +for the various encodings and transformations of Unicode / ISO/IEC 10646, +the values "ISO-8859-1", "ISO-8859-2", +... "ISO-8859-n" (where n +is the part number) SHOULD be used for the parts of ISO 8859, and +the values "ISO-2022-JP", "Shift_JIS", +and "EUC-JP" SHOULD be used for the various encoded +forms of JIS X-0208-1997. It +is RECOMMENDED that character encodings registered (as charsets) +with the Internet Assigned Numbers Authority [IANA-CHARSETS], +other than those just listed, be referred to using their registered names; +other encodings SHOULD use names starting with an "x-" prefix. +XML processors SHOULD match character encoding names in a case-insensitive +way and SHOULD either interpret an IANA-registered name as the encoding registered +at IANA for that name or treat it as unknown (processors are, of course, not +required to support all IANA-registered encodings).

In the absence of information provided by an external transport protocol +(e.g. HTTP or MIME), it is a fatal error for +an entity including an encoding declaration to be presented to the XML processor +in an encoding other than that named in the declaration, or for an entity which +begins with neither a Byte Order Mark +nor an encoding declaration to use an encoding other than UTF-8. Note that +since ASCII is a subset of UTF-8, ordinary ASCII entities do not strictly +need an encoding declaration.

It is a fatal error for a TextDecl to occur other +than at the beginning of an external entity.

It is a fatal error when an XML processor +encounters an entity with an encoding that it is unable to process. It +is a fatal error if an XML entity is determined (via default, encoding declaration, +or higher-level protocol) to be in a certain encoding but contains byte +sequences that are not legal in that encoding. Specifically, it is a +fatal error if an entity encoded in UTF-8 contains any irregular code unit sequences, +as defined in Unicode [Unicode]. Unless an encoding +is determined by a higher-level protocol, it is also a fatal error if an XML entity +contains no encoding declaration and its content is not legal UTF-8 or UTF-16.

Examples of text declarations containing encoding declarations:

<?xml encoding='UTF-8'?>
+<?xml encoding='EUC-JP'?>

4.3.4 Version Information in Entities

Each entity, including the document entity, +can be separately +declared as XML 1.0 or XML 1.1. The version declaration appearing +in the document entity determines the version of the document as a +whole. An XML 1.1 document may invoke XML 1.0 external entities, so +that otherwise duplicated versions of external entities, +particularly DTD external subsets, need not be maintained. However, +in such a case the rules of XML 1.1 are applied to the entire +document.

If an entity (including the document entity) is not labeled +with a version number, it is treated as if labeled as version +1.0.

4.4 XML Processor Treatment of Entities and References

The table below summarizes the contexts in which character references, +entity references, and invocations of unparsed entities might appear and the +REQUIRED behavior of an XML processor +in each case. The labels in the leftmost column describe the recognition context:

Reference in Content

as a reference anywhere after the start-tag +and before the end-tag of an element; corresponds +to the nonterminal content.

Reference in Attribute Value

as a reference within either the value of an attribute in a start-tag, +or a default value in an attribute declaration; +corresponds to the nonterminal AttValue.

Occurs as Attribute Value

as a Name, not a reference, appearing either as +the value of an attribute which has been declared as type ENTITY, +or as one of the space-separated tokens in the value of an attribute which +has been declared as type ENTITIES.

Reference in Entity Value

as a reference within a parameter or internal entity's literal +entity value in the entity's declaration; corresponds to the nonterminal EntityValue.

Reference in DTD

as a reference within either the internal or external subsets of the DTD, but outside of an EntityValue, AttValue, PI, Comment, SystemLiteral, PubidLiteral, +or the contents of an ignored conditional section (see 3.4 Conditional Sections).

.

Entity +TypeCharacter
ParameterInternal GeneralExternal Parsed +GeneralUnparsed
Reference +in ContentNot recognizedIncludedIncluded +if validatingForbiddenIncluded
Reference in Attribute ValueNot recognizedIncluded +in literalForbiddenForbiddenIncluded
Occurs as Attribute +ValueNot recognizedForbiddenForbiddenNotifyNot recognized
Reference in EntityValueIncluded in literalBypassedBypassedErrorIncluded
Reference in DTDIncluded as PEForbiddenForbiddenForbiddenForbidden

4.4.1 Not Recognized

Outside the DTD, the % character has no special significance; +thus, what would be parameter entity references in the DTD are not recognized +as markup in content. Similarly, the names of unparsed +entities are not recognized except when they appear in the value of an appropriately +declared attribute.

4.4.2 Included

[Definition: An entity is included +when its replacement text is retrieved +and processed, in place of the reference itself, as though it were part of +the document at the location the reference was recognized.] The replacement +text MAY contain both character data +and (except for parameter entities) markup, +which MUST be recognized in the usual way. (The string "AT&amp;T;" +expands to "AT&T;" and the remaining ampersand +is not recognized as an entity-reference delimiter.) A character reference +is included when the indicated character is processed in place +of the reference itself.

4.4.3 Included If Validating

When an XML processor recognizes a reference to a parsed entity, in order +to validate the document, the processor +MUST include its replacement text. If +the entity is external, and the processor is not attempting to validate the +XML document, the processor MAY, but need +not, include the entity's replacement text. If a non-validating processor +does not include the replacement text, it MUST inform the application that +it recognized, but did not read, the entity.

This rule is based on the recognition that the automatic inclusion provided +by the SGML and XML entity mechanism, primarily designed to support modularity +in authoring, is not necessarily appropriate for other applications, in particular +document browsing. Browsers, for example, when encountering an external parsed +entity reference, might choose to provide a visual indication of the entity's +presence and retrieve it for display only on demand.

4.4.4 Forbidden

The following are forbidden, and constitute fatal +errors:

  • the appearance of a reference to an unparsed +entity, except in the +EntityValue in an entity declaration.

  • the appearance of any character or general-entity reference in the +DTD except within an EntityValue or AttValue.

  • a reference to an external entity in an attribute value.

4.4.5 Included in Literal

When an entity reference appears in +an attribute value, or a parameter entity reference appears in a literal entity +value, its replacement text MUST be processed +in place of the reference itself as though it were part of the document at +the location the reference was recognized, except that a single or double +quote character in the replacement text MUST always be treated as a normal data +character and MUST NOT terminate the literal. For example, this is well-formed:

<!ENTITY % YN '"Yes"' >
+<!ENTITY WhatHeSaid "He said %YN;" >

while this is not:

<!ENTITY EndAttr "27'" >
+<element attribute='a-&EndAttr;>

4.4.6 Notify

When the name of an unparsed entity +appears as a token in the value of an attribute of declared type ENTITY +or ENTITIES, a validating processor MUST inform the application of +the system and public +(if any) identifiers for both the entity and its associated notation.

4.4.7 Bypassed

When a general entity reference appears in the EntityValue +in an entity declaration, it MUST be bypassed and left as is.

4.4.8 Included as PE

Just as with external parsed entities, parameter entities need only be included if validating. When a parameter-entity +reference is recognized in the DTD and included, its replacement +text MUST be enlarged by the attachment of one leading and one following +space (#x20) character; the intent is to constrain the replacement text of +parameter entities to contain an integral number of grammatical tokens in +the DTD. This +behavior MUST NOT apply to parameter entity references within entity values; +these are described in 4.4.5 Included in Literal.

4.4.9 Error

It is an error for a reference to +an unparsed entity to appear in the EntityValue in an +entity declaration.

4.5 Construction of Entity Replacement Text

In discussing the treatment of entities, it is useful to distinguish +two forms of the entity's value. +[Definition: For an +internal entity, the literal +entity value is the quoted string actually present in the entity declaration, +corresponding to the non-terminal EntityValue.] [Definition: For an external entity, the literal +entity value is the exact text contained in the entity.] [Definition: For an +internal entity, the replacement text +is the content of the entity, after replacement of character references and +parameter-entity references.] [Definition: For +an external entity, the replacement text is the content of the entity, +after stripping the text declaration (leaving any surrounding white space) if there +is one but without any replacement of character references or parameter-entity +references.]

The literal entity value as given in an internal entity declaration (EntityValue) MAY contain character, parameter-entity, +and general-entity references. Such references MUST be contained entirely +within the literal entity value. The actual replacement text that is included (or included in literal) as described above +MUST contain the replacement +text of any parameter entities referred to, and MUST contain the character +referred to, in place of any character references in the literal entity value; +however, general-entity references MUST be left as-is, unexpanded. For example, +given the following declarations:

<!ENTITY % pub    "&#xc9;ditions Gallimard" >
+<!ENTITY   rights "All rights reserved" >
+<!ENTITY   book   "La Peste: Albert Camus,
+&#xA9; 1947 %pub;. &rights;" >

then the replacement text for the entity "book" +is:

La Peste: Albert Camus,
+© 1947 Éditions Gallimard. &rights;

The general-entity reference "&rights;" would +be expanded should the reference "&book;" appear +in the document's content or an attribute value.

These simple rules may have complex interactions; for a detailed discussion +of a difficult example, see C Expansion of Entity and Character References.

4.6 Predefined Entities

[Definition: Entity and character references MAY +both be used to escape the left angle bracket, ampersand, and +other delimiters. A set of general entities (amp, +lt, +gt, +apos, +quot) is specified for +this purpose. Numeric character references MAY also be used; they are expanded +immediately when recognized and MUST be treated as character data, so the +numeric character references "&#60;" and "&#38;" MAY be used to escape < and & when they occur +in character data.]

All XML processors MUST recognize these entities whether they are declared +or not. For interoperability, valid XML +documents SHOULD declare these entities, like any others, before using them. If +the entities lt or amp are declared, they MUST be +declared as internal entities whose replacement text is a character reference +to the respective +character (less-than sign or ampersand) being escaped; the double +escaping is REQUIRED for these entities so that references to them produce +a well-formed result. If the entities gt, apos, +or quot are declared, they MUST be declared as internal entities +whose replacement text is the single character being escaped (or a character +reference to that character; the double escaping here is OPTIONAL but harmless). +For example:

<!ENTITY lt     "&#38;#60;">
+<!ENTITY gt     "&#62;">
+<!ENTITY amp    "&#38;#38;">
+<!ENTITY apos   "&#39;">
+<!ENTITY quot   "&#34;">

4.7 Notation Declarations

[Definition: Notations identify +by name the format of unparsed entities, +the format of elements which bear a notation attribute, or the application +to which a processing instruction is addressed.]

[Definition: Notation declarations +provide a name for the notation, for use in entity and attribute-list declarations +and in attribute specifications, and an external identifier for the notation +which may allow an XML processor or its client application to locate a helper +application capable of processing data in the given notation.]

Notation Declarations
[82]   NotationDecl   ::=   '<!NOTATION' S Name S (ExternalID | PublicID) S? '>'[VC: Unique Notation Name]
[83]   PublicID   ::=   'PUBLIC' S PubidLiteral

Validity constraint: Unique Notation Name

A given Name MUST NOT be declared in more than one notation declaration.

XML processors MUST provide applications with the name and external identifier(s) +of any notation declared and referred to in an attribute value, attribute +definition, or entity declaration. They MAY additionally resolve the external +identifier into the system identifier, file +name, or other information needed to allow the application to call a processor +for data in the notation described. (It is not an error, however, for XML +documents to declare and refer to notations for which notation-specific applications +are not available on the system where the XML processor or application is +running.)

4.8 Document Entity

[Definition: The document entity +serves as the root of the entity tree and a starting-point for an XML processor.] This specification does +not specify how the document entity is to be located by an XML processor; +unlike other entities, the document entity has no name and might well appear +on a processor input stream without any identification at all.

5 Conformance

5.1 Validating and Non-Validating Processors

Conforming XML processors fall into +two classes: validating and non-validating.

Validating and non-validating processors alike MUST report violations of +this specification's well-formedness constraints in the content of the document entity and any other parsed +entities that they read.

[Definition: Validating +processors MUST, +at user option, report violations of the constraints expressed by +the declarations in the DTD, and failures +to fulfill the validity constraints given in this specification.] +To accomplish this, validating XML processors MUST read and process the entire +DTD and all external parsed entities referenced in the document.

Non-validating processors are REQUIRED to check only the document +entity, including the entire internal DTD subset, for well-formedness. [Definition: While they are not required +to check the document for validity, they are REQUIRED to process +all the declarations they read in the internal DTD subset and in any parameter +entity that they read, up to the first reference to a parameter entity that +they do not read; that is to say, they MUST use the information +in those declarations to normalize +attribute values, include the replacement +text of internal entities, and supply default +attribute values.] Except when standalone="yes", they +MUST NOT process entity +declarations or attribute-list declarations +encountered after a reference to a parameter entity that is not read, since +the entity may have contained overriding declarations; when standalone="yes", processors MUST +process these declarations.

Note +that when processing invalid documents with a non-validating +processor the application may not be presented with consistent +information. For example, several requirements for uniqueness +within the document may not be met, including more than one element +with the same id, duplicate declarations of elements or notations +with the same name, etc. In these cases the behavior of the parser +with respect to reporting such information to the application is +undefined.

XML 1.1 processors MUST be able to process both XML 1.0 +and XML 1.1 documents. Programs which generate XML SHOULD +generate XML 1.0, unless one of the specific features of XML 1.1 is required.

5.2 Using XML Processors

The behavior of a validating XML processor is highly predictable; it must +read every piece of a document and report all well-formedness and validity +violations. Less is required of a non-validating processor; it need not read +any part of the document other than the document entity. This has two effects +that may be important to users of XML processors:

For maximum reliability in interoperating between different XML processors, +applications which use non-validating processors SHOULD NOT rely on any behaviors +not required of such processors. Applications which require DTD facilities +not related to validation (such +as the declaration of default attributes and internal entities that are +or may be specified in +external entities SHOULD use validating XML processors.

6 Notation

The formal grammar of XML is given in this specification using a simple +Extended Backus-Naur Form (EBNF) notation. Each rule in the grammar defines +one symbol, in the form

symbol ::= expression

Symbols are written with an initial capital letter if they are the +start symbol of a regular language, otherwise with an initial lowercase +letter. Literal strings are quoted.

Within the expression on the right-hand side of a rule, the following expressions +are used to match strings of one or more characters:

#xN

where N is a hexadecimal integer, the expression matches the character +whose number +(code point) in ISO/IEC 10646 is N. The number of leading zeros in the #xN +form is insignificant.

[a-zA-Z], [#xN-#xN]

matches any Char with a value in the range(s) indicated (inclusive).

[abc], [#xN#xN#xN]

matches any Char with a value among the characters +enumerated. Enumerations and ranges can be mixed in one set of brackets.

[^a-z], [^#xN-#xN]

matches any Char with a value outside the range +indicated.

[^abc], [^#xN#xN#xN]

matches any Char with a value not among the characters given. Enumerations +and ranges of forbidden values can be mixed in one set of brackets.

"string"

matches a literal string matching that +given inside the double quotes.

'string'

matches a literal string matching that +given inside the single quotes.

These symbols may be combined to match more complex patterns as follows, +where A and B represent simple expressions:

(expression)

expression is treated as a unit and may be combined as described +in this list.

A?

matches A or nothing; optional A.

A B

matches A followed by B. This +operator has higher precedence than alternation; thus A B | C D +is identical to (A B) | (C D).

A | B

matches A or B.

A - B

matches any string that matches A but does not match B.

A+

matches one or more occurrences of A. Concatenation +has higher precedence than alternation; thus A+ | B+ is identical +to (A+) | (B+).

A*

matches zero or more occurrences of A. Concatenation +has higher precedence than alternation; thus A* | B* is identical +to (A*) | (B*).

Other notations used in the productions are:

/* ... */

comment.

[ wfc: ... ]

well-formedness constraint; this identifies by name a constraint on well-formed documents associated with a production.

[ vc: ... ]

validity constraint; this identifies by name a constraint on valid +documents associated with a production.

A References

A.1 Normative References

IANA-CHARSETS
(Internet +Assigned Numbers Authority) Official Names for Character Sets, +ed. Keld Simonsen et al. (See http://www.iana.org/assignments/character-sets.)
IETF RFC 2119
IETF +(Internet Engineering Task Force). RFC 2119: Key words for use in RFCs to Indicate Requirement Levels. +Scott Bradner, 1997. (See http://www.ietf.org/rfc/rfc2119.txt.)
IETF RFC 2396
IETF +(Internet Engineering Task Force). RFC 2396: Uniform Resource Identifiers +(URI): Generic Syntax. T. Berners-Lee, R. Fielding, L. Masinter. +1998. (See http://www.ietf.org/rfc/rfc2396.txt.)
IETF RFC 2732
IETF +(Internet Engineering Task Force). RFC 2732: Format for Literal +IPv6 Addresses in URL's. R. Hinden, B. Carpenter, L. Masinter. +1999. (See http://www.ietf.org/rfc/rfc2732.txt.)
IETF RFC 3066
IETF +(Internet Engineering Task Force). RFC 3066: Tags for the Identification +of Languages, ed. H. Alvestrand. 2001. (See http://www.ietf.org/rfc/rfc3066.txt.)
ISO/IEC 10646
ISO (International +Organization for Standardization). ISO/IEC 10646-1:2000. Information +technology — Universal Multiple-Octet Coded Character Set (UCS) — +Part 1: Architecture and Basic Multilingual Plane and ISO/IEC 10646-2:2001. +Information technology — Universal Multiple-Octet Coded Character Set (UCS) — Part 2: +Supplementary Planes, as, from time to time, amended, replaced by a new edition or +expanded by the addition of new parts. [Geneva]: International Organization for Standardization. +(See http://www.iso.ch for the latest version.)
Unicode
The Unicode Consortium. The Unicode +Standard, Version 4.0. Reading, Mass.: Addison-Wesley, +2003, +as updated from time to time by the publication of new versions. (See + +http://www.unicode.org/unicode/standard/versions for the latest version +and additional information on versions of the standard and of the Unicode +Character Database).
XML-1.0
W3C. Extensible Markup Language (XML) 1.0 (Third +Edition). Tim Bray, Jean Paoli, C.M. Sperberg-McQueen, Eve Maler, François Yergeau +(editors) (See http://www.w3.org/TR/REC-xml.)

A.2 Other References

Aho/Ullman
Aho, Alfred V., Ravi Sethi, and Jeffrey D. +Ullman. Compilers: Principles, Techniques, and Tools. +Reading: Addison-Wesley, 1986, rpt. corr. 1988.
Brüggemann-Klein
Brüggemann-Klein, +Anne. Formal Models in Document Processing. Habilitationsschrift. Faculty +of Mathematics at the University of Freiburg, 1993. (See ftp://ftp.informatik.uni-freiburg.de/documents/papers/brueggem/habil.ps.)
Brüggemann-Klein and Wood
Brüggemann-Klein, +Anne, and Derick Wood. Deterministic Regular Languages. +Universität Freiburg, Institut für Informatik, Bericht 38, Oktober 1991. Extended +abstract in A. Finkel, M. Jantzen, Hrsg., STACS 1992, S. 173-184. Springer-Verlag, +Berlin 1992. Lecture Notes in Computer Science 577. Full version titled One-Unambiguous +Regular Languages in Information and Computation 140 (2): 229-253, +February 1998.
Charmod
W3C Working Draft. + +Character Model for the World Wide Web 1.0. + +Martin J. Dürst, François Yergeau, Richard Ishida, Misha Wolf, Tex Texin. (See http://www.w3.org/TR/2003/WD-charmod-20030822/.)
Clark
James Clark. +Comparison of SGML and XML. (See http://www.w3.org/TR/NOTE-sgml-xml-971215.)
IANA-LANGCODES
(Internet +Assigned Numbers Authority) Registry of Language Tags, +ed. Keld Simonsen et al. (See http://www.iana.org/assignments/language-tags.)
IETF RFC 2141
IETF +(Internet Engineering Task Force). RFC 2141: URN Syntax, ed. +R. Moats. 1997. (See http://www.ietf.org/rfc/rfc2141.txt.)
IETF RFC 3023
IETF +(Internet Engineering Task Force). RFC 3023: XML Media Types. +eds. M. Murata, S. St.Laurent, D. Kohn. 2001. (See http://www.ietf.org/rfc/rfc3023.txt.)
IETF RFC 2781
IETF +(Internet Engineering Task Force). RFC 2781: UTF-16, an encoding +of ISO 10646, ed. P. Hoffman, F. Yergeau. 2000. (See http://www.ietf.org/rfc/rfc2781.txt.)
ISO 639
(International Organization for Standardization). +ISO 639:1988 (E). +Code for the representation of names of languages. [Geneva]: International +Organization for Standardization, 1988.
ISO 3166
(International Organization for Standardization). +ISO 3166-1:1997 +(E). Codes for the representation of names of countries and their subdivisions — +Part 1: Country codes [Geneva]: International Organization for +Standardization, 1997.
ISO 8879
ISO (International Organization for Standardization). ISO +8879:1986(E). Information processing — Text and Office Systems — +Standard Generalized Markup Language (SGML). First edition — +1986-10-15. [Geneva]: International Organization for Standardization, 1986.
ISO/IEC 10744
ISO (International Organization for +Standardization). ISO/IEC 10744-1992 (E). Information technology — +Hypermedia/Time-based Structuring Language (HyTime). [Geneva]: +International Organization for Standardization, 1992. Extended Facilities +Annexe. [Geneva]: International Organization for Standardization, 1996.
WEBSGML
ISO +(International Organization for Standardization). ISO 8879:1986 +TC2. Information technology — Document Description and Processing Languages. +[Geneva]: International Organization for Standardization, 1998. (See http://www.sgmlsource.com/8879/n0029.htm.)
XML Names
Tim Bray, +Dave Hollander, and Andrew Layman, editors. Namespaces in XML. +Textuality, Hewlett-Packard, and Microsoft. World Wide Web Consortium, 1999. (See http://www.w3.org/TR/REC-xml-names/.)

B Definitions for Character Normalization

This appendix contains the necessary definitions for character normalization. +For additional background information and examples, see [Charmod].

+[Definition: Text is said to be +in a Unicode encoding form if it is encoded in +UTF-8, UTF-16 or UTF-32.]

+[Definition: Legacy encoding +is taken to mean any character encoding not based on Unicode.]

+[Definition: A +normalizing transcoder is a transcoder that converts from a +legacy encoding to a +Unicode encoding form and +ensures that the result is in Unicode Normalization Form C +(see UAX #15 [Unicode]).]

[Definition: A character escape +is a syntactic device defined in a markup or programming language that allows +one or more of:]

  1. expressing syntax-significant characters while disregarding +their significance in the syntax of the language, or

  2. expressing characters not representable in the character encoding +chosen for an instance of the language, or

  3. expressing characters in general, without use of the corresponding +character codes.

+[Definition: Certified text +is text which satisfies at least one of the following conditions:]

  1. it has been confirmed through inspection that the text +is in normalized form

  2. the source text-processing component is identified +and is known to produce only normalized text.

+[Definition: Text is, for the purposes of +this specification, Unicode-normalized if it is in a +Unicode encoding form and is in +Unicode Normalization Form C, according to a version of Unicode Standard Annex #15: +Unicode Normalization Forms [Unicode] at least as recent as the +oldest version of the Unicode Standard that contains all the characters +actually present in the text, but no earlier +than version 3.2.]

+[Definition: Text is +include-normalized if:]

  1. the text is Unicode-normalized +and does not contain any character escapes +or includes whose expansion would +cause the text to become no longer Unicode-normalized; +or

  2. the text is in a legacy encoding and, if it were transcoded +to a Unicode encoding form by a +normalizing transcoder, the resulting +text would satisfy clause 1 above.

+[Definition: A composing character +is a character that is one or both of the following:]

  1. the second character in the canonical decomposition mapping of +some primary composite (as defined in D3 of UAX #15 [Unicode]), or

  2. of non-zero canonical combining class (as defined in Unicode +[Unicode]).

+[Definition: Text is +fully-normalized if:]

  1. the text is in a Unicode encoding +form, is include-normalized and +none of the relevant +constructs comprising the text begin with a +composing character or a +character escape representing a +composing character; or

  2. the text is in a legacy encoding and, +if it were transcoded to a Unicode encoding form +by a normalizing transcoder, the resulting text +would satisfy clause 1 above.

C Expansion of Entity and Character References (Non-Normative)

This appendix contains some examples illustrating the sequence of entity- +and character-reference recognition and expansion, as specified in 4.4 XML Processor Treatment of Entities and References.

If the DTD contains the declaration

<!ENTITY example "<p>An ampersand (&#38;#38;) may be escaped
+numerically (&#38;#38;#38;) or with a general entity
+(&amp;amp;).</p>" >

then the XML processor will recognize the character references when it +parses the entity declaration, and resolve them before storing the following +string as the value of the entity "example":

<p>An ampersand (&#38;) may be escaped
+numerically (&#38;#38;) or with a general entity
+(&amp;amp;).</p>

A reference in the document to "&example;" +will cause the text to be reparsed, at which time the start- and end-tags +of the p element will be recognized and the three references will +be recognized and expanded, resulting in a p element with the following +content (all data, no delimiters or markup):

An ampersand (&) may be escaped
+numerically (&#38;) or with a general entity
+(&amp;).

A more complex example will illustrate the rules and their effects fully. +In the following example, the line numbers are solely for reference.

1 <?xml version='1.0'?>
+2 <!DOCTYPE test [
+3 <!ELEMENT test (#PCDATA) >
+4 <!ENTITY % xx '&#37;zz;'>
+5 <!ENTITY % zz '&#60;!ENTITY tricky "error-prone" >' >
+6 %xx;
+7 ]>
+8 <test>This sample shows a &tricky; method.</test>

This produces the following:

  • in line 4, the reference to character 37 is expanded immediately, +and the parameter entity "xx" is stored in the symbol +table with the value "%zz;". Since the replacement +text is not rescanned, the reference to parameter entity "zz" +is not recognized. (And it would be an error if it were, since "zz" +is not yet declared.)

  • in line 5, the character reference "&#60;" +is expanded immediately and the parameter entity "zz" +is stored with the replacement text "<!ENTITY tricky "error-prone" +>", which is a well-formed entity declaration.

  • in line 6, the reference to "xx" is recognized, +and the replacement text of "xx" (namely "%zz;") +is parsed. The reference to "zz" is recognized in +its turn, and its replacement text ("<!ENTITY tricky "error-prone" +>") is parsed. The general entity "tricky" +has now been declared, with the replacement text "error-prone".

  • in line 8, the reference to the general entity "tricky" +is recognized, and it is expanded, so the full content of the test +element is the self-describing (and ungrammatical) string This sample +shows a error-prone method.

D Deterministic Content Models (Non-Normative)

As +noted in 3.2.1 Element Content, it is required that content +models in element type declarations be deterministic. This requirement is for compatibility with SGML (which calls deterministic +content models "unambiguous"); XML processors built +using SGML systems may flag non-deterministic content models as errors.

For example, the content model ((b, c) | (b, d)) is non-deterministic, +because given an initial b the XML processor +cannot know which b in the model is being matched without looking +ahead to see which element follows the b. In this case, the two references +to b can be collapsed into a single reference, making the model read (b, +(c | d)). An initial b now clearly matches only a single name +in the content model. The processor doesn't need to look ahead to see what follows; either c or d +would be accepted.

More formally: a finite state automaton may be constructed from the content +model using the standard algorithms, e.g. algorithm 3.5 in section 3.9 of +Aho, Sethi, and Ullman [Aho/Ullman]. In many such algorithms, a follow +set is constructed for each position in the regular expression (i.e., each +leaf node in the syntax tree for the regular expression); if any position +has a follow set in which more than one following position is labeled with +the same element type name, then the content model is in error and may be +reported as an error.

Algorithms exist which allow many but not all non-deterministic content +models to be reduced automatically to equivalent deterministic models; see +Brüggemann-Klein 1991 [Brüggemann-Klein].

E Autodetection of Character Encodings (Non-Normative)

The XML encoding declaration functions as an internal label on each entity, +indicating which character encoding is in use. Before an XML processor can +read the internal label, however, it apparently has to know what character +encoding is in use — which is what the internal label is trying to indicate. +In the general case, this is a hopeless situation. It is not entirely hopeless +in XML, however, because XML limits the general case in two ways: each implementation +is assumed to support only a finite set of character encodings, and the XML +encoding declaration is restricted in position and content in order to make +it feasible to autodetect the character encoding in use in each entity in +normal cases. Also, in many cases other sources of information are available +in addition to the XML data stream itself. Two cases may be distinguished, +depending on whether the XML entity is presented to the processor without, +or with, any accompanying (external) information. We consider the first case +first.

E.1 Detection Without External Encoding Information

Because each XML entity not accompanied by external +encoding information and not in UTF-8 or UTF-16 encoding must +begin with an XML encoding declaration, in which the first characters must +be '<?xml', any conforming processor can detect, after two +to four octets of input, which of the following cases apply. In reading this +list, it may help to know that in UCS-4, '<' is "#x0000003C" +and '?' is "#x0000003F", and the Byte Order Mark +required of UTF-16 data streams is "#xFEFF". The notation +## is used to denote any byte value except that two consecutive +##s cannot be both 00.

With a Byte Order Mark:

00 00 FE +FFUCS-4, big-endian machine (1234 order)
FF +FE 00 00UCS-4, little-endian machine (4321 order)
00 00 FF FEUCS-4, unusual octet order (2143)
FE FF 00 00UCS-4, unusual octet order (3412)
FE FF ## ##UTF-16, big-endian
FF FE ## ##UTF-16, little-endian
EF BB BFUTF-8

Without a Byte Order Mark:

00 00 00 3CUCS-4 or other encoding with a 32-bit code unit and ASCII +characters encoded as ASCII values, in respectively big-endian (1234), little-endian +(4321) and two unusual byte orders (2143 and 3412). The encoding declaration +must be read to determine which of UCS-4 or other supported 32-bit encodings +applies.
3C 00 00 00
00 00 3C 00
00 3C 00 00
00 3C 00 3FUTF-16BE or big-endian ISO-10646-UCS-2 +or other encoding with a 16-bit code unit in big-endian order and ASCII characters +encoded as ASCII values (the encoding declaration must be read to determine +which)
3C 00 3F 00UTF-16LE or little-endian +ISO-10646-UCS-2 or other encoding with a 16-bit code unit in little-endian +order and ASCII characters encoded as ASCII values (the encoding declaration +must be read to determine which)
3C 3F 78 6DUTF-8, ISO 646, ASCII, some part of ISO 8859, Shift-JIS, EUC, or any other +7-bit, 8-bit, or mixed-width encoding which ensures that the characters of +ASCII have their normal positions, width, and values; the actual encoding +declaration must be read to detect which of these applies, but since all of +these encodings use the same bit patterns for the relevant ASCII characters, +the encoding declaration itself may be read reliably
4C +6F A7 94EBCDIC (in some flavor; the full encoding declaration +must be read to tell which code page is in use)
OtherUTF-8 without an encoding declaration, or else the data stream is mislabeled +(lacking a required encoding declaration), corrupt, fragmentary, or enclosed +in a wrapper of some kind

Note:

In cases above which do not require reading the encoding declaration to +determine the encoding, section 4.3.3 still requires that the encoding declaration, +if present, be read and that the encoding name be checked to match the actual +encoding of the entity. Also, it is possible that new character encodings +will be invented that will make it necessary to use the encoding declaration +to determine the encoding, in cases where this is not required at present.

This level of autodetection is enough to read the XML encoding declaration +and parse the character-encoding identifier, which is still necessary to distinguish +the individual members of each family of encodings (e.g. to tell UTF-8 from +8859, and the parts of 8859 from each other, or to distinguish the specific +EBCDIC code page in use, and so on).

Because the contents of the encoding declaration are restricted to characters +from the ASCII repertoire (however encoded), +a processor can reliably read the entire encoding declaration as soon as it +has detected which family of encodings is in use. Since in practice, all widely +used character encodings fall into one of the categories above, the XML encoding +declaration allows reasonably reliable in-band labeling of character encodings, +even when external sources of information at the operating-system or transport-protocol +level are unreliable. Character encodings such as UTF-7 +that make overloaded usage of ASCII-valued bytes may fail to be reliably detected.

Once the processor has detected the character encoding in use, it can act +appropriately, whether by invoking a separate input routine for each case, +or by calling the proper conversion function on each character of input.

Like any self-labeling system, the XML encoding declaration will not work +if any software changes the entity's character set or encoding without updating +the encoding declaration. Implementors of character-encoding routines should +be careful to ensure the accuracy of the internal and external information +used to label the entity.

E.2 Priorities in the Presence of External Encoding Information

The second possible case occurs when the XML entity is accompanied by encoding +information, as in some file systems and some network protocols. When multiple +sources of information are available, their relative priority and the preferred +method of handling conflict should be specified as part of the higher-level +protocol used to deliver XML. In particular, please refer +to [IETF RFC 3023] or its successor, which defines the text/xml +and application/xml MIME types and provides some useful guidance. +In the interests of interoperability, however, the following rule is recommended.

  • If an XML entity is in a file, the Byte-Order Mark and encoding declaration are used +(if present) to determine the character encoding.

F W3C XML Working Group (Non-Normative)

This specification was prepared and approved for publication by the W3C +XML Working Group (WG). WG approval of this specification does not necessarily +imply that all WG participants voted for its approval. The current and former members +in the XML WG are:

G W3C XML Core Working Group (Non-Normative)

The present edition of this specification was prepared by the W3C XML Core +Working Group (WG). The participants in the WG at the time of publication of this +edition were:

H Production Notes (Non-Normative)

This edition was encoded in a +slightly modified version of the +XMLspec DTD, 2.5. +The XHTML versions were produced with a combination of the +xmlspec.xsl, +diffspec.xsl, +and REC-xml-3e.xsl +XSLT stylesheets.

I Suggestions for XML Names (Non-Normative)

The following suggestions define what is believed to be best +practice in the construction of XML names used as element names, +attribute names, processing instruction targets, entity names, +notation names, and the values of attributes of type ID, and are +intended as guidance for document authors and schema designers. +All references to Unicode are understood with respect to +a particular version of the Unicode Standard greater than or equal +to 3.0; which version should be used is left to the discretion of +the document author or schema designer.

The first two suggestions are directly derived from the rules +given for identifiers in the Unicode Standard, version 3.0, and +exclude all control characters, enclosing nonspacing marks, +non-decimal numbers, private-use characters, punctuation characters +(with the noted exceptions), symbol characters, unassigned +codepoints, and white space characters. The other suggestions +are mostly derived from [XML-1.0] Appendix B.

  1. The first character of any name should have a Unicode General +Category of Ll, Lu, Lo, Lm, Lt, or Nl, or else be '_' #x5F.

  2. Characters other than the first should have a Unicode General +Category of Ll, Lu, Lo, Lm, Lt, Mc, Mn, Nl, Nd, Pc, or Cf, or else +be one of the following: '-' #x2D, '.' #x2E, ':' #x3A or +'·' #xB7 (middle dot). Since Cf characters are not +directly visible, they should be employed with caution and only +when necessary, to avoid creating names which are distinct to XML +processors but look the same to human beings.

  3. Ideographic characters which have a canonical decomposition +(including those in the ranges [#xF900-#xFAFF] and +[#x2F800-#x2FFFD], with 12 exceptions) should not be used in names. +

  4. Characters which have a compatibility decomposition (those with +a "compatibility formatting tag" in field 5 of the Unicode +Character Database -- marked by field 5 beginning with a "<") +should not be used in names. This suggestion does not apply +to #x0E33 THAI CHARACTER SARA AM or #x0EB3 LAO CHARACTER AM, which +despite their compatibility decompositions are in regular use in +those scripts.

  5. Combining characters meant for use with symbols only (including +those in the ranges [#x20D0-#x20EF] and [#x1D165-#x1D1AD]) should +not be used in names.

  6. The interlinear annotation characters ([#xFFF9-#xFFFB) should +not be used in names.

  7. Variation selector characters should not be used in names.

  8. Names which are nonsensical, unpronounceable, hard to read, or +easily confusable with other names should not be employed.

diff --git a/src/tests/xml.cpp b/src/tests/xml.cpp new file mode 100644 index 0000000..9ef6a7e --- /dev/null +++ b/src/tests/xml.cpp @@ -0,0 +1,15 @@ +#include "bu/xmlreader.h" +#include "bu/xmlnode.h" +#include "bu/xmldocument.h" +#include "bu/file.h" + +int main() +{ + Bu::File f("test.xml", "r"); + Bu::XmlReader xr( f ); + + xr.read(); + + return 0; +} + diff --git a/src/tsfdocument.cpp b/src/tsfdocument.cpp new file mode 100644 index 0000000..582f1b1 --- /dev/null +++ b/src/tsfdocument.cpp @@ -0,0 +1,9 @@ +#include "tsfdocument.h" + +Bu::TsfDocument::TsfDocument() +{ +} + +Bu::TsfDocument::~TsfDocument() +{ +} diff --git a/src/tsfdocument.h b/src/tsfdocument.h new file mode 100644 index 0000000..e324459 --- /dev/null +++ b/src/tsfdocument.h @@ -0,0 +1,22 @@ +#ifndef TSF_DOCUMENT_H +#define TSF_DOCUMENT_H + +#include + +namespace Bu +{ + /** + * + */ + class TsfDocument + { + public: + TsfDocument(); + virtual ~TsfDocument(); + + private: + + }; +} + +#endif diff --git a/src/tsfnode.cpp b/src/tsfnode.cpp new file mode 100644 index 0000000..19df4ed --- /dev/null +++ b/src/tsfnode.cpp @@ -0,0 +1,9 @@ +#include "tsfnode.h" + +Bu::TsfNode::TsfNode() +{ +} + +Bu::TsfNode::~TsfNode() +{ +} diff --git a/src/tsfnode.h b/src/tsfnode.h new file mode 100644 index 0000000..f58b825 --- /dev/null +++ b/src/tsfnode.h @@ -0,0 +1,21 @@ +#ifndef TSF_NODE_H +#define TSF_NODE_H + +#include + +namespace Bu +{ + /** + * + */ + class TsfNode + { + public: + TsfNode(); + virtual ~TsfNode(); + + private: + + }; +} +#endif diff --git a/src/tsfreader.cpp b/src/tsfreader.cpp new file mode 100644 index 0000000..58f4f78 --- /dev/null +++ b/src/tsfreader.cpp @@ -0,0 +1,9 @@ +#include "tsfreader.h" + +Bu::TsfReader::TsfReader() +{ +} + +Bu::TsfReader::~TsfReader() +{ +} diff --git a/src/tsfreader.h b/src/tsfreader.h new file mode 100644 index 0000000..cc8400a --- /dev/null +++ b/src/tsfreader.h @@ -0,0 +1,22 @@ +#ifndef TSF_READER_H +#define TSF_READER_H + +#include + +namespace Bu +{ + /** + * + */ + class TsfReader + { + public: + TsfReader(); + virtual ~TsfReader(); + + private: + + }; +} + +#endif diff --git a/src/tsfwriter.cpp b/src/tsfwriter.cpp new file mode 100644 index 0000000..6592996 --- /dev/null +++ b/src/tsfwriter.cpp @@ -0,0 +1,9 @@ +#include "tsfwriter.h" + +Bu::TsfWriter::TsfWriter() +{ +} + +Bu::TsfWriter::~TsfWriter() +{ +} diff --git a/src/tsfwriter.h b/src/tsfwriter.h new file mode 100644 index 0000000..18f19d6 --- /dev/null +++ b/src/tsfwriter.h @@ -0,0 +1,22 @@ +#ifndef TSF_WRITER_H +#define TSF_WRITER_H + +#include + +namespace Bu +{ + /** + * + */ + class TsfWriter + { + public: + TsfWriter(); + virtual ~TsfWriter(); + + private: + + }; +} + +#endif diff --git a/src/xmldocument.cpp b/src/xmldocument.cpp new file mode 100644 index 0000000..cb21826 --- /dev/null +++ b/src/xmldocument.cpp @@ -0,0 +1,9 @@ +#include "xmldocument.h" + +Bu::XmlDocument::XmlDocument() +{ +} + +Bu::XmlDocument::~XmlDocument() +{ +} diff --git a/src/xmldocument.h b/src/xmldocument.h new file mode 100644 index 0000000..e16e3ea --- /dev/null +++ b/src/xmldocument.h @@ -0,0 +1,22 @@ +#ifndef XML_DOCUMENT_H +#define XML_DOCUMENT_H + +#include + +namespace Bu +{ + /** + * + */ + class XmlDocument + { + public: + XmlDocument(); + virtual ~XmlDocument(); + + private: + + }; +} + +#endif diff --git a/src/xmlnode.cpp b/src/xmlnode.cpp new file mode 100644 index 0000000..58ef5c5 --- /dev/null +++ b/src/xmlnode.cpp @@ -0,0 +1,9 @@ +#include "xmlnode.h" + +Bu::XmlNode::XmlNode() +{ +} + +Bu::XmlNode::~XmlNode() +{ +} diff --git a/src/xmlnode.h b/src/xmlnode.h new file mode 100644 index 0000000..cd9961a --- /dev/null +++ b/src/xmlnode.h @@ -0,0 +1,22 @@ +#ifndef XML_NODE_H +#define XML_NODE_H + +#include + +namespace Bu +{ + /** + * + */ + class XmlNode + { + public: + XmlNode(); + virtual ~XmlNode(); + + private: + + }; +} + +#endif diff --git a/src/xmlreader.cpp b/src/xmlreader.cpp new file mode 100644 index 0000000..432ecc1 --- /dev/null +++ b/src/xmlreader.cpp @@ -0,0 +1,108 @@ +#include "xmlreader.h" + +Bu::XmlReader::XmlReader( Bu::Stream &sIn ) : + sIn( sIn ) +{ +} + +Bu::XmlReader::~XmlReader() +{ +} + +const char *Bu::XmlReader::lookahead( int nAmnt ) +{ + if( sBuf.getSize() >= nAmnt ) + return sBuf.getStr(); + + int nNew = nAmnt - sBuf.getSize(); + char *buf = new char[nNew]; + sIn.read( buf, nNew ); + sBuf.append( buf ); + + return sBuf.getStr(); +} + +void Bu::XmlReader::burn( int nAmnt ) +{ + if( sBuf.getSize() < nAmnt ) + { + lookahead( nAmnt ); + } + + sBuf.remove( nAmnt ); +} + +void Bu::XmlNode::checkString( const char *str, int nLen ) +{ + if( !strncmp( str, lookahead( nLen ), nLen ) ) + { + burn( nLen ); + return; + } + + throw Bu::ExceptionBase("Expected string '%s'", str ); +} + +Bu::XmlNode *Bu::XmlReader::read() +{ + prolog(); +} + +void Bu::XmlReader::prolog() +{ + XMLDecl(); + Misc(); +} + +void Bu::XmlReader::XMLDecl() +{ + checkString(" +#include "bu/stream.h" +#include "bu/fstring.h" +#include "bu/xmlnode.h" + +namespace Bu +{ + /** + * + */ + class XmlReader + { + public: + XmlReader( Bu::Stream &sIn ); + virtual ~XmlReader(); + + XmlNode *read(); + + private: + Bu::Stream &sIn; + Bu::FString sBuf; + + private: // Helpers + const char *lookahead( int nAmnt ); + void burn( int nAmnt ); + void checkString( const char *str, int nLen ); + + private: // States + /** + * The headers, etc. + */ + void prolog(); + + /** + * The xml decleration (version, encoding, etc). + */ + void XMLDecl(); + + /** + * Misc things...? + */ + void Misc(); + + /** + * Whitespace eater. + */ + void S(); + + /** + * Optional whitespace eater. + */ + void Sq(); + + /** + * XML Version spec + */ + void VersionInfo(); + + /** + * Your basic equals sign with surrounding whitespace. + */ + void Eq(); + + }; +} + +#endif diff --git a/src/xmlwriter.cpp b/src/xmlwriter.cpp new file mode 100644 index 0000000..23a5175 --- /dev/null +++ b/src/xmlwriter.cpp @@ -0,0 +1,9 @@ +#include "xmlwriter.h" + +Bu::XmlWriter::XmlWriter() +{ +} + +Bu::XmlWriter::~XmlWriter() +{ +} diff --git a/src/xmlwriter.h b/src/xmlwriter.h new file mode 100644 index 0000000..796d6fb --- /dev/null +++ b/src/xmlwriter.h @@ -0,0 +1,22 @@ +#ifndef XML_WRITER_H +#define XML_WRITER_H + +#include + +namespace Bu +{ + /** + * + */ + class XmlWriter + { + public: + XmlWriter(); + virtual ~XmlWriter(); + + private: + + }; +} + +#endif -- cgit v1.2.3 From 6e7e30b5fd87766566620d48e785072e0b5c52cd Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Tue, 8 May 2007 06:33:25 +0000 Subject: Now they all read "taf" not "tsf" :) --- src/tafdocument.cpp | 9 +++++++++ src/tafdocument.h | 22 ++++++++++++++++++++++ src/tafnode.cpp | 9 +++++++++ src/tafnode.h | 21 +++++++++++++++++++++ src/tafreader.cpp | 9 +++++++++ src/tafreader.h | 22 ++++++++++++++++++++++ src/tafwriter.cpp | 9 +++++++++ src/tafwriter.h | 22 ++++++++++++++++++++++ src/tsfdocument.cpp | 9 --------- src/tsfdocument.h | 22 ---------------------- src/tsfnode.cpp | 9 --------- src/tsfnode.h | 21 --------------------- src/tsfreader.cpp | 9 --------- src/tsfreader.h | 22 ---------------------- src/tsfwriter.cpp | 9 --------- src/tsfwriter.h | 22 ---------------------- 16 files changed, 123 insertions(+), 123 deletions(-) create mode 100644 src/tafdocument.cpp create mode 100644 src/tafdocument.h create mode 100644 src/tafnode.cpp create mode 100644 src/tafnode.h create mode 100644 src/tafreader.cpp create mode 100644 src/tafreader.h create mode 100644 src/tafwriter.cpp create mode 100644 src/tafwriter.h delete mode 100644 src/tsfdocument.cpp delete mode 100644 src/tsfdocument.h delete mode 100644 src/tsfnode.cpp delete mode 100644 src/tsfnode.h delete mode 100644 src/tsfreader.cpp delete mode 100644 src/tsfreader.h delete mode 100644 src/tsfwriter.cpp delete mode 100644 src/tsfwriter.h diff --git a/src/tafdocument.cpp b/src/tafdocument.cpp new file mode 100644 index 0000000..bd44dd5 --- /dev/null +++ b/src/tafdocument.cpp @@ -0,0 +1,9 @@ +#include "tafdocument.h" + +Bu::TafDocument::TafDocument() +{ +} + +Bu::TafDocument::~TafDocument() +{ +} diff --git a/src/tafdocument.h b/src/tafdocument.h new file mode 100644 index 0000000..171f829 --- /dev/null +++ b/src/tafdocument.h @@ -0,0 +1,22 @@ +#ifndef BU_TAF_DOCUMENT_H +#define BU_TAF_DOCUMENT_H + +#include + +namespace Bu +{ + /** + * + */ + class TafDocument + { + public: + TafDocument(); + virtual ~TafDocument(); + + private: + + }; +} + +#endif diff --git a/src/tafnode.cpp b/src/tafnode.cpp new file mode 100644 index 0000000..c9756ec --- /dev/null +++ b/src/tafnode.cpp @@ -0,0 +1,9 @@ +#include "tafnode.h" + +Bu::TafNode::TafNode() +{ +} + +Bu::TafNode::~TafNode() +{ +} diff --git a/src/tafnode.h b/src/tafnode.h new file mode 100644 index 0000000..34f5289 --- /dev/null +++ b/src/tafnode.h @@ -0,0 +1,21 @@ +#ifndef BU_TAF_NODE_H +#define BU_TAF_NODE_H + +#include + +namespace Bu +{ + /** + * + */ + class TafNode + { + public: + TafNode(); + virtual ~TafNode(); + + private: + + }; +} +#endif diff --git a/src/tafreader.cpp b/src/tafreader.cpp new file mode 100644 index 0000000..4f2890a --- /dev/null +++ b/src/tafreader.cpp @@ -0,0 +1,9 @@ +#include "tafreader.h" + +Bu::TafReader::TafReader() +{ +} + +Bu::TafReader::~TafReader() +{ +} diff --git a/src/tafreader.h b/src/tafreader.h new file mode 100644 index 0000000..d9f1dfd --- /dev/null +++ b/src/tafreader.h @@ -0,0 +1,22 @@ +#ifndef BU_TAF_READER_H +#define BU_TAF_READER_H + +#include + +namespace Bu +{ + /** + * + */ + class TafReader + { + public: + TafReader(); + virtual ~TafReader(); + + private: + + }; +} + +#endif diff --git a/src/tafwriter.cpp b/src/tafwriter.cpp new file mode 100644 index 0000000..3e6c025 --- /dev/null +++ b/src/tafwriter.cpp @@ -0,0 +1,9 @@ +#include "tafwriter.h" + +Bu::TafWriter::TafWriter() +{ +} + +Bu::TafWriter::~TafWriter() +{ +} diff --git a/src/tafwriter.h b/src/tafwriter.h new file mode 100644 index 0000000..7057d62 --- /dev/null +++ b/src/tafwriter.h @@ -0,0 +1,22 @@ +#ifndef BU_TAF_WRITER_H +#define BU_TAF_WRITER_H + +#include + +namespace Bu +{ + /** + * + */ + class TafWriter + { + public: + TafWriter(); + virtual ~TafWriter(); + + private: + + }; +} + +#endif diff --git a/src/tsfdocument.cpp b/src/tsfdocument.cpp deleted file mode 100644 index 582f1b1..0000000 --- a/src/tsfdocument.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "tsfdocument.h" - -Bu::TsfDocument::TsfDocument() -{ -} - -Bu::TsfDocument::~TsfDocument() -{ -} diff --git a/src/tsfdocument.h b/src/tsfdocument.h deleted file mode 100644 index e324459..0000000 --- a/src/tsfdocument.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef TSF_DOCUMENT_H -#define TSF_DOCUMENT_H - -#include - -namespace Bu -{ - /** - * - */ - class TsfDocument - { - public: - TsfDocument(); - virtual ~TsfDocument(); - - private: - - }; -} - -#endif diff --git a/src/tsfnode.cpp b/src/tsfnode.cpp deleted file mode 100644 index 19df4ed..0000000 --- a/src/tsfnode.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "tsfnode.h" - -Bu::TsfNode::TsfNode() -{ -} - -Bu::TsfNode::~TsfNode() -{ -} diff --git a/src/tsfnode.h b/src/tsfnode.h deleted file mode 100644 index f58b825..0000000 --- a/src/tsfnode.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef TSF_NODE_H -#define TSF_NODE_H - -#include - -namespace Bu -{ - /** - * - */ - class TsfNode - { - public: - TsfNode(); - virtual ~TsfNode(); - - private: - - }; -} -#endif diff --git a/src/tsfreader.cpp b/src/tsfreader.cpp deleted file mode 100644 index 58f4f78..0000000 --- a/src/tsfreader.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "tsfreader.h" - -Bu::TsfReader::TsfReader() -{ -} - -Bu::TsfReader::~TsfReader() -{ -} diff --git a/src/tsfreader.h b/src/tsfreader.h deleted file mode 100644 index cc8400a..0000000 --- a/src/tsfreader.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef TSF_READER_H -#define TSF_READER_H - -#include - -namespace Bu -{ - /** - * - */ - class TsfReader - { - public: - TsfReader(); - virtual ~TsfReader(); - - private: - - }; -} - -#endif diff --git a/src/tsfwriter.cpp b/src/tsfwriter.cpp deleted file mode 100644 index 6592996..0000000 --- a/src/tsfwriter.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "tsfwriter.h" - -Bu::TsfWriter::TsfWriter() -{ -} - -Bu::TsfWriter::~TsfWriter() -{ -} diff --git a/src/tsfwriter.h b/src/tsfwriter.h deleted file mode 100644 index 18f19d6..0000000 --- a/src/tsfwriter.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef TSF_WRITER_H -#define TSF_WRITER_H - -#include - -namespace Bu -{ - /** - * - */ - class TsfWriter - { - public: - TsfWriter(); - virtual ~TsfWriter(); - - private: - - }; -} - -#endif -- cgit v1.2.3 From 2e035fee36768e3c765b7f5dc10bf0a3b7d2448b Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Wed, 9 May 2007 15:01:03 +0000 Subject: Minor changes to both the taf and xml readers. I'm thinking I'm going to archive these for now and resurect/fix the old xml reader, just to have something working. --- misc/taf | 26 ++++++++ src/tafreader.cpp | 4 +- src/tafreader.h | 7 ++- src/xmlreader.cpp | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++--- src/xmlreader.h | 53 ++++++++++++++++- 5 files changed, 253 insertions(+), 12 deletions(-) create mode 100644 misc/taf diff --git a/misc/taf b/misc/taf new file mode 100644 index 0000000..5ffcdcf --- /dev/null +++ b/misc/taf @@ -0,0 +1,26 @@ +{player: + password = "aoeuaoeuao" + userclass = "implementor" + species = "human" + sex = "male" + active + startroom = "Salourn::Xagafinelle's Room" + {stats: str=14 dex=12 spd=12 enr=7 rea=12 wil=10 int=13 cha=14} + {hp: cur = 100 max = 100} + {en: cur = 100 max = 100} + attackrate = 30 + gold = 0 + {inventory: + {: count=1 id="Salourn::Dark Blade"} + {: count=1 id="Salourn::Dark Suit"} + {: count=3 id="Salourn::Small Fig"} + } + {aliases: + {: key="." value="say"} + {: key="," value="yell"} + {: key="li" value="lightning"} + } + description = """They appear to be rather average looking, not particularly + tall or short, with facial features that are difficult to remember even + seconds after witnessing them.""" +} diff --git a/src/tafreader.cpp b/src/tafreader.cpp index 4f2890a..f94fe44 100644 --- a/src/tafreader.cpp +++ b/src/tafreader.cpp @@ -1,9 +1,11 @@ #include "tafreader.h" -Bu::TafReader::TafReader() +Bu::TafReader::TafReader( Bu::Stream &sIn ) : + sIn( sIn ) { } Bu::TafReader::~TafReader() { } + diff --git a/src/tafreader.h b/src/tafreader.h index d9f1dfd..2dbb9ea 100644 --- a/src/tafreader.h +++ b/src/tafreader.h @@ -2,19 +2,22 @@ #define BU_TAF_READER_H #include +#include "bu/tafdocument.h" +#include "bu/stream.h" namespace Bu { /** * */ - class TafReader + class TafReader : public Bu::TafDocument { public: - TafReader(); + TafReader( Bu::Stream &sIn ); virtual ~TafReader(); private: + Stream &sIn; }; } diff --git a/src/xmlreader.cpp b/src/xmlreader.cpp index 432ecc1..bd241cf 100644 --- a/src/xmlreader.cpp +++ b/src/xmlreader.cpp @@ -29,10 +29,10 @@ void Bu::XmlReader::burn( int nAmnt ) lookahead( nAmnt ); } - sBuf.remove( nAmnt ); + //sBuf.remove( nAmnt ); } -void Bu::XmlNode::checkString( const char *str, int nLen ) +void Bu::XmlReader::checkString( const char *str, int nLen ) { if( !strncmp( str, lookahead( nLen ), nLen ) ) { @@ -57,14 +57,66 @@ void Bu::XmlReader::prolog() void Bu::XmlReader::XMLDecl() { checkString("", 2 ); } void Bu::XmlReader::Misc() { + for(;;) + { + S(); + if( !strncmp("", 3 ); + return; + } + } + burn( 1 ); + } +} + +void Bu::XmlReader::PI() +{ + checkString("", lookahead(j+2)+j, 2 ) ) + { + burn( j+2 ); + return; + } + } } void Bu::XmlReader::S() @@ -75,12 +127,12 @@ void Bu::XmlReader::S() if( c == 0x20 || c == 0x9 || c == 0xD || c == 0xA ) continue; if( j == 0 ) - printf("Error, expected whitespace!\n"); + throw ExceptionBase("Expected whitespace."); return; } } -void Bu::XmlReader::S() +void Bu::XmlReader::Sq() { for(;;) { @@ -93,9 +145,19 @@ void Bu::XmlReader::S() void Bu::XmlReader::VersionInfo() { - S(); - checkString("version", 7 ); - + try + { + S(); + checkString("version", 7 ); + } + catch( ExceptionBase &e ) + { + return; + } + Eq(); + Bu::FString ver = AttValue(); + if( ver != "1.1" ) + throw ExceptionBase("Currently we only support xml version 1.1\n"); } void Bu::XmlReader::Eq() @@ -105,4 +167,101 @@ void Bu::XmlReader::Eq() Sq(); } +void Bu::XmlReader::EncodingDecl() +{ + S(); + try + { + checkString("encoding", 8 ); + } + catch( ExceptionBase &e ) + { + return; + } + + Eq(); + AttValue(); +} + +void Bu::XmlReader::SDDecl() +{ + S(); + try + { + checkString("standalone", 10 ); + } + catch( ExceptionBase &e ) + { + return; + } + + Eq(); + AttValue(); +} + +Bu::FString Bu::XmlReader::AttValue() +{ + char q = *lookahead(1); + if( q == '\"' ) + { + for( int j = 2;; j++ ) + { + if( lookahead(j)[j-1] == '\"' ) + { + Bu::FString ret( lookahead(j)+1, j-2 ); + burn( j ); + return ret; + } + } + } + else if( q == '\'' ) + { + for( int j = 2;; j++ ) + { + if( lookahead(j)[j-1] == '\'' ) + { + Bu::FString ret( lookahead(j)+1, j-2 ); + burn( j ); + return ret; + } + } + } + + throw ExceptionBase("Excpected either \' or \".\n"); +} + +Bu::FString Bu::XmlReader::Name() +{ + unsigned char c = *lookahead( 1 ); + if( c != ':' && c != '_' && + (c < 'A' || c > 'Z') && + (c < 'a' || c > 'z') && + (c < 0xC0 || c > 0xD6 ) && + (c < 0xD8 || c > 0xF6 ) && + (c < 0xF8)) + { + throw ExceptionBase("Invalid entity name starting character."); + } + + for( int j = 1;; j++ ) + { + unsigned char c = lookahead(j+1)[j]; + if( isS( c ) ) + { + FString ret( lookahead(j+1), j+1 ); + burn( j+1 ); + return ret; + } + if( c != ':' && c != '_' && c != '-' && c != '.' && c != 0xB7 && + (c < 'A' || c > 'Z') && + (c < 'a' || c > 'z') && + (c < '0' || c > '9') && + (c < 0xC0 || c > 0xD6 ) && + (c < 0xD8 || c > 0xF6 ) && + (c < 0xF8)) + { + throw ExceptionBase("Invalid character in name."); + } + } +} diff --git a/src/xmlreader.h b/src/xmlreader.h index 19791c4..708a386 100644 --- a/src/xmlreader.h +++ b/src/xmlreader.h @@ -9,7 +9,24 @@ namespace Bu { /** + * An Xml 1.1 reader. I've decided to write this, this time, based on the + * official W3C reccomendation, now included with the source code. I've + * named the productions in the parser states the same as in that document, + * which may make them easier to find, etc, although possibly slightly less + * optimized than writing my own reduced grammer. * + * Below I will list differences between my parser and the official standard + * as I come up with them. + * - Encoding and Standalone headings are ignored for the moment. (4.3.3, + * 2.9) + * - The standalone heading attribute can have any standard whitespace + * before it (the specs say only spaces, no newlines). (2.9) + * - Since standalone is ignored, it is currently allowed to have any + * value (should be restricted to "yes" or "no"). (2.9) + * - Currently only UTF-8 / ascii are parsed. + * - [optional] The content of comments is thrown away. (2.5) + * - The content of processing instruction blocks is parsed properly, but + * thrown away. (2.6) */ class XmlReader { @@ -40,10 +57,20 @@ namespace Bu void XMLDecl(); /** - * Misc things...? + * Misc things, Includes Comments and PIData (Processing Instructions). */ void Misc(); + /** + * Comments + */ + void Comment(); + + /** + * Processing Instructions + */ + void PI(); + /** * Whitespace eater. */ @@ -64,6 +91,30 @@ namespace Bu */ void Eq(); + /** + * Read in an attribute value. + */ + FString AttValue(); + + /** + * Read in the name of something. + */ + FString Name(); + + /** + * Encoding decleration in the header + */ + void EncodingDecl(); + + /** + * Standalone decleration in the header + */ + void SDDecl(); + + bool isS( unsigned char c ) + { + return ( c == 0x20 || c == 0x9 || c == 0xD || c == 0xA ); + } }; } -- cgit v1.2.3 From ad92dc50b7cdf7cfe086f21d19442d03a90fd05d Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Wed, 9 May 2007 15:04:31 +0000 Subject: Just a few things re-arranged, moved the new taf/xml systems to the inprogress directory, and moved the old xml system in, so it will require heavy changes. --- src/inprogress/tafdocument.cpp | 9 + src/inprogress/tafdocument.h | 22 ++ src/inprogress/tafnode.cpp | 9 + src/inprogress/tafnode.h | 21 ++ src/inprogress/tafreader.cpp | 11 + src/inprogress/tafreader.h | 25 ++ src/inprogress/tafwriter.cpp | 9 + src/inprogress/tafwriter.h | 22 ++ src/inprogress/xmldocument.cpp | 9 + src/inprogress/xmldocument.h | 22 ++ src/inprogress/xmlnode.cpp | 9 + src/inprogress/xmlnode.h | 22 ++ src/inprogress/xmlreader.cpp | 267 +++++++++++++++++ src/inprogress/xmlreader.h | 121 ++++++++ src/inprogress/xmlwriter.cpp | 9 + src/inprogress/xmlwriter.h | 22 ++ src/old/xmldocument.cpp | 149 --------- src/old/xmldocument.h | 171 ----------- src/old/xmlnode.cpp | 445 --------------------------- src/old/xmlnode.h | 236 --------------- src/old/xmlreader.cpp | 602 ------------------------------------- src/old/xmlreader.h | 141 --------- src/old/xmlwriter.cpp | 173 ----------- src/old/xmlwriter.h | 96 ------ src/tafdocument.cpp | 9 - src/tafdocument.h | 22 -- src/tafnode.cpp | 9 - src/tafnode.h | 21 -- src/tafreader.cpp | 11 - src/tafreader.h | 25 -- src/tafwriter.cpp | 9 - src/tafwriter.h | 22 -- src/xmldocument.cpp | 146 ++++++++- src/xmldocument.h | 175 ++++++++++- src/xmlnode.cpp | 440 ++++++++++++++++++++++++++- src/xmlnode.h | 240 ++++++++++++++- src/xmlreader.cpp | 665 +++++++++++++++++++++++++++++++---------- src/xmlreader.h | 252 +++++++++------- src/xmlwriter.cpp | 168 ++++++++++- src/xmlwriter.h | 100 ++++++- 40 files changed, 2468 insertions(+), 2468 deletions(-) create mode 100644 src/inprogress/tafdocument.cpp create mode 100644 src/inprogress/tafdocument.h create mode 100644 src/inprogress/tafnode.cpp create mode 100644 src/inprogress/tafnode.h create mode 100644 src/inprogress/tafreader.cpp create mode 100644 src/inprogress/tafreader.h create mode 100644 src/inprogress/tafwriter.cpp create mode 100644 src/inprogress/tafwriter.h create mode 100644 src/inprogress/xmldocument.cpp create mode 100644 src/inprogress/xmldocument.h create mode 100644 src/inprogress/xmlnode.cpp create mode 100644 src/inprogress/xmlnode.h create mode 100644 src/inprogress/xmlreader.cpp create mode 100644 src/inprogress/xmlreader.h create mode 100644 src/inprogress/xmlwriter.cpp create mode 100644 src/inprogress/xmlwriter.h delete mode 100644 src/old/xmldocument.cpp delete mode 100644 src/old/xmldocument.h delete mode 100644 src/old/xmlnode.cpp delete mode 100644 src/old/xmlnode.h delete mode 100644 src/old/xmlreader.cpp delete mode 100644 src/old/xmlreader.h delete mode 100644 src/old/xmlwriter.cpp delete mode 100644 src/old/xmlwriter.h delete mode 100644 src/tafdocument.cpp delete mode 100644 src/tafdocument.h delete mode 100644 src/tafnode.cpp delete mode 100644 src/tafnode.h delete mode 100644 src/tafreader.cpp delete mode 100644 src/tafreader.h delete mode 100644 src/tafwriter.cpp delete mode 100644 src/tafwriter.h diff --git a/src/inprogress/tafdocument.cpp b/src/inprogress/tafdocument.cpp new file mode 100644 index 0000000..bd44dd5 --- /dev/null +++ b/src/inprogress/tafdocument.cpp @@ -0,0 +1,9 @@ +#include "tafdocument.h" + +Bu::TafDocument::TafDocument() +{ +} + +Bu::TafDocument::~TafDocument() +{ +} diff --git a/src/inprogress/tafdocument.h b/src/inprogress/tafdocument.h new file mode 100644 index 0000000..171f829 --- /dev/null +++ b/src/inprogress/tafdocument.h @@ -0,0 +1,22 @@ +#ifndef BU_TAF_DOCUMENT_H +#define BU_TAF_DOCUMENT_H + +#include + +namespace Bu +{ + /** + * + */ + class TafDocument + { + public: + TafDocument(); + virtual ~TafDocument(); + + private: + + }; +} + +#endif diff --git a/src/inprogress/tafnode.cpp b/src/inprogress/tafnode.cpp new file mode 100644 index 0000000..c9756ec --- /dev/null +++ b/src/inprogress/tafnode.cpp @@ -0,0 +1,9 @@ +#include "tafnode.h" + +Bu::TafNode::TafNode() +{ +} + +Bu::TafNode::~TafNode() +{ +} diff --git a/src/inprogress/tafnode.h b/src/inprogress/tafnode.h new file mode 100644 index 0000000..34f5289 --- /dev/null +++ b/src/inprogress/tafnode.h @@ -0,0 +1,21 @@ +#ifndef BU_TAF_NODE_H +#define BU_TAF_NODE_H + +#include + +namespace Bu +{ + /** + * + */ + class TafNode + { + public: + TafNode(); + virtual ~TafNode(); + + private: + + }; +} +#endif diff --git a/src/inprogress/tafreader.cpp b/src/inprogress/tafreader.cpp new file mode 100644 index 0000000..f94fe44 --- /dev/null +++ b/src/inprogress/tafreader.cpp @@ -0,0 +1,11 @@ +#include "tafreader.h" + +Bu::TafReader::TafReader( Bu::Stream &sIn ) : + sIn( sIn ) +{ +} + +Bu::TafReader::~TafReader() +{ +} + diff --git a/src/inprogress/tafreader.h b/src/inprogress/tafreader.h new file mode 100644 index 0000000..2dbb9ea --- /dev/null +++ b/src/inprogress/tafreader.h @@ -0,0 +1,25 @@ +#ifndef BU_TAF_READER_H +#define BU_TAF_READER_H + +#include +#include "bu/tafdocument.h" +#include "bu/stream.h" + +namespace Bu +{ + /** + * + */ + class TafReader : public Bu::TafDocument + { + public: + TafReader( Bu::Stream &sIn ); + virtual ~TafReader(); + + private: + Stream &sIn; + + }; +} + +#endif diff --git a/src/inprogress/tafwriter.cpp b/src/inprogress/tafwriter.cpp new file mode 100644 index 0000000..3e6c025 --- /dev/null +++ b/src/inprogress/tafwriter.cpp @@ -0,0 +1,9 @@ +#include "tafwriter.h" + +Bu::TafWriter::TafWriter() +{ +} + +Bu::TafWriter::~TafWriter() +{ +} diff --git a/src/inprogress/tafwriter.h b/src/inprogress/tafwriter.h new file mode 100644 index 0000000..7057d62 --- /dev/null +++ b/src/inprogress/tafwriter.h @@ -0,0 +1,22 @@ +#ifndef BU_TAF_WRITER_H +#define BU_TAF_WRITER_H + +#include + +namespace Bu +{ + /** + * + */ + class TafWriter + { + public: + TafWriter(); + virtual ~TafWriter(); + + private: + + }; +} + +#endif diff --git a/src/inprogress/xmldocument.cpp b/src/inprogress/xmldocument.cpp new file mode 100644 index 0000000..cb21826 --- /dev/null +++ b/src/inprogress/xmldocument.cpp @@ -0,0 +1,9 @@ +#include "xmldocument.h" + +Bu::XmlDocument::XmlDocument() +{ +} + +Bu::XmlDocument::~XmlDocument() +{ +} diff --git a/src/inprogress/xmldocument.h b/src/inprogress/xmldocument.h new file mode 100644 index 0000000..e16e3ea --- /dev/null +++ b/src/inprogress/xmldocument.h @@ -0,0 +1,22 @@ +#ifndef XML_DOCUMENT_H +#define XML_DOCUMENT_H + +#include + +namespace Bu +{ + /** + * + */ + class XmlDocument + { + public: + XmlDocument(); + virtual ~XmlDocument(); + + private: + + }; +} + +#endif diff --git a/src/inprogress/xmlnode.cpp b/src/inprogress/xmlnode.cpp new file mode 100644 index 0000000..58ef5c5 --- /dev/null +++ b/src/inprogress/xmlnode.cpp @@ -0,0 +1,9 @@ +#include "xmlnode.h" + +Bu::XmlNode::XmlNode() +{ +} + +Bu::XmlNode::~XmlNode() +{ +} diff --git a/src/inprogress/xmlnode.h b/src/inprogress/xmlnode.h new file mode 100644 index 0000000..cd9961a --- /dev/null +++ b/src/inprogress/xmlnode.h @@ -0,0 +1,22 @@ +#ifndef XML_NODE_H +#define XML_NODE_H + +#include + +namespace Bu +{ + /** + * + */ + class XmlNode + { + public: + XmlNode(); + virtual ~XmlNode(); + + private: + + }; +} + +#endif diff --git a/src/inprogress/xmlreader.cpp b/src/inprogress/xmlreader.cpp new file mode 100644 index 0000000..bd241cf --- /dev/null +++ b/src/inprogress/xmlreader.cpp @@ -0,0 +1,267 @@ +#include "xmlreader.h" + +Bu::XmlReader::XmlReader( Bu::Stream &sIn ) : + sIn( sIn ) +{ +} + +Bu::XmlReader::~XmlReader() +{ +} + +const char *Bu::XmlReader::lookahead( int nAmnt ) +{ + if( sBuf.getSize() >= nAmnt ) + return sBuf.getStr(); + + int nNew = nAmnt - sBuf.getSize(); + char *buf = new char[nNew]; + sIn.read( buf, nNew ); + sBuf.append( buf ); + + return sBuf.getStr(); +} + +void Bu::XmlReader::burn( int nAmnt ) +{ + if( sBuf.getSize() < nAmnt ) + { + lookahead( nAmnt ); + } + + //sBuf.remove( nAmnt ); +} + +void Bu::XmlReader::checkString( const char *str, int nLen ) +{ + if( !strncmp( str, lookahead( nLen ), nLen ) ) + { + burn( nLen ); + return; + } + + throw Bu::ExceptionBase("Expected string '%s'", str ); +} + +Bu::XmlNode *Bu::XmlReader::read() +{ + prolog(); +} + +void Bu::XmlReader::prolog() +{ + XMLDecl(); + Misc(); +} + +void Bu::XmlReader::XMLDecl() +{ + checkString("", 2 ); +} + +void Bu::XmlReader::Misc() +{ + for(;;) + { + S(); + if( !strncmp("", 3 ); + return; + } + } + burn( 1 ); + } +} + +void Bu::XmlReader::PI() +{ + checkString("", lookahead(j+2)+j, 2 ) ) + { + burn( j+2 ); + return; + } + } +} + +void Bu::XmlReader::S() +{ + for( int j = 0;; j++ ) + { + char c = *lookahead( 1 ); + if( c == 0x20 || c == 0x9 || c == 0xD || c == 0xA ) + continue; + if( j == 0 ) + throw ExceptionBase("Expected whitespace."); + return; + } +} + +void Bu::XmlReader::Sq() +{ + for(;;) + { + char c = *lookahead( 1 ); + if( c == 0x20 || c == 0x9 || c == 0xD || c == 0xA ) + continue; + return; + } +} + +void Bu::XmlReader::VersionInfo() +{ + try + { + S(); + checkString("version", 7 ); + } + catch( ExceptionBase &e ) + { + return; + } + Eq(); + Bu::FString ver = AttValue(); + if( ver != "1.1" ) + throw ExceptionBase("Currently we only support xml version 1.1\n"); +} + +void Bu::XmlReader::Eq() +{ + Sq(); + checkString("=", 1 ); + Sq(); +} + +void Bu::XmlReader::EncodingDecl() +{ + S(); + try + { + checkString("encoding", 8 ); + } + catch( ExceptionBase &e ) + { + return; + } + + Eq(); + AttValue(); +} + +void Bu::XmlReader::SDDecl() +{ + S(); + try + { + checkString("standalone", 10 ); + } + catch( ExceptionBase &e ) + { + return; + } + + Eq(); + AttValue(); +} + +Bu::FString Bu::XmlReader::AttValue() +{ + char q = *lookahead(1); + if( q == '\"' ) + { + for( int j = 2;; j++ ) + { + if( lookahead(j)[j-1] == '\"' ) + { + Bu::FString ret( lookahead(j)+1, j-2 ); + burn( j ); + return ret; + } + } + } + else if( q == '\'' ) + { + for( int j = 2;; j++ ) + { + if( lookahead(j)[j-1] == '\'' ) + { + Bu::FString ret( lookahead(j)+1, j-2 ); + burn( j ); + return ret; + } + } + } + + throw ExceptionBase("Excpected either \' or \".\n"); +} + +Bu::FString Bu::XmlReader::Name() +{ + unsigned char c = *lookahead( 1 ); + if( c != ':' && c != '_' && + (c < 'A' || c > 'Z') && + (c < 'a' || c > 'z') && + (c < 0xC0 || c > 0xD6 ) && + (c < 0xD8 || c > 0xF6 ) && + (c < 0xF8)) + { + throw ExceptionBase("Invalid entity name starting character."); + } + + for( int j = 1;; j++ ) + { + unsigned char c = lookahead(j+1)[j]; + if( isS( c ) ) + { + FString ret( lookahead(j+1), j+1 ); + burn( j+1 ); + return ret; + } + if( c != ':' && c != '_' && c != '-' && c != '.' && c != 0xB7 && + (c < 'A' || c > 'Z') && + (c < 'a' || c > 'z') && + (c < '0' || c > '9') && + (c < 0xC0 || c > 0xD6 ) && + (c < 0xD8 || c > 0xF6 ) && + (c < 0xF8)) + { + throw ExceptionBase("Invalid character in name."); + } + } +} + diff --git a/src/inprogress/xmlreader.h b/src/inprogress/xmlreader.h new file mode 100644 index 0000000..708a386 --- /dev/null +++ b/src/inprogress/xmlreader.h @@ -0,0 +1,121 @@ +#ifndef XML_READER_H +#define XML_READER_H + +#include +#include "bu/stream.h" +#include "bu/fstring.h" +#include "bu/xmlnode.h" + +namespace Bu +{ + /** + * An Xml 1.1 reader. I've decided to write this, this time, based on the + * official W3C reccomendation, now included with the source code. I've + * named the productions in the parser states the same as in that document, + * which may make them easier to find, etc, although possibly slightly less + * optimized than writing my own reduced grammer. + * + * Below I will list differences between my parser and the official standard + * as I come up with them. + * - Encoding and Standalone headings are ignored for the moment. (4.3.3, + * 2.9) + * - The standalone heading attribute can have any standard whitespace + * before it (the specs say only spaces, no newlines). (2.9) + * - Since standalone is ignored, it is currently allowed to have any + * value (should be restricted to "yes" or "no"). (2.9) + * - Currently only UTF-8 / ascii are parsed. + * - [optional] The content of comments is thrown away. (2.5) + * - The content of processing instruction blocks is parsed properly, but + * thrown away. (2.6) + */ + class XmlReader + { + public: + XmlReader( Bu::Stream &sIn ); + virtual ~XmlReader(); + + XmlNode *read(); + + private: + Bu::Stream &sIn; + Bu::FString sBuf; + + private: // Helpers + const char *lookahead( int nAmnt ); + void burn( int nAmnt ); + void checkString( const char *str, int nLen ); + + private: // States + /** + * The headers, etc. + */ + void prolog(); + + /** + * The xml decleration (version, encoding, etc). + */ + void XMLDecl(); + + /** + * Misc things, Includes Comments and PIData (Processing Instructions). + */ + void Misc(); + + /** + * Comments + */ + void Comment(); + + /** + * Processing Instructions + */ + void PI(); + + /** + * Whitespace eater. + */ + void S(); + + /** + * Optional whitespace eater. + */ + void Sq(); + + /** + * XML Version spec + */ + void VersionInfo(); + + /** + * Your basic equals sign with surrounding whitespace. + */ + void Eq(); + + /** + * Read in an attribute value. + */ + FString AttValue(); + + /** + * Read in the name of something. + */ + FString Name(); + + /** + * Encoding decleration in the header + */ + void EncodingDecl(); + + /** + * Standalone decleration in the header + */ + void SDDecl(); + + bool isS( unsigned char c ) + { + return ( c == 0x20 || c == 0x9 || c == 0xD || c == 0xA ); + } + }; +} + +#endif diff --git a/src/inprogress/xmlwriter.cpp b/src/inprogress/xmlwriter.cpp new file mode 100644 index 0000000..23a5175 --- /dev/null +++ b/src/inprogress/xmlwriter.cpp @@ -0,0 +1,9 @@ +#include "xmlwriter.h" + +Bu::XmlWriter::XmlWriter() +{ +} + +Bu::XmlWriter::~XmlWriter() +{ +} diff --git a/src/inprogress/xmlwriter.h b/src/inprogress/xmlwriter.h new file mode 100644 index 0000000..796d6fb --- /dev/null +++ b/src/inprogress/xmlwriter.h @@ -0,0 +1,22 @@ +#ifndef XML_WRITER_H +#define XML_WRITER_H + +#include + +namespace Bu +{ + /** + * + */ + class XmlWriter + { + public: + XmlWriter(); + virtual ~XmlWriter(); + + private: + + }; +} + +#endif diff --git a/src/old/xmldocument.cpp b/src/old/xmldocument.cpp deleted file mode 100644 index d7867d5..0000000 --- a/src/old/xmldocument.cpp +++ /dev/null @@ -1,149 +0,0 @@ -#include -#include -#include "xmlwriter.h" - -XmlDocument::XmlDocument( XmlNode *pRoot ) -{ - this->pRoot = pRoot; - pCurrent = NULL; - bCompleted = (pRoot!=NULL); -} - -XmlDocument::~XmlDocument() -{ - if( pRoot ) - { - delete pRoot; - } -} - -void XmlDocument::addNode( const char *sName, const char *sContent, bool bClose ) -{ - if( pRoot == NULL ) - { - // This is the first node, so ignore position and just insert it. - pCurrent = pRoot = new XmlNode( sName, NULL, sContent ); - } - else - { - pCurrent = pCurrent->addChild( sName, sContent ); - } - - if( bClose ) - { - closeNode(); - } -} - -void XmlDocument::setName( const char *sName ) -{ - pCurrent->setName( sName ); -} - -bool XmlDocument::isCompleted() -{ - return bCompleted; -} - -XmlNode *XmlDocument::getRoot() -{ - return pRoot; -} - -XmlNode *XmlDocument::detatchRoot() -{ - XmlNode *pTemp = pRoot; - pRoot = NULL; - return pTemp; -} - -XmlNode *XmlDocument::getCurrent() -{ - return pCurrent; -} - -void XmlDocument::closeNode() -{ - if( pCurrent != NULL ) - { - pCurrent = pCurrent->getParent(); - - if( pCurrent == NULL ) - { - bCompleted = true; - } - } -} - -void XmlDocument::addProperty( const char *sName, const char *sValue ) -{ - if( pCurrent ) - { - pCurrent->addProperty( sName, sValue ); - } -} - -void XmlDocument::addProperty( const char *sName, const unsigned char nValue ) -{ - char buf[12]; - sprintf( buf, "%hhi", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const char nValue ) -{ - char buf[12]; - sprintf( buf, "%hhi", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const unsigned short nValue ) -{ - char buf[12]; - sprintf( buf, "%hi", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const short nValue ) -{ - char buf[12]; - sprintf( buf, "%hi", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const int nValue ) -{ - char buf[12]; - sprintf( buf, "%d", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const unsigned long nValue ) -{ - char buf[12]; - sprintf( buf, "%li", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const long nValue ) -{ - char buf[12]; - sprintf( buf, "%li", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const double dValue ) -{ - char buf[40]; - sprintf( buf, "%f", dValue ); - addProperty( sName, buf ); -} - -void XmlDocument::setContent( const char *sContent ) -{ - if( pCurrent ) - { - pCurrent->setContent( sContent ); - } -} - diff --git a/src/old/xmldocument.h b/src/old/xmldocument.h deleted file mode 100644 index 6671c41..0000000 --- a/src/old/xmldocument.h +++ /dev/null @@ -1,171 +0,0 @@ -#ifndef XMLDOCUMENT -#define XMLDOCUMENT - -#include "xmlnode.h" - -/** - * Keeps track of an easily managed set of XmlNode information. Allows simple - * operations for logical writing to and reading from XML structures. Using - * already formed structures is simply done through the XmlNode structures, - * and the getRoot function here. Creation is performed through a simple set - * of operations that creates the data in a stream type format. - *@author Mike Buland - */ -class XmlDocument -{ -public: - /** - * Construct either a blank XmlDocuemnt or construct a document around an - * existing XmlNode. Be careful, once an XmlNode is passed into a document - * the document takes over ownership and will delete it when the XmlDocument - * is deleted. - *@param pRoot The XmlNode to use as the root of this document, or NULL if - * you want to start a new document. - */ - XmlDocument( XmlNode *pRoot=NULL ); - - /** - * Destroy all contained nodes. - */ - virtual ~XmlDocument(); - - /** - * Add a new node to the document. The new node is appended to the end of - * the current context, i.e. XmlNode, and the new node, provided it isn't - * close as part of this operation, will become the current context. - *@param sName The name of the new node to add. - *@param sContent A content string to be placed inside of the new node. - *@param bClose Set this to true to close the node immediately after adding - * the node and setting the content and name. If this is set to true the - * node is appended, but the context node doesn't change. - */ - void addNode( const char *sName=NULL, const char *sContent=NULL, bool bClose=false ); - - /** - * Set the name of the current node context. - *@param sName The new name of the node. - */ - void setName( const char *sName ); - - /** - * Close the current node context. This will move the current context to - * the parent node of the former current node. If the current node was the - * root then the "completed" flag is set and no more operations are allowed. - */ - void closeNode(); - - /** - * Change the content of the current node at the current position between - * nodes. - *@param sContent The new content of the current node. - */ - void setContent( const char *sContent ); - - /** - * Add a named property to the current context node. - *@param sName The name of the property to add. - *@param sValue The string value of the property. - */ - void addProperty( const char *sName, const char *sValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const unsigned char nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const char nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const unsigned short nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const short nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const unsigned long nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const long nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const int nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param dValue The numerical value to add. - */ - void addProperty( const char *sName, const double dValue ); - - /** - * The XmlDocuemnt is considered completed if the root node has been closed. - * Once an XmlDocument has been completed, you can no longer perform - * operations on it. - *@return True if completed, false if still in progress. - */ - bool isCompleted(); - - /** - * Get a pointer to the root object of this XmlDocument. - *@returns A pointer to an internally owned XmlNode. Do not delete this - * XmlNode. - */ - XmlNode *getRoot(); - - /** - * Get a pointer to the root object of this XmlDocument, and remove the - * ownership from this object. - *@returns A pointer to an internally owned XmlNode. Do not delete this - * XmlNode. - */ - XmlNode *detatchRoot(); - - /** - * Get the current context node, which could be the same as the root node. - *@returns A pointer to an internally owned XmlNode. Do not delete this - * XmlNode. - */ - XmlNode *getCurrent(); - -private: - XmlNode *pRoot; /**< The root node. */ - XmlNode *pCurrent; /**< The current node. */ - bool bCompleted; /**< Is it completed? */ -}; - -#endif diff --git a/src/old/xmlnode.cpp b/src/old/xmlnode.cpp deleted file mode 100644 index b1ed9a9..0000000 --- a/src/old/xmlnode.cpp +++ /dev/null @@ -1,445 +0,0 @@ -#include "xmlnode.h" -#include "hashfunctionstring.h" - -XmlNode::XmlNode( const char *sName, XmlNode *pParent, const char *sContent ) : - hProperties( new HashFunctionString(), 53, false ), - hChildren( new HashFunctionString(), 53, true ) -{ - this->pParent = pParent; - if( sName != NULL ) - { - setName( sName ); - } - if( sContent != NULL ) - { - this->sPreContent = new std::string( sContent ); - } - else - { - this->sPreContent = NULL; - } - nCurContent = 0; -} - -XmlNode::~XmlNode() -{ - for( int j = 0; j < lChildren.getSize(); j++ ) - { - delete (XmlNode *)lChildren[j]; - } - for( int j = 0; j < lPropNames.getSize(); j++ ) - { - delete (std::string *)lPropNames[j]; - } - for( int j = 0; j < lPropValues.getSize(); j++ ) - { - delete (std::string *)lPropValues[j]; - } - for( int j = 0; j < lPostContent.getSize(); j++ ) - { - if( lPostContent[j] != NULL ) - { - delete (std::string *)lPostContent[j]; - } - } - if( sPreContent ) - { - delete sPreContent; - } -} - -void XmlNode::setName( const char *sName ) -{ - if( pParent ) - { - if( this->sName.size() == 0 ) - { - // We're not in the hash yet, so add us - this->sName = sName; - pParent->hChildren.insert( this->sName.c_str(), this ); - } - else - { - // Slightly more tricky, delete us, then add us... - pParent->hChildren.del( this->sName.c_str() ); - this->sName = sName; - pParent->hChildren.insert( this->sName.c_str(), this ); - } - } - else - { - // If we have no parent, then just set the name string, we don't need - // to worry about hashing. - this->sName = sName; - } -} - -void XmlNode::setContent( const char *sContent, int nIndex ) -{ - if( nIndex == -1 ) - { - nIndex = nCurContent; - } - if( nIndex == 0 ) - { - if( this->sPreContent ) - { - delete this->sPreContent; - } - - this->sPreContent = new std::string( sContent ); - } - else - { - nIndex--; - if( lPostContent[nIndex] ) - { - delete (std::string *)lPostContent[nIndex]; - } - - lPostContent.setAt( nIndex, new std::string( sContent ) ); - } -} - -const char *XmlNode::getContent( int nIndex ) -{ - if( nIndex == 0 ) - { - if( sPreContent ) - { - return sPreContent->c_str(); - } - } - else - { - nIndex--; - if( lPostContent[nIndex] ) - { - return ((std::string *)lPostContent[nIndex])->c_str(); - } - } - - return NULL; -} - -XmlNode *XmlNode::addChild( const char *sName, const char *sContent ) -{ - return addChild( new XmlNode( sName, this, sContent ) ); -} - -XmlNode *XmlNode::addChild( XmlNode *pNode ) -{ - lChildren.append( pNode ); - lPostContent.append( NULL ); - nCurContent++; - pNode->pParent = this; - - return pNode; -} - -XmlNode *XmlNode::getParent() -{ - return pParent; -} - -void XmlNode::addProperty( const char *sName, const char *sValue ) -{ - std::string *pName = new std::string( sName ); - std::string *pValue = new std::string( sValue ); - - hProperties.insert( pName->c_str(), pValue->c_str() ); - lPropNames.append( pName ); - lPropValues.append( pValue ); -} - -int XmlNode::getNumProperties() -{ - return lPropNames.getSize(); -} - -const char *XmlNode::getPropertyName( int nIndex ) -{ - std::string *tmp = ((std::string *)lPropNames[nIndex]); - if( tmp == NULL ) - return NULL; - return tmp->c_str(); -} - -const char *XmlNode::getProperty( int nIndex ) -{ - std::string *tmp = ((std::string *)lPropValues[nIndex]); - if( tmp == NULL ) - return NULL; - return tmp->c_str(); -} - -const char *XmlNode::getProperty( const char *sName ) -{ - const char *tmp = (const char *)hProperties[sName]; - if( tmp == NULL ) - return NULL; - return tmp; -} - -void XmlNode::deleteProperty( int nIndex ) -{ - hProperties.del( ((std::string *)lPropNames[nIndex])->c_str() ); - - delete (std::string *)lPropNames[nIndex]; - delete (std::string *)lPropValues[nIndex]; - - lPropNames.deleteAt( nIndex ); - lPropValues.deleteAt( nIndex ); -} - -bool XmlNode::hasChildren() -{ - return lChildren.getSize()>0; -} - -int XmlNode::getNumChildren() -{ - return lChildren.getSize(); -} - -XmlNode *XmlNode::getChild( int nIndex ) -{ - return (XmlNode *)lChildren[nIndex]; -} - -XmlNode *XmlNode::getChild( const char *sName, int nSkip ) -{ - return (XmlNode *)hChildren.get( sName, nSkip ); -} - -const char *XmlNode::getName() -{ - return sName.c_str(); -} - -void XmlNode::deleteNode( int nIndex, const char *sReplacementText ) -{ - XmlNode *xRet = detatchNode( nIndex, sReplacementText ); - - if( xRet != NULL ) - { - delete xRet; - } -} - -XmlNode *XmlNode::detatchNode( int nIndex, const char *sReplacementText ) -{ - if( nIndex < 0 || nIndex >= lChildren.getSize() ) - return NULL; - - // The real trick when deleteing a node isn't actually deleting it, it's - // reforming the content around the node that's now missing...hmmm... - - if( nIndex == 0 ) - { - // If the index is zero we have to deal with the pre-content - if( sReplacementText ) - { - if( sPreContent == NULL ) - { - sPreContent = new std::string( sReplacementText ); - } - else - { - *sPreContent += sReplacementText; - } - } - if( lPostContent.getSize() > 0 ) - { - if( lPostContent[0] != NULL ) - { - if( sPreContent == NULL ) - { - sPreContent = new std::string( - ((std::string *)lPostContent[0])->c_str() - ); - } - else - { - *sPreContent += - ((std::string *)lPostContent[0])->c_str(); - } - } - delete (std::string *)lPostContent[0]; - lPostContent.deleteAt( 0 ); - } - } - else - { - int nCont = nIndex-1; - // If it's above zero we deal with the post-content only - if( sReplacementText ) - { - if( lPostContent[nCont] == NULL ) - { - lPostContent.setAt( nCont, new std::string( sReplacementText ) ); - } - else - { - *((std::string *)lPostContent[nCont]) += sReplacementText; - } - } - if( lPostContent.getSize() > nIndex ) - { - if( lPostContent[nIndex] != NULL ) - { - if( lPostContent[nCont] == NULL ) - { - lPostContent.setAt( nCont, new std::string( - ((std::string *)lPostContent[nIndex])->c_str() - ) ); - } - else - { - *((std::string *)lPostContent[nCont]) += - ((std::string *)lPostContent[nIndex])->c_str(); - } - } - delete (std::string *)lPostContent[nIndex]; - lPostContent.deleteAt( nIndex ); - } - } - - XmlNode *xRet = (XmlNode *)lChildren[nIndex]; - hChildren.del( ((XmlNode *)lChildren[nIndex])->getName() ); - lChildren.deleteAt( nIndex ); - - return xRet; -} - -void XmlNode::replaceNode( int nIndex, XmlNode *pNewNode ) -{ - if( nIndex < 0 || nIndex >= lChildren.getSize() ) - return; //TODO: throw an exception - - delete (XmlNode *)lChildren[nIndex]; - lChildren.setAt( nIndex, pNewNode ); - pNewNode->pParent = this; -} - -XmlNode *XmlNode::getCopy() -{ - XmlNode *pNew = new XmlNode(); - - pNew->sName = sName; - if( sPreContent ) - { - pNew->sPreContent = new std::string( sPreContent->c_str() ); - } - else - { - pNew->sPreContent = NULL; - } - pNew->nCurContent = 0; - - int nSize = lPostContent.getSize(); - pNew->lPostContent.setSize( nSize ); - for( int j = 0; j < nSize; j++ ) - { - if( lPostContent[j] ) - { - pNew->lPostContent.setAt( - j, new std::string( - ((std::string *)lPostContent[j])->c_str() - ) - ); - } - else - { - pNew->lPostContent.setAt( j, NULL ); - } - } - - nSize = lChildren.getSize(); - pNew->lChildren.setSize( nSize ); - for( int j = 0; j < nSize; j++ ) - { - XmlNode *pChild = ((XmlNode *)lChildren[j])->getCopy(); - pNew->lChildren.setAt( j, pChild ); - pChild->pParent = pNew; - pNew->hChildren.insert( pChild->getName(), pChild ); - } - - nSize = lPropNames.getSize(); - pNew->lPropNames.setSize( nSize ); - pNew->lPropValues.setSize( nSize ); - for( int j = 0; j < nSize; j++ ) - { - std::string *pProp = new std::string( ((std::string *)lPropNames[j])->c_str() ); - std::string *pVal = new std::string( ((std::string *)lPropValues[j])->c_str() ); - pNew->lPropNames.setAt( j, pProp ); - pNew->lPropValues.setAt( j, pVal ); - pNew->hProperties.insert( pProp->c_str(), pVal->c_str() ); - pNew->nCurContent++; - } - - return pNew; -} - -void XmlNode::deleteNodeKeepChildren( int nIndex ) -{ - // This is a tricky one...we need to do some patching to keep things all - // even... - XmlNode *xRet = (XmlNode *)lChildren[nIndex]; - - if( xRet == NULL ) - { - return; - } - else - { - if( getContent( nIndex ) ) - { - std::string sBuf( getContent( nIndex ) ); - sBuf += xRet->getContent( 0 ); - setContent( sBuf.c_str(), nIndex ); - } - else - { - setContent( xRet->getContent( 0 ), nIndex ); - } - - int nSize = xRet->lChildren.getSize(); - for( int j = 0; j < nSize; j++ ) - { - XmlNode *pCopy = ((XmlNode *)xRet->lChildren[j])->getCopy(); - pCopy->pParent = this; - lChildren.insertBefore( pCopy, nIndex+j ); - - if( xRet->lPostContent[j] ) - { - lPostContent.insertBefore( - new std::string( ((std::string *)xRet->lPostContent[j])->c_str() ), - nIndex+j - ); - } - else - { - lPostContent.insertBefore( NULL, nIndex+j ); - } - } - - if( getContent( nIndex+nSize ) ) - { - //SString sBuf( getContent( nIndex+nSize ) ); - //sBuf.catfrom( xRet->getContent( nSize ) ); - //setContent( sBuf, nIndex+nSize ); - } - else - { - setContent( xRet->getContent( nSize ), nIndex+nSize ); - } - - deleteNode( nIndex+nSize ); - } -} - -void XmlNode::replaceNodeWithChildren( int nIndex, XmlNode *pNewNode ) -{ -} - diff --git a/src/old/xmlnode.h b/src/old/xmlnode.h deleted file mode 100644 index 7525306..0000000 --- a/src/old/xmlnode.h +++ /dev/null @@ -1,236 +0,0 @@ -#ifndef XMLNODE -#define XMLNODE - -#include -#include "linkedlist.h" -#include "hashtable.h" - -/** - * Maintains all data pertient to an XML node, including sub-nodes and content. - * All child nodes can be accessed through index and through name via a hash - * table. This makes it very easy to gain simple and fast access to all of - * your data. For most applications, the memory footprint is also rather - * small. While XmlNode objects can be used directly to create XML structures - * it is highly reccomended that all operations be performed through the - * XmlDocument class. - *@author Mike Buland - */ -class XmlNode -{ -public: - /** - * Construct a new XmlNode. - *@param sName The name of the node. - *@param pParent The parent node. - *@param sContent The initial content string. - */ - XmlNode( - const char *sName=NULL, - XmlNode *pParent = NULL, - const char *sContent=NULL - ); - - /** - * Delete the node and cleanup all memory. - */ - virtual ~XmlNode(); - - /** - * Change the name of the node. - *@param sName The new name of the node. - */ - void setName( const char *sName ); - - /** - * Construct a new node and add it as a child to this node, also return a - * pointer to the newly constructed node. - *@param sName The name of the new node. - *@param sContent The initial content of the new node. - *@returns A pointer to the newly created child node. - */ - XmlNode *addChild( const char *sName, const char *sContent=NULL ); - - /** - * Add an already created XmlNode as a child to this node. The new child - * XmlNode's parent will be changed appropriately and the parent XmlNode - * will take ownership of the child. - *@param pChild The child XmlNode to add to this XmlNode. - *@returns A pointer to the child node that was just added. - */ - XmlNode *addChild( XmlNode *pChild ); - - /** - * Add a new property to the XmlNode. Properties are name/value pairs. - *@param sName The name of the property. Specifying a name that's already - * in use will overwrite that property. - *@param sValue The textual value of the property. - */ - void addProperty( const char *sName, const char *sValue ); - - /** - * Get a pointer to the parent node, if any. - *@returns A pointer to the node's parent, or NULL if there isn't one. - */ - XmlNode *getParent(); - - /** - * Tells you if this node has children. - *@returns True if this node has at least one child, false otherwise. - */ - bool hasChildren(); - - /** - * Tells you how many children this node has. - *@returns The number of children this node has. - */ - int getNumChildren(); - - /** - * Get a child node at a specific index. - *@param nIndex The zero-based index of the child to retreive. - *@returns A pointer to the child, or NULL if you requested an invalid - * index. - */ - XmlNode *getChild( int nIndex ); - - /** - * Get a child with the specified name, and possibly skip value. For an - * explination of skip values see the HashTable. - *@param sName The name of the child to find. - *@param nSkip The number of nodes with that name to skip. - *@returns A pointer to the child, or NULL if no child with that name was - * found. - */ - XmlNode *getChild( const char *sName, int nSkip=0 ); - - /** - * Get a pointer to the name of this node. Do not change this, use setName - * instead. - *@returns A pointer to the name of this node. - */ - const char *getName(); - - /** - * Set the content of this node, optionally at a specific index. Using the - * default of -1 will set the content after the last added node. - *@param sContent The content string to use. - *@param nIndex The index of the content. - */ - void setContent( const char *sContent, int nIndex=-1 ); - - /** - * Get the content string at a given index, or zero for initial content. - *@param nIndex The index of the content. - *@returns A pointer to the content at that location. - */ - const char *getContent( int nIndex = 0 ); - - /** - * Get the number of properties in this node. - *@returns The number of properties in this node. - */ - int getNumProperties(); - - /** - * Get a property's name by index. - *@param nIndex The index of the property to examine. - *@returns A pointer to the name of the property specified, or NULL if none - * found. - */ - const char *getPropertyName( int nIndex ); - - /** - * Get a proprty's value by index. - *@param nIndex The index of the property to examine. - *@returns A pointer to the value of the property specified, or NULL if none - * found. - */ - const char *getProperty( int nIndex ); - - /** - * Get a propery's value by name. - *@param sName The name of the property to examine. - *@returns A pointer to the value of the property specified, or NULL if none - * found. - */ - const char *getProperty( const char *sName ); - - /** - * Delete a property by index. - *@param nIndex The index of the property to delete. - *@returns True if the property was found and deleted, false if it wasn't - * found. - */ - void deleteProperty( int nIndex ); - - /** - * Delete a child node, possibly replacing it with some text. This actually - * fixes all content strings around the newly deleted child node. - *@param nIndex The index of the node to delete. - *@param sReplacementText The optional text to replace the node with. - *@returns True of the node was found, and deleted, false if it wasn't - * found. - */ - void deleteNode( int nIndex, const char *sReplacementText = NULL ); - - /** - * Delete a given node, but move all of it's children and content up to - * replace the deleted node. All of the content of the child node is - * spliced seamlessly into place with the parent node's content. - *@param nIndex The node to delete. - *@returns True if the node was found and deleted, false if it wasn't. - */ - void deleteNodeKeepChildren( int nIndex ); - - /** - * Detatch a given child node from this node. This effectively works just - * like a deleteNode, except that instead of deleting the node it is removed - * and returned, and all ownership is given up. - *@param nIndex The index of the node to detatch. - *@param sReplacementText The optional text to replace the detatched node - * with. - *@returns A pointer to the newly detatched node, which then passes - * ownership to the caller. - */ - XmlNode *detatchNode( int nIndex, const char *sReplacementText = NULL ); - - /** - * Replace a given node with a different node that is not currently owned by - * this XmlNode or any ancestor. - *@param nIndex The index of the node to replace. - *@param pNewNode The new node to replace the old node with. - *@returns True if the node was found and replaced, false if it wasn't. - */ - void replaceNode( int nIndex, XmlNode *pNewNode ); - - /** - * Replace a given node with the children and content of a given node. - *@param nIndex The index of the node to replace. - *@param pNewNode The node that contains the children and content that will - * replace the node specified by nIndex. - *@returns True if the node was found and replaced, false if it wasn't. - */ - void replaceNodeWithChildren( int nIndex, XmlNode *pNewNode ); - - /** - * Get a copy of this node and all children. getCopy is recursive, so - * beware copying large trees of xml. - *@returns A newly created copy of this node and all of it's children. - */ - XmlNode *getCopy(); - -private: - std::string sName; /**< The name of the node. */ - std::string *sPreContent; /**< The content that goes before any node. */ - LinkedList lChildren; /**< The children. */ - LinkedList lPostContent; /**< The content that comes after children. */ - HashTable hProperties; /**< Property hashtable. */ - HashTable hChildren; /**< Children hashtable. */ - LinkedList lPropNames; /**< List of property names. */ - LinkedList lPropValues; /**< List of property values. */ - XmlNode *pParent; /**< A pointer to the parent of this node. */ - int nCurContent; /**< The current content we're on, for using the -1 on - setContent. */ -}; - -#endif diff --git a/src/old/xmlreader.cpp b/src/old/xmlreader.cpp deleted file mode 100644 index 18df69c..0000000 --- a/src/old/xmlreader.cpp +++ /dev/null @@ -1,602 +0,0 @@ -#include "xmlreader.h" -#include "exceptions.h" -#include -#include "hashfunctionstring.h" - -XmlReader::XmlReader( bool bStrip ) : - bStrip( bStrip ), - htEntity( new HashFunctionString(), 11 ) -{ -} - -XmlReader::~XmlReader() -{ - void *i = htEntity.getFirstItemPos(); - while( (i = htEntity.getNextItemPos( i ) ) ) - { - free( (char *)(htEntity.getItemID( i )) ); - delete (StaticString *)htEntity.getItemData( i ); - } -} - -void XmlReader::addEntity( const char *name, const char *value ) -{ - if( htEntity[name] ) return; - - char *sName = strdup( name ); - StaticString *sValue = new StaticString( value ); - - htEntity.insert( sName, sValue ); -} - -#define gcall( x ) if( x == false ) return false; - -bool XmlReader::isws( char chr ) -{ - return ( chr == ' ' || chr == '\t' || chr == '\n' || chr == '\r' ); -} - -bool XmlReader::ws() -{ - while( true ) - { - char chr = getChar(); - if( isws( chr ) ) - { - usedChar(); - } - else - { - return true; - } - } - return true; -} - -bool XmlReader::buildDoc() -{ - // take care of initial whitespace - gcall( ws() ); - textDecl(); - entity(); - addEntity("gt", ">"); - addEntity("lt", "<"); - addEntity("amp", "&"); - addEntity("apos", "\'"); - addEntity("quot", "\""); - gcall( node() ); - - return true; -} - -void XmlReader::textDecl() -{ - if( getChar() == '<' && getChar( 1 ) == '?' ) - { - usedChar( 2 ); - for(;;) - { - if( getChar() == '?' ) - { - if( getChar( 1 ) == '>' ) - { - usedChar( 2 ); - return; - } - } - usedChar(); - } - } -} - -void XmlReader::entity() -{ - for(;;) - { - ws(); - - if( getChar() == '<' && getChar( 1 ) == '!' ) - { - usedChar( 2 ); - ws(); - std::string buf; - for(;;) - { - char chr = getChar(); - usedChar(); - if( isws( chr ) ) break; - buf += chr; - } - - if( strcmp( buf.c_str(), "ENTITY") == 0 ) - { - ws(); - std::string name; - for(;;) - { - char chr = getChar(); - usedChar(); - if( isws( chr ) ) break; - name += chr; - } - ws(); - char quot = getChar(); - usedChar(); - if( quot != '\'' && quot != '\"' ) - { - throw XmlException( - "Only quoted entity values are supported." - ); - } - std::string value; - for(;;) - { - char chr = getChar(); - usedChar(); - if( chr == '&' ) - { - StaticString *tmp = getEscape(); - if( tmp == NULL ) throw XmlException("Entity thing"); - value += tmp->getString(); - delete tmp; - } - else if( chr == quot ) - { - break; - } - else - { - value += chr; - } - } - ws(); - if( getChar() == '>' ) - { - usedChar(); - - addEntity( name.c_str(), value.c_str() ); - } - else - { - throw XmlException( - "Malformed ENTITY: unexpected '%c' found.", - getChar() - ); - } - } - else - { - throw XmlException( - "Unsupported header symbol: %s", - buf.c_str() - ); - } - } - else - { - return; - } - } -} - -bool XmlReader::node() -{ - gcall( startNode() ) - - // At this point, we are closing the startNode - char chr = getChar(); - if( chr == '>' ) - { - usedChar(); - - // Now we process the guts of the node. - gcall( content() ); - } - else if( chr == '/' ) - { - // This is the tricky one, one more validation, then we close the node. - usedChar(); - if( getChar() == '>' ) - { - closeNode(); - usedChar(); - } - else - { - throw XmlException("Close node in singleNode malformed!"); - } - } - else - { - throw XmlException("Close node expected, but not found."); - return false; - } - - return true; -} - -bool XmlReader::startNode() -{ - if( getChar() == '<' ) - { - usedChar(); - - if( getChar() == '/' ) - { - // Heh, it's actually a close node, go figure - FlexBuf fbName; - usedChar(); - gcall( ws() ); - - while( true ) - { - char chr = getChar(); - if( isws( chr ) || chr == '>' ) - { - // Here we actually compare the name we got to the name - // we already set, they have to match exactly. - if( !strcasecmp( getCurrent()->getName(), fbName.getData() ) ) - { - closeNode(); - break; - } - else - { - throw XmlException("Got a mismatched node close tag."); - } - } - else - { - fbName.appendData( chr ); - usedChar(); - } - } - - gcall( ws() ); - if( getChar() == '>' ) - { - // Everything is cool. - usedChar(); - } - else - { - throw XmlException("Got extra junk data instead of node close tag."); - } - } - else - { - // We're good, format is consistant - addNode(); - - // Skip extra whitespace - gcall( ws() ); - gcall( name() ); - gcall( ws() ); - gcall( paramlist() ); - gcall( ws() ); - } - } - else - { - throw XmlException("Expected to find node opening char, '<'."); - } - - return true; -} - -bool XmlReader::name() -{ - FlexBuf fbName; - - while( true ) - { - char chr = getChar(); - if( isws( chr ) || chr == '>' || chr == '/' ) - { - setName( fbName.getData() ); - return true; - } - else - { - fbName.appendData( chr ); - usedChar(); - } - } - - return true; -} - -bool XmlReader::paramlist() -{ - while( true ) - { - char chr = getChar(); - if( chr == '/' || chr == '>' ) - { - return true; - } - else - { - gcall( param() ); - gcall( ws() ); - } - } - - return true; -} - -StaticString *XmlReader::getEscape() -{ - if( getChar( 1 ) == '#' ) - { - // If the entity starts with a # it's a character escape code - int base = 10; - usedChar( 2 ); - if( getChar() == 'x' ) - { - base = 16; - usedChar(); - } - char buf[4]; - int j = 0; - for( j = 0; getChar() != ';'; j++ ) - { - buf[j] = getChar(); - usedChar(); - } - usedChar(); - buf[j] = '\0'; - buf[0] = (char)strtol( buf, (char **)NULL, base ); - buf[1] = '\0'; - - return new StaticString( buf ); - } - else - { - // ...otherwise replace with the appropriate string... - std::string buf; - usedChar(); - for(;;) - { - char cbuf = getChar(); - usedChar(); - if( cbuf == ';' ) break; - buf += cbuf; - } - - StaticString *tmp = (StaticString *)htEntity[buf.c_str()]; - if( tmp == NULL ) return NULL; - - StaticString *ret = new StaticString( *tmp ); - return ret; - } -} - -bool XmlReader::param() -{ - FlexBuf fbName; - FlexBuf fbValue; - - while( true ) - { - char chr = getChar(); - if( isws( chr ) || chr == '=' ) - { - break; - } - else - { - fbName.appendData( chr ); - usedChar(); - } - } - - gcall( ws() ); - - if( getChar() == '=' ) - { - usedChar(); - - gcall( ws() ); - - char chr = getChar(); - if( chr == '"' ) - { - // Better quoted rhs - usedChar(); - - while( true ) - { - chr = getChar(); - if( chr == '"' ) - { - usedChar(); - addProperty( fbName.getData(), fbValue.getData() ); - return true; - } - else - { - if( chr == '&' ) - { - StaticString *tmp = getEscape(); - if( tmp == NULL ) return false; - fbValue.appendData( tmp->getString() ); - delete tmp; - } - else - { - fbValue.appendData( chr ); - usedChar(); - } - } - } - } - else - { - // Simple one-word rhs - while( true ) - { - chr = getChar(); - if( isws( chr ) || chr == '/' || chr == '>' ) - { - addProperty( fbName.getData(), fbValue.getData() ); - return true; - } - else - { - if( chr == '&' ) - { - StaticString *tmp = getEscape(); - if( tmp == NULL ) return false; - fbValue.appendData( tmp->getString() ); - delete tmp; - } - else - { - fbValue.appendData( chr ); - usedChar(); - } - } - } - } - } - else - { - throw XmlException("Expected an equals to seperate the params."); - return false; - } - - return true; -} - -bool XmlReader::content() -{ - FlexBuf fbContent; - - if( bStrip ) gcall( ws() ); - - while( true ) - { - char chr = getChar(); - if( chr == '<' ) - { - if( getChar(1) == '/' ) - { - if( fbContent.getLength() > 0 ) - { - if( bStrip ) - { - int j; - for( j = fbContent.getLength()-1; isws(fbContent.getData()[j]); j-- ); - ((char *)fbContent.getData())[j+1] = '\0'; - } - setContent( fbContent.getData() ); - } - usedChar( 2 ); - gcall( ws() ); - FlexBuf fbName; - while( true ) - { - chr = getChar(); - if( isws( chr ) || chr == '>' ) - { - if( !strcasecmp( getCurrent()->getName(), fbName.getData() ) ) - { - closeNode(); - break; - } - else - { - throw XmlException("Mismatched close tag found: <%s> to <%s>.", getCurrent()->getName(), fbName.getData() ); - } - } - else - { - fbName.appendData( chr ); - usedChar(); - } - } - gcall( ws() ); - if( getChar() == '>' ) - { - usedChar(); - return true; - } - else - { - throw XmlException("Malformed close tag."); - } - } - else if( getChar(1) == '!' ) - { - // We know it's a comment, let's see if it's proper - if( getChar(2) != '-' || - getChar(3) != '-' ) - { - // Not a valid XML comment - throw XmlException("Malformed comment start tag found."); - } - - usedChar( 4 ); - - // Now burn text until we find the close tag - for(;;) - { - if( getChar() == '-' ) - { - if( getChar( 1 ) == '-' ) - { - // The next one has to be a '>' now - if( getChar( 2 ) != '>' ) - { - throw XmlException("Malformed comment close tag found. You cannot have a '--' that isn't followed by a '>' in a comment."); - } - usedChar( 3 ); - break; - } - else - { - // Found a dash followed by a non dash, that's ok... - usedChar( 2 ); - } - } - else - { - // Burn comment chars - usedChar(); - } - } - } - else - { - if( fbContent.getLength() > 0 ) - { - if( bStrip ) - { - int j; - for( j = fbContent.getLength()-1; isws(fbContent.getData()[j]); j-- ); - ((char *)fbContent.getData())[j+1] = '\0'; - } - setContent( fbContent.getData() ); - fbContent.clearData(); - } - gcall( node() ); - } - - if( bStrip ) gcall( ws() ); - } - else if( chr == '&' ) - { - StaticString *tmp = getEscape(); - if( tmp == NULL ) return false; - fbContent.appendData( tmp->getString() ); - delete tmp; - } - else - { - fbContent.appendData( chr ); - usedChar(); - } - } -} - diff --git a/src/old/xmlreader.h b/src/old/xmlreader.h deleted file mode 100644 index c8f7202..0000000 --- a/src/old/xmlreader.h +++ /dev/null @@ -1,141 +0,0 @@ -#ifndef XMLREADER -#define XMLREADER - -#include -#include "xmldocument.h" -#include "flexbuf.h" -#include "hashtable.h" -#include "staticstring.h" - -/** - * Takes care of reading in xml formatted data from a file. This could/should - * be made more arbitrary in the future so that we can read the data from any - * source. This is actually made quite simple already since all data read in - * is handled by one single helper function and then palced into a FlexBuf for - * easy access by the other functions. The FlexBuf also allows for block - * reading from disk, which improves speed by a noticable amount. - *
- * There are also some extra features implemented that allow you to break the - * standard XML reader specs and eliminate leading and trailing whitespace in - * all read content. This is useful in situations where you allow additional - * whitespace in the files to make them easily human readable. The resturned - * content will be NULL in sitautions where all content between nodes was - * stripped. - *@author Mike Buland - */ -class XmlReader : public XmlDocument -{ -public: - /** - * Create a standard XmlReader. The optional parameter bStrip allows you to - * create a reader that will strip out all leading and trailing whitespace - * in content, a-la html. - *@param bStrip Strip out leading and trailing whitespace? - */ - XmlReader( bool bStrip=false ); - - /** - * Destroy this XmlReader. - */ - virtual ~XmlReader(); - - /** - * Build a document based on some kind of input. This is called - * automatically by the constructor. - */ - bool buildDoc(); - -private: - /** - * This is called by the low level automoton in order to get the next - * character. This function should return a character at the current - * position plus nIndex, but does not increment the current character. - *@param nIndex The index of the character from the current stream position. - *@returns A single character at the requested position, or 0 for end of - * stream. - */ - virtual char getChar( int nIndex = 0 ) = 0; - - /** - * Called to increment the current stream position by a single character. - */ - virtual void usedChar( int nAmnt = 1) = 0; - - /** - * Automoton function: is whitespace. - *@param chr A character - *@returns True if chr is whitespace, false otherwise. - */ - bool isws( char chr ); - - /** - * Automoton function: ws. Skips sections of whitespace. - *@returns True if everything was ok, False for end of stream. - */ - bool ws(); - - /** - * Automoton function: node. Processes an XmlNode - *@returns True if everything was ok, False for end of stream. - */ - bool node(); - - /** - * Automoton function: startNode. Processes the begining of a node. - *@returns True if everything was ok, False for end of stream. - */ - bool startNode(); - - /** - * Automoton function: name. Processes the name of a node. - *@returns True if everything was ok, False for end of stream. - */ - bool name(); - - /** - * Automoton function: textDecl. Processes the xml text decleration, if - * there is one. - */ - void textDecl(); - - /** - * Automoton function: entity. Processes an entity from the header. - */ - void entity(); - - /** - * Adds an entity to the list, if it doesn't already exist. - *@param name The name of the entity - *@param value The value of the entity - */ - void addEntity( const char *name, const char *value ); - - StaticString *getEscape(); - - /** - * Automoton function: paramlist. Processes a list of node params. - *@returns True if everything was ok, False for end of stream. - */ - bool paramlist(); - - /** - * Automoton function: param. Processes a single parameter. - *@returns True if everything was ok, False for end of stream. - */ - bool param(); - - /** - * Automoton function: content. Processes node content. - *@returns True if everything was ok, False for end of stream. - */ - bool content(); - - FlexBuf fbContent; /**< buffer for the current node's content. */ - FlexBuf fbParamName; /**< buffer for the current param's name. */ - FlexBuf fbParamValue; /**< buffer for the current param's value. */ - bool bStrip; /**< Are we stripping whitespace? */ - - HashTable htEntity; /**< Entity type definitions. */ -}; - -#endif diff --git a/src/old/xmlwriter.cpp b/src/old/xmlwriter.cpp deleted file mode 100644 index 56880b6..0000000 --- a/src/old/xmlwriter.cpp +++ /dev/null @@ -1,173 +0,0 @@ -#include -#include -#include "xmlwriter.h" - -XmlWriter::XmlWriter( const char *sIndent, XmlNode *pRoot ) : - XmlDocument( pRoot ) -{ - if( sIndent == NULL ) - { - this->sIndent = ""; - } - else - { - this->sIndent = sIndent; - } -} - -XmlWriter::~XmlWriter() -{ -} - -void XmlWriter::write() -{ - write( getRoot(), sIndent.c_str() ); -} - -void XmlWriter::write( XmlNode *pRoot, const char *sIndent ) -{ - writeNode( pRoot, 0, sIndent ); -} - -void XmlWriter::closeNode() -{ - XmlDocument::closeNode(); - - if( isCompleted() ) - { - write( getRoot(), sIndent.c_str() ); - } -} - -void XmlWriter::writeIndent( int nIndent, const char *sIndent ) -{ - if( sIndent == NULL ) return; - for( int j = 0; j < nIndent; j++ ) - { - writeString( sIndent ); - } -} - -std::string XmlWriter::escape( std::string sIn ) -{ - std::string sOut; - - std::string::const_iterator i; - for( i = sIn.begin(); i != sIn.end(); i++ ) - { - if( ((*i >= ' ' && *i <= '9') || - (*i >= 'a' && *i <= 'z') || - (*i >= 'A' && *i <= 'Z') ) && - (*i != '\"' && *i != '\'' && *i != '&') - ) - { - sOut += *i; - } - else - { - sOut += "&#"; - char buf[4]; - sprintf( buf, "%u", (unsigned char)*i ); - sOut += buf; - sOut += ';'; - } - } - - return sOut; -} - -void XmlWriter::writeNodeProps( XmlNode *pNode, int nIndent, const char *sIndent ) -{ - for( int j = 0; j < pNode->getNumProperties(); j++ ) - { - writeString(" "); - writeString( pNode->getPropertyName( j ) ); - writeString("=\""); - writeString( escape( pNode->getProperty( j ) ).c_str() ); - writeString("\""); - } -} - -void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const char *sIndent ) -{ - if( pNode->hasChildren() ) - { - writeIndent( nIndent, sIndent ); - writeString("<"); - writeString( pNode->getName() ); - writeNodeProps( pNode, nIndent, sIndent ); - if( sIndent ) - writeString(">\n"); - else - writeString(">"); - - if( pNode->getContent( 0 ) ) - { - writeIndent( nIndent+1, sIndent ); - if( sIndent ) - { - writeString( pNode->getContent( 0 ) ); - writeString("\n"); - } - else - writeString( pNode->getContent( 0 ) ); - } - - int nNumChildren = pNode->getNumChildren(); - for( int j = 0; j < nNumChildren; j++ ) - { - writeNode( pNode->getChild( j ), nIndent+1, sIndent ); - if( pNode->getContent( j+1 ) ) - { - writeIndent( nIndent+1, sIndent ); - if( sIndent ) - { - writeString( pNode->getContent( j+1 ) ); - writeString("\n"); - } - else - writeString( pNode->getContent( j+1 ) ); - } - } - - writeIndent( nIndent, sIndent ); - if( sIndent ) - { - writeString("getName() ); - writeString(">\n"); - } - else - { - writeString("getName() ); - writeString(">"); - } - } - else if( pNode->getContent() ) - { - writeIndent( nIndent, sIndent ); - writeString("<"); - writeString( pNode->getName() ); - writeNodeProps( pNode, nIndent, sIndent ); - writeString(">"); - writeString( pNode->getContent() ); - writeString("getName() ); - writeString(">"); - if( sIndent ) - writeString("\n"); - } - else - { - writeIndent( nIndent, sIndent ); - writeString("<"); - writeString( pNode->getName() ); - writeNodeProps( pNode, nIndent, sIndent ); - if( sIndent ) - writeString("/>\n"); - else - writeString("/>"); - } -} - diff --git a/src/old/xmlwriter.h b/src/old/xmlwriter.h deleted file mode 100644 index c48e810..0000000 --- a/src/old/xmlwriter.h +++ /dev/null @@ -1,96 +0,0 @@ -#ifndef XMLWRITER -#define XMLWRITER - -#include "xmlnode.h" -#include "xmldocument.h" - -/** - * Implements xml writing in the XML standard format. Also allows you to - * break that format and auto-indent your exported xml data for ease of - * reading. The auto-indenting will only be applied to sections that - * have no content of their own already. This means that except for - * whitespace all of your data will be preserved perfectly. - * You can create an XmlWriter object around a file, or access the static - * write function directly and just hand it a filename and a root XmlNode. - * When using an XmlWriter object the interface is identicle to that of - * the XmlDocument class, so reference that class for API info. However - * when the initial (or root) node is closed, and the document is finished - * the file will be created and written to automatically. The user can - * check to see if this is actually true by calling the isFinished - * function in the XmlDocument class. - *@author Mike Buland - */ -class XmlWriter : public XmlDocument -{ -public: - /** - * Construct a standard XmlWriter. - *@param sIndent Set this to something other than NULL to include it as an - * indent before each node in the output that doesn't already have content. - * If you are using the whitespace stripping option in the XmlReader and set - * this to a tab or some spaces it will never effect the content of your - * file. - */ - XmlWriter( const char *sIndent=NULL, XmlNode *pRoot=NULL ); - - /** - * Destroy the writer. - */ - virtual ~XmlWriter(); - - /** - * This override of the parent class closeNode function calls the parent - * class, but also triggers a write operation when the final node is closed. - * This means that by checking the isCompleted() function the user may also - * check to see if their file has been written or not. - */ - void closeNode(); - - void write(); - -private: - std::string sIndent; /**< The indent string */ - - std::string escape( std::string sIn ); - - /** - * Write the file. - *@param pNode The root node - *@param sIndent The indent text. - */ - void write( XmlNode *pNode, const char *sIndent=NULL ); - - /** - * Write a node in the file, including children. - *@param pNode The node to write. - *@param nIndent The indent level (the number of times to include sIndent) - *@param sIndent The indent text. - */ - void writeNode( XmlNode *pNode, int nIndent, const char *sIndent ); - - /** - * Write the properties of a node. - *@param pNode The node who's properties to write. - *@param nIndent The indent level of the containing node - *@param sIndent The indent text. - */ - void writeNodeProps( XmlNode *pNode, int nIndent, const char *sIndent ); - - /** - * Called to write the actual indent. - *@param nIndent The indent level. - *@param sIndent The indent text. - */ - void writeIndent( int nIndent, const char *sIndent ); - - /** - * This is the function that must be overridden in order to use this class. - * It must write the null-terminated string sString, minus the mull, - * verbatum to it's output device. Adding extra characters for any reason - * will break the XML formatting. - *@param sString The string data to write to the output. - */ - virtual void writeString( const char *sString ) = 0; -}; - -#endif diff --git a/src/tafdocument.cpp b/src/tafdocument.cpp deleted file mode 100644 index bd44dd5..0000000 --- a/src/tafdocument.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "tafdocument.h" - -Bu::TafDocument::TafDocument() -{ -} - -Bu::TafDocument::~TafDocument() -{ -} diff --git a/src/tafdocument.h b/src/tafdocument.h deleted file mode 100644 index 171f829..0000000 --- a/src/tafdocument.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef BU_TAF_DOCUMENT_H -#define BU_TAF_DOCUMENT_H - -#include - -namespace Bu -{ - /** - * - */ - class TafDocument - { - public: - TafDocument(); - virtual ~TafDocument(); - - private: - - }; -} - -#endif diff --git a/src/tafnode.cpp b/src/tafnode.cpp deleted file mode 100644 index c9756ec..0000000 --- a/src/tafnode.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "tafnode.h" - -Bu::TafNode::TafNode() -{ -} - -Bu::TafNode::~TafNode() -{ -} diff --git a/src/tafnode.h b/src/tafnode.h deleted file mode 100644 index 34f5289..0000000 --- a/src/tafnode.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef BU_TAF_NODE_H -#define BU_TAF_NODE_H - -#include - -namespace Bu -{ - /** - * - */ - class TafNode - { - public: - TafNode(); - virtual ~TafNode(); - - private: - - }; -} -#endif diff --git a/src/tafreader.cpp b/src/tafreader.cpp deleted file mode 100644 index f94fe44..0000000 --- a/src/tafreader.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "tafreader.h" - -Bu::TafReader::TafReader( Bu::Stream &sIn ) : - sIn( sIn ) -{ -} - -Bu::TafReader::~TafReader() -{ -} - diff --git a/src/tafreader.h b/src/tafreader.h deleted file mode 100644 index 2dbb9ea..0000000 --- a/src/tafreader.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef BU_TAF_READER_H -#define BU_TAF_READER_H - -#include -#include "bu/tafdocument.h" -#include "bu/stream.h" - -namespace Bu -{ - /** - * - */ - class TafReader : public Bu::TafDocument - { - public: - TafReader( Bu::Stream &sIn ); - virtual ~TafReader(); - - private: - Stream &sIn; - - }; -} - -#endif diff --git a/src/tafwriter.cpp b/src/tafwriter.cpp deleted file mode 100644 index 3e6c025..0000000 --- a/src/tafwriter.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "tafwriter.h" - -Bu::TafWriter::TafWriter() -{ -} - -Bu::TafWriter::~TafWriter() -{ -} diff --git a/src/tafwriter.h b/src/tafwriter.h deleted file mode 100644 index 7057d62..0000000 --- a/src/tafwriter.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef BU_TAF_WRITER_H -#define BU_TAF_WRITER_H - -#include - -namespace Bu -{ - /** - * - */ - class TafWriter - { - public: - TafWriter(); - virtual ~TafWriter(); - - private: - - }; -} - -#endif diff --git a/src/xmldocument.cpp b/src/xmldocument.cpp index cb21826..d7867d5 100644 --- a/src/xmldocument.cpp +++ b/src/xmldocument.cpp @@ -1,9 +1,149 @@ -#include "xmldocument.h" +#include +#include +#include "xmlwriter.h" -Bu::XmlDocument::XmlDocument() +XmlDocument::XmlDocument( XmlNode *pRoot ) { + this->pRoot = pRoot; + pCurrent = NULL; + bCompleted = (pRoot!=NULL); } -Bu::XmlDocument::~XmlDocument() +XmlDocument::~XmlDocument() { + if( pRoot ) + { + delete pRoot; + } } + +void XmlDocument::addNode( const char *sName, const char *sContent, bool bClose ) +{ + if( pRoot == NULL ) + { + // This is the first node, so ignore position and just insert it. + pCurrent = pRoot = new XmlNode( sName, NULL, sContent ); + } + else + { + pCurrent = pCurrent->addChild( sName, sContent ); + } + + if( bClose ) + { + closeNode(); + } +} + +void XmlDocument::setName( const char *sName ) +{ + pCurrent->setName( sName ); +} + +bool XmlDocument::isCompleted() +{ + return bCompleted; +} + +XmlNode *XmlDocument::getRoot() +{ + return pRoot; +} + +XmlNode *XmlDocument::detatchRoot() +{ + XmlNode *pTemp = pRoot; + pRoot = NULL; + return pTemp; +} + +XmlNode *XmlDocument::getCurrent() +{ + return pCurrent; +} + +void XmlDocument::closeNode() +{ + if( pCurrent != NULL ) + { + pCurrent = pCurrent->getParent(); + + if( pCurrent == NULL ) + { + bCompleted = true; + } + } +} + +void XmlDocument::addProperty( const char *sName, const char *sValue ) +{ + if( pCurrent ) + { + pCurrent->addProperty( sName, sValue ); + } +} + +void XmlDocument::addProperty( const char *sName, const unsigned char nValue ) +{ + char buf[12]; + sprintf( buf, "%hhi", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const char nValue ) +{ + char buf[12]; + sprintf( buf, "%hhi", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const unsigned short nValue ) +{ + char buf[12]; + sprintf( buf, "%hi", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const short nValue ) +{ + char buf[12]; + sprintf( buf, "%hi", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const int nValue ) +{ + char buf[12]; + sprintf( buf, "%d", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const unsigned long nValue ) +{ + char buf[12]; + sprintf( buf, "%li", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const long nValue ) +{ + char buf[12]; + sprintf( buf, "%li", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const double dValue ) +{ + char buf[40]; + sprintf( buf, "%f", dValue ); + addProperty( sName, buf ); +} + +void XmlDocument::setContent( const char *sContent ) +{ + if( pCurrent ) + { + pCurrent->setContent( sContent ); + } +} + diff --git a/src/xmldocument.h b/src/xmldocument.h index e16e3ea..6671c41 100644 --- a/src/xmldocument.h +++ b/src/xmldocument.h @@ -1,22 +1,171 @@ -#ifndef XML_DOCUMENT_H -#define XML_DOCUMENT_H +#ifndef XMLDOCUMENT +#define XMLDOCUMENT -#include +#include "xmlnode.h" -namespace Bu +/** + * Keeps track of an easily managed set of XmlNode information. Allows simple + * operations for logical writing to and reading from XML structures. Using + * already formed structures is simply done through the XmlNode structures, + * and the getRoot function here. Creation is performed through a simple set + * of operations that creates the data in a stream type format. + *@author Mike Buland + */ +class XmlDocument { +public: /** - * + * Construct either a blank XmlDocuemnt or construct a document around an + * existing XmlNode. Be careful, once an XmlNode is passed into a document + * the document takes over ownership and will delete it when the XmlDocument + * is deleted. + *@param pRoot The XmlNode to use as the root of this document, or NULL if + * you want to start a new document. */ - class XmlDocument - { - public: - XmlDocument(); - virtual ~XmlDocument(); + XmlDocument( XmlNode *pRoot=NULL ); - private: + /** + * Destroy all contained nodes. + */ + virtual ~XmlDocument(); + + /** + * Add a new node to the document. The new node is appended to the end of + * the current context, i.e. XmlNode, and the new node, provided it isn't + * close as part of this operation, will become the current context. + *@param sName The name of the new node to add. + *@param sContent A content string to be placed inside of the new node. + *@param bClose Set this to true to close the node immediately after adding + * the node and setting the content and name. If this is set to true the + * node is appended, but the context node doesn't change. + */ + void addNode( const char *sName=NULL, const char *sContent=NULL, bool bClose=false ); + + /** + * Set the name of the current node context. + *@param sName The new name of the node. + */ + void setName( const char *sName ); + + /** + * Close the current node context. This will move the current context to + * the parent node of the former current node. If the current node was the + * root then the "completed" flag is set and no more operations are allowed. + */ + void closeNode(); + + /** + * Change the content of the current node at the current position between + * nodes. + *@param sContent The new content of the current node. + */ + void setContent( const char *sContent ); + + /** + * Add a named property to the current context node. + *@param sName The name of the property to add. + *@param sValue The string value of the property. + */ + void addProperty( const char *sName, const char *sValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const unsigned char nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const char nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const unsigned short nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const short nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const unsigned long nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const long nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const int nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param dValue The numerical value to add. + */ + void addProperty( const char *sName, const double dValue ); + + /** + * The XmlDocuemnt is considered completed if the root node has been closed. + * Once an XmlDocument has been completed, you can no longer perform + * operations on it. + *@return True if completed, false if still in progress. + */ + bool isCompleted(); + + /** + * Get a pointer to the root object of this XmlDocument. + *@returns A pointer to an internally owned XmlNode. Do not delete this + * XmlNode. + */ + XmlNode *getRoot(); + + /** + * Get a pointer to the root object of this XmlDocument, and remove the + * ownership from this object. + *@returns A pointer to an internally owned XmlNode. Do not delete this + * XmlNode. + */ + XmlNode *detatchRoot(); + + /** + * Get the current context node, which could be the same as the root node. + *@returns A pointer to an internally owned XmlNode. Do not delete this + * XmlNode. + */ + XmlNode *getCurrent(); - }; -} +private: + XmlNode *pRoot; /**< The root node. */ + XmlNode *pCurrent; /**< The current node. */ + bool bCompleted; /**< Is it completed? */ +}; #endif diff --git a/src/xmlnode.cpp b/src/xmlnode.cpp index 58ef5c5..b1ed9a9 100644 --- a/src/xmlnode.cpp +++ b/src/xmlnode.cpp @@ -1,9 +1,445 @@ #include "xmlnode.h" +#include "hashfunctionstring.h" -Bu::XmlNode::XmlNode() +XmlNode::XmlNode( const char *sName, XmlNode *pParent, const char *sContent ) : + hProperties( new HashFunctionString(), 53, false ), + hChildren( new HashFunctionString(), 53, true ) { + this->pParent = pParent; + if( sName != NULL ) + { + setName( sName ); + } + if( sContent != NULL ) + { + this->sPreContent = new std::string( sContent ); + } + else + { + this->sPreContent = NULL; + } + nCurContent = 0; } -Bu::XmlNode::~XmlNode() +XmlNode::~XmlNode() { + for( int j = 0; j < lChildren.getSize(); j++ ) + { + delete (XmlNode *)lChildren[j]; + } + for( int j = 0; j < lPropNames.getSize(); j++ ) + { + delete (std::string *)lPropNames[j]; + } + for( int j = 0; j < lPropValues.getSize(); j++ ) + { + delete (std::string *)lPropValues[j]; + } + for( int j = 0; j < lPostContent.getSize(); j++ ) + { + if( lPostContent[j] != NULL ) + { + delete (std::string *)lPostContent[j]; + } + } + if( sPreContent ) + { + delete sPreContent; + } } + +void XmlNode::setName( const char *sName ) +{ + if( pParent ) + { + if( this->sName.size() == 0 ) + { + // We're not in the hash yet, so add us + this->sName = sName; + pParent->hChildren.insert( this->sName.c_str(), this ); + } + else + { + // Slightly more tricky, delete us, then add us... + pParent->hChildren.del( this->sName.c_str() ); + this->sName = sName; + pParent->hChildren.insert( this->sName.c_str(), this ); + } + } + else + { + // If we have no parent, then just set the name string, we don't need + // to worry about hashing. + this->sName = sName; + } +} + +void XmlNode::setContent( const char *sContent, int nIndex ) +{ + if( nIndex == -1 ) + { + nIndex = nCurContent; + } + if( nIndex == 0 ) + { + if( this->sPreContent ) + { + delete this->sPreContent; + } + + this->sPreContent = new std::string( sContent ); + } + else + { + nIndex--; + if( lPostContent[nIndex] ) + { + delete (std::string *)lPostContent[nIndex]; + } + + lPostContent.setAt( nIndex, new std::string( sContent ) ); + } +} + +const char *XmlNode::getContent( int nIndex ) +{ + if( nIndex == 0 ) + { + if( sPreContent ) + { + return sPreContent->c_str(); + } + } + else + { + nIndex--; + if( lPostContent[nIndex] ) + { + return ((std::string *)lPostContent[nIndex])->c_str(); + } + } + + return NULL; +} + +XmlNode *XmlNode::addChild( const char *sName, const char *sContent ) +{ + return addChild( new XmlNode( sName, this, sContent ) ); +} + +XmlNode *XmlNode::addChild( XmlNode *pNode ) +{ + lChildren.append( pNode ); + lPostContent.append( NULL ); + nCurContent++; + pNode->pParent = this; + + return pNode; +} + +XmlNode *XmlNode::getParent() +{ + return pParent; +} + +void XmlNode::addProperty( const char *sName, const char *sValue ) +{ + std::string *pName = new std::string( sName ); + std::string *pValue = new std::string( sValue ); + + hProperties.insert( pName->c_str(), pValue->c_str() ); + lPropNames.append( pName ); + lPropValues.append( pValue ); +} + +int XmlNode::getNumProperties() +{ + return lPropNames.getSize(); +} + +const char *XmlNode::getPropertyName( int nIndex ) +{ + std::string *tmp = ((std::string *)lPropNames[nIndex]); + if( tmp == NULL ) + return NULL; + return tmp->c_str(); +} + +const char *XmlNode::getProperty( int nIndex ) +{ + std::string *tmp = ((std::string *)lPropValues[nIndex]); + if( tmp == NULL ) + return NULL; + return tmp->c_str(); +} + +const char *XmlNode::getProperty( const char *sName ) +{ + const char *tmp = (const char *)hProperties[sName]; + if( tmp == NULL ) + return NULL; + return tmp; +} + +void XmlNode::deleteProperty( int nIndex ) +{ + hProperties.del( ((std::string *)lPropNames[nIndex])->c_str() ); + + delete (std::string *)lPropNames[nIndex]; + delete (std::string *)lPropValues[nIndex]; + + lPropNames.deleteAt( nIndex ); + lPropValues.deleteAt( nIndex ); +} + +bool XmlNode::hasChildren() +{ + return lChildren.getSize()>0; +} + +int XmlNode::getNumChildren() +{ + return lChildren.getSize(); +} + +XmlNode *XmlNode::getChild( int nIndex ) +{ + return (XmlNode *)lChildren[nIndex]; +} + +XmlNode *XmlNode::getChild( const char *sName, int nSkip ) +{ + return (XmlNode *)hChildren.get( sName, nSkip ); +} + +const char *XmlNode::getName() +{ + return sName.c_str(); +} + +void XmlNode::deleteNode( int nIndex, const char *sReplacementText ) +{ + XmlNode *xRet = detatchNode( nIndex, sReplacementText ); + + if( xRet != NULL ) + { + delete xRet; + } +} + +XmlNode *XmlNode::detatchNode( int nIndex, const char *sReplacementText ) +{ + if( nIndex < 0 || nIndex >= lChildren.getSize() ) + return NULL; + + // The real trick when deleteing a node isn't actually deleting it, it's + // reforming the content around the node that's now missing...hmmm... + + if( nIndex == 0 ) + { + // If the index is zero we have to deal with the pre-content + if( sReplacementText ) + { + if( sPreContent == NULL ) + { + sPreContent = new std::string( sReplacementText ); + } + else + { + *sPreContent += sReplacementText; + } + } + if( lPostContent.getSize() > 0 ) + { + if( lPostContent[0] != NULL ) + { + if( sPreContent == NULL ) + { + sPreContent = new std::string( + ((std::string *)lPostContent[0])->c_str() + ); + } + else + { + *sPreContent += + ((std::string *)lPostContent[0])->c_str(); + } + } + delete (std::string *)lPostContent[0]; + lPostContent.deleteAt( 0 ); + } + } + else + { + int nCont = nIndex-1; + // If it's above zero we deal with the post-content only + if( sReplacementText ) + { + if( lPostContent[nCont] == NULL ) + { + lPostContent.setAt( nCont, new std::string( sReplacementText ) ); + } + else + { + *((std::string *)lPostContent[nCont]) += sReplacementText; + } + } + if( lPostContent.getSize() > nIndex ) + { + if( lPostContent[nIndex] != NULL ) + { + if( lPostContent[nCont] == NULL ) + { + lPostContent.setAt( nCont, new std::string( + ((std::string *)lPostContent[nIndex])->c_str() + ) ); + } + else + { + *((std::string *)lPostContent[nCont]) += + ((std::string *)lPostContent[nIndex])->c_str(); + } + } + delete (std::string *)lPostContent[nIndex]; + lPostContent.deleteAt( nIndex ); + } + } + + XmlNode *xRet = (XmlNode *)lChildren[nIndex]; + hChildren.del( ((XmlNode *)lChildren[nIndex])->getName() ); + lChildren.deleteAt( nIndex ); + + return xRet; +} + +void XmlNode::replaceNode( int nIndex, XmlNode *pNewNode ) +{ + if( nIndex < 0 || nIndex >= lChildren.getSize() ) + return; //TODO: throw an exception + + delete (XmlNode *)lChildren[nIndex]; + lChildren.setAt( nIndex, pNewNode ); + pNewNode->pParent = this; +} + +XmlNode *XmlNode::getCopy() +{ + XmlNode *pNew = new XmlNode(); + + pNew->sName = sName; + if( sPreContent ) + { + pNew->sPreContent = new std::string( sPreContent->c_str() ); + } + else + { + pNew->sPreContent = NULL; + } + pNew->nCurContent = 0; + + int nSize = lPostContent.getSize(); + pNew->lPostContent.setSize( nSize ); + for( int j = 0; j < nSize; j++ ) + { + if( lPostContent[j] ) + { + pNew->lPostContent.setAt( + j, new std::string( + ((std::string *)lPostContent[j])->c_str() + ) + ); + } + else + { + pNew->lPostContent.setAt( j, NULL ); + } + } + + nSize = lChildren.getSize(); + pNew->lChildren.setSize( nSize ); + for( int j = 0; j < nSize; j++ ) + { + XmlNode *pChild = ((XmlNode *)lChildren[j])->getCopy(); + pNew->lChildren.setAt( j, pChild ); + pChild->pParent = pNew; + pNew->hChildren.insert( pChild->getName(), pChild ); + } + + nSize = lPropNames.getSize(); + pNew->lPropNames.setSize( nSize ); + pNew->lPropValues.setSize( nSize ); + for( int j = 0; j < nSize; j++ ) + { + std::string *pProp = new std::string( ((std::string *)lPropNames[j])->c_str() ); + std::string *pVal = new std::string( ((std::string *)lPropValues[j])->c_str() ); + pNew->lPropNames.setAt( j, pProp ); + pNew->lPropValues.setAt( j, pVal ); + pNew->hProperties.insert( pProp->c_str(), pVal->c_str() ); + pNew->nCurContent++; + } + + return pNew; +} + +void XmlNode::deleteNodeKeepChildren( int nIndex ) +{ + // This is a tricky one...we need to do some patching to keep things all + // even... + XmlNode *xRet = (XmlNode *)lChildren[nIndex]; + + if( xRet == NULL ) + { + return; + } + else + { + if( getContent( nIndex ) ) + { + std::string sBuf( getContent( nIndex ) ); + sBuf += xRet->getContent( 0 ); + setContent( sBuf.c_str(), nIndex ); + } + else + { + setContent( xRet->getContent( 0 ), nIndex ); + } + + int nSize = xRet->lChildren.getSize(); + for( int j = 0; j < nSize; j++ ) + { + XmlNode *pCopy = ((XmlNode *)xRet->lChildren[j])->getCopy(); + pCopy->pParent = this; + lChildren.insertBefore( pCopy, nIndex+j ); + + if( xRet->lPostContent[j] ) + { + lPostContent.insertBefore( + new std::string( ((std::string *)xRet->lPostContent[j])->c_str() ), + nIndex+j + ); + } + else + { + lPostContent.insertBefore( NULL, nIndex+j ); + } + } + + if( getContent( nIndex+nSize ) ) + { + //SString sBuf( getContent( nIndex+nSize ) ); + //sBuf.catfrom( xRet->getContent( nSize ) ); + //setContent( sBuf, nIndex+nSize ); + } + else + { + setContent( xRet->getContent( nSize ), nIndex+nSize ); + } + + deleteNode( nIndex+nSize ); + } +} + +void XmlNode::replaceNodeWithChildren( int nIndex, XmlNode *pNewNode ) +{ +} + diff --git a/src/xmlnode.h b/src/xmlnode.h index cd9961a..7525306 100644 --- a/src/xmlnode.h +++ b/src/xmlnode.h @@ -1,22 +1,236 @@ -#ifndef XML_NODE_H -#define XML_NODE_H +#ifndef XMLNODE +#define XMLNODE -#include +#include +#include "linkedlist.h" +#include "hashtable.h" -namespace Bu +/** + * Maintains all data pertient to an XML node, including sub-nodes and content. + * All child nodes can be accessed through index and through name via a hash + * table. This makes it very easy to gain simple and fast access to all of + * your data. For most applications, the memory footprint is also rather + * small. While XmlNode objects can be used directly to create XML structures + * it is highly reccomended that all operations be performed through the + * XmlDocument class. + *@author Mike Buland + */ +class XmlNode { +public: /** - * + * Construct a new XmlNode. + *@param sName The name of the node. + *@param pParent The parent node. + *@param sContent The initial content string. */ - class XmlNode - { - public: - XmlNode(); - virtual ~XmlNode(); + XmlNode( + const char *sName=NULL, + XmlNode *pParent = NULL, + const char *sContent=NULL + ); + + /** + * Delete the node and cleanup all memory. + */ + virtual ~XmlNode(); + + /** + * Change the name of the node. + *@param sName The new name of the node. + */ + void setName( const char *sName ); + + /** + * Construct a new node and add it as a child to this node, also return a + * pointer to the newly constructed node. + *@param sName The name of the new node. + *@param sContent The initial content of the new node. + *@returns A pointer to the newly created child node. + */ + XmlNode *addChild( const char *sName, const char *sContent=NULL ); + + /** + * Add an already created XmlNode as a child to this node. The new child + * XmlNode's parent will be changed appropriately and the parent XmlNode + * will take ownership of the child. + *@param pChild The child XmlNode to add to this XmlNode. + *@returns A pointer to the child node that was just added. + */ + XmlNode *addChild( XmlNode *pChild ); + + /** + * Add a new property to the XmlNode. Properties are name/value pairs. + *@param sName The name of the property. Specifying a name that's already + * in use will overwrite that property. + *@param sValue The textual value of the property. + */ + void addProperty( const char *sName, const char *sValue ); + + /** + * Get a pointer to the parent node, if any. + *@returns A pointer to the node's parent, or NULL if there isn't one. + */ + XmlNode *getParent(); + + /** + * Tells you if this node has children. + *@returns True if this node has at least one child, false otherwise. + */ + bool hasChildren(); + + /** + * Tells you how many children this node has. + *@returns The number of children this node has. + */ + int getNumChildren(); + + /** + * Get a child node at a specific index. + *@param nIndex The zero-based index of the child to retreive. + *@returns A pointer to the child, or NULL if you requested an invalid + * index. + */ + XmlNode *getChild( int nIndex ); + + /** + * Get a child with the specified name, and possibly skip value. For an + * explination of skip values see the HashTable. + *@param sName The name of the child to find. + *@param nSkip The number of nodes with that name to skip. + *@returns A pointer to the child, or NULL if no child with that name was + * found. + */ + XmlNode *getChild( const char *sName, int nSkip=0 ); + + /** + * Get a pointer to the name of this node. Do not change this, use setName + * instead. + *@returns A pointer to the name of this node. + */ + const char *getName(); + + /** + * Set the content of this node, optionally at a specific index. Using the + * default of -1 will set the content after the last added node. + *@param sContent The content string to use. + *@param nIndex The index of the content. + */ + void setContent( const char *sContent, int nIndex=-1 ); - private: + /** + * Get the content string at a given index, or zero for initial content. + *@param nIndex The index of the content. + *@returns A pointer to the content at that location. + */ + const char *getContent( int nIndex = 0 ); + + /** + * Get the number of properties in this node. + *@returns The number of properties in this node. + */ + int getNumProperties(); + + /** + * Get a property's name by index. + *@param nIndex The index of the property to examine. + *@returns A pointer to the name of the property specified, or NULL if none + * found. + */ + const char *getPropertyName( int nIndex ); + + /** + * Get a proprty's value by index. + *@param nIndex The index of the property to examine. + *@returns A pointer to the value of the property specified, or NULL if none + * found. + */ + const char *getProperty( int nIndex ); + + /** + * Get a propery's value by name. + *@param sName The name of the property to examine. + *@returns A pointer to the value of the property specified, or NULL if none + * found. + */ + const char *getProperty( const char *sName ); + + /** + * Delete a property by index. + *@param nIndex The index of the property to delete. + *@returns True if the property was found and deleted, false if it wasn't + * found. + */ + void deleteProperty( int nIndex ); + + /** + * Delete a child node, possibly replacing it with some text. This actually + * fixes all content strings around the newly deleted child node. + *@param nIndex The index of the node to delete. + *@param sReplacementText The optional text to replace the node with. + *@returns True of the node was found, and deleted, false if it wasn't + * found. + */ + void deleteNode( int nIndex, const char *sReplacementText = NULL ); + + /** + * Delete a given node, but move all of it's children and content up to + * replace the deleted node. All of the content of the child node is + * spliced seamlessly into place with the parent node's content. + *@param nIndex The node to delete. + *@returns True if the node was found and deleted, false if it wasn't. + */ + void deleteNodeKeepChildren( int nIndex ); + + /** + * Detatch a given child node from this node. This effectively works just + * like a deleteNode, except that instead of deleting the node it is removed + * and returned, and all ownership is given up. + *@param nIndex The index of the node to detatch. + *@param sReplacementText The optional text to replace the detatched node + * with. + *@returns A pointer to the newly detatched node, which then passes + * ownership to the caller. + */ + XmlNode *detatchNode( int nIndex, const char *sReplacementText = NULL ); + + /** + * Replace a given node with a different node that is not currently owned by + * this XmlNode or any ancestor. + *@param nIndex The index of the node to replace. + *@param pNewNode The new node to replace the old node with. + *@returns True if the node was found and replaced, false if it wasn't. + */ + void replaceNode( int nIndex, XmlNode *pNewNode ); + + /** + * Replace a given node with the children and content of a given node. + *@param nIndex The index of the node to replace. + *@param pNewNode The node that contains the children and content that will + * replace the node specified by nIndex. + *@returns True if the node was found and replaced, false if it wasn't. + */ + void replaceNodeWithChildren( int nIndex, XmlNode *pNewNode ); + + /** + * Get a copy of this node and all children. getCopy is recursive, so + * beware copying large trees of xml. + *@returns A newly created copy of this node and all of it's children. + */ + XmlNode *getCopy(); - }; -} +private: + std::string sName; /**< The name of the node. */ + std::string *sPreContent; /**< The content that goes before any node. */ + LinkedList lChildren; /**< The children. */ + LinkedList lPostContent; /**< The content that comes after children. */ + HashTable hProperties; /**< Property hashtable. */ + HashTable hChildren; /**< Children hashtable. */ + LinkedList lPropNames; /**< List of property names. */ + LinkedList lPropValues; /**< List of property values. */ + XmlNode *pParent; /**< A pointer to the parent of this node. */ + int nCurContent; /**< The current content we're on, for using the -1 on + setContent. */ +}; #endif diff --git a/src/xmlreader.cpp b/src/xmlreader.cpp index bd241cf..18df69c 100644 --- a/src/xmlreader.cpp +++ b/src/xmlreader.cpp @@ -1,82 +1,176 @@ #include "xmlreader.h" +#include "exceptions.h" +#include +#include "hashfunctionstring.h" -Bu::XmlReader::XmlReader( Bu::Stream &sIn ) : - sIn( sIn ) +XmlReader::XmlReader( bool bStrip ) : + bStrip( bStrip ), + htEntity( new HashFunctionString(), 11 ) { } -Bu::XmlReader::~XmlReader() +XmlReader::~XmlReader() { + void *i = htEntity.getFirstItemPos(); + while( (i = htEntity.getNextItemPos( i ) ) ) + { + free( (char *)(htEntity.getItemID( i )) ); + delete (StaticString *)htEntity.getItemData( i ); + } } -const char *Bu::XmlReader::lookahead( int nAmnt ) +void XmlReader::addEntity( const char *name, const char *value ) { - if( sBuf.getSize() >= nAmnt ) - return sBuf.getStr(); + if( htEntity[name] ) return; - int nNew = nAmnt - sBuf.getSize(); - char *buf = new char[nNew]; - sIn.read( buf, nNew ); - sBuf.append( buf ); + char *sName = strdup( name ); + StaticString *sValue = new StaticString( value ); - return sBuf.getStr(); + htEntity.insert( sName, sValue ); } -void Bu::XmlReader::burn( int nAmnt ) -{ - if( sBuf.getSize() < nAmnt ) - { - lookahead( nAmnt ); - } +#define gcall( x ) if( x == false ) return false; - //sBuf.remove( nAmnt ); +bool XmlReader::isws( char chr ) +{ + return ( chr == ' ' || chr == '\t' || chr == '\n' || chr == '\r' ); } -void Bu::XmlReader::checkString( const char *str, int nLen ) +bool XmlReader::ws() { - if( !strncmp( str, lookahead( nLen ), nLen ) ) + while( true ) { - burn( nLen ); - return; + char chr = getChar(); + if( isws( chr ) ) + { + usedChar(); + } + else + { + return true; + } } - - throw Bu::ExceptionBase("Expected string '%s'", str ); + return true; } -Bu::XmlNode *Bu::XmlReader::read() +bool XmlReader::buildDoc() { - prolog(); -} + // take care of initial whitespace + gcall( ws() ); + textDecl(); + entity(); + addEntity("gt", ">"); + addEntity("lt", "<"); + addEntity("amp", "&"); + addEntity("apos", "\'"); + addEntity("quot", "\""); + gcall( node() ); -void Bu::XmlReader::prolog() -{ - XMLDecl(); - Misc(); + return true; } -void Bu::XmlReader::XMLDecl() +void XmlReader::textDecl() { - checkString("", 2 ); + if( getChar() == '<' && getChar( 1 ) == '?' ) + { + usedChar( 2 ); + for(;;) + { + if( getChar() == '?' ) + { + if( getChar( 1 ) == '>' ) + { + usedChar( 2 ); + return; + } + } + usedChar(); + } + } } -void Bu::XmlReader::Misc() +void XmlReader::entity() { for(;;) { - S(); - if( !strncmp("", 3 ); - return; - } + closeNode(); + usedChar(); + } + else + { + throw XmlException("Close node in singleNode malformed!"); } - burn( 1 ); } + else + { + throw XmlException("Close node expected, but not found."); + return false; + } + + return true; } -void Bu::XmlReader::PI() +bool XmlReader::startNode() { - checkString("", lookahead(j+2)+j, 2 ) ) + usedChar(); + + if( getChar() == '/' ) { - burn( j+2 ); - return; + // Heh, it's actually a close node, go figure + FlexBuf fbName; + usedChar(); + gcall( ws() ); + + while( true ) + { + char chr = getChar(); + if( isws( chr ) || chr == '>' ) + { + // Here we actually compare the name we got to the name + // we already set, they have to match exactly. + if( !strcasecmp( getCurrent()->getName(), fbName.getData() ) ) + { + closeNode(); + break; + } + else + { + throw XmlException("Got a mismatched node close tag."); + } + } + else + { + fbName.appendData( chr ); + usedChar(); + } + } + + gcall( ws() ); + if( getChar() == '>' ) + { + // Everything is cool. + usedChar(); + } + else + { + throw XmlException("Got extra junk data instead of node close tag."); + } } + else + { + // We're good, format is consistant + addNode(); + + // Skip extra whitespace + gcall( ws() ); + gcall( name() ); + gcall( ws() ); + gcall( paramlist() ); + gcall( ws() ); + } + } + else + { + throw XmlException("Expected to find node opening char, '<'."); } + + return true; } -void Bu::XmlReader::S() +bool XmlReader::name() { - for( int j = 0;; j++ ) + FlexBuf fbName; + + while( true ) { - char c = *lookahead( 1 ); - if( c == 0x20 || c == 0x9 || c == 0xD || c == 0xA ) - continue; - if( j == 0 ) - throw ExceptionBase("Expected whitespace."); - return; + char chr = getChar(); + if( isws( chr ) || chr == '>' || chr == '/' ) + { + setName( fbName.getData() ); + return true; + } + else + { + fbName.appendData( chr ); + usedChar(); + } } + + return true; } -void Bu::XmlReader::Sq() +bool XmlReader::paramlist() { - for(;;) + while( true ) { - char c = *lookahead( 1 ); - if( c == 0x20 || c == 0x9 || c == 0xD || c == 0xA ) - continue; - return; + char chr = getChar(); + if( chr == '/' || chr == '>' ) + { + return true; + } + else + { + gcall( param() ); + gcall( ws() ); + } } + + return true; } -void Bu::XmlReader::VersionInfo() +StaticString *XmlReader::getEscape() { - try + if( getChar( 1 ) == '#' ) { - S(); - checkString("version", 7 ); + // If the entity starts with a # it's a character escape code + int base = 10; + usedChar( 2 ); + if( getChar() == 'x' ) + { + base = 16; + usedChar(); + } + char buf[4]; + int j = 0; + for( j = 0; getChar() != ';'; j++ ) + { + buf[j] = getChar(); + usedChar(); + } + usedChar(); + buf[j] = '\0'; + buf[0] = (char)strtol( buf, (char **)NULL, base ); + buf[1] = '\0'; + + return new StaticString( buf ); } - catch( ExceptionBase &e ) + else { - return; + // ...otherwise replace with the appropriate string... + std::string buf; + usedChar(); + for(;;) + { + char cbuf = getChar(); + usedChar(); + if( cbuf == ';' ) break; + buf += cbuf; + } + + StaticString *tmp = (StaticString *)htEntity[buf.c_str()]; + if( tmp == NULL ) return NULL; + + StaticString *ret = new StaticString( *tmp ); + return ret; } - Eq(); - Bu::FString ver = AttValue(); - if( ver != "1.1" ) - throw ExceptionBase("Currently we only support xml version 1.1\n"); } -void Bu::XmlReader::Eq() +bool XmlReader::param() { - Sq(); - checkString("=", 1 ); - Sq(); -} + FlexBuf fbName; + FlexBuf fbValue; -void Bu::XmlReader::EncodingDecl() -{ - S(); - try - { - checkString("encoding", 8 ); - } - catch( ExceptionBase &e ) + while( true ) { - return; + char chr = getChar(); + if( isws( chr ) || chr == '=' ) + { + break; + } + else + { + fbName.appendData( chr ); + usedChar(); + } } - Eq(); - AttValue(); -} + gcall( ws() ); -void Bu::XmlReader::SDDecl() -{ - S(); - try - { - checkString("standalone", 10 ); - } - catch( ExceptionBase &e ) + if( getChar() == '=' ) { - return; - } + usedChar(); - Eq(); - AttValue(); -} + gcall( ws() ); -Bu::FString Bu::XmlReader::AttValue() -{ - char q = *lookahead(1); - if( q == '\"' ) - { - for( int j = 2;; j++ ) + char chr = getChar(); + if( chr == '"' ) { - if( lookahead(j)[j-1] == '\"' ) + // Better quoted rhs + usedChar(); + + while( true ) { - Bu::FString ret( lookahead(j)+1, j-2 ); - burn( j ); - return ret; + chr = getChar(); + if( chr == '"' ) + { + usedChar(); + addProperty( fbName.getData(), fbValue.getData() ); + return true; + } + else + { + if( chr == '&' ) + { + StaticString *tmp = getEscape(); + if( tmp == NULL ) return false; + fbValue.appendData( tmp->getString() ); + delete tmp; + } + else + { + fbValue.appendData( chr ); + usedChar(); + } + } } } - } - else if( q == '\'' ) - { - for( int j = 2;; j++ ) + else { - if( lookahead(j)[j-1] == '\'' ) + // Simple one-word rhs + while( true ) { - Bu::FString ret( lookahead(j)+1, j-2 ); - burn( j ); - return ret; + chr = getChar(); + if( isws( chr ) || chr == '/' || chr == '>' ) + { + addProperty( fbName.getData(), fbValue.getData() ); + return true; + } + else + { + if( chr == '&' ) + { + StaticString *tmp = getEscape(); + if( tmp == NULL ) return false; + fbValue.appendData( tmp->getString() ); + delete tmp; + } + else + { + fbValue.appendData( chr ); + usedChar(); + } + } } } } + else + { + throw XmlException("Expected an equals to seperate the params."); + return false; + } - throw ExceptionBase("Excpected either \' or \".\n"); + return true; } -Bu::FString Bu::XmlReader::Name() +bool XmlReader::content() { - unsigned char c = *lookahead( 1 ); - if( c != ':' && c != '_' && - (c < 'A' || c > 'Z') && - (c < 'a' || c > 'z') && - (c < 0xC0 || c > 0xD6 ) && - (c < 0xD8 || c > 0xF6 ) && - (c < 0xF8)) - { - throw ExceptionBase("Invalid entity name starting character."); - } + FlexBuf fbContent; - for( int j = 1;; j++ ) + if( bStrip ) gcall( ws() ); + + while( true ) { - unsigned char c = lookahead(j+1)[j]; - if( isS( c ) ) + char chr = getChar(); + if( chr == '<' ) + { + if( getChar(1) == '/' ) + { + if( fbContent.getLength() > 0 ) + { + if( bStrip ) + { + int j; + for( j = fbContent.getLength()-1; isws(fbContent.getData()[j]); j-- ); + ((char *)fbContent.getData())[j+1] = '\0'; + } + setContent( fbContent.getData() ); + } + usedChar( 2 ); + gcall( ws() ); + FlexBuf fbName; + while( true ) + { + chr = getChar(); + if( isws( chr ) || chr == '>' ) + { + if( !strcasecmp( getCurrent()->getName(), fbName.getData() ) ) + { + closeNode(); + break; + } + else + { + throw XmlException("Mismatched close tag found: <%s> to <%s>.", getCurrent()->getName(), fbName.getData() ); + } + } + else + { + fbName.appendData( chr ); + usedChar(); + } + } + gcall( ws() ); + if( getChar() == '>' ) + { + usedChar(); + return true; + } + else + { + throw XmlException("Malformed close tag."); + } + } + else if( getChar(1) == '!' ) + { + // We know it's a comment, let's see if it's proper + if( getChar(2) != '-' || + getChar(3) != '-' ) + { + // Not a valid XML comment + throw XmlException("Malformed comment start tag found."); + } + + usedChar( 4 ); + + // Now burn text until we find the close tag + for(;;) + { + if( getChar() == '-' ) + { + if( getChar( 1 ) == '-' ) + { + // The next one has to be a '>' now + if( getChar( 2 ) != '>' ) + { + throw XmlException("Malformed comment close tag found. You cannot have a '--' that isn't followed by a '>' in a comment."); + } + usedChar( 3 ); + break; + } + else + { + // Found a dash followed by a non dash, that's ok... + usedChar( 2 ); + } + } + else + { + // Burn comment chars + usedChar(); + } + } + } + else + { + if( fbContent.getLength() > 0 ) + { + if( bStrip ) + { + int j; + for( j = fbContent.getLength()-1; isws(fbContent.getData()[j]); j-- ); + ((char *)fbContent.getData())[j+1] = '\0'; + } + setContent( fbContent.getData() ); + fbContent.clearData(); + } + gcall( node() ); + } + + if( bStrip ) gcall( ws() ); + } + else if( chr == '&' ) { - FString ret( lookahead(j+1), j+1 ); - burn( j+1 ); - return ret; + StaticString *tmp = getEscape(); + if( tmp == NULL ) return false; + fbContent.appendData( tmp->getString() ); + delete tmp; } - if( c != ':' && c != '_' && c != '-' && c != '.' && c != 0xB7 && - (c < 'A' || c > 'Z') && - (c < 'a' || c > 'z') && - (c < '0' || c > '9') && - (c < 0xC0 || c > 0xD6 ) && - (c < 0xD8 || c > 0xF6 ) && - (c < 0xF8)) + else { - throw ExceptionBase("Invalid character in name."); + fbContent.appendData( chr ); + usedChar(); } } } diff --git a/src/xmlreader.h b/src/xmlreader.h index 708a386..c8f7202 100644 --- a/src/xmlreader.h +++ b/src/xmlreader.h @@ -1,121 +1,141 @@ -#ifndef XML_READER_H -#define XML_READER_H +#ifndef XMLREADER +#define XMLREADER + +#include +#include "xmldocument.h" +#include "flexbuf.h" +#include "hashtable.h" +#include "staticstring.h" + +/** + * Takes care of reading in xml formatted data from a file. This could/should + * be made more arbitrary in the future so that we can read the data from any + * source. This is actually made quite simple already since all data read in + * is handled by one single helper function and then palced into a FlexBuf for + * easy access by the other functions. The FlexBuf also allows for block + * reading from disk, which improves speed by a noticable amount. + *
+ * There are also some extra features implemented that allow you to break the + * standard XML reader specs and eliminate leading and trailing whitespace in + * all read content. This is useful in situations where you allow additional + * whitespace in the files to make them easily human readable. The resturned + * content will be NULL in sitautions where all content between nodes was + * stripped. + *@author Mike Buland + */ +class XmlReader : public XmlDocument +{ +public: + /** + * Create a standard XmlReader. The optional parameter bStrip allows you to + * create a reader that will strip out all leading and trailing whitespace + * in content, a-la html. + *@param bStrip Strip out leading and trailing whitespace? + */ + XmlReader( bool bStrip=false ); -#include -#include "bu/stream.h" -#include "bu/fstring.h" -#include "bu/xmlnode.h" + /** + * Destroy this XmlReader. + */ + virtual ~XmlReader(); + + /** + * Build a document based on some kind of input. This is called + * automatically by the constructor. + */ + bool buildDoc(); + +private: + /** + * This is called by the low level automoton in order to get the next + * character. This function should return a character at the current + * position plus nIndex, but does not increment the current character. + *@param nIndex The index of the character from the current stream position. + *@returns A single character at the requested position, or 0 for end of + * stream. + */ + virtual char getChar( int nIndex = 0 ) = 0; + + /** + * Called to increment the current stream position by a single character. + */ + virtual void usedChar( int nAmnt = 1) = 0; + + /** + * Automoton function: is whitespace. + *@param chr A character + *@returns True if chr is whitespace, false otherwise. + */ + bool isws( char chr ); + + /** + * Automoton function: ws. Skips sections of whitespace. + *@returns True if everything was ok, False for end of stream. + */ + bool ws(); + + /** + * Automoton function: node. Processes an XmlNode + *@returns True if everything was ok, False for end of stream. + */ + bool node(); -namespace Bu -{ /** - * An Xml 1.1 reader. I've decided to write this, this time, based on the - * official W3C reccomendation, now included with the source code. I've - * named the productions in the parser states the same as in that document, - * which may make them easier to find, etc, although possibly slightly less - * optimized than writing my own reduced grammer. - * - * Below I will list differences between my parser and the official standard - * as I come up with them. - * - Encoding and Standalone headings are ignored for the moment. (4.3.3, - * 2.9) - * - The standalone heading attribute can have any standard whitespace - * before it (the specs say only spaces, no newlines). (2.9) - * - Since standalone is ignored, it is currently allowed to have any - * value (should be restricted to "yes" or "no"). (2.9) - * - Currently only UTF-8 / ascii are parsed. - * - [optional] The content of comments is thrown away. (2.5) - * - The content of processing instruction blocks is parsed properly, but - * thrown away. (2.6) - */ - class XmlReader - { - public: - XmlReader( Bu::Stream &sIn ); - virtual ~XmlReader(); - - XmlNode *read(); - - private: - Bu::Stream &sIn; - Bu::FString sBuf; - - private: // Helpers - const char *lookahead( int nAmnt ); - void burn( int nAmnt ); - void checkString( const char *str, int nLen ); - - private: // States - /** - * The headers, etc. - */ - void prolog(); - - /** - * The xml decleration (version, encoding, etc). - */ - void XMLDecl(); - - /** - * Misc things, Includes Comments and PIData (Processing Instructions). - */ - void Misc(); - - /** - * Comments - */ - void Comment(); - - /** - * Processing Instructions - */ - void PI(); - - /** - * Whitespace eater. - */ - void S(); - - /** - * Optional whitespace eater. - */ - void Sq(); - - /** - * XML Version spec - */ - void VersionInfo(); - - /** - * Your basic equals sign with surrounding whitespace. - */ - void Eq(); - - /** - * Read in an attribute value. - */ - FString AttValue(); - - /** - * Read in the name of something. - */ - FString Name(); - - /** - * Encoding decleration in the header - */ - void EncodingDecl(); - - /** - * Standalone decleration in the header - */ - void SDDecl(); - - bool isS( unsigned char c ) - { - return ( c == 0x20 || c == 0x9 || c == 0xD || c == 0xA ); - } - }; -} + * Automoton function: startNode. Processes the begining of a node. + *@returns True if everything was ok, False for end of stream. + */ + bool startNode(); + + /** + * Automoton function: name. Processes the name of a node. + *@returns True if everything was ok, False for end of stream. + */ + bool name(); + + /** + * Automoton function: textDecl. Processes the xml text decleration, if + * there is one. + */ + void textDecl(); + + /** + * Automoton function: entity. Processes an entity from the header. + */ + void entity(); + + /** + * Adds an entity to the list, if it doesn't already exist. + *@param name The name of the entity + *@param value The value of the entity + */ + void addEntity( const char *name, const char *value ); + + StaticString *getEscape(); + + /** + * Automoton function: paramlist. Processes a list of node params. + *@returns True if everything was ok, False for end of stream. + */ + bool paramlist(); + + /** + * Automoton function: param. Processes a single parameter. + *@returns True if everything was ok, False for end of stream. + */ + bool param(); + + /** + * Automoton function: content. Processes node content. + *@returns True if everything was ok, False for end of stream. + */ + bool content(); + + FlexBuf fbContent; /**< buffer for the current node's content. */ + FlexBuf fbParamName; /**< buffer for the current param's name. */ + FlexBuf fbParamValue; /**< buffer for the current param's value. */ + bool bStrip; /**< Are we stripping whitespace? */ + + HashTable htEntity; /**< Entity type definitions. */ +}; #endif diff --git a/src/xmlwriter.cpp b/src/xmlwriter.cpp index 23a5175..56880b6 100644 --- a/src/xmlwriter.cpp +++ b/src/xmlwriter.cpp @@ -1,9 +1,173 @@ +#include +#include #include "xmlwriter.h" -Bu::XmlWriter::XmlWriter() +XmlWriter::XmlWriter( const char *sIndent, XmlNode *pRoot ) : + XmlDocument( pRoot ) { + if( sIndent == NULL ) + { + this->sIndent = ""; + } + else + { + this->sIndent = sIndent; + } } -Bu::XmlWriter::~XmlWriter() +XmlWriter::~XmlWriter() { } + +void XmlWriter::write() +{ + write( getRoot(), sIndent.c_str() ); +} + +void XmlWriter::write( XmlNode *pRoot, const char *sIndent ) +{ + writeNode( pRoot, 0, sIndent ); +} + +void XmlWriter::closeNode() +{ + XmlDocument::closeNode(); + + if( isCompleted() ) + { + write( getRoot(), sIndent.c_str() ); + } +} + +void XmlWriter::writeIndent( int nIndent, const char *sIndent ) +{ + if( sIndent == NULL ) return; + for( int j = 0; j < nIndent; j++ ) + { + writeString( sIndent ); + } +} + +std::string XmlWriter::escape( std::string sIn ) +{ + std::string sOut; + + std::string::const_iterator i; + for( i = sIn.begin(); i != sIn.end(); i++ ) + { + if( ((*i >= ' ' && *i <= '9') || + (*i >= 'a' && *i <= 'z') || + (*i >= 'A' && *i <= 'Z') ) && + (*i != '\"' && *i != '\'' && *i != '&') + ) + { + sOut += *i; + } + else + { + sOut += "&#"; + char buf[4]; + sprintf( buf, "%u", (unsigned char)*i ); + sOut += buf; + sOut += ';'; + } + } + + return sOut; +} + +void XmlWriter::writeNodeProps( XmlNode *pNode, int nIndent, const char *sIndent ) +{ + for( int j = 0; j < pNode->getNumProperties(); j++ ) + { + writeString(" "); + writeString( pNode->getPropertyName( j ) ); + writeString("=\""); + writeString( escape( pNode->getProperty( j ) ).c_str() ); + writeString("\""); + } +} + +void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const char *sIndent ) +{ + if( pNode->hasChildren() ) + { + writeIndent( nIndent, sIndent ); + writeString("<"); + writeString( pNode->getName() ); + writeNodeProps( pNode, nIndent, sIndent ); + if( sIndent ) + writeString(">\n"); + else + writeString(">"); + + if( pNode->getContent( 0 ) ) + { + writeIndent( nIndent+1, sIndent ); + if( sIndent ) + { + writeString( pNode->getContent( 0 ) ); + writeString("\n"); + } + else + writeString( pNode->getContent( 0 ) ); + } + + int nNumChildren = pNode->getNumChildren(); + for( int j = 0; j < nNumChildren; j++ ) + { + writeNode( pNode->getChild( j ), nIndent+1, sIndent ); + if( pNode->getContent( j+1 ) ) + { + writeIndent( nIndent+1, sIndent ); + if( sIndent ) + { + writeString( pNode->getContent( j+1 ) ); + writeString("\n"); + } + else + writeString( pNode->getContent( j+1 ) ); + } + } + + writeIndent( nIndent, sIndent ); + if( sIndent ) + { + writeString("getName() ); + writeString(">\n"); + } + else + { + writeString("getName() ); + writeString(">"); + } + } + else if( pNode->getContent() ) + { + writeIndent( nIndent, sIndent ); + writeString("<"); + writeString( pNode->getName() ); + writeNodeProps( pNode, nIndent, sIndent ); + writeString(">"); + writeString( pNode->getContent() ); + writeString("getName() ); + writeString(">"); + if( sIndent ) + writeString("\n"); + } + else + { + writeIndent( nIndent, sIndent ); + writeString("<"); + writeString( pNode->getName() ); + writeNodeProps( pNode, nIndent, sIndent ); + if( sIndent ) + writeString("/>\n"); + else + writeString("/>"); + } +} + diff --git a/src/xmlwriter.h b/src/xmlwriter.h index 796d6fb..c48e810 100644 --- a/src/xmlwriter.h +++ b/src/xmlwriter.h @@ -1,22 +1,96 @@ -#ifndef XML_WRITER_H -#define XML_WRITER_H +#ifndef XMLWRITER +#define XMLWRITER -#include +#include "xmlnode.h" +#include "xmldocument.h" -namespace Bu +/** + * Implements xml writing in the XML standard format. Also allows you to + * break that format and auto-indent your exported xml data for ease of + * reading. The auto-indenting will only be applied to sections that + * have no content of their own already. This means that except for + * whitespace all of your data will be preserved perfectly. + * You can create an XmlWriter object around a file, or access the static + * write function directly and just hand it a filename and a root XmlNode. + * When using an XmlWriter object the interface is identicle to that of + * the XmlDocument class, so reference that class for API info. However + * when the initial (or root) node is closed, and the document is finished + * the file will be created and written to automatically. The user can + * check to see if this is actually true by calling the isFinished + * function in the XmlDocument class. + *@author Mike Buland + */ +class XmlWriter : public XmlDocument { +public: /** - * + * Construct a standard XmlWriter. + *@param sIndent Set this to something other than NULL to include it as an + * indent before each node in the output that doesn't already have content. + * If you are using the whitespace stripping option in the XmlReader and set + * this to a tab or some spaces it will never effect the content of your + * file. */ - class XmlWriter - { - public: - XmlWriter(); - virtual ~XmlWriter(); + XmlWriter( const char *sIndent=NULL, XmlNode *pRoot=NULL ); - private: + /** + * Destroy the writer. + */ + virtual ~XmlWriter(); + + /** + * This override of the parent class closeNode function calls the parent + * class, but also triggers a write operation when the final node is closed. + * This means that by checking the isCompleted() function the user may also + * check to see if their file has been written or not. + */ + void closeNode(); + + void write(); - }; -} +private: + std::string sIndent; /**< The indent string */ + + std::string escape( std::string sIn ); + + /** + * Write the file. + *@param pNode The root node + *@param sIndent The indent text. + */ + void write( XmlNode *pNode, const char *sIndent=NULL ); + + /** + * Write a node in the file, including children. + *@param pNode The node to write. + *@param nIndent The indent level (the number of times to include sIndent) + *@param sIndent The indent text. + */ + void writeNode( XmlNode *pNode, int nIndent, const char *sIndent ); + + /** + * Write the properties of a node. + *@param pNode The node who's properties to write. + *@param nIndent The indent level of the containing node + *@param sIndent The indent text. + */ + void writeNodeProps( XmlNode *pNode, int nIndent, const char *sIndent ); + + /** + * Called to write the actual indent. + *@param nIndent The indent level. + *@param sIndent The indent text. + */ + void writeIndent( int nIndent, const char *sIndent ); + + /** + * This is the function that must be overridden in order to use this class. + * It must write the null-terminated string sString, minus the mull, + * verbatum to it's output device. Adding extra characters for any reason + * will break the XML formatting. + *@param sString The string data to write to the output. + */ + virtual void writeString( const char *sString ) = 0; +}; #endif -- cgit v1.2.3 From 033c41ed57348abb3a418166b1fb39bfad3312de Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Fri, 11 May 2007 07:51:40 +0000 Subject: Added a list template class, seems to work pretty well for now, I may have forgotten proper cleanup in the deconstructor, but besides that you can do almost everything you need. I'll make a slist/stack next, probably with the same basic code, just a different structure (not doubley-linked). The xml system from old-libbu++ is almost completely converted, I was going to re-write it, but this seemed easier at first, it may not have been, we'll see. It almost parses everything again, and almost outputs again, and it does use streams now. The FString is partway to doing minimum chunk allocations, so that adding single-characters will be really fast up to the minimum chunk size. I also figured out how to add this optimization without any extra variables taking up space, and it's optional in the template, which is cool. You can specify the size of the blocks (default 256 bytes), if it's 0 then they'll be like the old FString, 1 chunk per operation. The next FString update should be allowing efficient removal from the begining of the string by faking it, and simply moving a secondary base pointer ahead, and then optimizing appends after that fact to simply move the existing data around if you shouldn't have to re-allocate (alla FlexBuf). The final fun addition that I'm planning is a simple switch in the template (boolean) that will switch an FString into a thread-safe mode without changing the interface or anything that you can do with them at all. It may increasing memory usage, but they should still be better than std::strings, and totally thread-safe. The best part of that is that if it's done with a boolean template parameter and if statements that only test that parameter controlling flow, the code that you don't want (threadsafe/non-threadsafe) won't be included at all post-optimization. --- src/fstring.h | 14 +++-- src/list.cpp | 2 + src/list.h | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/tests/list.cpp | 22 +++++++ src/tests/xml.cpp | 6 +- src/xmldocument.cpp | 20 +++--- src/xmldocument.h | 8 +-- src/xmlnode.cpp | 106 ++++++++++--------------------- src/xmlnode.h | 101 +++++++++++------------------- src/xmlreader.cpp | 170 +++++++++++++++++++++++++------------------------- src/xmlreader.h | 31 ++++----- src/xmlwriter.cpp | 62 +++++++++--------- src/xmlwriter.h | 16 ++--- 13 files changed, 428 insertions(+), 306 deletions(-) create mode 100644 src/list.cpp create mode 100644 src/list.h create mode 100644 src/tests/list.cpp diff --git a/src/fstring.h b/src/fstring.h index 877e5a7..f738f63 100644 --- a/src/fstring.h +++ b/src/fstring.h @@ -28,7 +28,7 @@ namespace Bu * data is actually copied. This also means that you never need to put any * FBasicString into a ref-counting container class. */ - template< typename chr, typename chralloc=std::allocator, typename chunkalloc=std::allocator > > + template< typename chr, int nMinSize=256, typename chralloc=std::allocator, typename chunkalloc=std::allocator > > class FBasicString : public Archival { #ifndef VALTEST @@ -36,7 +36,7 @@ namespace Bu #endif private: typedef struct FStringChunk Chunk; - typedef struct FBasicString MyType; + typedef struct FBasicString MyType; public: FBasicString() : @@ -131,6 +131,11 @@ namespace Bu appendChunk( pNew ); } + void append( const chr cData ) + { + append( &cData, 1 ); + } + void prepend( const chr *pData ) { long nLen; @@ -231,8 +236,7 @@ namespace Bu MyType &operator +=( const chr pData ) { - chr tmp[2] = { pData, (chr)0 }; - append( tmp ); + append( &pData, 1 ); return (*this); } @@ -475,7 +479,7 @@ namespace Bu } } - void copyFrom( const FBasicString &rSrc ) + void copyFrom( const FBasicString &rSrc ) { if( rSrc.pFirst == NULL ) return; diff --git a/src/list.cpp b/src/list.cpp new file mode 100644 index 0000000..abe92ad --- /dev/null +++ b/src/list.cpp @@ -0,0 +1,2 @@ +#include "bu/list.h" + diff --git a/src/list.h b/src/list.h new file mode 100644 index 0000000..ec63496 --- /dev/null +++ b/src/list.h @@ -0,0 +1,176 @@ +#ifndef LIST_H +#define LIST_H + +#include +#include "bu/exceptionbase.h" + +namespace Bu +{ + template + struct ListLink + { + value *pValue; + ListLink *pNext; + ListLink *pPrev; + }; + template, typename linkalloc=std::allocator > > + class List + { + private: + typedef struct ListLink Link; + typedef class List MyType; + + public: + List() : + pFirst( NULL ), + pLast( NULL ) + { + } + + void append( value v ) + { + Link *pNew = la.allocate( sizeof( Link ) ); + pNew->pValue = va.allocate( sizeof( value ) ); + va.construct( pNew->pValue, v ); + if( pFirst == NULL ) + { + // Empty list + pFirst = pLast = pNew; + pNew->pNext = pNew->pPrev = NULL; + } + else + { + pNew->pNext = NULL; + pNew->pPrev = pLast; + pLast->pNext = pNew; + pLast = pNew; + } + } + + void prepend( value v ) + { + Link *pNew = la.allocate( sizeof( Link ) ); + pNew->pValue = va.allocate( sizeof( value ) ); + va.construct( pNew->pValue, v ); + if( pFirst == NULL ) + { + // Empty list + pFirst = pLast = pNew; + pNew->pNext = pNew->pPrev = NULL; + } + else + { + pNew->pNext = pFirst; + pNew->pPrev = NULL; + pFirst->pPrev = pNew; + pFirst = pNew; + } + } + + typedef struct iterator + { + friend class List; + private: + Link *pLink; + iterator() : + pLink( NULL ) + { + } + + iterator( Link *pLink ) : + pLink( pLink ) + { + } + + public: + bool operator==( const iterator &oth ) + { + return ( pLink == oth.pLink ); + } + + bool operator==( const Link *pOth ) + { + return ( pLink == pOth ); + } + + bool operator!=( const iterator &oth ) + { + return ( pLink != oth.pLink ); + } + + bool operator!=( const Link *pOth ) + { + return ( pLink != pOth ); + } + + value &operator*() + { + return *(pLink->pValue); + } + + value *operator->() + { + return pLink->pValue(); + } + + iterator operator++() + { + if( pLink != NULL ) + pLink = pLink->pNext; + return *this; + } + + iterator operator--() + { + if( pLink != NULL ) + pLink = pLink->pPrev; + return *this; + } + + iterator operator++( int ) + { + if( pLink != NULL ) + pLink = pLink->pNext; + return *this; + } + + iterator operator--( int ) + { + if( pLink != NULL ) + pLink = pLink->pPrev; + return *this; + } + + iterator operator=( const iterator &oth ) + { + pLink = oth.pLink; + } + }; + + iterator begin() + { + return iterator( pFirst ); + } + + const Link *end() + { + return NULL; + } + + int getSize() + { + int j = 0; + for( Link *pCur = pFirst; pCur; pCur = pCur->pNext ) + j++; + return j; + } + + private: + Link *pFirst; + Link *pLast; + linkalloc la; + valuealloc va; + }; +} + +#endif diff --git a/src/tests/list.cpp b/src/tests/list.cpp new file mode 100644 index 0000000..34ab656 --- /dev/null +++ b/src/tests/list.cpp @@ -0,0 +1,22 @@ +#include "bu/list.h" + +int main() +{ + Bu::List l; + + l.append( 0 ); + + for( int j = 3; j <= 21; j += 3 ) + { + l.append( j ); + l.prepend( -j ); + } + + for( Bu::List::iterator i = l.begin(); i != l.end(); i++ ) + { + printf("%d ", *i ); + } + + printf("\n\n"); +} + diff --git a/src/tests/xml.cpp b/src/tests/xml.cpp index 9ef6a7e..9689a28 100644 --- a/src/tests/xml.cpp +++ b/src/tests/xml.cpp @@ -6,9 +6,9 @@ int main() { Bu::File f("test.xml", "r"); - Bu::XmlReader xr( f ); - - xr.read(); + XmlReader xr( f ); + + //xr.read(); return 0; } diff --git a/src/xmldocument.cpp b/src/xmldocument.cpp index d7867d5..95b9788 100644 --- a/src/xmldocument.cpp +++ b/src/xmldocument.cpp @@ -1,6 +1,6 @@ #include #include -#include "xmlwriter.h" +#include "xmldocument.h" XmlDocument::XmlDocument( XmlNode *pRoot ) { @@ -17,28 +17,23 @@ XmlDocument::~XmlDocument() } } -void XmlDocument::addNode( const char *sName, const char *sContent, bool bClose ) +void XmlDocument::addNode( const Bu::FString &sName ) { if( pRoot == NULL ) { // This is the first node, so ignore position and just insert it. - pCurrent = pRoot = new XmlNode( sName, NULL, sContent ); + pCurrent = pRoot = new XmlNode( sName ); } else { - pCurrent = pCurrent->addChild( sName, sContent ); - } - - if( bClose ) - { - closeNode(); + pCurrent = pCurrent->addChild( sName ); } } - +/* void XmlDocument::setName( const char *sName ) { pCurrent->setName( sName ); -} +}*/ bool XmlDocument::isCompleted() { @@ -143,7 +138,8 @@ void XmlDocument::setContent( const char *sContent ) { if( pCurrent ) { - pCurrent->setContent( sContent ); + printf("XmlDocument::setContent: not yet implemented.\n"); + //pCurrent->setContent( sContent ); } } diff --git a/src/xmldocument.h b/src/xmldocument.h index 6671c41..e0c36eb 100644 --- a/src/xmldocument.h +++ b/src/xmldocument.h @@ -39,13 +39,7 @@ public: * the node and setting the content and name. If this is set to true the * node is appended, but the context node doesn't change. */ - void addNode( const char *sName=NULL, const char *sContent=NULL, bool bClose=false ); - - /** - * Set the name of the current node context. - *@param sName The new name of the node. - */ - void setName( const char *sName ); + void addNode( const Bu::FString &sName ); /** * Close the current node context. This will move the current context to diff --git a/src/xmlnode.cpp b/src/xmlnode.cpp index b1ed9a9..96d5850 100644 --- a/src/xmlnode.cpp +++ b/src/xmlnode.cpp @@ -1,53 +1,15 @@ #include "xmlnode.h" -#include "hashfunctionstring.h" -XmlNode::XmlNode( const char *sName, XmlNode *pParent, const char *sContent ) : - hProperties( new HashFunctionString(), 53, false ), - hChildren( new HashFunctionString(), 53, true ) +XmlNode::XmlNode( const Bu::FString &sName, XmlNode *pParent ) : + sName( sName ), + pParent( pParent ) { - this->pParent = pParent; - if( sName != NULL ) - { - setName( sName ); - } - if( sContent != NULL ) - { - this->sPreContent = new std::string( sContent ); - } - else - { - this->sPreContent = NULL; - } - nCurContent = 0; } XmlNode::~XmlNode() { - for( int j = 0; j < lChildren.getSize(); j++ ) - { - delete (XmlNode *)lChildren[j]; - } - for( int j = 0; j < lPropNames.getSize(); j++ ) - { - delete (std::string *)lPropNames[j]; - } - for( int j = 0; j < lPropValues.getSize(); j++ ) - { - delete (std::string *)lPropValues[j]; - } - for( int j = 0; j < lPostContent.getSize(); j++ ) - { - if( lPostContent[j] != NULL ) - { - delete (std::string *)lPostContent[j]; - } - } - if( sPreContent ) - { - delete sPreContent; - } } - +/* void XmlNode::setName( const char *sName ) { if( pParent ) @@ -120,18 +82,18 @@ const char *XmlNode::getContent( int nIndex ) } return NULL; -} +}*/ -XmlNode *XmlNode::addChild( const char *sName, const char *sContent ) +XmlNode *XmlNode::addChild( const Bu::FString &sName ) { - return addChild( new XmlNode( sName, this, sContent ) ); + return addChild( new XmlNode( sName, this ) ); } XmlNode *XmlNode::addChild( XmlNode *pNode ) { - lChildren.append( pNode ); - lPostContent.append( NULL ); - nCurContent++; + Child c = { typeNode }; + c.pNode = pNode; + lChildren.append( c ); pNode->pParent = this; return pNode; @@ -142,21 +104,16 @@ XmlNode *XmlNode::getParent() return pParent; } -void XmlNode::addProperty( const char *sName, const char *sValue ) +void XmlNode::addProperty( const Bu::FString &sName, const Bu::FString &sValue ) { - std::string *pName = new std::string( sName ); - std::string *pValue = new std::string( sValue ); - - hProperties.insert( pName->c_str(), pValue->c_str() ); - lPropNames.append( pName ); - lPropValues.append( pValue ); + hProperties.insert( sName, sValue ); } int XmlNode::getNumProperties() { - return lPropNames.getSize(); + return hProperties.size(); } - +/* const char *XmlNode::getPropertyName( int nIndex ) { std::string *tmp = ((std::string *)lPropNames[nIndex]); @@ -172,15 +129,12 @@ const char *XmlNode::getProperty( int nIndex ) return NULL; return tmp->c_str(); } - -const char *XmlNode::getProperty( const char *sName ) +*/ +Bu::FString XmlNode::getProperty( const Bu::FString &sName ) { - const char *tmp = (const char *)hProperties[sName]; - if( tmp == NULL ) - return NULL; - return tmp; + return hProperties[sName]; } - +/* void XmlNode::deleteProperty( int nIndex ) { hProperties.del( ((std::string *)lPropNames[nIndex])->c_str() ); @@ -194,29 +148,33 @@ void XmlNode::deleteProperty( int nIndex ) bool XmlNode::hasChildren() { - return lChildren.getSize()>0; -} + return hChildren.getSize()>0; +}*/ int XmlNode::getNumChildren() { return lChildren.getSize(); } - +/* XmlNode *XmlNode::getChild( int nIndex ) { return (XmlNode *)lChildren[nIndex]; } - -XmlNode *XmlNode::getChild( const char *sName, int nSkip ) +*/ +XmlNode *XmlNode::getChild( const Bu::FString &sName, int nSkip ) { - return (XmlNode *)hChildren.get( sName, nSkip ); + if( !hChildren.has( sName ) ) + return NULL; + + Bu::List::iterator i = hChildren[sName]->begin(); + return *i; } -const char *XmlNode::getName() +Bu::FString XmlNode::getName() { - return sName.c_str(); + return sName; } - +/* void XmlNode::deleteNode( int nIndex, const char *sReplacementText ) { XmlNode *xRet = detatchNode( nIndex, sReplacementText ); @@ -442,4 +400,4 @@ void XmlNode::deleteNodeKeepChildren( int nIndex ) void XmlNode::replaceNodeWithChildren( int nIndex, XmlNode *pNewNode ) { } - +*/ diff --git a/src/xmlnode.h b/src/xmlnode.h index 7525306..c895cd8 100644 --- a/src/xmlnode.h +++ b/src/xmlnode.h @@ -2,8 +2,9 @@ #define XMLNODE #include -#include "linkedlist.h" -#include "hashtable.h" +#include "bu/list.h" +#include "bu/hash.h" +#include "bu/fstring.h" /** * Maintains all data pertient to an XML node, including sub-nodes and content. @@ -25,9 +26,8 @@ public: *@param sContent The initial content string. */ XmlNode( - const char *sName=NULL, - XmlNode *pParent = NULL, - const char *sContent=NULL + const Bu::FString &sName, + XmlNode *pParent=NULL ); /** @@ -39,7 +39,7 @@ public: * Change the name of the node. *@param sName The new name of the node. */ - void setName( const char *sName ); + //void setName( const char *sName ); /** * Construct a new node and add it as a child to this node, also return a @@ -48,7 +48,7 @@ public: *@param sContent The initial content of the new node. *@returns A pointer to the newly created child node. */ - XmlNode *addChild( const char *sName, const char *sContent=NULL ); + XmlNode *addChild( const Bu::FString &sName ); /** * Add an already created XmlNode as a child to this node. The new child @@ -65,7 +65,7 @@ public: * in use will overwrite that property. *@param sValue The textual value of the property. */ - void addProperty( const char *sName, const char *sValue ); + void addProperty( const Bu::FString &sName, const Bu::FString &sValue ); /** * Get a pointer to the parent node, if any. @@ -85,14 +85,6 @@ public: */ int getNumChildren(); - /** - * Get a child node at a specific index. - *@param nIndex The zero-based index of the child to retreive. - *@returns A pointer to the child, or NULL if you requested an invalid - * index. - */ - XmlNode *getChild( int nIndex ); - /** * Get a child with the specified name, and possibly skip value. For an * explination of skip values see the HashTable. @@ -101,14 +93,14 @@ public: *@returns A pointer to the child, or NULL if no child with that name was * found. */ - XmlNode *getChild( const char *sName, int nSkip=0 ); + XmlNode *getChild( const Bu::FString &sName, int nSkip=0 ); /** * Get a pointer to the name of this node. Do not change this, use setName * instead. *@returns A pointer to the name of this node. */ - const char *getName(); + Bu::FString getName(); /** * Set the content of this node, optionally at a specific index. Using the @@ -116,14 +108,7 @@ public: *@param sContent The content string to use. *@param nIndex The index of the content. */ - void setContent( const char *sContent, int nIndex=-1 ); - - /** - * Get the content string at a given index, or zero for initial content. - *@param nIndex The index of the content. - *@returns A pointer to the content at that location. - */ - const char *getContent( int nIndex = 0 ); + //void setContent( const char *sContent, int nIndex=-1 ); /** * Get the number of properties in this node. @@ -131,37 +116,13 @@ public: */ int getNumProperties(); - /** - * Get a property's name by index. - *@param nIndex The index of the property to examine. - *@returns A pointer to the name of the property specified, or NULL if none - * found. - */ - const char *getPropertyName( int nIndex ); - - /** - * Get a proprty's value by index. - *@param nIndex The index of the property to examine. - *@returns A pointer to the value of the property specified, or NULL if none - * found. - */ - const char *getProperty( int nIndex ); - /** * Get a propery's value by name. *@param sName The name of the property to examine. *@returns A pointer to the value of the property specified, or NULL if none * found. */ - const char *getProperty( const char *sName ); - - /** - * Delete a property by index. - *@param nIndex The index of the property to delete. - *@returns True if the property was found and deleted, false if it wasn't - * found. - */ - void deleteProperty( int nIndex ); + Bu::FString getProperty( const Bu::FString &sName ); /** * Delete a child node, possibly replacing it with some text. This actually @@ -171,7 +132,7 @@ public: *@returns True of the node was found, and deleted, false if it wasn't * found. */ - void deleteNode( int nIndex, const char *sReplacementText = NULL ); + //void deleteNode( int nIndex, const char *sReplacementText = NULL ); /** * Delete a given node, but move all of it's children and content up to @@ -180,7 +141,7 @@ public: *@param nIndex The node to delete. *@returns True if the node was found and deleted, false if it wasn't. */ - void deleteNodeKeepChildren( int nIndex ); + //void deleteNodeKeepChildren( int nIndex ); /** * Detatch a given child node from this node. This effectively works just @@ -192,7 +153,7 @@ public: *@returns A pointer to the newly detatched node, which then passes * ownership to the caller. */ - XmlNode *detatchNode( int nIndex, const char *sReplacementText = NULL ); + //XmlNode *detatchNode( int nIndex, const char *sReplacementText = NULL ); /** * Replace a given node with a different node that is not currently owned by @@ -201,7 +162,7 @@ public: *@param pNewNode The new node to replace the old node with. *@returns True if the node was found and replaced, false if it wasn't. */ - void replaceNode( int nIndex, XmlNode *pNewNode ); + //void replaceNode( int nIndex, XmlNode *pNewNode ); /** * Replace a given node with the children and content of a given node. @@ -210,24 +171,34 @@ public: * replace the node specified by nIndex. *@returns True if the node was found and replaced, false if it wasn't. */ - void replaceNodeWithChildren( int nIndex, XmlNode *pNewNode ); + //void replaceNodeWithChildren( int nIndex, XmlNode *pNewNode ); /** * Get a copy of this node and all children. getCopy is recursive, so * beware copying large trees of xml. *@returns A newly created copy of this node and all of it's children. */ - XmlNode *getCopy(); + //XmlNode *getCopy(); + + enum ChildType + { + typeNode, + typeContent + }; private: - std::string sName; /**< The name of the node. */ - std::string *sPreContent; /**< The content that goes before any node. */ - LinkedList lChildren; /**< The children. */ - LinkedList lPostContent; /**< The content that comes after children. */ - HashTable hProperties; /**< Property hashtable. */ - HashTable hChildren; /**< Children hashtable. */ - LinkedList lPropNames; /**< List of property names. */ - LinkedList lPropValues; /**< List of property values. */ + typedef struct + { + uint8_t nType; + union { + XmlNode *pNode; + Bu::FString *pContent; + }; + } Child; + Bu::FString sName; /**< The name of the node. */ + Bu::List lChildren; /**< The children. */ + Bu::Hash hProperties; /**< Property hashtable. */ + Bu::Hash > hChildren; /**< Children hashtable. */ XmlNode *pParent; /**< A pointer to the parent of this node. */ int nCurContent; /**< The current content we're on, for using the -1 on setContent. */ diff --git a/src/xmlreader.cpp b/src/xmlreader.cpp index 18df69c..38cad5f 100644 --- a/src/xmlreader.cpp +++ b/src/xmlreader.cpp @@ -1,32 +1,49 @@ -#include "xmlreader.h" -#include "exceptions.h" +#include "bu/xmlreader.h" +#include "bu/exceptions.h" #include -#include "hashfunctionstring.h" -XmlReader::XmlReader( bool bStrip ) : - bStrip( bStrip ), - htEntity( new HashFunctionString(), 11 ) +XmlReader::XmlReader( Bu::Stream &sIn, bool bStrip ) : + sIn( sIn ), + bStrip( bStrip ) { + buildDoc(); } XmlReader::~XmlReader() { - void *i = htEntity.getFirstItemPos(); - while( (i = htEntity.getNextItemPos( i ) ) ) +} + +char XmlReader::getChar( int nIndex ) +{ + if( sBuf.getSize() <= nIndex ) { - free( (char *)(htEntity.getItemID( i )) ); - delete (StaticString *)htEntity.getItemData( i ); + int nInc = nIndex-sBuf.getSize()+1; + char *buf = new char[nInc]; + sIn.read( buf, nInc ); + sBuf.append( buf, nInc ); + delete[] buf; } + + return sBuf[nIndex]; } -void XmlReader::addEntity( const char *name, const char *value ) +void XmlReader::usedChar( int nAmnt ) { - if( htEntity[name] ) return; - - char *sName = strdup( name ); - StaticString *sValue = new StaticString( value ); + if( nAmnt >= sBuf.getSize() ) + { + sBuf.clear(); + } + else + { + char *s = sBuf.getStr(); + memcpy( s, s+nAmnt, sBuf.getSize()-nAmnt ); + sBuf.resize( sBuf.getSize()-nAmnt ); + } +} - htEntity.insert( sName, sValue ); +void XmlReader::addEntity( const Bu::FString &name, const Bu::FString &value ) +{ + htEntity[name] = value; } #define gcall( x ) if( x == false ) return false; @@ -99,7 +116,7 @@ void XmlReader::entity() { usedChar( 2 ); ws(); - std::string buf; + Bu::FString buf; for(;;) { char chr = getChar(); @@ -111,7 +128,7 @@ void XmlReader::entity() if( strcmp( buf.c_str(), "ENTITY") == 0 ) { ws(); - std::string name; + Bu::FString name; for(;;) { char chr = getChar(); @@ -124,21 +141,19 @@ void XmlReader::entity() usedChar(); if( quot != '\'' && quot != '\"' ) { - throw XmlException( + throw Bu::XmlException( "Only quoted entity values are supported." ); } - std::string value; + Bu::FString value; for(;;) { char chr = getChar(); usedChar(); if( chr == '&' ) { - StaticString *tmp = getEscape(); - if( tmp == NULL ) throw XmlException("Entity thing"); - value += tmp->getString(); - delete tmp; + Bu::FString tmp = getEscape(); + value += tmp; } else if( chr == quot ) { @@ -158,7 +173,7 @@ void XmlReader::entity() } else { - throw XmlException( + throw Bu::XmlException( "Malformed ENTITY: unexpected '%c' found.", getChar() ); @@ -166,7 +181,7 @@ void XmlReader::entity() } else { - throw XmlException( + throw Bu::XmlException( "Unsupported header symbol: %s", buf.c_str() ); @@ -203,12 +218,12 @@ bool XmlReader::node() } else { - throw XmlException("Close node in singleNode malformed!"); + throw Bu::XmlException("Close node in singleNode malformed!"); } } else { - throw XmlException("Close node expected, but not found."); + throw Bu::XmlException("Close node expected, but not found."); return false; } @@ -224,7 +239,7 @@ bool XmlReader::startNode() if( getChar() == '/' ) { // Heh, it's actually a close node, go figure - FlexBuf fbName; + Bu::FString sName; usedChar(); gcall( ws() ); @@ -235,19 +250,19 @@ bool XmlReader::startNode() { // Here we actually compare the name we got to the name // we already set, they have to match exactly. - if( !strcasecmp( getCurrent()->getName(), fbName.getData() ) ) + if( getCurrent()->getName() == sName ) { closeNode(); break; } else { - throw XmlException("Got a mismatched node close tag."); + throw Bu::XmlException("Got a mismatched node close tag."); } } else { - fbName.appendData( chr ); + sName += chr; usedChar(); } } @@ -260,13 +275,13 @@ bool XmlReader::startNode() } else { - throw XmlException("Got extra junk data instead of node close tag."); + throw Bu::XmlException("Got extra junk data instead of node close tag."); } } else { // We're good, format is consistant - addNode(); + //addNode(); // Skip extra whitespace gcall( ws() ); @@ -278,7 +293,7 @@ bool XmlReader::startNode() } else { - throw XmlException("Expected to find node opening char, '<'."); + throw Bu::XmlException("Expected to find node opening char, '<'."); } return true; @@ -286,19 +301,19 @@ bool XmlReader::startNode() bool XmlReader::name() { - FlexBuf fbName; + Bu::FString sName; while( true ) { char chr = getChar(); if( isws( chr ) || chr == '>' || chr == '/' ) { - setName( fbName.getData() ); + addNode( sName ); return true; } else { - fbName.appendData( chr ); + sName += chr; usedChar(); } } @@ -325,7 +340,7 @@ bool XmlReader::paramlist() return true; } -StaticString *XmlReader::getEscape() +Bu::FString XmlReader::getEscape() { if( getChar( 1 ) == '#' ) { @@ -349,12 +364,12 @@ StaticString *XmlReader::getEscape() buf[0] = (char)strtol( buf, (char **)NULL, base ); buf[1] = '\0'; - return new StaticString( buf ); + return buf; } else { // ...otherwise replace with the appropriate string... - std::string buf; + Bu::FString buf; usedChar(); for(;;) { @@ -364,18 +379,14 @@ StaticString *XmlReader::getEscape() buf += cbuf; } - StaticString *tmp = (StaticString *)htEntity[buf.c_str()]; - if( tmp == NULL ) return NULL; - - StaticString *ret = new StaticString( *tmp ); - return ret; + return htEntity[buf]; } } bool XmlReader::param() { - FlexBuf fbName; - FlexBuf fbValue; + Bu::FString sName; + Bu::FString sValue; while( true ) { @@ -386,7 +397,7 @@ bool XmlReader::param() } else { - fbName.appendData( chr ); + sName.append( chr ); usedChar(); } } @@ -411,21 +422,18 @@ bool XmlReader::param() if( chr == '"' ) { usedChar(); - addProperty( fbName.getData(), fbValue.getData() ); + addProperty( sName.getStr(), sValue.getStr() ); return true; } else { if( chr == '&' ) { - StaticString *tmp = getEscape(); - if( tmp == NULL ) return false; - fbValue.appendData( tmp->getString() ); - delete tmp; + sValue += getEscape(); } else { - fbValue.appendData( chr ); + sValue += chr; usedChar(); } } @@ -439,21 +447,18 @@ bool XmlReader::param() chr = getChar(); if( isws( chr ) || chr == '/' || chr == '>' ) { - addProperty( fbName.getData(), fbValue.getData() ); + addProperty( sName.getStr(), sValue.getStr() ); return true; } else { if( chr == '&' ) { - StaticString *tmp = getEscape(); - if( tmp == NULL ) return false; - fbValue.appendData( tmp->getString() ); - delete tmp; + sValue += getEscape(); } else { - fbValue.appendData( chr ); + sValue += chr; usedChar(); } } @@ -462,7 +467,7 @@ bool XmlReader::param() } else { - throw XmlException("Expected an equals to seperate the params."); + throw Bu::XmlException("Expected an equals to seperate the params."); return false; } @@ -471,7 +476,7 @@ bool XmlReader::param() bool XmlReader::content() { - FlexBuf fbContent; + Bu::FString sContent; if( bStrip ) gcall( ws() ); @@ -482,37 +487,37 @@ bool XmlReader::content() { if( getChar(1) == '/' ) { - if( fbContent.getLength() > 0 ) + if( sContent.getSize() > 0 ) { if( bStrip ) { int j; - for( j = fbContent.getLength()-1; isws(fbContent.getData()[j]); j-- ); - ((char *)fbContent.getData())[j+1] = '\0'; + for( j = sContent.getSize()-1; isws(sContent[j]); j-- ); + sContent[j+1] = '\0'; } - setContent( fbContent.getData() ); + setContent( sContent.getStr() ); } usedChar( 2 ); gcall( ws() ); - FlexBuf fbName; + Bu::FString sName; while( true ) { chr = getChar(); if( isws( chr ) || chr == '>' ) { - if( !strcasecmp( getCurrent()->getName(), fbName.getData() ) ) + if( !strcasecmp( getCurrent()->getName().getStr(), sName.getStr() ) ) { closeNode(); break; } else { - throw XmlException("Mismatched close tag found: <%s> to <%s>.", getCurrent()->getName(), fbName.getData() ); + throw Bu::XmlException("Mismatched close tag found: <%s> to <%s>.", getCurrent()->getName().getStr(), sName.getStr() ); } } else { - fbName.appendData( chr ); + sName += chr; usedChar(); } } @@ -524,7 +529,7 @@ bool XmlReader::content() } else { - throw XmlException("Malformed close tag."); + throw Bu::XmlException("Malformed close tag."); } } else if( getChar(1) == '!' ) @@ -534,7 +539,7 @@ bool XmlReader::content() getChar(3) != '-' ) { // Not a valid XML comment - throw XmlException("Malformed comment start tag found."); + throw Bu::XmlException("Malformed comment start tag found."); } usedChar( 4 ); @@ -549,7 +554,7 @@ bool XmlReader::content() // The next one has to be a '>' now if( getChar( 2 ) != '>' ) { - throw XmlException("Malformed comment close tag found. You cannot have a '--' that isn't followed by a '>' in a comment."); + throw Bu::XmlException("Malformed comment close tag found. You cannot have a '--' that isn't followed by a '>' in a comment."); } usedChar( 3 ); break; @@ -569,16 +574,16 @@ bool XmlReader::content() } else { - if( fbContent.getLength() > 0 ) + if( sContent.getSize() > 0 ) { if( bStrip ) { int j; - for( j = fbContent.getLength()-1; isws(fbContent.getData()[j]); j-- ); - ((char *)fbContent.getData())[j+1] = '\0'; + for( j = sContent.getSize()-1; isws(sContent[j]); j-- ); + sContent[j+1] = '\0'; } - setContent( fbContent.getData() ); - fbContent.clearData(); + setContent( sContent.getStr() ); + sContent.clear(); } gcall( node() ); } @@ -587,14 +592,11 @@ bool XmlReader::content() } else if( chr == '&' ) { - StaticString *tmp = getEscape(); - if( tmp == NULL ) return false; - fbContent.appendData( tmp->getString() ); - delete tmp; + sContent += getEscape(); } else { - fbContent.appendData( chr ); + sContent += chr; usedChar(); } } diff --git a/src/xmlreader.h b/src/xmlreader.h index c8f7202..7c85ddb 100644 --- a/src/xmlreader.h +++ b/src/xmlreader.h @@ -2,10 +2,10 @@ #define XMLREADER #include -#include "xmldocument.h" -#include "flexbuf.h" -#include "hashtable.h" -#include "staticstring.h" +#include "bu/xmldocument.h" +#include "bu/hash.h" +#include "bu/fstring.h" +#include "bu/stream.h" /** * Takes care of reading in xml formatted data from a file. This could/should @@ -32,7 +32,7 @@ public: * in content, a-la html. *@param bStrip Strip out leading and trailing whitespace? */ - XmlReader( bool bStrip=false ); + XmlReader( Bu::Stream &sIn, bool bStrip=false ); /** * Destroy this XmlReader. @@ -54,12 +54,12 @@ private: *@returns A single character at the requested position, or 0 for end of * stream. */ - virtual char getChar( int nIndex = 0 ) = 0; + virtual char getChar( int nIndex = 0 ); /** * Called to increment the current stream position by a single character. */ - virtual void usedChar( int nAmnt = 1) = 0; + virtual void usedChar( int nAmnt = 1 ); /** * Automoton function: is whitespace. @@ -108,9 +108,9 @@ private: *@param name The name of the entity *@param value The value of the entity */ - void addEntity( const char *name, const char *value ); + void addEntity( const Bu::FString &name, const Bu::FString &value ); - StaticString *getEscape(); + Bu::FString getEscape(); /** * Automoton function: paramlist. Processes a list of node params. @@ -130,12 +130,15 @@ private: */ bool content(); - FlexBuf fbContent; /**< buffer for the current node's content. */ - FlexBuf fbParamName; /**< buffer for the current param's name. */ - FlexBuf fbParamValue; /**< buffer for the current param's value. */ - bool bStrip; /**< Are we stripping whitespace? */ + Bu::FString sContent; /**< buffer for the current node's content. */ + Bu::FString sParamName; /**< buffer for the current param's name. */ + Bu::FString sParamValue; /**< buffer for the current param's value. */ + Bu::Stream &sIn; + bool bStrip; /**< Are we stripping whitespace? */ - HashTable htEntity; /**< Entity type definitions. */ + Bu::Hash htEntity; /**< Entity type definitions. */ + + Bu::FString sBuf; }; #endif diff --git a/src/xmlwriter.cpp b/src/xmlwriter.cpp index 56880b6..7dc6ca9 100644 --- a/src/xmlwriter.cpp +++ b/src/xmlwriter.cpp @@ -2,17 +2,10 @@ #include #include "xmlwriter.h" -XmlWriter::XmlWriter( const char *sIndent, XmlNode *pRoot ) : - XmlDocument( pRoot ) +XmlWriter::XmlWriter( const Bu::FString &sIndent, XmlNode *pRoot ) : + XmlDocument( pRoot ), + sIndent( sIndent ) { - if( sIndent == NULL ) - { - this->sIndent = ""; - } - else - { - this->sIndent = sIndent; - } } XmlWriter::~XmlWriter() @@ -24,7 +17,7 @@ void XmlWriter::write() write( getRoot(), sIndent.c_str() ); } -void XmlWriter::write( XmlNode *pRoot, const char *sIndent ) +void XmlWriter::write( XmlNode *pRoot, const Bu::FString &sIndent ) { writeNode( pRoot, 0, sIndent ); } @@ -39,7 +32,7 @@ void XmlWriter::closeNode() } } -void XmlWriter::writeIndent( int nIndent, const char *sIndent ) +void XmlWriter::writeIndent( int nIndent, const Bu::FString &sIndent ) { if( sIndent == NULL ) return; for( int j = 0; j < nIndent; j++ ) @@ -48,26 +41,27 @@ void XmlWriter::writeIndent( int nIndent, const char *sIndent ) } } -std::string XmlWriter::escape( std::string sIn ) +Bu::FString XmlWriter::escape( const Bu::FString &sIn ) { - std::string sOut; + Bu::FString sOut; - std::string::const_iterator i; - for( i = sIn.begin(); i != sIn.end(); i++ ) + int nMax = sIn.getSize(); + for( int j = 0; j < nMax; j++ ) { - if( ((*i >= ' ' && *i <= '9') || - (*i >= 'a' && *i <= 'z') || - (*i >= 'A' && *i <= 'Z') ) && - (*i != '\"' && *i != '\'' && *i != '&') + char c = sIn[j]; + if( ((c >= ' ' && c <= '9') || + (c >= 'a' && c <= 'z') || + (c >= 'A' && c <= 'Z') ) && + (c != '\"' && c != '\'' && c != '&') ) { - sOut += *i; + sOut += c; } else { sOut += "&#"; char buf[4]; - sprintf( buf, "%u", (unsigned char)*i ); + sprintf( buf, "%u", (unsigned char)c ); sOut += buf; sOut += ';'; } @@ -76,19 +70,19 @@ std::string XmlWriter::escape( std::string sIn ) return sOut; } -void XmlWriter::writeNodeProps( XmlNode *pNode, int nIndent, const char *sIndent ) +void XmlWriter::writeNodeProps( XmlNode *pNode, int nIndent, const Bu::FString &sIndent ) { for( int j = 0; j < pNode->getNumProperties(); j++ ) { writeString(" "); - writeString( pNode->getPropertyName( j ) ); + //writeString( pNode->getPropertyName( j ) ); writeString("=\""); - writeString( escape( pNode->getProperty( j ) ).c_str() ); + //writeString( escape( pNode->getProperty( j ) ).c_str() ); writeString("\""); } } -void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const char *sIndent ) +void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const Bu::FString &sIndent ) { if( pNode->hasChildren() ) { @@ -96,15 +90,15 @@ void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const char *sIndent ) writeString("<"); writeString( pNode->getName() ); writeNodeProps( pNode, nIndent, sIndent ); - if( sIndent ) + if( sIndent != "" ) writeString(">\n"); else writeString(">"); - +/* if( pNode->getContent( 0 ) ) { writeIndent( nIndent+1, sIndent ); - if( sIndent ) + if( sIndent != "" ) { writeString( pNode->getContent( 0 ) ); writeString("\n"); @@ -129,9 +123,9 @@ void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const char *sIndent ) writeString( pNode->getContent( j+1 ) ); } } - +*/ writeIndent( nIndent, sIndent ); - if( sIndent ) + if( sIndent != "" ) { writeString("getName() ); @@ -143,7 +137,7 @@ void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const char *sIndent ) writeString( pNode->getName() ); writeString(">"); } - } + }/* else if( pNode->getContent() ) { writeIndent( nIndent, sIndent ); @@ -157,14 +151,14 @@ void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const char *sIndent ) writeString(">"); if( sIndent ) writeString("\n"); - } + }*/ else { writeIndent( nIndent, sIndent ); writeString("<"); writeString( pNode->getName() ); writeNodeProps( pNode, nIndent, sIndent ); - if( sIndent ) + if( sIndent != "" ) writeString("/>\n"); else writeString("/>"); diff --git a/src/xmlwriter.h b/src/xmlwriter.h index c48e810..7e3c876 100644 --- a/src/xmlwriter.h +++ b/src/xmlwriter.h @@ -31,7 +31,7 @@ public: * this to a tab or some spaces it will never effect the content of your * file. */ - XmlWriter( const char *sIndent=NULL, XmlNode *pRoot=NULL ); + XmlWriter( const Bu::FString &sIndent="", XmlNode *pRoot=NULL ); /** * Destroy the writer. @@ -49,16 +49,16 @@ public: void write(); private: - std::string sIndent; /**< The indent string */ + Bu::FString sIndent; /**< The indent string */ - std::string escape( std::string sIn ); + Bu::FString escape( const Bu::FString &sIn ); /** * Write the file. *@param pNode The root node *@param sIndent The indent text. */ - void write( XmlNode *pNode, const char *sIndent=NULL ); + void write( XmlNode *pNode, const Bu::FString &sIndent ); /** * Write a node in the file, including children. @@ -66,7 +66,7 @@ private: *@param nIndent The indent level (the number of times to include sIndent) *@param sIndent The indent text. */ - void writeNode( XmlNode *pNode, int nIndent, const char *sIndent ); + void writeNode( XmlNode *pNode, int nIndent, const Bu::FString &sIndent ); /** * Write the properties of a node. @@ -74,14 +74,14 @@ private: *@param nIndent The indent level of the containing node *@param sIndent The indent text. */ - void writeNodeProps( XmlNode *pNode, int nIndent, const char *sIndent ); + void writeNodeProps( XmlNode *pNode, int nIndent, const Bu::FString &sIndent ); /** * Called to write the actual indent. *@param nIndent The indent level. *@param sIndent The indent text. */ - void writeIndent( int nIndent, const char *sIndent ); + void writeIndent( int nIndent, const Bu::FString &sIndent ); /** * This is the function that must be overridden in order to use this class. @@ -90,7 +90,7 @@ private: * will break the XML formatting. *@param sString The string data to write to the output. */ - virtual void writeString( const char *sString ) = 0; + virtual void writeString( const Bu::FString &sString ) = 0; }; #endif -- cgit v1.2.3 From dda94f3b53e02e117e6eb5758afa1410e1664c9f Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Tue, 15 May 2007 05:25:19 +0000 Subject: SPtr is now Bu::ified, and the List class now acts the way we think const lists should act, you can't change anything in there. I'm still debating changing the const_iterator to a constIterator, or something else that's more Bu::worthy. Heh, the namespaces are funny...ok...I'm really tired. --- src/list.h | 214 ++++++++++++++++++++++++++++++++++++++++++++++++----- src/old/sptr.cpp | 1 - src/old/sptr.h | 99 ------------------------- src/serversocket.h | 10 ++- src/sptr.cpp | 1 + src/sptr.h | 147 ++++++++++++++++++++++++++++++++++++ src/tests/list.cpp | 31 ++++++++ 7 files changed, 382 insertions(+), 121 deletions(-) delete mode 100644 src/old/sptr.cpp delete mode 100644 src/old/sptr.h create mode 100644 src/sptr.cpp create mode 100644 src/sptr.h diff --git a/src/list.h b/src/list.h index ec63496..4d16872 100644 --- a/src/list.h +++ b/src/list.h @@ -13,6 +13,15 @@ namespace Bu ListLink *pNext; ListLink *pPrev; }; + + /** + * Linked list template container. This class is similar to the stl list + * class except for a few minor changes. First, it doesn't mimic a stack or + * queue, use the Stack or Queue clasess for that. Second, when const, all + * members are only accessable const. Third, erasing a location does not + * invalidate the iterator, it simply points to the next valid location, or + * end() if there are no more. + */ template, typename linkalloc=std::allocator > > class List { @@ -23,15 +32,59 @@ namespace Bu public: List() : pFirst( NULL ), - pLast( NULL ) + pLast( NULL ), + nSize( 0 ) + { + } + + List( const MyType &src ) : + pFirst( NULL ), + pLast( NULL ), + nSize( 0 ) + { + for( Link *pCur = src.pFirst; pCur; pCur = pCur->pNext ) + { + append( *pCur->pValue ); + } + } + + ~List() + { + clear(); + } + + MyType &operator=( const MyType &src ) { + clear(); + for( Link *pCur = src.pFirst; pCur; pCur = pCur->pNext ) + { + append( *pCur->pValue ); + } + } + + void clear() + { + Link *pCur = pFirst; + for(;;) + { + if( pCur == NULL ) break; + va.destroy( pCur->pValue ); + va.deallocate( pCur->pValue, sizeof( value ) ); + Link *pTmp = pCur->pNext; + la.destroy( pCur ); + la.deallocate( pCur, sizeof( Link ) ); + pCur = pTmp; + } + pFirst = pLast = NULL; + nSize = 0; } - void append( value v ) + void append( const value &v ) { Link *pNew = la.allocate( sizeof( Link ) ); pNew->pValue = va.allocate( sizeof( value ) ); va.construct( pNew->pValue, v ); + nSize++; if( pFirst == NULL ) { // Empty list @@ -47,11 +100,12 @@ namespace Bu } } - void prepend( value v ) + void prepend( const value &v ) { Link *pNew = la.allocate( sizeof( Link ) ); pNew->pValue = va.allocate( sizeof( value ) ); va.construct( pNew->pValue, v ); + nSize++; if( pFirst == NULL ) { // Empty list @@ -83,22 +137,22 @@ namespace Bu } public: - bool operator==( const iterator &oth ) + bool operator==( const iterator &oth ) const { return ( pLink == oth.pLink ); } - bool operator==( const Link *pOth ) + bool operator==( const Link *pOth ) const { return ( pLink == pOth ); } - bool operator!=( const iterator &oth ) + bool operator!=( const iterator &oth ) const { return ( pLink != oth.pLink ); } - bool operator!=( const Link *pOth ) + bool operator!=( const Link *pOth ) const { return ( pLink != pOth ); } @@ -110,40 +164,128 @@ namespace Bu value *operator->() { - return pLink->pValue(); + return pLink->pValue; } - iterator operator++() + iterator &operator++() { if( pLink != NULL ) pLink = pLink->pNext; return *this; } - iterator operator--() + iterator &operator--() { if( pLink != NULL ) pLink = pLink->pPrev; return *this; } - iterator operator++( int ) + iterator &operator++( int ) { if( pLink != NULL ) pLink = pLink->pNext; return *this; } - iterator operator--( int ) + iterator &operator--( int ) { if( pLink != NULL ) pLink = pLink->pPrev; return *this; } - iterator operator=( const iterator &oth ) + iterator &operator=( const iterator &oth ) { pLink = oth.pLink; + return *this; + } + }; + + typedef struct const_iterator + { + friend class List; + private: + Link *pLink; + const_iterator() : + pLink( NULL ) + { + } + + const_iterator( Link *pLink ) : + pLink( pLink ) + { + } + + public: + bool operator==( const const_iterator &oth ) const + { + return ( pLink == oth.pLink ); + } + + bool operator==( const Link *pOth ) const + { + return ( pLink == pOth ); + } + + bool operator!=( const const_iterator &oth ) const + { + return ( pLink != oth.pLink ); + } + + bool operator!=( const Link *pOth ) const + { + return ( pLink != pOth ); + } + + const value &operator*() + { + return *(pLink->pValue); + } + + const value *operator->() + { + return pLink->pValue; + } + + const_iterator &operator++() + { + if( pLink != NULL ) + pLink = pLink->pNext; + return *this; + } + + const_iterator &operator--() + { + if( pLink != NULL ) + pLink = pLink->pPrev; + return *this; + } + + const_iterator &operator++( int ) + { + if( pLink != NULL ) + pLink = pLink->pNext; + return *this; + } + + const_iterator &operator--( int ) + { + if( pLink != NULL ) + pLink = pLink->pPrev; + return *this; + } + + const_iterator &operator=( const iterator &oth ) + { + pLink = oth.pLink; + return *this; + } + + const_iterator &operator=( const const_iterator &oth ) + { + pLink = oth.pLink; + return *this; } }; @@ -152,17 +294,50 @@ namespace Bu return iterator( pFirst ); } - const Link *end() + const const_iterator begin() const + { + return const_iterator( pFirst ); + } + + const Link *end() const { return NULL; } - int getSize() + void erase( iterator &i ) + { + Link *pCur = i.pLink; + Link *pPrev = pCur->pPrev; + if( pPrev == NULL ) + { + va.destroy( pCur->pValue ); + va.deallocate( pCur->pValue, sizeof( value ) ); + pFirst = pCur->pNext; + la.destroy( pCur ); + la.deallocate( pCur, sizeof( Link ) ); + if( pFirst == NULL ) + pLast = NULL; + nSize--; + i.pLink = pFirst; + } + else + { + va.destroy( pCur->pValue ); + va.deallocate( pCur->pValue, sizeof( value ) ); + Link *pTmp = pCur->pNext; + la.destroy( pCur ); + la.deallocate( pCur, sizeof( Link ) ); + pPrev->pNext = pTmp; + if( pTmp != NULL ) + pTmp->pPrev = pPrev; + nSize--; + i.pLink = pTmp; + } + } + + int getSize() const { - int j = 0; - for( Link *pCur = pFirst; pCur; pCur = pCur->pNext ) - j++; - return j; + return nSize; } private: @@ -170,6 +345,7 @@ namespace Bu Link *pLast; linkalloc la; valuealloc va; + int nSize; }; } diff --git a/src/old/sptr.cpp b/src/old/sptr.cpp deleted file mode 100644 index 7f5e894..0000000 --- a/src/old/sptr.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "sptr.h" diff --git a/src/old/sptr.h b/src/old/sptr.h deleted file mode 100644 index deae94d..0000000 --- a/src/old/sptr.h +++ /dev/null @@ -1,99 +0,0 @@ -#ifndef SPTR_H -#define SPTR_H - -#include -#include - -template -class SPtr -{ -public: - SPtr() : - pRefCnt( NULL ), - pData( NULL ) - { - } - - ~SPtr() - { - decCount(); - } - - SPtr( const SPtr &src ) : - pRefCnt( src.pRefCnt ), - pData( src.pData ) - { - if( pRefCnt ) - (*pRefCnt) += 1; - } - - SPtr( T *pSrc ) : - pRefCnt( NULL ), - pData( pSrc ) - { - pRefCnt = new int32_t; - (*pRefCnt) = 1; - } - - int32_t count() - { - return *pRefCnt; - } - - T *operator->() const - { - return pData; - } - - T *operator*() const - { - return pData; - } - - SPtr operator=( const SPtr &src ) - { - decCount(); - pRefCnt = src.pRefCnt; - pData = src.pData; - (*pRefCnt) += 1; - - return *this; - } - - bool operator==( const SPtr &src ) - { - return pData == src.pData; - } - - operator bool() - { - return pRefCnt != NULL; - } - - bool isSet() - { - return pRefCnt != NULL; - } - -private: - void decCount() - { - if( pRefCnt ) - { - (*pRefCnt) -= 1; - //printf("Decrementing ref-count to %d\n", *pRefCnt ); - if( (*pRefCnt) == 0 ) - { - delete pRefCnt; - delete pData; - pRefCnt = NULL; - pData = NULL; - } - } - } - - int32_t *pRefCnt; - T *pData; -}; - -#endif diff --git a/src/serversocket.h b/src/serversocket.h index 9a26e2d..f146d91 100644 --- a/src/serversocket.h +++ b/src/serversocket.h @@ -2,13 +2,19 @@ #define SERVER_SOCKET_H #include -#include "fstring.h" -#include "socket.h" +#include "bu/fstring.h" namespace Bu { /** + * A single tcp/ip server socket. When created the server socket will bind + * to the specified interface and port, and immediately begin listening for + * connections. When connections come in they are pooled by the networking + * drivers in the kernel until they are accepted, this means that failure + * to keep space in the connection pool will result in connection refusals. * + * Although the accept function returns an integral file descriptor, it is + * designed to be used with the Socket class. */ class ServerSocket { diff --git a/src/sptr.cpp b/src/sptr.cpp new file mode 100644 index 0000000..8ea7f8f --- /dev/null +++ b/src/sptr.cpp @@ -0,0 +1 @@ +#include "bu/sptr.h" diff --git a/src/sptr.h b/src/sptr.h new file mode 100644 index 0000000..faa8524 --- /dev/null +++ b/src/sptr.h @@ -0,0 +1,147 @@ +#ifndef SPTR_H +#define SPTR_H + +#include +#include + +namespace Bu +{ + template class SPtr; + template< typename Tb, typename Ta > SPtr SPtrCast( SPtr src ); + + template + class SPtr + { + template + friend SPtr SPtrCast( SPtr pt ); + public: + SPtr() : + pRefCnt( NULL ), + pData( NULL ) + { + } + + ~SPtr() + { + decCount(); + } + + SPtr( const SPtr &src ) : + pRefCnt( src.pRefCnt ), + pData( src.pData ) + { + if( pRefCnt ) + (*pRefCnt) += 1; + } + + SPtr( T *pSrc ) : + pRefCnt( NULL ), + pData( pSrc ) + { + if( pData ) + { + pRefCnt = new int32_t; + (*pRefCnt) = 1; + } + } + + int32_t count() const + { + return *pRefCnt; + } + + const T *operator->() const + { + return pData; + } + + const T &operator*() const + { + return *pData; + } + + T *operator->() + { + return pData; + } + + T &operator*() + { + return *pData; + } + + SPtr operator=( const SPtr &src ) + { + decCount(); + pRefCnt = src.pRefCnt; + pData = src.pData; + if( pRefCnt ) + (*pRefCnt) += 1; + + return *this; + } + + const SPtr operator=( const SPtr &src ) const + { + decCount(); + pRefCnt = src.pRefCnt; + pData = src.pData; + if( pRefCnt ) + (*pRefCnt) += 1; + + return *this; + } + + bool operator==( const SPtr &src ) const + { + return pData == src.pData; + } + + bool operator==( const T *src ) const + { + return pData == src; + } + + operator bool() const + { + return pRefCnt != NULL; + } + + bool isSet() const + { + return pRefCnt != NULL; + } + + private: + void decCount() const + { + if( pRefCnt ) + { + (*pRefCnt) -= 1; + //printf("Decrementing ref-count to %d\n", *pRefCnt ); + if( (*pRefCnt) == 0 ) + { + delete pRefCnt; + delete pData; + pRefCnt = NULL; + pData = NULL; + } + } + } + + mutable int32_t *pRefCnt; + mutable T *pData; + }; + + template< typename Tb, typename Ta > SPtr SPtrCast( SPtr src ) + { + SPtr ret; + ret.pRefCnt = src.pRefCnt; + ret.pData = dynamic_cast(src.pData); + if( ret.pRefCnt ) + (*(ret.pRefCnt)) += 1; + return ret; + } +} + +#endif diff --git a/src/tests/list.cpp b/src/tests/list.cpp index 34ab656..12807a5 100644 --- a/src/tests/list.cpp +++ b/src/tests/list.cpp @@ -1,4 +1,10 @@ #include "bu/list.h" +#include + +typedef struct Bob +{ + int nID; +} Bob; int main() { @@ -16,7 +22,32 @@ int main() { printf("%d ", *i ); } + printf("\n"); + for( Bu::List::iterator i = l.begin(); i != l.end(); i++ ) + { + l.erase( i ); + if( i != l.end() ) + printf("%d ", *i ); + } + + printf("\n\n"); + Bu::List lb; + for( int j = 0; j < 10; j++ ) + { + Bob b; + b.nID = j; + lb.append( b ); + } + + const Bu::List rb = lb; + + for( Bu::List::const_iterator i = rb.begin(); i != rb.end(); i++ ) + { + //i->nID += 2; + //(*i).nID = 4; + printf("%d ", i->nID ); + } printf("\n\n"); } -- cgit v1.2.3 From e0e7932a122614a0ff566fbfd8de5776de8b9f6d Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 17 May 2007 05:56:26 +0000 Subject: Lots of cool new stuff, the Server class actually works for everything except actually interacting with clients, and the Client class is almost there, except that it doesn't really do anything yet. --- src/client.cpp | 9 +++++++ src/client.h | 23 +++++++++++++++++ src/file.cpp | 10 +++++++ src/file.h | 3 +++ src/list.h | 5 ++++ src/old/singleton.h | 59 ------------------------------------------ src/server.cpp | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/server.h | 49 +++++++++++++++++++++++++++++++++++ src/serversocket.cpp | 5 ++++ src/serversocket.h | 3 ++- src/singleton.h | 62 ++++++++++++++++++++++++++++++++++++++++++++ src/socket.cpp | 9 +++++++ src/socket.h | 3 ++- src/stream.h | 3 +++ src/tests/hash.cpp | 24 +++++++++++++++++ 15 files changed, 279 insertions(+), 61 deletions(-) create mode 100644 src/client.cpp create mode 100644 src/client.h delete mode 100644 src/old/singleton.h create mode 100644 src/server.cpp create mode 100644 src/server.h create mode 100644 src/singleton.h create mode 100644 src/tests/hash.cpp diff --git a/src/client.cpp b/src/client.cpp new file mode 100644 index 0000000..a048ca3 --- /dev/null +++ b/src/client.cpp @@ -0,0 +1,9 @@ +#include "client.h" + +Bu::Client::Client() +{ +} + +Bu::Client::~Client() +{ +} diff --git a/src/client.h b/src/client.h new file mode 100644 index 0000000..27fbad4 --- /dev/null +++ b/src/client.h @@ -0,0 +1,23 @@ +#ifndef CLIENT_H +#define CLIENT_H + +#include +#include "bu/socket.h" + +namespace Bu +{ + /** + * + */ + class Client + { + public: + Client(); + virtual ~Client(); + + private: + + }; +} + +#endif diff --git a/src/file.cpp b/src/file.cpp index 5de5f6c..26986a5 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -98,3 +98,13 @@ bool Bu::File::canSeek() return true; } +bool Bu::File::isBlocking() +{ + return true; +} + +void Bu::File::setBlocking( bool bBlocking ) +{ + return; +} + diff --git a/src/file.h b/src/file.h index bbc620c..ee3fdb3 100644 --- a/src/file.h +++ b/src/file.h @@ -27,6 +27,9 @@ namespace Bu virtual bool canWrite(); virtual bool canSeek(); + virtual bool isBlocking(); + virtual void setBlocking( bool bBlocking=true ); + private: FILE *fh; diff --git a/src/list.h b/src/list.h index 4d16872..6081ea5 100644 --- a/src/list.h +++ b/src/list.h @@ -217,6 +217,11 @@ namespace Bu { } + const_iterator( const iterator &i ) : + pLink( i.pLink ) + { + } + public: bool operator==( const const_iterator &oth ) const { diff --git a/src/old/singleton.h b/src/old/singleton.h deleted file mode 100644 index 47adbd5..0000000 --- a/src/old/singleton.h +++ /dev/null @@ -1,59 +0,0 @@ -#ifndef SINGLETON_H -#define SINGLETON_H - -#include - -/** - * Provides singleton functionality in a modular sort of way. Make this the - * base class of any other class and you immediately gain singleton - * functionality. Be sure to make your constructor and various functions use - * intellegent scoping. Cleanup and instantiation are performed automatically - * for you at first use and program exit. There are two things that you must - * do when using this template, first is to inherit from it with the name of - * your class filling in for T and then make this class a friend of your class. - *@code - * // Making the Single Singleton: - * class Single : public Singleton - * { - * friend class Singleton; - * protected: - * Single(); - * ... - * }; - @endcode - * You can still add public functions and variables to your new Singleton child - * class, but your constructor should be protected (hence the need for the - * friend decleration). - *@author Mike Buland - */ -template -class Singleton -{ -protected: - /** - * Private constructor. This constructor is empty but has a body so that - * you can make your own override of it. Be sure that you're override is - * also protected. - */ - Singleton() {}; - -private: - /** - * Copy constructor, defined so that you could write your own as well. - */ - Singleton( const Singleton& ); - -public: - /** - * Get a handle to the contained instance of the contained class. It is - * a reference. - *@returns A reference to the contained object. - */ - static T &getInstance() - { - static T i; - return i; - } -}; - -#endif diff --git a/src/server.cpp b/src/server.cpp new file mode 100644 index 0000000..f93238c --- /dev/null +++ b/src/server.cpp @@ -0,0 +1,73 @@ +#include "server.h" +#include + +Bu::Server::Server() : + nTimeoutSec( 0 ), + nTimeoutUSec( 0 ) +{ + FD_ZERO( &fdActive ); +} + +Bu::Server::~Server() +{ +} + +void Bu::Server::addPort( int nPort, int nPoolSize ) +{ + ServerSocket *s = new ServerSocket( nPort, nPoolSize ); + int nSocket = s->getSocket(); + FD_SET( nSocket, &fdActive ); + hServers.insert( nSocket, s ); +} + +void Bu::Server::addPort( const FString &sAddr, int nPort, int nPoolSize ) +{ + ServerSocket *s = new ServerSocket( sAddr, nPort, nPoolSize ); + int nSocket = s->getSocket(); + FD_SET( nSocket, &fdActive ); + hServers.insert( nSocket, s ); +} + +void Bu::Server::setTimeout( int nTimeoutSec, int nTimeoutUSec ) +{ + this->nTimeoutSec = nTimeoutSec; + this->nTimeoutUSec = nTimeoutUSec; +} + +void Bu::Server::scan() +{ + struct timeval xTimeout = { nTimeoutSec, nTimeoutUSec }; + + fd_set fdRead = fdActive; + fd_set fdWrite = fdActive; + fd_set fdException = fdActive; + + if( TEMP_FAILURE_RETRY( select( FD_SETSIZE, &fdRead, NULL, &fdException, &xTimeout ) ) < 0 ) + { + throw ExceptionBase("Error attempting to scan open connections."); + } + + for( int j = 0; j < FD_SETSIZE; j++ ) + { + if( FD_ISSET( j, &fdRead ) ) + { + if( hServers.has( j ) ) + { + addClient( hServers.get( j )->accept() ); + } + else + { + + } + } + } +} + +void Bu::Server::addClient( int nSocket ) +{ + FD_SET( nSocket, &fdActive ); + + Client *c = new Client(); + hClients.insert( nSocket, c ); +} + diff --git a/src/server.h b/src/server.h new file mode 100644 index 0000000..9f4f459 --- /dev/null +++ b/src/server.h @@ -0,0 +1,49 @@ +#ifndef SERVER_H +#define SERVER_H + +#include +#include "bu/serversocket.h" +#include "bu/list.h" +#include "bu/client.h" + +namespace Bu +{ + /** + * Core of a network server. This class is distinct from a ServerSocket in + * that a ServerSocket is one listening socket, nothing more. Socket will + * manage a pool of both ServerSockets and connected Sockets along with + * their protocols and buffers. + * + * To start serving on a new port, use the addPort functions. Each call to + * addPort creates a new ServerSocket, starts it listening, and adds it to + * the server pool. + * + * All of the real work is done by scan, which will wait for up + * to the timeout set by setTimeout before returning if there is no data + * pending. scan should probably be called in some sort of tight + * loop, possibly in it's own thread, or in the main control loop. + */ + class Server + { + public: + Server(); + virtual ~Server(); + + void addPort( int nPort, int nPoolSize=40 ); + void addPort( const FString &sAddr, int nPort, int nPoolSize=40 ); + + void scan(); + void setTimeout( int nTimeoutSec, int nTimeoutUSec=0 ); + + void addClient( int nSocket ); + + private: + int nTimeoutSec; + int nTimeoutUSec; + fd_set fdActive; + Hash hServers; + Hash hClients; + }; +} + +#endif diff --git a/src/serversocket.cpp b/src/serversocket.cpp index c53c80d..9c8f743 100644 --- a/src/serversocket.cpp +++ b/src/serversocket.cpp @@ -85,6 +85,11 @@ void Bu::ServerSocket::startServer( struct sockaddr_in &name, int nPoolSize ) FD_SET( nServer, &fdActive ); } +int Bu::ServerSocket::getSocket() +{ + return nServer; +} + int Bu::ServerSocket::accept( int nTimeoutSec, int nTimeoutUSec ) { fd_set fdRead = fdActive; diff --git a/src/serversocket.h b/src/serversocket.h index f146d91..d2601e4 100644 --- a/src/serversocket.h +++ b/src/serversocket.h @@ -23,7 +23,8 @@ namespace Bu ServerSocket( const FString &sAddr, int nPort, int nPoolSize=40 ); virtual ~ServerSocket(); - int accept( int nTimeoutSec, int nTimeoutUSec ); + int accept( int nTimeoutSec=0, int nTimeoutUSec=0 ); + int getSocket(); private: void startServer( struct sockaddr_in &name, int nPoolSize ); diff --git a/src/singleton.h b/src/singleton.h new file mode 100644 index 0000000..4976a61 --- /dev/null +++ b/src/singleton.h @@ -0,0 +1,62 @@ +#ifndef SINGLETON_H +#define SINGLETON_H + +#include + +namespace Bu +{ + /** + * Provides singleton functionality in a modular sort of way. Make this the + * base class of any other class and you immediately gain singleton + * functionality. Be sure to make your constructor and various functions use + * intellegent scoping. Cleanup and instantiation are performed automatically + * for you at first use and program exit. There are two things that you must + * do when using this template, first is to inherit from it with the name of + * your class filling in for T and then make this class a friend of your class. + *@code + * // Making the Single Singleton: + * class Single : public Singleton + * { + * friend class Singleton; + * protected: + * Single(); + * ... + * }; + @endcode + * You can still add public functions and variables to your new Singleton child + * class, but your constructor should be protected (hence the need for the + * friend decleration). + *@author Mike Buland + */ + template + class Singleton + { + protected: + /** + * Private constructor. This constructor is empty but has a body so that + * you can make your own override of it. Be sure that you're override is + * also protected. + */ + Singleton() {}; + + private: + /** + * Copy constructor, defined so that you could write your own as well. + */ + Singleton( const Singleton& ); + + public: + /** + * Get a handle to the contained instance of the contained class. It is + * a reference. + *@returns A reference to the contained object. + */ + static T &getInstance() + { + static T i; + return i; + } + }; +} + +#endif diff --git a/src/socket.cpp b/src/socket.cpp index 455b5c8..441678a 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -231,3 +231,12 @@ bool Bu::Socket::canSeek() return false; } +bool Bu::Socket::isBlocking() +{ + return false; +} + +void Bu::Socket::setBlocking( bool bBlocking ) +{ +} + diff --git a/src/socket.h b/src/socket.h index 568cad6..e65eb74 100644 --- a/src/socket.h +++ b/src/socket.h @@ -33,7 +33,8 @@ namespace Bu virtual bool canWrite(); virtual bool canSeek(); - + virtual bool isBlocking(); + virtual void setBlocking( bool bBlocking=true ); private: int nSocket; diff --git a/src/stream.h b/src/stream.h index e640959..5f586e6 100644 --- a/src/stream.h +++ b/src/stream.h @@ -36,6 +36,9 @@ namespace Bu virtual bool canWrite() = 0; virtual bool canSeek() = 0; + virtual bool isBlocking() = 0; + virtual void setBlocking( bool bBlocking=true ) = 0; + private: }; diff --git a/src/tests/hash.cpp b/src/tests/hash.cpp new file mode 100644 index 0000000..73cfb27 --- /dev/null +++ b/src/tests/hash.cpp @@ -0,0 +1,24 @@ +#include "bu/hash.h" +#include "bu/sptr.h" + +typedef struct Bob +{ + int nID; +} Bob; + +int main() +{ + Bu::Hash > lb; + for( int j = 0; j < 10; j++ ) + { + Bob *b = new Bob; + b->nID = j; + lb.insert( j, b ); + } + + for( int j = 0; j < 10; j++ ) + { + printf("%d\n", lb[j].value()->nID ); + } +} + -- cgit v1.2.3 From 326125aee0b8cd807a6a1d158398078ff6bfb1e1 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 17 May 2007 21:45:50 +0000 Subject: As evidenced by my latest test, the Bu::FString copy is actually slower than the std::string copy by a rather large margin. This seems very odd, so I'm going to do a few tests, the first one is stripping out the FString shared pointer stuff and seeing if that makes an appreciable difference. --- build.conf | 3 ++ src/fstring.h | 4 +- src/old/tests/fstring.cpp | 48 ----------------- src/tests/fstring.cpp | 130 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 136 insertions(+), 49 deletions(-) delete mode 100644 src/old/tests/fstring.cpp create mode 100644 src/tests/fstring.cpp diff --git a/build.conf b/build.conf index c289205..35738e3 100644 --- a/build.conf +++ b/build.conf @@ -6,6 +6,9 @@ default action: check group "lnhdrs", check "libbu++.a" set "CXXFLAGS" += "-ggdb -Wall" +#set "CXXFLAGS" += "-pg" +#set "LDFLAGS" += "-pg" + filesIn("src") filter regexp("^src/(.*)\\.h$", "src/bu/{re:1}.h"): rule "hln", group "lnhdrs", diff --git a/src/fstring.h b/src/fstring.h index f738f63..43033b8 100644 --- a/src/fstring.h +++ b/src/fstring.h @@ -7,6 +7,8 @@ #include "archive.h" #include "hash.h" +#define min( a, b ) ((a @@ -131,7 +133,7 @@ namespace Bu appendChunk( pNew ); } - void append( const chr cData ) + void append( const chr &cData ) { append( &cData, 1 ); } diff --git a/src/old/tests/fstring.cpp b/src/old/tests/fstring.cpp deleted file mode 100644 index 271738c..0000000 --- a/src/old/tests/fstring.cpp +++ /dev/null @@ -1,48 +0,0 @@ -#include "hash.h" -#include "fstring.h" - -FString genThing() -{ - FString bob; - bob.append("ab "); - bob += "cd "; - bob += "efg"; - - printf("---bob------\n%08X: %s\n", (unsigned int)bob.c_str(), bob.c_str() ); - return bob; -} - -void thing( FString str ) -{ - printf("Hey: %s\n", str.c_str() ); -} - -#define pem printf("---------\n%08X: %s\n%08X: %s\n", (unsigned int)str.c_str(), str.c_str(), (unsigned int)str2.c_str(), str2.c_str() ); -int main( int argc, char *argv ) -{ - FString str("th"); - - str.prepend("Hello "); - str.append("ere."); - - FString str2( str ); - pem; - str += " What's up?"; - pem; - str2 += " How are you?"; - pem; - str = str2; - pem; - - str2 = genThing(); - pem; - - str = str2; - pem; - - thing( str2 ); - thing("test."); - - printf("%d == %d\n", __calcHashCode( str ), __calcHashCode( str.c_str() ) ); -} - diff --git a/src/tests/fstring.cpp b/src/tests/fstring.cpp new file mode 100644 index 0000000..d600be6 --- /dev/null +++ b/src/tests/fstring.cpp @@ -0,0 +1,130 @@ +#include "bu/hash.h" +#include "bu/fstring.h" +#include +#include + +inline double getTime() +{ + struct timeval tv; + gettimeofday( &tv, NULL ); + return ((double)tv.tv_sec) + ((double)tv.tv_usec/1000000.0); +} + +Bu::FString genThing() +{ + Bu::FString bob; + bob.append("ab "); + bob += "cd "; + bob += "efg"; + + printf("---bob------\n%08X: %s\n", (unsigned int)bob.c_str(), bob.c_str() ); + return bob; +} + +void thing( Bu::FString str ) +{ + printf("Hey: %s\n", str.c_str() ); +} + +void copyfunc( std::string temp ) +{ + temp += "Hi"; +} + +void copyfunc( Bu::FString temp ) +{ + temp += "Hi"; +} + +void doTimings() +{ + Bu::FString fs1, fs2; + std::string ss1, ss2; + double dStart, dEnd, tfs1, tfs2, tfs3, tss1, tss2, tss3; + int nChars = 500000, nChunks=5000, nCopies=5000000, nChunkSize=1024*4; + char *buf = new char[nChunkSize]; + memset( buf, '!', nChunkSize ); + + printf("Timing Bu::FString single chars...\n"); + dStart = getTime(); + for( int j = 0; j < nChars; j++ ) fs1 += (char)('a'+(j%26)); + fs1.getStr(); + dEnd = getTime(); + tfs1 = dEnd-dStart; + + printf("Timing std::string single chars...\n"); + dStart = getTime(); + for( int j = 0; j < nChars; j++ ) ss1 += (char)('a'+(j%26)); + ss1.c_str(); + dEnd = getTime(); + tss1 = dEnd-dStart; + + printf("Timing Bu::FString %d char chunks...\n", nChunkSize); + dStart = getTime(); + for( int j = 0; j < nChunks; j++ ) fs2.append(buf, nChunkSize); + fs2.getStr(); + dEnd = getTime(); + tfs2 = dEnd-dStart; + + printf("Timing std::string %d char chunks...\n", nChunkSize); + dStart = getTime(); + for( int j = 0; j < nChunks; j++ ) ss2.append(buf, nChunkSize); + ss2.c_str(); + dEnd = getTime(); + tss2 = dEnd-dStart; + + fs2 = "Hello there."; + ss2 = "Hello there."; + printf("Timing Bu::FString copies...\n"); + dStart = getTime(); + for( int j = 0; j < nCopies; j++ ) Bu::FString stmp = fs2; + dEnd = getTime(); + tfs3 = dEnd-dStart; + + printf("Timing std::string copies...\n"); + dStart = getTime(); + for( int j = 0; j < nCopies; j++ ) std::string stpm = ss2; + dEnd = getTime(); + tss3 = dEnd-dStart; + + printf( + "Results: singles: chunks: copies:\n" + "Bu::FString %10.2f/s %10.2f/s %10.2f/s\n" + "std::string %10.2f/s %10.2f/s %10.2f/s\n", + nChars/tfs1, nChunks/tfs2, nCopies/tfs3, + nChars/tss1, nChunks/tss2, nCopies/tss3 ); + + delete[] buf; +} + +#define pem printf("---------\n%08X: %s\n%08X: %s\n", (unsigned int)str.c_str(), str.c_str(), (unsigned int)str2.c_str(), str2.c_str() ); +int main( int argc, char *argv ) +{ + Bu::FString str("th"); + + str.prepend("Hello "); + str.append("ere."); + + Bu::FString str2( str ); + pem; + str += " What's up?"; + pem; + str2 += " How are you?"; + pem; + str = str2; + pem; + + str2 = genThing(); + pem; + + str = str2; + pem; + + thing( str2 ); + thing("test."); + + printf("%d == %d\n", Bu::__calcHashCode( str ), Bu::__calcHashCode( str.c_str() ) ); + + doTimings(); +} + -- cgit v1.2.3 From b7e40536df9bf9bbad3b2b7a59f33ebad25fc981 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Mon, 4 Jun 2007 23:49:26 +0000 Subject: Added rudimentary object tracking to Archive, and rearranged the hash and archive dependancies a little. I'll add docs for object tracking later... --- src/archive.cpp | 41 ++++++++++++++++++++++++++++++++++++++++- src/archive.h | 44 ++++++++++++++++++++++++++++++++++++++++++-- src/hash.h | 7 ++++--- 3 files changed, 86 insertions(+), 6 deletions(-) diff --git a/src/archive.cpp b/src/archive.cpp index c759477..7208bae 100644 --- a/src/archive.cpp +++ b/src/archive.cpp @@ -2,7 +2,8 @@ Bu::Archive::Archive( Stream &rStream, bool bLoading ) : bLoading( bLoading ), - rStream( rStream ) + rStream( rStream ), + nNextID( 1 ) { } @@ -345,3 +346,41 @@ Bu::Archive &Bu::operator>>( Bu::Archive &ar, std::string &s ) return ar; } +uint32_t Bu::Archive::getID( const void *ptr ) +{ + if( hPtrID.has( (int)ptr ) ) + return hPtrID.get( (int)ptr ); + hPtrID.insert( (int)ptr, nNextID ); + return nNextID++; +} + +void Bu::Archive::assocPtrID( void **ptr, uint32_t id ) +{ + if( hPtrID.has( id ) ) + { + *ptr = (void *)hPtrID.get( id ); + return; + } + + if( !hPtrDest.has( id ) ) + hPtrDest.insert( id, List() ); + + hPtrDest[id].value().append( ptr ); +} + +void Bu::Archive::readID( const void *ptr, uint32_t id ) +{ + hPtrID.insert( id, (int)ptr ); + + if( hPtrDest.has( id ) ) + { + Bu::List &l = hPtrDest.get( id ); + for( Bu::List::iterator i = l.begin(); i != l.end(); i++ ) + { + *(*i) = (void *)ptr; + } + + hPtrDest.erase( id ); + } +} + diff --git a/src/archive.h b/src/archive.h index 2f782d3..05c6f57 100644 --- a/src/archive.h +++ b/src/archive.h @@ -3,9 +3,11 @@ #include #include -#include "archival.h" -#include "stream.h" +#include "bu/archival.h" +#include "bu/stream.h" #include +#include "bu/hash.h" +#include "bu/list.h" namespace Bu { @@ -117,8 +119,15 @@ namespace Bu virtual Archive &operator&&(double &); virtual Archive &operator&&(long double &); + uint32_t getID( const void *ptr ); + void assocPtrID( void **ptr, uint32_t id ); + void readID( const void *ptr, uint32_t id ); + private: Stream &rStream; + uint32_t nNextID; + Hash hPtrID; + Hash > hPtrDest; }; Archive &operator<<(Archive &, class Bu::Archival &); @@ -168,6 +177,37 @@ namespace Bu return ar; } + + template + Archive &operator<<( Archive &ar, Hash &h ) + { + ar << h.size(); + for( typename Hash::iterator i = h.begin(); i != h.end(); i++ ) + { + std::pair p = *i; + ar << p.first << p.second; + } + + return ar; + } + + template + Archive &operator>>( Archive &ar, Hash &h ) + { + h.clear(); + uint32_t nSize; + ar >> nSize; + + for( uint32_t j = 0; j < nSize; j++ ) + { + key k; value v; + ar >> k >> v; + h.insert( k, v ); + } + + return ar; + } + } #endif diff --git a/src/hash.h b/src/hash.h index dc097df..f25c258 100644 --- a/src/hash.h +++ b/src/hash.h @@ -8,8 +8,8 @@ #include #include #include "exceptionbase.h" -#include "archival.h" -#include "archive.h" +///#include "archival.h" +///#include "archive.h" #define bitsToBytes( n ) (n/32+(n%32>0 ? 1 : 0)) @@ -697,6 +697,7 @@ namespace Bu template<> uint32_t __calcHashCode( const std::string &k ); template<> bool __cmpHashKeys( const std::string &a, const std::string &b ); + /* template Archive &operator<<( Archive &ar, Hash &h ) { @@ -725,7 +726,7 @@ namespace Bu } return ar; - } + }*/ /* template -- cgit v1.2.3 From 8c2c728ce5aa1c1941426d0f8e9ab27762ef6754 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Tue, 5 Jun 2007 18:46:01 +0000 Subject: Added a basic ringbuffer, it should be nice and quick, but may be bad to use with objects at the moment, still contemplating that one... --- src/list.h | 20 +++++----- src/ringbuffer.cpp | 2 + src/ringbuffer.h | 100 +++++++++++++++++++++++++++++++++++++++++++++++ src/tests/ringbuffer.cpp | 29 ++++++++++++++ 4 files changed, 141 insertions(+), 10 deletions(-) create mode 100644 src/ringbuffer.cpp create mode 100644 src/ringbuffer.h create mode 100644 src/tests/ringbuffer.cpp diff --git a/src/list.h b/src/list.h index 6081ea5..ea67f45 100644 --- a/src/list.h +++ b/src/list.h @@ -69,10 +69,10 @@ namespace Bu { if( pCur == NULL ) break; va.destroy( pCur->pValue ); - va.deallocate( pCur->pValue, sizeof( value ) ); + va.deallocate( pCur->pValue, 1 ); Link *pTmp = pCur->pNext; la.destroy( pCur ); - la.deallocate( pCur, sizeof( Link ) ); + la.deallocate( pCur, 1 ); pCur = pTmp; } pFirst = pLast = NULL; @@ -81,8 +81,8 @@ namespace Bu void append( const value &v ) { - Link *pNew = la.allocate( sizeof( Link ) ); - pNew->pValue = va.allocate( sizeof( value ) ); + Link *pNew = la.allocate( 1 ); + pNew->pValue = va.allocate( 1 ); va.construct( pNew->pValue, v ); nSize++; if( pFirst == NULL ) @@ -102,8 +102,8 @@ namespace Bu void prepend( const value &v ) { - Link *pNew = la.allocate( sizeof( Link ) ); - pNew->pValue = va.allocate( sizeof( value ) ); + Link *pNew = la.allocate( 1 ); + pNew->pValue = va.allocate( 1 ); va.construct( pNew->pValue, v ); nSize++; if( pFirst == NULL ) @@ -316,10 +316,10 @@ namespace Bu if( pPrev == NULL ) { va.destroy( pCur->pValue ); - va.deallocate( pCur->pValue, sizeof( value ) ); + va.deallocate( pCur->pValue, 1 ); pFirst = pCur->pNext; la.destroy( pCur ); - la.deallocate( pCur, sizeof( Link ) ); + la.deallocate( pCur, 1 ); if( pFirst == NULL ) pLast = NULL; nSize--; @@ -328,10 +328,10 @@ namespace Bu else { va.destroy( pCur->pValue ); - va.deallocate( pCur->pValue, sizeof( value ) ); + va.deallocate( pCur->pValue, 1 ); Link *pTmp = pCur->pNext; la.destroy( pCur ); - la.deallocate( pCur, sizeof( Link ) ); + la.deallocate( pCur, 1 ); pPrev->pNext = pTmp; if( pTmp != NULL ) pTmp->pPrev = pPrev; diff --git a/src/ringbuffer.cpp b/src/ringbuffer.cpp new file mode 100644 index 0000000..feb9bc7 --- /dev/null +++ b/src/ringbuffer.cpp @@ -0,0 +1,2 @@ +#include "bu/ringbuffer.h" + diff --git a/src/ringbuffer.h b/src/ringbuffer.h new file mode 100644 index 0000000..9480043 --- /dev/null +++ b/src/ringbuffer.h @@ -0,0 +1,100 @@ +#ifndef RING_BUFFER_H +#define RING_BUFFER_H + +#include +#include "bu/exceptionbase.h" + +namespace Bu +{ + template > + class RingBuffer + { + public: + RingBuffer( int nCapacity ) : + nCapacity( nCapacity ), + nStart( -1 ), + nEnd( -2 ) + { + aData = va.allocate( nCapacity ); + for( int j = 0; j < nCapacity; j++ ) + { + va.construct( &aData[j], value() ); + } + } + + virtual ~RingBuffer() + { + for( int j = 0; j < nCapacity; j++ ) + { + va.destroy( &aData[j] ); + } + va.deallocate( aData, nCapacity ); + } + + int getCapacity() + { + return nCapacity; + } + + bool isFilled() + { + return (nStart == nEnd); + } + + bool isEmpty() + { + return (nStart == -1); + } + + void enqueue( const value &v ) + { + if( nStart == -1 ) + { + nStart = 0; + nEnd = 1; + aData[0] = v; + } + else if( nStart == nEnd ) + { + throw ExceptionBase("Hey, it's full!"); + } + else + { + aData[nEnd] = v; + nEnd = (nEnd+1)%nCapacity; + } + } + + value dequeue() + { + if( nStart == -1 ) + { + throw ExceptionBase("No data"); + } + else + { + value &v = aData[nStart]; + nStart = (nStart+1)%nCapacity; + if( nStart == nEnd ) + { + nStart = -1; + nEnd = -2; + } + return v; + } + } + + value &operator[]( int nIndex ) + { + return aData[(nIndex+nStart)%nCapacity]; + } + + private: + int nCapacity; + value *aData; + valuealloc va; + int nStart, nEnd; + }; +} + +#endif diff --git a/src/tests/ringbuffer.cpp b/src/tests/ringbuffer.cpp new file mode 100644 index 0000000..259ec1f --- /dev/null +++ b/src/tests/ringbuffer.cpp @@ -0,0 +1,29 @@ +#include "bu/ringbuffer.h" +#include + +int main() +{ + Bu::RingBuffer ibuf( 10 ); + + for( int k = 0; k < 2; k++ ) + { + int j = 1; + for(; j < 7; j++ ) + { + ibuf.enqueue( j ); + } + + for(; j < 20; j++ ) + { + ibuf.enqueue( j ); + printf("- %d\n", ibuf.dequeue() ); + } + + for(;;) + { + if( ibuf.isEmpty() ) break; + printf(". %d\n", ibuf.dequeue() ); + } + } +} + -- cgit v1.2.3 From 6fd963c988199937d48a583b42c3d1217ab31f60 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Tue, 5 Jun 2007 18:48:13 +0000 Subject: Nevermind, it's good to use with objects or anything, they are now destroyed and constructed properly :-P --- src/ringbuffer.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/ringbuffer.h b/src/ringbuffer.h index 9480043..625f65b 100644 --- a/src/ringbuffer.h +++ b/src/ringbuffer.h @@ -16,15 +16,11 @@ namespace Bu nEnd( -2 ) { aData = va.allocate( nCapacity ); - for( int j = 0; j < nCapacity; j++ ) - { - va.construct( &aData[j], value() ); - } } virtual ~RingBuffer() { - for( int j = 0; j < nCapacity; j++ ) + for( int j = nStart; j < nEnd; j=(j+1%nCapacity) ) { va.destroy( &aData[j] ); } @@ -52,7 +48,7 @@ namespace Bu { nStart = 0; nEnd = 1; - aData[0] = v; + va.construct( &aData[0], v ); } else if( nStart == nEnd ) { @@ -60,7 +56,7 @@ namespace Bu } else { - aData[nEnd] = v; + va.construct( &aData[nEnd], v ); nEnd = (nEnd+1)%nCapacity; } } @@ -74,6 +70,7 @@ namespace Bu else { value &v = aData[nStart]; + va.destroy( &aData[nStart] ); nStart = (nStart+1)%nCapacity; if( nStart == nEnd ) { -- cgit v1.2.3 From b342b70ec5ecb11f84742c76db6f2e19a4b60f90 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Wed, 6 Jun 2007 16:11:07 +0000 Subject: About to move taf back into core...contemplating removing the xml system entirely for a while...we'll see what happens. --- src/inprogress/tafreader.cpp | 5 +++++ src/inprogress/tafreader.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/inprogress/tafreader.cpp b/src/inprogress/tafreader.cpp index f94fe44..4d10b8d 100644 --- a/src/inprogress/tafreader.cpp +++ b/src/inprogress/tafreader.cpp @@ -9,3 +9,8 @@ Bu::TafReader::~TafReader() { } +void Bu::TafReader::next() +{ + sIn.read( &c, 1 ); +} + diff --git a/src/inprogress/tafreader.h b/src/inprogress/tafreader.h index 2dbb9ea..b552f5d 100644 --- a/src/inprogress/tafreader.h +++ b/src/inprogress/tafreader.h @@ -17,6 +17,8 @@ namespace Bu virtual ~TafReader(); private: + void next(); + char c; Stream &sIn; }; -- cgit v1.2.3 From cdca5e17e1ecb9f212353dce55c5df2930e34e9d Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Wed, 6 Jun 2007 16:12:02 +0000 Subject: Moved Taf back into core. --- src/inprogress/tafdocument.cpp | 9 --------- src/inprogress/tafdocument.h | 22 ---------------------- src/inprogress/tafnode.cpp | 9 --------- src/inprogress/tafnode.h | 21 --------------------- src/inprogress/tafreader.cpp | 16 ---------------- src/inprogress/tafreader.h | 27 --------------------------- src/inprogress/tafwriter.cpp | 9 --------- src/inprogress/tafwriter.h | 22 ---------------------- src/tafdocument.cpp | 9 +++++++++ src/tafdocument.h | 22 ++++++++++++++++++++++ src/tafnode.cpp | 9 +++++++++ src/tafnode.h | 21 +++++++++++++++++++++ src/tafreader.cpp | 16 ++++++++++++++++ src/tafreader.h | 27 +++++++++++++++++++++++++++ src/tafwriter.cpp | 9 +++++++++ src/tafwriter.h | 22 ++++++++++++++++++++++ 16 files changed, 135 insertions(+), 135 deletions(-) delete mode 100644 src/inprogress/tafdocument.cpp delete mode 100644 src/inprogress/tafdocument.h delete mode 100644 src/inprogress/tafnode.cpp delete mode 100644 src/inprogress/tafnode.h delete mode 100644 src/inprogress/tafreader.cpp delete mode 100644 src/inprogress/tafreader.h delete mode 100644 src/inprogress/tafwriter.cpp delete mode 100644 src/inprogress/tafwriter.h create mode 100644 src/tafdocument.cpp create mode 100644 src/tafdocument.h create mode 100644 src/tafnode.cpp create mode 100644 src/tafnode.h create mode 100644 src/tafreader.cpp create mode 100644 src/tafreader.h create mode 100644 src/tafwriter.cpp create mode 100644 src/tafwriter.h diff --git a/src/inprogress/tafdocument.cpp b/src/inprogress/tafdocument.cpp deleted file mode 100644 index bd44dd5..0000000 --- a/src/inprogress/tafdocument.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "tafdocument.h" - -Bu::TafDocument::TafDocument() -{ -} - -Bu::TafDocument::~TafDocument() -{ -} diff --git a/src/inprogress/tafdocument.h b/src/inprogress/tafdocument.h deleted file mode 100644 index 171f829..0000000 --- a/src/inprogress/tafdocument.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef BU_TAF_DOCUMENT_H -#define BU_TAF_DOCUMENT_H - -#include - -namespace Bu -{ - /** - * - */ - class TafDocument - { - public: - TafDocument(); - virtual ~TafDocument(); - - private: - - }; -} - -#endif diff --git a/src/inprogress/tafnode.cpp b/src/inprogress/tafnode.cpp deleted file mode 100644 index c9756ec..0000000 --- a/src/inprogress/tafnode.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "tafnode.h" - -Bu::TafNode::TafNode() -{ -} - -Bu::TafNode::~TafNode() -{ -} diff --git a/src/inprogress/tafnode.h b/src/inprogress/tafnode.h deleted file mode 100644 index 34f5289..0000000 --- a/src/inprogress/tafnode.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef BU_TAF_NODE_H -#define BU_TAF_NODE_H - -#include - -namespace Bu -{ - /** - * - */ - class TafNode - { - public: - TafNode(); - virtual ~TafNode(); - - private: - - }; -} -#endif diff --git a/src/inprogress/tafreader.cpp b/src/inprogress/tafreader.cpp deleted file mode 100644 index 4d10b8d..0000000 --- a/src/inprogress/tafreader.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "tafreader.h" - -Bu::TafReader::TafReader( Bu::Stream &sIn ) : - sIn( sIn ) -{ -} - -Bu::TafReader::~TafReader() -{ -} - -void Bu::TafReader::next() -{ - sIn.read( &c, 1 ); -} - diff --git a/src/inprogress/tafreader.h b/src/inprogress/tafreader.h deleted file mode 100644 index b552f5d..0000000 --- a/src/inprogress/tafreader.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef BU_TAF_READER_H -#define BU_TAF_READER_H - -#include -#include "bu/tafdocument.h" -#include "bu/stream.h" - -namespace Bu -{ - /** - * - */ - class TafReader : public Bu::TafDocument - { - public: - TafReader( Bu::Stream &sIn ); - virtual ~TafReader(); - - private: - void next(); - char c; - Stream &sIn; - - }; -} - -#endif diff --git a/src/inprogress/tafwriter.cpp b/src/inprogress/tafwriter.cpp deleted file mode 100644 index 3e6c025..0000000 --- a/src/inprogress/tafwriter.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "tafwriter.h" - -Bu::TafWriter::TafWriter() -{ -} - -Bu::TafWriter::~TafWriter() -{ -} diff --git a/src/inprogress/tafwriter.h b/src/inprogress/tafwriter.h deleted file mode 100644 index 7057d62..0000000 --- a/src/inprogress/tafwriter.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef BU_TAF_WRITER_H -#define BU_TAF_WRITER_H - -#include - -namespace Bu -{ - /** - * - */ - class TafWriter - { - public: - TafWriter(); - virtual ~TafWriter(); - - private: - - }; -} - -#endif diff --git a/src/tafdocument.cpp b/src/tafdocument.cpp new file mode 100644 index 0000000..bd44dd5 --- /dev/null +++ b/src/tafdocument.cpp @@ -0,0 +1,9 @@ +#include "tafdocument.h" + +Bu::TafDocument::TafDocument() +{ +} + +Bu::TafDocument::~TafDocument() +{ +} diff --git a/src/tafdocument.h b/src/tafdocument.h new file mode 100644 index 0000000..171f829 --- /dev/null +++ b/src/tafdocument.h @@ -0,0 +1,22 @@ +#ifndef BU_TAF_DOCUMENT_H +#define BU_TAF_DOCUMENT_H + +#include + +namespace Bu +{ + /** + * + */ + class TafDocument + { + public: + TafDocument(); + virtual ~TafDocument(); + + private: + + }; +} + +#endif diff --git a/src/tafnode.cpp b/src/tafnode.cpp new file mode 100644 index 0000000..c9756ec --- /dev/null +++ b/src/tafnode.cpp @@ -0,0 +1,9 @@ +#include "tafnode.h" + +Bu::TafNode::TafNode() +{ +} + +Bu::TafNode::~TafNode() +{ +} diff --git a/src/tafnode.h b/src/tafnode.h new file mode 100644 index 0000000..34f5289 --- /dev/null +++ b/src/tafnode.h @@ -0,0 +1,21 @@ +#ifndef BU_TAF_NODE_H +#define BU_TAF_NODE_H + +#include + +namespace Bu +{ + /** + * + */ + class TafNode + { + public: + TafNode(); + virtual ~TafNode(); + + private: + + }; +} +#endif diff --git a/src/tafreader.cpp b/src/tafreader.cpp new file mode 100644 index 0000000..4d10b8d --- /dev/null +++ b/src/tafreader.cpp @@ -0,0 +1,16 @@ +#include "tafreader.h" + +Bu::TafReader::TafReader( Bu::Stream &sIn ) : + sIn( sIn ) +{ +} + +Bu::TafReader::~TafReader() +{ +} + +void Bu::TafReader::next() +{ + sIn.read( &c, 1 ); +} + diff --git a/src/tafreader.h b/src/tafreader.h new file mode 100644 index 0000000..b552f5d --- /dev/null +++ b/src/tafreader.h @@ -0,0 +1,27 @@ +#ifndef BU_TAF_READER_H +#define BU_TAF_READER_H + +#include +#include "bu/tafdocument.h" +#include "bu/stream.h" + +namespace Bu +{ + /** + * + */ + class TafReader : public Bu::TafDocument + { + public: + TafReader( Bu::Stream &sIn ); + virtual ~TafReader(); + + private: + void next(); + char c; + Stream &sIn; + + }; +} + +#endif diff --git a/src/tafwriter.cpp b/src/tafwriter.cpp new file mode 100644 index 0000000..3e6c025 --- /dev/null +++ b/src/tafwriter.cpp @@ -0,0 +1,9 @@ +#include "tafwriter.h" + +Bu::TafWriter::TafWriter() +{ +} + +Bu::TafWriter::~TafWriter() +{ +} diff --git a/src/tafwriter.h b/src/tafwriter.h new file mode 100644 index 0000000..7057d62 --- /dev/null +++ b/src/tafwriter.h @@ -0,0 +1,22 @@ +#ifndef BU_TAF_WRITER_H +#define BU_TAF_WRITER_H + +#include + +namespace Bu +{ + /** + * + */ + class TafWriter + { + public: + TafWriter(); + virtual ~TafWriter(); + + private: + + }; +} + +#endif -- cgit v1.2.3 From 3144bd7deb950de0cb80e2215c1545bdf8fc81e9 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Wed, 6 Jun 2007 18:48:07 +0000 Subject: Except for storing the data somewhere, the TafReader is more or less done. Some more generalizations are in order, then we'll stuff the data somewhere. --- misc/taf | 4 +- src/exceptions.cpp | 1 + src/exceptions.h | 1 + src/tafreader.cpp | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++- src/tafreader.h | 6 +++ src/tests/taf.cpp | 9 ++++ 6 files changed, 147 insertions(+), 3 deletions(-) create mode 100644 src/tests/taf.cpp diff --git a/misc/taf b/misc/taf index 5ffcdcf..045b042 100644 --- a/misc/taf +++ b/misc/taf @@ -20,7 +20,7 @@ {: key="," value="yell"} {: key="li" value="lightning"} } - description = """They appear to be rather average looking, not particularly + description = "They appear to be rather average looking, not particularly tall or short, with facial features that are difficult to remember even - seconds after witnessing them.""" + seconds after witnessing them." } diff --git a/src/exceptions.cpp b/src/exceptions.cpp index d9f4e70..50b95c3 100644 --- a/src/exceptions.cpp +++ b/src/exceptions.cpp @@ -4,6 +4,7 @@ namespace Bu { subExceptionDef( XmlException ) + subExceptionDef( TafException ) subExceptionDef( FileException ) subExceptionDef( SocketException ) subExceptionDef( ConnectionException ) diff --git a/src/exceptions.h b/src/exceptions.h index f146b73..d5a9d39 100644 --- a/src/exceptions.h +++ b/src/exceptions.h @@ -7,6 +7,7 @@ namespace Bu { subExceptionDecl( XmlException ) + subExceptionDecl( TafException ) subExceptionDecl( FileException ) subExceptionDecl( SocketException ) subExceptionDecl( ConnectionException ) diff --git a/src/tafreader.cpp b/src/tafreader.cpp index 4d10b8d..91aa9f2 100644 --- a/src/tafreader.cpp +++ b/src/tafreader.cpp @@ -1,14 +1,141 @@ -#include "tafreader.h" +#include "bu/tafreader.h" +#include "bu/exceptions.h" +#include "bu/fstring.h" Bu::TafReader::TafReader( Bu::Stream &sIn ) : sIn( sIn ) { + next(); + node(); } Bu::TafReader::~TafReader() { } +void Bu::TafReader::node() +{ + ws(); + if( c != '{' ) + throw Bu::TafException("Expected '{'"); + next(); + ws(); + Bu::FString sName; + for(;;) + { + if( c == ':' ) + break; + else + sName += c; + next(); + } + next(); + printf("Node[%s]:\n", sName.getStr() ); + + nodeContent(); + + if( c != '}' ) + throw TafException("Expected '}'"); + + next(); +} + +void Bu::TafReader::nodeContent() +{ + for(;;) + { + ws(); + if( c == '{' ) + node(); + else if( c == '}' ) + return; + else + nodeProperty(); + } +} + +void Bu::TafReader::nodeProperty() +{ + Bu::FString sName; + for(;;) + { + if( isws() || c == '=' ) + break; + else + sName += c; + next(); + } + ws(); + if( c != '=' ) + { + printf(" %s (true)\n", sName.getStr() ); + return; + } + next(); + ws(); + Bu::FString sValue; + if( c == '"' ) + { + next(); + for(;;) + { + if( c == '\\' ) + { + next(); + if( c == 'x' ) + { + char code[3]={'\0','\0','\0'}; + next(); + code[0] = c; + next(); + code[1] = c; + c = (unsigned char)strtol( code, NULL, 16 ); + } + else if( c == '"' ) + c = '"'; + else + throw TafException("Invalid escape sequence."); + } + else if( c == '"' ) + break; + sValue += c; + next(); + } + next(); + } + else + { + for(;;) + { + if( isws() || c == '}' || c == '{' ) + break; + sValue += c; + next(); + } + } + printf(" %s = %s\n", sName.getStr(), sValue.getStr() ); +} + +FString Bu::TafReader::readStr() +{ +} + +void Bu::TafReader::ws() +{ + for(;;) + { + if( !isws() ) + return; + + next(); + } +} + +bool Bu::TafReader::isws() +{ + return (c == ' ' || c == '\t' || c == '\n' || c == '\r'); +} + void Bu::TafReader::next() { sIn.read( &c, 1 ); diff --git a/src/tafreader.h b/src/tafreader.h index b552f5d..127b571 100644 --- a/src/tafreader.h +++ b/src/tafreader.h @@ -17,7 +17,13 @@ namespace Bu virtual ~TafReader(); private: + void node(); + void nodeContent(); + void nodeProperty(); + void ws(); + bool isws(); void next(); + FString readStr(); char c; Stream &sIn; diff --git a/src/tests/taf.cpp b/src/tests/taf.cpp new file mode 100644 index 0000000..12c653e --- /dev/null +++ b/src/tests/taf.cpp @@ -0,0 +1,9 @@ +#include "bu/tafreader.h" +#include "bu/file.h" + +int main() +{ + Bu::File f("test.taf", "rb"); + Bu::TafReader tr( f ); +} + -- cgit v1.2.3 From 3c846af2fa8e4693c190c5131ec87d967eb58b3e Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Wed, 6 Jun 2007 21:18:15 +0000 Subject: The TafReader is more general and much nicer, and about to actually construct nodes, that part will be exciting. I also fixed some stuff and added some new functions to List, it now has first() and last() which work just like std::list front() and back(), I may add compatibility functions later... --- src/entities/bu-class | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/list.h | 20 ++++++++++++++++++++ src/tafdocument.cpp | 9 --------- src/tafdocument.h | 22 ---------------------- src/tafnode.cpp | 16 ++++++++++++++++ src/tafnode.h | 17 ++++++++++++++++- src/tafreader.cpp | 47 ++++++++++++++++++++--------------------------- src/tafreader.h | 12 +++++++----- test.taf | 26 ++++++++++++++++++++++++++ 9 files changed, 151 insertions(+), 64 deletions(-) create mode 100644 src/entities/bu-class delete mode 100644 src/tafdocument.cpp delete mode 100644 src/tafdocument.h create mode 100644 test.taf diff --git a/src/entities/bu-class b/src/entities/bu-class new file mode 100644 index 0000000..81e3d25 --- /dev/null +++ b/src/entities/bu-class @@ -0,0 +1,46 @@ + + + + + #ifndef {=name:%uccsplit:%toupper}_H +#define {=name:%uccsplit:%toupper}_H + +#include <stdint.h> + +{?parent:"#include \"{=parent:%tolower}.h\" + +"}namespace Bu +{ + /** + * + */ + class {=name}{?parent:" : public {=parent}"} + { + public: + {=name}(); + virtual ~{=name}(); + + private: + + }; +} + +#endif + + #include "bu/{=name:%tolower}.h" + +Bu::{=name}::{=name}() +{ +} + +Bu::{=name}::~{=name}() +{ +} + + diff --git a/src/list.h b/src/list.h index ea67f45..4131987 100644 --- a/src/list.h +++ b/src/list.h @@ -344,6 +344,26 @@ namespace Bu { return nSize; } + + value &first() + { + return *pFirst->pValue; + } + + const value &first() const + { + return *pFirst->pValue; + } + + value &last() + { + return *pLast->pValue; + } + + const value &last() const + { + return *pLast->pValue; + } private: Link *pFirst; diff --git a/src/tafdocument.cpp b/src/tafdocument.cpp deleted file mode 100644 index bd44dd5..0000000 --- a/src/tafdocument.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "tafdocument.h" - -Bu::TafDocument::TafDocument() -{ -} - -Bu::TafDocument::~TafDocument() -{ -} diff --git a/src/tafdocument.h b/src/tafdocument.h deleted file mode 100644 index 171f829..0000000 --- a/src/tafdocument.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef BU_TAF_DOCUMENT_H -#define BU_TAF_DOCUMENT_H - -#include - -namespace Bu -{ - /** - * - */ - class TafDocument - { - public: - TafDocument(); - virtual ~TafDocument(); - - private: - - }; -} - -#endif diff --git a/src/tafnode.cpp b/src/tafnode.cpp index c9756ec..01880d9 100644 --- a/src/tafnode.cpp +++ b/src/tafnode.cpp @@ -7,3 +7,19 @@ Bu::TafNode::TafNode() Bu::TafNode::~TafNode() { } + +void Bu::TafNode::setProperty( Bu::FString sName, Bu::FString sValue ) +{ + if( hProp.has( sName ) ) + { + hProp.insert( sName, PropList() ); + } + + hProp.get( sName ).append( sValue ); +} + +const Bu::TafNode::PropList &Bu::TafNode::getProperty( const Bu::FString &sName ) +{ + return hProp.get( sName ); +} + diff --git a/src/tafnode.h b/src/tafnode.h index 34f5289..e962e88 100644 --- a/src/tafnode.h +++ b/src/tafnode.h @@ -2,6 +2,9 @@ #define BU_TAF_NODE_H #include +#include "bu/fstring.h" +#include "bu/hash.h" +#include "bu/list.h" namespace Bu { @@ -10,12 +13,24 @@ namespace Bu */ class TafNode { + public: + typedef Bu::List PropList; + typedef Bu::Hash PropHash; + typedef Bu::List NodeList; + typedef Bu::Hash NodeHash; + public: TafNode(); virtual ~TafNode(); - private: + void setProperty( Bu::FString sName, Bu::FString sValue ); + const PropList &getProperty( const Bu::FString &sName ); + private: + Bu::FString sName; + PropHash hProp; + NodeHash hChildren; }; } + #endif diff --git a/src/tafreader.cpp b/src/tafreader.cpp index 91aa9f2..3bca3d1 100644 --- a/src/tafreader.cpp +++ b/src/tafreader.cpp @@ -2,6 +2,8 @@ #include "bu/exceptions.h" #include "bu/fstring.h" +using namespace Bu; + Bu::TafReader::TafReader( Bu::Stream &sIn ) : sIn( sIn ) { @@ -13,22 +15,18 @@ Bu::TafReader::~TafReader() { } +Bu::TafNode *Bu::TafReader::readNode() +{ +} + void Bu::TafReader::node() { ws(); if( c != '{' ) - throw Bu::TafException("Expected '{'"); + throw TafException("Expected '{'"); next(); ws(); - Bu::FString sName; - for(;;) - { - if( c == ':' ) - break; - else - sName += c; - next(); - } + FString sName = readStr(); next(); printf("Node[%s]:\n", sName.getStr() ); @@ -56,15 +54,7 @@ void Bu::TafReader::nodeContent() void Bu::TafReader::nodeProperty() { - Bu::FString sName; - for(;;) - { - if( isws() || c == '=' ) - break; - else - sName += c; - next(); - } + FString sName = readStr(); ws(); if( c != '=' ) { @@ -72,8 +62,14 @@ void Bu::TafReader::nodeProperty() return; } next(); + FString sValue = readStr(); + printf(" %s = %s\n", sName.getStr(), sValue.getStr() ); +} + +Bu::FString Bu::TafReader::readStr() +{ ws(); - Bu::FString sValue; + FString s; if( c == '"' ) { next(); @@ -98,7 +94,7 @@ void Bu::TafReader::nodeProperty() } else if( c == '"' ) break; - sValue += c; + s += c; next(); } next(); @@ -107,17 +103,14 @@ void Bu::TafReader::nodeProperty() { for(;;) { - if( isws() || c == '}' || c == '{' ) + if( isws() || c == '}' || c == '{' || c == ':' || c == '=' ) break; - sValue += c; + s += c; next(); } } - printf(" %s = %s\n", sName.getStr(), sValue.getStr() ); -} -FString Bu::TafReader::readStr() -{ + return s; } void Bu::TafReader::ws() diff --git a/src/tafreader.h b/src/tafreader.h index 127b571..4da800c 100644 --- a/src/tafreader.h +++ b/src/tafreader.h @@ -2,20 +2,23 @@ #define BU_TAF_READER_H #include -#include "bu/tafdocument.h" +#include "bu/tafnode.h" #include "bu/stream.h" +#include "bu/fstring.h" namespace Bu { /** * */ - class TafReader : public Bu::TafDocument + class TafReader { public: TafReader( Bu::Stream &sIn ); virtual ~TafReader(); + Bu::TafNode *readNode(); + private: void node(); void nodeContent(); @@ -23,10 +26,9 @@ namespace Bu void ws(); bool isws(); void next(); - FString readStr(); + Bu::FString readStr(); char c; - Stream &sIn; - + Bu::Stream &sIn; }; } diff --git a/test.taf b/test.taf new file mode 100644 index 0000000..045b042 --- /dev/null +++ b/test.taf @@ -0,0 +1,26 @@ +{player: + password = "aoeuaoeuao" + userclass = "implementor" + species = "human" + sex = "male" + active + startroom = "Salourn::Xagafinelle's Room" + {stats: str=14 dex=12 spd=12 enr=7 rea=12 wil=10 int=13 cha=14} + {hp: cur = 100 max = 100} + {en: cur = 100 max = 100} + attackrate = 30 + gold = 0 + {inventory: + {: count=1 id="Salourn::Dark Blade"} + {: count=1 id="Salourn::Dark Suit"} + {: count=3 id="Salourn::Small Fig"} + } + {aliases: + {: key="." value="say"} + {: key="," value="yell"} + {: key="li" value="lightning"} + } + description = "They appear to be rather average looking, not particularly + tall or short, with facial features that are difficult to remember even + seconds after witnessing them." +} -- cgit v1.2.3 From 1f785c99b4e9e76d6803bd66cc4256e9b03fa788 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Wed, 6 Jun 2007 23:09:58 +0000 Subject: Dunno, really, apparently I changed the reader. --- src/tafreader.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tafreader.cpp b/src/tafreader.cpp index 3bca3d1..5fe303b 100644 --- a/src/tafreader.cpp +++ b/src/tafreader.cpp @@ -13,6 +13,7 @@ Bu::TafReader::TafReader( Bu::Stream &sIn ) : Bu::TafReader::~TafReader() { + } Bu::TafNode *Bu::TafReader::readNode() -- cgit v1.2.3 From 8b598e8436a7110abbd0a7566138bcaa952bb527 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 7 Jun 2007 03:26:43 +0000 Subject: Except for an excessive amount of debug info, I finally got the delete code working. Now you can load Taf structures and clean up, you just can't access all of the data inside 100%. --- src/tafnode.cpp | 39 ++++++++++++++++++++++++++++++++++++++- src/tafnode.h | 5 +++++ src/tafreader.cpp | 32 +++++++++++++++++--------------- src/tafreader.h | 7 +++---- src/tests/taf.cpp | 11 +++++++++++ 5 files changed, 74 insertions(+), 20 deletions(-) diff --git a/src/tafnode.cpp b/src/tafnode.cpp index 01880d9..ed8adc0 100644 --- a/src/tafnode.cpp +++ b/src/tafnode.cpp @@ -6,11 +6,21 @@ Bu::TafNode::TafNode() Bu::TafNode::~TafNode() { + printf("Entering Bu::TafNode::~TafNode() \"%s\"\n", sName.getStr() ); + for( NodeHash::iterator i = hChildren.begin(); i != hChildren.end(); i++ ) + { + NodeList &l = i.getValue(); + for( NodeList::iterator k = l.begin(); k != l.end(); k++ ) + { + printf("deleting: [%08X] %s\n", *k, "" );//(*k)->getName().getStr() ); + delete (*k); + } + } } void Bu::TafNode::setProperty( Bu::FString sName, Bu::FString sValue ) { - if( hProp.has( sName ) ) + if( !hProp.has( sName ) ) { hProp.insert( sName, PropList() ); } @@ -18,8 +28,35 @@ void Bu::TafNode::setProperty( Bu::FString sName, Bu::FString sValue ) hProp.get( sName ).append( sValue ); } +void Bu::TafNode::addChild( TafNode *pNode ) +{ + if( !hChildren.has( pNode->getName() ) ) + { + hChildren.insert( pNode->getName(), NodeList() ); + } + + printf("Appending \"%s\"\n", pNode->getName().getStr() ); + hChildren.get( pNode->getName() ).append( pNode ); + printf("[%08X]\n", hChildren.get( pNode->getName() ).last() ); +} + const Bu::TafNode::PropList &Bu::TafNode::getProperty( const Bu::FString &sName ) { return hProp.get( sName ); } +const Bu::TafNode::NodeList &Bu::TafNode::getNode( const Bu::FString &sName ) +{ + return hChildren.get( sName ); +} + +void Bu::TafNode::setName( const Bu::FString &sName ) +{ + this->sName = sName; +} + +const Bu::FString &Bu::TafNode::getName() +{ + return sName; +} + diff --git a/src/tafnode.h b/src/tafnode.h index e962e88..a570d2d 100644 --- a/src/tafnode.h +++ b/src/tafnode.h @@ -23,8 +23,13 @@ namespace Bu TafNode(); virtual ~TafNode(); + void setName( const Bu::FString &sName ); + const Bu::FString &getName(); + void setProperty( Bu::FString sName, Bu::FString sValue ); const PropList &getProperty( const Bu::FString &sName ); + const NodeList &getNode( const Bu::FString &sName ); + void addChild( TafNode *pNode ); private: Bu::FString sName; diff --git a/src/tafreader.cpp b/src/tafreader.cpp index 5fe303b..1187176 100644 --- a/src/tafreader.cpp +++ b/src/tafreader.cpp @@ -5,10 +5,9 @@ using namespace Bu; Bu::TafReader::TafReader( Bu::Stream &sIn ) : + c( 0 ), sIn( sIn ) { - next(); - node(); } Bu::TafReader::~TafReader() @@ -16,55 +15,58 @@ Bu::TafReader::~TafReader() } -Bu::TafNode *Bu::TafReader::readNode() -{ -} - -void Bu::TafReader::node() +Bu::TafNode *Bu::TafReader::getNode() { + if( c == 0 ) next(); + TafNode *pNode = new TafNode(); ws(); if( c != '{' ) throw TafException("Expected '{'"); next(); ws(); FString sName = readStr(); + pNode->setName( sName ); next(); - printf("Node[%s]:\n", sName.getStr() ); + //printf("Node[%s]:\n", sName.getStr() ); - nodeContent(); + nodeContent( pNode ); if( c != '}' ) throw TafException("Expected '}'"); next(); + + return pNode; } -void Bu::TafReader::nodeContent() +void Bu::TafReader::nodeContent( Bu::TafNode *pNode ) { for(;;) { ws(); if( c == '{' ) - node(); + pNode->addChild( getNode() ); else if( c == '}' ) return; else - nodeProperty(); + nodeProperty( pNode ); } } -void Bu::TafReader::nodeProperty() +void Bu::TafReader::nodeProperty( Bu::TafNode *pNode ) { FString sName = readStr(); ws(); if( c != '=' ) { - printf(" %s (true)\n", sName.getStr() ); + //printf(" %s (true)\n", sName.getStr() ); + pNode->setProperty( sName, "" ); return; } next(); FString sValue = readStr(); - printf(" %s = %s\n", sName.getStr(), sValue.getStr() ); + pNode->setProperty( sName, sValue ); + //printf(" %s = %s\n", sName.getStr(), sValue.getStr() ); } Bu::FString Bu::TafReader::readStr() diff --git a/src/tafreader.h b/src/tafreader.h index 4da800c..47ae187 100644 --- a/src/tafreader.h +++ b/src/tafreader.h @@ -17,12 +17,11 @@ namespace Bu TafReader( Bu::Stream &sIn ); virtual ~TafReader(); - Bu::TafNode *readNode(); + Bu::TafNode *getNode(); private: - void node(); - void nodeContent(); - void nodeProperty(); + void nodeContent( Bu::TafNode *pNode ); + void nodeProperty( Bu::TafNode *pNode ); void ws(); bool isws(); void next(); diff --git a/src/tests/taf.cpp b/src/tests/taf.cpp index 12c653e..f7af2b2 100644 --- a/src/tests/taf.cpp +++ b/src/tests/taf.cpp @@ -5,5 +5,16 @@ int main() { Bu::File f("test.taf", "rb"); Bu::TafReader tr( f ); + + Bu::TafNode *pNode = tr.getNode(); + + const Bu::TafNode::NodeList &l = pNode->getNode("stats"); + for( Bu::TafNode::NodeList::const_iterator i = l.begin(); + i != l.end(); i++ ) + { + printf("%s\n", (*i)->getName().getStr() ); + } + + delete pNode; } -- cgit v1.2.3 From 0e41e5b6c004f695013d65f71c4223e2540d1391 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 7 Jun 2007 03:30:38 +0000 Subject: Minor change to the operation of the Hash, now dereferencing an iterator with the prefix * operator will return only a reference to the value, not a pair, it was causing issues, and you can still get at the key with the getKey function. --- src/hash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hash.h b/src/hash.h index f25c258..a81c355 100644 --- a/src/hash.h +++ b/src/hash.h @@ -437,7 +437,7 @@ namespace Bu bFinished = oth.bFinished; } - std::pair operator *() + value &operator *() { return hsh.getAtPos( nPos ); } -- cgit v1.2.3 From c2e3879b965d297604804f03271ac71c8c5c81f3 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 7 Jun 2007 04:55:29 +0000 Subject: The new taf interfaces seem to work just fine, except for saving and that loaded TafNode structures are immutable, it all looks really good. Saving should be a snap, and the immutable part I'm not sure is bad...we'll see what happens. Also, I'm contemplating looking into a way to add "named data structure" support to the Archive at a lower level, then allow it to use a nameing system to apply names to each data structure and then output to any backend that supports naming, like taf, xml, etc. --- src/hash.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- src/tafnode.cpp | 24 +++++++++++++++++------- src/tafnode.h | 8 +++++--- src/tests/taf.cpp | 9 +++------ 4 files changed, 77 insertions(+), 17 deletions(-) diff --git a/src/hash.h b/src/hash.h index a81c355..f6c207f 100644 --- a/src/hash.h +++ b/src/hash.h @@ -358,6 +358,25 @@ namespace Bu ); } } + + virtual const value &get( key k ) const + { + uint32_t hash = __calcHashCode( k ); + bool bFill; + uint32_t nPos = probe( hash, k, bFill ); + + if( bFill ) + { + return aValues[nPos]; + } + else + { + throw HashException( + excodeNotFilled, + "No data assosiated with that key." + ); + } + } virtual bool has( key k ) { @@ -599,6 +618,38 @@ namespace Bu bFill = false; return nCur; } + + uint32_t probe( uint32_t hash, key k, bool &bFill, bool rehash=true ) const + { + uint32_t nCur = hash%nCapacity; + + // First we scan to see if the key is already there, abort if we + // run out of probing room, or we find a non-filled entry + for( int8_t j = 0; + isFilled( nCur ) && j < 32; + nCur = (nCur + (1<getName().getStr() ); + //printf("deleting: [%08X] %s\n", *k, "" );//(*k)->getName().getStr() ); delete (*k); } } @@ -35,27 +35,37 @@ void Bu::TafNode::addChild( TafNode *pNode ) hChildren.insert( pNode->getName(), NodeList() ); } - printf("Appending \"%s\"\n", pNode->getName().getStr() ); + //printf("Appending \"%s\"\n", pNode->getName().getStr() ); hChildren.get( pNode->getName() ).append( pNode ); - printf("[%08X]\n", hChildren.get( pNode->getName() ).last() ); + //printf("[%08X]\n", hChildren.get( pNode->getName() ).last() ); } -const Bu::TafNode::PropList &Bu::TafNode::getProperty( const Bu::FString &sName ) +const Bu::TafNode::PropList &Bu::TafNode::getProperties( const Bu::FString &sName ) const { return hProp.get( sName ); } -const Bu::TafNode::NodeList &Bu::TafNode::getNode( const Bu::FString &sName ) +const Bu::TafNode::NodeList &Bu::TafNode::getNodes( const Bu::FString &sName ) const { return hChildren.get( sName ); } +const Bu::FString &Bu::TafNode::getProperty( const Bu::FString &sName ) const +{ + return getProperties( sName ).first(); +} + +const Bu::TafNode *Bu::TafNode::getNode( const Bu::FString &sName ) const +{ + return getNodes( sName ).first(); +} + void Bu::TafNode::setName( const Bu::FString &sName ) { this->sName = sName; } -const Bu::FString &Bu::TafNode::getName() +const Bu::FString &Bu::TafNode::getName() const { return sName; } diff --git a/src/tafnode.h b/src/tafnode.h index a570d2d..10232d2 100644 --- a/src/tafnode.h +++ b/src/tafnode.h @@ -24,11 +24,13 @@ namespace Bu virtual ~TafNode(); void setName( const Bu::FString &sName ); - const Bu::FString &getName(); + const Bu::FString &getName() const; void setProperty( Bu::FString sName, Bu::FString sValue ); - const PropList &getProperty( const Bu::FString &sName ); - const NodeList &getNode( const Bu::FString &sName ); + const Bu::FString &getProperty( const Bu::FString &sName ) const; + const TafNode *getNode( const Bu::FString &sName ) const; + const PropList &getProperties( const Bu::FString &sName ) const; + const NodeList &getNodes( const Bu::FString &sName ) const; void addChild( TafNode *pNode ); private: diff --git a/src/tests/taf.cpp b/src/tests/taf.cpp index f7af2b2..e7bad52 100644 --- a/src/tests/taf.cpp +++ b/src/tests/taf.cpp @@ -8,12 +8,9 @@ int main() Bu::TafNode *pNode = tr.getNode(); - const Bu::TafNode::NodeList &l = pNode->getNode("stats"); - for( Bu::TafNode::NodeList::const_iterator i = l.begin(); - i != l.end(); i++ ) - { - printf("%s\n", (*i)->getName().getStr() ); - } + const Bu::TafNode *pStats = pNode->getNode("stats"); + printf("%s\n", pStats->getName().getStr() ); + printf(" str = %s\n", pStats->getProperty("str").getStr() ); delete pNode; } -- cgit v1.2.3 From 9e8a4944e50fab432012878c66e1bdac20649f76 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 7 Jun 2007 19:56:20 +0000 Subject: The Stream Filter archetecture is finished, it's actually much cooler than I had anticipated, and much cleaner. I'll have to add some documentation to it, because it's not really obvious how any of it fits together from the outset, although I have to say that the bzip2 test program is the easiest general bzip2 compression program I've ever made...it just goes :) Decompression in Bu::BZip2 isn't finished yet, but that's ok, it's coming soon. --- build.conf | 2 + src/bzip2.cpp | 123 ++++++++++++ src/bzip2.h | 35 ++++ src/entities/bu-class | 4 +- src/filter.cpp | 77 ++++++++ src/filter.h | 59 ++++++ src/fstring.h | 6 +- src/old/paramproc.cpp | 514 -------------------------------------------------- src/old/paramproc.h | 153 --------------- src/paramproc.cpp | 514 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/paramproc.h | 156 +++++++++++++++ src/stream.h | 3 + src/tests/bzip2.cpp | 23 +++ 13 files changed, 998 insertions(+), 671 deletions(-) create mode 100644 src/bzip2.cpp create mode 100644 src/bzip2.h create mode 100644 src/filter.cpp create mode 100644 src/filter.h delete mode 100644 src/old/paramproc.cpp delete mode 100644 src/old/paramproc.h create mode 100644 src/paramproc.cpp create mode 100644 src/paramproc.h create mode 100644 src/tests/bzip2.cpp diff --git a/build.conf b/build.conf index 35738e3..f493d67 100644 --- a/build.conf +++ b/build.conf @@ -61,6 +61,8 @@ filesIn("src/unit") filter regexp("^src/unit/(.*)\\.cpp$", "unit/{re:1}"): "tests/plugin": set "LDFLAGS" += "-ldl" +"tests/bzip2": set "LDFLAGS" += "-lbz2" + rule "exe": matches regexp("(.*)\\.o$"), aggregate toString(" "), diff --git a/src/bzip2.cpp b/src/bzip2.cpp new file mode 100644 index 0000000..b8c0f74 --- /dev/null +++ b/src/bzip2.cpp @@ -0,0 +1,123 @@ +#include "bu/bzip2.h" +#include "bu/exceptions.h" + +using namespace Bu; + +Bu::BZip2::BZip2( Bu::Stream &rNext, int nCompression ) : + Bu::Filter( rNext ), + nCompression( nCompression ) +{ + start(); +} + +Bu::BZip2::~BZip2() +{ + printf("-> Bu::BZip2::~BZip2()\n"); + stop(); +} + +void Bu::BZip2::start() +{ + printf("-> Bu::BZip2::start()\n"); + printf("Hey, it's starting...\n"); + bzState.state = NULL; + bzState.bzalloc = NULL; + bzState.bzfree = NULL; + bzState.opaque = NULL; + + nBufSize = 50000; + pBuf = new char[nBufSize]; +} + +void Bu::BZip2::stop() +{ + printf("-> Bu::BZip2::stop()\n"); + if( bzState.state ) + { + if( bReading ) + { + } + else + { + for(;;) + { + bzState.next_in = NULL; + bzState.avail_in = 0; + bzState.avail_out = nBufSize; + bzState.next_out = pBuf; + int res = BZ2_bzCompress( &bzState, BZ_FINISH ); + if( bzState.avail_out < nBufSize ) + { + rNext.write( pBuf, nBufSize-bzState.avail_out ); + } + if( res == BZ_STREAM_END ) + break; + } + BZ2_bzCompressEnd( &bzState ); + } + } +} + +void Bu::BZip2::bzError( int code ) +{ + switch( code ) + { + case BZ_OK: + return; + + case BZ_CONFIG_ERROR: + throw ExceptionBase("The bzip2 library has been miscompiled."); + + case BZ_PARAM_ERROR: + throw ExceptionBase("bzip2 parameter error."); + + case BZ_MEM_ERROR: + throw ExceptionBase("Not enough memory available for bzip2."); + } +} + +size_t Bu::BZip2::read( void *pData, size_t nBytes ) +{ + if( !bzState.state ) + { + bReading = true; + } + if( bReading == false ) + throw ExceptionBase("This bzip2 filter is in writing mode, you can't read."); + //bzState.next_in = pData; + //bzState.avail_in = nSizeIn; + + //printf("%db at [%08X] (%db)\n", bzState.avail_in, (uint32_t)bzState.next_in, bzState.total_in_lo32 ); + return 0; +} + +size_t Bu::BZip2::write( const void *pData, size_t nBytes ) +{ + if( !bzState.state ) + { + bReading = false; + BZ2_bzCompressInit( &bzState, nCompression, 0, 30 ); + } + if( bReading == true ) + throw ExceptionBase("This bzip2 filter is in reading mode, you can't write."); + + bzState.next_in = (char *)pData; + bzState.avail_in = nBytes; + for(;;) + { + bzState.avail_out = nBufSize; + bzState.next_out = pBuf; + + BZ2_bzCompress( &bzState, BZ_RUN ); + + if( bzState.avail_out < nBufSize ) + { + rNext.write( pBuf, nBufSize-bzState.avail_out ); + } + if( bzState.avail_in == 0 ) + break; + } + + return 0; +} + diff --git a/src/bzip2.h b/src/bzip2.h new file mode 100644 index 0000000..056f336 --- /dev/null +++ b/src/bzip2.h @@ -0,0 +1,35 @@ +#ifndef B_ZIP2_H +#define B_ZIP2_H + +#include +#include + +#include "bu/filter.h" + +namespace Bu +{ + /** + * + */ + class BZip2 : public Bu::Filter + { + public: + BZip2( Bu::Stream &rNext, int nCompression=9 ); + virtual ~BZip2(); + + virtual void start(); + virtual void stop(); + virtual size_t read( void *pBuf, size_t nBytes ); + virtual size_t write( const void *pBuf, size_t nBytes ); + + private: + void bzError( int code ); + bz_stream bzState; + bool bReading; + int nCompression; + char *pBuf; + uint32_t nBufSize; + }; +} + +#endif diff --git a/src/entities/bu-class b/src/entities/bu-class index 81e3d25..7b25291 100644 --- a/src/entities/bu-class +++ b/src/entities/bu-class @@ -10,7 +10,7 @@ #include <stdint.h> -{?parent:"#include \"{=parent:%tolower}.h\" +{?parent:"#include \"bu/{=parent:%tolower}.h\" "}namespace Bu { @@ -35,6 +35,8 @@ filename="{=name:%tolower}.cpp" >#include "bu/{=name:%tolower}.h" +using namespace Bu; + Bu::{=name}::{=name}() { } diff --git a/src/filter.cpp b/src/filter.cpp new file mode 100644 index 0000000..d3faa00 --- /dev/null +++ b/src/filter.cpp @@ -0,0 +1,77 @@ +#include "bu/filter.h" + +Bu::Filter::Filter( Bu::Stream &rNext ) : + rNext( rNext ) +{ +} + +Bu::Filter::~Filter() +{ + printf("-> Bu::Filter::~Filter()\n"); +} +/* +void Bu::Filter::start() +{ + printf("-> Bu::Filter::start()\n"); +} + +void Bu::Filter::stop() +{ +}*/ + +void Bu::Filter::close() +{ + stop(); + rNext.close(); +} + +long Bu::Filter::tell() +{ + return rNext.tell(); +} + +void Bu::Filter::seek( long offset ) +{ + rNext.seek( offset ); +} + +void Bu::Filter::setPos( long pos ) +{ + rNext.setPos( pos ); +} + +void Bu::Filter::setPosEnd( long pos ) +{ + rNext.setPosEnd( pos ); +} + +bool Bu::Filter::isEOS() +{ + return rNext.isEOS(); +} + +bool Bu::Filter::canRead() +{ + return rNext.canRead(); +} + +bool Bu::Filter::canWrite() +{ + return rNext.canWrite(); +} + +bool Bu::Filter::canSeek() +{ + return rNext.canSeek(); +} + +bool Bu::Filter::isBlocking() +{ + return rNext.isBlocking(); +} + +void Bu::Filter::setBlocking( bool bBlocking ) +{ + rNext.setBlocking( bBlocking ); +} + diff --git a/src/filter.h b/src/filter.h new file mode 100644 index 0000000..b068206 --- /dev/null +++ b/src/filter.h @@ -0,0 +1,59 @@ +#ifndef FILTER_H +#define FILTER_H + +#include + +#include "bu/stream.h" + +namespace Bu +{ + /** + * Data filter base class. Each data filter should contain a read and write + * section. Effectively, the write applies the filter, the read un-applies + * the filter, if possible. For example, BZip2 is a filter that compresses + * on write and decompresses on read. All bi-directional filters should + * follow: x == read( write( x ) ) (byte-for-byte comparison) + * + * Also, all returned buffers should be owned by the filter, and deleted + * when the filter is deleted. This means that the output of a read or + * write operation must be used before the next call to read or write or the + * data will be destroyed. Also, the internal buffer may be changed or + * recreated between calls, so always get a new pointer from a call to + * read or write. + * + * The close function can also return data, so make sure to check for it, + * many filters such as compression filters will buffer data until they have + * enough to create a compression block, in these cases the leftover data + * will be returned by close. + */ + class Filter : public Bu::Stream + { + public: + Filter( Bu::Stream &rNext ); + virtual ~Filter(); + + virtual void start()=0; + virtual void stop()=0; + virtual void close(); + virtual long tell(); + virtual void seek( long offset ); + virtual void setPos( long pos ); + virtual void setPosEnd( long pos ); + virtual bool isEOS(); + + virtual bool canRead(); + virtual bool canWrite(); + virtual bool canSeek(); + + virtual bool isBlocking(); + virtual void setBlocking( bool bBlocking=true ); + + protected: + Bu::Stream &rNext; + + private: + + }; +} + +#endif diff --git a/src/fstring.h b/src/fstring.h index 43033b8..d0307b5 100644 --- a/src/fstring.h +++ b/src/fstring.h @@ -3,9 +3,9 @@ #include #include -#include "archival.h" -#include "archive.h" -#include "hash.h" +#include "bu/archival.h" +#include "bu/archive.h" +#include "bu/hash.h" #define min( a, b ) ((a - -#define ptrtype( iitype, iiname ) \ - ParamProc::ParamPtr::ParamPtr( iitype *iiname ) : \ - type( vt ##iiname ) { val.iiname = iiname; } - -ParamProc::ParamPtr::ParamPtr() -{ - val.str = NULL; - type = vtunset; -} - -ptrtype( std::string, str ); -ptrtype( uint64_t, uint64 ); -ptrtype( uint32_t, uint32 ); -ptrtype( uint16_t, uint16 ); -ptrtype( uint8_t, uint8 ); -ptrtype( int64_t, int64 ); -ptrtype( int32_t, int32 ); -ptrtype( int16_t, int16 ); -ptrtype( int8_t, int8 ); -ptrtype( float, float32 ); -ptrtype( double, float64 ); -ptrtype( long double, float96 ); -ptrtype( bool, bln ); - -ParamProc::ParamPtr &ParamProc::ParamPtr::operator=( ParamProc::ParamPtr &ptr ) -{ - val = ptr.val; - type = ptr.type; - - return *this; -} - -bool ParamProc::ParamPtr::isSet() -{ - return type != vtunset; -} - -ParamProc::ParamPtr &ParamProc::ParamPtr::operator=( const char *str ) -{ - if( !isSet() ) return *this; - switch( type ) - { - case vtstr: - (*val.str) = str; - break; - - case vtuint64: - (*val.uint64) = strtoull( str, NULL, 10 ); - break; - - case vtuint32: - (*val.uint32) = strtoul( str, NULL, 10 ); - break; - - case vtuint16: - (*val.uint16) = (uint16_t)strtoul( str, NULL, 10 ); - break; - - case vtuint8: - (*val.uint8) = (uint8_t)strtoul( str, NULL, 10 ); - break; - - case vtint64: - (*val.int64) = strtoll( str, NULL, 10 ); - break; - - case vtint32: - (*val.int32) = strtol( str, NULL, 10 ); - break; - - case vtint16: - (*val.int16) = (int16_t)strtol( str, NULL, 10 ); - break; - - case vtint8: - (*val.int8) = (int8_t)strtol( str, NULL, 10 ); - break; - - case vtfloat32: - (*val.float32) = strtof( str, NULL ); - break; - - case vtfloat64: - (*val.float64) = strtod( str, NULL ); - break; - - case vtfloat96: - (*val.float96) = strtold( str, NULL ); - break; - - case vtbln: - if( strcasecmp("yes", str ) == 0 || - strcasecmp("true", str ) == 0 ) - { - (*val.bln) = true; - } - else - { - (*val.bln) = false; - } - break; - } - - return *this; -} - -ParamProc::ParamProc() -{ -} - -ParamProc::~ParamProc() -{ - for( std::list::iterator i = lArg.begin(); - i != lArg.end(); i++ ) - { - delete *i; - } - - for( std::list::iterator i = lBan.begin(); - i != lBan.end(); i++ ) - { - delete *i; - } - -} -/* -void ParamProc::addParam( const char *lpWord, char cChar, Proc proc, ParamPtr val ) -{ - printf("Calling callback...\n"); - val = "Hello there, this is set in the ParamProc"; - (this->*proc)(); -}*/ - -void ParamProc::addParam( const char *lpWord, char cChar, Proc proc, - ParamPtr val, const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - ArgSpec *as = new ArgSpec; - if( lpWord ) - as->sWord = lpWord; - - as->cChar = cChar; - as->proc = proc; - as->val = val; - if( lpDesc ) - as->sDesc = lpDesc; - if( lpExtra ) - as->sExtra = lpExtra; - if( lpValue ) - as->sValue = lpValue; - - lArg.push_back( as ); - - if( !lBan.empty() ) - { - if( lBan.back()->pBefore == NULL ) - lBan.back()->pBefore = as; - } -} - -void ParamProc::addParam( const char *lpWord, char cChar, Proc proc, - const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - addParam( lpWord, cChar, proc, ParamPtr(), lpDesc, lpExtra, lpValue ); -} - -void ParamProc::addParam( const char *lpWord, char cChar, ParamPtr val, - const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - addParam( lpWord, cChar, NULL, val, lpDesc, lpExtra, lpValue ); -} - -void ParamProc::addParam( const char *lpWord, Proc proc, ParamPtr val, - const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - addParam( lpWord, '\0', proc, val, lpDesc, lpExtra, lpValue ); -} - -void ParamProc::addParam( const char *lpWord, Proc proc, - const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - addParam( lpWord, '\0', proc, ParamPtr(), lpDesc, lpExtra, lpValue ); -} - -void ParamProc::addParam( const char *lpWord, ParamPtr val, - const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - addParam( lpWord, '\0', NULL, val, lpDesc, lpExtra, lpValue ); -} - -void ParamProc::addParam( char cChar, Proc proc, ParamPtr val, - const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - addParam( NULL, cChar, proc, val, lpDesc, lpExtra, lpValue ); -} - -void ParamProc::addParam( char cChar, Proc proc, - const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - addParam( NULL, cChar, proc, ParamPtr(), lpDesc, lpExtra, lpValue ); -} - -void ParamProc::addParam( char cChar, ParamPtr val, - const char *lpDesc, const char *lpExtra, - const char *lpValue ) -{ - addParam( NULL, cChar, NULL, val, lpDesc, lpExtra, lpValue ); -} - -void ParamProc::process( int argc, char *argv[] ) -{ - for( int arg = 1; arg < argc; arg++ ) - { - //printf(":::%d:::%s\n", arg, argv[arg] ); - if( argv[arg][0] == '-' ) - { - if( argv[arg][1] == '-' ) - { - ArgSpec *s = checkWord( argv[arg]+2 ); - if( s ) - { - if( argv[arg][s->sWord.getLength()+2] == '=' ) - { - if( s->val.isSet() ) - { - if( s->sValue.getString() == NULL ) - { - s->val = argv[arg]+s->sWord.getLength()+3; - } - else - { - s->val = s->sValue.getString(); - } - } - if( s->proc ) - { - char **tmp = new char*[argc-arg]; - tmp[0] = argv[arg]+s->sWord.getLength()+3; - for( int k = 1; k < argc-arg; k++ ) - tmp[k] = argv[arg+k]; - int ret = (this->*s->proc)( argc-arg, tmp ); - if( ret > 0 ) - { - arg += ret-1; - } - delete tmp; - } - } - else - { - int add = 0; - if( s->val.isSet() ) - { - if( s->sValue.getString() == NULL ) - { - if( arg+1 >= argc ) - { - return; - } - s->val = argv[arg+1]; - add++; - } - else - { - s->val = s->sValue.getString(); - } - } - if( s->proc ) - { - int ret = (this->*s->proc)( - argc-arg-1, argv+arg+1 ); - - if( ret > add ) - add = 0; - else - add -= ret; - arg += ret; - } - arg += add; - } - continue; - } - else - { - unknownParam( argc-arg, argv+arg ); - } - } - else - { - for( int chr = 1; argv[arg][chr]; chr++ ) - { - ArgSpec *s = checkLetr( argv[arg][chr] ); - if( s ) - { - if( argv[arg][chr+1] != '\0' ) - { - bool bUsed = false; - if( s->val.isSet() ) - { - if( s->sValue.getString() == NULL ) - { - s->val = argv[arg]+chr+1; - bUsed = true; - } - else - { - s->val = s->sValue.getString(); - } - } - if( s->proc ) - { - char **tmp = new char*[argc-arg]; - tmp[0] = argv[arg]+chr+1; - for( int k = 1; k < argc-arg; k++ ) - tmp[k] = argv[arg+k]; - int ret = (this->*s->proc)( argc-arg, tmp ); - if( ret > 0 ) - { - arg += ret - 1; - delete tmp; - break; - } - delete tmp; - } - if( bUsed ) - { - break; - } - } - else - { - bool bUsed = false; - if( s->val.isSet() ) - { - if( s->sValue.getString() == NULL ) - { - s->val = argv[arg+1]; - bUsed = true; - } - else - { - s->val = s->sValue.getString(); - } - } - if( s->proc ) - { - int ret = (this->*s->proc)( - argc-arg-1, argv+arg+1 - ); - if( ret > 0 ) - { - arg += ret; - break; - } - } - if( bUsed ) - { - arg++; - break; - } - } - } - else - { - unknownParam( argc-arg, argv+arg ); - } - } - } - } - else - { - cmdParam( argc-arg, argv+arg ); - } - } -} - -ParamProc::ArgSpec *ParamProc::checkWord( const char *arg ) -{ - //printf("Checking \"%s\"...\n", arg ); - std::list::const_iterator i; - for( i = lArg.begin(); i != lArg.end(); i++ ) - { - if( (*i)->sWord.getString() == NULL ) - continue; - - if( !strcmp( (*i)->sWord, arg ) ) - return *i; - - if( (*i)->val.isSet() ) - { - if( !strncmp( (*i)->sWord, arg, (*i)->sWord.getLength() ) && - arg[(*i)->sWord.getLength()] == '=' ) - { - return *i; - } - } - } - - return NULL; -} - -ParamProc::ArgSpec *ParamProc::checkLetr( const char arg ) -{ - //printf("Checking \'%c\'...\n", arg ); - std::list::const_iterator i; - for( i = lArg.begin(); i != lArg.end(); i++ ) - { - if( (*i)->cChar == '\0' ) - continue; - - if( (*i)->cChar == arg ) - { - return *i; - } - } - - return NULL; -} - -int ParamProc::cmdParam( int argc, char *argv[] ) -{ - printf("Unhandled command parameter \"%s\" found!\n", argv[0] ); - return 0; -} - -int ParamProc::unknownParam( int argc, char *argv[] ) -{ - printf("Unknown parameter \"%s\" found!\n", argv[0] ); - return 0; -} - -int ParamProc::help( int argc, char *argv[] ) -{ - std::list::const_iterator b = lBan.begin(); - std::list::const_iterator i; - int len=0; - for( i = lArg.begin(); i != lArg.end(); i++ ) - { - if( len < (*i)->sWord.getLength() + (*i)->sExtra.getLength() ) - len = (*i)->sWord.getLength() + (*i)->sExtra.getLength(); - } - char fmt[10]; - sprintf( fmt, "%%-%ds ", len ); - - for( i = lArg.begin(); i != lArg.end(); i++ ) - { - if( b != lBan.end() ) - { - if( (*b)->pBefore == (*i) ) - { - printf( (*b)->sBanner.getString() ); - b++; - } - } - printf(" "); - if( (*i)->cChar ) - { - if( (*i)->sWord.getString() ) - { - printf("-%c, ", (*i)->cChar ); - } - else - { - printf("-%c ", (*i)->cChar ); - } - } - else - { - printf(" "); - } - if( (*i)->sWord.getString() ) - { - printf("--"); - std::string sTmp = (*i)->sWord.getString(); - if( (*i)->sExtra.getString() ) - sTmp += (*i)->sExtra.getString(); - printf( fmt, sTmp.c_str() ); - } - else - { - printf(" "); - printf(fmt, "" ); - } - printf("%s\n", (*i)->sDesc.getString() ); - } - if( b != lBan.end() ) - { - if( (*b)->pBefore == NULL ) - { - printf( (*b)->sBanner.getString() ); - } - } - - exit( 0 ); -} - -void ParamProc::addHelpBanner( const char *sHelpBanner ) -{ - Banner *pBan = new Banner; - pBan->sBanner = sHelpBanner; - pBan->pBefore = NULL; - lBan.push_back( pBan ); -} - diff --git a/src/old/paramproc.h b/src/old/paramproc.h deleted file mode 100644 index d857193..0000000 --- a/src/old/paramproc.h +++ /dev/null @@ -1,153 +0,0 @@ -#ifndef PARAM_PROC_H -#define PARAM_PROC_H - -#include -#include -#include -#include "staticstring.h" - -class ParamProc -{ -public: - class ParamPtr - { - public: - ParamPtr(); - ParamPtr( std::string *str ); - ParamPtr( uint64_t *uint64 ); - ParamPtr( uint32_t *uint32 ); - ParamPtr( uint16_t *uint16 ); - ParamPtr( uint8_t *uint8 ); - ParamPtr( int64_t *int64 ); - ParamPtr( int32_t *int32 ); - ParamPtr( int16_t *int16 ); - ParamPtr( int8_t *int8 ); - ParamPtr( float *float32 ); - ParamPtr( double *float64 ); - ParamPtr( long double *float96 ); - ParamPtr( bool *bln ); - - enum - { - vtunset, - vtstr, - vtuint64, - vtuint32, - vtuint16, - vtuint8, - vtint64, - vtint32, - vtint16, - vtint8, - vtfloat32, - vtfloat64, - vtfloat96, - vtbln, - }; - ParamPtr &operator=( ParamPtr &ptr ); - ParamPtr &operator=( const char *str ); - - bool isSet(); - - private: - int type; - union - { - std::string *str; - uint64_t *uint64; - uint32_t *uint32; - uint16_t *uint16; - uint8_t *uint8; - int64_t *int64; - int32_t *int32; - int16_t *int16; - int8_t *int8; - float *float32; - double *float64; - long double *float96; - bool *bln; - } val; - }; - - typedef int (ParamProc::*Proc)( int, char *[] ); - - typedef struct ArgSpec - { - uint8_t nFlags; - StaticString sWord; - char cChar; - Proc proc; - ParamProc::ParamPtr val; - StaticString sExtra; - StaticString sDesc; - StaticString sValue; - } ArgSpec; - -public: - ParamProc(); - virtual ~ParamProc(); - - void addParam( const char *lpWord, char cChar, Proc proc, ParamPtr val, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - void addParam( const char *lpWord, char cChar, Proc proc, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - void addParam( const char *lpWord, char cChar, ParamPtr val, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - - void addParam( const char *lpWord, Proc proc, ParamPtr val, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - void addParam( const char *lpWord, Proc proc, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - void addParam( const char *lpWord, ParamPtr val, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - - void addParam( char cChar, Proc proc, ParamPtr val, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - void addParam( char cChar, Proc proc, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - void addParam( char cChar, ParamPtr val, - const char *lpDesc=NULL, const char *lpExtra=NULL, - const char *lpValue=NULL - ); - - void process( int argc, char *argv[] ); - void addHelpBanner( const char *sHelpBanner ); - -private: - ArgSpec *checkWord( const char *arg ); - ArgSpec *checkLetr( const char arg ); - -public: - virtual int cmdParam( int argc, char *argv[] ); - virtual int unknownParam( int argc, char *argv[] ); - virtual int help( int argc, char *argv[] ); - -private: - typedef struct Banner - { - StaticString sBanner; - ArgSpec *pBefore; - } Banner; - std::list lBan; - std::list lArg; -}; - -#define mkproc( cls ) static_cast(&cls) - -#endif diff --git a/src/paramproc.cpp b/src/paramproc.cpp new file mode 100644 index 0000000..34e973e --- /dev/null +++ b/src/paramproc.cpp @@ -0,0 +1,514 @@ +#include "paramproc.h" +#include + +#define ptrtype( iitype, iiname ) \ + Bu::ParamProc::ParamPtr::ParamPtr( iitype *iiname ) : \ + type( vt ##iiname ) { val.iiname = iiname; } + +Bu::ParamProc::ParamPtr::ParamPtr() +{ + val.str = NULL; + type = vtunset; +} + +ptrtype( std::string, str ); +ptrtype( uint64_t, uint64 ); +ptrtype( uint32_t, uint32 ); +ptrtype( uint16_t, uint16 ); +ptrtype( uint8_t, uint8 ); +ptrtype( int64_t, int64 ); +ptrtype( int32_t, int32 ); +ptrtype( int16_t, int16 ); +ptrtype( int8_t, int8 ); +ptrtype( float, float32 ); +ptrtype( double, float64 ); +ptrtype( long double, float96 ); +ptrtype( bool, bln ); + +Bu::ParamProc::ParamPtr &Bu::ParamProc::ParamPtr::operator=( ParamProc::ParamPtr &ptr ) +{ + val = ptr.val; + type = ptr.type; + + return *this; +} + +bool Bu::ParamProc::ParamPtr::isSet() +{ + return type != vtunset; +} + +Bu::ParamProc::ParamPtr &Bu::ParamProc::ParamPtr::operator=( const char *str ) +{ + if( !isSet() ) return *this; + switch( type ) + { + case vtstr: + (*val.str) = str; + break; + + case vtuint64: + (*val.uint64) = strtoull( str, NULL, 10 ); + break; + + case vtuint32: + (*val.uint32) = strtoul( str, NULL, 10 ); + break; + + case vtuint16: + (*val.uint16) = (uint16_t)strtoul( str, NULL, 10 ); + break; + + case vtuint8: + (*val.uint8) = (uint8_t)strtoul( str, NULL, 10 ); + break; + + case vtint64: + (*val.int64) = strtoll( str, NULL, 10 ); + break; + + case vtint32: + (*val.int32) = strtol( str, NULL, 10 ); + break; + + case vtint16: + (*val.int16) = (int16_t)strtol( str, NULL, 10 ); + break; + + case vtint8: + (*val.int8) = (int8_t)strtol( str, NULL, 10 ); + break; + + case vtfloat32: + (*val.float32) = strtof( str, NULL ); + break; + + case vtfloat64: + (*val.float64) = strtod( str, NULL ); + break; + + case vtfloat96: + (*val.float96) = strtold( str, NULL ); + break; + + case vtbln: + if( strcasecmp("yes", str ) == 0 || + strcasecmp("true", str ) == 0 ) + { + (*val.bln) = true; + } + else + { + (*val.bln) = false; + } + break; + } + + return *this; +} + +Bu::ParamProc::ParamProc() +{ +} + +Bu::ParamProc::~ParamProc() +{ + for( std::list::iterator i = lArg.begin(); + i != lArg.end(); i++ ) + { + delete *i; + } + + for( std::list::iterator i = lBan.begin(); + i != lBan.end(); i++ ) + { + delete *i; + } + +} +/* +void Bu::ParamProc::addParam( const char *lpWord, char cChar, Proc proc, ParamPtr val ) +{ + printf("Calling callback...\n"); + val = "Hello there, this is set in the ParamProc"; + (this->*proc)(); +}*/ + +void Bu::ParamProc::addParam( const char *lpWord, char cChar, Proc proc, + ParamPtr val, const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + ArgSpec *as = new ArgSpec; + if( lpWord ) + as->sWord = lpWord; + + as->cChar = cChar; + as->proc = proc; + as->val = val; + if( lpDesc ) + as->sDesc = lpDesc; + if( lpExtra ) + as->sExtra = lpExtra; + if( lpValue ) + as->sValue = lpValue; + + lArg.push_back( as ); + + if( !lBan.empty() ) + { + if( lBan.back()->pBefore == NULL ) + lBan.back()->pBefore = as; + } +} + +void Bu::ParamProc::addParam( const char *lpWord, char cChar, Proc proc, + const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + addParam( lpWord, cChar, proc, ParamPtr(), lpDesc, lpExtra, lpValue ); +} + +void Bu::ParamProc::addParam( const char *lpWord, char cChar, ParamPtr val, + const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + addParam( lpWord, cChar, NULL, val, lpDesc, lpExtra, lpValue ); +} + +void Bu::ParamProc::addParam( const char *lpWord, Proc proc, ParamPtr val, + const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + addParam( lpWord, '\0', proc, val, lpDesc, lpExtra, lpValue ); +} + +void Bu::ParamProc::addParam( const char *lpWord, Proc proc, + const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + addParam( lpWord, '\0', proc, ParamPtr(), lpDesc, lpExtra, lpValue ); +} + +void Bu::ParamProc::addParam( const char *lpWord, ParamPtr val, + const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + addParam( lpWord, '\0', NULL, val, lpDesc, lpExtra, lpValue ); +} + +void Bu::ParamProc::addParam( char cChar, Proc proc, ParamPtr val, + const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + addParam( NULL, cChar, proc, val, lpDesc, lpExtra, lpValue ); +} + +void Bu::ParamProc::addParam( char cChar, Proc proc, + const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + addParam( NULL, cChar, proc, ParamPtr(), lpDesc, lpExtra, lpValue ); +} + +void Bu::ParamProc::addParam( char cChar, ParamPtr val, + const char *lpDesc, const char *lpExtra, + const char *lpValue ) +{ + addParam( NULL, cChar, NULL, val, lpDesc, lpExtra, lpValue ); +} + +void Bu::ParamProc::process( int argc, char *argv[] ) +{ + for( int arg = 1; arg < argc; arg++ ) + { + //printf(":::%d:::%s\n", arg, argv[arg] ); + if( argv[arg][0] == '-' ) + { + if( argv[arg][1] == '-' ) + { + ArgSpec *s = checkWord( argv[arg]+2 ); + if( s ) + { + if( argv[arg][s->sWord.getSize()+2] == '=' ) + { + if( s->val.isSet() ) + { + if( s->sValue.getStr() == NULL ) + { + s->val = argv[arg]+s->sWord.getSize()+3; + } + else + { + s->val = s->sValue.getStr(); + } + } + if( s->proc ) + { + char **tmp = new char*[argc-arg]; + tmp[0] = argv[arg]+s->sWord.getSize()+3; + for( int k = 1; k < argc-arg; k++ ) + tmp[k] = argv[arg+k]; + int ret = (this->*s->proc)( argc-arg, tmp ); + if( ret > 0 ) + { + arg += ret-1; + } + delete tmp; + } + } + else + { + int add = 0; + if( s->val.isSet() ) + { + if( s->sValue.getStr() == NULL ) + { + if( arg+1 >= argc ) + { + return; + } + s->val = argv[arg+1]; + add++; + } + else + { + s->val = s->sValue.getStr(); + } + } + if( s->proc ) + { + int ret = (this->*s->proc)( + argc-arg-1, argv+arg+1 ); + + if( ret > add ) + add = 0; + else + add -= ret; + arg += ret; + } + arg += add; + } + continue; + } + else + { + unknownParam( argc-arg, argv+arg ); + } + } + else + { + for( int chr = 1; argv[arg][chr]; chr++ ) + { + ArgSpec *s = checkLetr( argv[arg][chr] ); + if( s ) + { + if( argv[arg][chr+1] != '\0' ) + { + bool bUsed = false; + if( s->val.isSet() ) + { + if( s->sValue.getStr() == NULL ) + { + s->val = argv[arg]+chr+1; + bUsed = true; + } + else + { + s->val = s->sValue.getStr(); + } + } + if( s->proc ) + { + char **tmp = new char*[argc-arg]; + tmp[0] = argv[arg]+chr+1; + for( int k = 1; k < argc-arg; k++ ) + tmp[k] = argv[arg+k]; + int ret = (this->*s->proc)( argc-arg, tmp ); + if( ret > 0 ) + { + arg += ret - 1; + delete tmp; + break; + } + delete tmp; + } + if( bUsed ) + { + break; + } + } + else + { + bool bUsed = false; + if( s->val.isSet() ) + { + if( s->sValue.getStr() == NULL ) + { + s->val = argv[arg+1]; + bUsed = true; + } + else + { + s->val = s->sValue.getStr(); + } + } + if( s->proc ) + { + int ret = (this->*s->proc)( + argc-arg-1, argv+arg+1 + ); + if( ret > 0 ) + { + arg += ret; + break; + } + } + if( bUsed ) + { + arg++; + break; + } + } + } + else + { + unknownParam( argc-arg, argv+arg ); + } + } + } + } + else + { + cmdParam( argc-arg, argv+arg ); + } + } +} + +Bu::ParamProc::ArgSpec *Bu::ParamProc::checkWord( const char *arg ) +{ + //printf("Checking \"%s\"...\n", arg ); + std::list::const_iterator i; + for( i = lArg.begin(); i != lArg.end(); i++ ) + { + if( (*i)->sWord.getStr() == NULL ) + continue; + + if( !strcmp( (*i)->sWord.getStr(), arg ) ) + return *i; + + if( (*i)->val.isSet() ) + { + if( !strncmp( (*i)->sWord.getStr(), arg, (*i)->sWord.getSize() ) && + arg[(*i)->sWord.getSize()] == '=' ) + { + return *i; + } + } + } + + return NULL; +} + +Bu::ParamProc::ArgSpec *Bu::ParamProc::checkLetr( const char arg ) +{ + //printf("Checking \'%c\'...\n", arg ); + std::list::const_iterator i; + for( i = lArg.begin(); i != lArg.end(); i++ ) + { + if( (*i)->cChar == '\0' ) + continue; + + if( (*i)->cChar == arg ) + { + return *i; + } + } + + return NULL; +} + +int Bu::ParamProc::cmdParam( int argc, char *argv[] ) +{ + printf("Unhandled command parameter \"%s\" found!\n", argv[0] ); + return 0; +} + +int Bu::ParamProc::unknownParam( int argc, char *argv[] ) +{ + printf("Unknown parameter \"%s\" found!\n", argv[0] ); + return 0; +} + +int Bu::ParamProc::help( int argc, char *argv[] ) +{ + std::list::const_iterator b = lBan.begin(); + std::list::const_iterator i; + int len=0; + for( i = lArg.begin(); i != lArg.end(); i++ ) + { + if( len < (*i)->sWord.getSize() + (*i)->sExtra.getSize() ) + len = (*i)->sWord.getSize() + (*i)->sExtra.getSize(); + } + char fmt[10]; + sprintf( fmt, "%%-%ds ", len ); + + for( i = lArg.begin(); i != lArg.end(); i++ ) + { + if( b != lBan.end() ) + { + if( (*b)->pBefore == (*i) ) + { + printf( (*b)->sBanner.getStr() ); + b++; + } + } + printf(" "); + if( (*i)->cChar ) + { + if( (*i)->sWord.getStr() ) + { + printf("-%c, ", (*i)->cChar ); + } + else + { + printf("-%c ", (*i)->cChar ); + } + } + else + { + printf(" "); + } + if( (*i)->sWord.getStr() ) + { + printf("--"); + std::string sTmp = (*i)->sWord.getStr(); + if( (*i)->sExtra.getStr() ) + sTmp += (*i)->sExtra.getStr(); + printf( fmt, sTmp.c_str() ); + } + else + { + printf(" "); + printf(fmt, "" ); + } + printf("%s\n", (*i)->sDesc.getStr() ); + } + if( b != lBan.end() ) + { + if( (*b)->pBefore == NULL ) + { + printf( (*b)->sBanner.getStr() ); + } + } + + exit( 0 ); +} + +void Bu::ParamProc::addHelpBanner( const char *sHelpBanner ) +{ + Banner *pBan = new Banner; + pBan->sBanner = sHelpBanner; + pBan->pBefore = NULL; + lBan.push_back( pBan ); +} + diff --git a/src/paramproc.h b/src/paramproc.h new file mode 100644 index 0000000..beee4a0 --- /dev/null +++ b/src/paramproc.h @@ -0,0 +1,156 @@ +#ifndef PARAM_PROC_H +#define PARAM_PROC_H + +#include +#include +#include +#include "bu/fstring.h" + +namespace Bu +{ + class ParamProc + { + public: + class ParamPtr + { + public: + ParamPtr(); + ParamPtr( std::string *str ); + ParamPtr( uint64_t *uint64 ); + ParamPtr( uint32_t *uint32 ); + ParamPtr( uint16_t *uint16 ); + ParamPtr( uint8_t *uint8 ); + ParamPtr( int64_t *int64 ); + ParamPtr( int32_t *int32 ); + ParamPtr( int16_t *int16 ); + ParamPtr( int8_t *int8 ); + ParamPtr( float *float32 ); + ParamPtr( double *float64 ); + ParamPtr( long double *float96 ); + ParamPtr( bool *bln ); + + enum + { + vtunset, + vtstr, + vtuint64, + vtuint32, + vtuint16, + vtuint8, + vtint64, + vtint32, + vtint16, + vtint8, + vtfloat32, + vtfloat64, + vtfloat96, + vtbln, + }; + ParamPtr &operator=( ParamPtr &ptr ); + ParamPtr &operator=( const char *str ); + + bool isSet(); + + private: + int type; + union + { + std::string *str; + uint64_t *uint64; + uint32_t *uint32; + uint16_t *uint16; + uint8_t *uint8; + int64_t *int64; + int32_t *int32; + int16_t *int16; + int8_t *int8; + float *float32; + double *float64; + long double *float96; + bool *bln; + } val; + }; + + typedef int (ParamProc::*Proc)( int, char *[] ); + + typedef struct ArgSpec + { + uint8_t nFlags; + Bu::FString sWord; + char cChar; + Proc proc; + ParamProc::ParamPtr val; + Bu::FString sExtra; + Bu::FString sDesc; + Bu::FString sValue; + } ArgSpec; + + public: + ParamProc(); + virtual ~ParamProc(); + + void addParam( const char *lpWord, char cChar, Proc proc, ParamPtr val, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + void addParam( const char *lpWord, char cChar, Proc proc, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + void addParam( const char *lpWord, char cChar, ParamPtr val, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + + void addParam( const char *lpWord, Proc proc, ParamPtr val, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + void addParam( const char *lpWord, Proc proc, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + void addParam( const char *lpWord, ParamPtr val, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + + void addParam( char cChar, Proc proc, ParamPtr val, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + void addParam( char cChar, Proc proc, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + void addParam( char cChar, ParamPtr val, + const char *lpDesc=NULL, const char *lpExtra=NULL, + const char *lpValue=NULL + ); + + void process( int argc, char *argv[] ); + void addHelpBanner( const char *sHelpBanner ); + + private: + ArgSpec *checkWord( const char *arg ); + ArgSpec *checkLetr( const char arg ); + + public: + virtual int cmdParam( int argc, char *argv[] ); + virtual int unknownParam( int argc, char *argv[] ); + virtual int help( int argc, char *argv[] ); + + private: + typedef struct Banner + { + Bu::FString sBanner; + ArgSpec *pBefore; + } Banner; + std::list lBan; + std::list lArg; + }; +} + +#define mkproc( cls ) static_cast(&cls) + +#endif diff --git a/src/stream.h b/src/stream.h index 5f586e6..fa0a606 100644 --- a/src/stream.h +++ b/src/stream.h @@ -39,6 +39,9 @@ namespace Bu virtual bool isBlocking() = 0; virtual void setBlocking( bool bBlocking=true ) = 0; + public: // Filters + + private: }; diff --git a/src/tests/bzip2.cpp b/src/tests/bzip2.cpp new file mode 100644 index 0000000..683d3d7 --- /dev/null +++ b/src/tests/bzip2.cpp @@ -0,0 +1,23 @@ +#include "bu/bzip2.h" +#include "bu/file.h" + +int main( int argc, char *argv[] ) +{ + char buf[1024]; + size_t nRead; + + Bu::File f( "test.bz2", "wb" ); + Bu::BZip2 bz2( f ); + + Bu::File fin( argv[1], "rb"); + + for(;;) + { + nRead = fin.read( buf, 1024 ); + if( nRead > 0 ) + bz2.write( buf, nRead ); + if( fin.isEOS() ) + break; + } +} + -- cgit v1.2.3 From f5352edf3dc23c044a91f1d1537fa0dc0f0babc7 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Sat, 9 Jun 2007 05:43:04 +0000 Subject: Alright, looks like the bzip2 filter can decompress just fine. It won't try to compensate for overshooting the end of the compression block yet, which it won't be able to do on streams that don't support seeking...I think I'll make it only try on stop commands, and try to re-use the buffer otherwise...maybe...it's an interesting problem since it *always* overshoots (unless you're really, really lucky...) --- src/bzip2.cpp | 37 ++++++++++++++++++++++++++++++------- src/tests/bzip2.cpp | 10 +++++----- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/bzip2.cpp b/src/bzip2.cpp index b8c0f74..433fc91 100644 --- a/src/bzip2.cpp +++ b/src/bzip2.cpp @@ -12,14 +12,11 @@ Bu::BZip2::BZip2( Bu::Stream &rNext, int nCompression ) : Bu::BZip2::~BZip2() { - printf("-> Bu::BZip2::~BZip2()\n"); stop(); } void Bu::BZip2::start() { - printf("-> Bu::BZip2::start()\n"); - printf("Hey, it's starting...\n"); bzState.state = NULL; bzState.bzalloc = NULL; bzState.bzfree = NULL; @@ -31,11 +28,11 @@ void Bu::BZip2::start() void Bu::BZip2::stop() { - printf("-> Bu::BZip2::stop()\n"); if( bzState.state ) { if( bReading ) { + BZ2_bzDecompressEnd( &bzState ); } else { @@ -81,13 +78,39 @@ size_t Bu::BZip2::read( void *pData, size_t nBytes ) if( !bzState.state ) { bReading = true; + BZ2_bzDecompressInit( &bzState, 0, 0 ); + bzState.next_in = pBuf; + bzState.avail_in = 0; } if( bReading == false ) throw ExceptionBase("This bzip2 filter is in writing mode, you can't read."); - //bzState.next_in = pData; - //bzState.avail_in = nSizeIn; + + int nRead = 0; + int nReadTotal = bzState.total_out_lo32; + for(;;) + { + bzState.next_out = (char *)pData; + bzState.avail_out = nBytes; + int ret = BZ2_bzDecompress( &bzState ); - //printf("%db at [%08X] (%db)\n", bzState.avail_in, (uint32_t)bzState.next_in, bzState.total_in_lo32 ); + nReadTotal += nRead-bzState.avail_out; + + if( ret == BZ_STREAM_END ) + { + return nBytes-bzState.avail_out; + } + + if( bzState.avail_out ) + { + nRead = rNext.read( pBuf, nBufSize ); + bzState.next_in = pBuf; + bzState.avail_in = nRead; + } + else + { + return nBytes-bzState.avail_out; + } + } return 0; } diff --git a/src/tests/bzip2.cpp b/src/tests/bzip2.cpp index 683d3d7..ef9328f 100644 --- a/src/tests/bzip2.cpp +++ b/src/tests/bzip2.cpp @@ -6,17 +6,17 @@ int main( int argc, char *argv[] ) char buf[1024]; size_t nRead; - Bu::File f( "test.bz2", "wb" ); + Bu::File f( "test.bz2", "rb" ); Bu::BZip2 bz2( f ); - Bu::File fin( argv[1], "rb"); + Bu::File fin( argv[1], "wb"); for(;;) { - nRead = fin.read( buf, 1024 ); + nRead = bz2.read( buf, 1024 ); if( nRead > 0 ) - bz2.write( buf, nRead ); - if( fin.isEOS() ) + fin.write( buf, nRead ); + if( bz2.isEOS() ) break; } } -- cgit v1.2.3 From 5f39066a4f561e9a94a6cc9293ab9b978ebf1f81 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Sun, 10 Jun 2007 21:28:14 +0000 Subject: Bunch of maintenence type things. Minor tweaks and the like. The file class has a lot more helper functions and the like, the filters give more info back to the caller, minor updates to taf. --- src/bzip2.cpp | 41 ++++++++++++++++++++++++++++++++++------- src/bzip2.h | 2 +- src/file.cpp | 31 +++++++++++++++++++++++++++++++ src/file.h | 17 ++++++++++++++++- src/filter.cpp | 7 ++++++- src/filter.h | 4 +++- src/socket.cpp | 4 ++++ src/socket.h | 2 ++ src/stream.h | 2 ++ src/tafnode.cpp | 6 +++--- src/tafnode.h | 4 ++-- src/tests/taf.cpp | 2 +- 12 files changed, 105 insertions(+), 17 deletions(-) diff --git a/src/bzip2.cpp b/src/bzip2.cpp index 433fc91..5423a10 100644 --- a/src/bzip2.cpp +++ b/src/bzip2.cpp @@ -26,16 +26,18 @@ void Bu::BZip2::start() pBuf = new char[nBufSize]; } -void Bu::BZip2::stop() +size_t Bu::BZip2::stop() { if( bzState.state ) { if( bReading ) { BZ2_bzDecompressEnd( &bzState ); + return 0; } else { + size_t sTotal = 0; for(;;) { bzState.next_in = NULL; @@ -45,14 +47,16 @@ void Bu::BZip2::stop() int res = BZ2_bzCompress( &bzState, BZ_FINISH ); if( bzState.avail_out < nBufSize ) { - rNext.write( pBuf, nBufSize-bzState.avail_out ); + sTotal += rNext.write( pBuf, nBufSize-bzState.avail_out ); } if( res == BZ_STREAM_END ) break; } BZ2_bzCompressEnd( &bzState ); + return sTotal; } } + return 0; } void Bu::BZip2::bzError( int code ) @@ -63,13 +67,35 @@ void Bu::BZip2::bzError( int code ) return; case BZ_CONFIG_ERROR: - throw ExceptionBase("The bzip2 library has been miscompiled."); + throw ExceptionBase("BZip2: Library configured improperly, reinstall."); + + case BZ_SEQUENCE_ERROR: + throw ExceptionBase("BZip2: Functions were called in an invalid sequence."); case BZ_PARAM_ERROR: - throw ExceptionBase("bzip2 parameter error."); + throw ExceptionBase("BZip2: Invalid parameter was passed into a function."); case BZ_MEM_ERROR: - throw ExceptionBase("Not enough memory available for bzip2."); + throw ExceptionBase("BZip2: Couldn't allocate sufficient memory."); + + case BZ_DATA_ERROR: + throw ExceptionBase("BZip2: Data was corrupted before decompression."); + + case BZ_DATA_ERROR_MAGIC: + throw ExceptionBase("BZip2: Stream does not appear to be bzip2 data."); + + case BZ_IO_ERROR: + throw ExceptionBase("BZip2: File couldn't be read from / written to."); + + case BZ_UNEXPECTED_EOF: + throw ExceptionBase("BZip2: End of file encountered before end of stream."); + + case BZ_OUTBUFF_FULL: + throw ExceptionBase("BZip2: Buffer not large enough to accomidate data."); + + default: + throw ExceptionBase("BZip2: Unknown error encountered."); + } } @@ -124,6 +150,7 @@ size_t Bu::BZip2::write( const void *pData, size_t nBytes ) if( bReading == true ) throw ExceptionBase("This bzip2 filter is in reading mode, you can't write."); + size_t sTotalOut = 0; bzState.next_in = (char *)pData; bzState.avail_in = nBytes; for(;;) @@ -135,12 +162,12 @@ size_t Bu::BZip2::write( const void *pData, size_t nBytes ) if( bzState.avail_out < nBufSize ) { - rNext.write( pBuf, nBufSize-bzState.avail_out ); + sTotalOut += rNext.write( pBuf, nBufSize-bzState.avail_out ); } if( bzState.avail_in == 0 ) break; } - return 0; + return sTotalOut; } diff --git a/src/bzip2.h b/src/bzip2.h index 056f336..a23f07a 100644 --- a/src/bzip2.h +++ b/src/bzip2.h @@ -18,7 +18,7 @@ namespace Bu virtual ~BZip2(); virtual void start(); - virtual void stop(); + virtual size_t stop(); virtual size_t read( void *pBuf, size_t nBytes ); virtual size_t write( const void *pBuf, size_t nBytes ); diff --git a/src/file.cpp b/src/file.cpp index 26986a5..14b6e54 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -1,6 +1,8 @@ #include "file.h" #include "exceptions.h" #include +#include +#include Bu::File::File( const char *sName, const char *sFlags ) { @@ -11,6 +13,20 @@ Bu::File::File( const char *sName, const char *sFlags ) } } +Bu::File::File( const Bu::FString &sName, const char *sFlags ) +{ + fh = fopen( sName.getStr(), sFlags ); + if( fh == NULL ) + { + throw Bu::FileException( errno, strerror(errno) ); + } +} + +Bu::File::File( int fd, const char *sFlags ) +{ + fh = fdopen( fd, sFlags ); +} + Bu::File::~File() { close(); @@ -108,3 +124,18 @@ void Bu::File::setBlocking( bool bBlocking ) return; } +void Bu::File::truncate( long nSize ) +{ + ftruncate( fileno( fh ), nSize ); +} + +void Bu::File::flush() +{ + fflush( fh ); +} + +void Bu::File::chmod( mode_t t ) +{ + fchmod( fileno( fh ), t ); +} + diff --git a/src/file.h b/src/file.h index ee3fdb3..8107a1b 100644 --- a/src/file.h +++ b/src/file.h @@ -3,7 +3,8 @@ #include -#include "stream.h" +#include "bu/stream.h" +#include "bu/fstring.h" namespace Bu { @@ -11,6 +12,8 @@ namespace Bu { public: File( const char *sName, const char *sFlags ); + File( const Bu::FString &sName, const char *sFlags ); + File( int fd, const char *sFlags ); virtual ~File(); virtual void close(); @@ -23,6 +26,8 @@ namespace Bu virtual void setPosEnd( long pos ); virtual bool isEOS(); + virtual void flush(); + virtual bool canRead(); virtual bool canWrite(); virtual bool canSeek(); @@ -30,6 +35,16 @@ namespace Bu virtual bool isBlocking(); virtual void setBlocking( bool bBlocking=true ); + inline static Bu::File tempFile( Bu::FString &sName, const char *sFlags ) + { + int afh_d = mkstemp( sName.getStr() ); + + return Bu::File( afh_d, sFlags ); + } + + void truncate( long nSize ); + void chmod( mode_t t ); + private: FILE *fh; diff --git a/src/filter.cpp b/src/filter.cpp index d3faa00..693fb9f 100644 --- a/src/filter.cpp +++ b/src/filter.cpp @@ -7,7 +7,7 @@ Bu::Filter::Filter( Bu::Stream &rNext ) : Bu::Filter::~Filter() { - printf("-> Bu::Filter::~Filter()\n"); + //printf("-> Bu::Filter::~Filter()\n"); } /* void Bu::Filter::start() @@ -75,3 +75,8 @@ void Bu::Filter::setBlocking( bool bBlocking ) rNext.setBlocking( bBlocking ); } +void Bu::Filter::flush() +{ + rNext.flush(); +} + diff --git a/src/filter.h b/src/filter.h index b068206..088d46e 100644 --- a/src/filter.h +++ b/src/filter.h @@ -33,7 +33,7 @@ namespace Bu virtual ~Filter(); virtual void start()=0; - virtual void stop()=0; + virtual size_t stop()=0; virtual void close(); virtual long tell(); virtual void seek( long offset ); @@ -41,6 +41,8 @@ namespace Bu virtual void setPosEnd( long pos ); virtual bool isEOS(); + virtual void flush(); + virtual bool canRead(); virtual bool canWrite(); virtual bool canSeek(); diff --git a/src/socket.cpp b/src/socket.cpp index 441678a..1832898 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -240,3 +240,7 @@ void Bu::Socket::setBlocking( bool bBlocking ) { } +void Bu::Socket::flush() +{ +} + diff --git a/src/socket.h b/src/socket.h index e65eb74..30a43fb 100644 --- a/src/socket.h +++ b/src/socket.h @@ -29,6 +29,8 @@ namespace Bu virtual void setPosEnd( long pos ); virtual bool isEOS(); + virtual void flush(); + virtual bool canRead(); virtual bool canWrite(); virtual bool canSeek(); diff --git a/src/stream.h b/src/stream.h index fa0a606..a80586b 100644 --- a/src/stream.h +++ b/src/stream.h @@ -32,6 +32,8 @@ namespace Bu virtual void setPosEnd( long pos ) = 0; virtual bool isEOS() = 0; + virtual void flush() = 0; + virtual bool canRead() = 0; virtual bool canWrite() = 0; virtual bool canSeek() = 0; diff --git a/src/tafnode.cpp b/src/tafnode.cpp index 3060606..b9a4a24 100644 --- a/src/tafnode.cpp +++ b/src/tafnode.cpp @@ -45,7 +45,7 @@ const Bu::TafNode::PropList &Bu::TafNode::getProperties( const Bu::FString &sNam return hProp.get( sName ); } -const Bu::TafNode::NodeList &Bu::TafNode::getNodes( const Bu::FString &sName ) const +const Bu::TafNode::NodeList &Bu::TafNode::getChildren( const Bu::FString &sName ) const { return hChildren.get( sName ); } @@ -55,9 +55,9 @@ const Bu::FString &Bu::TafNode::getProperty( const Bu::FString &sName ) const return getProperties( sName ).first(); } -const Bu::TafNode *Bu::TafNode::getNode( const Bu::FString &sName ) const +const Bu::TafNode *Bu::TafNode::getChild( const Bu::FString &sName ) const { - return getNodes( sName ).first(); + return getChildren( sName ).first(); } void Bu::TafNode::setName( const Bu::FString &sName ) diff --git a/src/tafnode.h b/src/tafnode.h index 10232d2..08f78e8 100644 --- a/src/tafnode.h +++ b/src/tafnode.h @@ -28,9 +28,9 @@ namespace Bu void setProperty( Bu::FString sName, Bu::FString sValue ); const Bu::FString &getProperty( const Bu::FString &sName ) const; - const TafNode *getNode( const Bu::FString &sName ) const; const PropList &getProperties( const Bu::FString &sName ) const; - const NodeList &getNodes( const Bu::FString &sName ) const; + const TafNode *getChild( const Bu::FString &sName ) const; + const NodeList &getChildren( const Bu::FString &sName ) const; void addChild( TafNode *pNode ); private: diff --git a/src/tests/taf.cpp b/src/tests/taf.cpp index e7bad52..d135e78 100644 --- a/src/tests/taf.cpp +++ b/src/tests/taf.cpp @@ -8,7 +8,7 @@ int main() Bu::TafNode *pNode = tr.getNode(); - const Bu::TafNode *pStats = pNode->getNode("stats"); + const Bu::TafNode *pStats = pNode->getChild("stats"); printf("%s\n", pStats->getName().getStr() ); printf(" str = %s\n", pStats->getProperty("str").getStr() ); -- cgit v1.2.3 From 408aca47fd423e7c4c38665b892a13c1c9fb1e9a Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Mon, 11 Jun 2007 07:31:52 +0000 Subject: Few minor tweaks to bzip2, it reports errors now...and there's a bug in odpm that could be in this, but it's going to be hard to tell... --- src/bzip2.cpp | 31 +++++++++++++++++++++++++++---- src/tests/bzip2.cpp | 10 +++++----- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/src/bzip2.cpp b/src/bzip2.cpp index 5423a10..6bb1429 100644 --- a/src/bzip2.cpp +++ b/src/bzip2.cpp @@ -64,6 +64,13 @@ void Bu::BZip2::bzError( int code ) switch( code ) { case BZ_OK: + printf("\n"); return; + case BZ_RUN_OK: + printf("\n"); return; + case BZ_FLUSH_OK: + printf("\n"); return; + case BZ_FINISH_OK: + printf("\n"); return; return; case BZ_CONFIG_ERROR: @@ -117,20 +124,36 @@ size_t Bu::BZip2::read( void *pData, size_t nBytes ) { bzState.next_out = (char *)pData; bzState.avail_out = nBytes; + printf(" (pre) in: %db, out: %db\n", bzState.avail_in, bzState.avail_out ); int ret = BZ2_bzDecompress( &bzState ); + printf("(post) in: %db, out: %db\n", bzState.avail_in, bzState.avail_out ); nReadTotal += nRead-bzState.avail_out; if( ret == BZ_STREAM_END ) { + printf("\n"); + if( bzState.avail_in > 0 ) + { + if( rNext.canSeek() ) + { + rNext.seek( -bzState.avail_in ); + } + } return nBytes-bzState.avail_out; } + bzError( ret ); if( bzState.avail_out ) { - nRead = rNext.read( pBuf, nBufSize ); - bzState.next_in = pBuf; - bzState.avail_in = nRead; + printf("Still more to fill, in: %db, out: %db\n", bzState.avail_in, bzState.avail_out ); + + if( bzState.avail_in == 0 ) + { + nRead = rNext.read( pBuf, nBufSize ); + bzState.next_in = pBuf; + bzState.avail_in = nRead; + } } else { @@ -158,7 +181,7 @@ size_t Bu::BZip2::write( const void *pData, size_t nBytes ) bzState.avail_out = nBufSize; bzState.next_out = pBuf; - BZ2_bzCompress( &bzState, BZ_RUN ); + bzError( BZ2_bzCompress( &bzState, BZ_RUN ) ); if( bzState.avail_out < nBufSize ) { diff --git a/src/tests/bzip2.cpp b/src/tests/bzip2.cpp index ef9328f..683d3d7 100644 --- a/src/tests/bzip2.cpp +++ b/src/tests/bzip2.cpp @@ -6,17 +6,17 @@ int main( int argc, char *argv[] ) char buf[1024]; size_t nRead; - Bu::File f( "test.bz2", "rb" ); + Bu::File f( "test.bz2", "wb" ); Bu::BZip2 bz2( f ); - Bu::File fin( argv[1], "wb"); + Bu::File fin( argv[1], "rb"); for(;;) { - nRead = bz2.read( buf, 1024 ); + nRead = fin.read( buf, 1024 ); if( nRead > 0 ) - fin.write( buf, nRead ); - if( bz2.isEOS() ) + bz2.write( buf, nRead ); + if( fin.isEOS() ) break; } } -- cgit v1.2.3 From 55244c8fd50dfda9c7c434cd05fc6280204447dd Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Mon, 11 Jun 2007 07:58:18 +0000 Subject: Wow that was a stupid bug. OK, decompression is working really well, and it corrects the underlying stream's position if it can seek, otherwise you just lose data (for now). --- src/bzip2.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/bzip2.cpp b/src/bzip2.cpp index 6bb1429..d3f237a 100644 --- a/src/bzip2.cpp +++ b/src/bzip2.cpp @@ -64,13 +64,9 @@ void Bu::BZip2::bzError( int code ) switch( code ) { case BZ_OK: - printf("\n"); return; case BZ_RUN_OK: - printf("\n"); return; case BZ_FLUSH_OK: - printf("\n"); return; case BZ_FINISH_OK: - printf("\n"); return; return; case BZ_CONFIG_ERROR: @@ -120,19 +116,16 @@ size_t Bu::BZip2::read( void *pData, size_t nBytes ) int nRead = 0; int nReadTotal = bzState.total_out_lo32; + bzState.next_out = (char *)pData; + bzState.avail_out = nBytes; for(;;) { - bzState.next_out = (char *)pData; - bzState.avail_out = nBytes; - printf(" (pre) in: %db, out: %db\n", bzState.avail_in, bzState.avail_out ); int ret = BZ2_bzDecompress( &bzState ); - printf("(post) in: %db, out: %db\n", bzState.avail_in, bzState.avail_out ); nReadTotal += nRead-bzState.avail_out; if( ret == BZ_STREAM_END ) { - printf("\n"); if( bzState.avail_in > 0 ) { if( rNext.canSeek() ) @@ -146,8 +139,6 @@ size_t Bu::BZip2::read( void *pData, size_t nBytes ) if( bzState.avail_out ) { - printf("Still more to fill, in: %db, out: %db\n", bzState.avail_in, bzState.avail_out ); - if( bzState.avail_in == 0 ) { nRead = rNext.read( pBuf, nBufSize ); -- cgit v1.2.3 From 7ba47b5b688afd7e04b38a3e0e4aa018c10a9a59 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Mon, 11 Jun 2007 16:03:46 +0000 Subject: Corrected another issue with the prefix * iterator operator in Bu::Hash, it was still trying to use a pair internally. Also added more helpers to FString. --- src/fstring.h | 19 ++++++++++++++----- src/hash.h | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/fstring.h b/src/fstring.h index d0307b5..7dda87c 100644 --- a/src/fstring.h +++ b/src/fstring.h @@ -138,6 +138,11 @@ namespace Bu append( &cData, 1 ); } + void prepend( const MyType & sData ) + { + prepend( sData.getStr(), sData.getSize() ); + } + void prepend( const chr *pData ) { long nLen; @@ -413,17 +418,21 @@ namespace Bu clear(); long nLen; ar >> nLen; - - Chunk *pNew = newChunk( nLen ); - ar.read( pNew->pData, nLen*sizeof(chr) ); - appendChunk( pNew ); + + if( nLen > 0 ) + { + Chunk *pNew = newChunk( nLen ); + ar.read( pNew->pData, nLen*sizeof(chr) ); + appendChunk( pNew ); + } } else { flatten(); ar << nLength; - ar.write( pFirst->pData, nLength*sizeof(chr) ); + if( nLength ) + ar.write( pFirst->pData, nLength*sizeof(chr) ); } } diff --git a/src/hash.h b/src/hash.h index f6c207f..1bb25c9 100644 --- a/src/hash.h +++ b/src/hash.h @@ -458,7 +458,7 @@ namespace Bu value &operator *() { - return hsh.getAtPos( nPos ); + return hsh.getValueAtPos( nPos ); } key &getKey() -- cgit v1.2.3 From b6f50f249ba3b18c597531a2d5dbc45f7bfa3eaa Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Mon, 11 Jun 2007 21:58:10 +0000 Subject: Another few fixes for zero-length strings in fstring. --- src/fstring.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/fstring.h b/src/fstring.h index 7dda87c..93a0042 100644 --- a/src/fstring.h +++ b/src/fstring.h @@ -117,6 +117,8 @@ namespace Bu { long nLen; for( nLen = 0; pData[nLen] != (chr)0; nLen++ ); + if( nLen == 0 ) + return; Chunk *pNew = newChunk( nLen ); cpy( pNew->pData, pData, nLen ); @@ -126,6 +128,9 @@ namespace Bu void append( const chr *pData, long nLen ) { + if( nLen == 0 ) + return; + Chunk *pNew = newChunk( nLen ); cpy( pNew->pData, pData, nLen ); @@ -235,6 +240,8 @@ namespace Bu MyType &operator +=( const MyType &rSrc ) { + if( rSrc.nLength == 0 ) + return (*this); rSrc.flatten(); append( rSrc.pFirst->pData, rSrc.nLength ); @@ -612,6 +619,8 @@ namespace Bu { if( isShared() == false ) return; + if( pFirst == NULL ) + return; Chunk *pNew = newChunk( nLength ); chr *pos = pNew->pData; -- cgit v1.2.3 From 4cb166570a8e2e97216bf6c7aeb99b971ff58ad7 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Tue, 12 Jun 2007 01:28:27 +0000 Subject: Moved out the xml system again. I think that if I am going to do it again, I'm going to do it over from scratch, that was just painful. Also, started in again on the server system, it's looking pretty good, already got connections working, next up is managing data flow through clients and protocols! --- src/client.cpp | 1 + src/file.cpp | 4 +- src/old/xmldocument.cpp | 145 ++++++++++++ src/old/xmldocument.h | 165 +++++++++++++ src/old/xmlnode.cpp | 403 ++++++++++++++++++++++++++++++++ src/old/xmlnode.h | 207 +++++++++++++++++ src/old/xmlreader.cpp | 604 ++++++++++++++++++++++++++++++++++++++++++++++++ src/old/xmlreader.h | 144 ++++++++++++ src/old/xmlwriter.cpp | 167 +++++++++++++ src/old/xmlwriter.h | 96 ++++++++ src/server.cpp | 7 +- src/server.h | 9 +- src/serversocket.cpp | 5 + src/serversocket.h | 1 + src/xmldocument.cpp | 145 ------------ src/xmldocument.h | 165 ------------- src/xmlnode.cpp | 403 -------------------------------- src/xmlnode.h | 207 ----------------- src/xmlreader.cpp | 604 ------------------------------------------------ src/xmlreader.h | 144 ------------ src/xmlwriter.cpp | 167 ------------- src/xmlwriter.h | 96 -------- 22 files changed, 1953 insertions(+), 1936 deletions(-) create mode 100644 src/old/xmldocument.cpp create mode 100644 src/old/xmldocument.h create mode 100644 src/old/xmlnode.cpp create mode 100644 src/old/xmlnode.h create mode 100644 src/old/xmlreader.cpp create mode 100644 src/old/xmlreader.h create mode 100644 src/old/xmlwriter.cpp create mode 100644 src/old/xmlwriter.h delete mode 100644 src/xmldocument.cpp delete mode 100644 src/xmldocument.h delete mode 100644 src/xmlnode.cpp delete mode 100644 src/xmlnode.h delete mode 100644 src/xmlreader.cpp delete mode 100644 src/xmlreader.h delete mode 100644 src/xmlwriter.cpp delete mode 100644 src/xmlwriter.h diff --git a/src/client.cpp b/src/client.cpp index a048ca3..a33cdc3 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -7,3 +7,4 @@ Bu::Client::Client() Bu::Client::~Client() { } + diff --git a/src/file.cpp b/src/file.cpp index 14b6e54..2965afa 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -48,8 +48,8 @@ size_t Bu::File::read( void *pBuf, size_t nBytes ) int nAmnt = fread( pBuf, 1, nBytes, fh ); - if( nAmnt == 0 ) - throw FileException("End of file."); + //if( nAmnt == 0 ) + // throw FileException("End of file."); return nAmnt; } diff --git a/src/old/xmldocument.cpp b/src/old/xmldocument.cpp new file mode 100644 index 0000000..95b9788 --- /dev/null +++ b/src/old/xmldocument.cpp @@ -0,0 +1,145 @@ +#include +#include +#include "xmldocument.h" + +XmlDocument::XmlDocument( XmlNode *pRoot ) +{ + this->pRoot = pRoot; + pCurrent = NULL; + bCompleted = (pRoot!=NULL); +} + +XmlDocument::~XmlDocument() +{ + if( pRoot ) + { + delete pRoot; + } +} + +void XmlDocument::addNode( const Bu::FString &sName ) +{ + if( pRoot == NULL ) + { + // This is the first node, so ignore position and just insert it. + pCurrent = pRoot = new XmlNode( sName ); + } + else + { + pCurrent = pCurrent->addChild( sName ); + } +} +/* +void XmlDocument::setName( const char *sName ) +{ + pCurrent->setName( sName ); +}*/ + +bool XmlDocument::isCompleted() +{ + return bCompleted; +} + +XmlNode *XmlDocument::getRoot() +{ + return pRoot; +} + +XmlNode *XmlDocument::detatchRoot() +{ + XmlNode *pTemp = pRoot; + pRoot = NULL; + return pTemp; +} + +XmlNode *XmlDocument::getCurrent() +{ + return pCurrent; +} + +void XmlDocument::closeNode() +{ + if( pCurrent != NULL ) + { + pCurrent = pCurrent->getParent(); + + if( pCurrent == NULL ) + { + bCompleted = true; + } + } +} + +void XmlDocument::addProperty( const char *sName, const char *sValue ) +{ + if( pCurrent ) + { + pCurrent->addProperty( sName, sValue ); + } +} + +void XmlDocument::addProperty( const char *sName, const unsigned char nValue ) +{ + char buf[12]; + sprintf( buf, "%hhi", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const char nValue ) +{ + char buf[12]; + sprintf( buf, "%hhi", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const unsigned short nValue ) +{ + char buf[12]; + sprintf( buf, "%hi", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const short nValue ) +{ + char buf[12]; + sprintf( buf, "%hi", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const int nValue ) +{ + char buf[12]; + sprintf( buf, "%d", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const unsigned long nValue ) +{ + char buf[12]; + sprintf( buf, "%li", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const long nValue ) +{ + char buf[12]; + sprintf( buf, "%li", nValue ); + addProperty( sName, buf ); +} + +void XmlDocument::addProperty( const char *sName, const double dValue ) +{ + char buf[40]; + sprintf( buf, "%f", dValue ); + addProperty( sName, buf ); +} + +void XmlDocument::setContent( const char *sContent ) +{ + if( pCurrent ) + { + printf("XmlDocument::setContent: not yet implemented.\n"); + //pCurrent->setContent( sContent ); + } +} + diff --git a/src/old/xmldocument.h b/src/old/xmldocument.h new file mode 100644 index 0000000..e0c36eb --- /dev/null +++ b/src/old/xmldocument.h @@ -0,0 +1,165 @@ +#ifndef XMLDOCUMENT +#define XMLDOCUMENT + +#include "xmlnode.h" + +/** + * Keeps track of an easily managed set of XmlNode information. Allows simple + * operations for logical writing to and reading from XML structures. Using + * already formed structures is simply done through the XmlNode structures, + * and the getRoot function here. Creation is performed through a simple set + * of operations that creates the data in a stream type format. + *@author Mike Buland + */ +class XmlDocument +{ +public: + /** + * Construct either a blank XmlDocuemnt or construct a document around an + * existing XmlNode. Be careful, once an XmlNode is passed into a document + * the document takes over ownership and will delete it when the XmlDocument + * is deleted. + *@param pRoot The XmlNode to use as the root of this document, or NULL if + * you want to start a new document. + */ + XmlDocument( XmlNode *pRoot=NULL ); + + /** + * Destroy all contained nodes. + */ + virtual ~XmlDocument(); + + /** + * Add a new node to the document. The new node is appended to the end of + * the current context, i.e. XmlNode, and the new node, provided it isn't + * close as part of this operation, will become the current context. + *@param sName The name of the new node to add. + *@param sContent A content string to be placed inside of the new node. + *@param bClose Set this to true to close the node immediately after adding + * the node and setting the content and name. If this is set to true the + * node is appended, but the context node doesn't change. + */ + void addNode( const Bu::FString &sName ); + + /** + * Close the current node context. This will move the current context to + * the parent node of the former current node. If the current node was the + * root then the "completed" flag is set and no more operations are allowed. + */ + void closeNode(); + + /** + * Change the content of the current node at the current position between + * nodes. + *@param sContent The new content of the current node. + */ + void setContent( const char *sContent ); + + /** + * Add a named property to the current context node. + *@param sName The name of the property to add. + *@param sValue The string value of the property. + */ + void addProperty( const char *sName, const char *sValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const unsigned char nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const char nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const unsigned short nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const short nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const unsigned long nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const long nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param nValue The numerical value to add. + */ + void addProperty( const char *sName, const int nValue ); + + /** + * Add a named property to the current context node, converting the + * numerical parameter to text using standrd printf style conversion. + *@param sName The name of the property to add. + *@param dValue The numerical value to add. + */ + void addProperty( const char *sName, const double dValue ); + + /** + * The XmlDocuemnt is considered completed if the root node has been closed. + * Once an XmlDocument has been completed, you can no longer perform + * operations on it. + *@return True if completed, false if still in progress. + */ + bool isCompleted(); + + /** + * Get a pointer to the root object of this XmlDocument. + *@returns A pointer to an internally owned XmlNode. Do not delete this + * XmlNode. + */ + XmlNode *getRoot(); + + /** + * Get a pointer to the root object of this XmlDocument, and remove the + * ownership from this object. + *@returns A pointer to an internally owned XmlNode. Do not delete this + * XmlNode. + */ + XmlNode *detatchRoot(); + + /** + * Get the current context node, which could be the same as the root node. + *@returns A pointer to an internally owned XmlNode. Do not delete this + * XmlNode. + */ + XmlNode *getCurrent(); + +private: + XmlNode *pRoot; /**< The root node. */ + XmlNode *pCurrent; /**< The current node. */ + bool bCompleted; /**< Is it completed? */ +}; + +#endif diff --git a/src/old/xmlnode.cpp b/src/old/xmlnode.cpp new file mode 100644 index 0000000..96d5850 --- /dev/null +++ b/src/old/xmlnode.cpp @@ -0,0 +1,403 @@ +#include "xmlnode.h" + +XmlNode::XmlNode( const Bu::FString &sName, XmlNode *pParent ) : + sName( sName ), + pParent( pParent ) +{ +} + +XmlNode::~XmlNode() +{ +} +/* +void XmlNode::setName( const char *sName ) +{ + if( pParent ) + { + if( this->sName.size() == 0 ) + { + // We're not in the hash yet, so add us + this->sName = sName; + pParent->hChildren.insert( this->sName.c_str(), this ); + } + else + { + // Slightly more tricky, delete us, then add us... + pParent->hChildren.del( this->sName.c_str() ); + this->sName = sName; + pParent->hChildren.insert( this->sName.c_str(), this ); + } + } + else + { + // If we have no parent, then just set the name string, we don't need + // to worry about hashing. + this->sName = sName; + } +} + +void XmlNode::setContent( const char *sContent, int nIndex ) +{ + if( nIndex == -1 ) + { + nIndex = nCurContent; + } + if( nIndex == 0 ) + { + if( this->sPreContent ) + { + delete this->sPreContent; + } + + this->sPreContent = new std::string( sContent ); + } + else + { + nIndex--; + if( lPostContent[nIndex] ) + { + delete (std::string *)lPostContent[nIndex]; + } + + lPostContent.setAt( nIndex, new std::string( sContent ) ); + } +} + +const char *XmlNode::getContent( int nIndex ) +{ + if( nIndex == 0 ) + { + if( sPreContent ) + { + return sPreContent->c_str(); + } + } + else + { + nIndex--; + if( lPostContent[nIndex] ) + { + return ((std::string *)lPostContent[nIndex])->c_str(); + } + } + + return NULL; +}*/ + +XmlNode *XmlNode::addChild( const Bu::FString &sName ) +{ + return addChild( new XmlNode( sName, this ) ); +} + +XmlNode *XmlNode::addChild( XmlNode *pNode ) +{ + Child c = { typeNode }; + c.pNode = pNode; + lChildren.append( c ); + pNode->pParent = this; + + return pNode; +} + +XmlNode *XmlNode::getParent() +{ + return pParent; +} + +void XmlNode::addProperty( const Bu::FString &sName, const Bu::FString &sValue ) +{ + hProperties.insert( sName, sValue ); +} + +int XmlNode::getNumProperties() +{ + return hProperties.size(); +} +/* +const char *XmlNode::getPropertyName( int nIndex ) +{ + std::string *tmp = ((std::string *)lPropNames[nIndex]); + if( tmp == NULL ) + return NULL; + return tmp->c_str(); +} + +const char *XmlNode::getProperty( int nIndex ) +{ + std::string *tmp = ((std::string *)lPropValues[nIndex]); + if( tmp == NULL ) + return NULL; + return tmp->c_str(); +} +*/ +Bu::FString XmlNode::getProperty( const Bu::FString &sName ) +{ + return hProperties[sName]; +} +/* +void XmlNode::deleteProperty( int nIndex ) +{ + hProperties.del( ((std::string *)lPropNames[nIndex])->c_str() ); + + delete (std::string *)lPropNames[nIndex]; + delete (std::string *)lPropValues[nIndex]; + + lPropNames.deleteAt( nIndex ); + lPropValues.deleteAt( nIndex ); +} + +bool XmlNode::hasChildren() +{ + return hChildren.getSize()>0; +}*/ + +int XmlNode::getNumChildren() +{ + return lChildren.getSize(); +} +/* +XmlNode *XmlNode::getChild( int nIndex ) +{ + return (XmlNode *)lChildren[nIndex]; +} +*/ +XmlNode *XmlNode::getChild( const Bu::FString &sName, int nSkip ) +{ + if( !hChildren.has( sName ) ) + return NULL; + + Bu::List::iterator i = hChildren[sName]->begin(); + return *i; +} + +Bu::FString XmlNode::getName() +{ + return sName; +} +/* +void XmlNode::deleteNode( int nIndex, const char *sReplacementText ) +{ + XmlNode *xRet = detatchNode( nIndex, sReplacementText ); + + if( xRet != NULL ) + { + delete xRet; + } +} + +XmlNode *XmlNode::detatchNode( int nIndex, const char *sReplacementText ) +{ + if( nIndex < 0 || nIndex >= lChildren.getSize() ) + return NULL; + + // The real trick when deleteing a node isn't actually deleting it, it's + // reforming the content around the node that's now missing...hmmm... + + if( nIndex == 0 ) + { + // If the index is zero we have to deal with the pre-content + if( sReplacementText ) + { + if( sPreContent == NULL ) + { + sPreContent = new std::string( sReplacementText ); + } + else + { + *sPreContent += sReplacementText; + } + } + if( lPostContent.getSize() > 0 ) + { + if( lPostContent[0] != NULL ) + { + if( sPreContent == NULL ) + { + sPreContent = new std::string( + ((std::string *)lPostContent[0])->c_str() + ); + } + else + { + *sPreContent += + ((std::string *)lPostContent[0])->c_str(); + } + } + delete (std::string *)lPostContent[0]; + lPostContent.deleteAt( 0 ); + } + } + else + { + int nCont = nIndex-1; + // If it's above zero we deal with the post-content only + if( sReplacementText ) + { + if( lPostContent[nCont] == NULL ) + { + lPostContent.setAt( nCont, new std::string( sReplacementText ) ); + } + else + { + *((std::string *)lPostContent[nCont]) += sReplacementText; + } + } + if( lPostContent.getSize() > nIndex ) + { + if( lPostContent[nIndex] != NULL ) + { + if( lPostContent[nCont] == NULL ) + { + lPostContent.setAt( nCont, new std::string( + ((std::string *)lPostContent[nIndex])->c_str() + ) ); + } + else + { + *((std::string *)lPostContent[nCont]) += + ((std::string *)lPostContent[nIndex])->c_str(); + } + } + delete (std::string *)lPostContent[nIndex]; + lPostContent.deleteAt( nIndex ); + } + } + + XmlNode *xRet = (XmlNode *)lChildren[nIndex]; + hChildren.del( ((XmlNode *)lChildren[nIndex])->getName() ); + lChildren.deleteAt( nIndex ); + + return xRet; +} + +void XmlNode::replaceNode( int nIndex, XmlNode *pNewNode ) +{ + if( nIndex < 0 || nIndex >= lChildren.getSize() ) + return; //TODO: throw an exception + + delete (XmlNode *)lChildren[nIndex]; + lChildren.setAt( nIndex, pNewNode ); + pNewNode->pParent = this; +} + +XmlNode *XmlNode::getCopy() +{ + XmlNode *pNew = new XmlNode(); + + pNew->sName = sName; + if( sPreContent ) + { + pNew->sPreContent = new std::string( sPreContent->c_str() ); + } + else + { + pNew->sPreContent = NULL; + } + pNew->nCurContent = 0; + + int nSize = lPostContent.getSize(); + pNew->lPostContent.setSize( nSize ); + for( int j = 0; j < nSize; j++ ) + { + if( lPostContent[j] ) + { + pNew->lPostContent.setAt( + j, new std::string( + ((std::string *)lPostContent[j])->c_str() + ) + ); + } + else + { + pNew->lPostContent.setAt( j, NULL ); + } + } + + nSize = lChildren.getSize(); + pNew->lChildren.setSize( nSize ); + for( int j = 0; j < nSize; j++ ) + { + XmlNode *pChild = ((XmlNode *)lChildren[j])->getCopy(); + pNew->lChildren.setAt( j, pChild ); + pChild->pParent = pNew; + pNew->hChildren.insert( pChild->getName(), pChild ); + } + + nSize = lPropNames.getSize(); + pNew->lPropNames.setSize( nSize ); + pNew->lPropValues.setSize( nSize ); + for( int j = 0; j < nSize; j++ ) + { + std::string *pProp = new std::string( ((std::string *)lPropNames[j])->c_str() ); + std::string *pVal = new std::string( ((std::string *)lPropValues[j])->c_str() ); + pNew->lPropNames.setAt( j, pProp ); + pNew->lPropValues.setAt( j, pVal ); + pNew->hProperties.insert( pProp->c_str(), pVal->c_str() ); + pNew->nCurContent++; + } + + return pNew; +} + +void XmlNode::deleteNodeKeepChildren( int nIndex ) +{ + // This is a tricky one...we need to do some patching to keep things all + // even... + XmlNode *xRet = (XmlNode *)lChildren[nIndex]; + + if( xRet == NULL ) + { + return; + } + else + { + if( getContent( nIndex ) ) + { + std::string sBuf( getContent( nIndex ) ); + sBuf += xRet->getContent( 0 ); + setContent( sBuf.c_str(), nIndex ); + } + else + { + setContent( xRet->getContent( 0 ), nIndex ); + } + + int nSize = xRet->lChildren.getSize(); + for( int j = 0; j < nSize; j++ ) + { + XmlNode *pCopy = ((XmlNode *)xRet->lChildren[j])->getCopy(); + pCopy->pParent = this; + lChildren.insertBefore( pCopy, nIndex+j ); + + if( xRet->lPostContent[j] ) + { + lPostContent.insertBefore( + new std::string( ((std::string *)xRet->lPostContent[j])->c_str() ), + nIndex+j + ); + } + else + { + lPostContent.insertBefore( NULL, nIndex+j ); + } + } + + if( getContent( nIndex+nSize ) ) + { + //SString sBuf( getContent( nIndex+nSize ) ); + //sBuf.catfrom( xRet->getContent( nSize ) ); + //setContent( sBuf, nIndex+nSize ); + } + else + { + setContent( xRet->getContent( nSize ), nIndex+nSize ); + } + + deleteNode( nIndex+nSize ); + } +} + +void XmlNode::replaceNodeWithChildren( int nIndex, XmlNode *pNewNode ) +{ +} +*/ diff --git a/src/old/xmlnode.h b/src/old/xmlnode.h new file mode 100644 index 0000000..c895cd8 --- /dev/null +++ b/src/old/xmlnode.h @@ -0,0 +1,207 @@ +#ifndef XMLNODE +#define XMLNODE + +#include +#include "bu/list.h" +#include "bu/hash.h" +#include "bu/fstring.h" + +/** + * Maintains all data pertient to an XML node, including sub-nodes and content. + * All child nodes can be accessed through index and through name via a hash + * table. This makes it very easy to gain simple and fast access to all of + * your data. For most applications, the memory footprint is also rather + * small. While XmlNode objects can be used directly to create XML structures + * it is highly reccomended that all operations be performed through the + * XmlDocument class. + *@author Mike Buland + */ +class XmlNode +{ +public: + /** + * Construct a new XmlNode. + *@param sName The name of the node. + *@param pParent The parent node. + *@param sContent The initial content string. + */ + XmlNode( + const Bu::FString &sName, + XmlNode *pParent=NULL + ); + + /** + * Delete the node and cleanup all memory. + */ + virtual ~XmlNode(); + + /** + * Change the name of the node. + *@param sName The new name of the node. + */ + //void setName( const char *sName ); + + /** + * Construct a new node and add it as a child to this node, also return a + * pointer to the newly constructed node. + *@param sName The name of the new node. + *@param sContent The initial content of the new node. + *@returns A pointer to the newly created child node. + */ + XmlNode *addChild( const Bu::FString &sName ); + + /** + * Add an already created XmlNode as a child to this node. The new child + * XmlNode's parent will be changed appropriately and the parent XmlNode + * will take ownership of the child. + *@param pChild The child XmlNode to add to this XmlNode. + *@returns A pointer to the child node that was just added. + */ + XmlNode *addChild( XmlNode *pChild ); + + /** + * Add a new property to the XmlNode. Properties are name/value pairs. + *@param sName The name of the property. Specifying a name that's already + * in use will overwrite that property. + *@param sValue The textual value of the property. + */ + void addProperty( const Bu::FString &sName, const Bu::FString &sValue ); + + /** + * Get a pointer to the parent node, if any. + *@returns A pointer to the node's parent, or NULL if there isn't one. + */ + XmlNode *getParent(); + + /** + * Tells you if this node has children. + *@returns True if this node has at least one child, false otherwise. + */ + bool hasChildren(); + + /** + * Tells you how many children this node has. + *@returns The number of children this node has. + */ + int getNumChildren(); + + /** + * Get a child with the specified name, and possibly skip value. For an + * explination of skip values see the HashTable. + *@param sName The name of the child to find. + *@param nSkip The number of nodes with that name to skip. + *@returns A pointer to the child, or NULL if no child with that name was + * found. + */ + XmlNode *getChild( const Bu::FString &sName, int nSkip=0 ); + + /** + * Get a pointer to the name of this node. Do not change this, use setName + * instead. + *@returns A pointer to the name of this node. + */ + Bu::FString getName(); + + /** + * Set the content of this node, optionally at a specific index. Using the + * default of -1 will set the content after the last added node. + *@param sContent The content string to use. + *@param nIndex The index of the content. + */ + //void setContent( const char *sContent, int nIndex=-1 ); + + /** + * Get the number of properties in this node. + *@returns The number of properties in this node. + */ + int getNumProperties(); + + /** + * Get a propery's value by name. + *@param sName The name of the property to examine. + *@returns A pointer to the value of the property specified, or NULL if none + * found. + */ + Bu::FString getProperty( const Bu::FString &sName ); + + /** + * Delete a child node, possibly replacing it with some text. This actually + * fixes all content strings around the newly deleted child node. + *@param nIndex The index of the node to delete. + *@param sReplacementText The optional text to replace the node with. + *@returns True of the node was found, and deleted, false if it wasn't + * found. + */ + //void deleteNode( int nIndex, const char *sReplacementText = NULL ); + + /** + * Delete a given node, but move all of it's children and content up to + * replace the deleted node. All of the content of the child node is + * spliced seamlessly into place with the parent node's content. + *@param nIndex The node to delete. + *@returns True if the node was found and deleted, false if it wasn't. + */ + //void deleteNodeKeepChildren( int nIndex ); + + /** + * Detatch a given child node from this node. This effectively works just + * like a deleteNode, except that instead of deleting the node it is removed + * and returned, and all ownership is given up. + *@param nIndex The index of the node to detatch. + *@param sReplacementText The optional text to replace the detatched node + * with. + *@returns A pointer to the newly detatched node, which then passes + * ownership to the caller. + */ + //XmlNode *detatchNode( int nIndex, const char *sReplacementText = NULL ); + + /** + * Replace a given node with a different node that is not currently owned by + * this XmlNode or any ancestor. + *@param nIndex The index of the node to replace. + *@param pNewNode The new node to replace the old node with. + *@returns True if the node was found and replaced, false if it wasn't. + */ + //void replaceNode( int nIndex, XmlNode *pNewNode ); + + /** + * Replace a given node with the children and content of a given node. + *@param nIndex The index of the node to replace. + *@param pNewNode The node that contains the children and content that will + * replace the node specified by nIndex. + *@returns True if the node was found and replaced, false if it wasn't. + */ + //void replaceNodeWithChildren( int nIndex, XmlNode *pNewNode ); + + /** + * Get a copy of this node and all children. getCopy is recursive, so + * beware copying large trees of xml. + *@returns A newly created copy of this node and all of it's children. + */ + //XmlNode *getCopy(); + + enum ChildType + { + typeNode, + typeContent + }; + +private: + typedef struct + { + uint8_t nType; + union { + XmlNode *pNode; + Bu::FString *pContent; + }; + } Child; + Bu::FString sName; /**< The name of the node. */ + Bu::List lChildren; /**< The children. */ + Bu::Hash hProperties; /**< Property hashtable. */ + Bu::Hash > hChildren; /**< Children hashtable. */ + XmlNode *pParent; /**< A pointer to the parent of this node. */ + int nCurContent; /**< The current content we're on, for using the -1 on + setContent. */ +}; + +#endif diff --git a/src/old/xmlreader.cpp b/src/old/xmlreader.cpp new file mode 100644 index 0000000..38cad5f --- /dev/null +++ b/src/old/xmlreader.cpp @@ -0,0 +1,604 @@ +#include "bu/xmlreader.h" +#include "bu/exceptions.h" +#include + +XmlReader::XmlReader( Bu::Stream &sIn, bool bStrip ) : + sIn( sIn ), + bStrip( bStrip ) +{ + buildDoc(); +} + +XmlReader::~XmlReader() +{ +} + +char XmlReader::getChar( int nIndex ) +{ + if( sBuf.getSize() <= nIndex ) + { + int nInc = nIndex-sBuf.getSize()+1; + char *buf = new char[nInc]; + sIn.read( buf, nInc ); + sBuf.append( buf, nInc ); + delete[] buf; + } + + return sBuf[nIndex]; +} + +void XmlReader::usedChar( int nAmnt ) +{ + if( nAmnt >= sBuf.getSize() ) + { + sBuf.clear(); + } + else + { + char *s = sBuf.getStr(); + memcpy( s, s+nAmnt, sBuf.getSize()-nAmnt ); + sBuf.resize( sBuf.getSize()-nAmnt ); + } +} + +void XmlReader::addEntity( const Bu::FString &name, const Bu::FString &value ) +{ + htEntity[name] = value; +} + +#define gcall( x ) if( x == false ) return false; + +bool XmlReader::isws( char chr ) +{ + return ( chr == ' ' || chr == '\t' || chr == '\n' || chr == '\r' ); +} + +bool XmlReader::ws() +{ + while( true ) + { + char chr = getChar(); + if( isws( chr ) ) + { + usedChar(); + } + else + { + return true; + } + } + return true; +} + +bool XmlReader::buildDoc() +{ + // take care of initial whitespace + gcall( ws() ); + textDecl(); + entity(); + addEntity("gt", ">"); + addEntity("lt", "<"); + addEntity("amp", "&"); + addEntity("apos", "\'"); + addEntity("quot", "\""); + gcall( node() ); + + return true; +} + +void XmlReader::textDecl() +{ + if( getChar() == '<' && getChar( 1 ) == '?' ) + { + usedChar( 2 ); + for(;;) + { + if( getChar() == '?' ) + { + if( getChar( 1 ) == '>' ) + { + usedChar( 2 ); + return; + } + } + usedChar(); + } + } +} + +void XmlReader::entity() +{ + for(;;) + { + ws(); + + if( getChar() == '<' && getChar( 1 ) == '!' ) + { + usedChar( 2 ); + ws(); + Bu::FString buf; + for(;;) + { + char chr = getChar(); + usedChar(); + if( isws( chr ) ) break; + buf += chr; + } + + if( strcmp( buf.c_str(), "ENTITY") == 0 ) + { + ws(); + Bu::FString name; + for(;;) + { + char chr = getChar(); + usedChar(); + if( isws( chr ) ) break; + name += chr; + } + ws(); + char quot = getChar(); + usedChar(); + if( quot != '\'' && quot != '\"' ) + { + throw Bu::XmlException( + "Only quoted entity values are supported." + ); + } + Bu::FString value; + for(;;) + { + char chr = getChar(); + usedChar(); + if( chr == '&' ) + { + Bu::FString tmp = getEscape(); + value += tmp; + } + else if( chr == quot ) + { + break; + } + else + { + value += chr; + } + } + ws(); + if( getChar() == '>' ) + { + usedChar(); + + addEntity( name.c_str(), value.c_str() ); + } + else + { + throw Bu::XmlException( + "Malformed ENTITY: unexpected '%c' found.", + getChar() + ); + } + } + else + { + throw Bu::XmlException( + "Unsupported header symbol: %s", + buf.c_str() + ); + } + } + else + { + return; + } + } +} + +bool XmlReader::node() +{ + gcall( startNode() ) + + // At this point, we are closing the startNode + char chr = getChar(); + if( chr == '>' ) + { + usedChar(); + + // Now we process the guts of the node. + gcall( content() ); + } + else if( chr == '/' ) + { + // This is the tricky one, one more validation, then we close the node. + usedChar(); + if( getChar() == '>' ) + { + closeNode(); + usedChar(); + } + else + { + throw Bu::XmlException("Close node in singleNode malformed!"); + } + } + else + { + throw Bu::XmlException("Close node expected, but not found."); + return false; + } + + return true; +} + +bool XmlReader::startNode() +{ + if( getChar() == '<' ) + { + usedChar(); + + if( getChar() == '/' ) + { + // Heh, it's actually a close node, go figure + Bu::FString sName; + usedChar(); + gcall( ws() ); + + while( true ) + { + char chr = getChar(); + if( isws( chr ) || chr == '>' ) + { + // Here we actually compare the name we got to the name + // we already set, they have to match exactly. + if( getCurrent()->getName() == sName ) + { + closeNode(); + break; + } + else + { + throw Bu::XmlException("Got a mismatched node close tag."); + } + } + else + { + sName += chr; + usedChar(); + } + } + + gcall( ws() ); + if( getChar() == '>' ) + { + // Everything is cool. + usedChar(); + } + else + { + throw Bu::XmlException("Got extra junk data instead of node close tag."); + } + } + else + { + // We're good, format is consistant + //addNode(); + + // Skip extra whitespace + gcall( ws() ); + gcall( name() ); + gcall( ws() ); + gcall( paramlist() ); + gcall( ws() ); + } + } + else + { + throw Bu::XmlException("Expected to find node opening char, '<'."); + } + + return true; +} + +bool XmlReader::name() +{ + Bu::FString sName; + + while( true ) + { + char chr = getChar(); + if( isws( chr ) || chr == '>' || chr == '/' ) + { + addNode( sName ); + return true; + } + else + { + sName += chr; + usedChar(); + } + } + + return true; +} + +bool XmlReader::paramlist() +{ + while( true ) + { + char chr = getChar(); + if( chr == '/' || chr == '>' ) + { + return true; + } + else + { + gcall( param() ); + gcall( ws() ); + } + } + + return true; +} + +Bu::FString XmlReader::getEscape() +{ + if( getChar( 1 ) == '#' ) + { + // If the entity starts with a # it's a character escape code + int base = 10; + usedChar( 2 ); + if( getChar() == 'x' ) + { + base = 16; + usedChar(); + } + char buf[4]; + int j = 0; + for( j = 0; getChar() != ';'; j++ ) + { + buf[j] = getChar(); + usedChar(); + } + usedChar(); + buf[j] = '\0'; + buf[0] = (char)strtol( buf, (char **)NULL, base ); + buf[1] = '\0'; + + return buf; + } + else + { + // ...otherwise replace with the appropriate string... + Bu::FString buf; + usedChar(); + for(;;) + { + char cbuf = getChar(); + usedChar(); + if( cbuf == ';' ) break; + buf += cbuf; + } + + return htEntity[buf]; + } +} + +bool XmlReader::param() +{ + Bu::FString sName; + Bu::FString sValue; + + while( true ) + { + char chr = getChar(); + if( isws( chr ) || chr == '=' ) + { + break; + } + else + { + sName.append( chr ); + usedChar(); + } + } + + gcall( ws() ); + + if( getChar() == '=' ) + { + usedChar(); + + gcall( ws() ); + + char chr = getChar(); + if( chr == '"' ) + { + // Better quoted rhs + usedChar(); + + while( true ) + { + chr = getChar(); + if( chr == '"' ) + { + usedChar(); + addProperty( sName.getStr(), sValue.getStr() ); + return true; + } + else + { + if( chr == '&' ) + { + sValue += getEscape(); + } + else + { + sValue += chr; + usedChar(); + } + } + } + } + else + { + // Simple one-word rhs + while( true ) + { + chr = getChar(); + if( isws( chr ) || chr == '/' || chr == '>' ) + { + addProperty( sName.getStr(), sValue.getStr() ); + return true; + } + else + { + if( chr == '&' ) + { + sValue += getEscape(); + } + else + { + sValue += chr; + usedChar(); + } + } + } + } + } + else + { + throw Bu::XmlException("Expected an equals to seperate the params."); + return false; + } + + return true; +} + +bool XmlReader::content() +{ + Bu::FString sContent; + + if( bStrip ) gcall( ws() ); + + while( true ) + { + char chr = getChar(); + if( chr == '<' ) + { + if( getChar(1) == '/' ) + { + if( sContent.getSize() > 0 ) + { + if( bStrip ) + { + int j; + for( j = sContent.getSize()-1; isws(sContent[j]); j-- ); + sContent[j+1] = '\0'; + } + setContent( sContent.getStr() ); + } + usedChar( 2 ); + gcall( ws() ); + Bu::FString sName; + while( true ) + { + chr = getChar(); + if( isws( chr ) || chr == '>' ) + { + if( !strcasecmp( getCurrent()->getName().getStr(), sName.getStr() ) ) + { + closeNode(); + break; + } + else + { + throw Bu::XmlException("Mismatched close tag found: <%s> to <%s>.", getCurrent()->getName().getStr(), sName.getStr() ); + } + } + else + { + sName += chr; + usedChar(); + } + } + gcall( ws() ); + if( getChar() == '>' ) + { + usedChar(); + return true; + } + else + { + throw Bu::XmlException("Malformed close tag."); + } + } + else if( getChar(1) == '!' ) + { + // We know it's a comment, let's see if it's proper + if( getChar(2) != '-' || + getChar(3) != '-' ) + { + // Not a valid XML comment + throw Bu::XmlException("Malformed comment start tag found."); + } + + usedChar( 4 ); + + // Now burn text until we find the close tag + for(;;) + { + if( getChar() == '-' ) + { + if( getChar( 1 ) == '-' ) + { + // The next one has to be a '>' now + if( getChar( 2 ) != '>' ) + { + throw Bu::XmlException("Malformed comment close tag found. You cannot have a '--' that isn't followed by a '>' in a comment."); + } + usedChar( 3 ); + break; + } + else + { + // Found a dash followed by a non dash, that's ok... + usedChar( 2 ); + } + } + else + { + // Burn comment chars + usedChar(); + } + } + } + else + { + if( sContent.getSize() > 0 ) + { + if( bStrip ) + { + int j; + for( j = sContent.getSize()-1; isws(sContent[j]); j-- ); + sContent[j+1] = '\0'; + } + setContent( sContent.getStr() ); + sContent.clear(); + } + gcall( node() ); + } + + if( bStrip ) gcall( ws() ); + } + else if( chr == '&' ) + { + sContent += getEscape(); + } + else + { + sContent += chr; + usedChar(); + } + } +} + diff --git a/src/old/xmlreader.h b/src/old/xmlreader.h new file mode 100644 index 0000000..7c85ddb --- /dev/null +++ b/src/old/xmlreader.h @@ -0,0 +1,144 @@ +#ifndef XMLREADER +#define XMLREADER + +#include +#include "bu/xmldocument.h" +#include "bu/hash.h" +#include "bu/fstring.h" +#include "bu/stream.h" + +/** + * Takes care of reading in xml formatted data from a file. This could/should + * be made more arbitrary in the future so that we can read the data from any + * source. This is actually made quite simple already since all data read in + * is handled by one single helper function and then palced into a FlexBuf for + * easy access by the other functions. The FlexBuf also allows for block + * reading from disk, which improves speed by a noticable amount. + *
+ * There are also some extra features implemented that allow you to break the + * standard XML reader specs and eliminate leading and trailing whitespace in + * all read content. This is useful in situations where you allow additional + * whitespace in the files to make them easily human readable. The resturned + * content will be NULL in sitautions where all content between nodes was + * stripped. + *@author Mike Buland + */ +class XmlReader : public XmlDocument +{ +public: + /** + * Create a standard XmlReader. The optional parameter bStrip allows you to + * create a reader that will strip out all leading and trailing whitespace + * in content, a-la html. + *@param bStrip Strip out leading and trailing whitespace? + */ + XmlReader( Bu::Stream &sIn, bool bStrip=false ); + + /** + * Destroy this XmlReader. + */ + virtual ~XmlReader(); + + /** + * Build a document based on some kind of input. This is called + * automatically by the constructor. + */ + bool buildDoc(); + +private: + /** + * This is called by the low level automoton in order to get the next + * character. This function should return a character at the current + * position plus nIndex, but does not increment the current character. + *@param nIndex The index of the character from the current stream position. + *@returns A single character at the requested position, or 0 for end of + * stream. + */ + virtual char getChar( int nIndex = 0 ); + + /** + * Called to increment the current stream position by a single character. + */ + virtual void usedChar( int nAmnt = 1 ); + + /** + * Automoton function: is whitespace. + *@param chr A character + *@returns True if chr is whitespace, false otherwise. + */ + bool isws( char chr ); + + /** + * Automoton function: ws. Skips sections of whitespace. + *@returns True if everything was ok, False for end of stream. + */ + bool ws(); + + /** + * Automoton function: node. Processes an XmlNode + *@returns True if everything was ok, False for end of stream. + */ + bool node(); + + /** + * Automoton function: startNode. Processes the begining of a node. + *@returns True if everything was ok, False for end of stream. + */ + bool startNode(); + + /** + * Automoton function: name. Processes the name of a node. + *@returns True if everything was ok, False for end of stream. + */ + bool name(); + + /** + * Automoton function: textDecl. Processes the xml text decleration, if + * there is one. + */ + void textDecl(); + + /** + * Automoton function: entity. Processes an entity from the header. + */ + void entity(); + + /** + * Adds an entity to the list, if it doesn't already exist. + *@param name The name of the entity + *@param value The value of the entity + */ + void addEntity( const Bu::FString &name, const Bu::FString &value ); + + Bu::FString getEscape(); + + /** + * Automoton function: paramlist. Processes a list of node params. + *@returns True if everything was ok, False for end of stream. + */ + bool paramlist(); + + /** + * Automoton function: param. Processes a single parameter. + *@returns True if everything was ok, False for end of stream. + */ + bool param(); + + /** + * Automoton function: content. Processes node content. + *@returns True if everything was ok, False for end of stream. + */ + bool content(); + + Bu::FString sContent; /**< buffer for the current node's content. */ + Bu::FString sParamName; /**< buffer for the current param's name. */ + Bu::FString sParamValue; /**< buffer for the current param's value. */ + Bu::Stream &sIn; + bool bStrip; /**< Are we stripping whitespace? */ + + Bu::Hash htEntity; /**< Entity type definitions. */ + + Bu::FString sBuf; +}; + +#endif diff --git a/src/old/xmlwriter.cpp b/src/old/xmlwriter.cpp new file mode 100644 index 0000000..7dc6ca9 --- /dev/null +++ b/src/old/xmlwriter.cpp @@ -0,0 +1,167 @@ +#include +#include +#include "xmlwriter.h" + +XmlWriter::XmlWriter( const Bu::FString &sIndent, XmlNode *pRoot ) : + XmlDocument( pRoot ), + sIndent( sIndent ) +{ +} + +XmlWriter::~XmlWriter() +{ +} + +void XmlWriter::write() +{ + write( getRoot(), sIndent.c_str() ); +} + +void XmlWriter::write( XmlNode *pRoot, const Bu::FString &sIndent ) +{ + writeNode( pRoot, 0, sIndent ); +} + +void XmlWriter::closeNode() +{ + XmlDocument::closeNode(); + + if( isCompleted() ) + { + write( getRoot(), sIndent.c_str() ); + } +} + +void XmlWriter::writeIndent( int nIndent, const Bu::FString &sIndent ) +{ + if( sIndent == NULL ) return; + for( int j = 0; j < nIndent; j++ ) + { + writeString( sIndent ); + } +} + +Bu::FString XmlWriter::escape( const Bu::FString &sIn ) +{ + Bu::FString sOut; + + int nMax = sIn.getSize(); + for( int j = 0; j < nMax; j++ ) + { + char c = sIn[j]; + if( ((c >= ' ' && c <= '9') || + (c >= 'a' && c <= 'z') || + (c >= 'A' && c <= 'Z') ) && + (c != '\"' && c != '\'' && c != '&') + ) + { + sOut += c; + } + else + { + sOut += "&#"; + char buf[4]; + sprintf( buf, "%u", (unsigned char)c ); + sOut += buf; + sOut += ';'; + } + } + + return sOut; +} + +void XmlWriter::writeNodeProps( XmlNode *pNode, int nIndent, const Bu::FString &sIndent ) +{ + for( int j = 0; j < pNode->getNumProperties(); j++ ) + { + writeString(" "); + //writeString( pNode->getPropertyName( j ) ); + writeString("=\""); + //writeString( escape( pNode->getProperty( j ) ).c_str() ); + writeString("\""); + } +} + +void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const Bu::FString &sIndent ) +{ + if( pNode->hasChildren() ) + { + writeIndent( nIndent, sIndent ); + writeString("<"); + writeString( pNode->getName() ); + writeNodeProps( pNode, nIndent, sIndent ); + if( sIndent != "" ) + writeString(">\n"); + else + writeString(">"); +/* + if( pNode->getContent( 0 ) ) + { + writeIndent( nIndent+1, sIndent ); + if( sIndent != "" ) + { + writeString( pNode->getContent( 0 ) ); + writeString("\n"); + } + else + writeString( pNode->getContent( 0 ) ); + } + + int nNumChildren = pNode->getNumChildren(); + for( int j = 0; j < nNumChildren; j++ ) + { + writeNode( pNode->getChild( j ), nIndent+1, sIndent ); + if( pNode->getContent( j+1 ) ) + { + writeIndent( nIndent+1, sIndent ); + if( sIndent ) + { + writeString( pNode->getContent( j+1 ) ); + writeString("\n"); + } + else + writeString( pNode->getContent( j+1 ) ); + } + } +*/ + writeIndent( nIndent, sIndent ); + if( sIndent != "" ) + { + writeString("getName() ); + writeString(">\n"); + } + else + { + writeString("getName() ); + writeString(">"); + } + }/* + else if( pNode->getContent() ) + { + writeIndent( nIndent, sIndent ); + writeString("<"); + writeString( pNode->getName() ); + writeNodeProps( pNode, nIndent, sIndent ); + writeString(">"); + writeString( pNode->getContent() ); + writeString("getName() ); + writeString(">"); + if( sIndent ) + writeString("\n"); + }*/ + else + { + writeIndent( nIndent, sIndent ); + writeString("<"); + writeString( pNode->getName() ); + writeNodeProps( pNode, nIndent, sIndent ); + if( sIndent != "" ) + writeString("/>\n"); + else + writeString("/>"); + } +} + diff --git a/src/old/xmlwriter.h b/src/old/xmlwriter.h new file mode 100644 index 0000000..7e3c876 --- /dev/null +++ b/src/old/xmlwriter.h @@ -0,0 +1,96 @@ +#ifndef XMLWRITER +#define XMLWRITER + +#include "xmlnode.h" +#include "xmldocument.h" + +/** + * Implements xml writing in the XML standard format. Also allows you to + * break that format and auto-indent your exported xml data for ease of + * reading. The auto-indenting will only be applied to sections that + * have no content of their own already. This means that except for + * whitespace all of your data will be preserved perfectly. + * You can create an XmlWriter object around a file, or access the static + * write function directly and just hand it a filename and a root XmlNode. + * When using an XmlWriter object the interface is identicle to that of + * the XmlDocument class, so reference that class for API info. However + * when the initial (or root) node is closed, and the document is finished + * the file will be created and written to automatically. The user can + * check to see if this is actually true by calling the isFinished + * function in the XmlDocument class. + *@author Mike Buland + */ +class XmlWriter : public XmlDocument +{ +public: + /** + * Construct a standard XmlWriter. + *@param sIndent Set this to something other than NULL to include it as an + * indent before each node in the output that doesn't already have content. + * If you are using the whitespace stripping option in the XmlReader and set + * this to a tab or some spaces it will never effect the content of your + * file. + */ + XmlWriter( const Bu::FString &sIndent="", XmlNode *pRoot=NULL ); + + /** + * Destroy the writer. + */ + virtual ~XmlWriter(); + + /** + * This override of the parent class closeNode function calls the parent + * class, but also triggers a write operation when the final node is closed. + * This means that by checking the isCompleted() function the user may also + * check to see if their file has been written or not. + */ + void closeNode(); + + void write(); + +private: + Bu::FString sIndent; /**< The indent string */ + + Bu::FString escape( const Bu::FString &sIn ); + + /** + * Write the file. + *@param pNode The root node + *@param sIndent The indent text. + */ + void write( XmlNode *pNode, const Bu::FString &sIndent ); + + /** + * Write a node in the file, including children. + *@param pNode The node to write. + *@param nIndent The indent level (the number of times to include sIndent) + *@param sIndent The indent text. + */ + void writeNode( XmlNode *pNode, int nIndent, const Bu::FString &sIndent ); + + /** + * Write the properties of a node. + *@param pNode The node who's properties to write. + *@param nIndent The indent level of the containing node + *@param sIndent The indent text. + */ + void writeNodeProps( XmlNode *pNode, int nIndent, const Bu::FString &sIndent ); + + /** + * Called to write the actual indent. + *@param nIndent The indent level. + *@param sIndent The indent text. + */ + void writeIndent( int nIndent, const Bu::FString &sIndent ); + + /** + * This is the function that must be overridden in order to use this class. + * It must write the null-terminated string sString, minus the mull, + * verbatum to it's output device. Adding extra characters for any reason + * will break the XML formatting. + *@param sString The string data to write to the output. + */ + virtual void writeString( const Bu::FString &sString ) = 0; +}; + +#endif diff --git a/src/server.cpp b/src/server.cpp index f93238c..abf4c5b 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -53,7 +53,8 @@ void Bu::Server::scan() { if( hServers.has( j ) ) { - addClient( hServers.get( j )->accept() ); + ServerSocket *pSrv = hServers.get( j ); + addClient( pSrv->accept(), pSrv->getPort() ); } else { @@ -63,11 +64,13 @@ void Bu::Server::scan() } } -void Bu::Server::addClient( int nSocket ) +void Bu::Server::addClient( int nSocket, int nPort ) { FD_SET( nSocket, &fdActive ); Client *c = new Client(); hClients.insert( nSocket, c ); + + onNewConnection( c, nPort ); } diff --git a/src/server.h b/src/server.h index 9f4f459..942eb32 100644 --- a/src/server.h +++ b/src/server.h @@ -22,6 +22,10 @@ namespace Bu * to the timeout set by setTimeout before returning if there is no data * pending. scan should probably be called in some sort of tight * loop, possibly in it's own thread, or in the main control loop. + * + * In order to use a Server you must subclass it and implement the pure + * virtual functions. These allow you to receive notification of events + * happening within the server itself, and actually makes it useful. */ class Server { @@ -35,7 +39,10 @@ namespace Bu void scan(); void setTimeout( int nTimeoutSec, int nTimeoutUSec=0 ); - void addClient( int nSocket ); + void addClient( int nSocket, int nPort ); + + virtual void onNewConnection( Client *pClient, int nPort )=0; + virtual void onClosedConnection( Client *pClient )=0; private: int nTimeoutSec; diff --git a/src/serversocket.cpp b/src/serversocket.cpp index 9c8f743..1424630 100644 --- a/src/serversocket.cpp +++ b/src/serversocket.cpp @@ -151,3 +151,8 @@ int Bu::ServerSocket::accept( int nTimeoutSec, int nTimeoutUSec ) return -1; } +int Bu::ServerSocket::getPort() +{ + return nPort; +} + diff --git a/src/serversocket.h b/src/serversocket.h index d2601e4..cb86078 100644 --- a/src/serversocket.h +++ b/src/serversocket.h @@ -25,6 +25,7 @@ namespace Bu int accept( int nTimeoutSec=0, int nTimeoutUSec=0 ); int getSocket(); + int getPort(); private: void startServer( struct sockaddr_in &name, int nPoolSize ); diff --git a/src/xmldocument.cpp b/src/xmldocument.cpp deleted file mode 100644 index 95b9788..0000000 --- a/src/xmldocument.cpp +++ /dev/null @@ -1,145 +0,0 @@ -#include -#include -#include "xmldocument.h" - -XmlDocument::XmlDocument( XmlNode *pRoot ) -{ - this->pRoot = pRoot; - pCurrent = NULL; - bCompleted = (pRoot!=NULL); -} - -XmlDocument::~XmlDocument() -{ - if( pRoot ) - { - delete pRoot; - } -} - -void XmlDocument::addNode( const Bu::FString &sName ) -{ - if( pRoot == NULL ) - { - // This is the first node, so ignore position and just insert it. - pCurrent = pRoot = new XmlNode( sName ); - } - else - { - pCurrent = pCurrent->addChild( sName ); - } -} -/* -void XmlDocument::setName( const char *sName ) -{ - pCurrent->setName( sName ); -}*/ - -bool XmlDocument::isCompleted() -{ - return bCompleted; -} - -XmlNode *XmlDocument::getRoot() -{ - return pRoot; -} - -XmlNode *XmlDocument::detatchRoot() -{ - XmlNode *pTemp = pRoot; - pRoot = NULL; - return pTemp; -} - -XmlNode *XmlDocument::getCurrent() -{ - return pCurrent; -} - -void XmlDocument::closeNode() -{ - if( pCurrent != NULL ) - { - pCurrent = pCurrent->getParent(); - - if( pCurrent == NULL ) - { - bCompleted = true; - } - } -} - -void XmlDocument::addProperty( const char *sName, const char *sValue ) -{ - if( pCurrent ) - { - pCurrent->addProperty( sName, sValue ); - } -} - -void XmlDocument::addProperty( const char *sName, const unsigned char nValue ) -{ - char buf[12]; - sprintf( buf, "%hhi", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const char nValue ) -{ - char buf[12]; - sprintf( buf, "%hhi", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const unsigned short nValue ) -{ - char buf[12]; - sprintf( buf, "%hi", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const short nValue ) -{ - char buf[12]; - sprintf( buf, "%hi", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const int nValue ) -{ - char buf[12]; - sprintf( buf, "%d", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const unsigned long nValue ) -{ - char buf[12]; - sprintf( buf, "%li", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const long nValue ) -{ - char buf[12]; - sprintf( buf, "%li", nValue ); - addProperty( sName, buf ); -} - -void XmlDocument::addProperty( const char *sName, const double dValue ) -{ - char buf[40]; - sprintf( buf, "%f", dValue ); - addProperty( sName, buf ); -} - -void XmlDocument::setContent( const char *sContent ) -{ - if( pCurrent ) - { - printf("XmlDocument::setContent: not yet implemented.\n"); - //pCurrent->setContent( sContent ); - } -} - diff --git a/src/xmldocument.h b/src/xmldocument.h deleted file mode 100644 index e0c36eb..0000000 --- a/src/xmldocument.h +++ /dev/null @@ -1,165 +0,0 @@ -#ifndef XMLDOCUMENT -#define XMLDOCUMENT - -#include "xmlnode.h" - -/** - * Keeps track of an easily managed set of XmlNode information. Allows simple - * operations for logical writing to and reading from XML structures. Using - * already formed structures is simply done through the XmlNode structures, - * and the getRoot function here. Creation is performed through a simple set - * of operations that creates the data in a stream type format. - *@author Mike Buland - */ -class XmlDocument -{ -public: - /** - * Construct either a blank XmlDocuemnt or construct a document around an - * existing XmlNode. Be careful, once an XmlNode is passed into a document - * the document takes over ownership and will delete it when the XmlDocument - * is deleted. - *@param pRoot The XmlNode to use as the root of this document, or NULL if - * you want to start a new document. - */ - XmlDocument( XmlNode *pRoot=NULL ); - - /** - * Destroy all contained nodes. - */ - virtual ~XmlDocument(); - - /** - * Add a new node to the document. The new node is appended to the end of - * the current context, i.e. XmlNode, and the new node, provided it isn't - * close as part of this operation, will become the current context. - *@param sName The name of the new node to add. - *@param sContent A content string to be placed inside of the new node. - *@param bClose Set this to true to close the node immediately after adding - * the node and setting the content and name. If this is set to true the - * node is appended, but the context node doesn't change. - */ - void addNode( const Bu::FString &sName ); - - /** - * Close the current node context. This will move the current context to - * the parent node of the former current node. If the current node was the - * root then the "completed" flag is set and no more operations are allowed. - */ - void closeNode(); - - /** - * Change the content of the current node at the current position between - * nodes. - *@param sContent The new content of the current node. - */ - void setContent( const char *sContent ); - - /** - * Add a named property to the current context node. - *@param sName The name of the property to add. - *@param sValue The string value of the property. - */ - void addProperty( const char *sName, const char *sValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const unsigned char nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const char nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const unsigned short nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const short nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const unsigned long nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const long nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param nValue The numerical value to add. - */ - void addProperty( const char *sName, const int nValue ); - - /** - * Add a named property to the current context node, converting the - * numerical parameter to text using standrd printf style conversion. - *@param sName The name of the property to add. - *@param dValue The numerical value to add. - */ - void addProperty( const char *sName, const double dValue ); - - /** - * The XmlDocuemnt is considered completed if the root node has been closed. - * Once an XmlDocument has been completed, you can no longer perform - * operations on it. - *@return True if completed, false if still in progress. - */ - bool isCompleted(); - - /** - * Get a pointer to the root object of this XmlDocument. - *@returns A pointer to an internally owned XmlNode. Do not delete this - * XmlNode. - */ - XmlNode *getRoot(); - - /** - * Get a pointer to the root object of this XmlDocument, and remove the - * ownership from this object. - *@returns A pointer to an internally owned XmlNode. Do not delete this - * XmlNode. - */ - XmlNode *detatchRoot(); - - /** - * Get the current context node, which could be the same as the root node. - *@returns A pointer to an internally owned XmlNode. Do not delete this - * XmlNode. - */ - XmlNode *getCurrent(); - -private: - XmlNode *pRoot; /**< The root node. */ - XmlNode *pCurrent; /**< The current node. */ - bool bCompleted; /**< Is it completed? */ -}; - -#endif diff --git a/src/xmlnode.cpp b/src/xmlnode.cpp deleted file mode 100644 index 96d5850..0000000 --- a/src/xmlnode.cpp +++ /dev/null @@ -1,403 +0,0 @@ -#include "xmlnode.h" - -XmlNode::XmlNode( const Bu::FString &sName, XmlNode *pParent ) : - sName( sName ), - pParent( pParent ) -{ -} - -XmlNode::~XmlNode() -{ -} -/* -void XmlNode::setName( const char *sName ) -{ - if( pParent ) - { - if( this->sName.size() == 0 ) - { - // We're not in the hash yet, so add us - this->sName = sName; - pParent->hChildren.insert( this->sName.c_str(), this ); - } - else - { - // Slightly more tricky, delete us, then add us... - pParent->hChildren.del( this->sName.c_str() ); - this->sName = sName; - pParent->hChildren.insert( this->sName.c_str(), this ); - } - } - else - { - // If we have no parent, then just set the name string, we don't need - // to worry about hashing. - this->sName = sName; - } -} - -void XmlNode::setContent( const char *sContent, int nIndex ) -{ - if( nIndex == -1 ) - { - nIndex = nCurContent; - } - if( nIndex == 0 ) - { - if( this->sPreContent ) - { - delete this->sPreContent; - } - - this->sPreContent = new std::string( sContent ); - } - else - { - nIndex--; - if( lPostContent[nIndex] ) - { - delete (std::string *)lPostContent[nIndex]; - } - - lPostContent.setAt( nIndex, new std::string( sContent ) ); - } -} - -const char *XmlNode::getContent( int nIndex ) -{ - if( nIndex == 0 ) - { - if( sPreContent ) - { - return sPreContent->c_str(); - } - } - else - { - nIndex--; - if( lPostContent[nIndex] ) - { - return ((std::string *)lPostContent[nIndex])->c_str(); - } - } - - return NULL; -}*/ - -XmlNode *XmlNode::addChild( const Bu::FString &sName ) -{ - return addChild( new XmlNode( sName, this ) ); -} - -XmlNode *XmlNode::addChild( XmlNode *pNode ) -{ - Child c = { typeNode }; - c.pNode = pNode; - lChildren.append( c ); - pNode->pParent = this; - - return pNode; -} - -XmlNode *XmlNode::getParent() -{ - return pParent; -} - -void XmlNode::addProperty( const Bu::FString &sName, const Bu::FString &sValue ) -{ - hProperties.insert( sName, sValue ); -} - -int XmlNode::getNumProperties() -{ - return hProperties.size(); -} -/* -const char *XmlNode::getPropertyName( int nIndex ) -{ - std::string *tmp = ((std::string *)lPropNames[nIndex]); - if( tmp == NULL ) - return NULL; - return tmp->c_str(); -} - -const char *XmlNode::getProperty( int nIndex ) -{ - std::string *tmp = ((std::string *)lPropValues[nIndex]); - if( tmp == NULL ) - return NULL; - return tmp->c_str(); -} -*/ -Bu::FString XmlNode::getProperty( const Bu::FString &sName ) -{ - return hProperties[sName]; -} -/* -void XmlNode::deleteProperty( int nIndex ) -{ - hProperties.del( ((std::string *)lPropNames[nIndex])->c_str() ); - - delete (std::string *)lPropNames[nIndex]; - delete (std::string *)lPropValues[nIndex]; - - lPropNames.deleteAt( nIndex ); - lPropValues.deleteAt( nIndex ); -} - -bool XmlNode::hasChildren() -{ - return hChildren.getSize()>0; -}*/ - -int XmlNode::getNumChildren() -{ - return lChildren.getSize(); -} -/* -XmlNode *XmlNode::getChild( int nIndex ) -{ - return (XmlNode *)lChildren[nIndex]; -} -*/ -XmlNode *XmlNode::getChild( const Bu::FString &sName, int nSkip ) -{ - if( !hChildren.has( sName ) ) - return NULL; - - Bu::List::iterator i = hChildren[sName]->begin(); - return *i; -} - -Bu::FString XmlNode::getName() -{ - return sName; -} -/* -void XmlNode::deleteNode( int nIndex, const char *sReplacementText ) -{ - XmlNode *xRet = detatchNode( nIndex, sReplacementText ); - - if( xRet != NULL ) - { - delete xRet; - } -} - -XmlNode *XmlNode::detatchNode( int nIndex, const char *sReplacementText ) -{ - if( nIndex < 0 || nIndex >= lChildren.getSize() ) - return NULL; - - // The real trick when deleteing a node isn't actually deleting it, it's - // reforming the content around the node that's now missing...hmmm... - - if( nIndex == 0 ) - { - // If the index is zero we have to deal with the pre-content - if( sReplacementText ) - { - if( sPreContent == NULL ) - { - sPreContent = new std::string( sReplacementText ); - } - else - { - *sPreContent += sReplacementText; - } - } - if( lPostContent.getSize() > 0 ) - { - if( lPostContent[0] != NULL ) - { - if( sPreContent == NULL ) - { - sPreContent = new std::string( - ((std::string *)lPostContent[0])->c_str() - ); - } - else - { - *sPreContent += - ((std::string *)lPostContent[0])->c_str(); - } - } - delete (std::string *)lPostContent[0]; - lPostContent.deleteAt( 0 ); - } - } - else - { - int nCont = nIndex-1; - // If it's above zero we deal with the post-content only - if( sReplacementText ) - { - if( lPostContent[nCont] == NULL ) - { - lPostContent.setAt( nCont, new std::string( sReplacementText ) ); - } - else - { - *((std::string *)lPostContent[nCont]) += sReplacementText; - } - } - if( lPostContent.getSize() > nIndex ) - { - if( lPostContent[nIndex] != NULL ) - { - if( lPostContent[nCont] == NULL ) - { - lPostContent.setAt( nCont, new std::string( - ((std::string *)lPostContent[nIndex])->c_str() - ) ); - } - else - { - *((std::string *)lPostContent[nCont]) += - ((std::string *)lPostContent[nIndex])->c_str(); - } - } - delete (std::string *)lPostContent[nIndex]; - lPostContent.deleteAt( nIndex ); - } - } - - XmlNode *xRet = (XmlNode *)lChildren[nIndex]; - hChildren.del( ((XmlNode *)lChildren[nIndex])->getName() ); - lChildren.deleteAt( nIndex ); - - return xRet; -} - -void XmlNode::replaceNode( int nIndex, XmlNode *pNewNode ) -{ - if( nIndex < 0 || nIndex >= lChildren.getSize() ) - return; //TODO: throw an exception - - delete (XmlNode *)lChildren[nIndex]; - lChildren.setAt( nIndex, pNewNode ); - pNewNode->pParent = this; -} - -XmlNode *XmlNode::getCopy() -{ - XmlNode *pNew = new XmlNode(); - - pNew->sName = sName; - if( sPreContent ) - { - pNew->sPreContent = new std::string( sPreContent->c_str() ); - } - else - { - pNew->sPreContent = NULL; - } - pNew->nCurContent = 0; - - int nSize = lPostContent.getSize(); - pNew->lPostContent.setSize( nSize ); - for( int j = 0; j < nSize; j++ ) - { - if( lPostContent[j] ) - { - pNew->lPostContent.setAt( - j, new std::string( - ((std::string *)lPostContent[j])->c_str() - ) - ); - } - else - { - pNew->lPostContent.setAt( j, NULL ); - } - } - - nSize = lChildren.getSize(); - pNew->lChildren.setSize( nSize ); - for( int j = 0; j < nSize; j++ ) - { - XmlNode *pChild = ((XmlNode *)lChildren[j])->getCopy(); - pNew->lChildren.setAt( j, pChild ); - pChild->pParent = pNew; - pNew->hChildren.insert( pChild->getName(), pChild ); - } - - nSize = lPropNames.getSize(); - pNew->lPropNames.setSize( nSize ); - pNew->lPropValues.setSize( nSize ); - for( int j = 0; j < nSize; j++ ) - { - std::string *pProp = new std::string( ((std::string *)lPropNames[j])->c_str() ); - std::string *pVal = new std::string( ((std::string *)lPropValues[j])->c_str() ); - pNew->lPropNames.setAt( j, pProp ); - pNew->lPropValues.setAt( j, pVal ); - pNew->hProperties.insert( pProp->c_str(), pVal->c_str() ); - pNew->nCurContent++; - } - - return pNew; -} - -void XmlNode::deleteNodeKeepChildren( int nIndex ) -{ - // This is a tricky one...we need to do some patching to keep things all - // even... - XmlNode *xRet = (XmlNode *)lChildren[nIndex]; - - if( xRet == NULL ) - { - return; - } - else - { - if( getContent( nIndex ) ) - { - std::string sBuf( getContent( nIndex ) ); - sBuf += xRet->getContent( 0 ); - setContent( sBuf.c_str(), nIndex ); - } - else - { - setContent( xRet->getContent( 0 ), nIndex ); - } - - int nSize = xRet->lChildren.getSize(); - for( int j = 0; j < nSize; j++ ) - { - XmlNode *pCopy = ((XmlNode *)xRet->lChildren[j])->getCopy(); - pCopy->pParent = this; - lChildren.insertBefore( pCopy, nIndex+j ); - - if( xRet->lPostContent[j] ) - { - lPostContent.insertBefore( - new std::string( ((std::string *)xRet->lPostContent[j])->c_str() ), - nIndex+j - ); - } - else - { - lPostContent.insertBefore( NULL, nIndex+j ); - } - } - - if( getContent( nIndex+nSize ) ) - { - //SString sBuf( getContent( nIndex+nSize ) ); - //sBuf.catfrom( xRet->getContent( nSize ) ); - //setContent( sBuf, nIndex+nSize ); - } - else - { - setContent( xRet->getContent( nSize ), nIndex+nSize ); - } - - deleteNode( nIndex+nSize ); - } -} - -void XmlNode::replaceNodeWithChildren( int nIndex, XmlNode *pNewNode ) -{ -} -*/ diff --git a/src/xmlnode.h b/src/xmlnode.h deleted file mode 100644 index c895cd8..0000000 --- a/src/xmlnode.h +++ /dev/null @@ -1,207 +0,0 @@ -#ifndef XMLNODE -#define XMLNODE - -#include -#include "bu/list.h" -#include "bu/hash.h" -#include "bu/fstring.h" - -/** - * Maintains all data pertient to an XML node, including sub-nodes and content. - * All child nodes can be accessed through index and through name via a hash - * table. This makes it very easy to gain simple and fast access to all of - * your data. For most applications, the memory footprint is also rather - * small. While XmlNode objects can be used directly to create XML structures - * it is highly reccomended that all operations be performed through the - * XmlDocument class. - *@author Mike Buland - */ -class XmlNode -{ -public: - /** - * Construct a new XmlNode. - *@param sName The name of the node. - *@param pParent The parent node. - *@param sContent The initial content string. - */ - XmlNode( - const Bu::FString &sName, - XmlNode *pParent=NULL - ); - - /** - * Delete the node and cleanup all memory. - */ - virtual ~XmlNode(); - - /** - * Change the name of the node. - *@param sName The new name of the node. - */ - //void setName( const char *sName ); - - /** - * Construct a new node and add it as a child to this node, also return a - * pointer to the newly constructed node. - *@param sName The name of the new node. - *@param sContent The initial content of the new node. - *@returns A pointer to the newly created child node. - */ - XmlNode *addChild( const Bu::FString &sName ); - - /** - * Add an already created XmlNode as a child to this node. The new child - * XmlNode's parent will be changed appropriately and the parent XmlNode - * will take ownership of the child. - *@param pChild The child XmlNode to add to this XmlNode. - *@returns A pointer to the child node that was just added. - */ - XmlNode *addChild( XmlNode *pChild ); - - /** - * Add a new property to the XmlNode. Properties are name/value pairs. - *@param sName The name of the property. Specifying a name that's already - * in use will overwrite that property. - *@param sValue The textual value of the property. - */ - void addProperty( const Bu::FString &sName, const Bu::FString &sValue ); - - /** - * Get a pointer to the parent node, if any. - *@returns A pointer to the node's parent, or NULL if there isn't one. - */ - XmlNode *getParent(); - - /** - * Tells you if this node has children. - *@returns True if this node has at least one child, false otherwise. - */ - bool hasChildren(); - - /** - * Tells you how many children this node has. - *@returns The number of children this node has. - */ - int getNumChildren(); - - /** - * Get a child with the specified name, and possibly skip value. For an - * explination of skip values see the HashTable. - *@param sName The name of the child to find. - *@param nSkip The number of nodes with that name to skip. - *@returns A pointer to the child, or NULL if no child with that name was - * found. - */ - XmlNode *getChild( const Bu::FString &sName, int nSkip=0 ); - - /** - * Get a pointer to the name of this node. Do not change this, use setName - * instead. - *@returns A pointer to the name of this node. - */ - Bu::FString getName(); - - /** - * Set the content of this node, optionally at a specific index. Using the - * default of -1 will set the content after the last added node. - *@param sContent The content string to use. - *@param nIndex The index of the content. - */ - //void setContent( const char *sContent, int nIndex=-1 ); - - /** - * Get the number of properties in this node. - *@returns The number of properties in this node. - */ - int getNumProperties(); - - /** - * Get a propery's value by name. - *@param sName The name of the property to examine. - *@returns A pointer to the value of the property specified, or NULL if none - * found. - */ - Bu::FString getProperty( const Bu::FString &sName ); - - /** - * Delete a child node, possibly replacing it with some text. This actually - * fixes all content strings around the newly deleted child node. - *@param nIndex The index of the node to delete. - *@param sReplacementText The optional text to replace the node with. - *@returns True of the node was found, and deleted, false if it wasn't - * found. - */ - //void deleteNode( int nIndex, const char *sReplacementText = NULL ); - - /** - * Delete a given node, but move all of it's children and content up to - * replace the deleted node. All of the content of the child node is - * spliced seamlessly into place with the parent node's content. - *@param nIndex The node to delete. - *@returns True if the node was found and deleted, false if it wasn't. - */ - //void deleteNodeKeepChildren( int nIndex ); - - /** - * Detatch a given child node from this node. This effectively works just - * like a deleteNode, except that instead of deleting the node it is removed - * and returned, and all ownership is given up. - *@param nIndex The index of the node to detatch. - *@param sReplacementText The optional text to replace the detatched node - * with. - *@returns A pointer to the newly detatched node, which then passes - * ownership to the caller. - */ - //XmlNode *detatchNode( int nIndex, const char *sReplacementText = NULL ); - - /** - * Replace a given node with a different node that is not currently owned by - * this XmlNode or any ancestor. - *@param nIndex The index of the node to replace. - *@param pNewNode The new node to replace the old node with. - *@returns True if the node was found and replaced, false if it wasn't. - */ - //void replaceNode( int nIndex, XmlNode *pNewNode ); - - /** - * Replace a given node with the children and content of a given node. - *@param nIndex The index of the node to replace. - *@param pNewNode The node that contains the children and content that will - * replace the node specified by nIndex. - *@returns True if the node was found and replaced, false if it wasn't. - */ - //void replaceNodeWithChildren( int nIndex, XmlNode *pNewNode ); - - /** - * Get a copy of this node and all children. getCopy is recursive, so - * beware copying large trees of xml. - *@returns A newly created copy of this node and all of it's children. - */ - //XmlNode *getCopy(); - - enum ChildType - { - typeNode, - typeContent - }; - -private: - typedef struct - { - uint8_t nType; - union { - XmlNode *pNode; - Bu::FString *pContent; - }; - } Child; - Bu::FString sName; /**< The name of the node. */ - Bu::List lChildren; /**< The children. */ - Bu::Hash hProperties; /**< Property hashtable. */ - Bu::Hash > hChildren; /**< Children hashtable. */ - XmlNode *pParent; /**< A pointer to the parent of this node. */ - int nCurContent; /**< The current content we're on, for using the -1 on - setContent. */ -}; - -#endif diff --git a/src/xmlreader.cpp b/src/xmlreader.cpp deleted file mode 100644 index 38cad5f..0000000 --- a/src/xmlreader.cpp +++ /dev/null @@ -1,604 +0,0 @@ -#include "bu/xmlreader.h" -#include "bu/exceptions.h" -#include - -XmlReader::XmlReader( Bu::Stream &sIn, bool bStrip ) : - sIn( sIn ), - bStrip( bStrip ) -{ - buildDoc(); -} - -XmlReader::~XmlReader() -{ -} - -char XmlReader::getChar( int nIndex ) -{ - if( sBuf.getSize() <= nIndex ) - { - int nInc = nIndex-sBuf.getSize()+1; - char *buf = new char[nInc]; - sIn.read( buf, nInc ); - sBuf.append( buf, nInc ); - delete[] buf; - } - - return sBuf[nIndex]; -} - -void XmlReader::usedChar( int nAmnt ) -{ - if( nAmnt >= sBuf.getSize() ) - { - sBuf.clear(); - } - else - { - char *s = sBuf.getStr(); - memcpy( s, s+nAmnt, sBuf.getSize()-nAmnt ); - sBuf.resize( sBuf.getSize()-nAmnt ); - } -} - -void XmlReader::addEntity( const Bu::FString &name, const Bu::FString &value ) -{ - htEntity[name] = value; -} - -#define gcall( x ) if( x == false ) return false; - -bool XmlReader::isws( char chr ) -{ - return ( chr == ' ' || chr == '\t' || chr == '\n' || chr == '\r' ); -} - -bool XmlReader::ws() -{ - while( true ) - { - char chr = getChar(); - if( isws( chr ) ) - { - usedChar(); - } - else - { - return true; - } - } - return true; -} - -bool XmlReader::buildDoc() -{ - // take care of initial whitespace - gcall( ws() ); - textDecl(); - entity(); - addEntity("gt", ">"); - addEntity("lt", "<"); - addEntity("amp", "&"); - addEntity("apos", "\'"); - addEntity("quot", "\""); - gcall( node() ); - - return true; -} - -void XmlReader::textDecl() -{ - if( getChar() == '<' && getChar( 1 ) == '?' ) - { - usedChar( 2 ); - for(;;) - { - if( getChar() == '?' ) - { - if( getChar( 1 ) == '>' ) - { - usedChar( 2 ); - return; - } - } - usedChar(); - } - } -} - -void XmlReader::entity() -{ - for(;;) - { - ws(); - - if( getChar() == '<' && getChar( 1 ) == '!' ) - { - usedChar( 2 ); - ws(); - Bu::FString buf; - for(;;) - { - char chr = getChar(); - usedChar(); - if( isws( chr ) ) break; - buf += chr; - } - - if( strcmp( buf.c_str(), "ENTITY") == 0 ) - { - ws(); - Bu::FString name; - for(;;) - { - char chr = getChar(); - usedChar(); - if( isws( chr ) ) break; - name += chr; - } - ws(); - char quot = getChar(); - usedChar(); - if( quot != '\'' && quot != '\"' ) - { - throw Bu::XmlException( - "Only quoted entity values are supported." - ); - } - Bu::FString value; - for(;;) - { - char chr = getChar(); - usedChar(); - if( chr == '&' ) - { - Bu::FString tmp = getEscape(); - value += tmp; - } - else if( chr == quot ) - { - break; - } - else - { - value += chr; - } - } - ws(); - if( getChar() == '>' ) - { - usedChar(); - - addEntity( name.c_str(), value.c_str() ); - } - else - { - throw Bu::XmlException( - "Malformed ENTITY: unexpected '%c' found.", - getChar() - ); - } - } - else - { - throw Bu::XmlException( - "Unsupported header symbol: %s", - buf.c_str() - ); - } - } - else - { - return; - } - } -} - -bool XmlReader::node() -{ - gcall( startNode() ) - - // At this point, we are closing the startNode - char chr = getChar(); - if( chr == '>' ) - { - usedChar(); - - // Now we process the guts of the node. - gcall( content() ); - } - else if( chr == '/' ) - { - // This is the tricky one, one more validation, then we close the node. - usedChar(); - if( getChar() == '>' ) - { - closeNode(); - usedChar(); - } - else - { - throw Bu::XmlException("Close node in singleNode malformed!"); - } - } - else - { - throw Bu::XmlException("Close node expected, but not found."); - return false; - } - - return true; -} - -bool XmlReader::startNode() -{ - if( getChar() == '<' ) - { - usedChar(); - - if( getChar() == '/' ) - { - // Heh, it's actually a close node, go figure - Bu::FString sName; - usedChar(); - gcall( ws() ); - - while( true ) - { - char chr = getChar(); - if( isws( chr ) || chr == '>' ) - { - // Here we actually compare the name we got to the name - // we already set, they have to match exactly. - if( getCurrent()->getName() == sName ) - { - closeNode(); - break; - } - else - { - throw Bu::XmlException("Got a mismatched node close tag."); - } - } - else - { - sName += chr; - usedChar(); - } - } - - gcall( ws() ); - if( getChar() == '>' ) - { - // Everything is cool. - usedChar(); - } - else - { - throw Bu::XmlException("Got extra junk data instead of node close tag."); - } - } - else - { - // We're good, format is consistant - //addNode(); - - // Skip extra whitespace - gcall( ws() ); - gcall( name() ); - gcall( ws() ); - gcall( paramlist() ); - gcall( ws() ); - } - } - else - { - throw Bu::XmlException("Expected to find node opening char, '<'."); - } - - return true; -} - -bool XmlReader::name() -{ - Bu::FString sName; - - while( true ) - { - char chr = getChar(); - if( isws( chr ) || chr == '>' || chr == '/' ) - { - addNode( sName ); - return true; - } - else - { - sName += chr; - usedChar(); - } - } - - return true; -} - -bool XmlReader::paramlist() -{ - while( true ) - { - char chr = getChar(); - if( chr == '/' || chr == '>' ) - { - return true; - } - else - { - gcall( param() ); - gcall( ws() ); - } - } - - return true; -} - -Bu::FString XmlReader::getEscape() -{ - if( getChar( 1 ) == '#' ) - { - // If the entity starts with a # it's a character escape code - int base = 10; - usedChar( 2 ); - if( getChar() == 'x' ) - { - base = 16; - usedChar(); - } - char buf[4]; - int j = 0; - for( j = 0; getChar() != ';'; j++ ) - { - buf[j] = getChar(); - usedChar(); - } - usedChar(); - buf[j] = '\0'; - buf[0] = (char)strtol( buf, (char **)NULL, base ); - buf[1] = '\0'; - - return buf; - } - else - { - // ...otherwise replace with the appropriate string... - Bu::FString buf; - usedChar(); - for(;;) - { - char cbuf = getChar(); - usedChar(); - if( cbuf == ';' ) break; - buf += cbuf; - } - - return htEntity[buf]; - } -} - -bool XmlReader::param() -{ - Bu::FString sName; - Bu::FString sValue; - - while( true ) - { - char chr = getChar(); - if( isws( chr ) || chr == '=' ) - { - break; - } - else - { - sName.append( chr ); - usedChar(); - } - } - - gcall( ws() ); - - if( getChar() == '=' ) - { - usedChar(); - - gcall( ws() ); - - char chr = getChar(); - if( chr == '"' ) - { - // Better quoted rhs - usedChar(); - - while( true ) - { - chr = getChar(); - if( chr == '"' ) - { - usedChar(); - addProperty( sName.getStr(), sValue.getStr() ); - return true; - } - else - { - if( chr == '&' ) - { - sValue += getEscape(); - } - else - { - sValue += chr; - usedChar(); - } - } - } - } - else - { - // Simple one-word rhs - while( true ) - { - chr = getChar(); - if( isws( chr ) || chr == '/' || chr == '>' ) - { - addProperty( sName.getStr(), sValue.getStr() ); - return true; - } - else - { - if( chr == '&' ) - { - sValue += getEscape(); - } - else - { - sValue += chr; - usedChar(); - } - } - } - } - } - else - { - throw Bu::XmlException("Expected an equals to seperate the params."); - return false; - } - - return true; -} - -bool XmlReader::content() -{ - Bu::FString sContent; - - if( bStrip ) gcall( ws() ); - - while( true ) - { - char chr = getChar(); - if( chr == '<' ) - { - if( getChar(1) == '/' ) - { - if( sContent.getSize() > 0 ) - { - if( bStrip ) - { - int j; - for( j = sContent.getSize()-1; isws(sContent[j]); j-- ); - sContent[j+1] = '\0'; - } - setContent( sContent.getStr() ); - } - usedChar( 2 ); - gcall( ws() ); - Bu::FString sName; - while( true ) - { - chr = getChar(); - if( isws( chr ) || chr == '>' ) - { - if( !strcasecmp( getCurrent()->getName().getStr(), sName.getStr() ) ) - { - closeNode(); - break; - } - else - { - throw Bu::XmlException("Mismatched close tag found: <%s> to <%s>.", getCurrent()->getName().getStr(), sName.getStr() ); - } - } - else - { - sName += chr; - usedChar(); - } - } - gcall( ws() ); - if( getChar() == '>' ) - { - usedChar(); - return true; - } - else - { - throw Bu::XmlException("Malformed close tag."); - } - } - else if( getChar(1) == '!' ) - { - // We know it's a comment, let's see if it's proper - if( getChar(2) != '-' || - getChar(3) != '-' ) - { - // Not a valid XML comment - throw Bu::XmlException("Malformed comment start tag found."); - } - - usedChar( 4 ); - - // Now burn text until we find the close tag - for(;;) - { - if( getChar() == '-' ) - { - if( getChar( 1 ) == '-' ) - { - // The next one has to be a '>' now - if( getChar( 2 ) != '>' ) - { - throw Bu::XmlException("Malformed comment close tag found. You cannot have a '--' that isn't followed by a '>' in a comment."); - } - usedChar( 3 ); - break; - } - else - { - // Found a dash followed by a non dash, that's ok... - usedChar( 2 ); - } - } - else - { - // Burn comment chars - usedChar(); - } - } - } - else - { - if( sContent.getSize() > 0 ) - { - if( bStrip ) - { - int j; - for( j = sContent.getSize()-1; isws(sContent[j]); j-- ); - sContent[j+1] = '\0'; - } - setContent( sContent.getStr() ); - sContent.clear(); - } - gcall( node() ); - } - - if( bStrip ) gcall( ws() ); - } - else if( chr == '&' ) - { - sContent += getEscape(); - } - else - { - sContent += chr; - usedChar(); - } - } -} - diff --git a/src/xmlreader.h b/src/xmlreader.h deleted file mode 100644 index 7c85ddb..0000000 --- a/src/xmlreader.h +++ /dev/null @@ -1,144 +0,0 @@ -#ifndef XMLREADER -#define XMLREADER - -#include -#include "bu/xmldocument.h" -#include "bu/hash.h" -#include "bu/fstring.h" -#include "bu/stream.h" - -/** - * Takes care of reading in xml formatted data from a file. This could/should - * be made more arbitrary in the future so that we can read the data from any - * source. This is actually made quite simple already since all data read in - * is handled by one single helper function and then palced into a FlexBuf for - * easy access by the other functions. The FlexBuf also allows for block - * reading from disk, which improves speed by a noticable amount. - *
- * There are also some extra features implemented that allow you to break the - * standard XML reader specs and eliminate leading and trailing whitespace in - * all read content. This is useful in situations where you allow additional - * whitespace in the files to make them easily human readable. The resturned - * content will be NULL in sitautions where all content between nodes was - * stripped. - *@author Mike Buland - */ -class XmlReader : public XmlDocument -{ -public: - /** - * Create a standard XmlReader. The optional parameter bStrip allows you to - * create a reader that will strip out all leading and trailing whitespace - * in content, a-la html. - *@param bStrip Strip out leading and trailing whitespace? - */ - XmlReader( Bu::Stream &sIn, bool bStrip=false ); - - /** - * Destroy this XmlReader. - */ - virtual ~XmlReader(); - - /** - * Build a document based on some kind of input. This is called - * automatically by the constructor. - */ - bool buildDoc(); - -private: - /** - * This is called by the low level automoton in order to get the next - * character. This function should return a character at the current - * position plus nIndex, but does not increment the current character. - *@param nIndex The index of the character from the current stream position. - *@returns A single character at the requested position, or 0 for end of - * stream. - */ - virtual char getChar( int nIndex = 0 ); - - /** - * Called to increment the current stream position by a single character. - */ - virtual void usedChar( int nAmnt = 1 ); - - /** - * Automoton function: is whitespace. - *@param chr A character - *@returns True if chr is whitespace, false otherwise. - */ - bool isws( char chr ); - - /** - * Automoton function: ws. Skips sections of whitespace. - *@returns True if everything was ok, False for end of stream. - */ - bool ws(); - - /** - * Automoton function: node. Processes an XmlNode - *@returns True if everything was ok, False for end of stream. - */ - bool node(); - - /** - * Automoton function: startNode. Processes the begining of a node. - *@returns True if everything was ok, False for end of stream. - */ - bool startNode(); - - /** - * Automoton function: name. Processes the name of a node. - *@returns True if everything was ok, False for end of stream. - */ - bool name(); - - /** - * Automoton function: textDecl. Processes the xml text decleration, if - * there is one. - */ - void textDecl(); - - /** - * Automoton function: entity. Processes an entity from the header. - */ - void entity(); - - /** - * Adds an entity to the list, if it doesn't already exist. - *@param name The name of the entity - *@param value The value of the entity - */ - void addEntity( const Bu::FString &name, const Bu::FString &value ); - - Bu::FString getEscape(); - - /** - * Automoton function: paramlist. Processes a list of node params. - *@returns True if everything was ok, False for end of stream. - */ - bool paramlist(); - - /** - * Automoton function: param. Processes a single parameter. - *@returns True if everything was ok, False for end of stream. - */ - bool param(); - - /** - * Automoton function: content. Processes node content. - *@returns True if everything was ok, False for end of stream. - */ - bool content(); - - Bu::FString sContent; /**< buffer for the current node's content. */ - Bu::FString sParamName; /**< buffer for the current param's name. */ - Bu::FString sParamValue; /**< buffer for the current param's value. */ - Bu::Stream &sIn; - bool bStrip; /**< Are we stripping whitespace? */ - - Bu::Hash htEntity; /**< Entity type definitions. */ - - Bu::FString sBuf; -}; - -#endif diff --git a/src/xmlwriter.cpp b/src/xmlwriter.cpp deleted file mode 100644 index 7dc6ca9..0000000 --- a/src/xmlwriter.cpp +++ /dev/null @@ -1,167 +0,0 @@ -#include -#include -#include "xmlwriter.h" - -XmlWriter::XmlWriter( const Bu::FString &sIndent, XmlNode *pRoot ) : - XmlDocument( pRoot ), - sIndent( sIndent ) -{ -} - -XmlWriter::~XmlWriter() -{ -} - -void XmlWriter::write() -{ - write( getRoot(), sIndent.c_str() ); -} - -void XmlWriter::write( XmlNode *pRoot, const Bu::FString &sIndent ) -{ - writeNode( pRoot, 0, sIndent ); -} - -void XmlWriter::closeNode() -{ - XmlDocument::closeNode(); - - if( isCompleted() ) - { - write( getRoot(), sIndent.c_str() ); - } -} - -void XmlWriter::writeIndent( int nIndent, const Bu::FString &sIndent ) -{ - if( sIndent == NULL ) return; - for( int j = 0; j < nIndent; j++ ) - { - writeString( sIndent ); - } -} - -Bu::FString XmlWriter::escape( const Bu::FString &sIn ) -{ - Bu::FString sOut; - - int nMax = sIn.getSize(); - for( int j = 0; j < nMax; j++ ) - { - char c = sIn[j]; - if( ((c >= ' ' && c <= '9') || - (c >= 'a' && c <= 'z') || - (c >= 'A' && c <= 'Z') ) && - (c != '\"' && c != '\'' && c != '&') - ) - { - sOut += c; - } - else - { - sOut += "&#"; - char buf[4]; - sprintf( buf, "%u", (unsigned char)c ); - sOut += buf; - sOut += ';'; - } - } - - return sOut; -} - -void XmlWriter::writeNodeProps( XmlNode *pNode, int nIndent, const Bu::FString &sIndent ) -{ - for( int j = 0; j < pNode->getNumProperties(); j++ ) - { - writeString(" "); - //writeString( pNode->getPropertyName( j ) ); - writeString("=\""); - //writeString( escape( pNode->getProperty( j ) ).c_str() ); - writeString("\""); - } -} - -void XmlWriter::writeNode( XmlNode *pNode, int nIndent, const Bu::FString &sIndent ) -{ - if( pNode->hasChildren() ) - { - writeIndent( nIndent, sIndent ); - writeString("<"); - writeString( pNode->getName() ); - writeNodeProps( pNode, nIndent, sIndent ); - if( sIndent != "" ) - writeString(">\n"); - else - writeString(">"); -/* - if( pNode->getContent( 0 ) ) - { - writeIndent( nIndent+1, sIndent ); - if( sIndent != "" ) - { - writeString( pNode->getContent( 0 ) ); - writeString("\n"); - } - else - writeString( pNode->getContent( 0 ) ); - } - - int nNumChildren = pNode->getNumChildren(); - for( int j = 0; j < nNumChildren; j++ ) - { - writeNode( pNode->getChild( j ), nIndent+1, sIndent ); - if( pNode->getContent( j+1 ) ) - { - writeIndent( nIndent+1, sIndent ); - if( sIndent ) - { - writeString( pNode->getContent( j+1 ) ); - writeString("\n"); - } - else - writeString( pNode->getContent( j+1 ) ); - } - } -*/ - writeIndent( nIndent, sIndent ); - if( sIndent != "" ) - { - writeString("getName() ); - writeString(">\n"); - } - else - { - writeString("getName() ); - writeString(">"); - } - }/* - else if( pNode->getContent() ) - { - writeIndent( nIndent, sIndent ); - writeString("<"); - writeString( pNode->getName() ); - writeNodeProps( pNode, nIndent, sIndent ); - writeString(">"); - writeString( pNode->getContent() ); - writeString("getName() ); - writeString(">"); - if( sIndent ) - writeString("\n"); - }*/ - else - { - writeIndent( nIndent, sIndent ); - writeString("<"); - writeString( pNode->getName() ); - writeNodeProps( pNode, nIndent, sIndent ); - if( sIndent != "" ) - writeString("/>\n"); - else - writeString("/>"); - } -} - diff --git a/src/xmlwriter.h b/src/xmlwriter.h deleted file mode 100644 index 7e3c876..0000000 --- a/src/xmlwriter.h +++ /dev/null @@ -1,96 +0,0 @@ -#ifndef XMLWRITER -#define XMLWRITER - -#include "xmlnode.h" -#include "xmldocument.h" - -/** - * Implements xml writing in the XML standard format. Also allows you to - * break that format and auto-indent your exported xml data for ease of - * reading. The auto-indenting will only be applied to sections that - * have no content of their own already. This means that except for - * whitespace all of your data will be preserved perfectly. - * You can create an XmlWriter object around a file, or access the static - * write function directly and just hand it a filename and a root XmlNode. - * When using an XmlWriter object the interface is identicle to that of - * the XmlDocument class, so reference that class for API info. However - * when the initial (or root) node is closed, and the document is finished - * the file will be created and written to automatically. The user can - * check to see if this is actually true by calling the isFinished - * function in the XmlDocument class. - *@author Mike Buland - */ -class XmlWriter : public XmlDocument -{ -public: - /** - * Construct a standard XmlWriter. - *@param sIndent Set this to something other than NULL to include it as an - * indent before each node in the output that doesn't already have content. - * If you are using the whitespace stripping option in the XmlReader and set - * this to a tab or some spaces it will never effect the content of your - * file. - */ - XmlWriter( const Bu::FString &sIndent="", XmlNode *pRoot=NULL ); - - /** - * Destroy the writer. - */ - virtual ~XmlWriter(); - - /** - * This override of the parent class closeNode function calls the parent - * class, but also triggers a write operation when the final node is closed. - * This means that by checking the isCompleted() function the user may also - * check to see if their file has been written or not. - */ - void closeNode(); - - void write(); - -private: - Bu::FString sIndent; /**< The indent string */ - - Bu::FString escape( const Bu::FString &sIn ); - - /** - * Write the file. - *@param pNode The root node - *@param sIndent The indent text. - */ - void write( XmlNode *pNode, const Bu::FString &sIndent ); - - /** - * Write a node in the file, including children. - *@param pNode The node to write. - *@param nIndent The indent level (the number of times to include sIndent) - *@param sIndent The indent text. - */ - void writeNode( XmlNode *pNode, int nIndent, const Bu::FString &sIndent ); - - /** - * Write the properties of a node. - *@param pNode The node who's properties to write. - *@param nIndent The indent level of the containing node - *@param sIndent The indent text. - */ - void writeNodeProps( XmlNode *pNode, int nIndent, const Bu::FString &sIndent ); - - /** - * Called to write the actual indent. - *@param nIndent The indent level. - *@param sIndent The indent text. - */ - void writeIndent( int nIndent, const Bu::FString &sIndent ); - - /** - * This is the function that must be overridden in order to use this class. - * It must write the null-terminated string sString, minus the mull, - * verbatum to it's output device. Adding extra characters for any reason - * will break the XML formatting. - *@param sString The string data to write to the output. - */ - virtual void writeString( const Bu::FString &sString ) = 0; -}; - -#endif -- cgit v1.2.3 From 9f98bc834ce2ac524c47ef633be4b4fb9eb8a079 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Tue, 12 Jun 2007 20:41:00 +0000 Subject: Removed the xml test...the xml system is effectively gone. --- src/tests/xml.cpp | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 src/tests/xml.cpp diff --git a/src/tests/xml.cpp b/src/tests/xml.cpp deleted file mode 100644 index 9689a28..0000000 --- a/src/tests/xml.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "bu/xmlreader.h" -#include "bu/xmlnode.h" -#include "bu/xmldocument.h" -#include "bu/file.h" - -int main() -{ - Bu::File f("test.xml", "r"); - XmlReader xr( f ); - - //xr.read(); - - return 0; -} - -- cgit v1.2.3 From 2b90449c30e4a420af4fff7e58588611d71f61fc Mon Sep 17 00:00:00 2001 From: David Date: Fri, 15 Jun 2007 18:54:59 +0000 Subject: david - wrote two silly unit tests... --- src/unit/hash.cpp | 40 ++++++++++++++++++++++++++++++++++++++++ src/unit/taf.cpp | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 src/unit/hash.cpp create mode 100644 src/unit/taf.cpp diff --git a/src/unit/hash.cpp b/src/unit/hash.cpp new file mode 100644 index 0000000..588e687 --- /dev/null +++ b/src/unit/hash.cpp @@ -0,0 +1,40 @@ +#include "bu/fstring.h" +#include "bu/hash.h" +#include "unitsuite.h" + +#include + +class Unit : public Bu::UnitSuite +{ +private: + typedef Bu::Hash StrIntHash; +public: + Unit() + { + setName("Hash"); + addTest( Unit::test_probe ); + } + + virtual ~Unit() + { + } + + void test_probe() + { + StrIntHash h; + char buf[20]; + for(int i=0;i<10000;i++) + { + sprintf(buf,"%d",i); + Bu::FString sTmp(buf); + h[sTmp] = i; + unitTest( h.has(sTmp) ); + } + } +}; + +int main( int argc, char *argv[] ) +{ + return Unit().run( argc, argv ); +} + diff --git a/src/unit/taf.cpp b/src/unit/taf.cpp new file mode 100644 index 0000000..ab485d0 --- /dev/null +++ b/src/unit/taf.cpp @@ -0,0 +1,48 @@ +#include "unitsuite.h" +#include "file.h" +#include "tafreader.h" + +#include +#include + +class Unit : public Bu::UnitSuite +{ +public: + Unit() + { + setName("taf"); + addTest( Unit::read1 ); + } + + virtual ~Unit() + { + } + + void read1() + { +#define FN_TMP ("/tmp/tmpXXXXXXXX") + Bu::FString sFnTmp(FN_TMP); + Bu::File fOut = Bu::File::tempFile( sFnTmp, "wb" ); + const char *data = +"{test: name=\"Bob\"}" +; + fOut.write(data,strlen(data)); + fOut.close(); + + Bu::File fIn(sFnTmp.c_str(), "rb"); + Bu::TafReader tr(fIn); + + Bu::TafNode *tn = tr.getNode(); + unitTest( !strcmp("Bob", tn->getProperty("name").c_str()) ); + delete tn; + + unlink(sFnTmp.c_str()); +#undef FN_TMP + } +}; + +int main( int argc, char *argv[] ) +{ + return Unit().run( argc, argv ); +} + -- cgit v1.2.3 From 5292e5831934dc719d1ac06332bd252abe4ac3bc Mon Sep 17 00:00:00 2001 From: David Date: Mon, 18 Jun 2007 19:41:34 +0000 Subject: david - writing code documentation... --- src/fstring.h | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/hash.h | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/list.h | 15 ++++++ 3 files changed, 306 insertions(+) diff --git a/src/fstring.h b/src/fstring.h index 93a0042..9d88bd4 100644 --- a/src/fstring.h +++ b/src/fstring.h @@ -29,6 +29,11 @@ namespace Bu * almost no overhead in time or memory since a reference is created and no * data is actually copied. This also means that you never need to put any * FBasicString into a ref-counting container class. + * + *@param chr (typename) Type of character (i.e. char) + *@param nMinSize (int) Chunk size (default: 256) + *@param chralloc (typename) Memory Allocator for chr + *@param chunkalloc (typename) Memory Allocator for chr chunks */ template< typename chr, int nMinSize=256, typename chralloc=std::allocator, typename chunkalloc=std::allocator > > class FBasicString : public Archival @@ -113,6 +118,14 @@ namespace Bu clear(); } + /** + *@todo void append( const MyType & sData ) + */ + + /** + * Append data to your string. + *@param pData (const chr *) The data to append. + */ void append( const chr *pData ) { long nLen; @@ -126,6 +139,11 @@ namespace Bu appendChunk( pNew ); } + /** + * Append data to your string. + *@param pData (const chr *) The data to append. + *@param nLen (long) The length of the data to append. + */ void append( const chr *pData, long nLen ) { if( nLen == 0 ) @@ -138,16 +156,28 @@ namespace Bu appendChunk( pNew ); } + /** + * Append a single chr to your string. + *@param cData (const chr &) The character to append. + */ void append( const chr &cData ) { append( &cData, 1 ); } + /** + * Prepend another FString to this one. + *@param sData (MyType &) The FString to prepend. + */ void prepend( const MyType & sData ) { prepend( sData.getStr(), sData.getSize() ); } + /** + * Prepend data to your string. + *@param pData (const chr *) The data to prepend. + */ void prepend( const chr *pData ) { long nLen; @@ -159,6 +189,11 @@ namespace Bu prependChunk( pNew ); } + /** + * Prepend data to your string. + *@param pData (const chr *) The data to prepend. + *@param nLen (long) The length of the data to prepend. + */ void prepend( const chr *pData, long nLen ) { Chunk *pNew = newChunk( nLen ); @@ -168,11 +203,22 @@ namespace Bu prependChunk( pNew ); } + /** + *@todo void prepend( const chr &cData ) + */ + + /** + * Clear all data from the string. + */ void clear() { realClear(); } + /** + * Force the string to resize + *@param nNewSize (long) The new size of the string. + */ void resize( long nNewSize ) { if( nLength == nNewSize ) @@ -190,11 +236,19 @@ namespace Bu nLength = nNewSize; } + /** + * Get the current size of the string. + *@returns (long) The current size of the string. + */ long getSize() const { return nLength; } + /** + * Get a pointer to the string array. + *@returns (chr *) The string data. + */ chr *getStr() { if( pFirst == NULL ) @@ -204,6 +258,10 @@ namespace Bu return pFirst->pData; } + /** + * Get a const pointer to the string array. + *@returns (const chr *) The string data. + */ const chr *getStr() const { if( pFirst == NULL ) @@ -213,6 +271,10 @@ namespace Bu return pFirst->pData; } + /** + * (std::string compatability) Get a pointer to the string array. + *@returns (chr *) The string data. + */ chr *c_str() { if( pFirst == NULL ) @@ -222,6 +284,10 @@ namespace Bu return pFirst->pData; } + /** + * (std::string compatability) Get a const pointer to the string array. + *@returns (const chr *) The string data. + */ const chr *c_str() const { if( pFirst == NULL ) @@ -231,6 +297,10 @@ namespace Bu return pFirst->pData; } + /** + * Plus equals operator for FString. + *@param pData (const chr *) The data to append to your FString. + */ MyType &operator +=( const chr *pData ) { append( pData ); @@ -238,6 +308,10 @@ namespace Bu return (*this); } + /** + * Plus equals operator for FString. + *@param pData (const MyType &) The FString to append to your FString. + */ MyType &operator +=( const MyType &rSrc ) { if( rSrc.nLength == 0 ) @@ -248,6 +322,10 @@ namespace Bu return (*this); } + /** + * Plus equals operator for FString. + *@param pData (const chr) The character to append to your FString. + */ MyType &operator +=( const chr pData ) { append( &pData, 1 ); @@ -255,6 +333,11 @@ namespace Bu return (*this); } + /** + * Assignment operator. + *@param pData (const chr *) The character array to append to your + * FString. + */ MyType &operator =( const chr *pData ) { clear(); @@ -263,18 +346,31 @@ namespace Bu return (*this); } + /** + * Reset your FString to this character array. + *@param pData (const chr *) The character array to set your FString to. + */ void set( const chr *pData ) { clear(); append( pData ); } + /** + * Reset your FString to this character array. + *@param pData (const chr *) The character array to set your FString to. + *@param nSize (long) The length of the inputted character array. + */ void set( const chr *pData, long nSize ) { clear(); append( pData, nSize ); } + /** + * Assignment operator. + *@param rSrc (const MyType &) The FString to set your FString to. + */ MyType &operator =( const MyType &rSrc ) { //if( rSrc.isFlat() ) @@ -290,6 +386,11 @@ namespace Bu return (*this); } + /** + * Equals comparison operator. + *@param pData (const chr *) The character array to compare your FString + * to. + */ bool operator ==( const chr *pData ) const { if( pFirst == NULL ) { @@ -310,6 +411,10 @@ namespace Bu return true; } + /** + * Equals comparison operator. + *@param pData (const MyType &) The FString to compare your FString to. + */ bool operator ==( const MyType &pData ) const { if( pFirst == pData.pFirst ) @@ -330,16 +435,30 @@ namespace Bu return true; } + /** + * Not equals comparison operator. + *@param pData (const chr *) The character array to compare your FString + * to. + */ bool operator !=(const chr *pData ) const { return !(*this == pData); } + /** + * Not equals comparison operator. + *@param pData (const MyType &) The FString to compare your FString to. + */ bool operator !=(const MyType &pData ) const { return !(*this == pData); } + /** + * Indexing operator + *@param nIndex (long) The index of the character you want. + *@returns (chr &) The character at position (nIndex). + */ chr &operator[]( long nIndex ) { flatten(); @@ -347,6 +466,11 @@ namespace Bu return pFirst->pData[nIndex]; } + /** + * Const indexing operator + *@param nIndex (long) The index of the character you want. + *@returns (const chr &) The character at position (nIndex). + */ const chr &operator[]( long nIndex ) const { flatten(); @@ -354,6 +478,11 @@ namespace Bu return pFirst->pData[nIndex]; } + /** + * Is the character at index (nIndex) white space? + *@param nIndex (long) The index of the character you want to check. + *@returns (bool) Is it white space? + */ bool isWS( long nIndex ) const { flatten(); @@ -362,6 +491,11 @@ namespace Bu || pFirst->pData[nIndex]=='\r' || pFirst->pData[nIndex]=='\n'; } + /** + * Is the character at index (nIndex) a letter? + *@param nIndex (long) The index of the character you want to check. + *@returns (bool) Is it a letter? + */ bool isAlpha( long nIndex ) const { flatten(); @@ -370,6 +504,9 @@ namespace Bu || (pFirst->pData[nIndex] >= 'A' && pFirst->pData[nIndex] <= 'Z'); } + /** + * Convert your alpha characters to lower case. + */ void toLower() { flatten(); @@ -382,6 +519,9 @@ namespace Bu } } + /** + * Convert your alpha characters to upper case. + */ void toUpper() { flatten(); @@ -394,6 +534,11 @@ namespace Bu } } + /** + * Find the index of the first occurrance of (sText) + *@param sText (const char *) The string to search for. + *@returns (long) The index of the first occurrance. -1 for not found. + */ long find( const char *sText ) { long nTLen = strlen( sText ); @@ -406,6 +551,11 @@ namespace Bu return -1; } + /** + * Do a reverse search for (sText) + *@param sText (const char *) The string to search for. + *@returns (long) The index of the last occurrance. -1 for not found. + */ long rfind( const char *sText ) { long nTLen = strlen( sText ); @@ -418,6 +568,10 @@ namespace Bu return -1; } + /** + * Function the archiver calls to archive your FString. + *@param ar (Archive) The archive which is archiving your FString. + */ void archive( class Archive &ar ) { if( ar.isLoading() ) diff --git a/src/hash.h b/src/hash.h index 1bb25c9..6c4a443 100644 --- a/src/hash.h +++ b/src/hash.h @@ -71,6 +71,10 @@ namespace Bu bool bFilled; public: + /** + * Cast operator for HashProxy. + *@returns (value_type &) The value the HashProxy is pointing to. + */ operator _value &() { if( bFilled == false ) @@ -81,6 +85,10 @@ namespace Bu return *pValue; } + /** + * Direct function for retrieving a value out of the HashProxy. + *@returns (value_type &) The value pointed to by this HashProxy. + */ _value &value() { if( bFilled == false ) @@ -91,11 +99,17 @@ namespace Bu return *pValue; } + /** + * Whether this HashProxy points to something real or not. + */ bool isFilled() { return bFilled; } + /** + * Erase the data pointed to by this HashProxy. + */ void erase() { if( bFilled ) @@ -105,6 +119,10 @@ namespace Bu } } + /** + * Assign data to this point in the hash table. + *@param nval (value_type) the data to assign. + */ _value operator=( _value nval ) { if( bFilled ) @@ -122,6 +140,11 @@ namespace Bu return nval; } + /** + * Pointer extraction operator. Access to members of data pointed to + * by HashProxy. + *@returns (value_type *) + */ _value *operator->() { if( bFilled == false ) @@ -133,6 +156,15 @@ namespace Bu } }; + /** + * Libbu Template Hash Table + *@param key (typename) The datatype of the hashtable keys + *@param value (typename) The datatype of the hashtable data + *@param sizecalc (typename) Functor to compute new table size on rehash + *@param keyalloc (typename) Memory allocator for hashtable keys + *@param valuealloc (typename) Memory allocator for hashtable values + *@param challoc (typename) Byte allocator for bitflags + */ template class Hash { @@ -186,6 +218,10 @@ namespace Bu } } + /** + * Hashtable assignment operator. Clears this hashtable and + * copies RH into it. + */ Hash &operator=( const Hash &src ) { for( uint32_t j = 0; j < nCapacity; j++ ) @@ -244,26 +280,49 @@ namespace Bu ca.deallocate( aHashCodes, nCapacity ); } + /** + * Get the current hash table capacity. (Changes at re-hash) + *@returns (uint32_t) The current capacity. + */ uint32_t getCapacity() { return nCapacity; } + /** + * Get the number of hash locations spoken for. (Including + * not-yet-cleaned-up deleted items.) + *@returns (uint32_t) The current fill state. + */ uint32_t getFill() { return nFilled; } + /** + * Get the number of items stored in the hash table. + *@returns (uint32_t) The number of items stored in the hash table. + */ uint32_t size() { return nFilled-nDeleted; } + /** + * Get the number of items which have been deleted, but not yet + * cleaned up. + *@returns (uint32_t) The number of deleted items. + */ uint32_t getDeleted() { return nDeleted; } + /** + * Hash table index operator + *@param k (key_type) Key of data to be retrieved. + *@returns (HashProxy) Proxy pointing to the data. + */ virtual HashProxy operator[]( key k ) { uint32_t hash = __calcHashCode( k ); @@ -280,6 +339,11 @@ namespace Bu } } + /** + * Insert a value (v) under key (k) into the hash table + *@param k (key_type) Key to list the value under. + *@param v (value_type) Value to store in the hash table. + */ virtual void insert( key k, value v ) { uint32_t hash = __calcHashCode( k ); @@ -299,6 +363,10 @@ namespace Bu } } + /** + * Remove a value from the hash table. + *@param k (key_type) The data under this key will be erased. + */ virtual void erase( key k ) { uint32_t hash = __calcHashCode( k ); @@ -313,6 +381,11 @@ namespace Bu } struct iterator; + + /** + * Remove a value from the hash pointed to from an iterator. + *@param i (iterator &) The data to be erased. + */ virtual void erase( struct iterator &i ) { if( this != &i.hsh ) @@ -324,6 +397,9 @@ namespace Bu } } + /** + * Remove all data from the hash table. + */ virtual void clear() { for( uint32_t j = 0; j < nCapacity; j++ ) @@ -340,6 +416,11 @@ namespace Bu clearBits(); } + /** + * Get an item of data from the hash table. + *@param k (key_type) Key pointing to the data to be retrieved. + *@returns (value_type &) The data pointed to by (k). + */ virtual value &get( key k ) { uint32_t hash = __calcHashCode( k ); @@ -359,6 +440,12 @@ namespace Bu } } + /** + * Get a const item of data from the hash table. + *@param k (key_type) Key pointing to the data to be retrieved. + *@returns (const value_type &) A const version of the data pointed + * to by (k). + */ virtual const value &get( key k ) const { uint32_t hash = __calcHashCode( k ); @@ -378,6 +465,11 @@ namespace Bu } } + /** + * Does the hash table contain an item under key (k). + *@param k (key_type) The key to check. + *@returns (bool) Whether there was an item in the hash under key (k). + */ virtual bool has( key k ) { bool bFill; @@ -386,6 +478,9 @@ namespace Bu return bFill; } + /** + * Iteration structure for iterating through the hash. + */ typedef struct iterator { friend class Hash; @@ -410,6 +505,9 @@ namespace Bu bool bFinished; public: + /** + * Iterator incrementation operator. Move the iterator forward. + */ iterator operator++( int ) { if( bFinished == false ) @@ -418,6 +516,9 @@ namespace Bu return *this; } + /** + * Iterator incrementation operator. Move the iterator forward. + */ iterator operator++() { if( bFinished == false ) @@ -426,6 +527,9 @@ namespace Bu return *this; } + /** + * Iterator equality comparison operator. Iterators the same? + */ bool operator==( const iterator &oth ) { if( bFinished != oth.bFinished ) @@ -442,11 +546,17 @@ namespace Bu } } + /** + * Iterator not equality comparison operator. Not the same? + */ bool operator!=( const iterator &oth ) { return !(*this == oth ); } + /** + * Iterator assignment operator. + */ iterator operator=( const iterator &oth ) { if( &hsh != &oth.hsh ) @@ -456,32 +566,59 @@ namespace Bu bFinished = oth.bFinished; } + /** + * Iterator dereference operator... err.. get the value + *@returns (value_type &) The value behind this iterator. + */ value &operator *() { return hsh.getValueAtPos( nPos ); } + /** + * Get the key behind this iterator. + *@returns (key_type &) The key behind this iterator. + */ key &getKey() { return hsh.getKeyAtPos( nPos ); } + /** + * Get the value behind this iterator. + *@returs (value_type &) The value behind this iterator. + */ value &getValue() { return hsh.getValueAtPos( nPos ); } }; + /** + * Get an iterator pointing to the first item in the hash table. + *@returns (iterator) An iterator pointing to the first item in the + * hash table. + */ iterator begin() { return iterator( *this ); } + /** + * Get an iterator pointing to a point just past the last item in the + * hash table. + *@returns (iterator) An iterator pointing to a point just past the + * last item in the hash table. + */ iterator end() { return iterator( *this, true ); } + /** + * Get a list of all the keys in the hash table. + *@returns (std::list) The list of keys in the hash table. + */ std::list getKeys() { std::list lKeys; diff --git a/src/list.h b/src/list.h index 4131987..9d1f904 100644 --- a/src/list.h +++ b/src/list.h @@ -21,6 +21,10 @@ namespace Bu * members are only accessable const. Third, erasing a location does not * invalidate the iterator, it simply points to the next valid location, or * end() if there are no more. + * + *@param value (typename) The type of data to store in your list + *@param valuealloc (typename) Memory Allocator for your value type + *@param linkalloc (typename) Memory Allocator for the list links. */ template, typename linkalloc=std::allocator > > class List @@ -53,6 +57,10 @@ namespace Bu clear(); } + /** + * Assignment operator. + *@param src (const MyType &) The list to assign to your list. + */ MyType &operator=( const MyType &src ) { clear(); @@ -62,6 +70,9 @@ namespace Bu } } + /** + * Clear the data from the list. + */ void clear() { Link *pCur = pFirst; @@ -79,6 +90,10 @@ namespace Bu nSize = 0; } + /** + * Append a value to the list. + *@param v (const value_type &) The value to append. + */ void append( const value &v ) { Link *pNew = la.allocate( 1 ); -- cgit v1.2.3 From 8b12972092777af56ae21f65b41f4c40d52c2367 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Mon, 18 Jun 2007 19:42:34 +0000 Subject: Added the protocol class. servers work, but don't send data, updated the streams to include many more state indicators and caps queries, and everything is working better in general. --- src/bzip2.cpp | 7 +++++- src/bzip2.h | 2 ++ src/client.cpp | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- src/client.h | 20 +++++++++++++--- src/file.cpp | 17 +++++++++++++- src/file.h | 6 ++++- src/filter.cpp | 19 ++++++++++++++-- src/filter.h | 6 ++++- src/protocol.cpp | 12 ++++++++++ src/protocol.h | 26 +++++++++++++++++++++ src/server.cpp | 11 ++++++--- src/server.h | 8 +++++-- src/socket.cpp | 48 ++++++++++++++++++++++++++++++++------- src/socket.h | 6 ++++- src/stream.h | 35 +++++++++++++++++++++++++++- 15 files changed, 266 insertions(+), 26 deletions(-) create mode 100644 src/protocol.cpp create mode 100644 src/protocol.h diff --git a/src/bzip2.cpp b/src/bzip2.cpp index d3f237a..66786e4 100644 --- a/src/bzip2.cpp +++ b/src/bzip2.cpp @@ -128,7 +128,7 @@ size_t Bu::BZip2::read( void *pData, size_t nBytes ) { if( bzState.avail_in > 0 ) { - if( rNext.canSeek() ) + if( rNext.isSeekable() ) { rNext.seek( -bzState.avail_in ); } @@ -185,3 +185,8 @@ size_t Bu::BZip2::write( const void *pData, size_t nBytes ) return sTotalOut; } +bool Bu::BZip2::isOpen() +{ + return (bzState.state != NULL); +} + diff --git a/src/bzip2.h b/src/bzip2.h index a23f07a..25f10c5 100644 --- a/src/bzip2.h +++ b/src/bzip2.h @@ -22,6 +22,8 @@ namespace Bu virtual size_t read( void *pBuf, size_t nBytes ); virtual size_t write( const void *pBuf, size_t nBytes ); + virtual bool isOpen(); + private: void bzError( int code ); bz_stream bzState; diff --git a/src/client.cpp b/src/client.cpp index a33cdc3..cf96424 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1,6 +1,16 @@ -#include "client.h" +#include "bu/client.h" +#include "bu/socket.h" +#include +#include +#include "bu/exceptions.h" +#include "bu/protocol.h" -Bu::Client::Client() +/** Read buffer size. */ +#define RBS (1024*2) + +Bu::Client::Client( Bu::Socket *pSocket ) : + pSocket( pSocket ), + pProto( NULL ) { } @@ -8,3 +18,58 @@ Bu::Client::~Client() { } +void Bu::Client::processInput() +{ + char buf[RBS]; + size_t nRead, nTotal=0; + + for(;;) + { + nRead = pSocket->read( buf, nRead ); + if( nRead < 0 ) + { + throw Bu::ConnectionException( + excodeReadError, + "Read error: %s", + strerror( errno ) + ); + } + else if( nRead == 0 ) + { + break; + } + else + { + nTotal += nRead; + sReadBuf.append( buf, nRead ); + if( !pSocket->canRead() ) + break; + } + } + + if( pProto && nTotal ) + { + pProto->onNewData( this ); + } +} + +void Bu::Client::setProtocol( Protocol *pProto ) +{ + this->pProto = pProto; +} + +Bu::Protocol *Bu::Client::getProtocol() +{ + return pProto; +} + +void Bu::Client::clearProtocol() +{ + pProto = NULL; +} + +Bu::FString &Bu::Client::getInput() +{ + return sReadBuf; +} + diff --git a/src/client.h b/src/client.h index 27fbad4..1a189e2 100644 --- a/src/client.h +++ b/src/client.h @@ -2,21 +2,35 @@ #define CLIENT_H #include -#include "bu/socket.h" + +#include "bu/fstring.h" namespace Bu { + class Protocol; + class Socket; + /** * */ class Client { public: - Client(); + Client( Bu::Socket *pSocket ); virtual ~Client(); - private: + void processInput(); + Bu::FString &getInput(); + + void setProtocol( Protocol *pProto ); + Bu::Protocol *getProtocol(); + void clearProtocol(); + + private: + Bu::Socket *pSocket; + Bu::Protocol *pProto; + Bu::FString sReadBuf; }; } diff --git a/src/file.cpp b/src/file.cpp index 2965afa..368b788 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -109,7 +109,17 @@ bool Bu::File::canWrite() return true; } -bool Bu::File::canSeek() +bool Bu::File::isReadable() +{ + return true; +} + +bool Bu::File::isWritable() +{ + return true; +} + +bool Bu::File::isSeekable() { return true; } @@ -139,3 +149,8 @@ void Bu::File::chmod( mode_t t ) fchmod( fileno( fh ), t ); } +bool Bu::File::isOpen() +{ + return (fh != NULL); +} + diff --git a/src/file.h b/src/file.h index 8107a1b..fe8dbda 100644 --- a/src/file.h +++ b/src/file.h @@ -25,12 +25,16 @@ namespace Bu virtual void setPos( long pos ); virtual void setPosEnd( long pos ); virtual bool isEOS(); + virtual bool isOpen(); virtual void flush(); virtual bool canRead(); virtual bool canWrite(); - virtual bool canSeek(); + + virtual bool isReadable(); + virtual bool isWritable(); + virtual bool isSeekable(); virtual bool isBlocking(); virtual void setBlocking( bool bBlocking=true ); diff --git a/src/filter.cpp b/src/filter.cpp index 693fb9f..96a8694 100644 --- a/src/filter.cpp +++ b/src/filter.cpp @@ -50,6 +50,11 @@ bool Bu::Filter::isEOS() return rNext.isEOS(); } +bool Bu::Filter::isOpen() +{ + return rNext.isOpen(); +} + bool Bu::Filter::canRead() { return rNext.canRead(); @@ -60,9 +65,19 @@ bool Bu::Filter::canWrite() return rNext.canWrite(); } -bool Bu::Filter::canSeek() +bool Bu::Filter::isReadable() +{ + return rNext.isReadable(); +} + +bool Bu::Filter::isWritable() +{ + return rNext.isWritable(); +} + +bool Bu::Filter::isSeekable() { - return rNext.canSeek(); + return rNext.isSeekable(); } bool Bu::Filter::isBlocking() diff --git a/src/filter.h b/src/filter.h index 088d46e..7bb04bc 100644 --- a/src/filter.h +++ b/src/filter.h @@ -40,12 +40,16 @@ namespace Bu virtual void setPos( long pos ); virtual void setPosEnd( long pos ); virtual bool isEOS(); + virtual bool isOpen(); virtual void flush(); virtual bool canRead(); virtual bool canWrite(); - virtual bool canSeek(); + + virtual bool isReadable(); + virtual bool isWritable(); + virtual bool isSeekable(); virtual bool isBlocking(); virtual void setBlocking( bool bBlocking=true ); diff --git a/src/protocol.cpp b/src/protocol.cpp new file mode 100644 index 0000000..0976b3b --- /dev/null +++ b/src/protocol.cpp @@ -0,0 +1,12 @@ +#include "bu/protocol.h" + +using namespace Bu; + +Bu::Protocol::Protocol() +{ +} + +Bu::Protocol::~Protocol() +{ +} + diff --git a/src/protocol.h b/src/protocol.h new file mode 100644 index 0000000..3accd99 --- /dev/null +++ b/src/protocol.h @@ -0,0 +1,26 @@ +#ifndef PROTOCOL_H +#define PROTOCOL_H + +#include + +namespace Bu +{ + class Client; + + /** + * + */ + class Protocol + { + public: + Protocol(); + virtual ~Protocol(); + + virtual void onNewData( Bu::Client *pClient )=0; + + private: + + }; +} + +#endif diff --git a/src/server.cpp b/src/server.cpp index abf4c5b..bceeb81 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1,5 +1,8 @@ -#include "server.h" +#include "bu/server.h" #include +#include "bu/serversocket.h" +#include "bu/client.h" +#include "bu/socket.h" Bu::Server::Server() : nTimeoutSec( 0 ), @@ -58,7 +61,7 @@ void Bu::Server::scan() } else { - + hClients.get( j )->processInput(); } } } @@ -68,7 +71,9 @@ void Bu::Server::addClient( int nSocket, int nPort ) { FD_SET( nSocket, &fdActive ); - Client *c = new Client(); + Client *c = new Client( + new Bu::Socket( nSocket ) + ); hClients.insert( nSocket, c ); onNewConnection( c, nPort ); diff --git a/src/server.h b/src/server.h index 942eb32..3331d2c 100644 --- a/src/server.h +++ b/src/server.h @@ -2,12 +2,16 @@ #define SERVER_H #include -#include "bu/serversocket.h" + +#include "bu/fstring.h" #include "bu/list.h" -#include "bu/client.h" namespace Bu { + class ServerSocket; + class Socket; + class Client; + /** * Core of a network server. This class is distinct from a ServerSocket in * that a ServerSocket is one listening socket, nothing more. Socket will diff --git a/src/socket.cpp b/src/socket.cpp index 1832898..bd05024 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -109,13 +109,6 @@ void Bu::Socket::close() ::close( nSocket ); } bActive = false; - //xInputBuf.clearData(); - //xOutputBuf.clearData(); - //if( pProtocol != NULL ) - //{ - // delete pProtocol; - // pProtocol = NULL; - //} } /* @@ -218,15 +211,49 @@ bool Bu::Socket::isEOS() bool Bu::Socket::canRead() { + fd_set rfds; + FD_ZERO(&rfds); + FD_SET(nSocket, &rfds); + struct timeval tv = { 0, 0 }; + int retval = select( nSocket+1, &rfds, NULL, NULL, &tv ); + if( retval == -1 ) + throw ConnectionException( + excodeBadReadError, + "Bad Read error" + ); + if( !FD_ISSET( nSocket, &rfds ) ) + return false; return true; } bool Bu::Socket::canWrite() { + fd_set wfds; + FD_ZERO(&wfds); + FD_SET(nSocket, &wfds); + struct timeval tv = { 0, 0 }; + int retval = select( nSocket+1, NULL, &wfds, NULL, &tv ); + if( retval == -1 ) + throw ConnectionException( + excodeBadReadError, + "Bad Read error" + ); + if( !FD_ISSET( nSocket, &wfds ) ) + return false; return true; } -bool Bu::Socket::canSeek() +bool Bu::Socket::isReadable() +{ + return true; +} + +bool Bu::Socket::isWritable() +{ + return true; +} + +bool Bu::Socket::isSeekable() { return false; } @@ -244,3 +271,8 @@ void Bu::Socket::flush() { } +bool Bu::Socket::isOpen() +{ + return bActive; +} + diff --git a/src/socket.h b/src/socket.h index 30a43fb..c9dbd8d 100644 --- a/src/socket.h +++ b/src/socket.h @@ -28,12 +28,16 @@ namespace Bu virtual void setPos( long pos ); virtual void setPosEnd( long pos ); virtual bool isEOS(); + virtual bool isOpen(); virtual void flush(); virtual bool canRead(); virtual bool canWrite(); - virtual bool canSeek(); + + virtual bool isReadable(); + virtual bool isWritable(); + virtual bool isSeekable(); virtual bool isBlocking(); virtual void setBlocking( bool bBlocking=true ); diff --git a/src/stream.h b/src/stream.h index a80586b..ba070d3 100644 --- a/src/stream.h +++ b/src/stream.h @@ -31,12 +31,45 @@ namespace Bu virtual void setPos( long pos ) = 0; virtual void setPosEnd( long pos ) = 0; virtual bool isEOS() = 0; + virtual bool isOpen() = 0; virtual void flush() = 0; + /** + * In non-blocking streams this indicates if a read operation will + * return data at the moment or not. In blocking streams this should + * return the same value as isEOS(). + */ virtual bool canRead() = 0; + + /** + * In non-blocking streams this indicates if a write operation will + * succeed or fail. In some cases writing is not allowed (e.g. + * internal buffers are full) temporarilly. In blocking streams this + * should return the same value as isWritable. + */ virtual bool canWrite() = 0; - virtual bool canSeek() = 0; + + /** + * Indicates if the stream is capable of read operations. This does not + * indicate if such operations will return useful data, see canRead for + * that. + */ + virtual bool isReadable() = 0; + + /** + * Indicates if the stream is capable of write operations. This does + * not indicate if such operations will succeed or fail, see canWrite + * for that. + */ + virtual bool isWritable() = 0; + + /** + * Indicates if the stream is capable of seek operations. This is + * generally false for non-blocking streams. Some buffered streams may + * support limited in-buffer seeking. + */ + virtual bool isSeekable() = 0; virtual bool isBlocking() = 0; virtual void setBlocking( bool bBlocking=true ) = 0; -- cgit v1.2.3 From f58a0b3a1f657124076b96ba092e1f69e88af263 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Mon, 18 Jun 2007 20:25:50 +0000 Subject: Added the atom class and did some more client work, it will close the socket now when the end has been reached. --- src/atom.cpp | 1 + src/atom.h | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/client.cpp | 5 +++ src/tests/atom.cpp | 17 ++++++++++ 4 files changed, 116 insertions(+) create mode 100644 src/atom.cpp create mode 100644 src/atom.h create mode 100644 src/tests/atom.cpp diff --git a/src/atom.cpp b/src/atom.cpp new file mode 100644 index 0000000..f966bfc --- /dev/null +++ b/src/atom.cpp @@ -0,0 +1 @@ +#include "bu/atom.h" diff --git a/src/atom.h b/src/atom.h new file mode 100644 index 0000000..731e08b --- /dev/null +++ b/src/atom.h @@ -0,0 +1,93 @@ +#ifndef ATOM_H +#define ATOM_H + +#include +#include +#include "bu/exceptions.h" + +namespace Bu +{ + /** + * + */ + template > + class Atom + { + private: + typedef struct Atom MyType; + + public: + Atom() : + pData( NULL ) + { + } + + virtual ~Atom() + { + clear(); + } + + bool isSet() const + { + return (pData != NULL); + } + + void set( const t &val ) + { + clear(); + pData = ta.allocate( 1 ); + ta.construct( pData, val ); + } + + t &get() + { + if( !pData ) + throw Bu::ExceptionBase("Not set"); + return *pData; + } + + const t &get() const + { + if( !pData ) + throw Bu::ExceptionBase("Not set"); + return *pData; + } + + void clear() + { + if( pData ) + { + ta.destroy( pData ); + ta.deallocate( pData, 1 ); + pData = NULL; + } + } + + operator const t &() const + { + if( !pData ) + throw Bu::ExceptionBase("Not set"); + return *pData; + } + + operator t &() + { + if( !pData ) + throw Bu::ExceptionBase("Not set"); + return *pData; + } + + MyType &operator =( const t &oth ) + { + set( oth ); + + return *this; + } + + private: + t *pData; + talloc ta; + }; +} + +#endif diff --git a/src/client.cpp b/src/client.cpp index cf96424..6d7d81c 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -47,6 +47,11 @@ void Bu::Client::processInput() } } + if( nTotal == 0 ) + { + pSocket->close(); + } + if( pProto && nTotal ) { pProto->onNewData( this ); diff --git a/src/tests/atom.cpp b/src/tests/atom.cpp new file mode 100644 index 0000000..cf076b1 --- /dev/null +++ b/src/tests/atom.cpp @@ -0,0 +1,17 @@ +#include "bu/atom.h" +#include +#include + +int main() +{ + Bu::Atom aInt; + Bu::Atom aStr; + + aStr.set("Hey there, dude"); + aInt.set( 55 ); + int me = aInt; + aInt = 12; + printf("%d, %d\n", aInt.get(), me ); + printf("%s\n", aStr.get() ); +} + -- cgit v1.2.3 From 6f94639a3f5e20e1c635b2d8676086464d7cba2e Mon Sep 17 00:00:00 2001 From: David Date: Mon, 18 Jun 2007 20:45:45 +0000 Subject: david - did more documenting --- src/file.h | 18 ++++++++++++ src/list.h | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/sptr.h | 45 +++++++++++++++++++++++++++++ src/stream.h | 58 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 213 insertions(+) diff --git a/src/file.h b/src/file.h index fe8dbda..1a4421b 100644 --- a/src/file.h +++ b/src/file.h @@ -39,6 +39,14 @@ namespace Bu virtual bool isBlocking(); virtual void setBlocking( bool bBlocking=true ); + /** + * Create a temp file and return its handle + *@param sName (Bu::FString) Give in the form: "/tmp/tmpfileXXXXXXXX" + * It will alter your (sName) setting the 'X's to random + * characters. + *@param sFlags (const char *) Standard file flags 'rb'... etc.. + *@returns (Bu::File) A file object representing your temp file. + */ inline static Bu::File tempFile( Bu::FString &sName, const char *sFlags ) { int afh_d = mkstemp( sName.getStr() ); @@ -46,7 +54,17 @@ namespace Bu return Bu::File( afh_d, sFlags ); } + /** + * Set the size of the file to (nSize). You can either grow or shrink + * the file. + *@param nSize (long) The new size of the file. + */ void truncate( long nSize ); + + /** + * Change the file access permissions. + *@param t (mode_t) The new file access permissions. + */ void chmod( mode_t t ); private: diff --git a/src/list.h b/src/list.h index 9d1f904..314459e 100644 --- a/src/list.h +++ b/src/list.h @@ -115,6 +115,10 @@ namespace Bu } } + /** + * Prepend a value to the list. + *@param v (const value_type &) The value to prepend. + */ void prepend( const value &v ) { Link *pNew = la.allocate( 1 ); @@ -136,6 +140,9 @@ namespace Bu } } + /** + * An iterator to iterate through your list. + */ typedef struct iterator { friend class List; @@ -152,36 +159,67 @@ namespace Bu } public: + /** + * Equals comparison operator. + *@param oth (const iterator &) The iterator to compare to. + *@returns (bool) Are they equal? + */ bool operator==( const iterator &oth ) const { return ( pLink == oth.pLink ); } + /** + * Equals comparison operator. + *@param pOth (const Link *) The link to compare to. + *@returns (bool) Are they equal? + */ bool operator==( const Link *pOth ) const { return ( pLink == pOth ); } + /** + * Not equals comparison operator. + *@param oth (const iterator &) The iterator to compare to. + *@returns (bool) Are they not equal? + */ bool operator!=( const iterator &oth ) const { return ( pLink != oth.pLink ); } + /** + * Not equals comparison operator. + *@param pOth (const Link *) The link to compare to. + *@returns (bool) Are they not equal? + */ bool operator!=( const Link *pOth ) const { return ( pLink != pOth ); } + /** + * Dereference operator. + *@returns (value_type &) The value. + */ value &operator*() { return *(pLink->pValue); } + /** + * Pointer access operator. + *@returns (value_type *) A pointer to the value. + */ value *operator->() { return pLink->pValue; } + /** + * Increment operator. + */ iterator &operator++() { if( pLink != NULL ) @@ -189,6 +227,9 @@ namespace Bu return *this; } + /** + * Decrement operator. + */ iterator &operator--() { if( pLink != NULL ) @@ -196,6 +237,9 @@ namespace Bu return *this; } + /** + * Increment operator. + */ iterator &operator++( int ) { if( pLink != NULL ) @@ -203,6 +247,9 @@ namespace Bu return *this; } + /** + * Decrement operator. + */ iterator &operator--( int ) { if( pLink != NULL ) @@ -210,6 +257,11 @@ namespace Bu return *this; } + /** + * Assignment operator. + *@param oth (const iterator &) The other iterator to set this + * one to. + */ iterator &operator=( const iterator &oth ) { pLink = oth.pLink; @@ -217,6 +269,9 @@ namespace Bu } }; + /** + *@see iterator + */ typedef struct const_iterator { friend class List; @@ -309,21 +364,38 @@ namespace Bu } }; + /** + * Get an iterator pointing to the first item in the list. + *@returns (iterator) + */ iterator begin() { return iterator( pFirst ); } + /** + * Get a const iterator pointing to the first item in the list. + *@returns (const const_iterator) + */ const const_iterator begin() const { return const_iterator( pFirst ); } + /** + * Get an iterator pointing to a place just past the last item in + * the list. + *@returns (const Link *) + */ const Link *end() const { return NULL; } + /** + * Erase an item from the list. + *@param i (iterator) The item to erase. + */ void erase( iterator &i ) { Link *pCur = i.pLink; @@ -355,26 +427,46 @@ namespace Bu } } + /** + * Get the current size of the list. + *@returns (int) The current size of the list. + */ int getSize() const { return nSize; } + /** + * Get the first item in the list. + *@returns (value_type &) The first item in the list. + */ value &first() { return *pFirst->pValue; } + /** + * Get the first item in the list. + *@returns (const value_type &) The first item in the list. + */ const value &first() const { return *pFirst->pValue; } + /** + * Get the last item in the list. + *@returns (value_type &) The last item in the list. + */ value &last() { return *pLast->pValue; } + /** + * Get the last item in the list. + *@returns (const value_type &) The last item in the list. + */ const value &last() const { return *pLast->pValue; diff --git a/src/sptr.h b/src/sptr.h index faa8524..4baa697 100644 --- a/src/sptr.h +++ b/src/sptr.h @@ -45,31 +45,55 @@ namespace Bu } } + /** + * Get the number of references to this pointer. + *@returns (int32_t) The number of references to this pointer. + */ int32_t count() const { return *pRefCnt; } + /** + * Pointer access operator. + *@returns (const T *) + */ const T *operator->() const { return pData; } + /** + * Dereference operator. + *@returns (const T &) The value at the end of the pointer. + */ const T &operator*() const { return *pData; } + /** + * Pointer access operator. + *@returns (T *) + */ T *operator->() { return pData; } + /** + * Dereference operator. + *@returns (T &) The value at the end of the pointer. + */ T &operator*() { return *pData; } + /** + * Assignment operator. + *@param src (const SPtr &) + */ SPtr operator=( const SPtr &src ) { decCount(); @@ -81,6 +105,10 @@ namespace Bu return *this; } + /** + * Assignment operator. + *@param src (const SPtr &) + */ const SPtr operator=( const SPtr &src ) const { decCount(); @@ -92,21 +120,38 @@ namespace Bu return *this; } + /** + * Equals comparison operator. + *@param src (const SPtr &) The SPtr to compare to. + *@returns (bool) Are the equal? + */ bool operator==( const SPtr &src ) const { return pData == src.pData; } + /** + * Equals comparison operator. + *@param src (const T *) The pointer to compare to. + *@returns (bool) Are the equal? + */ bool operator==( const T *src ) const { return pData == src; } + /** + * Boolean cast operator. Do we have a pointer? + */ operator bool() const { return pRefCnt != NULL; } + /** + * Do we have a pointer? + *@returns (bool) Do we have a pointer? + */ bool isSet() const { return pRefCnt != NULL; diff --git a/src/stream.h b/src/stream.h index ba070d3..056de0c 100644 --- a/src/stream.h +++ b/src/stream.h @@ -22,17 +22,66 @@ namespace Bu Stream(); virtual ~Stream(); + /** + * Close the stream. + */ virtual void close() = 0; + + /** + * Read data from the stream into a buffer. + *@param pBuf (void *) Buffer which will be filled. + *@param nBytes (size_t) Max data to read. + *@returns (size_t) Amount of data read. + */ virtual size_t read( void *pBuf, size_t nBytes ) = 0; + + /** + * Write data to the stream. + *@param pBuf (const void *) The data to be written. + *@param nBytes (size_t) Amount of data to write from pBuf. + *@returns (size_t) Amount of data actually written. + */ virtual size_t write( const void *pBuf, size_t nBytes ) = 0; + /** + * Get the current position in the stream. + *@returns (long) The current position in the stream. + */ virtual long tell() = 0; + + /** + * Seek to a position in the stream relative to the current position. + *@param offset (long) Offset from current position to seek to. + */ virtual void seek( long offset ) = 0; + + /** + * Set position in the stream relative to the start of the stream. + *@param pos (long) The position. + */ virtual void setPos( long pos ) = 0; + + /** + * Set position in the stream relative to the end of the stream. + *@param pos (long) The position. + */ virtual void setPosEnd( long pos ) = 0; + + /** + * Are we at the end of the stream? + *@returns (bool) Are we at the end of the stream? + */ virtual bool isEOS() = 0; + + /** + * Is the stream open? + *@returns (bool) Is the stream open? + */ virtual bool isOpen() = 0; + /** + * Flush any data still held in buffers. + */ virtual void flush() = 0; /** @@ -71,7 +120,16 @@ namespace Bu */ virtual bool isSeekable() = 0; + /** + * Are we currently set to block mode? + *@returns (bool) + */ virtual bool isBlocking() = 0; + + /** + * Set stream to blocking or non-blocking mode. + *@param bBlocking (bool) Whether we should block or not. + */ virtual void setBlocking( bool bBlocking=true ) = 0; public: // Filters -- cgit v1.2.3 From 33012c4ef4d39efad4fbc2b19f494f5c860fff51 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Mon, 18 Jun 2007 22:44:45 +0000 Subject: The client/server system now works both ways, in and out, and works as well as the old one in pretty much every way, and better in most. It's much easier to understand. And the atom class is better. --- src/atom.h | 2 +- src/client.cpp | 25 +++++++++++++++++++++++++ src/client.h | 6 ++++++ src/server.cpp | 17 ++++++++++++++++- src/server.h | 3 ++- 5 files changed, 50 insertions(+), 3 deletions(-) diff --git a/src/atom.h b/src/atom.h index 731e08b..f876274 100644 --- a/src/atom.h +++ b/src/atom.h @@ -27,7 +27,7 @@ namespace Bu clear(); } - bool isSet() const + bool has() const { return (pData != NULL); } diff --git a/src/client.cpp b/src/client.cpp index 6d7d81c..0e48285 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -58,6 +58,15 @@ void Bu::Client::processInput() } } +void Bu::Client::processOutput() +{ + if( sWriteBuf.getSize() > 0 ) + { + pSocket->write( sWriteBuf.getStr(), sWriteBuf.getSize() ); + sWriteBuf.clear(); + } +} + void Bu::Client::setProtocol( Protocol *pProto ) { this->pProto = pProto; @@ -78,3 +87,19 @@ Bu::FString &Bu::Client::getInput() return sReadBuf; } +Bu::FString &Bu::Client::getOutput() +{ + return sWriteBuf; +} + +bool Bu::Client::isOpen() +{ + if( !pSocket ) return false; + return pSocket->isOpen(); +} + +void Bu::Client::write( const char *pData, int nBytes ) +{ + sWriteBuf.append( pData, nBytes ); +} + diff --git a/src/client.h b/src/client.h index 1a189e2..02ba077 100644 --- a/src/client.h +++ b/src/client.h @@ -20,17 +20,23 @@ namespace Bu virtual ~Client(); void processInput(); + void processOutput(); Bu::FString &getInput(); + Bu::FString &getOutput(); + void write( const char *pData, int nBytes ); void setProtocol( Protocol *pProto ); Bu::Protocol *getProtocol(); void clearProtocol(); + bool isOpen(); + private: Bu::Socket *pSocket; Bu::Protocol *pProto; Bu::FString sReadBuf; + Bu::FString sWriteBuf; }; } diff --git a/src/server.cpp b/src/server.cpp index bceeb81..d07a597 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -61,10 +61,25 @@ void Bu::Server::scan() } else { - hClients.get( j )->processInput(); + Client *pClient = hClients.get( j ); + pClient->processInput(); + if( !pClient->isOpen() ) + { + onClosedConnection( pClient ); + hClients.erase( j ); + FD_CLR( j, &fdActive ); + } } } } + + // Now we just try to write all the pending data on all the sockets. + // this could be done better eventually, if we care about the socket + // wanting to accept writes (using a select). + for( ClientHash::iterator i = hClients.begin(); i != hClients.end(); i++ ) + { + (*i)->processOutput(); + } } void Bu::Server::addClient( int nSocket, int nPort ) diff --git a/src/server.h b/src/server.h index 3331d2c..07eef95 100644 --- a/src/server.h +++ b/src/server.h @@ -53,7 +53,8 @@ namespace Bu int nTimeoutUSec; fd_set fdActive; Hash hServers; - Hash hClients; + typedef Hash ClientHash; + ClientHash hClients; }; } -- cgit v1.2.3 From 8a7fed8386c152023ddae611fe274b966287370a Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Mon, 18 Jun 2007 22:49:39 +0000 Subject: Added more helper guys to atom, it seems weird, but I think it's ok... --- src/atom.h | 14 ++++++++++++++ src/tests/atom.cpp | 8 ++++++++ 2 files changed, 22 insertions(+) diff --git a/src/atom.h b/src/atom.h index f876274..a0469b6 100644 --- a/src/atom.h +++ b/src/atom.h @@ -84,6 +84,20 @@ namespace Bu return *this; } + t *operator ->() + { + if( !pData ) + throw Bu::ExceptionBase("Not set"); + return pData; + } + + t &operator *() + { + if( !pData ) + throw Bu::ExceptionBase("Not set"); + return *pData; + } + private: t *pData; talloc ta; diff --git a/src/tests/atom.cpp b/src/tests/atom.cpp index cf076b1..2077bfd 100644 --- a/src/tests/atom.cpp +++ b/src/tests/atom.cpp @@ -2,10 +2,18 @@ #include #include +typedef struct bob +{ + int a, b; +} bob; int main() { Bu::Atom aInt; Bu::Atom aStr; + Bu::Atom aBob; + + aBob = bob(); + aBob->a = 5; aStr.set("Hey there, dude"); aInt.set( 55 ); -- cgit v1.2.3 From 2b0fa89df615cb4789668014475ae64d99e773b5 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 19 Jun 2007 06:05:55 +0000 Subject: david - got some things compiling on win32 (wine/devc++) --- fstringtest.dev | 59 ++++++++++++++ libbu++.dev | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/file.cpp | 10 ++- src/file.h | 2 + src/tests/fstring.cpp | 10 +++ 5 files changed, 286 insertions(+), 4 deletions(-) create mode 100644 fstringtest.dev create mode 100644 libbu++.dev diff --git a/fstringtest.dev b/fstringtest.dev new file mode 100644 index 0000000..297242d --- /dev/null +++ b/fstringtest.dev @@ -0,0 +1,59 @@ +[Project] +FileName=fstringtest.dev +Name=fstringtest +UnitCount=1 +Type=1 +Ver=1 +ObjFiles= +Includes=z:\home\neonphog\wine_documents\libbu++\src\bu +Libs= +PrivateResource= +ResourceIncludes= +MakeIncludes= +Compiler= +CppCompiler=_@@_ +Linker=libbu++.a_@@_ +IsCpp=1 +Icon= +ExeOutput= +ObjectOutput= +OverrideOutput=0 +OverrideOutputName=fstringtest.exe +HostApplication= +Folders= +CommandLine= +UseCustomMakefile=0 +CustomMakefile= +IncludeVersionInfo=0 +SupportXPThemes=0 +CompilerSet=0 +CompilerSettings=0000000000000000000000 + +[VersionInfo] +Major=0 +Minor=1 +Release=1 +Build=1 +LanguageID=1033 +CharsetID=1252 +CompanyName= +FileVersion= +FileDescription=Developed using the Dev-C++ IDE +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion= +AutoIncBuildNr=0 + +[Unit1] +FileName=src\tests\fstring.cpp +CompileCpp=1 +Folder=fstringtest +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + diff --git a/libbu++.dev b/libbu++.dev new file mode 100644 index 0000000..2fb1ae9 --- /dev/null +++ b/libbu++.dev @@ -0,0 +1,209 @@ +[Project] +FileName=libbu++.dev +Name=libbu++ +UnitCount=16 +Type=2 +Ver=1 +ObjFiles= +Includes=z:\home\neonphog\wine_documents\libbu++\src\bu +Libs= +PrivateResource= +ResourceIncludes= +MakeIncludes= +Compiler= +CppCompiler= +Linker= +IsCpp=1 +Icon= +ExeOutput= +ObjectOutput= +OverrideOutput=0 +OverrideOutputName=libbu++.a +HostApplication= +Folders= +CommandLine= +UseCustomMakefile=0 +CustomMakefile= +IncludeVersionInfo=0 +SupportXPThemes=0 +CompilerSet=0 +CompilerSettings=0000000000000000000000 + +[Unit1] +FileName=src\stream.cpp +CompileCpp=1 +Folder=libbu++ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[VersionInfo] +Major=0 +Minor=1 +Release=1 +Build=1 +LanguageID=1033 +CharsetID=1252 +CompanyName= +FileVersion= +FileDescription=Developed using the Dev-C++ IDE +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion= +AutoIncBuildNr=0 + +[Unit2] +FileName=src\stream.h +CompileCpp=1 +Folder=libbu++ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit3] +FileName=src\file.cpp +CompileCpp=1 +Folder=libbu++ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit4] +FileName=src\file.h +CompileCpp=1 +Folder=libbu++ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit5] +FileName=src\fstring.h +CompileCpp=1 +Folder=libbu++ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit6] +FileName=src\fstring.cpp +CompileCpp=1 +Folder=libbu++ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit7] +FileName=src\archival.cpp +CompileCpp=1 +Folder=libbu++ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit8] +FileName=src\archival.h +CompileCpp=1 +Folder=libbu++ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit9] +FileName=src\archive.cpp +CompileCpp=1 +Folder=libbu++ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit10] +FileName=src\archive.h +CompileCpp=1 +Folder=libbu++ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit11] +FileName=src\hash.h +CompileCpp=1 +Folder=libbu++ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit12] +FileName=src\hash.cpp +CompileCpp=1 +Folder=libbu++ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit13] +FileName=src\exceptionbase.cpp +CompileCpp=1 +Folder=libbu++ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit14] +FileName=src\exceptionbase.h +CompileCpp=1 +Folder=libbu++ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit15] +FileName=src\list.cpp +CompileCpp=1 +Folder=libbu++ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit16] +FileName=src\list.h +CompileCpp=1 +Folder=libbu++ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + diff --git a/src/file.cpp b/src/file.cpp index 368b788..1a8bd08 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -134,19 +134,21 @@ void Bu::File::setBlocking( bool bBlocking ) return; } +#ifndef WIN32 void Bu::File::truncate( long nSize ) { ftruncate( fileno( fh ), nSize ); } -void Bu::File::flush() +void Bu::File::chmod( mode_t t ) { - fflush( fh ); + fchmod( fileno( fh ), t ); } +#endif -void Bu::File::chmod( mode_t t ) +void Bu::File::flush() { - fchmod( fileno( fh ), t ); + fflush( fh ); } bool Bu::File::isOpen() diff --git a/src/file.h b/src/file.h index 1a4421b..0f638a7 100644 --- a/src/file.h +++ b/src/file.h @@ -47,6 +47,7 @@ namespace Bu *@param sFlags (const char *) Standard file flags 'rb'... etc.. *@returns (Bu::File) A file object representing your temp file. */ +#ifndef WIN32 inline static Bu::File tempFile( Bu::FString &sName, const char *sFlags ) { int afh_d = mkstemp( sName.getStr() ); @@ -66,6 +67,7 @@ namespace Bu *@param t (mode_t) The new file access permissions. */ void chmod( mode_t t ); +#endif private: FILE *fh; diff --git a/src/tests/fstring.cpp b/src/tests/fstring.cpp index d600be6..48dfc5f 100644 --- a/src/tests/fstring.cpp +++ b/src/tests/fstring.cpp @@ -3,12 +3,22 @@ #include #include +#ifndef WIN32 inline double getTime() { struct timeval tv; gettimeofday( &tv, NULL ); return ((double)tv.tv_sec) + ((double)tv.tv_usec/1000000.0); } +#else +#include "windows.h" +#include "winbase.h" +inline double getTime() +{ + uint32_t t = (uint32_t) GetTickCount(); + return (double) t / 1000.0; +} +#endif Bu::FString genThing() { -- cgit v1.2.3 From 3f26c19b0b7a9fa73c58189788972ea43b72f014 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Mon, 25 Jun 2007 21:15:55 +0000 Subject: I think the plugger and programchain are all up to date to work with the new libbu++. The program chain may undergo heavy changes still, or be removed entirely, but we need it for congo and squirrelmud, so here it is for a while longer. The TafWriter isn't much closer, you still only get the groups in the output. --- src/linkmessage.cpp | 43 ++++++++++ src/linkmessage.h | 42 ++++++++++ src/old/linkmessage.cpp | 44 ----------- src/old/linkmessage.h | 39 ---------- src/old/plugger.cpp | 1 - src/old/plugger.h | 198 ----------------------------------------------- src/old/programchain.cpp | 96 ----------------------- src/old/programchain.h | 95 ----------------------- src/old/programlink.cpp | 54 ------------- src/old/programlink.h | 99 ------------------------ src/plugger.cpp | 1 + src/plugger.h | 196 ++++++++++++++++++++++++++++++++++++++++++++++ src/programchain.cpp | 97 +++++++++++++++++++++++ src/programchain.h | 98 +++++++++++++++++++++++ src/programlink.cpp | 56 ++++++++++++++ src/programlink.h | 100 ++++++++++++++++++++++++ src/tafwriter.cpp | 25 +++++- src/tafwriter.h | 10 ++- 18 files changed, 665 insertions(+), 629 deletions(-) create mode 100644 src/linkmessage.cpp create mode 100644 src/linkmessage.h delete mode 100644 src/old/linkmessage.cpp delete mode 100644 src/old/linkmessage.h delete mode 100644 src/old/plugger.cpp delete mode 100644 src/old/plugger.h delete mode 100644 src/old/programchain.cpp delete mode 100644 src/old/programchain.h delete mode 100644 src/old/programlink.cpp delete mode 100644 src/old/programlink.h create mode 100644 src/plugger.cpp create mode 100644 src/plugger.h create mode 100644 src/programchain.cpp create mode 100644 src/programchain.h create mode 100644 src/programlink.cpp create mode 100644 src/programlink.h diff --git a/src/linkmessage.cpp b/src/linkmessage.cpp new file mode 100644 index 0000000..abe113c --- /dev/null +++ b/src/linkmessage.cpp @@ -0,0 +1,43 @@ +#include "bu/linkmessage.h" + +Bu::LinkMessage::LinkMessage( int nNewMsg ) +{ + nMsg = nNewMsg; +} + +Bu::LinkMessage::~LinkMessage() +{ +} + +/* +void LinkMessage::setBroadcast( bool bOn ) +{ + bBroadcast = bOn; +} + +bool LinkMessage::isBroadcast() +{ + return bBroadcast; +} + + +void LinkMessage::setFromID( int id ) +{ + nFromLinkID = id; +} + +int LinkMessage::getFromID() +{ + return nFromLinkID; +} + +void LinkMessage::setToID( int id ) +{ + nTargetLinkID = id; +} + +int LinkMessage::getToID() +{ + return nTargetLinkID; +} +*/ diff --git a/src/linkmessage.h b/src/linkmessage.h new file mode 100644 index 0000000..64b8bc2 --- /dev/null +++ b/src/linkmessage.h @@ -0,0 +1,42 @@ +/**\file linkmessage.h + */ + +#ifndef LINKMESSAGE_H +#define LINKMESSAGE_H + +namespace Bu +{ + /** + * A message to be broadcast accross ProgramLinks in a ProgramChain. Generally + * one would make a subclass of this in order to transmit more useful + * information, but sometimes it isn't necesarry. + *@author Mike Buland + */ + class LinkMessage + { + public: + /** + * Construct a blank LinkMessage. + */ + LinkMessage() {}; + + /** + * Deconstruct a LinkMessage. + */ + virtual ~LinkMessage(); + + /** + * Create a LinkMessage object with a specific message assosiated with it + * to start with. + *@param nNewMsg The message to use in the Message object. + */ + LinkMessage( int nNewMsg ); + + /** + * The message contained in the Message object. + */ + int nMsg; + }; +} + +#endif diff --git a/src/old/linkmessage.cpp b/src/old/linkmessage.cpp deleted file mode 100644 index cf3df42..0000000 --- a/src/old/linkmessage.cpp +++ /dev/null @@ -1,44 +0,0 @@ -#include "linkmessage.h" -#include - -LinkMessage::LinkMessage( int nNewMsg ) -{ - nMsg = nNewMsg; -} - -LinkMessage::~LinkMessage() -{ -} - -/* -void LinkMessage::setBroadcast( bool bOn ) -{ - bBroadcast = bOn; -} - -bool LinkMessage::isBroadcast() -{ - return bBroadcast; -} - - -void LinkMessage::setFromID( int id ) -{ - nFromLinkID = id; -} - -int LinkMessage::getFromID() -{ - return nFromLinkID; -} - -void LinkMessage::setToID( int id ) -{ - nTargetLinkID = id; -} - -int LinkMessage::getToID() -{ - return nTargetLinkID; -} -*/ diff --git a/src/old/linkmessage.h b/src/old/linkmessage.h deleted file mode 100644 index 6cdfb2f..0000000 --- a/src/old/linkmessage.h +++ /dev/null @@ -1,39 +0,0 @@ -/**\file linkmessage.h - */ - -#ifndef LINKMESSAGE_H -#define LINKMESSAGE_H - -/** - * A message to be broadcast accross ProgramLinks in a ProgramChain. Generally - * one would make a subclass of this in order to transmit more useful - * information, but sometimes it isn't necesarry. - *@author Mike Buland - */ -class LinkMessage -{ -public: - /** - * Construct a blank LinkMessage. - */ - LinkMessage() {}; - - /** - * Deconstruct a LinkMessage. - */ - virtual ~LinkMessage(); - - /** - * Create a LinkMessage object with a specific message assosiated with it - * to start with. - *@param nNewMsg The message to use in the Message object. - */ - LinkMessage( int nNewMsg ); - - /** - * The message contained in the Message object. - */ - int nMsg; -}; - -#endif diff --git a/src/old/plugger.cpp b/src/old/plugger.cpp deleted file mode 100644 index f3bfa67..0000000 --- a/src/old/plugger.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "plugger.h" diff --git a/src/old/plugger.h b/src/old/plugger.h deleted file mode 100644 index d92f194..0000000 --- a/src/old/plugger.h +++ /dev/null @@ -1,198 +0,0 @@ -#ifndef PLUGGER_H -#define PLUGGER_H - - -#include "hashtable.h" -#include "list" -#include "hashfunctionstring.h" -#include "hashfunctionint.h" -#include "dlfcn.h" -#include "exceptions.h" - -typedef struct PluginInfo -{ - const char *sID; - const char *sAuthor; - unsigned short nVersion; - unsigned short nRevision; - void *(*createPlugin)(); - void (*destroyPlugin)( void * ); -} PluginInfo; - -typedef struct PluginReg -{ - bool bBuiltin; - void *dlHandle; - PluginInfo *pInfo; -} PluginReg; - -#define PluginInterface( classname, baseclass, name, ver, rev ) \ -extern "C" { \ - baseclass *create ##classname() \ - { \ - return new classname(); \ - } \ - void destroy ##classname( baseclass *pCls ) \ - { \ - delete pCls; \ - } \ - PluginInfo classname = { \ - #classname, name, ver, rev, \ - create ##classname, destroy ##classname }; \ -} - -#define PluginInterface2( pluginname, classname, baseclass, name, ver, rev ) \ -extern "C" { \ - baseclass *create ##classname() \ - { \ - return new classname(); \ - } \ - void destroy ##classname( baseclass *pCls ) \ - { \ - delete pCls; \ - } \ - PluginInfo pluginname = { \ - #pluginname, name, ver, rev, \ - (void *(*)())(create ##classname), \ - (void (*)( void * ))(destroy ##classname) }; \ -} - -#define PluginInterface3( structname, pluginname, classname, baseclass, name, ver, rev ) \ -extern "C" { \ - baseclass *create ##classname() \ - { \ - return new classname(); \ - } \ - void destroy ##classname( baseclass *pCls ) \ - { \ - delete pCls; \ - } \ - PluginInfo structname = { \ - #pluginname, name, ver, rev, \ - (void *(*)())(create ##classname), \ - (void (*)( void * ))(destroy ##classname) }; \ -} - -template -class Plugger -{ -public: - -public: - Plugger() : - hPlugin( new HashFunctionString(), 11 ), - hObj( new HashFunctionInt(), 11 ) - { - } - - virtual ~Plugger() - { - void *pos = hObj.getFirstItemPos(); - while( (pos = hObj.getNextItemPos( pos )) ) - { - T *pPlug = (T *)hObj.getItemID( pos ); - PluginReg *pReg = (PluginReg *)hObj.getItemData( pos ); - pReg->pInfo->destroyPlugin( pPlug ); - } - - std::list::iterator i; - for( i = lPlugin.begin(); i != lPlugin.end(); i++ ) - { - if( (*i)->bBuiltin == false ) - { - dlclose( (*i)->dlHandle ); - } - delete (*i); - } - } - - void registerBuiltinPlugin( PluginInfo *pInfo ) - { - PluginReg *pReg = new PluginReg; - pReg->bBuiltin = true; - pReg->pInfo = pInfo; - lPlugin.insert( lPlugin.end(), pReg ); - hPlugin.insert( pInfo->sID, pReg ); - } - - void registerExternalPlugin( const char *sFName, const char *sPluginName ) - { - PluginReg *pReg = (PluginReg *)hPlugin[sPluginName]; - if( pReg != NULL ) - { - hPlugin.del( sPluginName ); - dlclose( pReg->dlHandle ); - delete pReg; - pReg = NULL; - } - - pReg = new PluginReg; - - pReg->bBuiltin = false; - pReg->dlHandle = dlopen( sFName, RTLD_NOW ); - if( pReg->dlHandle == NULL ) - { - throw PluginException( 1, "Error on %s: %s", sFName, dlerror() ); - } - pReg->pInfo = (PluginInfo *)dlsym( pReg->dlHandle, sPluginName ); - if( pReg->pInfo == NULL ) - { - throw PluginException( 2, "Error on %s: %s", sFName, dlerror() ); - } - hPlugin.insert( pReg->pInfo->sID, pReg ); - lPlugin.insert( lPlugin.end(), pReg ); - } - - T *instantiate( const char *lpName ) - { - PluginReg *pReg = (PluginReg *)hPlugin[lpName]; - if( pReg == NULL ) - return NULL; - - T *p = (T *)pReg->pInfo->createPlugin(); - hObj.insert( p, pReg ); - //printf("pReg: %08X, pPlug: %08X\n", pReg, p ); - - return p; - } - - bool hasPlugin( const char *lpName ) - { - if( hPlugin[lpName] == NULL ) - return false; - return true; - } - - void destroy( T *pPlug ) - { - PluginReg *pReg = (PluginReg *)hObj[pPlug]; - //printf("pReg: %08X, pPlug: %08X\n", pReg, pPlug ); - if( pReg == NULL ) - return; - - pReg->pInfo->destroyPlugin( pPlug ); - - hObj.del( pPlug ); - } - - void unloadAll() - { - std::list::iterator i; - for( i = lPlugin.begin(); i != lPlugin.end(); i++ ) - { - if( (*i)->bBuiltin == false ) - { - dlclose( (*i)->dlHandle ); - } - delete (*i); - } - hPlugin.clear(); - } - -private: - std::list lPlugin; - HashTable hPlugin; - HashTable hObj; -}; - -#endif diff --git a/src/old/programchain.cpp b/src/old/programchain.cpp deleted file mode 100644 index 6120d58..0000000 --- a/src/old/programchain.cpp +++ /dev/null @@ -1,96 +0,0 @@ -#include -#include "programchain.h" - -ProgramChain::ProgramChain() : - xLog( MultiLog::getInstance() ) -{ - xLog.LineLog( MultiLog::LStatus, "Program Chain Initialized." ); -} - -ProgramChain::~ProgramChain() -{ -} - -bool ProgramChain::addLink( ProgramLink *pLink ) -{ - if( pLink->init() == false ) - { - emergencyShutdown(); - return false; - } - - lLink.append( pLink ); - - pLink->setChain( this ); - - return true; -} - -ProgramLink *ProgramChain::getLink( const char *lpName ) -{ - char a; - a = lpName[0]; - return NULL; -} - -ProgramLink *ProgramChain::getBaseLink() -{ - return NULL; -} - -bool ProgramChain::execChainOnce() -{ - int nLen = lLink.getSize(); - for( int j = 0; j < nLen; j++ ) - { - if( ((ProgramLink *)lLink[j])->timeSlice() == false ) - { - xLog.LineLog( MultiLog::LInfo, "Shutting down due to signal from link #%d", j ); - emergencyShutdown(); - return false; - } - } - - return true; -} - -bool ProgramChain::enterChainLoop() -{ - for(;;) - { - if( execChainOnce() == false ) - { - return false; - } - } - - return true; -} - -void ProgramChain::emergencyShutdown() -{ - int nLen = lLink.getSize(); - for( int j = 0; j < nLen; j++ ) - { - ((ProgramLink *)lLink[j])->deInit(); - delete (ProgramLink *)lLink[j]; - } - lLink.empty(); -} - -LinkMessage *ProgramChain::broadcastIRM( LinkMessage *pMsgOut, ProgramLink *pSender ) -{ - int nLen = lLink.getSize(); - for( int j = 0; j < nLen; j++ ) - { - LinkMessage *pMsg = ((ProgramLink *)lLink[j])->processIRM( pMsgOut ); - if( pMsg != NULL ) - { - delete pMsgOut; - return pMsg; - } - } - - delete pMsgOut; - return NULL; -} diff --git a/src/old/programchain.h b/src/old/programchain.h deleted file mode 100644 index 2bdfeee..0000000 --- a/src/old/programchain.h +++ /dev/null @@ -1,95 +0,0 @@ -#ifndef PROGRAMCHAIN_H -#define PROGRAMCHAIN_H - -#include "linkedlist.h" -#include "multilog.h" -#include "programlink.h" - -/** - * The Program Chain links together program "chunks" to more easily facilitate - * a generalized program loop with modular extensions. - *@author Mike Buland - */ -class ProgramChain -{ -public: - /** - * Construct an empty chain. - */ - ProgramChain(); - - /** - * Destroy your chain. - */ - virtual ~ProgramChain(); - - /** - * Adds a link to the end of the chain. - *@param pLink A pointer to the link to add to the chain. - *@returns True if adding the link was successful, otherwise false - *@author Mike Buland - */ - bool addLink( ProgramLink *pLink ); - - /** - * Gets a link by name. - *@param lpName The name of the link you're looking for. Every link has a - * name, apparently. - *@returns A pointer to the specified ProgramLink, or NULL if none were - * found matching your criteria. - *@author Mike Buland - */ - class ProgramLink *getLink( const char *lpName ); - - /** - * Gets the very first link in the chain. - *@returns A pointer to the first link in the chain. - *@author Mike Buland - */ - class ProgramLink *getBaseLink(); - - /** - * Runs through the chain once. Useful if you want to have more control - * over the operation of the chain. - *@returns true if every link returned true. If at least one link returns - * false, then returns false. - *@author Mike Buland - */ - bool execChainOnce(); - - /** - * Enters the master chain loop, looping over the entire chain and - * executing every link's TimeSlice routine in order, over and over, until - * a link returns a false value. - *@returns False, always. It returns true unless a link returned false, - * but loops until a link does return false. - *@author Mike Buland - **/ - bool enterChainLoop(); - - /** - * Broadcasts an Immediate Response Message to all active links, save the - * sender. Whatever link first responds with a non-null response message - * will have it's messages sent back to the broadcasting link as the returns - * of this function call. Therefore it is very important that all message - * processing code is handled in a fairly timely fasion. - *@param pMsgOut The message to broadcast in hopes of a response. - *@param pSender The message that sent out the message and doesn't want to - * receive it's own message. This should always just be "this". - *@returns The message that was returned by the first link to return a - * non-null response. If all messages return null responses then this also - * returns null. Please note that whoever calls this will be responsible - * for deleting the message returned by it, if non-null. - */ - class LinkMessage *broadcastIRM( LinkMessage *pMsgOut, ProgramLink *pSender ); - -private: - /** - * Shuts down all operation no matter what point in the operation we were. - */ - void emergencyShutdown(); - MultiLog &xLog; /**< A reference to the log. */ - LinkedList lLink; /**< The linked list that contains all of the links. */ -}; - -#endif diff --git a/src/old/programlink.cpp b/src/old/programlink.cpp deleted file mode 100644 index 21c6fe4..0000000 --- a/src/old/programlink.cpp +++ /dev/null @@ -1,54 +0,0 @@ -#include "programlink.h" -#include "programchain.h" - -ProgramLink::ProgramLink() -{ -} - -ProgramLink::~ProgramLink() -{ -} - -LinkMessage *ProgramLink::sendIRM( LinkMessage *pMsgOut ) -{ - return pChain->broadcastIRM( pMsgOut, this ); -} - -void ProgramLink::setChain( ProgramChain *pNewChain ) -{ - pChain = pNewChain; -} - -/* -void ProgramLink::postMessage( LinkMessage *pMsg, int nLvl ) -{ - if( nLvl == msgToChain ) - { - qMsgToChain.enqueue( pMsg ); - } - else if( nLvl == msgToLink ) - { - qMsgToLink.enqueue( pMsg ); - } - else - { - // ERROR! - } -} - -LinkMessage *ProgramLink::getMessage( int nLvl ) -{ - if( nLvl == msgToChain ) - { - return (LinkMessage *)qMsgToChain.dequeue(); - } - else if( nLvl == msgToLink ) - { - return (LinkMessage *)qMsgToLink.dequeue(); - } - else - { - // ERROR! - } -} -*/ diff --git a/src/old/programlink.h b/src/old/programlink.h deleted file mode 100644 index f93edcc..0000000 --- a/src/old/programlink.h +++ /dev/null @@ -1,99 +0,0 @@ -#ifndef PROGRAMLINK_H -#define PROGRAMLINK_H - -class ProgramLink; -#include "queue.h" -#include "linkmessage.h" -#include "programchain.h" - -/** - * Program Link is the base class for any object that will be a piece of the - * main program chain loop. - *@author Mike Buland - */ -class ProgramLink -{ -friend class ProgramChain; -public: - /** - * Construct a program link. - */ - ProgramLink(); - - /** - * Deconstruct. - */ - virtual ~ProgramLink(); - - /** - * Initialization code required for a link that wasn't performed in the - * constructor. - *@returns true if initialization was successful. A false value will halt - * the chain. - */ - virtual bool init()=0; - - /** - * DeInitialization code that should happen, but doesn't belong in the - * destructor. - *@returns true means everything worked, false means failure, but is - * meaningless. - */ - virtual bool deInit()=0; - - /** - * Executed once per link per chain pass. Contains the guts of the program. - *@returns true if everything went well. A false value will halt the chain. - */ - virtual bool timeSlice()=0; - - /** - * This must be handled in order to process Instant Response Messages. - * This function should return null on all messages that it doesn't - * understand how to handle, and construct new messages to return to sender - * in the cases where it does understand. - *@param pMsgIn The message that must be processed. - *@returns Either a new message in cases where a response is required, - * or null if nothing needs to be done by this link. - */ - virtual LinkMessage *processIRM( LinkMessage *pMsgIn ) = 0; - - /** - * Broadcast a LinkMessage to all other links in the system. Each other - * link will get a call of their processIRM function. If the message gets - * a response then you will regain control immediately, otherwise the system - * will give all other Links a chance to respond before returning NULL. - *@param pMsgOut The message to broadcast. - *@returns The message response, or NULL if no Link understood your message. - */ - LinkMessage *sendIRM( LinkMessage *pMsgOut ); - -private: - /** - * Set which chain we're assosiated with. This is how IRM messages make - * it out to the rest of the world. - *@param pNewChain A pointer to the containing program chain. - */ - void setChain( class ProgramChain *pNewChain ); - - /** - * The pointer to the containing chain. - */ - class ProgramChain *pChain; -/* - void postMessage( LinkMessage *pMsg, int nLvl ); - LinkMessage *getMessage( int nLvl ); - - enum - { - msgToChain, - msgToLink - }; - -private: - Queue qMsgToChain; - Queue qMsgToLink; -*/ -}; - -#endif diff --git a/src/plugger.cpp b/src/plugger.cpp new file mode 100644 index 0000000..f3bfa67 --- /dev/null +++ b/src/plugger.cpp @@ -0,0 +1 @@ +#include "plugger.h" diff --git a/src/plugger.h b/src/plugger.h new file mode 100644 index 0000000..98d4ecc --- /dev/null +++ b/src/plugger.h @@ -0,0 +1,196 @@ +#ifndef PLUGGER_H +#define PLUGGER_H + + +#include "bu/hash.h" +#include "bu/list.h" +#include +#include "bu/exceptions.h" +#include "bu/fstring.h" + +namespace Bu +{ + typedef struct PluginInfo + { + const char *sID; + const char *sAuthor; + unsigned short nVersion; + unsigned short nRevision; + void *(*createPlugin)(); + void (*destroyPlugin)( void * ); + } PluginInfo; + + typedef struct PluginReg + { + bool bBuiltin; + void *dlHandle; + PluginInfo *pInfo; + } PluginReg; + +#define PluginInterface( classname, baseclass, name, ver, rev ) \ + extern "C" { \ + baseclass *create ##classname() \ + { \ + return new classname(); \ + } \ + void destroy ##classname( baseclass *pCls ) \ + { \ + delete pCls; \ + } \ + PluginInfo classname = { \ + #classname, name, ver, rev, \ + create ##classname, destroy ##classname }; \ + } + +#define PluginInterface2( pluginname, classname, baseclass, name, ver, rev ) \ + extern "C" { \ + baseclass *create ##classname() \ + { \ + return new classname(); \ + } \ + void destroy ##classname( baseclass *pCls ) \ + { \ + delete pCls; \ + } \ + PluginInfo pluginname = { \ + #pluginname, name, ver, rev, \ + (void *(*)())(create ##classname), \ + (void (*)( void * ))(destroy ##classname) }; \ + } + +#define PluginInterface3( structname, pluginname, classname, baseclass, name, ver, rev ) \ + extern "C" { \ + baseclass *create ##classname() \ + { \ + return new classname(); \ + } \ + void destroy ##classname( baseclass *pCls ) \ + { \ + delete pCls; \ + } \ + PluginInfo structname = { \ + #pluginname, name, ver, rev, \ + (void *(*)())(create ##classname), \ + (void (*)( void * ))(destroy ##classname) }; \ + } + + template + class Plugger + { + public: + typedef Bu::Hash PluginHash; + typedef Bu::Hash InstHash; + + public: + Plugger() + { + } + + virtual ~Plugger() + { + for( InstHash::iterator i = hObj.begin(); i != hObj.end(); i++ ) + { + T *pPlug = (T *)i.getKey(); + PluginReg *pReg = (PluginReg *)*i; + pReg->pInfo->destroyPlugin( pPlug ); + } + + for( PluginHash::iterator i = hPlugin.begin(); + i != hPlugin.end(); i++ ) + { + if( (*i)->bBuiltin == false ) + { + dlclose( (*i)->dlHandle ); + } + delete (*i); + } + } + + void registerBuiltinPlugin( PluginInfo *pInfo ) + { + PluginReg *pReg = new PluginReg; + pReg->bBuiltin = true; + pReg->pInfo = pInfo; + hPlugin.insert( pInfo->sID, pReg ); + } + + void registerExternalPlugin( const char *sFName, const char *sPluginName ) + { + PluginReg *pReg = (PluginReg *)hPlugin[sPluginName]; + if( pReg != NULL ) + { + hPlugin.erase( sPluginName ); + dlclose( pReg->dlHandle ); + delete pReg; + pReg = NULL; + } + + pReg = new PluginReg; + + pReg->bBuiltin = false; + pReg->dlHandle = dlopen( sFName, RTLD_NOW ); + if( pReg->dlHandle == NULL ) + { + throw PluginException( 1, "Error on %s: %s", sFName, dlerror() ); + } + pReg->pInfo = (PluginInfo *)dlsym( pReg->dlHandle, sPluginName ); + if( pReg->pInfo == NULL ) + { + throw PluginException( 2, "Error on %s: %s", sFName, dlerror() ); + } + hPlugin.insert( pReg->pInfo->sID, pReg ); + } + + T *instantiate( const char *lpName ) + { + PluginReg *pReg = (PluginReg *)hPlugin[lpName]; + if( pReg == NULL ) + return NULL; + + T *p = (T *)pReg->pInfo->createPlugin(); + hObj.insert( p, pReg ); + //printf("pReg: %08X, pPlug: %08X\n", pReg, p ); + + return p; + } + + bool hasPlugin( const char *lpName ) + { + if( hPlugin[lpName] == NULL ) + return false; + return true; + } + + void destroy( T *pPlug ) + { + PluginReg *pReg = (PluginReg *)hObj[pPlug]; + //printf("pReg: %08X, pPlug: %08X\n", pReg, pPlug ); + if( pReg == NULL ) + return; + + pReg->pInfo->destroyPlugin( pPlug ); + + hObj.erase( pPlug ); + } + + void unloadAll() + { + for( PluginHash::iterator i = hPlugin.begin(); + i != hPlugin.end(); i++ ) + { + if( (*i)->bBuiltin == false ) + { + dlclose( (*i)->dlHandle ); + } + delete (*i); + } + hPlugin.clear(); + } + + private: + PluginHash hPlugin; + InstHash hObj; + }; +} + +#endif diff --git a/src/programchain.cpp b/src/programchain.cpp new file mode 100644 index 0000000..0bb7a77 --- /dev/null +++ b/src/programchain.cpp @@ -0,0 +1,97 @@ +#include +#include "bu/programchain.h" +#include "bu/programlink.h" + +using namespace Bu; + +Bu::ProgramChain::ProgramChain() +{ +} + +Bu::ProgramChain::~ProgramChain() +{ +} + +bool Bu::ProgramChain::addLink( ProgramLink *pLink ) +{ + if( pLink->init() == false ) + { + emergencyShutdown(); + return false; + } + + lLink.append( pLink ); + + pLink->setChain( this ); + + return true; +} + +ProgramLink *Bu::ProgramChain::getLink( const char *lpName ) +{ + char a; + a = lpName[0]; + return NULL; +} + +ProgramLink *Bu::ProgramChain::getBaseLink() +{ + return NULL; +} + +bool Bu::ProgramChain::execChainOnce() +{ + for( Bu::List::iterator i = lLink.begin(); + i != lLink.end(); i++ ) + { + if( (*i)->timeSlice() == false ) + { + emergencyShutdown(); + return false; + } + } + + return true; +} + +bool Bu::ProgramChain::enterChainLoop() +{ + for(;;) + { + if( execChainOnce() == false ) + { + return false; + } + } + + return true; +} + +void Bu::ProgramChain::emergencyShutdown() +{ + for( Bu::List::iterator i = lLink.begin(); + i != lLink.end(); i++ ) + { + (*i)->deInit(); + delete *i; + } + lLink.clear(); +} + +LinkMessage *Bu::ProgramChain::broadcastIRM( LinkMessage *pMsgOut, ProgramLink *pSender ) +{ + for( Bu::List::iterator i = lLink.begin(); + i != lLink.end(); i++ ) + { + LinkMessage *pMsg = (*i)->processIRM( pMsgOut ); + if( pMsg != NULL ) + { + delete pMsgOut; + return pMsg; + } + } + + delete pMsgOut; + return NULL; +} + diff --git a/src/programchain.h b/src/programchain.h new file mode 100644 index 0000000..e73d659 --- /dev/null +++ b/src/programchain.h @@ -0,0 +1,98 @@ +#ifndef PROGRAMCHAIN_H +#define PROGRAMCHAIN_H + +#include "bu/list.h" +#include "bu/linkmessage.h" + +namespace Bu +{ + class ProgramLink; + /** + * The Program Chain links together program "chunks" to more easily facilitate + * a generalized program loop with modular extensions. + *@author Mike Buland + */ + class ProgramChain + { + public: + /** + * Construct an empty chain. + */ + ProgramChain(); + + /** + * Destroy your chain. + */ + virtual ~ProgramChain(); + + /** + * Adds a link to the end of the chain. + *@param pLink A pointer to the link to add to the chain. + *@returns True if adding the link was successful, otherwise false + *@author Mike Buland + */ + bool addLink( Bu::ProgramLink *pLink ); + + /** + * Gets a link by name. + *@param lpName The name of the link you're looking for. Every link has a + * name, apparently. + *@returns A pointer to the specified ProgramLink, or NULL if none were + * found matching your criteria. + *@author Mike Buland + */ + class ProgramLink *getLink( const char *lpName ); + + /** + * Gets the very first link in the chain. + *@returns A pointer to the first link in the chain. + *@author Mike Buland + */ + class ProgramLink *getBaseLink(); + + /** + * Runs through the chain once. Useful if you want to have more control + * over the operation of the chain. + *@returns true if every link returned true. If at least one link returns + * false, then returns false. + *@author Mike Buland + */ + bool execChainOnce(); + + /** + * Enters the master chain loop, looping over the entire chain and + * executing every link's TimeSlice routine in order, over and over, until + * a link returns a false value. + *@returns False, always. It returns true unless a link returned false, + * but loops until a link does return false. + *@author Mike Buland + **/ + bool enterChainLoop(); + + /** + * Broadcasts an Immediate Response Message to all active links, save the + * sender. Whatever link first responds with a non-null response message + * will have it's messages sent back to the broadcasting link as the returns + * of this function call. Therefore it is very important that all message + * processing code is handled in a fairly timely fasion. + *@param pMsgOut The message to broadcast in hopes of a response. + *@param pSender The message that sent out the message and doesn't want to + * receive it's own message. This should always just be "this". + *@returns The message that was returned by the first link to return a + * non-null response. If all messages return null responses then this also + * returns null. Please note that whoever calls this will be responsible + * for deleting the message returned by it, if non-null. + */ + class LinkMessage *broadcastIRM( LinkMessage *pMsgOut, ProgramLink *pSender ); + + private: + /** + * Shuts down all operation no matter what point in the operation we were. + */ + void emergencyShutdown(); + Bu::List lLink; /**< The linked list that contains all of the links. */ + }; +} + + +#endif diff --git a/src/programlink.cpp b/src/programlink.cpp new file mode 100644 index 0000000..e5c624c --- /dev/null +++ b/src/programlink.cpp @@ -0,0 +1,56 @@ +#include "bu/programlink.h" +#include "bu/programchain.h" + +using namespace Bu; + +Bu::ProgramLink::ProgramLink() +{ +} + +Bu::ProgramLink::~ProgramLink() +{ +} + +LinkMessage *Bu::ProgramLink::sendIRM( LinkMessage *pMsgOut ) +{ + return pChain->broadcastIRM( pMsgOut, this ); +} + +void Bu::ProgramLink::setChain( ProgramChain *pNewChain ) +{ + pChain = pNewChain; +} + +/* +void ProgramLink::postMessage( LinkMessage *pMsg, int nLvl ) +{ + if( nLvl == msgToChain ) + { + qMsgToChain.enqueue( pMsg ); + } + else if( nLvl == msgToLink ) + { + qMsgToLink.enqueue( pMsg ); + } + else + { + // ERROR! + } +} + +LinkMessage *ProgramLink::getMessage( int nLvl ) +{ + if( nLvl == msgToChain ) + { + return (LinkMessage *)qMsgToChain.dequeue(); + } + else if( nLvl == msgToLink ) + { + return (LinkMessage *)qMsgToLink.dequeue(); + } + else + { + // ERROR! + } +} +*/ diff --git a/src/programlink.h b/src/programlink.h new file mode 100644 index 0000000..7c31a18 --- /dev/null +++ b/src/programlink.h @@ -0,0 +1,100 @@ +#ifndef PROGRAMLINK_H +#define PROGRAMLINK_H + +#include "bu/linkmessage.h" +#include "bu/programchain.h" + +namespace Bu +{ + /** + * Program Link is the base class for any object that will be a piece of the + * main program chain loop. + *@author Mike Buland + */ + class ProgramLink + { + friend class Bu::ProgramChain; + public: + /** + * Construct a program link. + */ + ProgramLink(); + + /** + * Deconstruct. + */ + virtual ~ProgramLink(); + + /** + * Initialization code required for a link that wasn't performed in the + * constructor. + *@returns true if initialization was successful. A false value will halt + * the chain. + */ + virtual bool init()=0; + + /** + * DeInitialization code that should happen, but doesn't belong in the + * destructor. + *@returns true means everything worked, false means failure, but is + * meaningless. + */ + virtual bool deInit()=0; + + /** + * Executed once per link per chain pass. Contains the guts of the program. + *@returns true if everything went well. A false value will halt the chain. + */ + virtual bool timeSlice()=0; + + /** + * This must be handled in order to process Instant Response Messages. + * This function should return null on all messages that it doesn't + * understand how to handle, and construct new messages to return to sender + * in the cases where it does understand. + *@param pMsgIn The message that must be processed. + *@returns Either a new message in cases where a response is required, + * or null if nothing needs to be done by this link. + */ + virtual LinkMessage *processIRM( LinkMessage *pMsgIn ) = 0; + + /** + * Broadcast a LinkMessage to all other links in the system. Each other + * link will get a call of their processIRM function. If the message gets + * a response then you will regain control immediately, otherwise the system + * will give all other Links a chance to respond before returning NULL. + *@param pMsgOut The message to broadcast. + *@returns The message response, or NULL if no Link understood your message. + */ + LinkMessage *sendIRM( LinkMessage *pMsgOut ); + + private: + /** + * Set which chain we're assosiated with. This is how IRM messages make + * it out to the rest of the world. + *@param pNewChain A pointer to the containing program chain. + */ + void setChain( class ProgramChain *pNewChain ); + + /** + * The pointer to the containing chain. + */ + class ProgramChain *pChain; + /* + void postMessage( LinkMessage *pMsg, int nLvl ); + LinkMessage *getMessage( int nLvl ); + + enum + { + msgToChain, + msgToLink + }; + + private: + Queue qMsgToChain; + Queue qMsgToLink; + */ + }; +} + +#endif diff --git a/src/tafwriter.cpp b/src/tafwriter.cpp index 3e6c025..ac42d3d 100644 --- a/src/tafwriter.cpp +++ b/src/tafwriter.cpp @@ -1,9 +1,32 @@ #include "tafwriter.h" -Bu::TafWriter::TafWriter() +Bu::TafWriter::TafWriter( Bu::Stream &sOut ) : + sOut( sOut ) { } Bu::TafWriter::~TafWriter() { } + +void Bu::TafWriter::writeNode( Bu::TafNode *pRoot ) +{ + sOut.write("{", 1 ); + writeString( pRoot->getName().getStr() ); + sOut.write(": ", 2 ); + sOut.write("}", 1 ); +} + +void Bu::TafWriter::writeString( const Bu::FString &str ) +{ + sOut.write("\"", 1 ); + for( const char *s = str.getStr(); *s; s++ ) + { + if( *s == '\"' ) + sOut.write("\\\"", 2 ); + else + sOut.write( s, 1 ); + } + sOut.write("\"", 1 ); +} + diff --git a/src/tafwriter.h b/src/tafwriter.h index 7057d62..4310e62 100644 --- a/src/tafwriter.h +++ b/src/tafwriter.h @@ -2,6 +2,9 @@ #define BU_TAF_WRITER_H #include +#include "bu/tafnode.h" +#include "bu/stream.h" +#include "bu/fstring.h" namespace Bu { @@ -11,11 +14,14 @@ namespace Bu class TafWriter { public: - TafWriter(); + TafWriter( Bu::Stream &sOut ); virtual ~TafWriter(); - private: + void writeNode( Bu::TafNode *pRoot ); + private: + void writeString( const Bu::FString &str ); + Bu::Stream &sOut; }; } -- cgit v1.2.3 From aa82dc64b397b6ca0d336d91638d4f4b849e3667 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Tue, 26 Jun 2007 05:10:58 +0000 Subject: Fixed a minor bug in FString, and added the Logger and a test...it's cool, and a decent replacement for multilog now that we use runit. --- src/fstring.h | 1 + src/logger.cpp | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/logger.h | 112 ++++++++++++++++++++++++++++++++++++++++++++++ src/tests/logger.cpp | 28 ++++++++++++ 4 files changed, 264 insertions(+) create mode 100644 src/logger.cpp create mode 100644 src/logger.h create mode 100644 src/tests/logger.cpp diff --git a/src/fstring.h b/src/fstring.h index 9d88bd4..fe34804 100644 --- a/src/fstring.h +++ b/src/fstring.h @@ -128,6 +128,7 @@ namespace Bu */ void append( const chr *pData ) { + if( !pData ) return; long nLen; for( nLen = 0; pData[nLen] != (chr)0; nLen++ ); if( nLen == 0 ) diff --git a/src/logger.cpp b/src/logger.cpp new file mode 100644 index 0000000..848dfb1 --- /dev/null +++ b/src/logger.cpp @@ -0,0 +1,123 @@ +#include "bu/logger.h" +#include +#include +#include + +Bu::Logger::Logger() +{ +} + +Bu::Logger::~Logger() +{ +} + +void Bu::Logger::log( int nLevel, const char *sFile, const char *sFunction, int nLine, const char *sFormat, ...) +{ + if( (nLevel&nLevelMask) == 0 ) + return; + + va_list ap; + va_start( ap, sFormat ); + char *text; + vasprintf( &text, sFormat, ap ); + va_end(ap); + + time_t t = time(NULL); + + char *line = NULL; + struct tm *pTime; + pTime = localtime( &t ); + asprintf( + &line, + sLogFormat.getStr(), + pTime->tm_year+1900, + pTime->tm_mon+1, + pTime->tm_mday, + pTime->tm_hour, + pTime->tm_min, + pTime->tm_sec, + nLevel, + sFile, + nLine, + text, + sFunction + ); + write( fileno(stdout), line, strlen(line) ); + free( text ); + free( line ); +} + +void Bu::Logger::setFormat( const Bu::FString &str ) +{ + sLogFormat = ""; + + static char fmts[][4]={ + {'y', 'd', '0', '1'}, + {'m', 'd', '0', '2'}, + {'d', 'd', '0', '3'}, + {'h', 'd', '0', '4'}, + {'M', 'd', '0', '5'}, + {'s', 'd', '0', '6'}, + {'L', 'd', '0', '7'}, + {'f', 's', '0', '8'}, + {'l', 'd', '0', '9'}, + {'t', 's', '1', '0'}, + {'F', 's', '1', '1'}, + {'\0', '\0', '\0', '\0'}, + }; + + for( const char *s = str.getStr(); *s; s++ ) + { + if( *s == '%' ) + { + sLogFormat += '%'; + s++; + for( int l = 0;; l++ ) + { + if( fmts[l][0] == '\0' ) + { + sLogFormat += *s; + break; + } + else if( *s == fmts[l][0] ) + { + sLogFormat += fmts[l][2]; + sLogFormat += fmts[l][3]; + sLogFormat += '$'; + sLogFormat += fmts[l][1]; + break; + } + } + } + else + { + sLogFormat += *s; + } + } + sLogFormat += '\n'; + + write( fileno(stdout), sLogFormat.getStr(), sLogFormat.getSize() ); +} + +void Bu::Logger::setMask( int n ) +{ + nLevelMask = n; +} + +void Bu::Logger::setLevel( int n ) +{ + int j; + for( j = 31; j > 0; j-- ) + { + if( (n&(1<= 0; j-- ) + { + n |= (1< + { + friend class Bu::Singleton; + private: + Logger(); + virtual ~Logger(); + + public: + void log( int nLevel, const char *sFile, const char *sFunction, int nLine, const char *sFormat, ...); + + void setFormat( const Bu::FString &str ); + void setMask( int n ); + void setLevel( int n ); + + private: + Bu::FString sLogFormat; + int nLevelMask; + }; +} + +/** + * Use Bu::Logger to log a message at the given level and with the given message + * using printf style formatting, and include extra data such as the current + * file, line number, and function. + */ +#define lineLog( nLevel, sFrmt, ...) \ + Bu::Logger::getInstance().log( nLevel, __FILE__, __PRETTY_FUNCTION__, __LINE__, sFrmt, ##__VA_ARGS__ ) + +/** + * Set the Bu::Logger logging mask directly. See Bu::Logger::setMask for + * details. + */ +#define setLogMask( nLevel ) \ + Bu::Logger::getInstance().setMask( nLevel ) + +/** + * Set the Bu::Logger format. See Bu::Logger::setFormat for details. + */ +#define setLogFormat( sFrmt ) \ + Bu::Logger::getInstance().setFormat( sFrmt ) + +/** + * Set the Bu::Logger logging mask simulating levels. See Bu::Logger::setLevel + * for details. + */ +#define setLogLevel( nLevel ) \ + Bu::Logger::getInstance().setLevel( nLevel ) + +#endif diff --git a/src/tests/logger.cpp b/src/tests/logger.cpp new file mode 100644 index 0000000..a271443 --- /dev/null +++ b/src/tests/logger.cpp @@ -0,0 +1,28 @@ +#include "bu/logger.h" +#include +#include + +class Thing +{ + public: + Thing() + { + lineLog( 2, "Want a thing?"); + } + + void go( int i ) + { + lineLog( 1, "GO!!!!"); + } +}; + +int main() +{ + setLogLevel( 4 ); + setLogFormat("%L: %y-%m-%d %h:%M:%s %f:%l:%F: %t"); + lineLog( 5, "Hey, error: %s", strerror( errno ) ); + + Thing gh; + gh.go( 6); +} + -- cgit v1.2.3 From 20584158e3d7f6a012a677476ba36d1691c7aa66 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Tue, 26 Jun 2007 15:11:57 +0000 Subject: Corrected a memory leak in Bu::BZip2, it wasn't cleaning up the big buffer. --- src/bzip2.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/bzip2.cpp b/src/bzip2.cpp index 66786e4..fbe5712 100644 --- a/src/bzip2.cpp +++ b/src/bzip2.cpp @@ -33,6 +33,8 @@ size_t Bu::BZip2::stop() if( bReading ) { BZ2_bzDecompressEnd( &bzState ); + delete[] pBuf; + pBuf = NULL; return 0; } else @@ -53,6 +55,8 @@ size_t Bu::BZip2::stop() break; } BZ2_bzCompressEnd( &bzState ); + delete[] pBuf; + pBuf = NULL; return sTotal; } } -- cgit v1.2.3 From 01ecf54b07e75c17ca5f7039084daeefaea9a1c7 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Tue, 26 Jun 2007 19:22:02 +0000 Subject: Fixed a bug in the plugger and added the skeleton of the MemBuf class. --- src/membuf.cpp | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/membuf.h | 43 +++++++++++++++++++++++++++++++ src/plugger.h | 2 +- 3 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 src/membuf.cpp create mode 100644 src/membuf.h diff --git a/src/membuf.cpp b/src/membuf.cpp new file mode 100644 index 0000000..fdb4366 --- /dev/null +++ b/src/membuf.cpp @@ -0,0 +1,81 @@ +#include "bu/membuf.h" + +using namespace Bu; + +Bu::MemBuf::MemBuf() +{ +} + +Bu::MemBuf::~MemBuf() +{ +} + +void Bu::MemBuf::close() +{ +} + +size_t Bu::MemBuf::read( void *pBuf, size_t nBytes ) +{ + +} + +size_t Bu::MemBuf::write( const void *pBuf, size_t nBytes ) +{ +} + +long Bu::MemBuf::tell() +{ +} + +void Bu::MemBuf::seek( long offset ) +{ +} + +void Bu::MemBuf::setPos( long pos ) +{ +} + +void Bu::MemBuf::setPosEnd( long pos ) +{ +} + +bool Bu::MemBuf::isEOS() +{ +} + +bool Bu::MemBuf::isOpen() +{ +} + +void Bu::MemBuf::flush() +{ +} + +bool Bu::MemBuf::canRead() +{ +} + +bool Bu::MemBuf::canWrite() +{ +} + +bool Bu::MemBuf::isReadable() +{ +} + +bool Bu::MemBuf::isWritable() +{ +} + +bool Bu::MemBuf::isSeekable() +{ +} + +bool Bu::MemBuf::isBlocking() +{ +} + +void Bu::MemBuf::setBlocking( bool bBlocking ) +{ +} + diff --git a/src/membuf.h b/src/membuf.h new file mode 100644 index 0000000..2cbbbdc --- /dev/null +++ b/src/membuf.h @@ -0,0 +1,43 @@ +#ifndef MEM_BUF_H +#define MEM_BUF_H + +#include + +#include "bu/stream.h" + +namespace Bu +{ + /** + * A memory buffer stream. + */ + class MemBuf : public Stream + { + public: + MemBuf(); + virtual ~MemBuf(); + + virtual void close(); + virtual size_t read( void *pBuf, size_t nBytes ); + virtual size_t write( const void *pBuf, size_t nBytes ); + virtual long tell(); + virtual void seek( long offset ); + virtual void setPos( long pos ); + virtual void setPosEnd( long pos ); + virtual bool isEOS(); + virtual bool isOpen(); + virtual void flush(); + virtual bool canRead(); + virtual bool canWrite(); + virtual bool isReadable(); + virtual bool isWritable(); + virtual bool isSeekable(); + virtual bool isBlocking(); + virtual void setBlocking( bool bBlocking=true ); + + private: + Bu::FString sBuf; + long nPos; + }; +} + +#endif diff --git a/src/plugger.h b/src/plugger.h index 98d4ecc..01bbb50 100644 --- a/src/plugger.h +++ b/src/plugger.h @@ -148,7 +148,7 @@ namespace Bu return NULL; T *p = (T *)pReg->pInfo->createPlugin(); - hObj.insert( p, pReg ); + hObj.insert( (int )p, pReg ); //printf("pReg: %08X, pPlug: %08X\n", pReg, p ); return p; -- cgit v1.2.3 From 5ec9a131e12d021c42b46b601f5e79502485bebb Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Wed, 27 Jun 2007 15:42:50 +0000 Subject: The MemBuf works just fine, although it still can't over-write data in the buffer. --- build.conf | 9 --------- src/membuf.cpp | 30 +++++++++++++++++++++++++++++- src/membuf.h | 7 +++++++ src/unit/entities/unit | 30 ++++++++++++++++++++++++++++++ src/unit/file.cpp | 10 ++++++++-- src/unit/hash.cpp | 4 ++-- src/unit/membuf.cpp | 37 +++++++++++++++++++++++++++++++++++++ 7 files changed, 113 insertions(+), 14 deletions(-) create mode 100644 src/unit/entities/unit create mode 100644 src/unit/membuf.cpp diff --git a/build.conf b/build.conf index f493d67..d994977 100644 --- a/build.conf +++ b/build.conf @@ -41,15 +41,6 @@ filesIn("src/tests") filter regexp("^src/tests/(.*)\\.cpp$", "tests/{re:1}"): ["tests/itoqueue1", "tests/itoqueue2"]: set "LDFLAGS" += "-lpthread" -directoriesIn("src/unit","unit/"): - rule "exe", - target file, - group "tests", - requires "libbu++.a", - set "CXXFLAGS" += "-Isrc", - set "LDFLAGS" += "-L. -lbu++", - input filesIn("{fulldir}") filter regexp("^.*\\.cpp$") - filesIn("src/unit") filter regexp("^src/unit/(.*)\\.cpp$", "unit/{re:1}"): rule "exe", target file, diff --git a/src/membuf.cpp b/src/membuf.cpp index fdb4366..3c394b0 100644 --- a/src/membuf.cpp +++ b/src/membuf.cpp @@ -2,7 +2,8 @@ using namespace Bu; -Bu::MemBuf::MemBuf() +Bu::MemBuf::MemBuf() : + nPos( 0 ) { } @@ -16,35 +17,56 @@ void Bu::MemBuf::close() size_t Bu::MemBuf::read( void *pBuf, size_t nBytes ) { + if( (size_t)sBuf.getSize()-(size_t)nPos < nBytes ) + nBytes = sBuf.getSize()-nPos; + memcpy( pBuf, sBuf.getStr()+nPos, nBytes ); + nPos += nBytes; + + return nBytes; } size_t Bu::MemBuf::write( const void *pBuf, size_t nBytes ) { + sBuf.append( (const char *)pBuf, nBytes ); + nPos += nBytes; + return nBytes; } long Bu::MemBuf::tell() { + return nPos; } void Bu::MemBuf::seek( long offset ) { + nPos += offset; + if( nPos < 0 ) nPos = 0; + else if( nPos > sBuf.getSize() ) nPos = sBuf.getSize(); } void Bu::MemBuf::setPos( long pos ) { + nPos = pos; + if( nPos < 0 ) nPos = 0; + else if( nPos > sBuf.getSize() ) nPos = sBuf.getSize(); } void Bu::MemBuf::setPosEnd( long pos ) { + nPos = sBuf.getSize()-pos; + if( nPos < 0 ) nPos = 0; + else if( nPos > sBuf.getSize() ) nPos = sBuf.getSize(); } bool Bu::MemBuf::isEOS() { + return (nPos == sBuf.getSize()); } bool Bu::MemBuf::isOpen() { + return true; } void Bu::MemBuf::flush() @@ -53,26 +75,32 @@ void Bu::MemBuf::flush() bool Bu::MemBuf::canRead() { + return !isEOS(); } bool Bu::MemBuf::canWrite() { + return isEOS(); } bool Bu::MemBuf::isReadable() { + return true; } bool Bu::MemBuf::isWritable() { + return true; } bool Bu::MemBuf::isSeekable() { + return true; } bool Bu::MemBuf::isBlocking() { + return true; } void Bu::MemBuf::setBlocking( bool bBlocking ) diff --git a/src/membuf.h b/src/membuf.h index 2cbbbdc..877b35e 100644 --- a/src/membuf.h +++ b/src/membuf.h @@ -4,6 +4,7 @@ #include #include "bu/stream.h" +#include "bu/fstring.h" namespace Bu { @@ -18,6 +19,12 @@ namespace Bu virtual void close(); virtual size_t read( void *pBuf, size_t nBytes ); + + /** + *@todo Allow writes at the current position, not just appending to + * the current buffer. This is a silly way to do it, but it covers all + * of our bases for now. + */ virtual size_t write( const void *pBuf, size_t nBytes ); virtual long tell(); virtual void seek( long offset ); diff --git a/src/unit/entities/unit b/src/unit/entities/unit new file mode 100644 index 0000000..28db45f --- /dev/null +++ b/src/unit/entities/unit @@ -0,0 +1,30 @@ + + + + #include "bu/unitsuite.h" + +class Unit : public Bu::UnitSuite +{ +public: + Unit() + { + setName("{=name}"); + addTest( Unit::test01 ); + } + + virtual ~Unit() + { + } + + void test01() + { + unitTest( 0 == 5 ); + } +}; + +int main( int argc, char *argv[] ){ return Unit().run( argc, argv ); } + + diff --git a/src/unit/file.cpp b/src/unit/file.cpp index a45b8d7..1eaaf36 100644 --- a/src/unit/file.cpp +++ b/src/unit/file.cpp @@ -87,8 +87,14 @@ public: unitTest( sf.isEOS() == false ); try { - sf.read( buf, 5 ); - unitFailed("No exception thrown"); + if( sf.read( buf, 5 ) > 0 ) + { + unitFailed("Non-zero read result"); + } + else + { + sf.close(); + } } catch( Bu::FileException &e ) { diff --git a/src/unit/hash.cpp b/src/unit/hash.cpp index 588e687..9ea933f 100644 --- a/src/unit/hash.cpp +++ b/src/unit/hash.cpp @@ -1,6 +1,6 @@ #include "bu/fstring.h" #include "bu/hash.h" -#include "unitsuite.h" +#include "bu/unitsuite.h" #include @@ -23,7 +23,7 @@ public: { StrIntHash h; char buf[20]; - for(int i=0;i<10000;i++) + for(int i=1;i<10000;i++) { sprintf(buf,"%d",i); Bu::FString sTmp(buf); diff --git a/src/unit/membuf.cpp b/src/unit/membuf.cpp new file mode 100644 index 0000000..65ba82a --- /dev/null +++ b/src/unit/membuf.cpp @@ -0,0 +1,37 @@ +#include "bu/unitsuite.h" +#include "bu/membuf.h" + +class Unit : public Bu::UnitSuite +{ +public: + Unit() + { + setName("MemBuf"); + addTest( Unit::testWriteRead01 ); + } + + virtual ~Unit() + { + } + + void testWriteRead01() + { + Bu::MemBuf mb; + unitTest( mb.write("ab", 2 ) == 2 ); + unitTest( mb.write("cde", 3 ) == 3 ); + unitTest( mb.write("FG", 2 ) == 2 ); + + mb.setPos( 0 ); + + char buf[8]; + buf[7] = '\0'; + unitTest( mb.read( buf, 7 ) == 7 ); + unitTest( !strncmp( buf, "abcdeFG", 7 ) ); + unitTest( mb.read( buf, 7 ) == 0 ); + mb.seek( -3 ); + unitTest( mb.read( buf, 7 ) == 3 ); + unitTest( !strncmp( buf, "eFG", 3 ) ); + } +}; + +int main( int argc, char *argv[] ){ return Unit().run( argc, argv ); } -- cgit v1.2.3 From c86c0cf088492e02431dffb1f860ff2f6faa492d Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Wed, 27 Jun 2007 18:11:13 +0000 Subject: The taf system is new and improved. The writer works, we added C++ style comment blocks, and it retains the order of all nodes. --- src/tafnode.cpp | 138 ++++++++++++++++++++++++++++++++++++++++++------------ src/tafnode.h | 68 +++++++++++++++++++++++---- src/tafreader.cpp | 44 +++++++++++------ src/tafreader.h | 9 ++-- src/tafwriter.cpp | 42 ++++++++++++++++- src/tafwriter.h | 4 +- src/tests/taf.cpp | 13 +++-- src/unit/taf.cpp | 2 +- test.taf | 31 +++--------- 9 files changed, 260 insertions(+), 91 deletions(-) diff --git a/src/tafnode.cpp b/src/tafnode.cpp index b9a4a24..b7cf211 100644 --- a/src/tafnode.cpp +++ b/src/tafnode.cpp @@ -1,72 +1,148 @@ #include "tafnode.h" -Bu::TafNode::TafNode() +Bu::TafNode::TafNode( NodeType eType ) : + eType( eType ) { } Bu::TafNode::~TafNode() +{ +} + +const Bu::TafNode::NodeType Bu::TafNode::getType() const +{ + return eType; +} + +/* +const Bu::TafNode::PropList &Bu::TafNode::getProperties( const Bu::FString &sName ) const +{ + return hProp.get( sName ); +} + +const Bu::TafNode::NodeList &Bu::TafNode::getChildren( const Bu::FString &sName ) const +{ + return hChildren.get( sName ); +} + +const Bu::FString &Bu::TafNode::getProperty( const Bu::FString &sName ) const +{ + return getProperties( sName ).first(); +} + +const Bu::TafNode *Bu::TafNode::getChild( const Bu::FString &sName ) const +{ + return getChildren( sName ).first(); +} +*/ + +Bu::TafGroup::TafGroup( const Bu::FString &sName ) : + TafNode( typeGroup ), + sName( sName ) +{ +} + +Bu::TafGroup::~TafGroup() { //printf("Entering Bu::TafNode::~TafNode() \"%s\"\n", sName.getStr() ); - for( NodeHash::iterator i = hChildren.begin(); i != hChildren.end(); i++ ) + for( NodeList::iterator i = lChildren.begin(); i != lChildren.end(); i++ ) { - NodeList &l = i.getValue(); - for( NodeList::iterator k = l.begin(); k != l.end(); k++ ) - { - //printf("deleting: [%08X] %s\n", *k, "" );//(*k)->getName().getStr() ); - delete (*k); - } + delete (*i); } } -void Bu::TafNode::setProperty( Bu::FString sName, Bu::FString sValue ) +const Bu::FString &Bu::TafGroup::getName() const { - if( !hProp.has( sName ) ) + return sName; +} + +void Bu::TafGroup::addChild( Bu::TafNode *pNode ) +{ + switch( pNode->getType() ) { - hProp.insert( sName, PropList() ); + case typeGroup: + { + TafGroup *pGroup = (TafGroup *)pNode; + if( !hChildren.has( pGroup->getName() ) ) + hChildren.insert( pGroup->getName(), GroupList() ); + hChildren.get( pGroup->getName() ).append( pGroup ); + } + break; + + case typeProperty: + { + TafProperty *pProperty = (TafProperty *)pNode; + if( !hProp.has( pProperty->getName() ) ) + hProp.insert( pProperty->getName(), PropList() ); + hProp.get( pProperty->getName() ).append( pProperty->getValue() ); + } + break; + + case typeComment: + break; } - hProp.get( sName ).append( sValue ); + lChildren.append( pNode ); } -void Bu::TafNode::addChild( TafNode *pNode ) +const Bu::TafGroup::GroupList &Bu::TafGroup::getChildren( const Bu::FString &sName ) const { - if( !hChildren.has( pNode->getName() ) ) - { - hChildren.insert( pNode->getName(), NodeList() ); - } + return hChildren.get( sName ); +} - //printf("Appending \"%s\"\n", pNode->getName().getStr() ); - hChildren.get( pNode->getName() ).append( pNode ); - //printf("[%08X]\n", hChildren.get( pNode->getName() ).last() ); +const Bu::TafGroup::NodeList &Bu::TafGroup::getChildren() const +{ + return lChildren; } -const Bu::TafNode::PropList &Bu::TafNode::getProperties( const Bu::FString &sName ) const +const Bu::TafGroup *Bu::TafGroup::getChild( const Bu::FString &sName ) const { - return hProp.get( sName ); + return hChildren.get( sName ).first(); } -const Bu::TafNode::NodeList &Bu::TafNode::getChildren( const Bu::FString &sName ) const +const Bu::TafGroup::PropList &Bu::TafGroup::getProperties( const Bu::FString &sName ) const { - return hChildren.get( sName ); + return hProp.get( sName ); } -const Bu::FString &Bu::TafNode::getProperty( const Bu::FString &sName ) const +const Bu::FString &Bu::TafGroup::getProperty( const Bu::FString &sName ) const { - return getProperties( sName ).first(); + return hProp.get( sName ).first(); } -const Bu::TafNode *Bu::TafNode::getChild( const Bu::FString &sName ) const +Bu::TafProperty::TafProperty( const Bu::FString &sName, const Bu::FString &sValue ) : + TafNode( typeProperty ), + sName( sName ), + sValue( sValue ) { - return getChildren( sName ).first(); } -void Bu::TafNode::setName( const Bu::FString &sName ) +Bu::TafProperty::~TafProperty() { - this->sName = sName; } -const Bu::FString &Bu::TafNode::getName() const +const Bu::FString &Bu::TafProperty::getName() const { return sName; } +const Bu::FString &Bu::TafProperty::getValue() const +{ + return sValue; +} + +Bu::TafComment::TafComment( const Bu::FString &sText ) : + TafNode( typeComment ), + sText( sText ) +{ +} + +Bu::TafComment::~TafComment() +{ +} + +const Bu::FString &Bu::TafComment::getText() const +{ + return sText; +} + diff --git a/src/tafnode.h b/src/tafnode.h index 08f78e8..55a5123 100644 --- a/src/tafnode.h +++ b/src/tafnode.h @@ -14,29 +14,77 @@ namespace Bu class TafNode { public: - typedef Bu::List PropList; - typedef Bu::Hash PropHash; - typedef Bu::List NodeList; - typedef Bu::Hash NodeHash; + enum NodeType + { + typeGroup, + typeProperty, + typeComment + }; public: - TafNode(); + TafNode( NodeType eType ); virtual ~TafNode(); - void setName( const Bu::FString &sName ); + const NodeType getType() const; + + private: + NodeType eType; + }; + + class TafProperty; + class TafComment; + class TafGroup : public TafNode + { + public: + typedef Bu::List PropList; + typedef Bu::Hash PropHash; + typedef Bu::List GroupList; + typedef Bu::Hash GroupHash; + typedef Bu::List NodeList; + + TafGroup( const Bu::FString &sName ); + virtual ~TafGroup(); + const Bu::FString &getName() const; - void setProperty( Bu::FString sName, Bu::FString sValue ); const Bu::FString &getProperty( const Bu::FString &sName ) const; const PropList &getProperties( const Bu::FString &sName ) const; - const TafNode *getChild( const Bu::FString &sName ) const; - const NodeList &getChildren( const Bu::FString &sName ) const; + const TafGroup *getChild( const Bu::FString &sName ) const; + const GroupList &getChildren( const Bu::FString &sName ) const; void addChild( TafNode *pNode ); + const NodeList &getChildren() const; private: Bu::FString sName; PropHash hProp; - NodeHash hChildren; + GroupHash hChildren; + NodeList lChildren; + }; + + class TafProperty : public TafNode + { + public: + TafProperty( const Bu::FString &sName, const Bu::FString &sValue ); + virtual ~TafProperty(); + + const Bu::FString &getName() const; + const Bu::FString &getValue() const; + + private: + Bu::FString sName; + Bu::FString sValue; + }; + + class TafComment : public TafNode + { + public: + TafComment( const Bu::FString &sText ); + virtual ~TafComment(); + + const Bu::FString &getText() const; + + private: + Bu::FString sText; }; } diff --git a/src/tafreader.cpp b/src/tafreader.cpp index 1187176..db465e9 100644 --- a/src/tafreader.cpp +++ b/src/tafreader.cpp @@ -8,6 +8,7 @@ Bu::TafReader::TafReader( Bu::Stream &sIn ) : c( 0 ), sIn( sIn ) { + next(); next(); } Bu::TafReader::~TafReader() @@ -15,60 +16,74 @@ Bu::TafReader::~TafReader() } -Bu::TafNode *Bu::TafReader::getNode() +Bu::TafGroup *Bu::TafReader::readGroup() { - if( c == 0 ) next(); - TafNode *pNode = new TafNode(); ws(); if( c != '{' ) throw TafException("Expected '{'"); next(); ws(); FString sName = readStr(); - pNode->setName( sName ); + TafGroup *pGroup = new TafGroup( sName ); next(); //printf("Node[%s]:\n", sName.getStr() ); - nodeContent( pNode ); + groupContent( pGroup ); if( c != '}' ) throw TafException("Expected '}'"); next(); - return pNode; + return pGroup; } -void Bu::TafReader::nodeContent( Bu::TafNode *pNode ) +void Bu::TafReader::groupContent( Bu::TafGroup *pGroup ) { for(;;) { ws(); if( c == '{' ) - pNode->addChild( getNode() ); + pGroup->addChild( readGroup() ); else if( c == '}' ) return; + else if( c == '/' && la == '*' ) + pGroup->addChild( readComment() ); else - nodeProperty( pNode ); + pGroup->addChild( readProperty() ); } } -void Bu::TafReader::nodeProperty( Bu::TafNode *pNode ) +Bu::TafProperty *Bu::TafReader::readProperty() { FString sName = readStr(); ws(); if( c != '=' ) { //printf(" %s (true)\n", sName.getStr() ); - pNode->setProperty( sName, "" ); - return; + return new Bu::TafProperty( sName, "" ); } next(); FString sValue = readStr(); - pNode->setProperty( sName, sValue ); + return new Bu::TafProperty( sName, sValue ); //printf(" %s = %s\n", sName.getStr(), sValue.getStr() ); } +Bu::TafComment *Bu::TafReader::readComment() +{ + next(); + FString sCmnt; + for(;;) + { + next(); + if( c == '*' && la == '/' ) + break; + sCmnt += c; + } + + return new TafComment( sCmnt ); +} + Bu::FString Bu::TafReader::readStr() { ws(); @@ -134,6 +149,7 @@ bool Bu::TafReader::isws() void Bu::TafReader::next() { - sIn.read( &c, 1 ); + c = la; + sIn.read( &la, 1 ); } diff --git a/src/tafreader.h b/src/tafreader.h index 47ae187..eeaafb3 100644 --- a/src/tafreader.h +++ b/src/tafreader.h @@ -17,16 +17,17 @@ namespace Bu TafReader( Bu::Stream &sIn ); virtual ~TafReader(); - Bu::TafNode *getNode(); + Bu::TafGroup *readGroup(); private: - void nodeContent( Bu::TafNode *pNode ); - void nodeProperty( Bu::TafNode *pNode ); + void groupContent( Bu::TafGroup *pNode ); + Bu::TafProperty *readProperty(); + Bu::TafComment *readComment(); void ws(); bool isws(); void next(); Bu::FString readStr(); - char c; + char c, la; Bu::Stream &sIn; }; } diff --git a/src/tafwriter.cpp b/src/tafwriter.cpp index ac42d3d..6b505ef 100644 --- a/src/tafwriter.cpp +++ b/src/tafwriter.cpp @@ -9,16 +9,54 @@ Bu::TafWriter::~TafWriter() { } -void Bu::TafWriter::writeNode( Bu::TafNode *pRoot ) +void Bu::TafWriter::writeGroup( const Bu::TafGroup *pRoot ) { sOut.write("{", 1 ); - writeString( pRoot->getName().getStr() ); + writeString( pRoot->getName() ); sOut.write(": ", 2 ); + const Bu::TafGroup::NodeList &nl = pRoot->getChildren(); + for( Bu::TafGroup::NodeList::const_iterator i = nl.begin(); i != nl.end(); i++ ) + { + switch( (*i)->getType() ) + { + case Bu::TafNode::typeGroup: + writeGroup( (Bu::TafGroup *)(*i) ); + break; + + case Bu::TafNode::typeProperty: + writeProperty( (Bu::TafProperty *)(*i) ); + break; + + case Bu::TafNode::typeComment: + writeComment( (Bu::TafComment *)(*i) ); + break; + } + } sOut.write("}", 1 ); } +void Bu::TafWriter::writeProperty( const Bu::TafProperty *pProp ) +{ + writeString( pProp->getName() ); + if( pProp->getValue().getStr() != NULL ) + { + sOut.write("=", 1 ); + writeString( pProp->getValue() ); + } + sOut.write(" ", 1 ); +} + +void Bu::TafWriter::writeComment( const Bu::TafComment *pComment ) +{ + sOut.write("/*", 2 ); + sOut.write( pComment->getText().getStr(), pComment->getText().getSize() ); + sOut.write("*/ ", 3 ); +} + void Bu::TafWriter::writeString( const Bu::FString &str ) { + if( str.getStr() == NULL ) + return; sOut.write("\"", 1 ); for( const char *s = str.getStr(); *s; s++ ) { diff --git a/src/tafwriter.h b/src/tafwriter.h index 4310e62..5f80504 100644 --- a/src/tafwriter.h +++ b/src/tafwriter.h @@ -17,9 +17,11 @@ namespace Bu TafWriter( Bu::Stream &sOut ); virtual ~TafWriter(); - void writeNode( Bu::TafNode *pRoot ); + void writeGroup( const Bu::TafGroup *pRoot ); private: + void writeProperty( const Bu::TafProperty *pProp ); + void writeComment( const Bu::TafComment *pComment ); void writeString( const Bu::FString &str ); Bu::Stream &sOut; }; diff --git a/src/tests/taf.cpp b/src/tests/taf.cpp index d135e78..e3da120 100644 --- a/src/tests/taf.cpp +++ b/src/tests/taf.cpp @@ -1,4 +1,5 @@ #include "bu/tafreader.h" +#include "bu/tafwriter.h" #include "bu/file.h" int main() @@ -6,12 +7,18 @@ int main() Bu::File f("test.taf", "rb"); Bu::TafReader tr( f ); - Bu::TafNode *pNode = tr.getNode(); + Bu::TafGroup *pGroup = tr.readGroup(); - const Bu::TafNode *pStats = pNode->getChild("stats"); + const Bu::TafGroup *pStats = pGroup->getChild("stats"); printf("%s\n", pStats->getName().getStr() ); printf(" str = %s\n", pStats->getProperty("str").getStr() ); - delete pNode; + { + Bu::File fo("out.taf", "wb"); + Bu::TafWriter tw( fo ); + tw.writeGroup( pGroup ); + } + + delete pGroup; } diff --git a/src/unit/taf.cpp b/src/unit/taf.cpp index ab485d0..5e0e914 100644 --- a/src/unit/taf.cpp +++ b/src/unit/taf.cpp @@ -32,7 +32,7 @@ public: Bu::File fIn(sFnTmp.c_str(), "rb"); Bu::TafReader tr(fIn); - Bu::TafNode *tn = tr.getNode(); + Bu::TafGroup *tn = tr.readGroup(); unitTest( !strcmp("Bob", tn->getProperty("name").c_str()) ); delete tn; diff --git a/test.taf b/test.taf index 045b042..1d4e7d1 100644 --- a/test.taf +++ b/test.taf @@ -1,26 +1,7 @@ -{player: - password = "aoeuaoeuao" - userclass = "implementor" - species = "human" - sex = "male" - active - startroom = "Salourn::Xagafinelle's Room" - {stats: str=14 dex=12 spd=12 enr=7 rea=12 wil=10 int=13 cha=14} - {hp: cur = 100 max = 100} - {en: cur = 100 max = 100} - attackrate = 30 - gold = 0 - {inventory: - {: count=1 id="Salourn::Dark Blade"} - {: count=1 id="Salourn::Dark Suit"} - {: count=3 id="Salourn::Small Fig"} - } - {aliases: - {: key="." value="say"} - {: key="," value="yell"} - {: key="li" value="lightning"} - } - description = "They appear to be rather average looking, not particularly +{"player": "password"="aoeuaoeuao" "userclass"="implementor" "species"="human" "sex"="male" "active" "startroom"="Salourn::Xagafinelle's Room" {"stats": "str"="14" "dex"="12" "spd"="12" "enr"="7" "rea"="12" "wil"="10" "int"="13" "cha"="14" }{"hp": "cur"="100" "max"="100" }{"en": "cur"="100" "max"="100" }"attackrate"="30" "gold"="0" + + /* Hey, the inventory is next...isn't that cool? Oooooh yeah! */ + +{"inventory": {: "count"="1" "id"="Salourn::Dark Blade" }{: "count"="1" "id"="Salourn::Dark Suit" }{: "count"="3" "id"="Salourn::Small Fig" }}{"aliases": {: "key"="." "value"="say" }{: "key"="," "value"="yell" }{: "key"="li" "value"="lightning" }}"description"="They appear to be rather average looking, not particularly tall or short, with facial features that are difficult to remember even - seconds after witnessing them." -} + seconds after witnessing them." } -- cgit v1.2.3 From 686ed62f519d66ac43315fb20dfb7233b839411d Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Wed, 27 Jun 2007 19:57:23 +0000 Subject: Added more functions to fstring, now it has isSet and a bool cast operator. These allow you to see if there is anything set in the fstring. --- src/fstring.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/fstring.h b/src/fstring.h index fe34804..21a07ce 100644 --- a/src/fstring.h +++ b/src/fstring.h @@ -479,6 +479,16 @@ namespace Bu return pFirst->pData[nIndex]; } + operator bool() const + { + return (pFirst != NULL); + } + + bool isSet() const + { + return (pFirst != NULL); + } + /** * Is the character at index (nIndex) white space? *@param nIndex (long) The index of the character you want to check. -- cgit v1.2.3 From d79253e87306607a0985abaeba0b87242f3532b7 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Wed, 27 Jun 2007 21:58:51 +0000 Subject: More fstring stuff. --- src/fstring.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/fstring.h b/src/fstring.h index 21a07ce..7180f5f 100644 --- a/src/fstring.h +++ b/src/fstring.h @@ -479,6 +479,13 @@ namespace Bu return pFirst->pData[nIndex]; } + operator const chr *() const + { + if( !pFirst ) return NULL; + flatten(); + return pFirst->pData; + } + operator bool() const { return (pFirst != NULL); -- cgit v1.2.3 From 850f977e83182745549e907f8d86c4272e5f443b Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Wed, 27 Jun 2007 22:12:33 +0000 Subject: Tweaked a tafnode function. --- src/tafnode.cpp | 4 +++- src/tafnode.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tafnode.cpp b/src/tafnode.cpp index b7cf211..7e171c9 100644 --- a/src/tafnode.cpp +++ b/src/tafnode.cpp @@ -56,7 +56,7 @@ const Bu::FString &Bu::TafGroup::getName() const return sName; } -void Bu::TafGroup::addChild( Bu::TafNode *pNode ) +Bu::TafNode *Bu::TafGroup::addChild( Bu::TafNode *pNode ) { switch( pNode->getType() ) { @@ -83,6 +83,8 @@ void Bu::TafGroup::addChild( Bu::TafNode *pNode ) } lChildren.append( pNode ); + + return pNode; } const Bu::TafGroup::GroupList &Bu::TafGroup::getChildren( const Bu::FString &sName ) const diff --git a/src/tafnode.h b/src/tafnode.h index 55a5123..0fdcba7 100644 --- a/src/tafnode.h +++ b/src/tafnode.h @@ -51,7 +51,7 @@ namespace Bu const PropList &getProperties( const Bu::FString &sName ) const; const TafGroup *getChild( const Bu::FString &sName ) const; const GroupList &getChildren( const Bu::FString &sName ) const; - void addChild( TafNode *pNode ); + TafNode *addChild( TafNode *pNode ); const NodeList &getChildren() const; private: -- cgit v1.2.3 From c84fe052b8bdeb0638d2c71e99e8fe992f5af647 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Wed, 27 Jun 2007 23:15:25 +0000 Subject: Ooooh, more Taf-goodness. --- src/tafnode.cpp | 39 +++++++++++++++++++++++++++------------ src/tafnode.h | 3 +++ 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/tafnode.cpp b/src/tafnode.cpp index 7e171c9..53b782e 100644 --- a/src/tafnode.cpp +++ b/src/tafnode.cpp @@ -61,29 +61,44 @@ Bu::TafNode *Bu::TafGroup::addChild( Bu::TafNode *pNode ) switch( pNode->getType() ) { case typeGroup: - { - TafGroup *pGroup = (TafGroup *)pNode; - if( !hChildren.has( pGroup->getName() ) ) - hChildren.insert( pGroup->getName(), GroupList() ); - hChildren.get( pGroup->getName() ).append( pGroup ); - } + addChild( (Bu::TafGroup *)pNode ); break; case typeProperty: - { - TafProperty *pProperty = (TafProperty *)pNode; - if( !hProp.has( pProperty->getName() ) ) - hProp.insert( pProperty->getName(), PropList() ); - hProp.get( pProperty->getName() ).append( pProperty->getValue() ); - } + addChild( (Bu::TafProperty *)pNode ); break; case typeComment: + addChild( (Bu::TafComment *)pNode ); break; } + return pNode; +} + +Bu::TafGroup *Bu::TafGroup::addChild( TafGroup *pNode ) +{ + TafGroup *pGroup = (TafGroup *)pNode; + if( !hChildren.has( pGroup->getName() ) ) + hChildren.insert( pGroup->getName(), GroupList() ); + hChildren.get( pGroup->getName() ).append( pGroup ); lChildren.append( pNode ); + return pNode; +} +Bu::TafProperty *Bu::TafGroup::addChild( TafProperty *pNode ) +{ + TafProperty *pProperty = (TafProperty *)pNode; + if( !hProp.has( pProperty->getName() ) ) + hProp.insert( pProperty->getName(), PropList() ); + hProp.get( pProperty->getName() ).append( pProperty->getValue() ); + lChildren.append( pNode ); + return pNode; +} + +Bu::TafComment *Bu::TafGroup::addChild( TafComment *pNode ) +{ + lChildren.append( pNode ); return pNode; } diff --git a/src/tafnode.h b/src/tafnode.h index 0fdcba7..cb4093f 100644 --- a/src/tafnode.h +++ b/src/tafnode.h @@ -52,6 +52,9 @@ namespace Bu const TafGroup *getChild( const Bu::FString &sName ) const; const GroupList &getChildren( const Bu::FString &sName ) const; TafNode *addChild( TafNode *pNode ); + TafGroup *addChild( TafGroup *pNode ); + TafProperty *addChild( TafProperty *pNode ); + TafComment *addChild( TafComment *pNode ); const NodeList &getChildren() const; private: -- cgit v1.2.3 From 45124f3982e41994bb203420c9a13e7039c973b5 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 28 Jun 2007 19:22:00 +0000 Subject: Another stupid plugger bug. --- src/plugger.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugger.h b/src/plugger.h index 01bbb50..019cc23 100644 --- a/src/plugger.h +++ b/src/plugger.h @@ -163,7 +163,7 @@ namespace Bu void destroy( T *pPlug ) { - PluginReg *pReg = (PluginReg *)hObj[pPlug]; + PluginReg *pReg = (PluginReg *)hObj[(int)pPlug]; //printf("pReg: %08X, pPlug: %08X\n", pReg, pPlug ); if( pReg == NULL ) return; -- cgit v1.2.3 From db15bc90703b0ccafd53ca16c0ef68673f66a184 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 28 Jun 2007 19:23:14 +0000 Subject: Oi, another bug fix, the same line... --- src/plugger.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugger.h b/src/plugger.h index 019cc23..2a85e17 100644 --- a/src/plugger.h +++ b/src/plugger.h @@ -163,7 +163,7 @@ namespace Bu void destroy( T *pPlug ) { - PluginReg *pReg = (PluginReg *)hObj[(int)pPlug]; + PluginReg *pReg = (PluginReg *)hObj.get((int)pPlug); //printf("pReg: %08X, pPlug: %08X\n", pReg, pPlug ); if( pReg == NULL ) return; -- cgit v1.2.3 From d35ef3b116e793dca1c9c5b07e47aec44b109c25 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 28 Jun 2007 19:24:20 +0000 Subject: Another one, five lines down. --- src/plugger.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugger.h b/src/plugger.h index 2a85e17..4d2e7af 100644 --- a/src/plugger.h +++ b/src/plugger.h @@ -170,7 +170,7 @@ namespace Bu pReg->pInfo->destroyPlugin( pPlug ); - hObj.erase( pPlug ); + hObj.erase( (int)pPlug ); } void unloadAll() -- cgit v1.2.3 From 932677862376e9642a496a15b7f09f1106f495a5 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 28 Jun 2007 20:49:39 +0000 Subject: Many minor changes, hopefully the header fixes will keep future header macro conflicts from happening. And, from now on, other projects should do -Ilibbu++ not -Ilibbu++/src so we can get ready for an installed version of libbu++. --- bu | 1 + src/archival.h | 4 ++-- src/archive.h | 4 ++-- src/atom.h | 4 ++-- src/bzip2.h | 4 ++-- src/client.h | 4 ++-- src/exceptionbase.h | 4 ++-- src/exceptions.h | 4 ++-- src/file.h | 4 ++-- src/filter.h | 4 ++-- src/fstring.h | 4 ++-- src/hash.h | 4 ++-- src/ito.h | 4 ++-- src/itoatom.h | 4 ++-- src/itocondition.h | 4 ++-- src/itomutex.h | 4 ++-- src/itoqueue.h | 4 ++-- src/linkmessage.h | 4 ++-- src/list.h | 4 ++-- src/membuf.h | 4 ++-- src/paramproc.h | 4 ++-- src/plugger.h | 4 ++-- src/programchain.h | 4 ++-- src/programlink.h | 4 ++-- src/protocol.h | 4 ++-- src/ringbuffer.h | 4 ++-- src/server.h | 4 ++-- src/serversocket.h | 4 ++-- src/singleton.h | 4 ++-- src/socket.h | 4 ++-- src/sptr.h | 4 ++-- src/stream.h | 4 ++-- src/unitsuite.h | 4 ++-- 33 files changed, 65 insertions(+), 64 deletions(-) create mode 120000 bu diff --git a/bu b/bu new file mode 120000 index 0000000..02b8847 --- /dev/null +++ b/bu @@ -0,0 +1 @@ +src/bu/ \ No newline at end of file diff --git a/src/archival.h b/src/archival.h index e2c803c..8be3308 100644 --- a/src/archival.h +++ b/src/archival.h @@ -1,5 +1,5 @@ -#ifndef ARCHIVAL_H -#define ARCHIVAL_H +#ifndef BU_ARCHIVAL_H +#define BU_ARCHIVAL_H namespace Bu { diff --git a/src/archive.h b/src/archive.h index 05c6f57..6c0c1df 100644 --- a/src/archive.h +++ b/src/archive.h @@ -1,5 +1,5 @@ -#ifndef ARCHIVE_H -#define ARCHIVE_H +#ifndef BU_ARCHIVE_H +#define BU_ARCHIVE_H #include #include diff --git a/src/atom.h b/src/atom.h index a0469b6..fad47eb 100644 --- a/src/atom.h +++ b/src/atom.h @@ -1,5 +1,5 @@ -#ifndef ATOM_H -#define ATOM_H +#ifndef BU_ATOM_H +#define BU_ATOM_H #include #include diff --git a/src/bzip2.h b/src/bzip2.h index 25f10c5..0a111e8 100644 --- a/src/bzip2.h +++ b/src/bzip2.h @@ -1,5 +1,5 @@ -#ifndef B_ZIP2_H -#define B_ZIP2_H +#ifndef BU_BZIP2_H +#define BU_BZIP2_H #include #include diff --git a/src/client.h b/src/client.h index 02ba077..cee558d 100644 --- a/src/client.h +++ b/src/client.h @@ -1,5 +1,5 @@ -#ifndef CLIENT_H -#define CLIENT_H +#ifndef BU_CLIENT_H +#define BU_CLIENT_H #include diff --git a/src/exceptionbase.h b/src/exceptionbase.h index fd78089..24e4bbf 100644 --- a/src/exceptionbase.h +++ b/src/exceptionbase.h @@ -1,5 +1,5 @@ -#ifndef EXCEPTION_BASE_H -#define EXCEPTION_BASE_H +#ifndef BU_EXCEPTION_BASE_H +#define BU_EXCEPTION_BASE_H #include #include diff --git a/src/exceptions.h b/src/exceptions.h index d5a9d39..b824b91 100644 --- a/src/exceptions.h +++ b/src/exceptions.h @@ -1,5 +1,5 @@ -#ifndef EXCEPTIONS_H -#define EXCEPTIONS_H +#ifndef BU_EXCEPTIONS_H +#define BU_EXCEPTIONS_H #include "exceptionbase.h" #include diff --git a/src/file.h b/src/file.h index 0f638a7..d4e43eb 100644 --- a/src/file.h +++ b/src/file.h @@ -1,5 +1,5 @@ -#ifndef FILE_H -#define FILE_H +#ifndef BU_FILE_H +#define BU_FILE_H #include diff --git a/src/filter.h b/src/filter.h index 7bb04bc..bd557b2 100644 --- a/src/filter.h +++ b/src/filter.h @@ -1,5 +1,5 @@ -#ifndef FILTER_H -#define FILTER_H +#ifndef BU_FILTER_H +#define BU_FILTER_H #include diff --git a/src/fstring.h b/src/fstring.h index 7180f5f..bf6518b 100644 --- a/src/fstring.h +++ b/src/fstring.h @@ -1,5 +1,5 @@ -#ifndef F_STRING_H -#define F_STRING_H +#ifndef BU_F_STRING_H +#define BU_F_STRING_H #include #include diff --git a/src/hash.h b/src/hash.h index 6c4a443..0fa3af7 100644 --- a/src/hash.h +++ b/src/hash.h @@ -1,5 +1,5 @@ -#ifndef HASH_H -#define HASH_H +#ifndef BU_HASH_H +#define BU_HASH_H #include #include diff --git a/src/ito.h b/src/ito.h index 01253f5..c062052 100644 --- a/src/ito.h +++ b/src/ito.h @@ -1,5 +1,5 @@ -#ifndef ITO_H -#define ITO_H +#ifndef BU_ITO_H +#define BU_ITO_H #include diff --git a/src/itoatom.h b/src/itoatom.h index 96090f2..7fc9090 100644 --- a/src/itoatom.h +++ b/src/itoatom.h @@ -1,5 +1,5 @@ -#ifndef ITO_QUEUE_H -#define ITO_QUEUE_H +#ifndef BU_ITO_QUEUE_H +#define BU_ITO_QUEUE_H #include diff --git a/src/itocondition.h b/src/itocondition.h index 4771b22..1793f81 100644 --- a/src/itocondition.h +++ b/src/itocondition.h @@ -1,5 +1,5 @@ -#ifndef ITO_CONDITION_H -#define ITO_CONDITION_H +#ifndef BU_ITO_CONDITION_H +#define BU_ITO_CONDITION_H #include diff --git a/src/itomutex.h b/src/itomutex.h index 80956b8..9c9d205 100644 --- a/src/itomutex.h +++ b/src/itomutex.h @@ -1,5 +1,5 @@ -#ifndef ITO_MUTEX_H -#define ITO_MUTEX_H +#ifndef BU_ITO_MUTEX_H +#define BU_ITO_MUTEX_H #include diff --git a/src/itoqueue.h b/src/itoqueue.h index 322698d..75a2f27 100644 --- a/src/itoqueue.h +++ b/src/itoqueue.h @@ -1,5 +1,5 @@ -#ifndef ITO_QUEUE_H -#define ITO_QUEUE_H +#ifndef BU_ITO_QUEUE_H +#define BU_ITO_QUEUE_H #include diff --git a/src/linkmessage.h b/src/linkmessage.h index 64b8bc2..baa22a6 100644 --- a/src/linkmessage.h +++ b/src/linkmessage.h @@ -1,8 +1,8 @@ /**\file linkmessage.h */ -#ifndef LINKMESSAGE_H -#define LINKMESSAGE_H +#ifndef BU_LINKMESSAGE_H +#define BU_LINKMESSAGE_H namespace Bu { diff --git a/src/list.h b/src/list.h index 314459e..6235619 100644 --- a/src/list.h +++ b/src/list.h @@ -1,5 +1,5 @@ -#ifndef LIST_H -#define LIST_H +#ifndef BU_LIST_H +#define BU_LIST_H #include #include "bu/exceptionbase.h" diff --git a/src/membuf.h b/src/membuf.h index 877b35e..b82f943 100644 --- a/src/membuf.h +++ b/src/membuf.h @@ -1,5 +1,5 @@ -#ifndef MEM_BUF_H -#define MEM_BUF_H +#ifndef BU_MEM_BUF_H +#define BU_MEM_BUF_H #include diff --git a/src/paramproc.h b/src/paramproc.h index beee4a0..2bca588 100644 --- a/src/paramproc.h +++ b/src/paramproc.h @@ -1,5 +1,5 @@ -#ifndef PARAM_PROC_H -#define PARAM_PROC_H +#ifndef BU_PARAM_PROC_H +#define BU_PARAM_PROC_H #include #include diff --git a/src/plugger.h b/src/plugger.h index 4d2e7af..79a3271 100644 --- a/src/plugger.h +++ b/src/plugger.h @@ -1,5 +1,5 @@ -#ifndef PLUGGER_H -#define PLUGGER_H +#ifndef BU_PLUGGER_H +#define BU_PLUGGER_H #include "bu/hash.h" diff --git a/src/programchain.h b/src/programchain.h index e73d659..336a9f1 100644 --- a/src/programchain.h +++ b/src/programchain.h @@ -1,5 +1,5 @@ -#ifndef PROGRAMCHAIN_H -#define PROGRAMCHAIN_H +#ifndef BU_PROGRAMCHAIN_H +#define BU_PROGRAMCHAIN_H #include "bu/list.h" #include "bu/linkmessage.h" diff --git a/src/programlink.h b/src/programlink.h index 7c31a18..07d7489 100644 --- a/src/programlink.h +++ b/src/programlink.h @@ -1,5 +1,5 @@ -#ifndef PROGRAMLINK_H -#define PROGRAMLINK_H +#ifndef BU_PROGRAMLINK_H +#define BU_PROGRAMLINK_H #include "bu/linkmessage.h" #include "bu/programchain.h" diff --git a/src/protocol.h b/src/protocol.h index 3accd99..c7a9275 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -1,5 +1,5 @@ -#ifndef PROTOCOL_H -#define PROTOCOL_H +#ifndef BU_PROTOCOL_H +#define BU_PROTOCOL_H #include diff --git a/src/ringbuffer.h b/src/ringbuffer.h index 625f65b..be80e2f 100644 --- a/src/ringbuffer.h +++ b/src/ringbuffer.h @@ -1,5 +1,5 @@ -#ifndef RING_BUFFER_H -#define RING_BUFFER_H +#ifndef BU_RING_BUFFER_H +#define BU_RING_BUFFER_H #include #include "bu/exceptionbase.h" diff --git a/src/server.h b/src/server.h index 07eef95..302b6e3 100644 --- a/src/server.h +++ b/src/server.h @@ -1,5 +1,5 @@ -#ifndef SERVER_H -#define SERVER_H +#ifndef BU_SERVER_H +#define BU_SERVER_H #include diff --git a/src/serversocket.h b/src/serversocket.h index cb86078..b4ee247 100644 --- a/src/serversocket.h +++ b/src/serversocket.h @@ -1,5 +1,5 @@ -#ifndef SERVER_SOCKET_H -#define SERVER_SOCKET_H +#ifndef BU_SERVER_SOCKET_H +#define BU_SERVER_SOCKET_H #include #include "bu/fstring.h" diff --git a/src/singleton.h b/src/singleton.h index 4976a61..c43d71b 100644 --- a/src/singleton.h +++ b/src/singleton.h @@ -1,5 +1,5 @@ -#ifndef SINGLETON_H -#define SINGLETON_H +#ifndef BU_SINGLETON_H +#define BU_SINGLETON_H #include diff --git a/src/socket.h b/src/socket.h index c9dbd8d..0ccee3b 100644 --- a/src/socket.h +++ b/src/socket.h @@ -1,5 +1,5 @@ -#ifndef SOCKET_H -#define SOCKET_H +#ifndef BU_SOCKET_H +#define BU_SOCKET_H #include diff --git a/src/sptr.h b/src/sptr.h index 4baa697..75851a6 100644 --- a/src/sptr.h +++ b/src/sptr.h @@ -1,5 +1,5 @@ -#ifndef SPTR_H -#define SPTR_H +#ifndef BU_SPTR_H +#define BU_SPTR_H #include #include diff --git a/src/stream.h b/src/stream.h index 056de0c..1e236a6 100644 --- a/src/stream.h +++ b/src/stream.h @@ -1,5 +1,5 @@ -#ifndef STREAM_H -#define STREAM_H +#ifndef BU_STREAM_H +#define BU_STREAM_H #include #include diff --git a/src/unitsuite.h b/src/unitsuite.h index 6e9270a..578b4cc 100644 --- a/src/unitsuite.h +++ b/src/unitsuite.h @@ -1,5 +1,5 @@ -#ifndef UNIT_SUITE_H -#define UNIT_SUITE_H +#ifndef BU_UNIT_SUITE_H +#define BU_UNIT_SUITE_H #include #include -- cgit v1.2.3 From 66d1eb52b7f3023cfee5c10792a55b6af08eebe4 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 28 Jun 2007 21:08:49 +0000 Subject: Minor update to protocol. --- src/protocol.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/protocol.h b/src/protocol.h index c7a9275..bca337f 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -16,6 +16,7 @@ namespace Bu Protocol(); virtual ~Protocol(); + virtual void onNewConnection( Bu::Client *pClient )=0; virtual void onNewData( Bu::Client *pClient )=0; private: -- cgit v1.2.3 From afb50f535dd60b485a38f1f1f692b3303e28fecc Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 28 Jun 2007 21:58:47 +0000 Subject: The FString has more things that it can do...now. --- src/client.h | 1 + src/fstring.cpp | 6 ++++++ src/fstring.h | 17 +++++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/src/client.h b/src/client.h index cee558d..f228e96 100644 --- a/src/client.h +++ b/src/client.h @@ -25,6 +25,7 @@ namespace Bu Bu::FString &getInput(); Bu::FString &getOutput(); void write( const char *pData, int nBytes ); + void read( const char *pData, int nBytes ); void setProtocol( Protocol *pProto ); Bu::Protocol *getProtocol(); diff --git a/src/fstring.cpp b/src/fstring.cpp index 56d2173..0b5a970 100644 --- a/src/fstring.cpp +++ b/src/fstring.cpp @@ -12,3 +12,9 @@ template<> bool Bu::__cmpHashKeys( return a == b; } +std::ostream& operator<< (std::ostream &os, Bu::FString &val ) +{ + os.write( val.getStr(), val.getSize() ); + return os; +} + diff --git a/src/fstring.h b/src/fstring.h index bf6518b..1f21b5f 100644 --- a/src/fstring.h +++ b/src/fstring.h @@ -586,6 +586,20 @@ namespace Bu return -1; } + /** + * Remove nAmnt bytes from the front of the string. This function + * operates in O(n) time and should be used sparingly. + */ + void trimFront( long nAmnt ) + { + long nNewLen = nLength - nAmnt; + flatten(); + Chunk *pNew = newChunk( nNewLen ); + cpy( pNew->pData, pFirst->pData, nNewLen ); + clear(); + appendChunk( pNew ); + } + /** * Function the archiver calls to archive your FString. *@param ar (Archive) The archive which is archiving your FString. @@ -882,4 +896,7 @@ namespace Bu template<> bool __cmpHashKeys( const FString &a, const FString &b ); } +#include +std::ostream& operator<< (std::ostream &os, Bu::FString &val ); + #endif -- cgit v1.2.3 From f896b0e207e0b656109ef0e9f721f27ce53a836e Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 28 Jun 2007 22:47:03 +0000 Subject: Client code is better, so is the socket, you can get addresses and other cool things from it. The plugger had yet another bugfix...plugger... --- src/client.cpp | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- src/client.h | 10 +++++++++- src/plugger.h | 6 +++--- src/socket.cpp | 12 ++++++++++++ src/socket.h | 2 ++ 5 files changed, 79 insertions(+), 5 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index 0e48285..63822ba 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -10,7 +10,8 @@ Bu::Client::Client( Bu::Socket *pSocket ) : pSocket( pSocket ), - pProto( NULL ) + pProto( NULL ), + nRBOffset( 0 ) { } @@ -103,3 +104,54 @@ void Bu::Client::write( const char *pData, int nBytes ) sWriteBuf.append( pData, nBytes ); } +void Bu::Client::write( int8_t nData ) +{ + sWriteBuf.append( (const char *)&nData, sizeof(nData) ); +} + +void Bu::Client::write( int16_t nData ) +{ + sWriteBuf.append( (const char *)&nData, sizeof(nData) ); +} + +void Bu::Client::write( int32_t nData ) +{ + sWriteBuf.append( (const char *)&nData, sizeof(nData) ); +} + +void Bu::Client::write( int64_t nData ) +{ + sWriteBuf.append( (const char *)&nData, sizeof(nData) ); +} + +void Bu::Client::read( char *pData, int nBytes ) +{ + memcpy( pData, sReadBuf.getStr()+nRBOffset, nBytes ); + nRBOffset += nBytes; + if( sReadBuf.getSize()-nRBOffset == 0 ) + { + sReadBuf.clear(); + nRBOffset = 0; + } + // This is an experimental threshold, maybe I'll make this configurable + // later on. + else if( + (sReadBuf.getSize() >= 1024 && nRBOffset >= sReadBuf.getSize()/2) || + (nRBOffset >= sReadBuf.getSize()/4) + ) + { + sReadBuf.trimFront( nRBOffset ); + nRBOffset = 0; + } +} + +long Bu::Client::getInputSize() +{ + return sReadBuf.getSize()-nRBOffset; +} + +const Bu::Socket *Bu::Client::getSocket() const +{ + return pSocket; +} + diff --git a/src/client.h b/src/client.h index f228e96..b400bb3 100644 --- a/src/client.h +++ b/src/client.h @@ -25,7 +25,12 @@ namespace Bu Bu::FString &getInput(); Bu::FString &getOutput(); void write( const char *pData, int nBytes ); - void read( const char *pData, int nBytes ); + void write( int8_t nData ); + void write( int16_t nData ); + void write( int32_t nData ); + void write( int64_t nData ); + void read( char *pData, int nBytes ); + long getInputSize(); void setProtocol( Protocol *pProto ); Bu::Protocol *getProtocol(); @@ -33,10 +38,13 @@ namespace Bu bool isOpen(); + const Bu::Socket *getSocket() const; + private: Bu::Socket *pSocket; Bu::Protocol *pProto; Bu::FString sReadBuf; + int nRBOffset; Bu::FString sWriteBuf; }; } diff --git a/src/plugger.h b/src/plugger.h index 79a3271..615a662 100644 --- a/src/plugger.h +++ b/src/plugger.h @@ -37,7 +37,7 @@ namespace Bu { \ delete pCls; \ } \ - PluginInfo classname = { \ + Bu::PluginInfo classname = { \ #classname, name, ver, rev, \ create ##classname, destroy ##classname }; \ } @@ -52,7 +52,7 @@ namespace Bu { \ delete pCls; \ } \ - PluginInfo pluginname = { \ + Bu::PluginInfo pluginname = { \ #pluginname, name, ver, rev, \ (void *(*)())(create ##classname), \ (void (*)( void * ))(destroy ##classname) }; \ @@ -68,7 +68,7 @@ namespace Bu { \ delete pCls; \ } \ - PluginInfo structname = { \ + Bu::PluginInfo structname = { \ #pluginname, name, ver, rev, \ (void *(*)())(create ##classname), \ (void (*)( void * ))(destroy ##classname) }; \ diff --git a/src/socket.cpp b/src/socket.cpp index bd05024..5a3097c 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -276,3 +276,15 @@ bool Bu::Socket::isOpen() return bActive; } +Bu::FString Bu::Socket::getAddress() const +{ + struct sockaddr_in addr; + socklen_t len = sizeof(addr); + addr.sin_family = AF_INET; + getsockname( nSocket, (sockaddr *)(&addr), &len ); + char buf[150]; + sprintf( buf, "%s", inet_ntoa( addr.sin_addr ) ); + + return buf; +} + diff --git a/src/socket.h b/src/socket.h index 0ccee3b..9e36041 100644 --- a/src/socket.h +++ b/src/socket.h @@ -42,6 +42,8 @@ namespace Bu virtual bool isBlocking(); virtual void setBlocking( bool bBlocking=true ); + Bu::FString getAddress() const; + private: int nSocket; bool bActive; -- cgit v1.2.3 From 76ea96f91115585f7c6b49d11ba60ec15bee12e6 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Thu, 28 Jun 2007 22:53:10 +0000 Subject: Updated the client, it now takes all intXX_t and uintXX_t as a param for write as a convinience. --- src/client.cpp | 20 ++++++++++++++++++++ src/client.h | 4 ++++ 2 files changed, 24 insertions(+) diff --git a/src/client.cpp b/src/client.cpp index 63822ba..2f293b7 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -124,6 +124,26 @@ void Bu::Client::write( int64_t nData ) sWriteBuf.append( (const char *)&nData, sizeof(nData) ); } +void Bu::Client::write( uint8_t nData ) +{ + sWriteBuf.append( (const char *)&nData, sizeof(nData) ); +} + +void Bu::Client::write( uint16_t nData ) +{ + sWriteBuf.append( (const char *)&nData, sizeof(nData) ); +} + +void Bu::Client::write( uint32_t nData ) +{ + sWriteBuf.append( (const char *)&nData, sizeof(nData) ); +} + +void Bu::Client::write( uint64_t nData ) +{ + sWriteBuf.append( (const char *)&nData, sizeof(nData) ); +} + void Bu::Client::read( char *pData, int nBytes ) { memcpy( pData, sReadBuf.getStr()+nRBOffset, nBytes ); diff --git a/src/client.h b/src/client.h index b400bb3..1253dcd 100644 --- a/src/client.h +++ b/src/client.h @@ -29,6 +29,10 @@ namespace Bu void write( int16_t nData ); void write( int32_t nData ); void write( int64_t nData ); + void write( uint8_t nData ); + void write( uint16_t nData ); + void write( uint32_t nData ); + void write( uint64_t nData ); void read( char *pData, int nBytes ); long getInputSize(); -- cgit v1.2.3 From ec8ed8b4b44c7b039e87faaa50bb4d503393d336 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Fri, 29 Jun 2007 00:48:32 +0000 Subject: A few changes here and there, mainly related to getting the new Server system working in optimal condition... --- src/client.cpp | 35 ++++++++++++++++++++++++++++++++--- src/client.h | 11 +++++++++-- src/fstring.cpp | 2 +- src/fstring.h | 2 +- src/membuf.cpp | 11 +++++++++++ src/membuf.h | 3 +++ 6 files changed, 57 insertions(+), 7 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index 2f293b7..8077b3d 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -99,9 +99,9 @@ bool Bu::Client::isOpen() return pSocket->isOpen(); } -void Bu::Client::write( const char *pData, int nBytes ) +void Bu::Client::write( const void *pData, int nBytes ) { - sWriteBuf.append( pData, nBytes ); + sWriteBuf.append( (const char *)pData, nBytes ); } void Bu::Client::write( int8_t nData ) @@ -144,7 +144,7 @@ void Bu::Client::write( uint64_t nData ) sWriteBuf.append( (const char *)&nData, sizeof(nData) ); } -void Bu::Client::read( char *pData, int nBytes ) +void Bu::Client::read( void *pData, int nBytes ) { memcpy( pData, sReadBuf.getStr()+nRBOffset, nBytes ); nRBOffset += nBytes; @@ -165,6 +165,31 @@ void Bu::Client::read( char *pData, int nBytes ) } } +void Bu::Client::peek( void *pData, int nBytes ) +{ + memcpy( pData, sReadBuf.getStr()+nRBOffset, nBytes ); +} + +void Bu::Client::seek( int nBytes ) +{ + nRBOffset += nBytes; + if( sReadBuf.getSize()-nRBOffset == 0 ) + { + sReadBuf.clear(); + nRBOffset = 0; + } + // This is an experimental threshold, maybe I'll make this configurable + // later on. + else if( + (sReadBuf.getSize() >= 1024 && nRBOffset >= sReadBuf.getSize()/2) || + (nRBOffset >= sReadBuf.getSize()/4) + ) + { + sReadBuf.trimFront( nRBOffset ); + nRBOffset = 0; + } +} + long Bu::Client::getInputSize() { return sReadBuf.getSize()-nRBOffset; @@ -175,3 +200,7 @@ const Bu::Socket *Bu::Client::getSocket() const return pSocket; } +void Bu::Client::disconnect() +{ +} + diff --git a/src/client.h b/src/client.h index 1253dcd..5947521 100644 --- a/src/client.h +++ b/src/client.h @@ -24,7 +24,7 @@ namespace Bu Bu::FString &getInput(); Bu::FString &getOutput(); - void write( const char *pData, int nBytes ); + void write( const void *pData, int nBytes ); void write( int8_t nData ); void write( int16_t nData ); void write( int32_t nData ); @@ -33,7 +33,9 @@ namespace Bu void write( uint16_t nData ); void write( uint32_t nData ); void write( uint64_t nData ); - void read( char *pData, int nBytes ); + void read( void *pData, int nBytes ); + void peek( void *pData, int nBytes ); + void seek( int nBytes ); long getInputSize(); void setProtocol( Protocol *pProto ); @@ -44,6 +46,11 @@ namespace Bu const Bu::Socket *getSocket() const; + /** + *@todo Make this not suck. + */ + void disconnect(); + private: Bu::Socket *pSocket; Bu::Protocol *pProto; diff --git a/src/fstring.cpp b/src/fstring.cpp index 0b5a970..f71d6c1 100644 --- a/src/fstring.cpp +++ b/src/fstring.cpp @@ -12,7 +12,7 @@ template<> bool Bu::__cmpHashKeys( return a == b; } -std::ostream& operator<< (std::ostream &os, Bu::FString &val ) +std::basic_ostream& operator<< (std::basic_ostream &os, const Bu::FString &val ) { os.write( val.getStr(), val.getSize() ); return os; diff --git a/src/fstring.h b/src/fstring.h index 1f21b5f..f06c362 100644 --- a/src/fstring.h +++ b/src/fstring.h @@ -897,6 +897,6 @@ namespace Bu } #include -std::ostream& operator<< (std::ostream &os, Bu::FString &val ); +std::basic_ostream& operator<< (std::basic_ostream &os, const Bu::FString &val ); #endif diff --git a/src/membuf.cpp b/src/membuf.cpp index 3c394b0..45ff5bd 100644 --- a/src/membuf.cpp +++ b/src/membuf.cpp @@ -7,6 +7,12 @@ Bu::MemBuf::MemBuf() : { } +Bu::MemBuf::MemBuf( const Bu::FString &str ) : + sBuf( str ), + nPos( 0 ) +{ +} + Bu::MemBuf::~MemBuf() { } @@ -107,3 +113,8 @@ void Bu::MemBuf::setBlocking( bool bBlocking ) { } +Bu::FString &Bu::MemBuf::getString() +{ + return sBuf; +} + diff --git a/src/membuf.h b/src/membuf.h index b82f943..8f53d4b 100644 --- a/src/membuf.h +++ b/src/membuf.h @@ -15,6 +15,7 @@ namespace Bu { public: MemBuf(); + MemBuf( const Bu::FString &str ); virtual ~MemBuf(); virtual void close(); @@ -41,6 +42,8 @@ namespace Bu virtual bool isBlocking(); virtual void setBlocking( bool bBlocking=true ); + Bu::FString &getString(); + private: Bu::FString sBuf; long nPos; -- cgit v1.2.3 From 60bac0c9f558ab34c70f099db923204a84d51ffc Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Fri, 29 Jun 2007 01:59:26 +0000 Subject: The plugger was dying on a HashException it should have caught, and the Logger now allows you to include extra printf formatting in your fields just like the docs say you can. --- src/logger.cpp | 32 ++++++++++++++++++++------------ src/plugger.h | 8 +++++--- src/tests/logger.cpp | 2 +- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/src/logger.cpp b/src/logger.cpp index 848dfb1..1fc2262 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -71,22 +71,30 @@ void Bu::Logger::setFormat( const Bu::FString &str ) if( *s == '%' ) { sLogFormat += '%'; - s++; - for( int l = 0;; l++ ) + Bu::FString sBuf; + for(;;) { - if( fmts[l][0] == '\0' ) + s++; + int l; + for( l = 0;; l++ ) { - sLogFormat += *s; - break; + if( fmts[l][0] == '\0' ) + { + sBuf += *s; + break; + } + else if( *s == fmts[l][0] ) + { + sLogFormat += fmts[l][2]; + sLogFormat += fmts[l][3]; + sLogFormat += '$'; + sLogFormat += sBuf; + sLogFormat += fmts[l][1]; + break; + } } - else if( *s == fmts[l][0] ) - { - sLogFormat += fmts[l][2]; - sLogFormat += fmts[l][3]; - sLogFormat += '$'; - sLogFormat += fmts[l][1]; + if( fmts[l][0] != '\0' ) break; - } } } else diff --git a/src/plugger.h b/src/plugger.h index 615a662..2124b7a 100644 --- a/src/plugger.h +++ b/src/plugger.h @@ -116,13 +116,15 @@ namespace Bu void registerExternalPlugin( const char *sFName, const char *sPluginName ) { - PluginReg *pReg = (PluginReg *)hPlugin[sPluginName]; - if( pReg != NULL ) - { + PluginReg *pReg; + try { + pReg = (PluginReg *)hPlugin[sPluginName]; hPlugin.erase( sPluginName ); dlclose( pReg->dlHandle ); delete pReg; pReg = NULL; + } catch( Bu::HashException &e ) + { } pReg = new PluginReg; diff --git a/src/tests/logger.cpp b/src/tests/logger.cpp index a271443..290f479 100644 --- a/src/tests/logger.cpp +++ b/src/tests/logger.cpp @@ -19,7 +19,7 @@ class Thing int main() { setLogLevel( 4 ); - setLogFormat("%L: %y-%m-%d %h:%M:%s %f:%l:%F: %t"); + setLogFormat("%L: %y-%02m-%02d %h:%02M:%02s %f:%l:%F: %t"); lineLog( 5, "Hey, error: %s", strerror( errno ) ); Thing gh; -- cgit v1.2.3 From cfcfbf452a96da757420ad87a22c9e25409c975e Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Sat, 30 Jun 2007 06:24:15 +0000 Subject: For now we have no const char * cast operator on FString, ISO C++ says that we can't have that and an indexing operator. More research with other compilers needs to be done if we want to try just having the cast operator. I would rather be able to index than auto-cast. --- src/fstring.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/fstring.h b/src/fstring.h index f06c362..1e1fc02 100644 --- a/src/fstring.h +++ b/src/fstring.h @@ -478,13 +478,14 @@ namespace Bu return pFirst->pData[nIndex]; } - +/* operator const chr *() const { if( !pFirst ) return NULL; flatten(); return pFirst->pData; } + */ operator bool() const { -- cgit v1.2.3 From 364b888d35f5acdef3721025e02210bce5ae3082 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Sun, 1 Jul 2007 06:17:28 +0000 Subject: A minor bugfix in the Bu::Archive was preventing compilation when archiving a Bu::Hash due to the new return value of the unary (*) extraction operator in the iterators. --- src/archive.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/archive.h b/src/archive.h index 6c0c1df..a2d4c8f 100644 --- a/src/archive.h +++ b/src/archive.h @@ -184,8 +184,8 @@ namespace Bu ar << h.size(); for( typename Hash::iterator i = h.begin(); i != h.end(); i++ ) { - std::pair p = *i; - ar << p.first << p.second; + //std::pair p = *i; + ar << (i.getKey()) << (i.getValue()); } return ar; @@ -207,7 +207,6 @@ namespace Bu return ar; } - } #endif -- cgit v1.2.3 From 62fb9ee2ff8b1d9590c92a703d6506de6aa8df52 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Sun, 1 Jul 2007 07:51:52 +0000 Subject: That was weird. Bu::Hash was basically unusable const'd, this has been corrected. There may be more operations that need to be fixed, but all basic data operations are fixed and a const_iterator has been added. --- src/hash.h | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 143 insertions(+), 6 deletions(-) diff --git a/src/hash.h b/src/hash.h index 0fa3af7..f183823 100644 --- a/src/hash.h +++ b/src/hash.h @@ -7,7 +7,8 @@ #include #include #include -#include "exceptionbase.h" +#include "bu/exceptionbase.h" +#include "bu/list.h" ///#include "archival.h" ///#include "archive.h" @@ -593,6 +594,122 @@ namespace Bu return hsh.getValueAtPos( nPos ); } }; + + /** + * Iteration structure for iterating through the hash (const). + */ + typedef struct const_iterator + { + friend class Hash; + private: + const_iterator( const Hash &hsh ) : + hsh( hsh ), + nPos( 0 ), + bFinished( false ) + { + nPos = hsh.getFirstPos( bFinished ); + } + + const_iterator( const Hash &hsh, bool bDone ) : + hsh( hsh ), + nPos( 0 ), + bFinished( bDone ) + { + } + + const Hash &hsh; + uint32_t nPos; + bool bFinished; + + public: + /** + * Iterator incrementation operator. Move the iterator forward. + */ + const_iterator operator++( int ) + { + if( bFinished == false ) + nPos = hsh.getNextPos( nPos, bFinished ); + + return *this; + } + + /** + * Iterator incrementation operator. Move the iterator forward. + */ + const_iterator operator++() + { + if( bFinished == false ) + nPos = hsh.getNextPos( nPos, bFinished ); + + return *this; + } + + /** + * Iterator equality comparison operator. Iterators the same? + */ + bool operator==( const const_iterator &oth ) + { + if( bFinished != oth.bFinished ) + return false; + if( bFinished == true ) + { + return true; + } + else + { + if( oth.nPos == nPos ) + return true; + return false; + } + } + + /** + * Iterator not equality comparison operator. Not the same? + */ + bool operator!=( const const_iterator &oth ) + { + return !(*this == oth ); + } + + /** + * Iterator assignment operator. + */ + const_iterator operator=( const const_iterator &oth ) + { + if( &hsh != &oth.hsh ) + throw HashException( + "Cannot mix iterators from different hash objects."); + nPos = oth.nPos; + bFinished = oth.bFinished; + } + + /** + * Iterator dereference operator... err.. get the value + *@returns (value_type &) The value behind this iterator. + */ + const value &operator *() const + { + return hsh.getValueAtPos( nPos ); + } + + /** + * Get the key behind this iterator. + *@returns (key_type &) The key behind this iterator. + */ + const key &getKey() const + { + return hsh.getKeyAtPos( nPos ); + } + + /** + * Get the value behind this iterator. + *@returs (value_type &) The value behind this iterator. + */ + const value &getValue() const + { + return hsh.getValueAtPos( nPos ); + } + }; /** * Get an iterator pointing to the first item in the hash table. @@ -604,6 +721,11 @@ namespace Bu return iterator( *this ); } + const_iterator begin() const + { + return const_iterator( *this ); + } + /** * Get an iterator pointing to a point just past the last item in the * hash table. @@ -614,14 +736,19 @@ namespace Bu { return iterator( *this, true ); } + + const_iterator end() const + { + return const_iterator( *this, true ); + } /** * Get a list of all the keys in the hash table. *@returns (std::list) The list of keys in the hash table. */ - std::list getKeys() + Bu::List getKeys() const { - std::list lKeys; + Bu::List lKeys; for( uint32_t j = 0; j < nCapacity; j++ ) { @@ -629,7 +756,7 @@ namespace Bu { if( !isDeleted( j ) ) { - lKeys.push_back( aKeys[j] ); + lKeys.append( aKeys[j] ); } } } @@ -682,12 +809,22 @@ namespace Bu return aKeys[nPos]; } + virtual const key &getKeyAtPos( uint32_t nPos ) const + { + return aKeys[nPos]; + } + virtual value &getValueAtPos( uint32_t nPos ) { return aValues[nPos]; } + + virtual const value &getValueAtPos( uint32_t nPos ) const + { + return aValues[nPos]; + } - virtual uint32_t getFirstPos( bool &bFinished ) + virtual uint32_t getFirstPos( bool &bFinished ) const { for( uint32_t j = 0; j < nCapacity; j++ ) { @@ -700,7 +837,7 @@ namespace Bu return 0; } - virtual uint32_t getNextPos( uint32_t nPos, bool &bFinished ) + virtual uint32_t getNextPos( uint32_t nPos, bool &bFinished ) const { for( uint32_t j = nPos+1; j < nCapacity; j++ ) { -- cgit v1.2.3 From bd865cee5f89116c1f054cd0e5c275e97c2d0a9b Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Mon, 2 Jul 2007 20:35:44 +0000 Subject: The list has an isEmpty funcion, and the socket may have a new read function soon, check it out...later... --- src/list.h | 5 +++++ src/socket.cpp | 4 ++++ src/socket.h | 1 + 3 files changed, 10 insertions(+) diff --git a/src/list.h b/src/list.h index 6235619..e05ebbc 100644 --- a/src/list.h +++ b/src/list.h @@ -471,6 +471,11 @@ namespace Bu { return *pLast->pValue; } + + const bool isEmpty() const + { + return (nSize == 0); + } private: Link *pFirst; diff --git a/src/socket.cpp b/src/socket.cpp index 5a3097c..e567061 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -174,6 +174,10 @@ size_t Bu::Socket::read( void *pBuf, size_t nBytes ) return nRead; } +//size_t Bu::Socket::read( void *pBuf, size_t nBytes, uint32_t nTimeout ) +//{ +//} + size_t Bu::Socket::write( const void *pBuf, size_t nBytes ) { int nWrote = TEMP_FAILURE_RETRY( ::write( nSocket, pBuf, nBytes ) ); diff --git a/src/socket.h b/src/socket.h index 9e36041..c291549 100644 --- a/src/socket.h +++ b/src/socket.h @@ -21,6 +21,7 @@ namespace Bu virtual void close(); //virtual void read(); virtual size_t read( void *pBuf, size_t nBytes ); + virtual size_t read( void *pBuf, size_t nBytes, uint32_t nTimeout ); virtual size_t write( const void *pBuf, size_t nBytes ); virtual long tell(); -- cgit v1.2.3