summaryrefslogtreecommitdiff
path: root/cpp/src/IceStorm
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceStorm')
-rw-r--r--cpp/src/IceStorm/IceStormDB.cpp8
-rw-r--r--cpp/src/IceStorm/InstrumentationI.cpp4
-rw-r--r--cpp/src/IceStorm/Parser.cpp6
-rw-r--r--cpp/src/IceStorm/Service.cpp2
-rw-r--r--cpp/src/IceStorm/Subscriber.cpp8
-rw-r--r--cpp/src/IceStorm/TopicI.cpp22
-rw-r--r--cpp/src/IceStorm/TopicManagerI.cpp12
-rw-r--r--cpp/src/IceStorm/TransientTopicI.cpp10
-rw-r--r--cpp/src/IceStorm/TransientTopicManagerI.cpp2
9 files changed, 37 insertions, 37 deletions
diff --git a/cpp/src/IceStorm/IceStormDB.cpp b/cpp/src/IceStorm/IceStormDB.cpp
index b3a927c719e..9a3c81022e3 100644
--- a/cpp/src/IceStorm/IceStormDB.cpp
+++ b/cpp/src/IceStorm/IceStormDB.cpp
@@ -231,8 +231,8 @@ Client::run(int argc, char* argv[])
{
if(debug)
{
- cout << " KEY = TOPIC(" << communicator()->identityToString(q->first.topic)
- << ") ID(" << communicator()->identityToString(q->first.id) << ")" <<endl;
+ cout << " KEY = TOPIC(" << identityToString(q->first.topic)
+ << ") ID(" << identityToString(q->first.id) << ")" <<endl;
}
subscriberMap.put(txn, q->first, q->second);
}
@@ -286,8 +286,8 @@ Client::run(int argc, char* argv[])
{
if(debug)
{
- cout << " KEY = TOPIC(" << communicator()->identityToString(key.topic)
- << ") ID(" << communicator()->identityToString(key.id) << ")" <<endl;
+ cout << " KEY = TOPIC(" << identityToString(key.topic)
+ << ") ID(" << identityToString(key.id) << ")" <<endl;
}
data.subscribers.insert(std::make_pair(key, record));
}
diff --git a/cpp/src/IceStorm/InstrumentationI.cpp b/cpp/src/IceStorm/InstrumentationI.cpp
index 017a5196fd3..ad3495429c9 100644
--- a/cpp/src/IceStorm/InstrumentationI.cpp
+++ b/cpp/src/IceStorm/InstrumentationI.cpp
@@ -174,7 +174,7 @@ public:
}
catch(const ::Ice::FixedProxyException&)
{
- _id = _proxy->ice_getCommunicator()->identityToString(_proxy->ice_getIdentity());
+ _id = identityToString(_proxy->ice_getIdentity());
}
}
return _id;
@@ -206,7 +206,7 @@ public:
string
getIdentity() const
{
- return _proxy->ice_getCommunicator()->identityToString(_proxy->ice_getIdentity());
+ return identityToString(_proxy->ice_getIdentity());
}
private:
diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp
index fc00848fe65..6f802b11569 100644
--- a/cpp/src/IceStorm/Parser.cpp
+++ b/cpp/src/IceStorm/Parser.cpp
@@ -364,7 +364,7 @@ Parser::subscribers(const list<string>& args)
IdentitySeq subscribers = topic->getSubscribers();
for(IdentitySeq::const_iterator j = subscribers.begin(); j != subscribers.end(); ++j)
{
- cout << "\t" << _communicator->identityToString(*j) << endl;
+ cout << "\t" << identityToString(*j) << endl;
}
}
}
@@ -379,7 +379,7 @@ Parser::current(const list<string>& args)
{
if(args.empty())
{
- cout << _communicator->identityToString(_defaultManager->ice_getIdentity()) << endl;
+ cout << identityToString(_defaultManager->ice_getIdentity()) << endl;
return;
}
else if(args.size() > 1)
@@ -618,7 +618,7 @@ Parser::parse(const std::string& commands, bool debug)
TopicManagerPrx
Parser::findManagerById(const string& full, string& arg) const
{
- Ice::Identity id = _communicator->stringToIdentity(full);
+ Ice::Identity id = stringToIdentity(full);
arg = id.name;
if(id.category.empty())
{
diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp
index de1393e554e..9d925c9bff1 100644
--- a/cpp/src/IceStorm/Service.cpp
+++ b/cpp/src/IceStorm/Service.cpp
@@ -403,7 +403,7 @@ ServiceI::start(
}
topicAdapter->add(new FinderI(TopicManagerPrx::uncheckedCast(topicAdapter->createProxy(topicManagerId))),
- communicator->stringToIdentity("IceStorm/Finder"));
+ stringToIdentity("IceStorm/Finder"));
topicAdapter->activate();
publishAdapter->activate();
diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp
index 4b53be621e1..a4b89d09e1b 100644
--- a/cpp/src/IceStorm/Subscriber.cpp
+++ b/cpp/src/IceStorm/Subscriber.cpp
@@ -546,7 +546,7 @@ Subscriber::create(
Ice::Identity perId;
perId.category = instance->instanceName();
perId.name = "topic." + rec.topicName + ".publish." +
- instance->communicator()->identityToString(rec.obj->ice_getIdentity());
+ identityToString(rec.obj->ice_getIdentity());
Ice::ObjectPrx proxy = instance->publishAdapter()->add(per, perId);
TraceLevelsPtr traceLevels = instance->traceLevels();
SubscriberPtr subscriber;
@@ -798,7 +798,7 @@ Subscriber::error(bool dec, const Ice::Exception& e)
if(_currentRetry == 0)
{
Ice::Warning warn(traceLevels->logger);
- warn << traceLevels->subscriberCat << ":" << _instance->communicator()->identityToString(_rec.id);
+ warn << traceLevels->subscriberCat << ":" << identityToString(_rec.id);
if(traceLevels->subscriber > 1)
{
warn << " endpoints: " << IceStormInternal::describeEndpoints(_rec.obj);
@@ -811,7 +811,7 @@ Subscriber::error(bool dec, const Ice::Exception& e)
if(traceLevels->subscriber > 0)
{
Ice::Trace out(traceLevels->logger, traceLevels->subscriberCat);
- out << _instance->communicator()->identityToString(_rec.id);
+ out << identityToString(_rec.id);
if(traceLevels->subscriber > 1)
{
out << " endpoints: " << IceStormInternal::describeEndpoints(_rec.obj);
@@ -839,7 +839,7 @@ Subscriber::error(bool dec, const Ice::Exception& e)
if(traceLevels->subscriber > 0)
{
Ice::Trace out(traceLevels->logger, traceLevels->subscriberCat);
- out << _instance->communicator()->identityToString(_rec.id);
+ out << identityToString(_rec.id);
if(traceLevels->subscriber > 1)
{
out << " endpoints: " << IceStormInternal::describeEndpoints(_rec.obj);
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index acea59e5c15..3a9c3d65a79 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -399,7 +399,7 @@ TopicImpl::TopicImpl(
if(traceLevels->topic > 0)
{
Ice::Trace out(traceLevels->logger, traceLevels->topicCat);
- out << _name << " recreate " << _instance->communicator()->identityToString(id);
+ out << _name << " recreate " << identityToString(id);
if(traceLevels->topic > 1)
{
out << " endpoints: " << IceStormInternal::describeEndpoints(p->obj);
@@ -418,7 +418,7 @@ TopicImpl::TopicImpl(
catch(const Ice::Exception& ex)
{
Ice::Warning out(traceLevels->logger);
- out << _name << " recreate " << _instance->communicator()->identityToString(id);
+ out << _name << " recreate " << identityToString(id);
if(traceLevels->topic > 1)
{
out << " endpoints: " << IceStormInternal::describeEndpoints(p->obj);
@@ -491,7 +491,7 @@ trace(Ice::Trace& out, const PersistentInstancePtr& instance, const vector<Subsc
{
out << ",";
}
- out << instance->communicator()->identityToString((*p)->id());
+ out << identityToString((*p)->id());
}
out << "]";
}
@@ -516,7 +516,7 @@ TopicImpl::subscribeAndGetPublisher(const QoS& qos, const Ice::ObjectPrx& obj)
if(traceLevels->topic > 0)
{
Ice::Trace out(traceLevels->logger, traceLevels->topicCat);
- out << _name << ": subscribeAndGetPublisher: " << _instance->communicator()->identityToString(id);
+ out << _name << ": subscribeAndGetPublisher: " << identityToString(id);
if(traceLevels->topic > 1)
{
@@ -600,7 +600,7 @@ TopicImpl::unsubscribe(const Ice::ObjectPrx& subscriber)
if(traceLevels->topic > 0)
{
Ice::Trace out(traceLevels->logger, traceLevels->topicCat);
- out << _name << ": unsubscribe: " << _instance->communicator()->identityToString(id);
+ out << _name << ": unsubscribe: " << identityToString(id);
if(traceLevels->topic > 1)
{
@@ -637,7 +637,7 @@ TopicImpl::link(const TopicPrx& topic, Ice::Int cost)
if(traceLevels->topic > 0)
{
Ice::Trace out(traceLevels->logger, traceLevels->topicCat);
- out << _name << ": link " << _instance->communicator()->identityToString(topic->ice_getIdentity())
+ out << _name << ": link " << identityToString(topic->ice_getIdentity())
<< " cost " << cost;
}
@@ -722,7 +722,7 @@ TopicImpl::unlink(const TopicPrx& topic)
if(traceLevels->topic > 0)
{
Ice::Trace out(traceLevels->logger, traceLevels->topicCat);
- out << _name << " unlink " << _instance->communicator()->identityToString(id);
+ out << _name << " unlink " << identityToString(id);
}
Ice::IdentitySeq ids;
@@ -746,7 +746,7 @@ TopicImpl::reap(const Ice::IdentitySeq& ids)
{
out << ",";
}
- out << _instance->communicator()->identityToString(*p);
+ out << identityToString(*p);
}
}
@@ -1045,7 +1045,7 @@ TopicImpl::observerAddSubscriber(const LogUpdate& llu, const SubscriberRecord& r
if(traceLevels->topic > 0)
{
Ice::Trace out(traceLevels->logger, traceLevels->topicCat);
- out << _name << ": add replica observer: " << _instance->communicator()->identityToString(record.id);
+ out << _name << ": add replica observer: " << identityToString(record.id);
if(traceLevels->topic > 1)
{
@@ -1072,7 +1072,7 @@ TopicImpl::observerAddSubscriber(const LogUpdate& llu, const SubscriberRecord& r
if(traceLevels->topic > 0)
{
Ice::Trace out(traceLevels->logger, traceLevels->topicCat);
- out << _instance->communicator()->identityToString(record.id) << ": already subscribed";
+ out << identityToString(record.id) << ": already subscribed";
}
return;
}
@@ -1116,7 +1116,7 @@ TopicImpl::observerRemoveSubscriber(const LogUpdate& llu, const Ice::IdentitySeq
{
out << ",";
}
- out << _instance->communicator()->identityToString(*id);
+ out << identityToString(*id);
}
out << " llu: " << llu.generation << "/" << llu.iteration;
}
diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp
index 5c4ad1c6cbc..15696d70abc 100644
--- a/cpp/src/IceStorm/TopicManagerI.cpp
+++ b/cpp/src/IceStorm/TopicManagerI.cpp
@@ -421,14 +421,14 @@ TopicManagerImpl::observerInit(const LogUpdate& llu, const TopicContentSeq& cont
out << "init";
for(TopicContentSeq::const_iterator p = content.begin(); p != content.end(); ++p)
{
- out << " topic: " << _instance->communicator()->identityToString(p->id) << " subscribers: ";
+ out << " topic: " << identityToString(p->id) << " subscribers: ";
for(SubscriberRecordSeq::const_iterator q = p->records.begin(); q != p->records.end(); ++q)
{
if(q != p->records.begin())
{
out << ",";
}
- out << _instance->communicator()->identityToString(q->id);
+ out << identityToString(q->id);
if(traceLevels->topicMgr > 1)
{
out << " endpoints: " << IceStormInternal::describeEndpoints(q->obj);
@@ -803,7 +803,7 @@ TopicManagerImpl::installTopic(const string& name, const Ice::Identity& id, bool
if(create)
{
out << "creating new topic \"" << name << "\". id: "
- << _instance->communicator()->identityToString(id)
+ << identityToString(id)
<< " subscribers: ";
for(SubscriberRecordSeq::const_iterator q = subscribers.begin(); q != subscribers.end(); ++q)
{
@@ -813,7 +813,7 @@ TopicManagerImpl::installTopic(const string& name, const Ice::Identity& id, bool
}
if(traceLevels->topicMgr > 1)
{
- out << _instance->communicator()->identityToString(q->id)
+ out << identityToString(q->id)
<< " endpoints: " << IceStormInternal::describeEndpoints(q->obj);
}
}
@@ -821,7 +821,7 @@ TopicManagerImpl::installTopic(const string& name, const Ice::Identity& id, bool
else
{
out << "loading topic \"" << name << "\" from database. id: "
- << _instance->communicator()->identityToString(id)
+ << identityToString(id)
<< " subscribers: ";
for(SubscriberRecordSeq::const_iterator q = subscribers.begin(); q != subscribers.end(); ++q)
{
@@ -831,7 +831,7 @@ TopicManagerImpl::installTopic(const string& name, const Ice::Identity& id, bool
}
if(traceLevels->topicMgr > 1)
{
- out << _instance->communicator()->identityToString(q->id)
+ out << identityToString(q->id)
<< " endpoints: " << IceStormInternal::describeEndpoints(q->obj);
}
}
diff --git a/cpp/src/IceStorm/TransientTopicI.cpp b/cpp/src/IceStorm/TransientTopicI.cpp
index 062db7014fb..f11688d1a10 100644
--- a/cpp/src/IceStorm/TransientTopicI.cpp
+++ b/cpp/src/IceStorm/TransientTopicI.cpp
@@ -178,7 +178,7 @@ TransientTopicImpl::subscribe(const QoS& origQoS, const Ice::ObjectPrx& obj, con
if(traceLevels->topic > 0)
{
Ice::Trace out(traceLevels->logger, traceLevels->topicCat);
- out << _name << ": subscribe: " << _instance->communicator()->identityToString(id);
+ out << _name << ": subscribe: " << identityToString(id);
if(traceLevels->topic > 1)
{
@@ -280,7 +280,7 @@ TransientTopicImpl::subscribeAndGetPublisher(const QoS& qos, const Ice::ObjectPr
if(traceLevels->topic > 0)
{
Ice::Trace out(traceLevels->logger, traceLevels->topicCat);
- out << _name << ": subscribeAndGetPublisher: " << _instance->communicator()->identityToString(id);
+ out << _name << ": subscribeAndGetPublisher: " << identityToString(id);
if(traceLevels->topic > 1)
{
@@ -338,7 +338,7 @@ TransientTopicImpl::unsubscribe(const Ice::ObjectPrx& subscriber, const Ice::Cur
if(traceLevels->topic > 0)
{
Ice::Trace out(traceLevels->logger, traceLevels->topicCat);
- out << _name << ": unsubscribe: " << _instance->communicator()->identityToString(id);
+ out << _name << ": unsubscribe: " << identityToString(id);
if(traceLevels->topic > 1)
{
out << " endpoints: " << IceStormInternal::describeEndpoints(subscriber);
@@ -374,7 +374,7 @@ TransientTopicImpl::link(const TopicPrx& topic, Ice::Int cost, const Ice::Curren
if(traceLevels->topic > 0)
{
Ice::Trace out(traceLevels->logger, traceLevels->topicCat);
- out << _name << ": link " << _instance->communicator()->identityToString(topic->ice_getIdentity())
+ out << _name << ": link " << identityToString(topic->ice_getIdentity())
<< " cost " << cost;
}
@@ -434,7 +434,7 @@ TransientTopicImpl::unlink(const TopicPrx& topic, const Ice::Current&)
if(traceLevels->topic > 0)
{
Ice::Trace out(traceLevels->logger, traceLevels->topicCat);
- out << _name << " unlink " << _instance->communicator()->identityToString(id);
+ out << _name << " unlink " << identityToString(id);
}
// Remove the subscriber from the subscribers list. Note
diff --git a/cpp/src/IceStorm/TransientTopicManagerI.cpp b/cpp/src/IceStorm/TransientTopicManagerI.cpp
index 8c45a471f19..5bd8449fd66 100644
--- a/cpp/src/IceStorm/TransientTopicManagerI.cpp
+++ b/cpp/src/IceStorm/TransientTopicManagerI.cpp
@@ -55,7 +55,7 @@ TransientTopicManagerImpl::create(const string& name, const Ice::Current&)
{
Ice::Trace out(traceLevels->logger, traceLevels->topicMgrCat);
out << "creating new topic \"" << name << "\". id: "
- << _instance->communicator()->identityToString(id);
+ << identityToString(id);
}
//
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 23:11:41 +0000