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

generate id if no device id available

Browse Source 
* CreateSocket factory no longer accepts id param, but the
    TransportFactory has an id member instead
This commit is contained in:
Dennis Klein
2017-05-16 18:26:24 +02:00
committed by Mohammad Al-Turany
parent eb614b6005
commit 3be2f297f3
10 changed files with 101 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
fairmq/FairMQTransportFactory.cxx
View File

@@ -14,21 +14,41 @@
#endif /* NANOMSG_FOUND */
#include <FairMQLogger.h>
#include <memory>
#include <boost/uuid/uuid.hpp>
#include <boost/uuid/uuid_generators.hpp>
#include <boost/uuid/uuid_io.hpp>
#include <string>
#include <sstream>
auto FairMQTransportFactory::CreateTransportFactory(const std::string& type) -> std::shared_ptr<FairMQTransportFactory>
FairMQTransportFactory::FairMQTransportFactory(const std::string& id)
: fkId(id)
{
}
auto FairMQTransportFactory::CreateTransportFactory(const std::string& type, const std::string& id) -> std::shared_ptr<FairMQTransportFactory>
{
using namespace std;
auto final_id = id;
// Generate uuid if empty
if(final_id == "")
{
final_id = boost::uuids::to_string(boost::uuids::random_generator()());
}
if (type == "zeromq")
{
return std::make_shared<FairMQTransportFactoryZMQ>();
return std::make_shared<FairMQTransportFactoryZMQ>(final_id);
}
else if (type == "shmem")
{
return std::make_shared<FairMQTransportFactorySHM>();
return std::make_shared<FairMQTransportFactorySHM>(final_id);
}
#ifdef NANOMSG_FOUND
else if (type == "nanomsg")
{
return std::make_shared<FairMQTransportFactoryNN>();
return std::make_shared<FairMQTransportFactoryNN>(final_id);
}
#endif /* NANOMSG_FOUND */
else