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

prefix general executables with 'fairmq-'

Browse Source
This commit is contained in:
Alexey Rybalchenko
2018-04-30 17:27:07 +02:00
committed by Mohammad Al-Turany
parent 4b05fda0d8
commit f68b5425a6
7 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fairmq/shmem/FairMQTransportFactorySHM.cxx
View File

@@ -117,17 +117,17 @@ FairMQTransportFactorySHM::FairMQTransportFactorySHM(const string& id, const Fai
MonitorStatus* monitorStatus = fManager->ManagementSegment().find<MonitorStatus>(bipc::unique_instance).first;
if (monitorStatus == nullptr)
{
LOG(debug) << "no shmmonitor found, starting...";
LOG(debug) << "no fairmq-shmmonitor found, starting...";
StartMonitor();
}
else
{
LOG(debug) << "found shmmonitor.";
LOG(debug) << "found fairmq-shmmonitor.";
}
}
catch (std::exception& e)
{
LOG(error) << "Exception during shmmonitor initialization: " << e.what() << ", application will now exit";
LOG(error) << "Exception during fairmq-shmmonitor initialization: " << e.what() << ", application will now exit";
exit(EXIT_FAILURE);
}
}
@@ -149,7 +149,7 @@ void FairMQTransportFactorySHM::StartMonitor()
auto env = boost::this_process::environment();
boost::filesystem::path p = boost::process::search_path("shmmonitor");
boost::filesystem::path p = boost::process::search_path("fairmq-shmmonitor");
if (!p.empty())
{
@@ -160,7 +160,7 @@ void FairMQTransportFactorySHM::StartMonitor()
MonitorStatus* monitorStatus = fManager->ManagementSegment().find<MonitorStatus>(bipc::unique_instance).first;
if (monitorStatus)
{
LOG(debug) << "shmmonitor started";
LOG(debug) << "fairmq-shmmonitor started";
break;
}
else
@@ -168,7 +168,7 @@ void FairMQTransportFactorySHM::StartMonitor()
this_thread::sleep_for(std::chrono::milliseconds(10));
if (++numTries > 1000)
{
LOG(error) << "Did not get response from shmmonitor after " << 10 * 1000 << " milliseconds. Exiting.";
LOG(error) << "Did not get response from fairmq-shmmonitor after " << 10 * 1000 << " milliseconds. Exiting.";
exit(EXIT_FAILURE);
}
}
@@ -177,7 +177,7 @@ void FairMQTransportFactorySHM::StartMonitor()
}
else
{
LOG(WARN) << "could not find shmmonitor in the path";
LOG(WARN) << "could not find fairmq-shmmonitor in the path";
}
}

2
fairmq/shmem/Monitor.cxx
View File

@@ -72,7 +72,7 @@ Monitor::Monitor(const string& sessionName, bool selfDestruct, bool interactive,
MonitorStatus* monitorStatus = fManagementSegment.find<MonitorStatus>(bipc::unique_instance).first;
if (monitorStatus != nullptr)
{
cout << "shmmonitor already started or not properly exited. Try `shmmonitor --cleanup`" << endl;
cout << "fairmq-shmmonitor already started or not properly exited. Try `fairmq-shmmonitor --cleanup`" << endl;
exit(EXIT_FAILURE);
}
fManagementSegment.construct<MonitorStatus>(bipc::unique_instance)();

2
fairmq/shmem/README.md
View File

@@ -23,7 +23,7 @@ Without the `--self-destruct` option, the monitor will run continuously, moitori
Possible further implementation would be to run the monitor with `--self-destruct` with each topology.
The FairMQShmMonitor class can also be used independently from the supplied executable (built from `runFairMQShmMonitor.cxx`), allowing integration on any level. For example invoking the monitor could be a functionality that a device offers.
The Monitor class can also be used independently from the supplied executable (built from `runMonitor.cxx`), allowing integration on any level. For example invoking the monitor could be a functionality that a device offers.
FairMQ Shared Memory currently uses following names to register shared memory on the system: