summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Glacier2/RoutingTable.cpp24
-rw-r--r--cpp/src/Glacier2/RoutingTable.h16
-rw-r--r--cpp/src/Ice/PropertyNames.cpp94
-rw-r--r--cpp/src/Ice/PropertyNames.h6
4 files changed, 25 insertions, 115 deletions
diff --git a/cpp/src/Glacier2/RoutingTable.cpp b/cpp/src/Glacier2/RoutingTable.cpp
index c1c5cad24dc..ff90a85dbaa 100644
--- a/cpp/src/Glacier2/RoutingTable.cpp
+++ b/cpp/src/Glacier2/RoutingTable.cpp
@@ -20,12 +20,12 @@ Glacier2::RoutingTable::RoutingTable(const CommunicatorPtr& communicator) :
{
}
-bool
+void
Glacier2::RoutingTable::add(const ObjectPrx& prx)
{
if(!prx)
{
- return false;
+ return;
}
//
@@ -39,7 +39,7 @@ Glacier2::RoutingTable::add(const ObjectPrx& prx)
if(p == _map.end())
{
- if(_traceLevel)
+ if(_traceLevel == 1 || _traceLevel >= 3)
{
Trace out(_communicator->getLogger(), "Glacier2");
out << "adding proxy to routing table:\n" << _communicator->proxyToString(proxy);
@@ -50,12 +50,10 @@ Glacier2::RoutingTable::add(const ObjectPrx& prx)
EvictorQueue::iterator q = _queue.insert(_queue.end(), p);
entry->proxy = proxy;
entry->pos = q;
-
- return true;
}
else
{
- if(_traceLevel)
+ if(_traceLevel == 1 || _traceLevel >= 3)
{
Trace out(_communicator->getLogger(), "Glacier2");
out << "proxy already in routing table:\n" << _communicator->proxyToString(proxy);
@@ -65,8 +63,20 @@ Glacier2::RoutingTable::add(const ObjectPrx& prx)
_queue.erase(entry->pos);
EvictorQueue::iterator q = _queue.insert(_queue.end(), p);
entry->pos = q;
+ }
+
+ while(static_cast<int>(_map.size()) > _maxSize)
+ {
+ p = _queue.front();
+
+ if(_traceLevel >= 2)
+ {
+ Trace out(_communicator->getLogger(), "Glacier2");
+ out << "evicting proxy from routing table:\n" << _communicator->proxyToString(p->second->proxy);
+ }
- return false;
+ _map.erase(p);
+ _queue.pop_front();
}
}
diff --git a/cpp/src/Glacier2/RoutingTable.h b/cpp/src/Glacier2/RoutingTable.h
index 1159ccdb0b8..22774a135e3 100644
--- a/cpp/src/Glacier2/RoutingTable.h
+++ b/cpp/src/Glacier2/RoutingTable.h
@@ -26,20 +26,8 @@ public:
RoutingTable(const Ice::CommunicatorPtr&);
- //
- // Clear the contents of the routing table.
- //
-// void clear();
-
- //
- // Returns false if the Proxy exists already.
- //
- bool add(const Ice::ObjectPrx&);
-
- //
- // Returns null if no Proxy exists for the given identity.
- //
- Ice::ObjectPrx get(const Ice::Identity&);
+ void add(const Ice::ObjectPrx&);
+ Ice::ObjectPrx get(const Ice::Identity&); // Returns null if no proxy can be found.
private:
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 1b691c03c35..979eb55beb9 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -1,13 +1,13 @@
// **********************************************************************
//
-// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-// Generated by makeprops.py from file `../config/PropertyNames.def', Tue Mar 7 15:44:07 2006
+// Generated by makeprops.py from file `../config/PropertyNames.def', Thu Mar 16 17:18:42 2006
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -171,20 +171,6 @@ const char* IceInternal::PropertyNames::IceGridProps[] =
0
};
-const char* IceInternal::PropertyNames::IcePatchProps[] =
-{
- "IcePatch.BusyTimeout",
- "IcePatch.Directory",
- "IcePatch.Dynamic",
- "IcePatch.Endpoints",
- "IcePatch.PublishedEndpoints",
- "IcePatch.RemoveOrphaned",
- "IcePatch.Thorough",
- "IcePatch.Trace.Files",
- "IcePatch.UpdatePeriod",
- 0
-};
-
const char* IceInternal::PropertyNames::IcePatch2Props[] =
{
"IcePatch2.AdapterId",
@@ -282,75 +268,6 @@ const char* IceInternal::PropertyNames::IceStormProps[] =
0
};
-const char* IceInternal::PropertyNames::GlacierProps[] =
-{
- "Glacier.Router.AcceptCert",
- "Glacier.Router.AdapterId",
- "Glacier.Router.ReplicaGroupId",
- "Glacier.Router.AllowCategories",
- "Glacier.Router.Client.AdapterId",
- "Glacier.Router.Client.ReplicaGroupId",
- "Glacier.Router.Client.Endpoints",
- "Glacier.Router.Client.ForwardContext",
- "Glacier.Router.Client.PublishedEndpoints",
- "Glacier.Router.Client.SleepTime",
- "Glacier.Router.Client.ThreadPool.Size",
- "Glacier.Router.Client.ThreadPool.SizeMax",
- "Glacier.Router.Client.ThreadPool.SizeWarn",
- "Glacier.Router.Client.ThreadPool.StackSize",
- "Glacier.Router.Client.Throttle.Twoways",
- "Glacier.Router.Endpoints",
- "Glacier.Router.Identity",
- "Glacier.Router.PrintProxyOnFd",
- "Glacier.Router.PublishedEndpoints",
- "Glacier.Router.Server.AdapterId",
- "Glacier.Router.Server.ReplicaGroupId",
- "Glacier.Router.Server.Endpoints",
- "Glacier.Router.Server.ForwardContext",
- "Glacier.Router.Server.PublishedEndpoints",
- "Glacier.Router.Server.SleepTime",
- "Glacier.Router.Server.ThreadPool.Size",
- "Glacier.Router.Server.ThreadPool.SizeMax",
- "Glacier.Router.Server.ThreadPool.SizeWarn",
- "Glacier.Router.Server.ThreadPool.StackSize",
- "Glacier.Router.Server.Throttle.Twoways",
- "Glacier.Router.SessionManager",
- "Glacier.Router.ThreadPool.Size",
- "Glacier.Router.ThreadPool.SizeMax",
- "Glacier.Router.ThreadPool.SizeWarn",
- "Glacier.Router.ThreadPool.StackSize",
- "Glacier.Router.Trace.Client",
- "Glacier.Router.Trace.RoutingTable",
- "Glacier.Router.Trace.Server",
- "Glacier.Router.Trace.Throttle",
- "Glacier.Router.UserId",
- "Glacier.Starter.AdapterId",
- "Glacier.Starter.ReplicaGroupId",
- "Glacier.Starter.AddUserToAllowCategories",
- "Glacier.Starter.Certificate.BitStrength",
- "Glacier.Starter.Certificate.CommonName",
- "Glacier.Starter.Certificate.Country",
- "Glacier.Starter.Certificate.IssuedAdjust",
- "Glacier.Starter.Certificate.Locality",
- "Glacier.Starter.Certificate.Organization",
- "Glacier.Starter.Certificate.OrganizationalUnit",
- "Glacier.Starter.Certificate.SecondsValid",
- "Glacier.Starter.Certificate.StateProvince",
- "Glacier.Starter.CryptPasswords",
- "Glacier.Starter.Endpoints",
- "Glacier.Starter.PermissionsVerifier",
- "Glacier.Starter.PropertiesOverride",
- "Glacier.Starter.PublishedEndpoints",
- "Glacier.Starter.RouterPath",
- "Glacier.Starter.StartupTimeout",
- "Glacier.Starter.ThreadPool.Size",
- "Glacier.Starter.ThreadPool.SizeMax",
- "Glacier.Starter.ThreadPool.SizeWarn",
- "Glacier.Starter.ThreadPool.StackSize",
- "Glacier.Starter.Trace",
- 0
-};
-
const char* IceInternal::PropertyNames::Glacier2Props[] =
{
"Glacier2.AddUserToAllowCategories",
@@ -373,6 +290,7 @@ const char* IceInternal::PropertyNames::Glacier2Props[] =
"Glacier2.InstanceName",
"Glacier2.PermissionsVerifier",
"Glacier2.RouterIdentity",
+ "Glacier2.RoutingTable.MaxSize",
"Glacier2.Server.AlwaysBatch",
"Glacier2.Server.Buffered",
"Glacier2.Server.Endpoints",
@@ -415,10 +333,8 @@ const char* IceInternal::PropertyNames::FreezeProps[] =
const char* const* IceInternal::PropertyNames::validProps[] =
{
IcePatch2Props,
- IcePatchProps,
- IceSSLProps,
- GlacierProps,
IceStormProps,
+ IceSSLProps,
IceProps,
FreezeProps,
IceGridProps,
@@ -432,10 +348,8 @@ const char* IceInternal::PropertyNames::clPropNames[] =
"Ice",
"IceBox",
"IceGrid",
- "IcePatch",
"IcePatch2",
"IceStorm",
- "Glacier",
"Glacier2",
"Freeze",
0
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 79ab7677335..e10710ade28 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -1,13 +1,13 @@
// **********************************************************************
//
-// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-// Generated by makeprops.py from file `../config/PropertyNames.def', Tue Mar 7 15:44:07 2006
+// Generated by makeprops.py from file `../config/PropertyNames.def', Thu Mar 16 17:18:42 2006
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -25,11 +25,9 @@ public:
static const char* IceProps[];
static const char* IceBoxProps[];
static const char* IceGridProps[];
- static const char* IcePatchProps[];
static const char* IcePatch2Props[];
static const char* IceSSLProps[];
static const char* IceStormProps[];
- static const char* GlacierProps[];
static const char* Glacier2Props[];
static const char* FreezeProps[];
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 19:48:12 +0000