Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-10-07 18:22:53 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-10-07 18:22:53 (GMT) |
| commit | eb982771caed944f441967194df86ddbec21efde (patch) | |
| tree | e76ab6fccb3e88898d9bb1eb4c8866d6ebdcbb5d | |
| parent | 6b98253a4127c975bd59b6a49ddb203337a8c32b (diff) | |
| download | swift-contrib-eb982771caed944f441967194df86ddbec21efde.zip swift-contrib-eb982771caed944f441967194df86ddbec21efde.tar.bz2 | |
Initialize LibXML for multithreaded applications.
| -rw-r--r-- | Swiften/Parser/LibXMLParser.cpp | 8 | ||||
| -rw-r--r-- | Swiften/Parser/LibXMLParser.h | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Swiften/Parser/LibXMLParser.cpp b/Swiften/Parser/LibXMLParser.cpp index ae87f38..1590262 100644 --- a/Swiften/Parser/LibXMLParser.cpp +++ b/Swiften/Parser/LibXMLParser.cpp @@ -45,21 +45,27 @@ static void handleError(void*, const char* /*m*/, ... ) { va_start(args, m); vfprintf(stdout, m, args); va_end(args); */ } static void handleWarning(void*, const char*, ... ) { } - +bool LibXMLParser::initialized = false; LibXMLParser::LibXMLParser(XMLParserClient* client) : XMLParser(client) { + // Initialize libXML for multithreaded applications + if (!initialized) { + xmlInitParser(); + initialized = true; + } + memset(&handler_, 0, sizeof(handler_) ); handler_.initialized = XML_SAX2_MAGIC; handler_.startElementNs = &handleStartElement; handler_.endElementNs = &handleEndElement; handler_.characters = &handleCharacterData; handler_.warning = &handleWarning; handler_.error = &handleError; context_ = xmlCreatePushParserCtxt(&handler_, this, 0, 0, 0); diff --git a/Swiften/Parser/LibXMLParser.h b/Swiften/Parser/LibXMLParser.h index ba61ad9..cd73637 100644 --- a/Swiften/Parser/LibXMLParser.h +++ b/Swiften/Parser/LibXMLParser.h @@ -6,21 +6,26 @@ #pragma once #include <libxml/parser.h> #include <boost/noncopyable.hpp> #include <Swiften/Parser/XMLParser.h> namespace Swift { + /** + * Warning: This constructor is not thread-safe, because it depends on global state to + * check whether it is initialized. + */ class LibXMLParser : public XMLParser, public boost::noncopyable { public: LibXMLParser(XMLParserClient* client); ~LibXMLParser(); bool parse(const std::string& data); private: + static bool initialized; xmlSAXHandler handler_; xmlParserCtxtPtr context_; }; } |