From 36f409dc72c71e20556179dbefe1f3ed129aa5b9 Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Wed, 6 Feb 2019 16:37:47 +0100 Subject: [PATCH] Formatting --- examples/dds/Processor.h | 4 ++-- examples/dds/Sampler.cxx | 4 ++-- examples/dds/Sink.cxx | 4 ++-- fairmq/FairMQMessage.cxx | 4 ++-- fairmq/FairMQPoller.cxx | 4 ++-- fairmq/FairMQPoller.h | 4 ++-- fairmq/FairMQSocket.cxx | 4 ++-- fairmq/FairMQSocket.h | 4 ++-- fairmq/devices/FairMQMerger.cxx | 4 ++-- fairmq/devices/FairMQMerger.h | 4 ++-- fairmq/devices/FairMQMultiplier.cxx | 4 ++-- fairmq/devices/FairMQMultiplier.h | 4 ++-- fairmq/devices/FairMQProxy.cxx | 4 ++-- fairmq/devices/FairMQProxy.h | 4 ++-- fairmq/devices/FairMQSink.h | 6 +++--- fairmq/devices/FairMQSplitter.cxx | 4 ++-- fairmq/devices/FairMQSplitter.h | 4 ++-- fairmq/nanomsg/FairMQPollerNN.cxx | 4 ++-- fairmq/nanomsg/FairMQPollerNN.h | 4 ++-- fairmq/nanomsg/FairMQSocketNN.cxx | 4 ++-- fairmq/nanomsg/FairMQSocketNN.h | 4 ++-- fairmq/ofi/Poller.cxx | 4 ++-- fairmq/options/FairMQProgOptions.cxx | 2 +- fairmq/shmem/FairMQPollerSHM.cxx | 4 ++-- fairmq/zeromq/FairMQPollerZMQ.cxx | 4 ++-- fairmq/zeromq/FairMQPollerZMQ.h | 4 ++-- fairmq/zeromq/FairMQSocketZMQ.h | 4 ++-- test/plugin_services/_config.cxx | 28 ++++++++++++++-------------- 28 files changed, 68 insertions(+), 68 deletions(-) diff --git a/examples/dds/Processor.h b/examples/dds/Processor.h index c8530fee..ede74087 100644 --- a/examples/dds/Processor.h +++ b/examples/dds/Processor.h @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ diff --git a/examples/dds/Sampler.cxx b/examples/dds/Sampler.cxx index e4fb3fa9..f6c3c065 100644 --- a/examples/dds/Sampler.cxx +++ b/examples/dds/Sampler.cxx @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ /** diff --git a/examples/dds/Sink.cxx b/examples/dds/Sink.cxx index e4df0731..62958ea1 100644 --- a/examples/dds/Sink.cxx +++ b/examples/dds/Sink.cxx @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ /** diff --git a/fairmq/FairMQMessage.cxx b/fairmq/FairMQMessage.cxx index d2837aad..bc9d4147 100644 --- a/fairmq/FairMQMessage.cxx +++ b/fairmq/FairMQMessage.cxx @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ /** diff --git a/fairmq/FairMQPoller.cxx b/fairmq/FairMQPoller.cxx index 08e89424..9f9687a6 100644 --- a/fairmq/FairMQPoller.cxx +++ b/fairmq/FairMQPoller.cxx @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ /** diff --git a/fairmq/FairMQPoller.h b/fairmq/FairMQPoller.h index ec2d7c8e..d8a58983 100644 --- a/fairmq/FairMQPoller.h +++ b/fairmq/FairMQPoller.h @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ diff --git a/fairmq/FairMQSocket.cxx b/fairmq/FairMQSocket.cxx index 0855f465..b318cc68 100644 --- a/fairmq/FairMQSocket.cxx +++ b/fairmq/FairMQSocket.cxx @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ diff --git a/fairmq/FairMQSocket.h b/fairmq/FairMQSocket.h index 74528467..dee98c16 100644 --- a/fairmq/FairMQSocket.h +++ b/fairmq/FairMQSocket.h @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ diff --git a/fairmq/devices/FairMQMerger.cxx b/fairmq/devices/FairMQMerger.cxx index c0ea0290..e0c0a3be 100644 --- a/fairmq/devices/FairMQMerger.cxx +++ b/fairmq/devices/FairMQMerger.cxx @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ /** diff --git a/fairmq/devices/FairMQMerger.h b/fairmq/devices/FairMQMerger.h index 0e24a03c..5f4e0d14 100644 --- a/fairmq/devices/FairMQMerger.h +++ b/fairmq/devices/FairMQMerger.h @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ /** diff --git a/fairmq/devices/FairMQMultiplier.cxx b/fairmq/devices/FairMQMultiplier.cxx index ec18ff15..156500e1 100644 --- a/fairmq/devices/FairMQMultiplier.cxx +++ b/fairmq/devices/FairMQMultiplier.cxx @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ diff --git a/fairmq/devices/FairMQMultiplier.h b/fairmq/devices/FairMQMultiplier.h index 0e151351..06da096f 100644 --- a/fairmq/devices/FairMQMultiplier.h +++ b/fairmq/devices/FairMQMultiplier.h @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ diff --git a/fairmq/devices/FairMQProxy.cxx b/fairmq/devices/FairMQProxy.cxx index 915ac509..df3b6e09 100644 --- a/fairmq/devices/FairMQProxy.cxx +++ b/fairmq/devices/FairMQProxy.cxx @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ /** diff --git a/fairmq/devices/FairMQProxy.h b/fairmq/devices/FairMQProxy.h index b2f43204..d2e344c5 100644 --- a/fairmq/devices/FairMQProxy.h +++ b/fairmq/devices/FairMQProxy.h @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ /** diff --git a/fairmq/devices/FairMQSink.h b/fairmq/devices/FairMQSink.h index e3b9d0aa..fb8c6f17 100644 --- a/fairmq/devices/FairMQSink.h +++ b/fairmq/devices/FairMQSink.h @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ /** @@ -57,7 +57,7 @@ class FairMQSink : public FairMQDevice//, public OutputPolicy LOG(info) << "Starting the benchmark and expecting to receive " << fMaxIterations << " messages."; auto tStart = std::chrono::high_resolution_clock::now(); - while (CheckCurrentState(RUNNING)) + while (!NewStatePending()) { if (fMultipart) { diff --git a/fairmq/devices/FairMQSplitter.cxx b/fairmq/devices/FairMQSplitter.cxx index a8a87b43..d1ed196e 100644 --- a/fairmq/devices/FairMQSplitter.cxx +++ b/fairmq/devices/FairMQSplitter.cxx @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ /** diff --git a/fairmq/devices/FairMQSplitter.h b/fairmq/devices/FairMQSplitter.h index b51344b3..5a163228 100644 --- a/fairmq/devices/FairMQSplitter.h +++ b/fairmq/devices/FairMQSplitter.h @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ /** diff --git a/fairmq/nanomsg/FairMQPollerNN.cxx b/fairmq/nanomsg/FairMQPollerNN.cxx index 2f946fe1..eb268957 100644 --- a/fairmq/nanomsg/FairMQPollerNN.cxx +++ b/fairmq/nanomsg/FairMQPollerNN.cxx @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ /** diff --git a/fairmq/nanomsg/FairMQPollerNN.h b/fairmq/nanomsg/FairMQPollerNN.h index feb6c830..878d3208 100644 --- a/fairmq/nanomsg/FairMQPollerNN.h +++ b/fairmq/nanomsg/FairMQPollerNN.h @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ /** diff --git a/fairmq/nanomsg/FairMQSocketNN.cxx b/fairmq/nanomsg/FairMQSocketNN.cxx index 30498fff..42c7e0fd 100644 --- a/fairmq/nanomsg/FairMQSocketNN.cxx +++ b/fairmq/nanomsg/FairMQSocketNN.cxx @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ /** diff --git a/fairmq/nanomsg/FairMQSocketNN.h b/fairmq/nanomsg/FairMQSocketNN.h index 8007c81b..241162d4 100644 --- a/fairmq/nanomsg/FairMQSocketNN.h +++ b/fairmq/nanomsg/FairMQSocketNN.h @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ diff --git a/fairmq/ofi/Poller.cxx b/fairmq/ofi/Poller.cxx index 81cc670a..2155e308 100644 --- a/fairmq/ofi/Poller.cxx +++ b/fairmq/ofi/Poller.cxx @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ diff --git a/fairmq/options/FairMQProgOptions.cxx b/fairmq/options/FairMQProgOptions.cxx index 55cfd3e4..bdabf006 100644 --- a/fairmq/options/FairMQProgOptions.cxx +++ b/fairmq/options/FairMQProgOptions.cxx @@ -58,7 +58,7 @@ FairMQProgOptions::FairMQProgOptions() fMQOptions.add_options() ("id", po::value(), "Device ID (required argument).") ("io-threads", po::value()->default_value(1), "Number of I/O threads.") - ("transport", po::value()->default_value("zeromq"), "Transport ('zeromq'/'nanomsg'/'shmem') .") + ("transport", po::value()->default_value("zeromq"), "Transport ('zeromq'/'nanomsg'/'shmem').") ("network-interface", po::value()->default_value("default"), "Network interface to bind on (e.g. eth0, ib0..., default will try to detect the interface of the default route).") ("config-key", po::value(), "Use provided value instead of device id for fetching the configuration from the config file.") ("initialization-timeout", po::value()->default_value(120), "Timeout for the initialization in seconds (when expecting dynamic initialization).") diff --git a/fairmq/shmem/FairMQPollerSHM.cxx b/fairmq/shmem/FairMQPollerSHM.cxx index 80a1e516..c314dc4d 100644 --- a/fairmq/shmem/FairMQPollerSHM.cxx +++ b/fairmq/shmem/FairMQPollerSHM.cxx @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ /** diff --git a/fairmq/zeromq/FairMQPollerZMQ.cxx b/fairmq/zeromq/FairMQPollerZMQ.cxx index 333f8e79..820d1ff0 100644 --- a/fairmq/zeromq/FairMQPollerZMQ.cxx +++ b/fairmq/zeromq/FairMQPollerZMQ.cxx @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ /** diff --git a/fairmq/zeromq/FairMQPollerZMQ.h b/fairmq/zeromq/FairMQPollerZMQ.h index 8247d36b..2fff5f0b 100644 --- a/fairmq/zeromq/FairMQPollerZMQ.h +++ b/fairmq/zeromq/FairMQPollerZMQ.h @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ /** diff --git a/fairmq/zeromq/FairMQSocketZMQ.h b/fairmq/zeromq/FairMQSocketZMQ.h index 3337b77e..ba055878 100644 --- a/fairmq/zeromq/FairMQSocketZMQ.h +++ b/fairmq/zeromq/FairMQSocketZMQ.h @@ -1,8 +1,8 @@ /******************************************************************************** * Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH * * * - * This software is distributed under the terms of the * - * GNU Lesser General Public Licence (LGPL) version 3, * + * This software is distributed under the terms of the * + * GNU Lesser General Public Licence (LGPL) version 3, * * copied verbatim in the file "LICENSE" * ********************************************************************************/ diff --git a/test/plugin_services/_config.cxx b/test/plugin_services/_config.cxx index 898df504..9e4a1adc 100644 --- a/test/plugin_services/_config.cxx +++ b/test/plugin_services/_config.cxx @@ -22,15 +22,15 @@ TEST_F(PluginServices, ConfigSynchronous) { mServices.SubscribeToDeviceStateChange("test",[&](DeviceState newState){ switch (newState) { - case DeviceState::InitializingDevice: - mServices.SetProperty("blubb", 42); - break; - case DeviceState::DeviceReady: - EXPECT_EQ(mServices.GetProperty("blubb"), 42); - EXPECT_EQ(mServices.GetPropertyAsString("blubb"), fair::mq::tools::ToString(42)); - break; - default: - break; + case DeviceState::InitializingDevice: + mServices.SetProperty("blubb", 42); + break; + case DeviceState::DeviceReady: + EXPECT_EQ(mServices.GetProperty("blubb"), 42); + EXPECT_EQ(mServices.GetPropertyAsString("blubb"), fair::mq::tools::ToString(42)); + break; + default: + break; } }); } @@ -39,11 +39,11 @@ TEST_F(PluginServices, ConfigInvalidStateError) { mServices.SubscribeToDeviceStateChange("test",[&](DeviceState newState){ switch (newState) { - case DeviceState::DeviceReady: - ASSERT_THROW(mServices.SetProperty("blubb", 42), fair::mq::PluginServices::InvalidStateError); - break; - default: - break; + case DeviceState::DeviceReady: + ASSERT_THROW(mServices.SetProperty("blubb", 42), fair::mq::PluginServices::InvalidStateError); + break; + default: + break; } }); }