Commit 7f3186f4 authored by Mathieu Faverge's avatar Mathieu Faverge

Support correctly the MT_PARSER option

parent fe7071f9
......@@ -40,11 +40,11 @@ include(${QT_USE_FILE})
find_package(GLU)
### Optimization options
option(VITE_ENABLE_SERIALIZATION
option(VITE_ENABLE_SERIALIZATION
"Enable the support of Boost Serialization." OFF)
option(VITE_ENABLE_VBO
option(VITE_ENABLE_VBO
"Enable the support of VBO." OFF)
option(VITE_ENABLE_MT_PARSERS
option(VITE_ENABLE_MT_PARSERS
"Enable multi-threading in parsers." OFF)
### Debug options
......@@ -54,9 +54,9 @@ cmake_dependent_option(VITE_DBG_MEMORY_TRACE
"Enable trace generation of memory usage (requires MEMORY_USAGE)." OFF "VITE_DBG_MEMORY_USAGE" OFF)
### Trace format options
option(VITE_ENABLE_OTF
option(VITE_ENABLE_OTF
"Enable the support of OTF file format." OFF)
option(VITE_ENABLE_TAU
option(VITE_ENABLE_TAU
"Enable the support of TAU file format." OFF)
# timeval, timespec, realtime clocks, etc
......@@ -90,10 +90,10 @@ check_include_files(string.h HAVE_STRING_H)
#
# Find optional packages
#
#
# Search for Boost
# Components : filesystem, iostreams, programoptions, python, regex,
# Search for Boost
# Components : filesystem, iostreams, programoptions, python, regex,
# serialization, signals, system, thread, wave
if(VITE_ENABLE_SERIALIZATION)
find_package( Boost COMPONENTS serialization thread iostreams)
......
......@@ -118,12 +118,6 @@ SET(VITE_HDRS
parser/PajeParser/ParserEventPaje.hpp
parser/PajeParser/ParserPaje.hpp
parser/PajeParser/ParserVite.hpp
#Multithread Paje
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
statistics/Statistic.hpp
......@@ -204,12 +198,6 @@ SET(VITE_SRCS
parser/PajeParser/ParserEventPaje.cpp
parser/PajeParser/ParserPaje.cpp
parser/PajeParser/ParserVite.cpp
#Multithread Paje Parser
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
statistics/Stats_window.cpp
......@@ -282,9 +270,6 @@ IF(VITE_ENABLE_OTF)
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
......@@ -292,11 +277,22 @@ IF(VITE_ENABLE_OTF)
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
)
IF(VITE_ENABLE_MT_PARSERS)
SET(VITE_HDRS
${VITE_HDRS}
parser/OTFParser/mt_ParserEventOTF.hpp
parser/OTFParser/mt_ParserOTF.hpp
parser/OTFParser/OTFTraceBuilderThread.hpp
)
SET(VITE_SRCS
${VITE_SRCS}
parser/OTFParser/mt_ParserEventOTF.cpp
parser/OTFParser/mt_ParserOTF.cpp
parser/OTFParser/OTFTraceBuilderThread.cpp
)
ENDIF()
INCLUDE_DIRECTORIES(${OTF_INCLUDE_DIR})
ENDIF(VITE_ENABLE_OTF)
......@@ -322,9 +318,33 @@ IF(VITE_ENABLE_TAU)
ENDIF(VITE_ENABLE_TAU)
#ADD_DEFINITIONS(-DMEMORY_USAGE)
#ADD_DEFINITIONS(-DMEMORY_TRACE)
#############################################
# Multi-threaded Paje Parser
#############################################
IF(VITE_ENABLE_MT_PARSERS)
SET(VITE_HDRS
${VITE_HDRS}
#Multithread Paje
parser/PajeParser/mt_ParserEventPaje.hpp
parser/PajeParser/mt_ParserPaje.hpp
parser/PajeParser/mt_PajeFileManager.hpp
parser/PajeParser/BuilderThread.hpp
trace/TraceBuilderThread.hpp
)
SET(VITE_SRCS
${VITE_SRCS}
#Multithread Paje Parser
parser/PajeParser/mt_ParserEventPaje.cpp
parser/PajeParser/mt_ParserPaje.cpp
parser/PajeParser/mt_PajeFileManager.cpp
parser/PajeParser/BuilderThread.cpp
trace/TraceBuilderThread.cpp
)
ENDIF()
#############################################
# BOOST
......
......@@ -6,13 +6,13 @@
** use, modify and/or redistribute the software under the terms of the
** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
** URL: "http://www.cecill.info".
**
**
** As a counterpart to the access to the source code and rights to copy,
** modify and redistribute granted by the license, users are provided
** only with a limited warranty and the software's author, the holder of
** the economic rights, and the successive licensors have only limited
** liability.
**
**
** In this respect, the user's attention is drawn to the risks associated
** with loading, using, modifying and/or developing or reproducing the
** software by the user in light of its specific status of free software,
......@@ -23,7 +23,7 @@
** their requirements in conditions enabling the security of their
** systems and/or data to be ensured and, more generally, to use and
** operate it in the same conditions as regards security.
**
**
** The fact that you are presently reading this means that you have had
** knowledge of the CeCILL-A license and that you accept its terms.
**
......@@ -37,7 +37,7 @@
** - MARCOUEILLE Jule
** - NOISETTE Pascal
** - REDONDY Arthur
** - VUCHENER Clément
** - VUCHENER Clément
**
*/
/*!
......@@ -96,6 +96,6 @@ typedef double Times;
/* TODO : move this somewhere else when we will have the message handler */
#define vite_warning(str) std::cerr << str << std::endl;
#define vite_error(str) std::cerr << str << std::endl;
#define vite_error(str) std::cerr << str << std::endl;
#endif /* COMMON_H */
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