summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cpp/demo/Glacier2/callback/config11
-rw-r--r--cpp/demo/Glacier2/chat/config11
-rw-r--r--cpp/demo/Ice/hello/config3
-rw-r--r--cpp/demo/Ice/invoke/config5
-rw-r--r--cpp/demo/Ice/latency/config4
-rw-r--r--cpp/demo/Ice/throughput/config4
-rw-r--r--cpp/src/Glacier2/Glacier2Router.cpp9
-rw-r--r--cs/demo/Glacier2/callback/config11
-rw-r--r--cs/demo/Ice/hello/config6
-rw-r--r--cs/demo/Ice/latency/config4
-rw-r--r--cs/demo/Ice/throughput/config4
-rw-r--r--java/demo/Glacier2/callback/config11
-rw-r--r--java/demo/Ice/hello/config3
-rw-r--r--java/demo/Ice/latency/config4
-rw-r--r--java/demo/Ice/throughput/config4
-rw-r--r--vb/demo/Glacier2/callback/config11
-rw-r--r--vb/demo/Ice/hello/config6
-rw-r--r--vb/demo/Ice/latency/config4
-rw-r--r--vb/demo/Ice/throughput/config4
19 files changed, 67 insertions, 52 deletions
diff --git a/cpp/demo/Glacier2/callback/config b/cpp/demo/Glacier2/callback/config
index 6f37260495e..4733647d45c 100644
--- a/cpp/demo/Glacier2/callback/config
+++ b/cpp/demo/Glacier2/callback/config
@@ -28,13 +28,14 @@ Callback.Proxy=callback:tcp -h 127.0.0.1 -p 10000
# No active connection management is permitted with Glacier2.
# Connections must remain established.
#
-Ice.ConnectionIdleTime=0
+Ice.ACM.Client=0
+Ice.ACM.Server=0
#
-# Ice.MonitorConnections defaults to Ice.ConnectionIdleTime, which we
-# set to 0 above. However we still want the connection monitor thread
-# for AMI timeouts (for completeness, even if this demo doesn't use
-# AMI).
+# Ice.MonitorConnections defaults to the smaller of Ice.ACM.Client or
+# Ice.ACM.Server, which we set to 0 above. However we still want the
+# connection monitor thread for AMI timeouts (for completeness, even
+# if this demo doesn't use AMI).
#
Ice.MonitorConnections=60
diff --git a/cpp/demo/Glacier2/chat/config b/cpp/demo/Glacier2/chat/config
index 3c25364fc24..2d09ab276c9 100644
--- a/cpp/demo/Glacier2/chat/config
+++ b/cpp/demo/Glacier2/chat/config
@@ -22,13 +22,14 @@ Chat.Client.Endpoints=
# No active connection management is permitted with Glacier2.
# Connections must remain established.
#
-Ice.ConnectionIdleTime=0
+Ice.ACM.Client=0
+Ice.ACM.Server=0
#
-# Ice.MonitorConnections defaults to Ice.ConnectionIdleTime, which we
-# set to 0 above. However we still want the connection monitor thread
-# for AMI timeouts (for completeness, even if this demo doesn't use
-# AMI).
+# Ice.MonitorConnections defaults to the smaller of Ice.ACM.Client or
+# Ice.ACM.Server, which we set to 0 above. However we still want the
+# connection monitor thread for AMI timeouts (for completeness, even
+# if this demo doesn't use AMI).
#
Ice.MonitorConnections=60
diff --git a/cpp/demo/Ice/hello/config b/cpp/demo/Ice/hello/config
index 634d2f8b613..39c092f4770 100644
--- a/cpp/demo/Ice/hello/config
+++ b/cpp/demo/Ice/hello/config
@@ -19,7 +19,8 @@ Ice.Warn.Connections=1
#
# We want a faster ACM for this demo.
#
-Ice.ConnectionIdleTime=10
+Ice.ACM.Client=10
+Ice.ACM.Server=10
#
# Network Tracing
diff --git a/cpp/demo/Ice/invoke/config b/cpp/demo/Ice/invoke/config
index 74db29549bb..7b3ad1cda13 100644
--- a/cpp/demo/Ice/invoke/config
+++ b/cpp/demo/Ice/invoke/config
@@ -17,11 +17,6 @@ Printer.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
Ice.Warn.Connections=1
#
-# We want a faster ACM for this demo.
-#
-Ice.ConnectionIdleTime=10
-
-#
# Network Tracing
#
# 0 = no network tracing
diff --git a/cpp/demo/Ice/latency/config b/cpp/demo/Ice/latency/config
index b0dea3c0db8..1ab1916e177 100644
--- a/cpp/demo/Ice/latency/config
+++ b/cpp/demo/Ice/latency/config
@@ -7,5 +7,5 @@ IceSSL.Client.Config=./sslconfig.xml
IceSSL.Server.CertPath=../../../certs
IceSSL.Server.Config=./sslconfig.xml
-Ice.MonitorConnections=0
-Ice.ConnectionIdleTime=0
+Ice.ACM.Client=0
+Ice.ACM.Server=0
diff --git a/cpp/demo/Ice/throughput/config b/cpp/demo/Ice/throughput/config
index 510a0583012..567793849cb 100644
--- a/cpp/demo/Ice/throughput/config
+++ b/cpp/demo/Ice/throughput/config
@@ -7,5 +7,5 @@ IceSSL.Client.Config=./sslconfig.xml
IceSSL.Server.CertPath=../../../certs
IceSSL.Server.Config=./sslconfig.xml
-Ice.MonitorConnections=0
-Ice.ConnectionIdleTime=0
+Ice.ACM.Client=0
+Ice.ACM.Server=0
diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp
index ab322df495d..b9361e21052 100644
--- a/cpp/src/Glacier2/Glacier2Router.cpp
+++ b/cpp/src/Glacier2/Glacier2Router.cpp
@@ -277,12 +277,13 @@ Glacier2::RouterService::initializeCommunicator(int& argc, char* argv[])
// No active connection management is permitted with
// Glacier2. Connections must remain established.
//
- defaultProperties->setProperty("Ice.ConnectionIdleTime", "0");
+ defaultProperties->setProperty("Ice.ACM.Client", "0");
+ defaultProperties->setProperty("Ice.ACM.Server", "0");
//
- // Ice.MonitorConnections defaults to Ice.ConnectionIdleTime,
- // which we set to 0 above. However, we still want the
- // connection monitor thread for AMI timeouts. We only set
+ // Ice.MonitorConnections defaults to the smaller of Ice.ACM.Client
+ // or Ice.ACM.Server, which we set to 0 above. However, we still want
+ // the connection monitor thread for AMI timeouts. We only set
// this value if it hasn't been set explicitly already.
//
if(defaultProperties->getProperty("Ice.MonitorConnections").empty())
diff --git a/cs/demo/Glacier2/callback/config b/cs/demo/Glacier2/callback/config
index 09668c3465d..6d7b702c936 100644
--- a/cs/demo/Glacier2/callback/config
+++ b/cs/demo/Glacier2/callback/config
@@ -28,13 +28,14 @@ Callback.Proxy=callback:tcp -h 127.0.0.1 -p 10000
# No active connection management is permitted with Glacier2.
# Connections must remain established.
#
-Ice.ConnectionIdleTime=0
+Ice.ACM.Client=0
+Ice.ACM.Server=0
#
-# Ice.MonitorConnections defaults to Ice.ConnectionIdleTime, which we
-# set to 0 above. However we still want the connection monitor thread
-# for AMI timeouts (for completeness, even if this demo doesn't use
-# AMI).
+# Ice.MonitorConnections defaults to the smaller of Ice.ACM.Client or
+# Ice.ACM.Server, which we set to 0 above. However we still want the
+# connection monitor thread for AMI timeouts (for completeness, even
+# if this demo doesn't use AMI).
#
Ice.MonitorConnections=60
diff --git a/cs/demo/Ice/hello/config b/cs/demo/Ice/hello/config
index a1f611de9b5..fa5e48fd529 100644
--- a/cs/demo/Ice/hello/config
+++ b/cs/demo/Ice/hello/config
@@ -17,6 +17,12 @@ Hello.Endpoints=tcp -p 10000:udp -p 10000
Ice.Warn.Connections=1
#
+# We want a faster ACM for this demo.
+#
+Ice.ACM.Client=10
+Ice.ACM.Server=10
+
+#
# Network Tracing
#
# 0 = no network tracing
diff --git a/cs/demo/Ice/latency/config b/cs/demo/Ice/latency/config
index 8f53bad7c83..89b07653828 100644
--- a/cs/demo/Ice/latency/config
+++ b/cs/demo/Ice/latency/config
@@ -1,5 +1,5 @@
Latency.Ping=ping:default -p 10000
Latency.Endpoints=default -p 10000
-Ice.MonitorConnections=0
-Ice.ConnectionIdleTime=0
+Ice.ACM.Client=0
+Ice.ACM.Server=0
diff --git a/cs/demo/Ice/throughput/config b/cs/demo/Ice/throughput/config
index f2b197d2f9f..1de2062b6d2 100644
--- a/cs/demo/Ice/throughput/config
+++ b/cs/demo/Ice/throughput/config
@@ -1,5 +1,5 @@
Throughput.Throughput=throughput:default -p 10000
Throughput.Endpoints=default -p 10000
-Ice.MonitorConnections=0
-Ice.ConnectionIdleTime=0
+Ice.ACM.Client=0
+Ice.ACM.Server=0
diff --git a/java/demo/Glacier2/callback/config b/java/demo/Glacier2/callback/config
index 00eb28a557c..49412bca3c3 100644
--- a/java/demo/Glacier2/callback/config
+++ b/java/demo/Glacier2/callback/config
@@ -28,13 +28,14 @@ Callback.Proxy=callback:tcp -h 127.0.0.1 -p 10000
# No active connection management is permitted with Glacier2.
# Connections must remain established.
#
-Ice.ConnectionIdleTime=0
+Ice.ACM.Client=0
+Ice.ACM.Server=0
#
-# Ice.MonitorConnections defaults to Ice.ConnectionIdleTime, which we
-# set to 0 above. However we still want the connection monitor thread
-# for AMI timeouts (for completeness, even if this demo doesn't use
-# AMI).
+# Ice.MonitorConnections defaults to the smaller of Ice.ACM.Client or
+# Ice.ACM.Server, which we set to 0 above. However we still want the
+# connection monitor thread for AMI timeouts (for completeness, even
+# if this demo doesn't use AMI).
#
Ice.MonitorConnections=60
diff --git a/java/demo/Ice/hello/config b/java/demo/Ice/hello/config
index 12937f75be4..ea81f74af15 100644
--- a/java/demo/Ice/hello/config
+++ b/java/demo/Ice/hello/config
@@ -19,7 +19,8 @@ Ice.Warn.Connections=1
#
# We want a faster ACM for this demo.
#
-Ice.ConnectionIdleTime=10
+Ice.ACM.Client=10
+Ice.ACM.Server=10
#
# Network Tracing
diff --git a/java/demo/Ice/latency/config b/java/demo/Ice/latency/config
index 8f53bad7c83..89b07653828 100644
--- a/java/demo/Ice/latency/config
+++ b/java/demo/Ice/latency/config
@@ -1,5 +1,5 @@
Latency.Ping=ping:default -p 10000
Latency.Endpoints=default -p 10000
-Ice.MonitorConnections=0
-Ice.ConnectionIdleTime=0
+Ice.ACM.Client=0
+Ice.ACM.Server=0
diff --git a/java/demo/Ice/throughput/config b/java/demo/Ice/throughput/config
index f2b197d2f9f..1de2062b6d2 100644
--- a/java/demo/Ice/throughput/config
+++ b/java/demo/Ice/throughput/config
@@ -1,5 +1,5 @@
Throughput.Throughput=throughput:default -p 10000
Throughput.Endpoints=default -p 10000
-Ice.MonitorConnections=0
-Ice.ConnectionIdleTime=0
+Ice.ACM.Client=0
+Ice.ACM.Server=0
diff --git a/vb/demo/Glacier2/callback/config b/vb/demo/Glacier2/callback/config
index 09668c3465d..6d7b702c936 100644
--- a/vb/demo/Glacier2/callback/config
+++ b/vb/demo/Glacier2/callback/config
@@ -28,13 +28,14 @@ Callback.Proxy=callback:tcp -h 127.0.0.1 -p 10000
# No active connection management is permitted with Glacier2.
# Connections must remain established.
#
-Ice.ConnectionIdleTime=0
+Ice.ACM.Client=0
+Ice.ACM.Server=0
#
-# Ice.MonitorConnections defaults to Ice.ConnectionIdleTime, which we
-# set to 0 above. However we still want the connection monitor thread
-# for AMI timeouts (for completeness, even if this demo doesn't use
-# AMI).
+# Ice.MonitorConnections defaults to the smaller of Ice.ACM.Client or
+# Ice.ACM.Server, which we set to 0 above. However we still want the
+# connection monitor thread for AMI timeouts (for completeness, even
+# if this demo doesn't use AMI).
#
Ice.MonitorConnections=60
diff --git a/vb/demo/Ice/hello/config b/vb/demo/Ice/hello/config
index a1f611de9b5..fa5e48fd529 100644
--- a/vb/demo/Ice/hello/config
+++ b/vb/demo/Ice/hello/config
@@ -17,6 +17,12 @@ Hello.Endpoints=tcp -p 10000:udp -p 10000
Ice.Warn.Connections=1
#
+# We want a faster ACM for this demo.
+#
+Ice.ACM.Client=10
+Ice.ACM.Server=10
+
+#
# Network Tracing
#
# 0 = no network tracing
diff --git a/vb/demo/Ice/latency/config b/vb/demo/Ice/latency/config
index 8f53bad7c83..89b07653828 100644
--- a/vb/demo/Ice/latency/config
+++ b/vb/demo/Ice/latency/config
@@ -1,5 +1,5 @@
Latency.Ping=ping:default -p 10000
Latency.Endpoints=default -p 10000
-Ice.MonitorConnections=0
-Ice.ConnectionIdleTime=0
+Ice.ACM.Client=0
+Ice.ACM.Server=0
diff --git a/vb/demo/Ice/throughput/config b/vb/demo/Ice/throughput/config
index f2b197d2f9f..1de2062b6d2 100644
--- a/vb/demo/Ice/throughput/config
+++ b/vb/demo/Ice/throughput/config
@@ -1,5 +1,5 @@
Throughput.Throughput=throughput:default -p 10000
Throughput.Endpoints=default -p 10000
-Ice.MonitorConnections=0
-Ice.ConnectionIdleTime=0
+Ice.ACM.Client=0
+Ice.ACM.Server=0
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 16:57:07 +0000