diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-09-13 10:09:50 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-09-13 10:09:50 +0000 |
| commit | e65e272d55bfe9f9d26de43b73721c04b683234a (patch) | |
| tree | 0b0e04bbaf26fe357a1620e4725986d5d750c003 /cpp/src/IceGrid/Database.h | |
| parent | Fixed for VC6 (STLport bug?) (diff) | |
| download | ice-e65e272d55bfe9f9d26de43b73721c04b683234a.tar.bz2 ice-e65e272d55bfe9f9d26de43b73721c04b683234a.tar.xz ice-e65e272d55bfe9f9d26de43b73721c04b683234a.zip | |
Fixes
Diffstat (limited to 'cpp/src/IceGrid/Database.h')
| -rw-r--r-- | cpp/src/IceGrid/Database.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/cpp/src/IceGrid/Database.h b/cpp/src/IceGrid/Database.h index e8226d776cd..4056c8005f6 100644 --- a/cpp/src/IceGrid/Database.h +++ b/cpp/src/IceGrid/Database.h @@ -92,8 +92,9 @@ public: void addReplica(const std::string&, const ReplicaSessionIPtr&); RegistryInfo getReplicaInfo(const std::string&) const; InternalRegistryPrx getReplica(const std::string&) const; - void replicaReceivedUpdate(const std::string&, const std::string&, int, const std::string&); - void waitForApplicationReplication(const std::string&, int); + void replicaReceivedUpdate(const std::string&, TopicName, int, const std::string&); + void waitForApplicationReplication(const AMD_NodeSession_waitForApplicationReplicationPtr&, const std::string&, + int); void removeReplica(const std::string&, const ReplicaSessionIPtr&); Ice::StringSeq getAllReplicas(const std::string& = std::string()); @@ -142,11 +143,14 @@ private: void load(const ApplicationHelper&, ServerEntrySeq&, const std::string&, int); void unload(const ApplicationHelper&, ServerEntrySeq&); void reload(const ApplicationHelper&, const ApplicationHelper&, ServerEntrySeq&, const std::string&, int); - void finishUpdate(ServerEntrySeq&, const ApplicationUpdateInfo&, const ApplicationInfo&, - const ApplicationDescriptor&, AdminSessionI*); + void finishApplicationUpdate(ServerEntrySeq&, const ApplicationUpdateInfo&, const ApplicationInfo&, + const ApplicationDescriptor&, AdminSessionI*); void checkSessionLock(AdminSessionI*); + void startUpdating(const std::string&); + void finishUpdating(const std::string&); + friend struct AddComponent; static const std::string _applicationDbName; @@ -187,7 +191,7 @@ private: int _replicaApplicationSerial; int _adapterSerial; int _objectSerial; - std::set<std::string> _updating; + std::map<std::string, std::vector<AMD_NodeSession_waitForApplicationReplicationPtr> > _updating; }; typedef IceUtil::Handle<Database> DatabasePtr; |