The master now waits for the replicas to be updated before to return.

Added support for dynamic registration of adapters in the replicas.

1 files changed, 73 insertions, 0 deletions

diff --git a/cpp/src/IceGrid/ReplicaCache.cpp b/cpp/src/IceGrid/ReplicaCache.cpp
index f411e170730..e60fd1a21e8 100644
--- a/cpp/src/IceGrid/ReplicaCache.cpp
+++ b/cpp/src/IceGrid/ReplicaCache.cpp
@@ -89,6 +89,24 @@ ReplicaCache::remove(const string& name)
 	    out << "replica `" << name << "' down";
 	}
     }
+
+    {
+	IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_waitForUpdatesMonitor);
+	map<string, set<string> >::iterator p = _waitForUpdates.begin();
+	while(p != _waitForUpdates.end())
+	{
+	    p->second.erase(name);
+	    if(p->second.empty())
+	    {
+		_waitForUpdates.erase(p++);
+		_waitForUpdatesMonitor.notifyAll();
+	    }
+	    else
+	    {
+		++p;
+	    }
+	}
+    }
     
     try
     {
@@ -172,6 +190,61 @@ ReplicaCache::getEndpoints(const string& name, const Ice::ObjectPrx& proxy) cons
     return _communicator->stringToProxy("dummy")->ice_endpoints(endpoints);
 }
 
+void
+ReplicaCache::waitForUpdateReplication(const string& name, int serial)
+{
+    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_waitForUpdatesMonitor);
+
+    vector<string> replicas = getAll("");
+    if(replicas.empty())
+    {
+	return;
+    }
+
+    ostringstream os;
+    os << name << "-" << serial;
+    const string key = os.str();
+
+    _waitForUpdates.insert(make_pair(key, set<string>(replicas.begin(), replicas.end())));
+
+    //
+    // Wait until all the updates are received.
+    //
+    while(true)
+    {
+	map<string, set<string> >::const_iterator p = _waitForUpdates.find(key);
+	if(p == _waitForUpdates.end())
+	{
+	    return;
+	}
+	else
+	{
+	    _waitForUpdatesMonitor.wait();
+	}
+    }
+}
+
+void
+ReplicaCache::replicaReceivedUpdate(const string& name, const string& update, int serial)
+{
+    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_waitForUpdatesMonitor);
+
+    ostringstream os;
+    os << update << "-" << serial;
+    const string key = os.str();
+
+    map<string, set<string> >::iterator p = _waitForUpdates.find(key);
+    if(p != _waitForUpdates.end())
+    {
+	p->second.erase(name);
+	if(p->second.empty())
+	{
+	    _waitForUpdates.erase(p);
+	    _waitForUpdatesMonitor.notifyAll();
+	}
+    }
+}
+
 ReplicaEntry::ReplicaEntry(const std::string& name, const ReplicaSessionIPtr& session) : 
     _name(name),
     _session(session)