diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-09-15 12:32:45 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-09-15 12:32:45 +0000 |
| commit | 0df21eda351a4e9ea3d7647bf1a91d8bee903b61 (patch) | |
| tree | 4f6ad583db87fe40bc0de570a4cfb4d575e615ca /cpp/src/IceGrid/AdapterCache.cpp | |
| parent | Fix (diff) | |
| download | ice-0df21eda351a4e9ea3d7647bf1a91d8bee903b61.tar.bz2 ice-0df21eda351a4e9ea3d7647bf1a91d8bee903b61.tar.xz ice-0df21eda351a4e9ea3d7647bf1a91d8bee903b61.zip | |
Better tracing
Diffstat (limited to 'cpp/src/IceGrid/AdapterCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/AdapterCache.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/cpp/src/IceGrid/AdapterCache.cpp b/cpp/src/IceGrid/AdapterCache.cpp index 93b018a33ea..36dd71d292f 100644 --- a/cpp/src/IceGrid/AdapterCache.cpp +++ b/cpp/src/IceGrid/AdapterCache.cpp @@ -57,10 +57,6 @@ struct ServerLoadCI : binary_function<ServerEntryPtr&, ServerEntryPtr&, bool> } -AdapterCache::AdapterCache(const TraceLevelsPtr& traceLevels) : CacheByString<AdapterEntry>(traceLevels) -{ -} - AdapterEntryPtr AdapterCache::get(const string& id, bool create) const { @@ -79,7 +75,7 @@ AdapterCache::get(const string& id, bool create) const AdapterEntryPtr AdapterCache::addImpl(const string& id) { - if(_traceLevels->adapter > 0) + if(_traceLevels && _traceLevels->adapter > 0) { Ice::Trace out(_traceLevels->logger, _traceLevels->adapterCat); out << "added adapter `" << id << "'"; @@ -90,7 +86,7 @@ AdapterCache::addImpl(const string& id) AdapterEntryPtr AdapterCache::removeImpl(const string& id) { - if(_traceLevels->adapter > 0) + if(_traceLevels && _traceLevels->adapter > 0) { Ice::Trace out(_traceLevels->logger, _traceLevels->adapterCat); out << "removed adapter `" << id << "'"; @@ -143,7 +139,7 @@ AdapterEntry::enableReplication(const LoadBalancingPolicyPtr& policy) } } - if(_cache.getTraceLevels()->adapter > 0) + if(_cache.getTraceLevels() && _cache.getTraceLevels()->adapter > 0) { Ice::Trace out(_cache.getTraceLevels()->logger, _cache.getTraceLevels()->adapterCat); out << "enabled replication on adapter `" << _id << "'"; @@ -159,7 +155,7 @@ AdapterEntry::disableReplication() _replicated = false; remove = _servers.empty(); } - if(_cache.getTraceLevels()->adapter > 0) + if(_cache.getTraceLevels() && _cache.getTraceLevels()->adapter > 0) { Ice::Trace out(_cache.getTraceLevels()->logger, _cache.getTraceLevels()->adapterCat); out << "disabled replication on adapter `" << _id << "'"; @@ -205,6 +201,7 @@ AdapterEntry::getProxies(int& nReplicas) { vector<ServerEntryPtr> servers; bool adaptive = false; + LoadSample loadSample; { Lock sync(*this); if(_servers.empty()) @@ -233,6 +230,7 @@ AdapterEntry::getProxies(int& nReplicas) { servers = _servers; adaptive = true; + loadSample = _loadSample; } else// if(RandomLoadBalancingPolicyPtr::dynamicCast(_loadBalancing)) { @@ -249,7 +247,7 @@ AdapterEntry::getProxies(int& nReplicas) // the sort() will call and lock each server entry. // random_shuffle(servers.begin(), servers.end()); - sort(servers.begin(), servers.end(), ServerLoadCI(_loadSample)); + sort(servers.begin(), servers.end(), ServerLoadCI(loadSample)); } vector<pair<string, AdapterPrx> > adapters; |