From 1f8c3e3b78e0abb96d06a51eca354ae7ade5deb2 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Wed, 1 Nov 2017 12:46:35 +0900 Subject: Extract XmlWriter and XmlWalker from opencl into tools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In opencl we read and writer the profile xml with custom classes XmlWriter and XmlWalker for reading. This classes are useful in other places (very similar XmlWriter is used in test), so extract the code from opencl and move it to a more common place - tools. Refactoring of other usages will follow. Change-Id: I8363e87b7c30083d299080adec3f99cb33ebe4cc Reviewed-on: https://gerrit.libreoffice.org/44149 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- opencl/inc/opencl_device_selection.h | 182 ++--------------------------------- 1 file changed, 8 insertions(+), 174 deletions(-) (limited to 'opencl') diff --git a/opencl/inc/opencl_device_selection.h b/opencl/inc/opencl_device_selection.h index 54caf183f2aa..5ebc87a9410c 100644 --- a/opencl/inc/opencl_device_selection.h +++ b/opencl/inc/opencl_device_selection.h @@ -21,9 +21,9 @@ #include #include -#include -#include #include +#include +#include #include #include @@ -235,172 +235,6 @@ inline ds_status initDSProfile(std::unique_ptr& rProfile, OString co return DS_SUCCESS; } -/** - * XmlWriter writes a XML to a SvStream. It uses libxml2 for writing but hides - * all the internal libxml2 workings and uses types that are native for LO - * development. - * - * The codepage used for XML is always "utf-8" and the output is indented so it - * is easier to read. - * - * TODO: move to common code - */ -class XmlWriter -{ -private: - SvStream* mpStream; - xmlTextWriterPtr mpWriter; - - static int funcWriteCallback(void* pContext, const char* sBuffer, int nLen) - { - SvStream* pStream = static_cast(pContext); - return static_cast(pStream->WriteBytes(sBuffer, nLen)); - } - - static int funcCloseCallback(void* pContext) - { - SvStream* pStream = static_cast(pContext); - pStream->Flush(); - return 0; // 0 or -1 in case of error - } - -public: - - XmlWriter(SvStream* pStream) - : mpStream(pStream) - , mpWriter(nullptr) - { - } - - ~XmlWriter() - { - if (mpWriter != nullptr) - endDocument(); - } - - bool startDocument() - { - xmlOutputBufferPtr xmlOutBuffer = xmlOutputBufferCreateIO(funcWriteCallback, funcCloseCallback, mpStream, nullptr); - mpWriter = xmlNewTextWriter(xmlOutBuffer); - if (mpWriter == nullptr) - return false; - xmlTextWriterSetIndent(mpWriter, 1); - xmlTextWriterStartDocument(mpWriter, nullptr, "UTF-8", nullptr); - return true; - } - - void endDocument() - { - xmlTextWriterEndDocument(mpWriter); - xmlFreeTextWriter(mpWriter); - mpWriter = nullptr; - } - - void startElement(const OString& sName) - { - xmlChar* xmlName = xmlCharStrdup(sName.getStr()); - xmlTextWriterStartElement(mpWriter, xmlName); - xmlFree(xmlName); - } - - void endElement() - { - xmlTextWriterEndElement(mpWriter); - } - - void content(const OString& sValue) - { - xmlChar* xmlValue = xmlCharStrdup(sValue.getStr()); - xmlTextWriterWriteString(mpWriter, xmlValue); - xmlFree(xmlValue); - } -}; - -/** - * XmlWalker main purpose is to make it easier for walking the - * parsed XML DOM tree. - * - * It hides all the libxml2 and C -isms and makes the usage more - * comfortable from LO developer point of view. - * - * TODO: move to common code - */ -class XmlWalker -{ -private: - xmlDocPtr mpDocPtr; - xmlNodePtr mpRoot; - xmlNodePtr mpCurrent; - - std::vector mpStack; - -public: - XmlWalker() - : mpDocPtr(nullptr) - , mpRoot(nullptr) - , mpCurrent(nullptr) - {} - - ~XmlWalker() - { - xmlFreeDoc(mpDocPtr); - } - - bool open(SvStream* pStream) - { - std::size_t nSize = pStream->remainingSize(); - std::vector aBuffer(nSize + 1); - pStream->ReadBytes(aBuffer.data(), nSize); - aBuffer[nSize] = 0; - mpDocPtr = xmlParseDoc(reinterpret_cast(aBuffer.data())); - if (mpDocPtr == nullptr) - return false; - mpRoot = xmlDocGetRootElement(mpDocPtr); - mpCurrent = mpRoot; - mpStack.push_back(mpCurrent); - return true; - } - - OString name() - { - return OString(reinterpret_cast(mpCurrent->name)); - } - - OString content() - { - OString aContent; - if (mpCurrent->xmlChildrenNode != nullptr) - { - xmlChar* pContent = xmlNodeListGetString(mpDocPtr, mpCurrent->xmlChildrenNode, 1); - aContent = OString(reinterpret_cast(pContent)); - xmlFree(pContent); - } - return aContent; - } - - void children() - { - mpStack.push_back(mpCurrent); - mpCurrent = mpCurrent->xmlChildrenNode; - } - - void parent() - { - mpCurrent = mpStack.back(); - mpStack.pop_back(); - } - - void next() - { - mpCurrent = mpCurrent->next; - } - - bool isValid() const - { - return mpCurrent != nullptr; - } -}; - inline ds_status writeProfile(const OUString& rStreamName, std::unique_ptr const & pProfile) { if (pProfile == nullptr) @@ -411,7 +245,7 @@ inline ds_status writeProfile(const OUString& rStreamName, std::unique_ptr pStream; pStream.reset(new SvFileStream(rStreamName, StreamMode::STD_READWRITE | StreamMode::TRUNC)); - XmlWriter aXmlWriter(pStream.get()); + tools::XmlWriter aXmlWriter(pStream.get()); if (!aXmlWriter.startDocument()) return DS_FILE_ERROR; @@ -430,12 +264,12 @@ inline ds_status writeProfile(const OUString& rStreamName, std::unique_ptr pStream; pStream.reset(new SvFileStream(rStreamName, StreamMode::READ)); - XmlWalker aWalker; + tools::XmlWalker aWalker; if (!aWalker.open(pStream.get())) return DS_FILE_ERROR; -- cgit