From e295978b3e842ad5d69683c2ec54d60f16cb4b39 Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Mon, 14 May 2018 16:29:02 +0200 Subject: [PATCH] further shorten shm names --- fairmq/shmem/FairMQTransportFactorySHM.cxx | 8 ++++---- fairmq/shmem/Manager.cxx | 4 ++-- fairmq/shmem/Monitor.cxx | 18 +++++++++--------- fairmq/shmem/README.md | 12 ++++++------ fairmq/shmem/Region.cxx | 4 ++-- fairmq/shmem/runMonitor.cxx | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/fairmq/shmem/FairMQTransportFactorySHM.cxx b/fairmq/shmem/FairMQTransportFactorySHM.cxx index 80067d08..e71c0633 100644 --- a/fairmq/shmem/FairMQTransportFactorySHM.cxx +++ b/fairmq/shmem/FairMQTransportFactorySHM.cxx @@ -76,7 +76,7 @@ FairMQTransportFactorySHM::FairMQTransportFactorySHM(const string& id, const Fai try { - fShMutex = fair::mq::tools::make_unique(bipc::open_or_create, string("fmq_shm_" + fSessionName + "_mutex").c_str()); + fShMutex = fair::mq::tools::make_unique(bipc::open_or_create, string("fmq_" + fSessionName + "_mtx").c_str()); if (zmq_ctx_set(fContext, ZMQ_IO_THREADS, numIoThreads) != 0) { @@ -90,7 +90,7 @@ FairMQTransportFactorySHM::FairMQTransportFactorySHM(const string& id, const Fai } fManager = fair::mq::tools::make_unique(fSessionName, segmentSize); - LOG(debug) << "created/opened shared memory segment '" << "fmq_shm_" << fSessionName << "_main" << "' of " << segmentSize << " bytes. Available are " << fManager->Segment().get_free_memory() << " bytes."; + LOG(debug) << "created/opened shared memory segment '" << "fmq_" << fSessionName << "_main" << "' of " << segmentSize << " bytes. Available are " << fManager->Segment().get_free_memory() << " bytes."; { bipc::scoped_lock lock(*fShMutex); @@ -190,7 +190,7 @@ void FairMQTransportFactorySHM::StartMonitor() void FairMQTransportFactorySHM::SendHeartbeats() { - string controlQueueName("fmq_shm_" + fSessionName + "_control_queue"); + string controlQueueName("fmq_" + fSessionName + "_cq"); while (fSendHeartbeats) { try @@ -312,7 +312,7 @@ FairMQTransportFactorySHM::~FairMQTransportFactorySHM() if (lastRemoved) { - boost::interprocess::named_mutex::remove(string("fmq_shm_" + fSessionName + "_mutex").c_str()); + boost::interprocess::named_mutex::remove(string("fmq_" + fSessionName + "_mtx").c_str()); } } diff --git a/fairmq/shmem/Manager.cxx b/fairmq/shmem/Manager.cxx index c19d0dde..e85b1020 100644 --- a/fairmq/shmem/Manager.cxx +++ b/fairmq/shmem/Manager.cxx @@ -23,8 +23,8 @@ std::unordered_map Manager::fRegions; Manager::Manager(const string& name, size_t size) : fSessionName(name) - , fSegmentName("fmq_shm_" + fSessionName + "_main") - , fManagementSegmentName("fmq_shm_" + fSessionName + "_management") + , fSegmentName("fmq_" + fSessionName + "_main") + , fManagementSegmentName("fmq_" + fSessionName + "_mng") , fSegment(bipc::open_or_create, fSegmentName.c_str(), size) , fManagementSegment(bipc::open_or_create, fManagementSegmentName.c_str(), 65536) {} diff --git a/fairmq/shmem/Monitor.cxx b/fairmq/shmem/Monitor.cxx index 669ffb56..a91e4bee 100644 --- a/fairmq/shmem/Monitor.cxx +++ b/fairmq/shmem/Monitor.cxx @@ -59,9 +59,9 @@ Monitor::Monitor(const string& sessionName, bool selfDestruct, bool interactive, , fCleanOnExit(cleanOnExit) , fTimeoutInMS(timeoutInMS) , fSessionName(sessionName) - , fSegmentName("fmq_shm_" + fSessionName + "_main") - , fManagementSegmentName("fmq_shm_" + fSessionName + "_management") - , fControlQueueName("fmq_shm_" + fSessionName + "_control_queue") + , fSegmentName("fmq_" + fSessionName + "_main") + , fManagementSegmentName("fmq_" + fSessionName + "_mng") + , fControlQueueName("fmq_" + fSessionName + "_cq") , fTerminating(false) , fHeartbeatTriggered(false) , fLastHeartbeat(chrono::high_resolution_clock::now()) @@ -360,7 +360,7 @@ void Monitor::CheckSegment() void Monitor::Cleanup(const string& sessionName) { - string managementSegmentName("fmq_shm_" + sessionName + "_management"); + string managementSegmentName("fmq_" + sessionName + "_mng"); try { bipc::managed_shared_memory managementSegment(bipc::open_only, managementSegmentName.c_str()); @@ -371,8 +371,8 @@ void Monitor::Cleanup(const string& sessionName) unsigned int regionCount = rc->fCount; for (unsigned int i = 1; i <= regionCount; ++i) { - RemoveObject("fmq_shm_" + sessionName + "_region_" + to_string(i)); - RemoveQueue(string("fmq_shm_" + sessionName + "_region_queue_" + to_string(i))); + RemoveObject("fmq_" + sessionName + "_rg_" + to_string(i)); + RemoveQueue(string("fmq_" + sessionName + "_rgq_" + to_string(i))); } } else @@ -387,9 +387,9 @@ void Monitor::Cleanup(const string& sessionName) cout << "Did not find '" << managementSegmentName << "' shared memory segment. No regions to cleanup." << endl; } - RemoveObject("fmq_shm_" + sessionName + "_main"); + RemoveObject("fmq_" + sessionName + "_main"); - boost::interprocess::named_mutex::remove(string("fmq_shm_" + sessionName + "_mutex").c_str()); + boost::interprocess::named_mutex::remove(string("fmq_" + sessionName + "_mtx").c_str()); cout << endl; } @@ -425,7 +425,7 @@ void Monitor::PrintQueues() try { bipc::managed_shared_memory segment(bipc::open_only, fSegmentName.c_str()); - StringVector* queues = segment.find(string("fmq_shm_" + fSessionName + "_queues").c_str()).first; + StringVector* queues = segment.find(string("fmq_" + fSessionName + "_qs").c_str()).first; if (queues) { cout << "found " << queues->size() << " queue(s):" << endl; diff --git a/fairmq/shmem/README.md b/fairmq/shmem/README.md index 00bf74de..c4a36a25 100644 --- a/fairmq/shmem/README.md +++ b/fairmq/shmem/README.md @@ -27,9 +27,9 @@ The Monitor class can also be used independently from the supplied executable (b FairMQ Shared Memory currently uses following names to register shared memory on the system: -`fmq_shm__main` - main segment name, used for user data (session name can be overridden via `--session`). -`fmq_shm__management` - management segment name, used for storing management data. -`fmq_shm__control_queue` - message queue for communicating between shm transport and shm monitor (exists independent of above segments). -`fmq_shm__mutex` - boost::interprocess::named_mutex for management purposes (exists independent of above segments). -`fmq_shm__region_` - names of unmanaged regions. -`fmq_shm__region_queue_` - names of queues for the unmanaged regions. +`fmq__main` - main segment name, used for user data (session name can be overridden via `--session`). +`fmq__mng` - management segment name, used for storing management data. +`fmq__cq` - message queue for communicating between shm transport and shm monitor (exists independent of above segments). +`fmq__mtx` - boost::interprocess::named_mutex for management purposes (exists independent of above segments). +`fmq__rg_` - names of unmanaged regions. +`fmq__rgq_` - names of queues for the unmanaged regions. diff --git a/fairmq/shmem/Region.cxx b/fairmq/shmem/Region.cxx index 3c2bb0e1..ac91cb60 100644 --- a/fairmq/shmem/Region.cxx +++ b/fairmq/shmem/Region.cxx @@ -28,8 +28,8 @@ Region::Region(Manager& manager, uint64_t id, uint64_t size, bool remote, FairMQ : fManager(manager) , fRemote(remote) , fStop(false) - , fName("fmq_shm_" + fManager.fSessionName +"_region_" + to_string(id)) - , fQueueName("fmq_shm_" + fManager.fSessionName +"_region_queue_" + to_string(id)) + , fName("fmq_" + fManager.fSessionName +"_rg_" + to_string(id)) + , fQueueName("fmq_" + fManager.fSessionName +"_rgq_" + to_string(id)) , fShmemObject() , fQueue(nullptr) , fWorker() diff --git a/fairmq/shmem/runMonitor.cxx b/fairmq/shmem/runMonitor.cxx index 563b5485..52863971 100644 --- a/fairmq/shmem/runMonitor.cxx +++ b/fairmq/shmem/runMonitor.cxx @@ -108,7 +108,7 @@ int main(int argc, char** argv) { cout << "Cleaning up \"" << sessionName << "\"..." << endl; fair::mq::shmem::Monitor::Cleanup(sessionName); - fair::mq::shmem::Monitor::RemoveQueue("fmq_shm_" + sessionName + "_control_queue"); + fair::mq::shmem::Monitor::RemoveQueue("fmq_" + sessionName + "_cq"); return 0; }