Commit 2efde775 authored by Johnny Jazeix's avatar Johnny Jazeix

Découpage des parsers en sous dossiers

parent 303bae38
......@@ -112,17 +112,17 @@ SET(VITE_HDRS
parser/Parser.hpp
parser/ParserFactory.hpp
# Paje
parser/PajeDefinition.hpp
parser/PajeFileManager.hpp
parser/ParserDefinitionPaje.hpp
parser/ParserEventPaje.hpp
parser/ParserPaje.hpp
parser/ParserVite.hpp
parser/PajeParser/PajeDefinition.hpp
parser/PajeParser/PajeFileManager.hpp
parser/PajeParser/ParserDefinitionPaje.hpp
parser/PajeParser/ParserEventPaje.hpp
parser/PajeParser/ParserPaje.hpp
parser/PajeParser/ParserVite.hpp
#Multithread Paje
parser/mt_ParserEventPaje.hpp
parser/mt_ParserPaje.hpp
parser/mt_PajeFileManager.hpp
parser/BuilderThread.hpp
parser/PajeParser/mt_ParserEventPaje.hpp
parser/PajeParser/mt_ParserPaje.hpp
parser/PajeParser/mt_PajeFileManager.hpp
parser/PajeParser/BuilderThread.hpp
trace/TraceBuilderThread.hpp
# Statistics headers
statistics/Stats_window.hpp
......@@ -198,17 +198,17 @@ SET(VITE_SRCS
parser/ParserFactory.cpp
parser/ParsingThread.cpp
# Paje Parser
parser/PajeDefinition.cpp
parser/PajeFileManager.cpp
parser/ParserDefinitionPaje.cpp
parser/ParserEventPaje.cpp
parser/ParserPaje.cpp
parser/ParserVite.cpp
parser/PajeParser/PajeDefinition.cpp
parser/PajeParser/PajeFileManager.cpp
parser/PajeParser/ParserDefinitionPaje.cpp
parser/PajeParser/ParserEventPaje.cpp
parser/PajeParser/ParserPaje.cpp
parser/PajeParser/ParserVite.cpp
#Multithread Paje Parser
parser/mt_ParserEventPaje.cpp
parser/mt_ParserPaje.cpp
parser/mt_PajeFileManager.cpp
parser/BuilderThread.cpp
parser/PajeParser/mt_ParserEventPaje.cpp
parser/PajeParser/mt_ParserPaje.cpp
parser/PajeParser/mt_PajeFileManager.cpp
parser/PajeParser/BuilderThread.cpp
trace/TraceBuilderThread.cpp
# Statistics code files
statistics/Statistic.cpp
......@@ -279,22 +279,22 @@ IF(VITE_ENABLE_OTF)
SET(VITE_HDRS
${VITE_HDRS}
parser/ParserDefinitionOTF.hpp
parser/ParserEventOTF.hpp
parser/ParserOTF.hpp
parser/mt_ParserEventOTF.hpp
parser/mt_ParserOTF.hpp
parser/OTFTraceBuilderThread.hpp
parser/OTFParser/ParserDefinitionOTF.hpp
parser/OTFParser/ParserEventOTF.hpp
parser/OTFParser/ParserOTF.hpp
parser/OTFParser/mt_ParserEventOTF.hpp
parser/OTFParser/mt_ParserOTF.hpp
parser/OTFParser/OTFTraceBuilderThread.hpp
)
SET(VITE_SRCS
${VITE_SRCS}
parser/ParserDefinitionOTF.cpp
parser/ParserEventOTF.cpp
parser/ParserOTF.cpp
parser/mt_ParserEventOTF.cpp
parser/mt_ParserOTF.cpp
parser/OTFTraceBuilderThread.cpp
parser/OTFParser/ParserDefinitionOTF.cpp
parser/OTFParser/ParserEventOTF.cpp
parser/OTFParser/ParserOTF.cpp
parser/OTFParser/mt_ParserEventOTF.cpp
parser/OTFParser/mt_ParserOTF.cpp
parser/OTFParser/OTFTraceBuilderThread.cpp
)
INCLUDE_DIRECTORIES(${OTF_INCLUDE_DIR})
......@@ -309,13 +309,13 @@ IF(VITE_ENABLE_TAU)
SET(VITE_HDRS
${VITE_HDRS}
parser/ParserTau.hpp
parser/TauStructs.hpp
parser/TauParser/ParserTau.hpp
parser/TauParser/TauStructs.hpp
)
SET(VITE_SRCS
${VITE_SRCS}
parser/ParserTau.cpp
parser/TauParser/ParserTau.cpp
)
INCLUDE_DIRECTORIES(${TAU_INCLUDE_DIR})
......
......@@ -244,7 +244,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget">
<widget class="QWidget" name="layoutWidget_1">
<property name="geometry">
<rect>
<x>10</x>
......
......@@ -61,9 +61,9 @@
#include <QObject>
#include <QMutex>
/* -- */
#include "parser/ParserDefinitionOTF.hpp"
#include "parser/mt_ParserEventOTF.hpp"
#include "parser/OTFTraceBuilderThread.hpp"
#include "parser/OTFParser/ParserDefinitionOTF.hpp"
#include "parser/OTFParser/mt_ParserEventOTF.hpp"
#include "parser/OTFParser/OTFTraceBuilderThread.hpp"
/* -- */
using namespace std;
......
......@@ -63,7 +63,7 @@
#include "trace/Entitys.hpp"
#include "trace/Trace.hpp"
/* -- */
#include "parser/ParserDefinitionOTF.hpp"
#include "parser/OTFParser/ParserDefinitionOTF.hpp"
#include <QWaitCondition>
#include <QSemaphore>
......
......@@ -67,7 +67,7 @@
#include "trace/Entitys.hpp"
#include "trace/Trace.hpp"
/* -- */
#include "parser/ParserDefinitionOTF.hpp"
#include "parser/OTFParser/ParserDefinitionOTF.hpp"
/* -- */
using namespace std;
......
......@@ -64,8 +64,8 @@
#include "trace/Entitys.hpp"
#include "trace/Trace.hpp"
/* -- */
#include "parser/ParserDefinitionOTF.hpp"
#include "parser/ParserEventOTF.hpp"
#include "parser/OTFParser/ParserDefinitionOTF.hpp"
#include "parser/OTFParser/ParserEventOTF.hpp"
/* -- */
using namespace std;
......
......@@ -64,9 +64,9 @@
#include "trace/Trace.hpp"
/* -- */
#include "parser/Parser.hpp"
#include "parser/ParserOTF.hpp"
#include "parser/ParserDefinitionOTF.hpp"
#include "parser/ParserEventOTF.hpp"
#include "parser/OTFParser/ParserOTF.hpp"
#include "parser/OTFParser/ParserDefinitionOTF.hpp"
#include "parser/OTFParser/ParserEventOTF.hpp"
/* -- */
using namespace std;
......
......@@ -57,9 +57,9 @@
#include "trace/Entitys.hpp"
#include "trace/Trace.hpp"
/* -- */
#include "parser/ParserDefinitionOTF.hpp"
#include "parser/mt_ParserEventOTF.hpp"
#include "parser/OTFTraceBuilderThread.hpp"
#include "parser/OTFParser/ParserDefinitionOTF.hpp"
#include "parser/OTFParser/mt_ParserEventOTF.hpp"
#include "parser/OTFParser/OTFTraceBuilderThread.hpp"
/* -- */
using namespace std;
......
......@@ -63,7 +63,7 @@
#include "trace/Entitys.hpp"
#include "trace/Trace.hpp"
/* -- */
#include "parser/ParserDefinitionOTF.hpp"
#include "parser/OTFParser/ParserDefinitionOTF.hpp"
#include <QWaitCondition>
#include <QSemaphore>
#include <QObject>
......
......@@ -58,10 +58,10 @@
#include "trace/Trace.hpp"
/* -- */
#include "parser/Parser.hpp"
#include "parser/mt_ParserOTF.hpp"
#include "parser/ParserDefinitionOTF.hpp"
#include "parser/mt_ParserEventOTF.hpp"
#include "parser/OTFTraceBuilderThread.hpp"
#include "parser/OTFParser/mt_ParserOTF.hpp"
#include "parser/OTFParser/ParserDefinitionOTF.hpp"
#include "parser/OTFParser/mt_ParserEventOTF.hpp"
#include "parser/OTFParser/OTFTraceBuilderThread.hpp"
/* -- */
using namespace std;
......
......@@ -57,7 +57,6 @@
#define mt_ParserOTF_HPP
#include <QtCore>
#include <parser/Parser.hpp>
#include <parser/Parser.hpp>
#include <otf.h>
class mt_ParserEventOTF;
class ParserDefinitionOTF;
......
......@@ -51,12 +51,13 @@
#include "trace/Trace.hpp"
/* -- */
#include "parser/Parser.hpp"
#include "parser/mt_PajeFileManager.hpp"
#include "parser/ParserDefinitionPaje.hpp"
#include "parser/mt_ParserEventPaje.hpp"
#include "parser/PajeParser/mt_PajeFileManager.hpp"
#include "parser/PajeParser/ParserDefinitionPaje.hpp"
#include "parser/PajeParser/mt_ParserEventPaje.hpp"
/* -- */
#include "parser/BuilderThread.hpp"
#include "parser/PajeParser/BuilderThread.hpp"
#include "trace/TraceBuilderThread.hpp"
BuilderThread::BuilderThread(mt_ParserEventPaje *p, Trace * trace,QWaitCondition* cond,QWaitCondition* trace_cond, QSemaphore *sem1, QSemaphore *sem2, QMutex *mutex, QMutex *mutex2){
_parser = p;
......
......@@ -49,7 +49,7 @@
#include <QWaitCondition>
#include <QSemaphore>
#include <queue>
#include <parser/mt_PajeFileManager.hpp>
#include <parser/PajeParser/mt_PajeFileManager.hpp>
class Trace;
class Parser;
......
......@@ -49,7 +49,7 @@
#include <stdexcept>
#include <map>
/* -- */
#include "parser/PajeDefinition.hpp"
#include "parser/PajeParser/PajeDefinition.hpp"
/* -- */
using namespace std;
......
......@@ -46,7 +46,7 @@
#include <fstream>
#include <iostream>
/* -- */
#include "parser/PajeFileManager.hpp"
#include "parser/PajeParser/PajeFileManager.hpp"
/* -- */
using namespace std;
......
......@@ -51,9 +51,9 @@
/* -- */
#include "common/Errors.hpp"
/* -- */
#include "parser/PajeFileManager.hpp" // temporary
#include "parser/PajeDefinition.hpp"
#include "parser/ParserDefinitionPaje.hpp"
#include "parser/PajeParser/PajeFileManager.hpp" // temporary
#include "parser/PajeParser/PajeDefinition.hpp"
#include "parser/PajeParser/ParserDefinitionPaje.hpp"
/* -- */
using namespace std;
......
......@@ -56,10 +56,10 @@
/* -- */
#include <fstream>
#include <sstream>
#include "parser/PajeFileManager.hpp" // temporary
#include "parser/PajeDefinition.hpp"
#include "parser/ParserDefinitionPaje.hpp"
#include "parser/ParserEventPaje.hpp"
#include "parser/PajeParser/PajeFileManager.hpp" // temporary
#include "parser/PajeParser/PajeDefinition.hpp"
#include "parser/PajeParser/ParserDefinitionPaje.hpp"
#include "parser/PajeParser/ParserEventPaje.hpp"
/* -- */
using namespace std;
#ifdef WIN32
......
......@@ -57,11 +57,11 @@
/* -- */
#include "parser/Parser.hpp"
/* -- */
#include "parser/PajeFileManager.hpp"
#include "parser/PajeDefinition.hpp"
#include "parser/ParserDefinitionPaje.hpp"
#include "parser/ParserEventPaje.hpp"
#include "parser/ParserPaje.hpp"
#include "parser/PajeParser/PajeFileManager.hpp"
#include "parser/PajeParser/PajeDefinition.hpp"
#include "parser/PajeParser/ParserDefinitionPaje.hpp"
#include "parser/PajeParser/ParserEventPaje.hpp"
#include "parser/PajeParser/ParserPaje.hpp"
/* -- */
using namespace std;
......
......@@ -61,11 +61,11 @@
#include "trace/Trace.hpp"
/* -- */
#include "parser/Parser.hpp"
#include "parser/ParserVite.hpp"
#include "parser/PajeFileManager.hpp"
#include "parser/ParserPaje.hpp"
#include "parser/ParserEventPaje.hpp"
#include "parser/ParserDefinitionPaje.hpp"
#include "parser/PajeParser/ParserVite.hpp"
#include "parser/PajeParser/PajeFileManager.hpp"
#include "parser/PajeParser/ParserPaje.hpp"
#include "parser/PajeParser/ParserEventPaje.hpp"
#include "parser/PajeParser/ParserDefinitionPaje.hpp"
/* -- */
using namespace std;
......
......@@ -57,7 +57,7 @@
#include <queue>
/* -- */
#include "common/Errors.hpp"
#include "parser/mt_PajeFileManager.hpp"
#include "parser/PajeParser/mt_PajeFileManager.hpp"
/* -- */
using namespace std;
......
......@@ -56,10 +56,10 @@
/* -- */
#include <fstream>
#include <sstream>
#include "parser/mt_PajeFileManager.hpp" // temporary
#include "parser/PajeDefinition.hpp"
#include "parser/ParserDefinitionPaje.hpp"
#include "parser/mt_ParserEventPaje.hpp"
#include "parser/PajeParser/mt_PajeFileManager.hpp" // temporary
#include "parser/PajeParser/PajeDefinition.hpp"
#include "parser/PajeParser/ParserDefinitionPaje.hpp"
#include "parser/PajeParser/mt_ParserEventPaje.hpp"
#include "trace/TraceBuilderThread.hpp"
/* -- */
#include <QMetaType>
......
......@@ -71,9 +71,9 @@
#include "trace/Trace.hpp"
/* -- */
#include <fstream>
#include "parser/mt_PajeFileManager.hpp"
#include "parser/PajeDefinition.hpp"
#include "parser/ParserDefinitionPaje.hpp"
#include "parser/PajeParser/mt_PajeFileManager.hpp"
#include "parser/PajeParser/PajeDefinition.hpp"
#include "parser/PajeParser/ParserDefinitionPaje.hpp"
#include "trace/TraceBuilderThread.hpp"
class Container;
......
......@@ -57,12 +57,12 @@
/* -- */
#include "parser/Parser.hpp"
/* -- */
#include "parser/mt_PajeFileManager.hpp"
#include "parser/PajeDefinition.hpp"
#include "parser/ParserDefinitionPaje.hpp"
#include "parser/mt_ParserEventPaje.hpp"
#include "parser/mt_ParserPaje.hpp"
#include "parser/BuilderThread.hpp"
#include "parser/PajeParser/mt_PajeFileManager.hpp"
#include "parser/PajeParser/PajeDefinition.hpp"
#include "parser/PajeParser/ParserDefinitionPaje.hpp"
#include "parser/PajeParser/mt_ParserEventPaje.hpp"
#include "parser/PajeParser/mt_ParserPaje.hpp"
#include "parser/PajeParser/BuilderThread.hpp"
#include "trace/TraceBuilderThread.hpp"
/* -- */
/*
......
......@@ -51,7 +51,7 @@
#include <cstdio>
#include <QtCore>
#include <parser/Parser.hpp>
#include <parser/mt_PajeFileManager.hpp>
#include <parser/PajeParser/mt_PajeFileManager.hpp>
class ParserDefinitionPaje;
class mt_ParserEventPaje;
class mt_PajeFileManager;
......
......@@ -57,24 +57,24 @@
#include "parser/Parser.hpp"
#ifdef MT_PARSING
#include "parser/mt_ParserPaje.hpp"
#include "parser/PajeParser/mt_ParserPaje.hpp"
#else
#include "parser/ParserPaje.hpp"
#include "parser/PajeParser/ParserPaje.hpp"
#endif
#include "parser/ParserVite.hpp"
#include "parser/PajeParser/ParserVite.hpp"
#ifdef WITH_OTF
#include <otf.h>
#ifdef MT_PARSING
#include "parser/mt_ParserOTF.hpp"
#include "parser/OTFParser/mt_ParserOTF.hpp"
#else
#include "parser/ParserOTF.hpp"
#include "parser/OTFParser/ParserOTF.hpp"
#endif
#endif //WITH_OTF
#ifdef WITH_TAU
#include <TAU_tf.h>
#include "parser/ParserTau.hpp"
#include "parser/TauParser/ParserTau.hpp"
#endif //WITH_TAU
......
......@@ -57,7 +57,7 @@
#include "trace/Trace.hpp"
/* -- */
#include "parser/Parser.hpp"
#include "parser/ParserTau.hpp"
#include "parser/TauParser/ParserTau.hpp"
/* -- */
using namespace std;
......
......@@ -48,7 +48,7 @@
#ifndef PARSERTAU_HPP
#define PARSERTAU_HPP
#include "TauStructs.hpp"
#include "parser/TauParser/TauStructs.hpp"
/*!
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment