Add logger for InformationManager

[frida/frida.git] / src / core / InformationManager.cxx

diff --git a/src/core/InformationManager.cxx b/src/core/InformationManager.cxx
index 294dc2f53583b7e3a9c5ce6b8f33fd49427bf058..1ea4ba0cb0357f7a12235d8af3adb17592659043 100644 (file)
--- a/src/core/InformationManager.cxx
+++ b/src/core/InformationManager.cxx
@@ -8,6 +8,10 @@
 #include <quazip/quazip.h>
 #include <quazip/quazipfile.h>
 
+InformationManager::InformationManager()
+       : logger(log4cxx::Logger::getLogger("InformationManager"))
+{}
+
 InformationManager::~InformationManager() {
        for (auto b : blocks)
                delete b.second;
@@ -37,23 +41,9 @@ void InformationManager::save(const QString& filename) {
                stream.setAutoFormatting(true);
                stream.setAutoFormattingIndent(-1);
                stream.writeStartDocument();
-               stream.writeStartElement("function");
-               stream.writeAttribute("name", fun->getName().c_str());
-               stream.writeAttribute("entry", QString::number(fun->getStartAddress(), 16));
-
-               for (auto& blockentry : fun->blocks()) {
-                       stream.writeStartElement("block");
-                       stream.writeAttribute("id", blockentry.second->getName().c_str());
-                       stream.writeTextElement("start", QString::number(blockentry.second->getStartAddress(), 16));
-                       stream.writeTextElement("end", QString::number(blockentry.second->getEndAddress(), 16));
-                       if (0 != blockentry.second->getNextBlock(0))
-                               stream.writeTextElement("next", QString::number(blockentry.second->getNextBlock(0), 16));
-                       if (0 != blockentry.second->getNextBlock(1))
-                               stream.writeTextElement("next", QString::number(blockentry.second->getNextBlock(1), 16));
-                       stream.writeEndElement(); // "block"
-               }
-
-               stream.writeEndElement(); // "function"
+
+               fun->serialize(stream);
+
                stream.writeEndDocument();
                outZipFile.close();
        }
@@ -101,6 +91,7 @@ Comment* InformationManager::newLocalComment(uint64_t address, Function* f) {
 }
 
 void InformationManager::finishFunction(Function* fun) {
+       LOG4CXX_DEBUG(logger, "Finishing function " << fun->getName());
        for (auto b : fun->blocks()) {
                BasicBlock* bl = b.second;
                blocks.insert(std::make_pair(bl->getStartAddress(), bl));