Add a new CTFLogVisitor mock implementation for Nexus to CTF conversion

Signed-off-by: Christian Babeux <christian.babeux@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/converter/nexus/Application.cpp b/converter/nexus/Application.cpp
index 8b476965b99ebeecb15dc093b0e26adb2c3cfedb..a1a157790710eba25c9050939491e99bce88e69c 100644 (file)
--- a/converter/nexus/Application.cpp
+++ b/converter/nexus/Application.cpp
@@ -23,6 +23,7 @@
 #include "Application.h"
 #include "NxMessageDecoder.h"
 #include "NxMessage.h"
+#include "CTFLogVisitor.h"
 #include "FManDebugLogVisitor.h"
 #include "FullAddressVisitor.h"
 #include "SizedAddress.h"
@@ -69,9 +70,8 @@ void Application::enableFmanLog()
 // Enable the Common Trace Format (CTF) converter for the Application
 void Application::enableCTFLog(const string &outdir)
 {
-       // TODO
-       //NxMessageVisitor* v = new CTFLogVisitor(outdir);
-       //visitors_.push_back(v);
+       NxMessageVisitor* v = new CTFLogVisitor(outdir);
+       visitors_.push_back(v);
 }
 
 // Main application entry

diff --git a/converter/nexus/CTFLogVisitor.cpp b/converter/nexus/CTFLogVisitor.cpp
new file mode 100644 (file)
index 0000000..7a7e86f
--- /dev/null
+++ b/converter/nexus/CTFLogVisitor.cpp
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) - 2013 Christian Babeux <christian.babeux@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include <sstream>
+
+#include "CTFLogVisitor.h"
+#include "NxMessageVisitor.h"
+#include "NxMessage.h"
+
+using std::ostringstream;
+using std::endl;
+
+CTFLogVisitor::CTFLogVisitor(const string& trace_path)
+       : trace_path_(trace_path)
+{
+       // TODO
+}
+
+CTFLogVisitor::~CTFLogVisitor()
+{
+       // TODO
+}
+
+string CTFLogVisitor::asString() const
+{
+       // TODO
+       ostringstream os;
+
+       if (useful_visit_) {
+               os << "CTFLogVisitor::asString() == TODO";
+               os << endl;
+               os << "CTF trace path: " << trace_path_;
+               os << endl;
+       }
+
+       return os.str();
+}

diff --git a/converter/nexus/CTFLogVisitor.h b/converter/nexus/CTFLogVisitor.h
new file mode 100644 (file)
index 0000000..fa06e06
--- /dev/null
+++ b/converter/nexus/CTFLogVisitor.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) - 2013 Christian Babeux <christian.babeux@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef CTFLOGVISITOR_H
+#define CTFLOGVISITOR_H
+
+#include <string>
+#include "NxMessageVisitor.h"
+
+using std::string;
+
+class NxDefaultMessage;
+class NxDebugStatusMessage;
+class NxDeviceIDMessage;
+class NxOwnershipTraceMessage;
+class NxDataAcquisitionMessage;
+class NxErrorMessage;
+class NxProgramTraceSync;
+class NxDataTraceWrite;
+class NxDataTraceRead;
+class NxDataTraceWriteSync;
+class NxDataTraceReadSync;
+class NxWatchpointMessage;
+class NxResourceFullMessage;
+class NxProgramTraceIndirectBranch;
+class NxProgramTraceIndirectBranchSync;
+class NxProgramTraceCorrelation;
+class NxDAMInCircuitTraceMessage;
+class NxCAMInCircuitTraceMessage;
+class NxCDMInCircuitTraceMessage;
+class NxDPQMInCircuitTraceMessage;
+class NxDPFMInCircuitTraceMessage;
+class NxCoreInCircuitTraceMessage;
+class NxInCircuitTraceMessage;
+class NxTimeStampCorrelation;
+
+// Convert each Nexus message an equivalent Common Trace Format (CTF) event
+class CTFLogVisitor: public NxMessageVisitor
+{
+public:
+
+       CTFLogVisitor(const string& trace_path);
+       virtual ~CTFLogVisitor();
+
+       virtual void visit(NxDefaultMessage *m){useful_visit_ = false;}
+       virtual void visit(NxDebugStatusMessage *m){useful_visit_ = false;}
+       virtual void visit(NxDeviceIDMessage *m){useful_visit_ = false;}
+       virtual void visit(NxOwnershipTraceMessage *m){useful_visit_ = false;}
+       virtual void visit(NxDataAcquisitionMessage *m){useful_visit_ = false;}
+       virtual void visit(NxErrorMessage *m){useful_visit_ = false;}
+       virtual void visit(NxProgramTraceSync *m){useful_visit_ = false;}
+       virtual void visit(NxDataTraceWrite *m){useful_visit_ = false;}
+       virtual void visit(NxDataTraceRead *m){useful_visit_ = false;}
+       virtual void visit(NxDataTraceWriteSync *m){useful_visit_ = false;}
+       virtual void visit(NxDataTraceReadSync *m){useful_visit_ = false;}
+       virtual void visit(NxWatchpointMessage *m){useful_visit_ = false;}
+       virtual void visit(NxResourceFullMessage *m){useful_visit_ = false;}
+       virtual void visit(NxProgramTraceIndirectBranch *m){useful_visit_ = false;}
+       virtual void visit(NxProgramTraceIndirectBranchSync *m){useful_visit_ = false;}
+       virtual void visit(NxProgramTraceCorrelation *m){useful_visit_ = false;}
+       virtual void visit(NxDAMInCircuitTraceMessage *m){useful_visit_ = false;}
+       virtual void visit(NxCAMInCircuitTraceMessage *m){useful_visit_ = false;}
+       virtual void visit(NxCDMInCircuitTraceMessage *m){useful_visit_ = false;}
+       virtual void visit(NxDPQMInCircuitTraceMessage *m){useful_visit_ = false;}
+       virtual void visit(NxCoreInCircuitTraceMessage *m){useful_visit_ = false;}
+       virtual void visit(NxInCircuitTraceMessage *m){useful_visit_ = false;}
+       virtual void visit(NxTimeStampCorrelation *m){useful_visit_ = false;}
+       virtual void visit(NxDPFMInCircuitTraceMessage *m){useful_visit_ = false;}
+
+       virtual string asString() const;
+
+private:
+       string trace_path_;
+};
+
+#endif // CTFLOGVISITOR_H

diff --git a/converter/nexus/Makefile.am b/converter/nexus/Makefile.am
index 3303ca3fec8d7b19584015197efc275b09dc70e6..010cd2727b7b76904a9298d62f62370d41b3d257 100644 (file)
--- a/converter/nexus/Makefile.am
+++ b/converter/nexus/Makefile.am
@@ -26,6 +26,8 @@ nexdump_SOURCES=main.cpp \
                Application.cpp \
                AUXMessageProtocol.h \
                AUXMessageProtocol.cpp \
+               CTFLogVisitor.h \
+               CTFLogVisitor.cpp \
                FManDebugLog.h \
                FManDebugLog.cpp \
                FManDebugLogVisitor.h \