summaryrefslogtreecommitdiff
path: root/csharp
diff options
context:
space:
mode:
Diffstat (limited to 'csharp')
-rw-r--r--csharp/src/Ice/BatchRequestQueue.cs20
-rw-r--r--csharp/src/Ice/CommunicatorI.cs23
-rw-r--r--csharp/src/Ice/ConnectionFactory.cs8
-rw-r--r--csharp/src/Ice/ConnectionI.cs15
-rw-r--r--csharp/src/Ice/ObjectAdapterFactory.cs32
-rw-r--r--csharp/src/Ice/ObjectAdapterI.cs4
-rw-r--r--csharp/src/Ice/OutgoingAsync.cs49
-rw-r--r--csharp/src/Ice/Reference.cs25
-rw-r--r--csharp/test/Ice/ami/AllTests.cs76
-rw-r--r--csharp/test/Ice/operations/BatchOneways.cs36
10 files changed, 210 insertions, 78 deletions
diff --git a/csharp/src/Ice/BatchRequestQueue.cs b/csharp/src/Ice/BatchRequestQueue.cs
index 5507e879933..a2d3ee13857 100644
--- a/csharp/src/Ice/BatchRequestQueue.cs
+++ b/csharp/src/Ice/BatchRequestQueue.cs
@@ -27,7 +27,7 @@ namespace IceInternal
public void enqueue()
{
- _queue.enqueueBatchRequest();
+ _queue.enqueueBatchRequest(_proxy);
}
public Ice.ObjectPrx getProxy()
@@ -118,6 +118,11 @@ namespace IceInternal
}
else
{
+ bool compress;
+ if(((Ice.ObjectPrxHelperBase)proxy).iceReference().getCompressOverride(out compress))
+ {
+ _batchCompress |= compress;
+ }
_batchMarker = _batchStream.size();
++_batchRequestNum;
}
@@ -150,12 +155,13 @@ namespace IceInternal
}
public int
- swap(Ice.OutputStream os)
+ swap(Ice.OutputStream os, out bool compress)
{
lock(this)
{
if(_batchRequestNum == 0)
{
+ compress = false;
return 0;
}
@@ -172,12 +178,14 @@ namespace IceInternal
}
int requestNum = _batchRequestNum;
+ compress = _batchCompress;
_batchStream.swap(os);
//
// Reset the batch.
//
_batchRequestNum = 0;
+ _batchCompress = false;
_batchStream.writeBlob(Protocol.requestBatchHdr);
_batchMarker = _batchStream.size();
if(lastRequest != null)
@@ -221,9 +229,14 @@ namespace IceInternal
}
}
- internal void enqueueBatchRequest()
+ internal void enqueueBatchRequest(Ice.ObjectPrx proxy)
{
Debug.Assert(_batchMarker < _batchStream.size());
+ bool compress;
+ if(((Ice.ObjectPrxHelperBase)proxy).iceReference().getCompressOverride(out compress))
+ {
+ _batchCompress |= compress;
+ }
_batchMarker = _batchStream.size();
++_batchRequestNum;
}
@@ -234,6 +247,7 @@ namespace IceInternal
private bool _batchStreamCanFlush;
private int _batchRequestNum;
private int _batchMarker;
+ private bool _batchCompress;
private BatchRequestI _request;
private Ice.LocalException _exception;
private int _maxSize;
diff --git a/csharp/src/Ice/CommunicatorI.cs b/csharp/src/Ice/CommunicatorI.cs
index 73a9d0b0dbb..1528a116a06 100644
--- a/csharp/src/Ice/CommunicatorI.cs
+++ b/csharp/src/Ice/CommunicatorI.cs
@@ -163,23 +163,24 @@ namespace Ice
return _instance.pluginManager();
}
- public void flushBatchRequests()
+ public void flushBatchRequests(Ice.CompressBatch compressBatch)
{
- flushBatchRequestsAsync().Wait();
+ flushBatchRequestsAsync(compressBatch).Wait();
}
- public Task flushBatchRequestsAsync(IProgress<bool> progress = null,
+ public Task flushBatchRequestsAsync(Ice.CompressBatch compressBatch,
+ IProgress<bool> progress = null,
CancellationToken cancel = new CancellationToken())
{
var completed = new FlushBatchTaskCompletionCallback(progress, cancel);
var outgoing = new CommunicatorFlushBatchAsync(_instance, completed);
- outgoing.invoke(_flushBatchRequests_name);
+ outgoing.invoke(_flushBatchRequests_name, compressBatch);
return completed.Task;
}
- public AsyncResult begin_flushBatchRequests()
+ public AsyncResult begin_flushBatchRequests(Ice.CompressBatch compressBatch)
{
- return begin_flushBatchRequests(null, null);
+ return begin_flushBatchRequests(compressBatch, null, null);
}
private const string _flushBatchRequests_name = "flushBatchRequests";
@@ -214,11 +215,15 @@ namespace Ice
}
};
- public AsyncResult begin_flushBatchRequests(AsyncCallback cb, object cookie)
+ public AsyncResult begin_flushBatchRequests(Ice.CompressBatch compressBatch, AsyncCallback cb, object cookie)
{
- var result = new CommunicatorFlushBatchCompletionCallback(this, _instance, _flushBatchRequests_name, cookie, cb);
+ var result = new CommunicatorFlushBatchCompletionCallback(this,
+ _instance,
+ _flushBatchRequests_name,
+ cookie,
+ cb);
var outgoing = new CommunicatorFlushBatchAsync(_instance, result);
- outgoing.invoke(_flushBatchRequests_name);
+ outgoing.invoke(_flushBatchRequests_name, compressBatch);
return result;
}
diff --git a/csharp/src/Ice/ConnectionFactory.cs b/csharp/src/Ice/ConnectionFactory.cs
index 936f2b3da57..51e9c992e1e 100644
--- a/csharp/src/Ice/ConnectionFactory.cs
+++ b/csharp/src/Ice/ConnectionFactory.cs
@@ -255,7 +255,7 @@ namespace IceInternal
}
}
- public void flushAsyncBatchRequests(CommunicatorFlushBatchAsync outAsync)
+ public void flushAsyncBatchRequests(Ice.CompressBatch compressBatch, CommunicatorFlushBatchAsync outAsync)
{
ICollection<Ice.ConnectionI> c = new List<Ice.ConnectionI>();
@@ -280,7 +280,7 @@ namespace IceInternal
{
try
{
- outAsync.flushConnection(conn);
+ outAsync.flushConnection(conn, compressBatch);
}
catch(Ice.LocalException)
{
@@ -1292,7 +1292,7 @@ namespace IceInternal
}
}
- public void flushAsyncBatchRequests(CommunicatorFlushBatchAsync outAsync)
+ public void flushAsyncBatchRequests(Ice.CompressBatch compressBatch, CommunicatorFlushBatchAsync outAsync)
{
//
// connections() is synchronized, no need to synchronize here.
@@ -1301,7 +1301,7 @@ namespace IceInternal
{
try
{
- outAsync.flushConnection(connection);
+ outAsync.flushConnection(connection, compressBatch);
}
catch(Ice.LocalException)
{
diff --git a/csharp/src/Ice/ConnectionI.cs b/csharp/src/Ice/ConnectionI.cs
index 63a5148742a..a1cbdde8fcf 100644
--- a/csharp/src/Ice/ConnectionI.cs
+++ b/csharp/src/Ice/ConnectionI.cs
@@ -473,9 +473,9 @@ namespace Ice
return _batchRequestQueue;
}
- public void flushBatchRequests()
+ public void flushBatchRequests(CompressBatch compressBatch)
{
- flushBatchRequestsAsync().Wait();
+ flushBatchRequestsAsync(compressBatch).Wait();
}
private class ConnectionFlushBatchCompletionCallback : AsyncResultCompletionCallback
@@ -517,21 +517,24 @@ namespace Ice
private Connection _connection;
}
- public Task flushBatchRequestsAsync(IProgress<bool> progress = null,
+ public Task flushBatchRequestsAsync(CompressBatch compressBatch,
+ IProgress<bool> progress = null,
CancellationToken cancel = new CancellationToken())
{
var completed = new FlushBatchTaskCompletionCallback(progress, cancel);
var outgoing = new ConnectionFlushBatchAsync(this, _instance, completed);
- outgoing.invoke(_flushBatchRequests_name);
+ outgoing.invoke(_flushBatchRequests_name, compressBatch);
return completed.Task;
}
- public AsyncResult begin_flushBatchRequests(AsyncCallback cb = null, object cookie = null)
+ public AsyncResult begin_flushBatchRequests(CompressBatch compressBatch,
+ AsyncCallback cb = null,
+ object cookie = null)
{
var result = new ConnectionFlushBatchCompletionCallback(this, _communicator, _instance,
_flushBatchRequests_name, cookie, cb);
var outgoing = new ConnectionFlushBatchAsync(this, _instance, result);
- outgoing.invoke(_flushBatchRequests_name);
+ outgoing.invoke(_flushBatchRequests_name, compressBatch);
return result;
}
diff --git a/csharp/src/Ice/ObjectAdapterFactory.cs b/csharp/src/Ice/ObjectAdapterFactory.cs
index 17ccfa91b1c..0abdea67a62 100644
--- a/csharp/src/Ice/ObjectAdapterFactory.cs
+++ b/csharp/src/Ice/ObjectAdapterFactory.cs
@@ -28,10 +28,10 @@ namespace IceInternal
}
adapters = new List<Ice.ObjectAdapterI>(_adapters);
-
+
_instance = null;
_communicator = null;
-
+
System.Threading.Monitor.PulseAll(this);
}
@@ -44,7 +44,7 @@ namespace IceInternal
adapter.deactivate();
}
}
-
+
public void waitForShutdown()
{
List<Ice.ObjectAdapterI> adapters;
@@ -57,7 +57,7 @@ namespace IceInternal
{
System.Threading.Monitor.Wait(this);
}
-
+
adapters = new List<Ice.ObjectAdapterI>(_adapters);
}
@@ -110,13 +110,13 @@ namespace IceInternal
{
adapters = new List<Ice.ObjectAdapterI>(_adapters);
}
-
+
foreach(Ice.ObjectAdapterI adapter in adapters)
{
adapter.updateConnectionObservers();
}
}
-
+
public void
updateThreadObservers()
{
@@ -125,13 +125,13 @@ namespace IceInternal
{
adapters = new List<Ice.ObjectAdapterI>(_adapters);
}
-
+
foreach(Ice.ObjectAdapterI adapter in adapters)
{
adapter.updateThreadObservers();
}
}
-
+
public Ice.ObjectAdapter createObjectAdapter(string name, Ice.RouterPrx router)
{
lock(this)
@@ -140,7 +140,7 @@ namespace IceInternal
{
throw new Ice.CommunicatorDestroyedException();
}
-
+
Ice.ObjectAdapterI adapter = null;
if(name.Length == 0)
{
@@ -163,7 +163,7 @@ namespace IceInternal
return adapter;
}
}
-
+
public Ice.ObjectAdapter findObjectAdapter(Ice.ObjectPrx proxy)
{
List<Ice.ObjectAdapterI> adapters;
@@ -173,10 +173,10 @@ namespace IceInternal
{
return null;
}
-
+
adapters = new List<Ice.ObjectAdapterI>(_adapters);
}
-
+
foreach(Ice.ObjectAdapterI adapter in adapters)
{
try
@@ -209,7 +209,7 @@ namespace IceInternal
}
}
- public void flushAsyncBatchRequests(CommunicatorFlushBatchAsync outAsync)
+ public void flushAsyncBatchRequests(Ice.CompressBatch compressBatch, CommunicatorFlushBatchAsync outAsync)
{
List<Ice.ObjectAdapterI> adapters;
lock(this)
@@ -219,10 +219,10 @@ namespace IceInternal
foreach(Ice.ObjectAdapterI adapter in adapters)
{
- adapter.flushAsyncBatchRequests(outAsync);
+ adapter.flushAsyncBatchRequests(compressBatch, outAsync);
}
}
-
+
//
// Only for use by Instance.
//
@@ -233,7 +233,7 @@ namespace IceInternal
_adapterNamesInUse = new HashSet<string>();
_adapters = new List<Ice.ObjectAdapterI>();
}
-
+
private Instance _instance;
private Ice.Communicator _communicator;
private HashSet<string> _adapterNamesInUse;
diff --git a/csharp/src/Ice/ObjectAdapterI.cs b/csharp/src/Ice/ObjectAdapterI.cs
index 5929b46fd3c..01892c30401 100644
--- a/csharp/src/Ice/ObjectAdapterI.cs
+++ b/csharp/src/Ice/ObjectAdapterI.cs
@@ -688,7 +688,7 @@ namespace Ice
}
}
- public void flushAsyncBatchRequests(CommunicatorFlushBatchAsync outAsync)
+ public void flushAsyncBatchRequests(Ice.CompressBatch compressBatch, CommunicatorFlushBatchAsync outAsync)
{
List<IncomingConnectionFactory> f;
lock(this)
@@ -698,7 +698,7 @@ namespace Ice
foreach(IncomingConnectionFactory factory in f)
{
- factory.flushAsyncBatchRequests(outAsync);
+ factory.flushAsyncBatchRequests(compressBatch, outAsync);
}
}
diff --git a/csharp/src/Ice/OutgoingAsync.cs b/csharp/src/Ice/OutgoingAsync.cs
index db0e76d2bc7..74828721b6a 100644
--- a/csharp/src/Ice/OutgoingAsync.cs
+++ b/csharp/src/Ice/OutgoingAsync.cs
@@ -1140,7 +1140,8 @@ namespace IceInternal
{
Protocol.checkSupportedProtocol(Protocol.getCompatibleProtocol(proxy_.iceReference().getProtocol()));
observer_ = ObserverHelper.get(proxy_, operation, null);
- _batchRequestNum = proxy_.iceGetBatchRequestQueue().swap(os_);
+ bool compress; // Not used for proxy flush batch requests.
+ _batchRequestNum = proxy_.iceGetBatchRequestQueue().swap(os_, out compress);
invokeImpl(true); // userThread = true
}
@@ -1198,13 +1199,14 @@ namespace IceInternal
_connection = connection;
}
- public void invoke(string operation)
+ public void invoke(string operation, Ice.CompressBatch compressBatch)
{
observer_ = ObserverHelper.get(instance_, operation);
try
{
int status;
- int batchRequestNum = _connection.getBatchRequestQueue().swap(os_);
+ bool compress;
+ int batchRequestNum = _connection.getBatchRequestQueue().swap(os_, out compress);
if(batchRequestNum == 0)
{
status = AsyncStatusSent;
@@ -1215,7 +1217,20 @@ namespace IceInternal
}
else
{
- status = _connection.sendAsyncRequest(this, false, false, batchRequestNum);
+ bool comp;
+ if(compressBatch == Ice.CompressBatch.Yes)
+ {
+ comp = true;
+ }
+ else if(compressBatch == Ice.CompressBatch.No)
+ {
+ comp = false;
+ }
+ else
+ {
+ comp = compress;
+ }
+ status = _connection.sendAsyncRequest(this, comp, false, batchRequestNum);
}
if((status & AsyncStatusSent) != 0)
@@ -1311,7 +1326,7 @@ namespace IceInternal
_useCount = 1;
}
- public void flushConnection(Ice.ConnectionI con)
+ public void flushConnection(Ice.ConnectionI con, Ice.CompressBatch compressBatch)
{
lock(this)
{
@@ -1321,14 +1336,28 @@ namespace IceInternal
try
{
var flushBatch = new FlushBatch(this, instance_, _observer);
- int batchRequestNum = con.getBatchRequestQueue().swap(flushBatch.getOs());
+ bool compress;
+ int batchRequestNum = con.getBatchRequestQueue().swap(flushBatch.getOs(), out compress);
if(batchRequestNum == 0)
{
flushBatch.sent();
}
else
{
- con.sendAsyncRequest(flushBatch, false, false, batchRequestNum);
+ bool comp;
+ if(compressBatch == Ice.CompressBatch.Yes)
+ {
+ comp = true;
+ }
+ else if(compressBatch == Ice.CompressBatch.No)
+ {
+ comp = false;
+ }
+ else
+ {
+ comp = compress;
+ }
+ con.sendAsyncRequest(flushBatch, comp, false, batchRequestNum);
}
}
catch(Ice.LocalException)
@@ -1338,15 +1367,15 @@ namespace IceInternal
}
}
- public void invoke(string operation)
+ public void invoke(string operation, Ice.CompressBatch compressBatch)
{
_observer = ObserverHelper.get(instance_, operation);
if(_observer != null)
{
_observer.attach();
}
- instance_.outgoingConnectionFactory().flushAsyncBatchRequests(this);
- instance_.objectAdapterFactory().flushAsyncBatchRequests(this);
+ instance_.outgoingConnectionFactory().flushAsyncBatchRequests(compressBatch, this);
+ instance_.objectAdapterFactory().flushAsyncBatchRequests(compressBatch, this);
check(true);
}
diff --git a/csharp/src/Ice/Reference.cs b/csharp/src/Ice/Reference.cs
index cfd1019cc74..f786dd5e18e 100644
--- a/csharp/src/Ice/Reference.cs
+++ b/csharp/src/Ice/Reference.cs
@@ -237,6 +237,25 @@ namespace IceInternal
}
}
+ public bool getCompressOverride(out bool compress)
+ {
+ DefaultsAndOverrides defaultsAndOverrides = getInstance().defaultsAndOverrides();
+ if(defaultsAndOverrides.overrideCompress)
+ {
+ compress = defaultsAndOverrides.overrideCompressValue;
+ }
+ else if(overrideCompress_)
+ {
+ compress = compress_;
+ }
+ else
+ {
+ compress = false;
+ return false;
+ }
+ return true;
+ }
+
public abstract bool isIndirect();
public abstract bool isWellKnown();
@@ -709,7 +728,7 @@ namespace IceInternal
_fixedConnection.throwException(); // Throw in case our connection is already destroyed.
- bool compress;
+ bool compress = false;
if(defaultsAndOverrides.overrideCompress)
{
compress = defaultsAndOverrides.overrideCompressValue;
@@ -718,10 +737,6 @@ namespace IceInternal
{
compress = compress_;
}
- else
- {
- compress = _fixedConnection.endpoint().compress();
- }
return proxy.iceSetRequestHandler(new ConnectionRequestHandler(this, _fixedConnection, compress));
}
diff --git a/csharp/test/Ice/ami/AllTests.cs b/csharp/test/Ice/ami/AllTests.cs
index 0a515a0b2e9..d6f4f68e4d3 100644
--- a/csharp/test/Ice/ami/AllTests.cs
+++ b/csharp/test/Ice/ami/AllTests.cs
@@ -2147,6 +2147,7 @@ public class AllTests : TestCommon.AllTests
b1.opBatch();
SentCallback cb = new SentCallback();
Task t = b1.ice_getConnection().flushBatchRequestsAsync(
+ Ice.CompressBatch.BasedOnProxy,
progress:new Progress(
sentSyncrhonously =>
{
@@ -2168,6 +2169,7 @@ public class AllTests : TestCommon.AllTests
b1.opBatch();
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
Task t = b1.ice_getConnection().flushBatchRequestsAsync(
+ Ice.CompressBatch.BasedOnProxy,
progress: new Progress(
sentSynchronously =>
{
@@ -2189,7 +2191,10 @@ public class AllTests : TestCommon.AllTests
b1.opBatch();
b1.opBatch();
FlushCallback cb = new FlushCallback(cookie);
- Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(cb.completedAsync, cookie);
+ Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
+ Ice.CompressBatch.BasedOnProxy,
+ cb.completedAsync,
+ cookie);
r.whenSent(cb.sentAsync);
cb.check();
test(r.isSent());
@@ -2207,7 +2212,10 @@ public class AllTests : TestCommon.AllTests
b1.opBatch();
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
FlushExCallback cb = new FlushExCallback(cookie);
- Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(cb.completedAsync, cookie);
+ Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
+ Ice.CompressBatch.BasedOnProxy,
+ cb.completedAsync,
+ cookie);
r.whenSent(cb.sentAsync);
cb.check();
test(!r.isSent());
@@ -2225,7 +2233,7 @@ public class AllTests : TestCommon.AllTests
b1.opBatch();
b1.opBatch();
FlushCallback cb = new FlushCallback();
- Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests();
+ Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
r.whenCompleted(cb.exception);
r.whenSent(cb.sent);
cb.check();
@@ -2244,7 +2252,7 @@ public class AllTests : TestCommon.AllTests
b1.opBatch();
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
FlushExCallback cb = new FlushExCallback();
- Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests();
+ Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
r.whenCompleted(cb.exception);
r.whenSent(cb.sent);
cb.check();
@@ -2274,6 +2282,7 @@ public class AllTests : TestCommon.AllTests
b1.opBatch();
FlushCallback cb = new FlushCallback(cookie);
Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
+ Ice.CompressBatch.BasedOnProxy,
(Ice.AsyncResult result) =>
{
cb.completedAsync(result);
@@ -2300,6 +2309,7 @@ public class AllTests : TestCommon.AllTests
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
FlushExCallback cb = new FlushExCallback(cookie);
Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(
+ Ice.CompressBatch.BasedOnProxy,
(Ice.AsyncResult result) =>
{
cb.completedAsync(result);
@@ -2325,7 +2335,7 @@ public class AllTests : TestCommon.AllTests
b1.opBatch();
b1.opBatch();
FlushCallback cb = new FlushCallback();
- Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests();
+ Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
r.whenCompleted(
(Ice.Exception ex) =>
{
@@ -2352,7 +2362,7 @@ public class AllTests : TestCommon.AllTests
b1.opBatch();
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
FlushExCallback cb = new FlushExCallback();
- Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests();
+ Ice.AsyncResult r = b1.ice_getConnection().begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
r.whenCompleted(
(Ice.Exception ex) =>
{
@@ -2386,6 +2396,7 @@ public class AllTests : TestCommon.AllTests
SentCallback cb = new SentCallback();
Task t = communicator.flushBatchRequestsAsync(
+ Ice.CompressBatch.BasedOnProxy,
progress: new Progress(
sentSynchronously =>
{
@@ -2407,6 +2418,7 @@ public class AllTests : TestCommon.AllTests
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
SentCallback cb = new SentCallback();
Task t = communicator.flushBatchRequestsAsync(
+ Ice.CompressBatch.BasedOnProxy,
progress:new Progress(
sentSynchronously =>
{
@@ -2435,6 +2447,7 @@ public class AllTests : TestCommon.AllTests
SentCallback cb = new SentCallback();
Task t = communicator.flushBatchRequestsAsync(
+ Ice.CompressBatch.BasedOnProxy,
new Progress(sentSynchronously =>
{
cb.sent(sentSynchronously);
@@ -2462,6 +2475,7 @@ public class AllTests : TestCommon.AllTests
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
SentCallback cb = new SentCallback();
Task t = communicator.flushBatchRequestsAsync(
+ Ice.CompressBatch.BasedOnProxy,
new Progress(
sentSynchronously =>
{
@@ -2490,6 +2504,7 @@ public class AllTests : TestCommon.AllTests
b2.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
SentCallback cb = new SentCallback();
Task t = communicator.flushBatchRequestsAsync(
+ Ice.CompressBatch.BasedOnProxy,
new Progress(
sentSynchronously =>
{
@@ -2512,7 +2527,9 @@ public class AllTests : TestCommon.AllTests
b1.opBatch();
b1.opBatch();
FlushCallback cb = new FlushCallback(cookie);
- Ice.AsyncResult r = communicator.begin_flushBatchRequests(cb.completedAsync, cookie);
+ Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy,
+ cb.completedAsync,
+ cookie);
r.whenSent(cb.sentAsync);
cb.check();
test(r.isSent());
@@ -2530,7 +2547,9 @@ public class AllTests : TestCommon.AllTests
b1.opBatch();
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
FlushCallback cb = new FlushCallback(cookie);
- Ice.AsyncResult r = communicator.begin_flushBatchRequests(cb.completedAsync, cookie);
+ Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy,
+ cb.completedAsync,
+ cookie);
r.whenSent(cb.sentAsync);
cb.check();
test(r.isSent()); // Exceptions are ignored!
@@ -2554,7 +2573,9 @@ public class AllTests : TestCommon.AllTests
b2.opBatch();
b2.opBatch();
FlushCallback cb = new FlushCallback(cookie);
- Ice.AsyncResult r = communicator.begin_flushBatchRequests(cb.completedAsync, cookie);
+ Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy,
+ cb.completedAsync,
+ cookie);
r.whenSent(cb.sentAsync);
cb.check();
test(r.isSent());
@@ -2579,7 +2600,9 @@ public class AllTests : TestCommon.AllTests
b2.opBatch();
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
FlushCallback cb = new FlushCallback(cookie);
- Ice.AsyncResult r = communicator.begin_flushBatchRequests(cb.completedAsync, cookie);
+ Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy,
+ cb.completedAsync,
+ cookie);
r.whenSent(cb.sentAsync);
cb.check();
test(r.isSent()); // Exceptions are ignored!
@@ -2604,7 +2627,9 @@ public class AllTests : TestCommon.AllTests
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
b2.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
FlushCallback cb = new FlushCallback(cookie);
- Ice.AsyncResult r = communicator.begin_flushBatchRequests(cb.completedAsync, cookie);
+ Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy,
+ cb.completedAsync,
+ cookie);
r.whenSent(cb.sentAsync);
cb.check();
test(r.isSent()); // Exceptions are ignored!
@@ -2622,7 +2647,7 @@ public class AllTests : TestCommon.AllTests
b1.opBatch();
b1.opBatch();
FlushCallback cb = new FlushCallback();
- Ice.AsyncResult r = communicator.begin_flushBatchRequests();
+ Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
r.whenCompleted(cb.exception);
r.whenSent(cb.sent);
cb.check();
@@ -2641,7 +2666,7 @@ public class AllTests : TestCommon.AllTests
b1.opBatch();
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
FlushCallback cb = new FlushCallback();
- Ice.AsyncResult r = communicator.begin_flushBatchRequests();
+ Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
r.whenCompleted(cb.exception);
r.whenSent(cb.sent);
cb.check();
@@ -2665,7 +2690,7 @@ public class AllTests : TestCommon.AllTests
b2.opBatch();
b2.opBatch();
FlushCallback cb = new FlushCallback();
- Ice.AsyncResult r = communicator.begin_flushBatchRequests();
+ Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
r.whenCompleted(cb.exception);
r.whenSent(cb.sent);
cb.check();
@@ -2691,7 +2716,7 @@ public class AllTests : TestCommon.AllTests
b2.opBatch();
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
FlushCallback cb = new FlushCallback();
- Ice.AsyncResult r = communicator.begin_flushBatchRequests();
+ Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
r.whenCompleted(cb.exception);
r.whenSent(cb.sent);
cb.check();
@@ -2717,7 +2742,7 @@ public class AllTests : TestCommon.AllTests
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
b2.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
FlushCallback cb = new FlushCallback();
- Ice.AsyncResult r = communicator.begin_flushBatchRequests();
+ Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
r.whenCompleted(cb.exception);
r.whenSent(cb.sent);
cb.check();
@@ -2744,6 +2769,7 @@ public class AllTests : TestCommon.AllTests
b1.opBatch();
FlushCallback cb = new FlushCallback(cookie);
Ice.AsyncResult r = communicator.begin_flushBatchRequests(
+ Ice.CompressBatch.BasedOnProxy,
(Ice.AsyncResult result) =>
{
cb.completedAsync(result);
@@ -2770,6 +2796,7 @@ public class AllTests : TestCommon.AllTests
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
FlushCallback cb = new FlushCallback(cookie);
Ice.AsyncResult r = communicator.begin_flushBatchRequests(
+ Ice.CompressBatch.BasedOnProxy,
(Ice.AsyncResult result) =>
{
cb.completedAsync(result);
@@ -2801,6 +2828,7 @@ public class AllTests : TestCommon.AllTests
b2.opBatch();
FlushCallback cb = new FlushCallback(cookie);
Ice.AsyncResult r = communicator.begin_flushBatchRequests(
+ Ice.CompressBatch.BasedOnProxy,
(Ice.AsyncResult result) =>
{
cb.completedAsync(result);
@@ -2834,6 +2862,7 @@ public class AllTests : TestCommon.AllTests
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
FlushCallback cb = new FlushCallback(cookie);
Ice.AsyncResult r = communicator.begin_flushBatchRequests(
+ Ice.CompressBatch.BasedOnProxy,
(Ice.AsyncResult result) =>
{
cb.completedAsync(result);
@@ -2867,6 +2896,7 @@ public class AllTests : TestCommon.AllTests
b2.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
FlushCallback cb = new FlushCallback(cookie);
Ice.AsyncResult r = communicator.begin_flushBatchRequests(
+ Ice.CompressBatch.BasedOnProxy,
(Ice.AsyncResult result) =>
{
cb.completedAsync(result);
@@ -2892,7 +2922,7 @@ public class AllTests : TestCommon.AllTests
b1.opBatch();
b1.opBatch();
FlushCallback cb = new FlushCallback();
- Ice.AsyncResult r = communicator.begin_flushBatchRequests();
+ Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
r.whenCompleted(
(Ice.Exception ex) =>
{
@@ -2919,7 +2949,7 @@ public class AllTests : TestCommon.AllTests
b1.opBatch();
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
FlushCallback cb = new FlushCallback();
- Ice.AsyncResult r = communicator.begin_flushBatchRequests();
+ Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
r.whenCompleted(
(Ice.Exception ex) =>
{
@@ -2951,7 +2981,7 @@ public class AllTests : TestCommon.AllTests
b2.opBatch();
b2.opBatch();
FlushCallback cb = new FlushCallback();
- Ice.AsyncResult r = communicator.begin_flushBatchRequests();
+ Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
r.whenCompleted(
(Ice.Exception ex) =>
{
@@ -2985,7 +3015,7 @@ public class AllTests : TestCommon.AllTests
b2.opBatch();
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
FlushCallback cb = new FlushCallback();
- Ice.AsyncResult r = communicator.begin_flushBatchRequests();
+ Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
r.whenCompleted(
(Ice.Exception ex) =>
{
@@ -3019,7 +3049,7 @@ public class AllTests : TestCommon.AllTests
b1.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
b2.ice_getConnection().close(Ice.ConnectionClose.CloseGracefullyAndWait);
FlushCallback cb = new FlushCallback();
- Ice.AsyncResult r = communicator.begin_flushBatchRequests();
+ Ice.AsyncResult r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
r.whenCompleted(
(Ice.Exception ex) =>
{
@@ -3254,7 +3284,7 @@ public class AllTests : TestCommon.AllTests
Ice.Connection con = p.ice_getConnection();
p2 = p.ice_batchOneway() as Test.TestIntfPrx;
p2.ice_ping();
- r = con.begin_flushBatchRequests();
+ r = con.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
test(r.getConnection() == con);
test(r.getCommunicator() == communicator);
test(r.getProxy() == null); // Expected
@@ -3265,7 +3295,7 @@ public class AllTests : TestCommon.AllTests
//
p2 = p.ice_batchOneway() as Test.TestIntfPrx;
p2.ice_ping();
- r = communicator.begin_flushBatchRequests();
+ r = communicator.begin_flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
test(r.getConnection() == null); // Expected
test(r.getCommunicator() == communicator);
test(r.getProxy() == null); // Expected
diff --git a/csharp/test/Ice/operations/BatchOneways.cs b/csharp/test/Ice/operations/BatchOneways.cs
index ee21049b0c7..1eb020416ba 100644
--- a/csharp/test/Ice/operations/BatchOneways.cs
+++ b/csharp/test/Ice/operations/BatchOneways.cs
@@ -162,5 +162,41 @@ class BatchOneways
ic.destroy();
}
+
+ p.ice_ping();
+ if(p.ice_getConnection() != null &&
+ p.ice_getCommunicator().getProperties().getProperty("Ice.Override.Compress").Equals(""))
+ {
+ Ice.ObjectPrx prx = p.ice_getConnection().createProxy(p.ice_getIdentity()).ice_batchOneway();
+
+ Test.MyClassPrx batchC1 = Test.MyClassPrxHelper.uncheckedCast(prx.ice_compress(false));
+ Test.MyClassPrx batchC2 = Test.MyClassPrxHelper.uncheckedCast(prx.ice_compress(true));
+ Test.MyClassPrx batchC3 = Test.MyClassPrxHelper.uncheckedCast(prx.ice_identity(identity));
+
+ batchC1.opByteSOneway(bs1);
+ batchC1.opByteSOneway(bs1);
+ batchC1.opByteSOneway(bs1);
+ batchC1.ice_getConnection().flushBatchRequests(Ice.CompressBatch.Yes);
+
+ batchC2.opByteSOneway(bs1);
+ batchC2.opByteSOneway(bs1);
+ batchC2.opByteSOneway(bs1);
+ batchC1.ice_getConnection().flushBatchRequests(Ice.CompressBatch.No);
+
+ batchC1.opByteSOneway(bs1);
+ batchC1.opByteSOneway(bs1);
+ batchC1.opByteSOneway(bs1);
+ batchC1.ice_getConnection().flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+
+ batchC1.opByteSOneway(bs1);
+ batchC2.opByteSOneway(bs1);
+ batchC1.opByteSOneway(bs1);
+ batchC1.ice_getConnection().flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+
+ batchC1.opByteSOneway(bs1);
+ batchC3.opByteSOneway(bs1);
+ batchC1.opByteSOneway(bs1);
+ batchC1.ice_getConnection().flushBatchRequests(Ice.CompressBatch.BasedOnProxy);
+ }
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 21:09:54 +0000