Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-12 16:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

various fixes

Browse Source 
* fix include paths
* print on stderr
This commit is contained in:
Dennis Klein 2017-03-28 14:48:08 +02:00 committed by Mohammad Al-Turany
parent 13c9c09ab9
commit 365a68010f
17 changed files with 45 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fairmq/FairMQDevice.cxx
View File

@ -30,13 +30,13 @@
#include "FairMQSocket.h" #include "FairMQSocket.h"
#include "FairMQDevice.h" #include "FairMQDevice.h"
#include "FairMQLogger.h" #include "FairMQLogger.h"
#include "FairMQTools.h" #include "tools/FairMQTools.h"
#include "FairMQProgOptions.h" #include "options/FairMQProgOptions.h"
#include "FairMQTransportFactoryZMQ.h" #include "zeromq/FairMQTransportFactoryZMQ.h"
#include "FairMQTransportFactorySHM.h" #include "shmem/FairMQTransportFactorySHM.h"
#ifdef NANOMSG_FOUND #ifdef NANOMSG_FOUND
#include "FairMQTransportFactoryNN.h" #include "nanomsg/FairMQTransportFactoryNN.h"
#endif #endif
using namespace std; using namespace std;

7
fairmq/devices/FairMQBenchmarkSampler.cxx
View File

@ -12,13 +12,14 @@
* @author D. Klein, A. Rybalchenko * @author D. Klein, A. Rybalchenko
*/ */
#include "FairMQBenchmarkSampler.h"
#include <vector> #include <vector>
#include <chrono> #include <chrono>
#include <thread> #include <thread>
#include "FairMQBenchmarkSampler.h" #include "../FairMQLogger.h"
#include "FairMQLogger.h" #include "../options/FairMQProgOptions.h"
#include "FairMQProgOptions.h"
using namespace std; using namespace std;

6
fairmq/devices/FairMQMerger.cxx
View File

@ -12,10 +12,10 @@
* @author D. Klein, A. Rybalchenko * @author D. Klein, A. Rybalchenko
*/ */
#include "FairMQLogger.h"
#include "FairMQMerger.h" #include "FairMQMerger.h"
#include "FairMQPoller.h" #include "../FairMQLogger.h"
#include "FairMQProgOptions.h" #include "../FairMQPoller.h"
#include "../options/FairMQProgOptions.h"
using namespace std; using namespace std;

5
fairmq/devices/FairMQMultiplier.cxx
View File

@ -6,9 +6,10 @@
* copied verbatim in the file "LICENSE" * * copied verbatim in the file "LICENSE" *
********************************************************************************/ ********************************************************************************/
#include "FairMQLogger.h"
#include "FairMQMultiplier.h" #include "FairMQMultiplier.h"
#include "FairMQProgOptions.h"
#include "../FairMQLogger.h"
#include "../options/FairMQProgOptions.h"
using namespace std; using namespace std;

5
fairmq/devices/FairMQProxy.cxx
View File

@ -12,9 +12,10 @@
* @author A. Rybalchenko * @author A. Rybalchenko
*/ */
#include "FairMQLogger.h"
#include "FairMQProxy.h" #include "FairMQProxy.h"
#include "FairMQProgOptions.h"
#include "../FairMQLogger.h"
#include "../options/FairMQProgOptions.h"
using namespace std; using namespace std;

7
fairmq/devices/FairMQSink.cxx
View File

@ -12,11 +12,12 @@
* @author D. Klein, A. Rybalchenko * @author D. Klein, A. Rybalchenko
*/ */
#include "FairMQSink.h"
#include <chrono> #include <chrono>
#include "FairMQSink.h" #include "../FairMQLogger.h"
#include "FairMQLogger.h" #include "../options/FairMQProgOptions.h"
#include "FairMQProgOptions.h"
using namespace std; using namespace std;

5
fairmq/devices/FairMQSplitter.cxx
View File

@ -12,9 +12,10 @@
* @author D. Klein, A. Rybalchenko * @author D. Klein, A. Rybalchenko
*/ */
#include "FairMQLogger.h"
#include "FairMQSplitter.h" #include "FairMQSplitter.h"
#include "FairMQProgOptions.h"
#include "../FairMQLogger.h"
#include "../options/FairMQProgOptions.h"
using namespace std; using namespace std;

53
fairmq/logger/CMakeLists.txt
View File

@ -1,53 +0,0 @@
################################################################################
# Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH #
# #
# This software is distributed under the terms of the #
# GNU Lesser General Public Licence version 3 (LGPL) version 3, #
# copied verbatim in the file "LICENSE" #
################################################################################
# Create a library
set(INCLUDE_DIRECTORIES
${CMAKE_SOURCE_DIR}/fairmq/logger
${CMAKE_SOURCE_DIR}/fairmq/logger/run
)
include_directories(${INCLUDE_DIRECTORIES})
set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR})
include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES ${Boost_LIBRARY_DIRS})
link_directories(${LINK_DIRECTORIES})
set(SRCS logger.cxx)
set(LIBRARY_NAME fairmq_logger)
set(DEPENDENCIES
${Boost_LOG_LIBRARY}
${Boost_LOG_SETUP_LIBRARY}
${Boost_THREAD_LIBRARY}
${Boost_THREAD_LIBRARY}
${Boost_DATE_TIME_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
pthread
)
install(FILES logger.h logger_def.h DESTINATION include/logger)
if("${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}" VERSION_LESS "1.56")
install(FILES fairroot_null_deleter.h DESTINATION include/logger)
endif()
GENERATE_LIBRARY()
# generate test executable
set(EXE_NAME runtestLogger)
set(SRCS run/testLogger.cxx)
set(DEPENDENCIES fairmq_logger)
GENERATE_EXECUTABLE()

8
fairmq/run/runBenchmarkSampler.cxx
View File

@ -1,13 +1,13 @@
/******************************************************************************** /********************************************************************************
* Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * Copyright (C) 2014-2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* * * *
* This software is distributed under the terms of the * * This software is distributed under the terms of the *
* GNU Lesser General Public Licence version 3 (LGPL) version 3, * * GNU Lesser General Public Licence (LGPL) version 3, *
* copied verbatim in the file "LICENSE" * * copied verbatim in the file "LICENSE" *
********************************************************************************/ ********************************************************************************/
#include "runFairMQDevice.h" #include <runFairMQDevice.h>
#include "FairMQBenchmarkSampler.h" #include <devices/FairMQBenchmarkSampler.h>
namespace bpo = boost::program_options; namespace bpo = boost::program_options;

4
fairmq/run/runMerger.cxx
View File

@ -6,8 +6,8 @@
* copied verbatim in the file "LICENSE" * * copied verbatim in the file "LICENSE" *
********************************************************************************/ ********************************************************************************/
#include "runFairMQDevice.h" #include <runFairMQDevice.h>
#include "FairMQMerger.h" #include <devices/FairMQMerger.h>
namespace bpo = boost::program_options; namespace bpo = boost::program_options;

4
fairmq/run/runMultiplier.cxx
View File

@ -6,8 +6,8 @@
* copied verbatim in the file "LICENSE" * * copied verbatim in the file "LICENSE" *
********************************************************************************/ ********************************************************************************/
#include "runFairMQDevice.h" #include <runFairMQDevice.h>
#include "FairMQMultiplier.h" #include <devices/FairMQMultiplier.h>
namespace bpo = boost::program_options; namespace bpo = boost::program_options;

4
fairmq/run/runProxy.cxx
View File

@ -6,8 +6,8 @@
* copied verbatim in the file "LICENSE" * * copied verbatim in the file "LICENSE" *
********************************************************************************/ ********************************************************************************/
#include "runFairMQDevice.h" #include <runFairMQDevice.h>
#include "FairMQProxy.h" #include <devices/FairMQProxy.h>
namespace bpo = boost::program_options; namespace bpo = boost::program_options;

4
fairmq/run/runSink.cxx
View File

@ -6,8 +6,8 @@
* copied verbatim in the file "LICENSE" * * copied verbatim in the file "LICENSE" *
********************************************************************************/ ********************************************************************************/
#include "runFairMQDevice.h" #include <runFairMQDevice.h>
#include "FairMQSink.h" #include <devices/FairMQSink.h>
namespace bpo = boost::program_options; namespace bpo = boost::program_options;

4
fairmq/run/runSplitter.cxx
View File

@ -6,8 +6,8 @@
* copied verbatim in the file "LICENSE" * * copied verbatim in the file "LICENSE" *
********************************************************************************/ ********************************************************************************/
#include "runFairMQDevice.h" #include <runFairMQDevice.h>
#include "FairMQSplitter.h" #include <devices/FairMQSplitter.h>
namespace bpo = boost::program_options; namespace bpo = boost::program_options;

4
fairmq/runFairMQDevice.h
View File

@ -9,9 +9,9 @@
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include "FairMQLogger.h" #include "FairMQLogger.h"
#include "FairMQProgOptions.h" #include "options/FairMQProgOptions.h"
#include "FairMQDevice.h" #include "FairMQDevice.h"
#include "runSimpleMQStateMachine.h" #include "tools/runSimpleMQStateMachine.h"
template <typename R> template <typename R>
class GenericFairMQDevice : public FairMQDevice class GenericFairMQDevice : public FairMQDevice

4
fairmq/shmem/FairMQContextSHM.cxx
View File

@ -48,11 +48,11 @@ FairMQContextSHM::~FairMQContextSHM()
if (boost::interprocess::shared_memory_object::remove("FairMQSharedMemory")) if (boost::interprocess::shared_memory_object::remove("FairMQSharedMemory"))
{ {
printf("Successfully removed shared memory after the device has stopped.\n"); fprintf(stderr, "Successfully removed shared memory after the device has stopped.\n");
} }
else else
{ {
printf("Did not remove shared memory after the device stopped. Already removed?\n"); fprintf(stderr, "Did not remove shared memory after the device stopped. Already removed?\n");
} }
} }

4
fairmq/tools/runSimpleMQStateMachine.h
View File

@ -11,8 +11,8 @@
#include "FairMQLogger.h" #include "FairMQLogger.h"
#include "FairMQConfigPlugin.h" #include "FairMQConfigPlugin.h"
#include "FairMQControlPlugin.h" #include "FairMQControlPlugin.h"
#include "FairMQParser.h" #include "options/FairMQParser.h"
#include "FairMQProgOptions.h" #include "options/FairMQProgOptions.h"
#include <iostream> #include <iostream>
#include <string> #include <string>