diff options
Diffstat (limited to 'cpp')
200 files changed, 3387 insertions, 1755 deletions
diff --git a/cpp/demo/Freeze/backup/.depend.mak b/cpp/demo/Freeze/backup/.depend.mak index 736e00cbe09..83939a49e80 100755 --- a/cpp/demo/Freeze/backup/.depend.mak +++ b/cpp/demo/Freeze/backup/.depend.mak @@ -61,6 +61,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -82,6 +83,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -208,6 +210,7 @@ IntLongMap.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -215,6 +218,7 @@ IntLongMap.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Freeze/bench/.depend.mak b/cpp/demo/Freeze/bench/.depend.mak index 96a1497c6c9..79bae0a3716 100755 --- a/cpp/demo/Freeze/bench/.depend.mak +++ b/cpp/demo/Freeze/bench/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -131,6 +132,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -153,6 +155,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -284,6 +287,7 @@ BenchTypes.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -291,6 +295,7 @@ BenchTypes.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Freeze/casino/.depend.mak b/cpp/demo/Freeze/casino/.depend.mak index 0987ff25445..bf066965a62 100755 --- a/cpp/demo/Freeze/casino/.depend.mak +++ b/cpp/demo/Freeze/casino/.depend.mak @@ -45,6 +45,7 @@ Casino.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -136,6 +137,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -158,6 +160,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -249,6 +252,7 @@ CasinoStore.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -344,6 +348,7 @@ BankI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -366,6 +371,7 @@ BankI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -489,6 +495,7 @@ BetI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -511,6 +518,7 @@ BetI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -635,6 +643,7 @@ BetResolver.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -656,6 +665,7 @@ BetResolver.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -768,6 +778,7 @@ PlayerI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -790,6 +801,7 @@ PlayerI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -903,6 +915,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -925,6 +938,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Freeze/customEvictor/.depend.mak b/cpp/demo/Freeze/customEvictor/.depend.mak index cead3ab8a72..d5421a69c2a 100755 --- a/cpp/demo/Freeze/customEvictor/.depend.mak +++ b/cpp/demo/Freeze/customEvictor/.depend.mak @@ -43,6 +43,7 @@ Item.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -144,6 +145,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -165,6 +167,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -309,6 +312,7 @@ CurrentDatabase.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -331,6 +335,7 @@ CurrentDatabase.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -454,6 +459,7 @@ Evictor.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -475,6 +481,7 @@ Evictor.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -579,6 +586,7 @@ EvictorBase.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -601,6 +609,7 @@ EvictorBase.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -707,6 +716,7 @@ ItemI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -746,6 +756,7 @@ ItemI.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -847,6 +858,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -868,6 +880,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -987,6 +1000,7 @@ SimpleEvictor.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1009,6 +1023,7 @@ SimpleEvictor.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1139,6 +1154,7 @@ Database.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -1146,6 +1162,7 @@ Database.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Freeze/library/.depend.mak b/cpp/demo/Freeze/library/.depend.mak index 4b1b309e09d..f522b154ead 100755 --- a/cpp/demo/Freeze/library/.depend.mak +++ b/cpp/demo/Freeze/library/.depend.mak @@ -40,6 +40,7 @@ Library.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -131,6 +132,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -153,6 +155,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -251,6 +254,7 @@ Parser.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -273,6 +277,7 @@ Parser.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -370,6 +375,7 @@ RunParser.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -392,6 +398,7 @@ RunParser.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -489,6 +496,7 @@ Grammar.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -511,6 +519,7 @@ Grammar.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -609,6 +618,7 @@ Scanner.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -631,6 +641,7 @@ Scanner.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -746,6 +757,7 @@ LibraryTypes.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -753,6 +765,7 @@ LibraryTypes.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -865,6 +878,7 @@ BookFactory.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -900,6 +914,7 @@ BookFactory.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -989,6 +1004,7 @@ LibraryI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1011,6 +1027,7 @@ LibraryI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1130,6 +1147,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1152,6 +1170,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1274,6 +1293,7 @@ Collocated.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1296,6 +1316,7 @@ Collocated.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Freeze/phonebook/.depend.mak b/cpp/demo/Freeze/phonebook/.depend.mak index 164e8fa2274..c9ee4b4ea8c 100755 --- a/cpp/demo/Freeze/phonebook/.depend.mak +++ b/cpp/demo/Freeze/phonebook/.depend.mak @@ -41,6 +41,7 @@ PhoneBook.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -133,6 +134,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -155,6 +157,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -252,6 +255,7 @@ Parser.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -274,6 +278,7 @@ Parser.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -371,6 +376,7 @@ RunParser.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -393,6 +399,7 @@ RunParser.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -490,6 +497,7 @@ Grammar.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -512,6 +520,7 @@ Grammar.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -610,6 +619,7 @@ Scanner.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -632,6 +642,7 @@ Scanner.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -747,6 +758,7 @@ NameIndex.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -754,6 +766,7 @@ NameIndex.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -854,6 +867,7 @@ ContactFactory.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -876,6 +890,7 @@ ContactFactory.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1006,6 +1021,7 @@ PhoneBookI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -1027,6 +1043,7 @@ PhoneBookI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1139,6 +1156,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1161,6 +1179,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1286,6 +1305,7 @@ Collocated.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1308,6 +1328,7 @@ Collocated.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Freeze/transform/.depend.mak b/cpp/demo/Freeze/transform/.depend.mak index 1eb159deeeb..d572ec33e07 100755 --- a/cpp/demo/Freeze/transform/.depend.mak +++ b/cpp/demo/Freeze/transform/.depend.mak @@ -121,6 +121,7 @@ Contacts.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -128,6 +129,7 @@ Contacts.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -228,6 +230,7 @@ create.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -250,6 +253,7 @@ create.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -363,6 +367,7 @@ read.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -385,6 +390,7 @@ read.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -564,6 +570,7 @@ NewContacts.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -571,6 +578,7 @@ NewContacts.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -671,6 +679,7 @@ readnew.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -693,6 +702,7 @@ readnew.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -806,6 +816,7 @@ recreate.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -828,6 +839,7 @@ recreate.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Glacier2/callback/.depend.mak b/cpp/demo/Glacier2/callback/.depend.mak index 749e03477ea..7146801332f 100755 --- a/cpp/demo/Glacier2/callback/.depend.mak +++ b/cpp/demo/Glacier2/callback/.depend.mak @@ -40,6 +40,7 @@ Callback.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ CallbackI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ CallbackI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -258,6 +261,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -279,6 +283,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -383,6 +388,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -405,6 +411,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Glacier2/callback/Client.cpp b/cpp/demo/Glacier2/callback/Client.cpp index 42bffc96bda..f47c1c33acf 100644 --- a/cpp/demo/Glacier2/callback/Client.cpp +++ b/cpp/demo/Glacier2/callback/Client.cpp @@ -163,7 +163,7 @@ CallbackClient::runWithSession(int argc, char*[]) } else if(c == 'f') { - communicator()->flushBatchRequests(); + batchOneway->ice_flushBatchRequests(); } else if(c == 'v') { diff --git a/cpp/demo/Glacier2/chat/.depend.mak b/cpp/demo/Glacier2/chat/.depend.mak index 6703e7e7706..dcf9276f66c 100755 --- a/cpp/demo/Glacier2/chat/.depend.mak +++ b/cpp/demo/Glacier2/chat/.depend.mak @@ -44,6 +44,7 @@ Chat.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -149,6 +150,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -170,6 +172,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -273,6 +276,7 @@ ChatSessionI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -295,6 +299,7 @@ ChatSessionI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -395,6 +400,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -417,6 +423,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/MFC/client/.depend.mak b/cpp/demo/Ice/MFC/client/.depend.mak index 2a00f5e7920..22c0688423a 100755 --- a/cpp/demo/Ice/MFC/client/.depend.mak +++ b/cpp/demo/Ice/MFC/client/.depend.mak @@ -40,6 +40,7 @@ Hello.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -130,6 +131,7 @@ HelloClient.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -152,6 +154,7 @@ HelloClient.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -252,6 +255,7 @@ HelloClientDlg.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -274,6 +278,7 @@ HelloClientDlg.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -374,6 +379,7 @@ stdafx.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -396,6 +402,7 @@ stdafx.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp index 2462340a045..5a87cadfc37 100644 --- a/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp +++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.cpp @@ -131,7 +131,7 @@ CHelloClientDlg::CHelloClientDlg(CWnd* pParent /*=NULL*/) : CDialog(CHelloClient CallbackPtr cb = new Callback(this); _sayHelloCallback = newCallback_Hello_sayHello(cb, &Callback::response, &Callback::exception, &Callback::sent); _shutdownCallback = newCallback_Hello_shutdown(cb, &Callback::response, &Callback::exception); - _flushCallback = Ice::newCallback_Communicator_flushBatchRequests(cb, &Callback::exception, &Callback::flushSent); + _flushCallback = Ice::newCallback_Object_ice_flushBatchRequests(cb, &Callback::exception, &Callback::flushSent); } void @@ -341,9 +341,13 @@ CHelloClientDlg::OnShutdown() void CHelloClientDlg::OnFlush() { + if(!_helloPrx) + { + return; + } try { - _communicator->begin_flushBatchRequests(_flushCallback); + _helloPrx->begin_ice_flushBatchRequests(_flushCallback); } catch(const IceUtil::Exception& ex) { @@ -455,6 +459,12 @@ CHelloClientDlg::updateProxy() } _helloPrx = Demo::HelloPrx::uncheckedCast(prx); + + // + // The batch requests associated to the proxy are lost when we + // update the proxy. + // + _flush->EnableWindow(FALSE); } BOOL diff --git a/cpp/demo/Ice/MFC/client/HelloClientDlg.h b/cpp/demo/Ice/MFC/client/HelloClientDlg.h index 1e20f1a3d49..56fb2ee45e9 100644 --- a/cpp/demo/Ice/MFC/client/HelloClientDlg.h +++ b/cpp/demo/Ice/MFC/client/HelloClientDlg.h @@ -38,7 +38,7 @@ protected: Demo::HelloPrx _helloPrx; Demo::Callback_Hello_sayHelloPtr _sayHelloCallback; Demo::Callback_Hello_shutdownPtr _shutdownCallback; - Ice::Callback_Communicator_flushBatchRequestsPtr _flushCallback; + Ice::Callback_Object_ice_flushBatchRequestsPtr _flushCallback; CEdit* _host; CComboBox* _mode; CSliderCtrl* _timeout; diff --git a/cpp/demo/Ice/MFC/server/.depend.mak b/cpp/demo/Ice/MFC/server/.depend.mak index 52da1649973..8fce59c7b1b 100755 --- a/cpp/demo/Ice/MFC/server/.depend.mak +++ b/cpp/demo/Ice/MFC/server/.depend.mak @@ -40,6 +40,7 @@ Hello.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -130,6 +131,7 @@ HelloI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -152,6 +154,7 @@ HelloI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -258,6 +261,7 @@ HelloServer.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -280,6 +284,7 @@ HelloServer.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -382,6 +387,7 @@ HelloServerDlg.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -404,6 +410,7 @@ HelloServerDlg.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -504,6 +511,7 @@ LogI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -526,6 +534,7 @@ LogI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -623,6 +632,7 @@ stdafx.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -645,6 +655,7 @@ stdafx.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/async/.depend.mak b/cpp/demo/Ice/async/.depend.mak index e612f1986bd..fc0ffe0117c 100755 --- a/cpp/demo/Ice/async/.depend.mak +++ b/cpp/demo/Ice/async/.depend.mak @@ -40,6 +40,7 @@ Hello.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -132,6 +133,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -154,6 +156,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -250,6 +253,7 @@ HelloI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -272,6 +276,7 @@ HelloI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -377,6 +382,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -399,6 +405,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -504,6 +511,7 @@ WorkQueue.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -526,6 +534,7 @@ WorkQueue.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/bidir/.depend.mak b/cpp/demo/Ice/bidir/.depend.mak index fc19421e95e..e20c6de3097 100755 --- a/cpp/demo/Ice/bidir/.depend.mak +++ b/cpp/demo/Ice/bidir/.depend.mak @@ -41,6 +41,7 @@ Callback.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -140,6 +141,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -161,6 +163,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -255,6 +258,7 @@ CallbackI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -277,6 +281,7 @@ CallbackI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -381,6 +386,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -403,6 +409,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/callback/.depend.mak b/cpp/demo/Ice/callback/.depend.mak index 100b79cecfc..98bdcdb8d7e 100755 --- a/cpp/demo/Ice/callback/.depend.mak +++ b/cpp/demo/Ice/callback/.depend.mak @@ -40,6 +40,7 @@ Callback.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -247,6 +250,7 @@ CallbackSenderI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -269,6 +273,7 @@ CallbackSenderI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -366,6 +371,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -388,6 +394,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/context/.depend.mak b/cpp/demo/Ice/context/.depend.mak index 2c366a9dcd8..3d5424a8fc3 100755 --- a/cpp/demo/Ice/context/.depend.mak +++ b/cpp/demo/Ice/context/.depend.mak @@ -40,6 +40,7 @@ Context.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -257,6 +260,7 @@ ContextI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -278,6 +282,7 @@ ContextI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -373,6 +378,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -395,6 +401,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/converter/.depend.mak b/cpp/demo/Ice/converter/.depend.mak index 0e57ec0810e..c171161b7ce 100755 --- a/cpp/demo/Ice/converter/.depend.mak +++ b/cpp/demo/Ice/converter/.depend.mak @@ -40,6 +40,7 @@ Greet.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -130,6 +131,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -152,6 +154,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -249,6 +252,7 @@ ClientWithConverter.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -271,6 +275,7 @@ ClientWithConverter.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -407,6 +412,7 @@ ClientWithoutConverter.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -429,6 +435,7 @@ ClientWithoutConverter.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -534,6 +541,7 @@ GreetI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -555,6 +563,7 @@ GreetI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -650,6 +659,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -672,6 +682,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/hello/.depend.mak b/cpp/demo/Ice/hello/.depend.mak index a4261c81022..f62259bf8a6 100755 --- a/cpp/demo/Ice/hello/.depend.mak +++ b/cpp/demo/Ice/hello/.depend.mak @@ -40,6 +40,7 @@ Hello.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -257,6 +260,7 @@ HelloI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -278,6 +282,7 @@ HelloI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -373,6 +378,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -395,6 +401,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/hello/Client.cpp b/cpp/demo/Ice/hello/Client.cpp index d325ab72627..affd68ae438 100644 --- a/cpp/demo/Ice/hello/Client.cpp +++ b/cpp/demo/Ice/hello/Client.cpp @@ -112,7 +112,8 @@ HelloClient::run(int argc, char* argv[]) } else if(c == 'f') { - communicator()->flushBatchRequests(); + batchOneway->ice_flushBatchRequests(); + batchDatagram->ice_flushBatchRequests(); } else if(c == 'T') { diff --git a/cpp/demo/Ice/interleaved/.depend.mak b/cpp/demo/Ice/interleaved/.depend.mak index 5558e4dddf3..76aeb4d6f5c 100755 --- a/cpp/demo/Ice/interleaved/.depend.mak +++ b/cpp/demo/Ice/interleaved/.depend.mak @@ -40,6 +40,7 @@ Throughput.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -130,6 +131,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -152,6 +154,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -248,6 +251,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -270,6 +274,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -367,6 +372,7 @@ ThroughputI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -389,6 +395,7 @@ ThroughputI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/invoke/.depend.mak b/cpp/demo/Ice/invoke/.depend.mak index 36050b31626..8785aa7d599 100755 --- a/cpp/demo/Ice/invoke/.depend.mak +++ b/cpp/demo/Ice/invoke/.depend.mak @@ -40,6 +40,7 @@ Printer.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -131,6 +132,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -153,6 +155,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -249,6 +252,7 @@ PrinterI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -271,6 +275,7 @@ PrinterI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -368,6 +373,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -390,6 +396,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/latency/.depend.mak b/cpp/demo/Ice/latency/.depend.mak index a8a7d266c5c..0231e755e8d 100755 --- a/cpp/demo/Ice/latency/.depend.mak +++ b/cpp/demo/Ice/latency/.depend.mak @@ -40,6 +40,7 @@ Latency.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -131,6 +132,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -153,6 +155,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -249,6 +252,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -271,6 +275,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/minimal/.depend.mak b/cpp/demo/Ice/minimal/.depend.mak index 5506c482c2b..13d69c10206 100755 --- a/cpp/demo/Ice/minimal/.depend.mak +++ b/cpp/demo/Ice/minimal/.depend.mak @@ -40,6 +40,7 @@ Hello.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -247,6 +250,7 @@ HelloI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -269,6 +273,7 @@ HelloI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -366,6 +371,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -388,6 +394,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/multicast/.depend.mak b/cpp/demo/Ice/multicast/.depend.mak index 01de6037341..85655fda138 100755 --- a/cpp/demo/Ice/multicast/.depend.mak +++ b/cpp/demo/Ice/multicast/.depend.mak @@ -43,6 +43,7 @@ Discovery.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -120,6 +121,7 @@ Hello.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -209,6 +211,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -231,6 +234,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -335,6 +339,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -357,6 +362,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/nested/.depend.mak b/cpp/demo/Ice/nested/.depend.mak index a391020e339..2408a28b0db 100755 --- a/cpp/demo/Ice/nested/.depend.mak +++ b/cpp/demo/Ice/nested/.depend.mak @@ -40,6 +40,7 @@ Nested.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -248,6 +251,7 @@ NestedI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -270,6 +274,7 @@ NestedI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -367,6 +372,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -389,6 +395,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/nrvo/.depend.mak b/cpp/demo/Ice/nrvo/.depend.mak index bd7478726a3..df0a39ab426 100755 --- a/cpp/demo/Ice/nrvo/.depend.mak +++ b/cpp/demo/Ice/nrvo/.depend.mak @@ -40,6 +40,7 @@ Nrvo.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -170,6 +171,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -192,6 +194,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -296,6 +299,7 @@ NrvoI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -318,6 +322,7 @@ NrvoI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -423,6 +428,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -445,6 +451,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/optional/.depend.mak b/cpp/demo/Ice/optional/.depend.mak index 6dfc49fc58c..9ebcadf05cb 100755 --- a/cpp/demo/Ice/optional/.depend.mak +++ b/cpp/demo/Ice/optional/.depend.mak @@ -40,6 +40,7 @@ Contact.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -131,6 +132,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -153,6 +155,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -259,6 +262,7 @@ ContactDBI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -280,6 +284,7 @@ ContactDBI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -375,6 +380,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -397,6 +403,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/plugin/.depend.mak b/cpp/demo/Ice/plugin/.depend.mak index 6e0ac7cc652..af2c30dc681 100755 --- a/cpp/demo/Ice/plugin/.depend.mak +++ b/cpp/demo/Ice/plugin/.depend.mak @@ -40,6 +40,7 @@ Hello.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -247,6 +250,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -269,6 +273,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -364,6 +369,7 @@ LoggerPluginI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -386,6 +392,7 @@ LoggerPluginI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -481,6 +488,7 @@ HelloPluginI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -503,6 +511,7 @@ HelloPluginI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/properties/.depend.mak b/cpp/demo/Ice/properties/.depend.mak index 2c4031b32f4..d00cb3b2209 100755 --- a/cpp/demo/Ice/properties/.depend.mak +++ b/cpp/demo/Ice/properties/.depend.mak @@ -43,6 +43,7 @@ Props.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -135,6 +136,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -157,6 +159,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -253,6 +256,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -275,6 +279,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/session/.depend.mak b/cpp/demo/Ice/session/.depend.mak index 705d076090f..ac80a71f936 100755 --- a/cpp/demo/Ice/session/.depend.mak +++ b/cpp/demo/Ice/session/.depend.mak @@ -40,6 +40,7 @@ Session.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -139,6 +140,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -160,6 +162,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -266,6 +269,7 @@ ReapTask.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -287,6 +291,7 @@ ReapTask.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -382,6 +387,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -404,6 +410,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -510,6 +517,7 @@ SessionFactoryI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -532,6 +540,7 @@ SessionFactoryI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -638,6 +647,7 @@ SessionI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -660,6 +670,7 @@ SessionI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/throughput/.depend.mak b/cpp/demo/Ice/throughput/.depend.mak index d9476ab5211..7930912f4aa 100755 --- a/cpp/demo/Ice/throughput/.depend.mak +++ b/cpp/demo/Ice/throughput/.depend.mak @@ -40,6 +40,7 @@ Throughput.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -83,6 +84,7 @@ Throughput.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\Properties.h" \ @@ -172,6 +174,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -194,6 +197,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -291,6 +295,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -313,6 +318,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -411,6 +417,7 @@ ThroughputI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -433,6 +440,7 @@ ThroughputI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/value/.depend.mak b/cpp/demo/Ice/value/.depend.mak index f25058cb470..c3cc40fe0a3 100755 --- a/cpp/demo/Ice/value/.depend.mak +++ b/cpp/demo/Ice/value/.depend.mak @@ -40,6 +40,7 @@ Value.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -132,6 +133,7 @@ ObjectFactory.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -154,6 +156,7 @@ ObjectFactory.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -252,6 +255,7 @@ ValueI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -274,6 +278,7 @@ ValueI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -371,6 +376,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -393,6 +399,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -491,6 +498,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -513,6 +521,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Ice/winrt/hello/MainPage.xaml.cpp b/cpp/demo/Ice/winrt/hello/MainPage.xaml.cpp index 0156dfba8b2..1a4d14a9e0d 100644 --- a/cpp/demo/Ice/winrt/hello/MainPage.xaml.cpp +++ b/cpp/demo/Ice/winrt/hello/MainPage.xaml.cpp @@ -125,6 +125,13 @@ hello::MainPage::updateProxy() prx = prx->ice_invocationTimeout(static_cast<int>(timeout->Value * 1000)); } _helloPrx = Demo::HelloPrx::uncheckedCast(prx); + + // + // The batch requests associated to the proxy are lost when we + // update the proxy. + // + flush->IsEnabled = false; + print("Ready."); } @@ -172,7 +179,7 @@ hello::MainPage::hello_Click(Platform::Object^ sender, Windows::UI::Xaml::Routed Ice::ConnectionPtr con = _helloPrx->ice_getCachedConnection(); if(con) { - Ice::IPConnectionInfoPtr info = + Ice::IPConnectionInfoPtr info = Ice::IPConnectionInfoPtr::dynamicCast(con->getInfo()); if(info) { @@ -195,7 +202,7 @@ hello::MainPage::hello_Click(Platform::Object^ sender, Windows::UI::Xaml::Routed print("Ready."); } }); - + if(!result->sentSynchronously()) { print("Sending request"); @@ -264,19 +271,24 @@ void hello::MainPage::shutdown_Click(Platform::Object^ sender, Windows::UI::Xaml void hello::MainPage::flush_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) { + if(!_helloPrx) + { + return; + } + try { flush->IsEnabled = false; - _communicator->begin_flushBatchRequests([=](const Ice::Exception& ex) - { - ostringstream os; - os << ex; - print(os.str()); - }, + _helloPrx->begin_ice_flushBatchRequests([=](const Ice::Exception& ex) + { + ostringstream os; + os << ex; + print(os.str()); + }, [=](bool) - { - print("Flushed batch requests."); - }); + { + print("Flushed batch requests."); + }); } catch(const Ice::Exception& ex) { @@ -286,19 +298,19 @@ void hello::MainPage::flush_Click(Platform::Object^ sender, Windows::UI::Xaml::R } } -void +void MainPage::mode_SelectionChanged(Platform::Object^ sender, Windows::UI::Xaml::Controls::SelectionChangedEventArgs^ e) { updateProxy(); } -void +void MainPage::timeout_ValueChanged(Platform::Object^ sender, Windows::UI::Xaml::Controls::Primitives::RangeBaseValueChangedEventArgs^ e) { updateProxy(); } -void +void MainPage::hostname_TextChanged(Platform::Object^ sender, Windows::UI::Xaml::Controls::TextChangedEventArgs^ e) { if (hostname->Text->Length() == 0 && !useDiscovery->IsChecked->Value) @@ -336,5 +348,3 @@ MainPage::print(const std::string& message) { output->Text = ref new String(IceUtil::stringToWstring(message).c_str()); } - - diff --git a/cpp/demo/IceBox/hello/.depend.mak b/cpp/demo/IceBox/hello/.depend.mak index c76d0f35f61..2e61d2d99c5 100755 --- a/cpp/demo/IceBox/hello/.depend.mak +++ b/cpp/demo/IceBox/hello/.depend.mak @@ -40,6 +40,7 @@ Hello.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -247,6 +250,7 @@ HelloI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -269,6 +273,7 @@ HelloI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -366,6 +371,7 @@ HelloServiceI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -388,6 +394,7 @@ HelloServiceI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/IceBox/hello/Client.cpp b/cpp/demo/IceBox/hello/Client.cpp index a827c9f270f..857681d2bf3 100644 --- a/cpp/demo/IceBox/hello/Client.cpp +++ b/cpp/demo/IceBox/hello/Client.cpp @@ -110,7 +110,8 @@ HelloClient::run(int argc, char* argv[]) } else if(c == 'f') { - communicator()->flushBatchRequests(); + batchOneway->ice_flushBatchRequests(); + batchDatagram->ice_flushBatchRequests(); } else if(c == 'S') { diff --git a/cpp/demo/IceDiscovery/hello/.depend.mak b/cpp/demo/IceDiscovery/hello/.depend.mak index a4261c81022..f62259bf8a6 100755 --- a/cpp/demo/IceDiscovery/hello/.depend.mak +++ b/cpp/demo/IceDiscovery/hello/.depend.mak @@ -40,6 +40,7 @@ Hello.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -257,6 +260,7 @@ HelloI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -278,6 +282,7 @@ HelloI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -373,6 +378,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -395,6 +401,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/IceDiscovery/hello/Client.cpp b/cpp/demo/IceDiscovery/hello/Client.cpp index 41b0b7b23f8..8c138745718 100644 --- a/cpp/demo/IceDiscovery/hello/Client.cpp +++ b/cpp/demo/IceDiscovery/hello/Client.cpp @@ -116,7 +116,8 @@ HelloClient::run(int argc, char* argv[]) } else if(c == 'f') { - communicator()->flushBatchRequests(); + batchOneway->ice_flushBatchRequests(); + batchDatagram->ice_flushBatchRequests(); } else if(c == 'T') { diff --git a/cpp/demo/IceDiscovery/replication/.depend.mak b/cpp/demo/IceDiscovery/replication/.depend.mak index 6c1b2cf426f..5c60af31368 100755 --- a/cpp/demo/IceDiscovery/replication/.depend.mak +++ b/cpp/demo/IceDiscovery/replication/.depend.mak @@ -40,6 +40,7 @@ Hello.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -139,6 +140,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -160,6 +162,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -271,6 +274,7 @@ HelloI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -293,6 +297,7 @@ HelloI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -390,6 +395,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -412,6 +418,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/IceGrid/allocate/.depend.mak b/cpp/demo/IceGrid/allocate/.depend.mak index 6c1b2cf426f..5c60af31368 100755 --- a/cpp/demo/IceGrid/allocate/.depend.mak +++ b/cpp/demo/IceGrid/allocate/.depend.mak @@ -40,6 +40,7 @@ Hello.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -139,6 +140,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -160,6 +162,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -271,6 +274,7 @@ HelloI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -293,6 +297,7 @@ HelloI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -390,6 +395,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -412,6 +418,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/IceGrid/customLoadBalancing/.depend.mak b/cpp/demo/IceGrid/customLoadBalancing/.depend.mak index 2661ad22a28..439f3d1fdb6 100755 --- a/cpp/demo/IceGrid/customLoadBalancing/.depend.mak +++ b/cpp/demo/IceGrid/customLoadBalancing/.depend.mak @@ -41,6 +41,7 @@ Pricing.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -130,6 +131,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -152,6 +154,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -265,6 +268,7 @@ RegistryPlugin.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -287,6 +291,7 @@ RegistryPlugin.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -399,6 +404,7 @@ PricingI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -421,6 +427,7 @@ PricingI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -518,6 +525,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -540,6 +548,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/IceGrid/icebox/.depend.mak b/cpp/demo/IceGrid/icebox/.depend.mak index c76d0f35f61..2e61d2d99c5 100755 --- a/cpp/demo/IceGrid/icebox/.depend.mak +++ b/cpp/demo/IceGrid/icebox/.depend.mak @@ -40,6 +40,7 @@ Hello.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -247,6 +250,7 @@ HelloI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -269,6 +273,7 @@ HelloI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -366,6 +371,7 @@ HelloServiceI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -388,6 +394,7 @@ HelloServiceI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/IceGrid/replication/.depend.mak b/cpp/demo/IceGrid/replication/.depend.mak index 6c1b2cf426f..5c60af31368 100755 --- a/cpp/demo/IceGrid/replication/.depend.mak +++ b/cpp/demo/IceGrid/replication/.depend.mak @@ -40,6 +40,7 @@ Hello.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -139,6 +140,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -160,6 +162,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -271,6 +274,7 @@ HelloI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -293,6 +297,7 @@ HelloI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -390,6 +395,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -412,6 +418,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/IceGrid/secure/.depend.mak b/cpp/demo/IceGrid/secure/.depend.mak index 1260114e3b7..b81e40da9f3 100755 --- a/cpp/demo/IceGrid/secure/.depend.mak +++ b/cpp/demo/IceGrid/secure/.depend.mak @@ -40,6 +40,7 @@ Hello.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -264,6 +267,7 @@ HelloI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -286,6 +290,7 @@ HelloI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -383,6 +388,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -405,6 +411,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/IceGrid/sessionActivation/.depend.mak b/cpp/demo/IceGrid/sessionActivation/.depend.mak index 6c1b2cf426f..5c60af31368 100755 --- a/cpp/demo/IceGrid/sessionActivation/.depend.mak +++ b/cpp/demo/IceGrid/sessionActivation/.depend.mak @@ -40,6 +40,7 @@ Hello.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -139,6 +140,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -160,6 +162,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -271,6 +274,7 @@ HelloI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -293,6 +297,7 @@ HelloI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -390,6 +395,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -412,6 +418,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/IceGrid/simple/.depend.mak b/cpp/demo/IceGrid/simple/.depend.mak index 1260114e3b7..b81e40da9f3 100755 --- a/cpp/demo/IceGrid/simple/.depend.mak +++ b/cpp/demo/IceGrid/simple/.depend.mak @@ -40,6 +40,7 @@ Hello.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -264,6 +267,7 @@ HelloI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -286,6 +290,7 @@ HelloI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -383,6 +388,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -405,6 +411,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/IcePatch2/MFC/.depend.mak b/cpp/demo/IcePatch2/MFC/.depend.mak index 353df65a723..55247d958e5 100755 --- a/cpp/demo/IcePatch2/MFC/.depend.mak +++ b/cpp/demo/IcePatch2/MFC/.depend.mak @@ -50,6 +50,7 @@ PatchClient.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -72,6 +73,7 @@ PatchClient.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -171,6 +173,7 @@ PatchClientDlg.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -193,6 +196,7 @@ PatchClientDlg.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -296,6 +300,7 @@ stdafx.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -318,6 +323,7 @@ stdafx.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/IceStorm/clock/.depend.mak b/cpp/demo/IceStorm/clock/.depend.mak index d3b4f7abf9d..40a1f1dbc03 100755 --- a/cpp/demo/IceStorm/clock/.depend.mak +++ b/cpp/demo/IceStorm/clock/.depend.mak @@ -40,6 +40,7 @@ Clock.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -139,6 +140,7 @@ Publisher.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -160,6 +162,7 @@ Publisher.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -268,6 +271,7 @@ Subscriber.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -289,6 +293,7 @@ Subscriber.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/IceStorm/counter/.depend.mak b/cpp/demo/IceStorm/counter/.depend.mak index 25ea2dbcb33..36cd61423fe 100755 --- a/cpp/demo/IceStorm/counter/.depend.mak +++ b/cpp/demo/IceStorm/counter/.depend.mak @@ -40,6 +40,7 @@ Counter.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -248,6 +251,7 @@ CounterObserverI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -270,6 +274,7 @@ CounterObserverI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -367,6 +372,7 @@ CounterI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -389,6 +395,7 @@ CounterI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -490,6 +497,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -512,6 +520,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/IceStorm/replicated/.depend.mak b/cpp/demo/IceStorm/replicated/.depend.mak index d3b4f7abf9d..40a1f1dbc03 100755 --- a/cpp/demo/IceStorm/replicated/.depend.mak +++ b/cpp/demo/IceStorm/replicated/.depend.mak @@ -40,6 +40,7 @@ Clock.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -139,6 +140,7 @@ Publisher.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -160,6 +162,7 @@ Publisher.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -268,6 +271,7 @@ Subscriber.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -289,6 +293,7 @@ Subscriber.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/IceStorm/replicated2/.depend.mak b/cpp/demo/IceStorm/replicated2/.depend.mak index d3b4f7abf9d..40a1f1dbc03 100755 --- a/cpp/demo/IceStorm/replicated2/.depend.mak +++ b/cpp/demo/IceStorm/replicated2/.depend.mak @@ -40,6 +40,7 @@ Clock.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -139,6 +140,7 @@ Publisher.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -160,6 +162,7 @@ Publisher.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -268,6 +271,7 @@ Subscriber.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -289,6 +293,7 @@ Subscriber.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Manual/evictor_filesystem/.depend.mak b/cpp/demo/Manual/evictor_filesystem/.depend.mak index 79bb5fde01a..c53a6695211 100755 --- a/cpp/demo/Manual/evictor_filesystem/.depend.mak +++ b/cpp/demo/Manual/evictor_filesystem/.depend.mak @@ -44,6 +44,7 @@ Filesystem.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -135,6 +136,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -157,6 +159,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -255,6 +258,7 @@ Parser.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -277,6 +281,7 @@ Parser.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -374,6 +379,7 @@ Grammar.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -396,6 +402,7 @@ Grammar.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -494,6 +501,7 @@ Scanner.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -516,6 +524,7 @@ Scanner.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -601,6 +610,7 @@ PersistentFilesystem.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -682,6 +692,7 @@ PersistentFilesystemI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -737,6 +748,7 @@ PersistentFilesystemI.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -825,6 +837,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -880,6 +893,7 @@ Server.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ diff --git a/cpp/demo/Manual/lifecycle/.depend.mak b/cpp/demo/Manual/lifecycle/.depend.mak index ac6752f0d71..d945f2d4525 100755 --- a/cpp/demo/Manual/lifecycle/.depend.mak +++ b/cpp/demo/Manual/lifecycle/.depend.mak @@ -40,6 +40,7 @@ Filesystem.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -131,6 +132,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -153,6 +155,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -251,6 +254,7 @@ Parser.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -273,6 +277,7 @@ Parser.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -370,6 +375,7 @@ Grammar.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -392,6 +398,7 @@ Grammar.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -490,6 +497,7 @@ Scanner.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -512,6 +520,7 @@ Scanner.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -620,6 +629,7 @@ FilesystemI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -641,6 +651,7 @@ FilesystemI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -735,6 +746,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -757,6 +769,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Manual/map_filesystem/.depend.mak b/cpp/demo/Manual/map_filesystem/.depend.mak index b6239f0c48c..23c07c9768f 100755 --- a/cpp/demo/Manual/map_filesystem/.depend.mak +++ b/cpp/demo/Manual/map_filesystem/.depend.mak @@ -45,6 +45,7 @@ Filesystem.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -136,6 +137,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -158,6 +160,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -256,6 +259,7 @@ Parser.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -278,6 +282,7 @@ Parser.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -375,6 +380,7 @@ Grammar.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -397,6 +403,7 @@ Grammar.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -495,6 +502,7 @@ Scanner.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -517,6 +525,7 @@ Scanner.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -602,6 +611,7 @@ FilesystemDB.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -683,6 +693,7 @@ FilesystemI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -729,6 +740,7 @@ FilesystemI.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -828,6 +840,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -874,6 +887,7 @@ Server.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -995,6 +1009,7 @@ IdentityDirectoryEntryMap.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -1002,6 +1017,7 @@ IdentityDirectoryEntryMap.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1121,6 +1137,7 @@ IdentityFileEntryMap.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -1128,6 +1145,7 @@ IdentityFileEntryMap.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Manual/printer/.depend.mak b/cpp/demo/Manual/printer/.depend.mak index 5a8c84b6f95..0ee59c65724 100755 --- a/cpp/demo/Manual/printer/.depend.mak +++ b/cpp/demo/Manual/printer/.depend.mak @@ -40,6 +40,7 @@ Printer.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -247,6 +250,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -269,6 +273,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/demo/Manual/simple_filesystem/.depend.mak b/cpp/demo/Manual/simple_filesystem/.depend.mak index 2ee2328f8ad..827ccc3d5f9 100755 --- a/cpp/demo/Manual/simple_filesystem/.depend.mak +++ b/cpp/demo/Manual/simple_filesystem/.depend.mak @@ -40,6 +40,7 @@ Filesystem.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -131,6 +132,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -153,6 +155,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -260,6 +263,7 @@ FilesystemI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -281,6 +285,7 @@ FilesystemI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -375,6 +380,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -397,6 +403,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/include/Ice/.headers b/cpp/include/Ice/.headers index 5cad480ba31..47a6188f281 100644 --- a/cpp/include/Ice/.headers +++ b/cpp/include/Ice/.headers @@ -4,6 +4,8 @@ SDK_HEADERS = \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\AsyncResult.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\AsyncResultF.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\BasicStream.h \ + $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\BatchRequestInterceptor.h \ + $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\BatchRequestQueueF.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Buffer.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\BuiltinSequences.h \ $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Communicator.h \ diff --git a/cpp/include/Ice/BatchRequestInterceptor.h b/cpp/include/Ice/BatchRequestInterceptor.h new file mode 100644 index 00000000000..4c05546cdf0 --- /dev/null +++ b/cpp/include/Ice/BatchRequestInterceptor.h @@ -0,0 +1,48 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 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. +// +// ********************************************************************** + +#ifndef ICE_BATCH_REQUEST_INTERCEPTOR_H +#define ICE_BATCH_REQUEST_INTERCEPTOR_H + +#include <IceUtil/Shared.h> + +#include <Ice/ProxyF.h> +#ifdef ICE_CPP11 +# include <functional> +#endif + +namespace Ice +{ + +class BatchRequest +{ +public: + + virtual void enqueue() const = 0; + virtual int getSize() const = 0; + virtual const std::string& getOperation() const = 0; + virtual const Ice::ObjectPrx& getProxy() const = 0; +}; + +class BatchRequestInterceptor : public IceUtil::Shared +{ +public: + + virtual void enqueue(const BatchRequest&, int, int) = 0; +}; +typedef IceUtil::Handle<BatchRequestInterceptor> BatchRequestInterceptorPtr; + +#ifdef ICE_CPP11 +ICE_API BatchRequestInterceptorPtr +newBatchRequestInterceptor(const ::std::function<void (const BatchRequest&, int, int)>&); +#endif + +}; + +#endif diff --git a/cpp/include/Ice/BatchRequestQueueF.h b/cpp/include/Ice/BatchRequestQueueF.h new file mode 100644 index 00000000000..3d33a0e0dc8 --- /dev/null +++ b/cpp/include/Ice/BatchRequestQueueF.h @@ -0,0 +1,25 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 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. +// +// ********************************************************************** + +#ifndef ICE_BATCH_REQUEST_QUEUE_F_H +#define ICE_BATCH_REQUEST_QUEUE_F_H + +#include <IceUtil/Shared.h> +#include <Ice/Handle.h> + +namespace IceInternal +{ + +class BatchRequestQueue; +ICE_API IceUtil::Shared* upCast(BatchRequestQueue*); +typedef IceInternal::Handle<BatchRequestQueue> BatchRequestQueuePtr; + +} + +#endif diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h index e90d98803d2..8cbeeed2c91 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -22,6 +22,7 @@ #include <Ice/BuiltinSequences.h> #include <Ice/Version.h> #include <Ice/Plugin.h> +#include <Ice/BatchRequestInterceptor.h> namespace Ice { @@ -86,6 +87,7 @@ struct InitializationData ThreadNotificationPtr threadHook; DispatcherPtr dispatcher; CompactIdResolverPtr compactIdResolver; + BatchRequestInterceptorPtr batchRequestInterceptor; }; ICE_API CommunicatorPtr initialize(int&, char*[], const InitializationData& = InitializationData(), @@ -94,7 +96,7 @@ ICE_API CommunicatorPtr initialize(int&, char*[], const InitializationData& = In ICE_API CommunicatorPtr initialize(Ice::StringSeq&, const InitializationData& = InitializationData(), Int = ICE_INT_VERSION); -ICE_API CommunicatorPtr initialize(const InitializationData& = InitializationData(), +ICE_API CommunicatorPtr initialize(const InitializationData& = InitializationData(), Int = ICE_INT_VERSION); @@ -111,7 +113,7 @@ ICE_API InputStreamPtr createInputStream(const CommunicatorPtr&, ICE_API InputStreamPtr wrapInputStream(const CommunicatorPtr&, const ::std::pair< const Ice::Byte*, const Ice::Byte*>&); ICE_API InputStreamPtr wrapInputStream(const CommunicatorPtr&, - const ::std::pair< const Ice::Byte*, const Ice::Byte*>&, + const ::std::pair< const Ice::Byte*, const Ice::Byte*>&, const EncodingVersion&); ICE_API OutputStreamPtr createOutputStream(const CommunicatorPtr&); diff --git a/cpp/include/Ice/Outgoing.h b/cpp/include/Ice/Outgoing.h index fb469a2ca6c..62aea1f7c63 100644 --- a/cpp/include/Ice/Outgoing.h +++ b/cpp/include/Ice/Outgoing.h @@ -40,12 +40,10 @@ class ICE_API OutgoingBase : private IceUtil::noncopyable public: virtual ~OutgoingBase() { } - - virtual bool send(const Ice::ConnectionIPtr&, bool, bool) = 0; - virtual void invokeCollocated(CollocatedRequestHandler*) = 0; virtual void sent() = 0; virtual void completed(const Ice::Exception&) = 0; + virtual void completed(BasicStream&) = 0; virtual void retryException(const Ice::Exception&) = 0; BasicStream* os() { return &_os; } @@ -64,7 +62,7 @@ public: protected: - OutgoingBase(Instance*, const std::string&); + OutgoingBase(Instance*); BasicStream _os; IceUtil::UniquePtr<Ice::Exception> _exception; @@ -75,23 +73,60 @@ protected: IceUtil::Monitor<IceUtil::Mutex> _monitor; }; -class ICE_API Outgoing : public OutgoingBase +class ICE_API ProxyOutgoingBase : public OutgoingBase { public: - Outgoing(IceProxy::Ice::Object*, const std::string&, Ice::OperationMode, const Ice::Context*); - ~Outgoing(); + ProxyOutgoingBase(IceProxy::Ice::Object*, Ice::OperationMode); + ~ProxyOutgoingBase(); - virtual bool send(const Ice::ConnectionIPtr&, bool, bool); - virtual void invokeCollocated(CollocatedRequestHandler*); + virtual bool invokeRemote(const Ice::ConnectionIPtr&, bool, bool) = 0; + virtual void invokeCollocated(CollocatedRequestHandler*) = 0; virtual void sent(); virtual void completed(const Ice::Exception&); + virtual void completed(BasicStream&); virtual void retryException(const Ice::Exception&); +protected: + + bool invokeImpl(); // Returns true if ok, false if user exception. + + // + // Optimization. The request handler and the reference may not be + // deleted while a stack-allocated Outgoing still holds it. + // + IceProxy::Ice::Object* _proxy; + Ice::OperationMode _mode; + RequestHandlerPtr _handler; + IceUtil::Time _invocationTimeoutDeadline; + + enum + { + StateUnsent, + StateInProgress, + StateRetry, + StateOK, + StateUserException, + StateLocalException, + StateFailed + } _state; +}; + +class ICE_API Outgoing : public ProxyOutgoingBase +{ +public: + + Outgoing(IceProxy::Ice::Object*, const std::string&, Ice::OperationMode, const Ice::Context*); + ~Outgoing(); + + virtual bool invokeRemote(const Ice::ConnectionIPtr&, bool, bool); + virtual void invokeCollocated(CollocatedRequestHandler*); + bool invoke(); // Returns true if ok, false if user exception. void abort(const Ice::LocalException&); - void completed(BasicStream&); + + virtual void completed(BasicStream&); // Inlined for speed optimization. BasicStream* startReadParams() @@ -137,7 +172,7 @@ public: } } - bool hasResponse() + bool hasResponse() { return !_is.b.empty(); } @@ -146,49 +181,42 @@ public: private: - // - // Optimization. The request handler and the reference may not be - // deleted while a stack-allocated Outgoing still holds it. - // - IceProxy::Ice::Object* _proxy; - Ice::OperationMode _mode; - RequestHandlerPtr _handler; - IceUtil::Time _invocationTimeoutDeadline; - - enum - { - StateUnsent, - StateInProgress, - StateRetry, - StateOK, - StateUserException, - StateLocalException, - StateFailed - } _state; - Ice::EncodingVersion _encoding; BasicStream _is; + const std::string& _operation; }; -class FlushBatch : public OutgoingBase +class ProxyFlushBatch : public ProxyOutgoingBase { public: - FlushBatch(IceProxy::Ice::Object*, const std::string&); - FlushBatch(Ice::ConnectionI*, Instance*, const std::string&); - - void invoke(); + ProxyFlushBatch(IceProxy::Ice::Object*, const std::string&); - virtual bool send(const Ice::ConnectionIPtr&, bool, bool); + virtual bool invokeRemote(const Ice::ConnectionIPtr&, bool, bool); virtual void invokeCollocated(CollocatedRequestHandler*); + void invoke(); + +private: + + int _batchRequestNum; +}; + +class ConnectionFlushBatch : public OutgoingBase +{ +public: + + ConnectionFlushBatch(Ice::ConnectionI*, Instance*, const std::string&); + + void invoke(); + virtual void sent(); virtual void completed(const Ice::Exception&); + virtual void completed(BasicStream&); virtual void retryException(const Ice::Exception&); private: - IceProxy::Ice::Object* _proxy; Ice::ConnectionI* _connection; }; diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h index ed1e72f0521..440a39138fb 100644 --- a/cpp/include/Ice/OutgoingAsync.h +++ b/cpp/include/Ice/OutgoingAsync.h @@ -32,16 +32,9 @@ class ICE_API OutgoingAsyncBase : public Ice::AsyncResult { public: - // - // Those methods must be overriden if the invocation is sent - // through a request handler. - // - virtual AsyncStatus send(const Ice::ConnectionIPtr&, bool, bool) { assert(false); return AsyncStatusQueued; } - virtual AsyncStatus invokeCollocated(CollocatedRequestHandler*) { assert(false); return AsyncStatusQueued; } - virtual bool sent(); virtual bool completed(const Ice::Exception&); - virtual void retryException(const Ice::Exception&); + virtual bool completed(); // Those methods are public when called from an OutgoingAsyncBase reference. using Ice::AsyncResult::cancelable; @@ -55,7 +48,7 @@ public: const Ice::Int size = static_cast<Ice::Int>(_os.b.size() - headerSize - 4); _childObserver.attach(getObserver().getRemoteObserver(c, endpt, requestId, size)); } - + void attachCollocatedObserver(const Ice::ObjectAdapterPtr& adapter, Ice::Int requestId) { const Ice::Int size = static_cast<Ice::Int>(_os.b.size() - headerSize - 4); @@ -67,9 +60,11 @@ public: return &_os; } + virtual BasicStream* getIs(); + protected: - OutgoingAsyncBase(const Ice::CommunicatorPtr&, const InstancePtr&, const std::string&, const CallbackBasePtr&, + OutgoingAsyncBase(const Ice::CommunicatorPtr&, const InstancePtr&, const std::string&, const CallbackBasePtr&, const Ice::LocalObjectPtr&); bool sent(bool); @@ -90,11 +85,14 @@ class ICE_API ProxyOutgoingAsyncBase : public OutgoingAsyncBase, protected IceUt { public: + virtual AsyncStatus invokeRemote(const Ice::ConnectionIPtr&, bool, bool) = 0; + virtual AsyncStatus invokeCollocated(CollocatedRequestHandler*) = 0; + virtual Ice::ObjectPrx getProxy() const; using OutgoingAsyncBase::sent; virtual bool completed(const Ice::Exception&); - virtual void retryException(const Ice::Exception&); + void retryException(const Ice::Exception&); virtual void cancelable(const CancellationHandlerPtr&); void retry(); @@ -102,7 +100,7 @@ public: protected: - ProxyOutgoingAsyncBase(const Ice::ObjectPrx&, const std::string&, const CallbackBasePtr&, + ProxyOutgoingAsyncBase(const Ice::ObjectPrx&, const std::string&, const CallbackBasePtr&, const Ice::LocalObjectPtr&); void invokeImpl(bool); @@ -111,8 +109,7 @@ protected: bool finished(const Ice::Exception&); bool finished(bool); - virtual void handleRetryException(const Ice::Exception&); - virtual int handleException(const Ice::Exception&); + int handleException(const Ice::Exception&); virtual void runTimerTask(); const Ice::ObjectPrx _proxy; @@ -138,14 +135,15 @@ public: virtual bool sent(); - virtual AsyncStatus send(const Ice::ConnectionIPtr&, bool, bool); + virtual AsyncStatus invokeRemote(const Ice::ConnectionIPtr&, bool, bool); virtual AsyncStatus invokeCollocated(CollocatedRequestHandler*); + using ProxyOutgoingAsyncBase::completed; + virtual bool completed(); + void abort(const Ice::Exception&); void invoke(); - using ProxyOutgoingAsyncBase::completed; - bool completed(); BasicStream* startWriteParams(Ice::FormatType format) { @@ -172,7 +170,7 @@ public: } } - BasicStream* getIs() + virtual BasicStream* getIs() { return &_is; } @@ -185,23 +183,22 @@ private: // // Class for handling the proxy's begin_ice_flushBatchRequest request. // -class ICE_API ProxyFlushBatch : public ProxyOutgoingAsyncBase +class ICE_API ProxyFlushBatchAsync : public ProxyOutgoingAsyncBase { public: - ProxyFlushBatch(const Ice::ObjectPrx&, const std::string&, const CallbackBasePtr&, const Ice::LocalObjectPtr&); + ProxyFlushBatchAsync(const Ice::ObjectPrx&, const std::string&, const CallbackBasePtr&, const Ice::LocalObjectPtr&); - virtual AsyncStatus send(const Ice::ConnectionIPtr&, bool, bool); + virtual AsyncStatus invokeRemote(const Ice::ConnectionIPtr&, bool, bool); virtual AsyncStatus invokeCollocated(CollocatedRequestHandler*); void invoke(); private: - virtual void handleRetryException(const Ice::Exception&); - virtual int handleException(const Ice::Exception&); + int _batchRequestNum; }; -typedef IceUtil::Handle<ProxyFlushBatch> ProxyFlushBatchPtr; +typedef IceUtil::Handle<ProxyFlushBatchAsync> ProxyFlushBatchAsyncPtr; // // Class for handling the proxy's begin_ice_getConnection request. @@ -212,7 +209,7 @@ public: ProxyGetConnection(const Ice::ObjectPrx&, const std::string&, const CallbackBasePtr&, const Ice::LocalObjectPtr&); - virtual AsyncStatus send(const Ice::ConnectionIPtr&, bool, bool); + virtual AsyncStatus invokeRemote(const Ice::ConnectionIPtr&, bool, bool); virtual AsyncStatus invokeCollocated(CollocatedRequestHandler*); void invoke(); @@ -222,13 +219,13 @@ typedef IceUtil::Handle<ProxyGetConnection> ProxyGetConnectionPtr; // // Class for handling Ice::Connection::begin_flushBatchRequests // -class ICE_API ConnectionFlushBatch : public OutgoingAsyncBase +class ICE_API ConnectionFlushBatchAsync : public OutgoingAsyncBase { public: - ConnectionFlushBatch(const Ice::ConnectionIPtr&, const Ice::CommunicatorPtr&, const InstancePtr&, - const std::string&, const CallbackBasePtr&, const Ice::LocalObjectPtr&); - + ConnectionFlushBatchAsync(const Ice::ConnectionIPtr&, const Ice::CommunicatorPtr&, const InstancePtr&, + const std::string&, const CallbackBasePtr&, const Ice::LocalObjectPtr&); + virtual Ice::ConnectionPtr getConnection() const; void invoke(); @@ -237,17 +234,17 @@ private: const Ice::ConnectionIPtr _connection; }; -typedef IceUtil::Handle<ConnectionFlushBatch> ConnectionFlushBatchPtr; +typedef IceUtil::Handle<ConnectionFlushBatchAsync> ConnectionFlushBatchAsyncPtr; // // Class for handling Ice::Communicator::begin_flushBatchRequests // -class ICE_API CommunicatorFlushBatch : public Ice::AsyncResult +class ICE_API CommunicatorFlushBatchAsync : public Ice::AsyncResult { public: - CommunicatorFlushBatch(const Ice::CommunicatorPtr&, const InstancePtr&, const std::string&, - const CallbackBasePtr&, const Ice::LocalObjectPtr&); + CommunicatorFlushBatchAsync(const Ice::CommunicatorPtr&, const InstancePtr&, const std::string&, + const CallbackBasePtr&, const Ice::LocalObjectPtr&); void flushConnection(const Ice::ConnectionIPtr&); void ready(); diff --git a/cpp/include/Ice/OutgoingAsyncF.h b/cpp/include/Ice/OutgoingAsyncF.h index ef6b075b082..c889ba32c4c 100644 --- a/cpp/include/Ice/OutgoingAsyncF.h +++ b/cpp/include/Ice/OutgoingAsyncF.h @@ -29,9 +29,9 @@ class ProxyOutgoingAsyncBase; ICE_API IceUtil::Shared* upCast(ProxyOutgoingAsyncBase*); typedef IceInternal::Handle<ProxyOutgoingAsyncBase> ProxyOutgoingAsyncBasePtr; -class CommunicatorFlushBatch; -ICE_API IceUtil::Shared* upCast(CommunicatorFlushBatch*); -typedef IceInternal::Handle<CommunicatorFlushBatch> CommunicatorFlushBatchPtr; +class CommunicatorFlushBatchAsync; +ICE_API IceUtil::Shared* upCast(CommunicatorFlushBatchAsync*); +typedef IceInternal::Handle<CommunicatorFlushBatchAsync> CommunicatorFlushBatchAsyncPtr; } diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h index c0257e54a60..0d36364fcc9 100644 --- a/cpp/include/Ice/Proxy.h +++ b/cpp/include/Ice/Proxy.h @@ -21,6 +21,7 @@ #include <Ice/ObjectF.h> #include <Ice/ObjectAdapterF.h> #include <Ice/ReferenceF.h> +#include <Ice/BatchRequestQueueF.h> #include <Ice/AsyncResult.h> //#include <Ice/RouterF.h> // Can't include RouterF.h here, otherwise we have cyclic includes //#include <Ice/LocatorF.h> // Can't include RouterF.h here, otherwise we have cyclic includes @@ -844,7 +845,9 @@ public: void __end(const ::Ice::AsyncResultPtr&, const std::string&) const; ::IceInternal::RequestHandlerPtr __getRequestHandler(); - void __setRequestHandler(const ::IceInternal::RequestHandlerPtr&, const ::IceInternal::RequestHandlerPtr&); + ::IceInternal::BatchRequestQueuePtr __getBatchRequestQueue(); + ::IceInternal::RequestHandlerPtr __setRequestHandler(const ::IceInternal::RequestHandlerPtr&); + void __updateRequestHandler(const ::IceInternal::RequestHandlerPtr&, const ::IceInternal::RequestHandlerPtr&); protected: @@ -977,6 +980,7 @@ private: ::IceInternal::ReferencePtr _reference; ::IceInternal::RequestHandlerPtr _requestHandler; + ::IceInternal::BatchRequestQueuePtr _batchRequestQueue; IceUtil::Mutex _mutex; }; diff --git a/cpp/src/Freeze/.depend.mak b/cpp/src/Freeze/.depend.mak index c8ee9ff06be..35ce4156afa 100755 --- a/cpp/src/Freeze/.depend.mak +++ b/cpp/src/Freeze/.depend.mak @@ -124,6 +124,7 @@ BackgroundSaveEvictorI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -145,6 +146,7 @@ BackgroundSaveEvictorI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -281,6 +283,7 @@ Catalog.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -288,6 +291,7 @@ Catalog.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -406,6 +410,7 @@ CatalogIndexList.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -413,6 +418,7 @@ CatalogIndexList.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -517,6 +523,7 @@ ConnectionI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -538,6 +545,7 @@ ConnectionI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -654,6 +662,7 @@ EvictorI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -675,6 +684,7 @@ EvictorI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -794,6 +804,7 @@ EvictorIteratorI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -816,6 +827,7 @@ EvictorIteratorI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -943,6 +955,7 @@ Index.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -965,6 +978,7 @@ Index.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1092,6 +1106,7 @@ IndexI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1114,6 +1129,7 @@ IndexI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1247,6 +1263,7 @@ MapDb.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1268,6 +1285,7 @@ MapDb.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1378,6 +1396,7 @@ MapI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1400,6 +1419,7 @@ MapI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1515,6 +1535,7 @@ ObjectStore.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1537,6 +1558,7 @@ ObjectStore.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1667,6 +1689,7 @@ SharedDbEnv.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1689,6 +1712,7 @@ SharedDbEnv.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1821,6 +1845,7 @@ TransactionalEvictorContext.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1843,6 +1868,7 @@ TransactionalEvictorContext.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1984,6 +2010,7 @@ TransactionalEvictorI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -2005,6 +2032,7 @@ TransactionalEvictorI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -2160,6 +2188,7 @@ TransactionI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -2181,6 +2210,7 @@ TransactionI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -2285,6 +2315,7 @@ Util.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -2307,6 +2338,7 @@ Util.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -2842,6 +2874,7 @@ PingObject.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ diff --git a/cpp/src/FreezeScript/.depend.mak b/cpp/src/FreezeScript/.depend.mak index 3cee24b8da9..8c3f572f42c 100755 --- a/cpp/src/FreezeScript/.depend.mak +++ b/cpp/src/FreezeScript/.depend.mak @@ -51,6 +51,7 @@ AssignVisitor.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -73,6 +74,7 @@ AssignVisitor.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -174,6 +176,7 @@ Data.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -196,6 +199,7 @@ Data.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -295,6 +299,7 @@ Error.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -321,6 +326,7 @@ Error.obj: \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Freeze\CatalogData.h" \ Functions.obj: \ @@ -375,6 +381,7 @@ Functions.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -397,6 +404,7 @@ Functions.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -506,6 +514,7 @@ Parser.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -528,6 +537,7 @@ Parser.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -628,6 +638,7 @@ Print.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -650,6 +661,7 @@ Print.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -746,6 +758,7 @@ Util.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -772,6 +785,7 @@ Util.obj: \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Freeze\CatalogData.h" \ "Exception.h" \ "$(includedir)\Freeze\Catalog.h" \ @@ -885,6 +899,7 @@ Grammar.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -907,6 +922,7 @@ Grammar.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1008,6 +1024,7 @@ Scanner.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1030,6 +1047,7 @@ Scanner.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1127,6 +1145,7 @@ TransformAnalyzer.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1153,6 +1172,7 @@ TransformAnalyzer.obj: \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Freeze\CatalogData.h" \ TransformVisitor.obj: \ @@ -1207,6 +1227,7 @@ TransformVisitor.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1229,6 +1250,7 @@ TransformVisitor.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1330,6 +1352,7 @@ Transformer.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1352,6 +1375,7 @@ Transformer.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1471,6 +1495,7 @@ transformdb.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1493,6 +1518,7 @@ transformdb.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1612,6 +1638,7 @@ DumpDescriptors.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1634,6 +1661,7 @@ DumpDescriptors.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1742,6 +1770,7 @@ DumpDB.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1764,6 +1793,7 @@ DumpDB.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/src/Glacier2/.depend.mak b/cpp/src/Glacier2/.depend.mak index 695dbdf41ad..64d24bca609 100755 --- a/cpp/src/Glacier2/.depend.mak +++ b/cpp/src/Glacier2/.depend.mak @@ -60,6 +60,7 @@ Blobject.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -82,6 +83,7 @@ Blobject.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -191,6 +193,7 @@ ClientBlobject.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -213,6 +216,7 @@ ClientBlobject.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -311,6 +315,7 @@ FilterI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -398,6 +403,7 @@ FilterManager.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -460,6 +466,7 @@ FilterManager.obj: \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ @@ -554,6 +561,7 @@ Glacier2Router.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -576,6 +584,7 @@ Glacier2Router.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -689,6 +698,7 @@ Instance.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -711,6 +721,7 @@ Instance.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -821,6 +832,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -863,6 +875,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\MetricsFunctional.h" \ "Instrumentation.h" \ "$(includedir)\Glacier2\Metrics.h" \ @@ -929,6 +942,7 @@ ProxyVerifier.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -951,6 +965,7 @@ ProxyVerifier.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1047,6 +1062,7 @@ RequestQueue.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1069,6 +1085,7 @@ RequestQueue.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1167,6 +1184,7 @@ RouterI.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1201,6 +1219,7 @@ RouterI.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1313,6 +1332,7 @@ RoutingTable.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1335,6 +1355,7 @@ RoutingTable.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1434,6 +1455,7 @@ ServerBlobject.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1456,6 +1478,7 @@ ServerBlobject.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1565,6 +1588,7 @@ SessionRouterI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1587,6 +1611,7 @@ SessionRouterI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak index 12621e79a97..c5b11b96f0a 100755 --- a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak +++ b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak @@ -37,6 +37,7 @@ CryptPermissionsVerifierI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -91,6 +92,7 @@ CryptPermissionsVerifierI.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ diff --git a/cpp/src/Glacier2Lib/.depend.mak b/cpp/src/Glacier2Lib/.depend.mak index dcdcec2bf50..9e08907c161 100755 --- a/cpp/src/Glacier2Lib/.depend.mak +++ b/cpp/src/Glacier2Lib/.depend.mak @@ -86,6 +86,7 @@ Application.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -108,6 +109,7 @@ Application.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -203,6 +205,7 @@ NullPermissionsVerifier.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -250,6 +253,7 @@ NullPermissionsVerifier.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -332,6 +336,7 @@ SessionHelper.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -358,6 +363,7 @@ SessionHelper.obj: \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -455,6 +461,7 @@ Metrics.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -536,6 +543,7 @@ PermissionsVerifierF.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -599,6 +607,7 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -681,6 +690,7 @@ Router.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -767,6 +777,7 @@ RouterF.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -830,6 +841,7 @@ Session.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ diff --git a/cpp/src/Ice/.depend.mak b/cpp/src/Ice/.depend.mak index 4deb806f714..5252a359fc4 100755 --- a/cpp/src/Ice/.depend.mak +++ b/cpp/src/Ice/.depend.mak @@ -230,6 +230,7 @@ Acceptor.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -301,6 +302,7 @@ ACM.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ @@ -373,6 +375,7 @@ ACM.obj: \ "$(includedir)\Ice\DynamicLibraryF.h" \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -429,6 +432,7 @@ Application.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -451,6 +455,7 @@ Application.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -567,6 +572,7 @@ AsyncResult.obj: \ "$(includedir)\Ice\ConnectionIF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "EventHandler.h" \ "EventHandlerF.h" \ "Network.h" \ @@ -598,6 +604,7 @@ AsyncResult.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -681,6 +688,7 @@ BasicStream.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -719,6 +727,7 @@ BasicStream.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -745,6 +754,115 @@ BasicStream.obj: \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\SlicedData.h" \ +BatchRequestQueue.obj: \ + BatchRequestQueue.cpp \ + "BatchRequestQueue.h" \ + "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\IceUtil\Atomic.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Exception.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ + "$(includedir)\Ice\ProxyF.h" \ + "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\ProxyHandle.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ + "$(includedir)\Ice\Handle.h" \ + "$(includedir)\Ice\InstanceF.h" \ + "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\Exception.h" \ + "$(includedir)\Ice\Format.h" \ + "$(includedir)\Ice\StreamF.h" \ + "$(includedir)\Ice\LocalObject.h" \ + "$(includedir)\Ice\LocalObjectF.h" \ + "$(includedir)\Ice\StreamHelpers.h" \ + "$(includedir)\IceUtil\ScopedArray.h" \ + "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\IceUtil\Optional.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\IceUtil\UndefSysMacros.h" \ + "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\Buffer.h" \ + "$(includedir)\Ice\Protocol.h" \ + "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ + "Instance.h" \ + "$(includedir)\IceUtil\RecMutex.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\Ice\InstrumentationF.h" \ + "TraceLevelsF.h" \ + "DefaultsAndOverridesF.h" \ + "RouterInfoF.h" \ + "LocatorInfoF.h" \ + "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ProxyFactoryF.h" \ + "$(includedir)\Ice\ThreadPoolF.h" \ + "$(includedir)\Ice\ConnectionFactoryF.h" \ + "ACM.h" \ + "$(includedir)\Ice\ACMF.h" \ + "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\Proxy.h" \ + "$(includedir)\Ice\ConnectionIF.h" \ + "$(includedir)\Ice\RequestHandlerF.h" \ + "$(includedir)\Ice\EndpointF.h" \ + "$(includedir)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\AsyncResult.h" \ + "$(includedir)\Ice\AsyncResultF.h" \ + "$(includedir)\Ice\ObserverHelper.h" \ + "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ + "EndpointFactoryManagerF.h" \ + "IPEndpointIF.h" \ + "RetryQueueF.h" \ + "$(includedir)\Ice\DynamicLibraryF.h" \ + "$(includedir)\Ice\PluginF.h" \ + "NetworkF.h" \ + "NetworkProxyF.h" \ + "$(includedir)\Ice\Initialize.h" \ + "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\Plugin.h" \ + "ImplicitContextI.h" \ + "$(includedir)\Ice\ImplicitContext.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\FacetMap.h" \ + "$(includedir)\Ice\Process.h" \ + "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Incoming.h" \ + "$(includedir)\Ice\ServantLocatorF.h" \ + "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\Properties.h" \ + "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\PropertiesAdmin.h" \ + Buffer.obj: \ Buffer.cpp \ "$(includedir)\Ice\Buffer.h" \ @@ -844,6 +962,7 @@ CollocatedRequestHandler.obj: \ "$(includedir)\Ice\ProxyFactoryF.h" \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -879,6 +998,8 @@ CollocatedRequestHandler.obj: \ "Reference.h" \ "ReferenceFactoryF.h" \ "$(includedir)\Ice\RouterF.h" \ + "BatchRequestQueue.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -952,6 +1073,7 @@ CommunicatorI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -978,6 +1100,7 @@ CommunicatorI.obj: \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1034,6 +1157,7 @@ CommunicatorI.obj: \ "EndpointI.h" \ "ReferenceFactory.h" \ "Reference.h" \ + "BatchRequestQueue.h" \ "SharedContext.h" \ "ProxyFactory.h" \ "ObjectFactoryManager.h" \ @@ -1096,6 +1220,7 @@ ConnectionFactory.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -1158,6 +1283,7 @@ ConnectionFactory.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -1184,6 +1310,7 @@ ConnectionFactory.obj: \ "$(includedir)\Ice\LocatorF.h" \ "Reference.h" \ "$(includedir)\Ice\RouterF.h" \ + "BatchRequestQueue.h" \ "SharedContext.h" \ "RouterInfo.h" \ "$(includedir)\Ice\Functional.h" \ @@ -1238,6 +1365,7 @@ ConnectionI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -1299,6 +1427,7 @@ ConnectionI.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -1329,6 +1458,7 @@ ConnectionI.obj: \ "ReferenceFactory.h" \ "Reference.h" \ "$(includedir)\Ice\RouterF.h" \ + "BatchRequestQueue.h" \ "SharedContext.h" \ "ProxyFactory.h" \ @@ -1373,6 +1503,7 @@ ConnectionRequestHandler.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1403,6 +1534,8 @@ ConnectionRequestHandler.obj: \ "$(includedir)\Ice\LocatorF.h" \ "RouterInfoF.h" \ "LocatorInfoF.h" \ + "BatchRequestQueue.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1468,14 +1601,15 @@ ConnectRequestHandler.obj: \ "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ - "RequestHandler.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ + "ConnectRequestHandlerF.h" \ "$(includedir)\IceUtil\Shared.h" \ "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\Handle.h" \ "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\Ice\Config.h" \ + "RequestHandler.h" \ + "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\ReferenceF.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1504,6 +1638,7 @@ ConnectRequestHandler.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1527,6 +1662,8 @@ ConnectRequestHandler.obj: \ "$(includedir)\Ice\LocatorF.h" \ "RouterInfoF.h" \ "LocatorInfoF.h" \ + "BatchRequestQueue.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1629,6 +1766,7 @@ DefaultsAndOverrides.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1723,6 +1861,7 @@ DeprecatedStringConverter.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1745,6 +1884,7 @@ DeprecatedStringConverter.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "Instance.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "TraceLevelsF.h" \ @@ -1915,6 +2055,7 @@ EndpointFactory.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1946,6 +2087,7 @@ EndpointFactory.obj: \ "NetworkProxyF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -2046,6 +2188,7 @@ EndpointFactoryManager.obj: \ "$(includedir)\Ice\ConnectionIF.h" \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -2061,6 +2204,7 @@ EndpointFactoryManager.obj: \ "NetworkProxyF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -2173,6 +2317,7 @@ EventHandler.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -2208,6 +2353,7 @@ EventHandler.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -2265,6 +2411,7 @@ Exception.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -2572,6 +2719,7 @@ Incoming.obj: \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -2626,6 +2774,7 @@ Incoming.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Process.h" \ @@ -2708,6 +2857,7 @@ IncomingAsync.obj: \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\Endpoint.h" \ @@ -2749,6 +2899,7 @@ IncomingAsync.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -2808,6 +2959,7 @@ Initialize.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -2834,6 +2986,7 @@ Initialize.obj: \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -2938,6 +3091,7 @@ Instance.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -2972,6 +3126,7 @@ Instance.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -3001,6 +3156,7 @@ Instance.obj: \ "$(includedir)\Ice\ProcessF.h" \ "ReferenceFactory.h" \ "Reference.h" \ + "BatchRequestQueue.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ @@ -3039,6 +3195,7 @@ Instance.obj: \ "EndpointFactory.h" \ "ProtocolInstance.h" \ "RequestHandlerFactory.h" \ + "ConnectRequestHandlerF.h" \ "RetryQueue.h" \ "$(includedir)\Ice\DynamicLibrary.h" \ "PluginManagerI.h" \ @@ -3102,6 +3259,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -3144,6 +3302,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\MetricsFunctional.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -3210,6 +3369,7 @@ IPEndpointI.obj: \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ @@ -3256,6 +3416,7 @@ IPEndpointI.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -3331,6 +3492,7 @@ LocatorInfo.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ @@ -3396,6 +3558,7 @@ LocatorInfo.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -3409,6 +3572,7 @@ LocatorInfo.obj: \ "AcceptorF.h" \ "Reference.h" \ "$(includedir)\Ice\RouterF.h" \ + "BatchRequestQueue.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ @@ -3455,6 +3619,7 @@ LoggerAdminI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -3487,6 +3652,7 @@ LoggerAdminI.obj: \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -3617,6 +3783,7 @@ LoggerUtil.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -3646,6 +3813,7 @@ LoggerUtil.obj: \ "NetworkProxyF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -3696,6 +3864,7 @@ MetricsAdminI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -3738,6 +3907,7 @@ MetricsAdminI.obj: \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\Metrics.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ @@ -3827,6 +3997,7 @@ MetricsObserverI.obj: \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -3869,6 +4040,7 @@ MetricsObserverI.obj: \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\MetricsFunctional.h" \ Network.obj: \ @@ -3913,6 +4085,7 @@ Network.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -3943,18 +4116,50 @@ Network.obj: \ "$(includedir)\IceUtil\StringUtil.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Properties.h" \ + "ProtocolInstance.h" \ + "EndpointIF.h" \ + "ConnectorF.h" \ + "IPEndpointIF.h" \ + "Instance.h" \ + "$(includedir)\IceUtil\RecMutex.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\Ice\InstrumentationF.h" \ + "TraceLevelsF.h" \ + "DefaultsAndOverridesF.h" \ + "RouterInfoF.h" \ + "LocatorInfoF.h" \ + "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ThreadPoolF.h" \ + "$(includedir)\Ice\ConnectionFactoryF.h" \ + "ACM.h" \ + "$(includedir)\Ice\ACMF.h" \ + "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ + "EndpointFactoryManagerF.h" \ + "RetryQueueF.h" \ + "$(includedir)\Ice\DynamicLibraryF.h" \ + "$(includedir)\Ice\PluginF.h" \ + "$(includedir)\Ice\Initialize.h" \ + "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ + "ImplicitContextI.h" \ + "$(includedir)\Ice\ImplicitContext.h" \ + "$(includedir)\Ice\FacetMap.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\Plugin.h" \ "$(includedir)\IceUtil\Random.h" \ NetworkProxy.obj: \ @@ -3999,6 +4204,7 @@ NetworkProxy.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -4103,6 +4309,7 @@ Object.obj: \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -4155,6 +4362,7 @@ ObjectAdapterFactory.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ @@ -4245,6 +4453,7 @@ ObjectAdapterI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ @@ -4303,6 +4512,7 @@ ObjectAdapterI.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -4318,6 +4528,7 @@ ObjectAdapterI.obj: \ "ReferenceFactory.h" \ "Reference.h" \ "$(includedir)\Ice\RouterF.h" \ + "BatchRequestQueue.h" \ "SharedContext.h" \ "EndpointI.h" \ "TransceiverF.h" \ @@ -4445,6 +4656,7 @@ ObserverHelper.obj: \ "$(includedir)\Ice\ConnectionIF.h" \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -4465,6 +4677,8 @@ ObserverHelper.obj: \ "$(includedir)\Ice\LocatorF.h" \ "RouterInfoF.h" \ "LocatorInfoF.h" \ + "BatchRequestQueue.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -4578,6 +4792,7 @@ OpaqueEndpointI.obj: \ "$(includedir)\Ice\ConnectionIF.h" \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -4658,6 +4873,7 @@ Outgoing.obj: \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\Endpoint.h" \ @@ -4693,6 +4909,8 @@ Outgoing.obj: \ "$(includedir)\Ice\LocatorF.h" \ "RouterInfoF.h" \ "LocatorInfoF.h" \ + "BatchRequestQueue.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -4788,6 +5006,7 @@ OutgoingAsync.obj: \ "$(includedir)\Ice\ProxyFactoryF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\ConnectionFactoryF.h" \ @@ -4820,6 +5039,8 @@ OutgoingAsync.obj: \ "$(includedir)\Ice\LocatorF.h" \ "RouterInfoF.h" \ "LocatorInfoF.h" \ + "BatchRequestQueue.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -4898,6 +5119,7 @@ PluginManagerI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -4960,6 +5182,7 @@ PluginManagerI.obj: \ "NetworkProxyF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -5006,6 +5229,7 @@ PropertiesAdminI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -5084,6 +5308,7 @@ PropertiesI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -5128,6 +5353,7 @@ PropertiesI.obj: \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "PropertyNames.h" \ "$(includedir)\Ice\Logger.h" \ @@ -5216,6 +5442,7 @@ ProtocolInstance.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -5270,6 +5497,7 @@ ProtocolInstance.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -5351,6 +5579,7 @@ ProtocolPluginFacade.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -5384,6 +5613,7 @@ ProtocolPluginFacade.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -5438,6 +5668,7 @@ Proxy.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -5482,6 +5713,8 @@ Proxy.obj: \ "$(includedir)\Ice\LocatorF.h" \ "RouterInfoF.h" \ "LocatorInfoF.h" \ + "BatchRequestQueue.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "SharedContext.h" \ "ObjectAdapterFactory.h" \ "ObjectAdapterI.h" \ @@ -5501,7 +5734,6 @@ Proxy.obj: \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ - "RequestHandlerFactory.h" \ "EndpointI.h" \ "TransceiverF.h" \ "ConnectorF.h" \ @@ -5579,6 +5811,7 @@ ProxyFactory.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -5639,6 +5872,7 @@ ProxyFactory.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -5649,6 +5883,7 @@ ProxyFactory.obj: \ "EndpointIF.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ + "BatchRequestQueue.h" \ "SharedContext.h" \ "LocatorInfo.h" \ "RouterInfo.h" \ @@ -5699,6 +5934,7 @@ Reference.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -5725,6 +5961,8 @@ Reference.obj: \ "$(includedir)\Ice\LocatorF.h" \ "RouterInfoF.h" \ "LocatorInfoF.h" \ + "BatchRequestQueue.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -5800,6 +6038,9 @@ Reference.obj: \ "$(includedir)\Ice\Logger.h" \ "TraceLevels.h" \ "HashUtil.h" \ + "RequestHandlerFactory.h" \ + "ConnectRequestHandlerF.h" \ + "ConnectionRequestHandler.h" \ "DefaultsAndOverrides.h" \ "$(includedir)\IceUtil\StringUtil.h" \ "$(includedir)\IceUtil\Random.h" \ @@ -5842,6 +6083,7 @@ ReferenceFactory.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -5889,6 +6131,8 @@ ReferenceFactory.obj: \ "EndpointIF.h" \ "RouterInfoF.h" \ "LocatorInfoF.h" \ + "BatchRequestQueue.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "SharedContext.h" \ "ProxyFactory.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ @@ -5993,6 +6237,7 @@ RegisterPlugins.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -6019,6 +6264,7 @@ RegisterPlugins.obj: \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ RequestHandler.obj: \ RequestHandler.cpp \ @@ -6065,6 +6311,7 @@ RequestHandler.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -6090,6 +6337,8 @@ RequestHandler.obj: \ "$(includedir)\Ice\LocatorF.h" \ "RouterInfoF.h" \ "LocatorInfoF.h" \ + "BatchRequestQueue.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -6118,6 +6367,7 @@ RequestHandlerFactory.obj: \ "$(includedir)\Ice\Handle.h" \ "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\Ice\Config.h" \ + "ConnectRequestHandlerF.h" \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\ProxyHandle.h" \ "$(includedir)\Ice\ReferenceF.h" \ @@ -6173,6 +6423,7 @@ RequestHandlerFactory.obj: \ "$(includedir)\Ice\ProxyFactoryF.h" \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -6181,6 +6432,8 @@ RequestHandlerFactory.obj: \ "$(includedir)\Ice\LocatorF.h" \ "RouterInfoF.h" \ "LocatorInfoF.h" \ + "BatchRequestQueue.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -6337,6 +6590,7 @@ RetryQueue.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\LoggerF.h" \ @@ -6350,6 +6604,7 @@ RetryQueue.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -6360,6 +6615,9 @@ RetryQueue.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ + "TraceLevels.h" \ + "$(includedir)\Ice\LoggerUtil.h" \ + "$(includedir)\Ice\Logger.h" \ RouterInfo.obj: \ RouterInfo.cpp \ @@ -6401,6 +6659,7 @@ RouterInfo.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -6443,6 +6702,8 @@ RouterInfo.obj: \ "ReferenceFactoryF.h" \ "$(includedir)\Ice\LocatorF.h" \ "LocatorInfoF.h" \ + "BatchRequestQueue.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -6493,6 +6754,7 @@ Selector.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ @@ -6545,6 +6807,7 @@ Selector.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -6631,6 +6894,7 @@ ServantManager.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -6658,6 +6922,7 @@ ServantManager.obj: \ "NetworkProxyF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Process.h" \ @@ -6722,6 +6987,7 @@ Service.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -6744,6 +7010,7 @@ Service.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -6937,6 +7204,7 @@ Stream.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -7001,6 +7269,7 @@ StreamI.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -7048,6 +7317,7 @@ StreamI.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -7105,6 +7375,7 @@ StreamSocket.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -7161,6 +7432,7 @@ StreamSocket.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -7233,6 +7505,7 @@ StringConverterPlugin.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -7269,6 +7542,7 @@ StringConverterPlugin.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\Logger.h" \ @@ -7320,6 +7594,7 @@ TcpAcceptor.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -7381,6 +7656,7 @@ TcpAcceptor.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -7445,6 +7721,7 @@ TcpConnector.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -7507,6 +7784,7 @@ TcpConnector.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -7577,6 +7855,7 @@ TcpEndpointI.obj: \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ @@ -7633,6 +7912,7 @@ TcpEndpointI.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -7692,6 +7972,7 @@ TcpTransceiver.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -7745,6 +8026,7 @@ TcpTransceiver.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -7807,6 +8089,7 @@ ThreadPool.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ @@ -7860,6 +8143,7 @@ ThreadPool.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -7923,6 +8207,7 @@ TraceLevels.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -8019,6 +8304,7 @@ TraceUtil.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -8052,6 +8338,7 @@ TraceUtil.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -8111,6 +8398,7 @@ Transceiver.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -8183,6 +8471,7 @@ UdpConnector.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -8236,6 +8525,7 @@ UdpConnector.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -8311,6 +8601,7 @@ UdpEndpointI.obj: \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ @@ -8364,6 +8655,7 @@ UdpEndpointI.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -8424,6 +8716,7 @@ UdpTransceiver.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -8482,6 +8775,7 @@ UdpTransceiver.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -8548,6 +8842,7 @@ WSAcceptor.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -8601,6 +8896,7 @@ WSAcceptor.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -8666,6 +8962,7 @@ WSConnector.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -8718,6 +9015,7 @@ WSConnector.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -8795,6 +9093,7 @@ WSEndpoint.obj: \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -8840,6 +9139,7 @@ WSEndpoint.obj: \ "NetworkProxyF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -8902,6 +9202,7 @@ WSTransceiver.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -8956,6 +9257,7 @@ WSTransceiver.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -9044,6 +9346,7 @@ DLLMain.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -9062,6 +9365,7 @@ DLLMain.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -9190,6 +9494,7 @@ Communicator.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -9303,6 +9608,7 @@ Connection.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -9864,6 +10170,7 @@ Locator.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -9945,6 +10252,7 @@ LocatorF.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -10060,6 +10368,7 @@ Metrics.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -10139,6 +10448,7 @@ ObjectAdapter.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -10383,6 +10693,7 @@ Process.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -10460,6 +10771,7 @@ ProcessF.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -10523,6 +10835,7 @@ Properties.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -10602,6 +10915,7 @@ PropertiesAdmin.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -10680,6 +10994,7 @@ PropertiesF.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -10743,6 +11058,7 @@ RemoteLogger.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -10822,6 +11138,7 @@ Router.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -10899,6 +11216,7 @@ RouterF.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp new file mode 100644 index 00000000000..c34de544df7 --- /dev/null +++ b/cpp/src/Ice/BatchRequestQueue.cpp @@ -0,0 +1,227 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 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. +// +// ********************************************************************** + +#include <Ice/BatchRequestQueue.h> +#include <Ice/Instance.h> +#include <Ice/Properties.h> + +using namespace std; +using namespace IceInternal; + +IceUtil::Shared* IceInternal::upCast(BatchRequestQueue* p) { return p; } + +namespace +{ + +const int udpOverhead = 20 + 8; + +class BatchRequestI : public Ice::BatchRequest +{ +public: + + BatchRequestI(BatchRequestQueue& queue, const Ice::ObjectPrx& proxy, const string& operation, int size) : + _queue(queue), _proxy(proxy), _operation(operation), _size(size) + { + } + + virtual void + enqueue() const + { + _queue.enqueueBatchRequest(); + } + + virtual int + getSize() const + { + return _size; + } + + virtual const std::string& + getOperation() const + { + return _operation; + } + + virtual const Ice::ObjectPrx& + getProxy() const + { + return _proxy; + } + +private: + + BatchRequestQueue& _queue; + const Ice::ObjectPrx& _proxy; + const std::string& _operation; + const int _size; +}; + +} + +BatchRequestQueue::BatchRequestQueue(const InstancePtr& instance, bool datagram) : + _interceptor(instance->initializationData().batchRequestInterceptor), + _batchStream(instance.get(), Ice::currentProtocolEncoding), + _batchStreamInUse(false), + _batchStreamCanFlush(false), + _batchRequestNum(0) +{ + _batchStream.writeBlob(requestBatchHdr, sizeof(requestBatchHdr)); + _batchMarker = _batchStream.b.size(); + + _maxSize = instance->batchAutoFlushSize(); + if(_maxSize > 0 && datagram) + { + const Ice::InitializationData& initData = instance->initializationData(); + size_t udpSndSize = initData.properties->getPropertyAsIntWithDefault("Ice.UDP.SndSize", 65535 - udpOverhead); + if(udpSndSize < _maxSize) + { + _maxSize = udpSndSize; + } + } +} + +void +BatchRequestQueue::prepareBatchRequest(BasicStream* os) +{ + Lock sync(*this); + if(_exception.get()) + { + _exception->ice_throw(); + } + + waitStreamInUse(false); + _batchStreamInUse = true; + _batchStream.swap(*os); +} + +void +BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrx& proxy, const std::string& operation) +{ + // + // No need for synchronization, no other threads are supposed + // to modify the queue since we set _batchStreamInUse to true. + // + assert(_batchStreamInUse); + _batchStream.swap(*os); + + try + { + _batchStreamCanFlush = true; // Allow flush to proceed even if the stream is marked in use. + + if(_maxSize > 0 && _batchStream.b.size() >= _maxSize) + { + proxy->begin_ice_flushBatchRequests(); + } + + assert(_batchMarker < _batchStream.b.size()); + if(_interceptor) + { + BatchRequestI request(*this, proxy, operation, static_cast<int>(_batchStream.b.size() - _batchMarker)); + _interceptor->enqueue(request, _batchRequestNum, static_cast<int>(_batchMarker)); + } + else + { + _batchMarker = _batchStream.b.size(); + ++_batchRequestNum; + } + + Lock sync(*this); + _batchStream.resize(_batchMarker); + _batchStreamInUse = false; + _batchStreamCanFlush = false; + notifyAll(); + } + catch(const std::exception&) + { + Lock sync(*this); + _batchStream.resize(_batchMarker); + _batchStreamInUse = false; + _batchStreamCanFlush = false; + notifyAll(); + throw; + } +} + +void +BatchRequestQueue::abortBatchRequest(BasicStream* os) +{ + Lock sync(*this); + if(_batchStreamInUse) + { + _batchStream.swap(*os); + _batchStream.resize(_batchMarker); + _batchStreamInUse = false; + notifyAll(); + } +} + +int +BatchRequestQueue::swap(BasicStream* os) +{ + Lock sync(*this); + if(_batchRequestNum == 0) + { + return 0; + } + + waitStreamInUse(true); + + vector<Ice::Byte> lastRequest; + if(_batchMarker < _batchStream.b.size()) + { + vector<Ice::Byte>(_batchStream.b.begin() + _batchMarker, _batchStream.b.end()).swap(lastRequest); + _batchStream.b.resize(_batchMarker); + } + + int requestNum = _batchRequestNum; + _batchStream.swap(*os); + + // + // Reset the batch. + // + _batchRequestNum = 0; + _batchStream.writeBlob(requestBatchHdr, sizeof(requestBatchHdr)); + _batchMarker = _batchStream.b.size(); + if(!lastRequest.empty()) + { + _batchStream.writeBlob(&lastRequest[0], lastRequest.size()); + } + return requestNum; +} + +void +BatchRequestQueue::destroy(const Ice::LocalException& ex) +{ + Lock sync(*this); + _exception.reset(ex.ice_clone()); +} + +bool +BatchRequestQueue::isEmpty() +{ + Lock sync(*this); + return _batchStream.b.size() == sizeof(requestBatchHdr); +} + +void +BatchRequestQueue::waitStreamInUse(bool flush) +{ + while(_batchStreamInUse && !(flush && _batchStreamCanFlush)) + { + wait(); + } +} + +void +BatchRequestQueue::enqueueBatchRequest() +{ + assert(_batchMarker < _batchStream.b.size()); + _batchMarker = _batchStream.b.size(); + ++_batchRequestNum; +} diff --git a/cpp/src/Ice/BatchRequestQueue.h b/cpp/src/Ice/BatchRequestQueue.h new file mode 100644 index 00000000000..6a082af1921 --- /dev/null +++ b/cpp/src/Ice/BatchRequestQueue.h @@ -0,0 +1,59 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 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. +// +// ********************************************************************** + +#ifndef ICE_BATCH_REQUEST_QUEUE_H +#define ICE_BATCH_REQUEST_QUEUE_H + +#include <IceUtil/Shared.h> +#include <IceUtil/Mutex.h> +#include <IceUtil/Monitor.h> +#include <IceUtil/UniquePtr.h> + +#include <Ice/BatchRequestInterceptor.h> +#include <Ice/BatchRequestQueueF.h> +#include <Ice/InstanceF.h> +#include <Ice/BasicStream.h> + +namespace IceInternal +{ + +class BatchRequestQueue : public IceUtil::Shared, private IceUtil::Monitor<IceUtil::Mutex> +{ +public: + + BatchRequestQueue(const InstancePtr&, bool); + + void prepareBatchRequest(BasicStream*); + void finishBatchRequest(BasicStream*, const Ice::ObjectPrx&, const std::string&); + void abortBatchRequest(BasicStream*); + + int swap(BasicStream*); + + void destroy(const Ice::LocalException&); + bool isEmpty(); + + void enqueueBatchRequest(); + +private: + + void waitStreamInUse(bool); + + Ice::BatchRequestInterceptorPtr _interceptor; + BasicStream _batchStream; + bool _batchStreamInUse; + bool _batchStreamCanFlush; + int _batchRequestNum; + size_t _batchMarker; + IceUtil::UniquePtr<Ice::LocalException> _exception; + size_t _maxSize; +}; + +}; + +#endif diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp index 8b2e505d8d7..d2e78fcd4a9 100644 --- a/cpp/src/Ice/CollocatedRequestHandler.cpp +++ b/cpp/src/Ice/CollocatedRequestHandler.cpp @@ -29,14 +29,13 @@ namespace class InvokeAll : public DispatchWorkItem { public: - + InvokeAll(OutgoingBase* out, BasicStream* os, - CollocatedRequestHandler* handler, + CollocatedRequestHandler* handler, Int requestId, - Int invokeNum, - bool batch) : - _out(out), _os(os), _handler(handler), _requestId(requestId), _invokeNum(invokeNum), _batch(batch) + Int batchRequestNum) : + _out(out), _os(os), _handler(handler), _requestId(requestId), _batchRequestNum(batchRequestNum) { } @@ -45,31 +44,29 @@ public: { if(_handler->sent(_out)) { - _handler->invokeAll(_os, _requestId, _invokeNum, _batch); + _handler->invokeAll(_os, _requestId, _batchRequestNum); } } - + private: - + OutgoingBase* _out; BasicStream* _os; CollocatedRequestHandlerPtr _handler; Int _requestId; - Int _invokeNum; - bool _batch; + Int _batchRequestNum; }; class InvokeAllAsync : public DispatchWorkItem { public: - + InvokeAllAsync(const OutgoingAsyncBasePtr& outAsync, BasicStream* os, - CollocatedRequestHandler* handler, + CollocatedRequestHandler* handler, Int requestId, - Int invokeNum, - bool batch) : - _outAsync(outAsync), _os(os), _handler(handler), _requestId(requestId), _invokeNum(invokeNum), _batch(batch) + Int batchRequestNum) : + _outAsync(outAsync), _os(os), _handler(handler), _requestId(requestId), _batchRequestNum(batchRequestNum) { } @@ -78,46 +75,17 @@ public: { if(_handler->sentAsync(_outAsync.get())) { - _handler->invokeAll(_os, _requestId, _invokeNum, _batch); + _handler->invokeAll(_os, _requestId, _batchRequestNum); } } - + private: - + OutgoingAsyncBasePtr _outAsync; BasicStream* _os; CollocatedRequestHandlerPtr _handler; Int _requestId; - Int _invokeNum; - bool _batch; -}; - -class InvokeBatchRequests : public DispatchWorkItem -{ -public: - - InvokeBatchRequests(const CollocatedRequestHandlerPtr& handler, - BasicStream& stream, - Int invokeNum) : - _handler(handler), - _stream(stream.instance(), currentProtocolEncoding), - _invokeNum(invokeNum) - { - _stream.swap(stream); - } - - virtual void - run() - { - _handler->invokeAll(&_stream, 0, _invokeNum, true); - } - -private: - - const CollocatedRequestHandlerPtr _handler; - const OutgoingAsyncBasePtr _outAsync; - BasicStream _stream; - Int _invokeNum; + Int _batchRequestNum; }; void @@ -134,16 +102,12 @@ fillInValue(BasicStream* os, int pos, Int value) } CollocatedRequestHandler::CollocatedRequestHandler(const ReferencePtr& ref, const ObjectAdapterPtr& adapter) : - RequestHandler(ref), - _adapter(ObjectAdapterIPtr::dynamicCast(adapter)), + RequestHandler(ref), + _adapter(ObjectAdapterIPtr::dynamicCast(adapter)), _dispatcher(_reference->getInstance()->initializationData().dispatcher), _logger(_reference->getInstance()->initializationData().logger), // Cached for better performance. _traceLevels(_reference->getInstance()->traceLevels()), // Cached for better performance. - _batchAutoFlushSize(ref->getInstance()->batchAutoFlushSize()), - _requestId(0), - _batchStreamInUse(false), - _batchRequestNum(0), - _batchStream(ref->getInstance().get(), currentProtocolEncoding) + _requestId(0) { } @@ -152,124 +116,29 @@ CollocatedRequestHandler::~CollocatedRequestHandler() } RequestHandlerPtr -CollocatedRequestHandler::connect(const Ice::ObjectPrx&) -{ - return this; -} - -RequestHandlerPtr CollocatedRequestHandler::update(const RequestHandlerPtr& previousHandler, const RequestHandlerPtr& newHandler) { return previousHandler.get() == this ? newHandler : this; } -void -CollocatedRequestHandler::prepareBatchRequest(BasicStream* os) -{ - Lock sync(*this); - while(_batchStreamInUse) - { - wait(); - } - - if(_batchStream.b.empty()) - { - try - { - _batchStream.writeBlob(requestBatchHdr, sizeof(requestBatchHdr)); - } - catch(const LocalException& ex) - { - ex.ice_throw(); - } - } - - _batchStreamInUse = true; - _batchMarker = _batchStream.b.size(); - _batchStream.swap(*os); -} - -void -CollocatedRequestHandler::finishBatchRequest(BasicStream* os) -{ - try - { - Lock sync(*this); - _batchStream.swap(*os); - - if(_batchAutoFlushSize > 0 && (_batchStream.b.size() > _batchAutoFlushSize)) - { - // - // Temporarily save the last request. - // - vector<Byte> lastRequest(_batchStream.b.begin() + _batchMarker, _batchStream.b.end()); - _batchStream.b.resize(_batchMarker); - - _adapter->getThreadPool()->dispatch(new InvokeBatchRequests(this, _batchStream, _batchRequestNum)); - - // - // Reset the batch. - // - BasicStream dummy(_reference->getInstance().get(), currentProtocolEncoding); - _batchStream.swap(dummy); - _batchRequestNum = 0; - _batchMarker = 0; - - // - // Start a new batch with the last message that caused us to go over the limit. - // - _batchStream.writeBlob(requestBatchHdr, sizeof(requestBatchHdr)); - _batchStream.writeBlob(&lastRequest[0], lastRequest.size()); - } - - // - // Increment the number of requests in the batch. - // - assert(_batchStreamInUse); - ++_batchRequestNum; - _batchStreamInUse = false; - notifyAll(); - } - catch(const LocalException&) - { - abortBatchRequest(); - throw; - } -} - -void -CollocatedRequestHandler::abortBatchRequest() -{ - Lock sync(*this); - - BasicStream dummy(_reference->getInstance().get(), currentProtocolEncoding); - _batchStream.swap(dummy); - _batchRequestNum = 0; - _batchMarker = 0; - - assert(_batchStreamInUse); - _batchStreamInUse = false; - notifyAll(); -} - bool -CollocatedRequestHandler::sendRequest(OutgoingBase* out) +CollocatedRequestHandler::sendRequest(ProxyOutgoingBase* out) { out->invokeCollocated(this); return !_response && _reference->getInvocationTimeout() == 0; } AsyncStatus -CollocatedRequestHandler::sendAsyncRequest(const OutgoingAsyncBasePtr& outAsync) +CollocatedRequestHandler::sendAsyncRequest(const ProxyOutgoingAsyncBasePtr& outAsync) { return outAsync->invokeCollocated(this); } -void +void CollocatedRequestHandler::requestCanceled(OutgoingBase* out, const LocalException& ex) { Lock sync(*this); - + map<OutgoingBase*, Int>::iterator p = _sendRequests.find(out); if(p != _sendRequests.end()) { @@ -286,12 +155,12 @@ CollocatedRequestHandler::requestCanceled(OutgoingBase* out, const LocalExceptio Outgoing* o = dynamic_cast<Outgoing*>(out); if(o) { - for(map<Int, Outgoing*>::iterator q = _requests.begin(); q != _requests.end(); ++q) + for(map<Int, OutgoingBase*>::iterator q = _requests.begin(); q != _requests.end(); ++q) { if(q->second == o) { InvocationTimeoutException ex(__FILE__, __LINE__); - o->completed(ex); + q->second->completed(ex); _requests.erase(q); return; // We're done. } @@ -322,7 +191,7 @@ CollocatedRequestHandler::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAs OutgoingAsyncPtr o = OutgoingAsyncPtr::dynamicCast(outAsync); if(o) { - for(map<Int, OutgoingAsyncPtr>::iterator q = _asyncRequests.begin(); q != _asyncRequests.end(); ++q) + for(map<Int, OutgoingAsyncBasePtr>::iterator q = _asyncRequests.begin(); q != _asyncRequests.end(); ++q) { if(q->second.get() == o.get()) { @@ -338,7 +207,7 @@ CollocatedRequestHandler::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAs } void -CollocatedRequestHandler::invokeRequest(Outgoing* out) +CollocatedRequestHandler::invokeRequest(OutgoingBase* out, int batchRequestNum) { int requestId = 0; { @@ -348,29 +217,31 @@ CollocatedRequestHandler::invokeRequest(Outgoing* out) requestId = ++_requestId; _requests.insert(make_pair(requestId, out)); } + _sendRequests.insert(make_pair(out, requestId)); - } + } out->attachCollocatedObserver(_adapter, requestId); if(_reference->getInvocationTimeout() > 0) { // Don't invoke from the user thread, invocation timeouts wouldn't work otherwise. - _adapter->getThreadPool()->dispatch(new InvokeAll(out, out->os(), this, requestId, 1, false)); + _adapter->getThreadPool()->dispatch(new InvokeAll(out, out->os(), this, requestId, batchRequestNum)); } else if(_dispatcher) { - _adapter->getThreadPool()->dispatchFromThisThread(new InvokeAll(out, out->os(), this, requestId, 1, false)); + _adapter->getThreadPool()->dispatchFromThisThread(new InvokeAll(out, out->os(), this, requestId, + batchRequestNum)); } else // Optimization: directly call invokeAll if there's no dispatcher. { out->sent(); - invokeAll(out->os(), requestId, 1, false); + invokeAll(out->os(), requestId, batchRequestNum); } } AsyncStatus -CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsync* outAsync) +CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsyncBase* outAsync, int batchRequestNum) { int requestId = 0; { @@ -383,125 +254,25 @@ CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsync* outAsync) requestId = ++_requestId; _asyncRequests.insert(make_pair(requestId, outAsync)); } + _sendAsyncRequests.insert(make_pair(outAsync, requestId)); } outAsync->attachCollocatedObserver(_adapter, requestId); - _adapter->getThreadPool()->dispatch(new InvokeAllAsync(outAsync, outAsync->getOs(), this, requestId, 1, false)); + _adapter->getThreadPool()->dispatch(new InvokeAllAsync(outAsync, outAsync->getOs(), this, requestId, + batchRequestNum)); return AsyncStatusQueued; } void -CollocatedRequestHandler::invokeBatchRequests(OutgoingBase* out) -{ - Int invokeNum; - { - Lock sync(*this); - while(_batchStreamInUse) - { - wait(); - } - - invokeNum = _batchRequestNum; - - if(_batchRequestNum > 0) - { - _sendRequests.insert(make_pair(out, 0)); - - assert(!_batchStream.b.empty()); - _batchStream.swap(*out->os()); - - // - // Reset the batch stream. - // - BasicStream dummy(_reference->getInstance().get(), currentProtocolEncoding); - _batchStream.swap(dummy); - _batchRequestNum = 0; - _batchMarker = 0; - } - } - - out->attachCollocatedObserver(_adapter, 0); - - if(invokeNum > 0) - { - if(_reference->getInvocationTimeout() > 0) - { - _adapter->getThreadPool()->dispatch(new InvokeAll(out, out->os(), this, 0, invokeNum, true)); - } - else if(_dispatcher) - { - _adapter->getThreadPool()->dispatchFromThisThread(new InvokeAll(out, out->os(), this, 0, invokeNum, true)); - } - else // Optimization: directly call invokeAll if there's no dispatcher. - { - out->sent(); - invokeAll(out->os(), 0, invokeNum, true); // Invoke from the user thread. - } - } - else - { - out->sent(); - } -} - -AsyncStatus -CollocatedRequestHandler::invokeAsyncBatchRequests(OutgoingAsyncBase* outAsync) -{ - Int invokeNum; - { - Lock sync(*this); - while(_batchStreamInUse) - { - wait(); - } - - invokeNum = _batchRequestNum; - if(_batchRequestNum > 0) - { - outAsync->cancelable(this); // This will throw if the request is canceled - - _sendAsyncRequests.insert(make_pair(outAsync, 0)); - - assert(!_batchStream.b.empty()); - _batchStream.swap(*outAsync->getOs()); - - // - // Reset the batch stream. - // - BasicStream dummy(_reference->getInstance().get(), currentProtocolEncoding); - _batchStream.swap(dummy); - _batchRequestNum = 0; - _batchMarker = 0; - } - } - - outAsync->attachCollocatedObserver(_adapter, 0); - - if(invokeNum > 0) - { - _adapter->getThreadPool()->dispatch(new InvokeAllAsync(outAsync, outAsync->getOs(), this, 0, invokeNum,true)); - return AsyncStatusQueued; - } - else if(outAsync->sent()) - { - return static_cast<AsyncStatus>(AsyncStatusSent | AsyncStatusInvokeSentCallback); - } - else - { - return AsyncStatusSent; - } -} - -void CollocatedRequestHandler::sendResponse(Int requestId, BasicStream* os, Byte, bool amd) { - OutgoingAsyncPtr outAsync; + OutgoingAsyncBasePtr outAsync; { Lock sync(*this); assert(_response); - + os->i = os->b.begin() + sizeof(replyHdr) + 4; if(_traceLevels->protocol >= 1) @@ -510,7 +281,7 @@ CollocatedRequestHandler::sendResponse(Int requestId, BasicStream* os, Byte, boo traceRecv(*os, _logger, _traceLevels); } - map<int, Outgoing*>::iterator p = _requests.find(requestId); + map<int, OutgoingBase*>::iterator p = _requests.find(requestId); if(p != _requests.end()) { p->second->completed(*os); @@ -518,7 +289,7 @@ CollocatedRequestHandler::sendResponse(Int requestId, BasicStream* os, Byte, boo } else { - map<int, OutgoingAsyncPtr>::iterator q = _asyncRequests.find(requestId); + map<int, OutgoingAsyncBasePtr>::iterator q = _asyncRequests.find(requestId); if(q != _asyncRequests.end()) { os->swap(*q->second->getIs()); @@ -565,7 +336,7 @@ CollocatedRequestHandler::systemException(Int requestId, const SystemException& return true; } -void +void CollocatedRequestHandler::invokeException(Int requestId, const LocalException& ex, int invokeNum, bool amd) { handleException(requestId, ex, amd); @@ -616,9 +387,9 @@ CollocatedRequestHandler::sentAsync(OutgoingAsyncBase* outAsync) } void -CollocatedRequestHandler::invokeAll(BasicStream* os, Int requestId, Int invokeNum, bool batch) +CollocatedRequestHandler::invokeAll(BasicStream* os, Int requestId, Int batchRequestNum) { - if(batch) + if(batchRequestNum > 0) { os->i = os->b.begin() + sizeof(requestBatchHdr); } @@ -634,18 +405,19 @@ CollocatedRequestHandler::invokeAll(BasicStream* os, Int requestId, Int invokeNu { fillInValue(os, headerSize, requestId); } - else if(batch) + else if(batchRequestNum > 0) { - fillInValue(os, headerSize, invokeNum); + fillInValue(os, headerSize, batchRequestNum); } traceSend(*os, _logger, _traceLevels); } + int invokeNum = batchRequestNum > 0 ? batchRequestNum : 1; ServantManagerPtr servantManager = _adapter->getServantManager(); try { while(invokeNum > 0) - { + { try { _adapter->incDirectCount(); @@ -675,11 +447,11 @@ CollocatedRequestHandler::handleException(int requestId, const Exception& ex, bo return; // Ignore exception for oneway messages. } - OutgoingAsyncPtr outAsync; + OutgoingAsyncBasePtr outAsync; { Lock sync(*this); - - map<int, Outgoing*>::iterator p = _requests.find(requestId); + + map<int, OutgoingBase*>::iterator p = _requests.find(requestId); if(p != _requests.end()) { p->second->completed(ex); @@ -687,7 +459,7 @@ CollocatedRequestHandler::handleException(int requestId, const Exception& ex, bo } else { - map<int, OutgoingAsyncPtr>::iterator q = _asyncRequests.find(requestId); + map<int, OutgoingAsyncBasePtr>::iterator q = _asyncRequests.find(requestId); if(q != _asyncRequests.end()) { if(q->second->completed(ex)) diff --git a/cpp/src/Ice/CollocatedRequestHandler.h b/cpp/src/Ice/CollocatedRequestHandler.h index 751e8f24e7d..248984ed647 100644 --- a/cpp/src/Ice/CollocatedRequestHandler.h +++ b/cpp/src/Ice/CollocatedRequestHandler.h @@ -43,15 +43,10 @@ public: CollocatedRequestHandler(const ReferencePtr&, const Ice::ObjectAdapterPtr&); virtual ~CollocatedRequestHandler(); - virtual RequestHandlerPtr connect(const Ice::ObjectPrx&); virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&); - virtual void prepareBatchRequest(BasicStream*); - virtual void finishBatchRequest(BasicStream*); - virtual void abortBatchRequest(); - - virtual bool sendRequest(OutgoingBase*); - virtual AsyncStatus sendAsyncRequest(const OutgoingAsyncBasePtr&); + virtual bool sendRequest(ProxyOutgoingBase*); + virtual AsyncStatus sendAsyncRequest(const ProxyOutgoingAsyncBasePtr&); virtual void requestCanceled(OutgoingBase*, const Ice::LocalException&); virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, const Ice::LocalException&); @@ -66,15 +61,13 @@ public: virtual Ice::ConnectionIPtr getConnection(); virtual Ice::ConnectionIPtr waitForConnection(); - void invokeRequest(Outgoing*); - AsyncStatus invokeAsyncRequest(OutgoingAsync*); - void invokeBatchRequests(OutgoingBase*); - AsyncStatus invokeAsyncBatchRequests(OutgoingAsyncBase*); + void invokeRequest(OutgoingBase*, int); + AsyncStatus invokeAsyncRequest(OutgoingAsyncBase*, int); bool sent(OutgoingBase*); bool sentAsync(OutgoingAsyncBase*); - void invokeAll(BasicStream*, Ice::Int, Ice::Int, bool); + void invokeAll(BasicStream*, Ice::Int, Ice::Int); private: @@ -84,20 +77,14 @@ private: const bool _dispatcher; const Ice::LoggerPtr _logger; const TraceLevelsPtr _traceLevels; - const size_t _batchAutoFlushSize; int _requestId; std::map<OutgoingBase*, Ice::Int> _sendRequests; std::map<OutgoingAsyncBasePtr, Ice::Int> _sendAsyncRequests; - std::map<Ice::Int, Outgoing*> _requests; - std::map<Ice::Int, OutgoingAsyncPtr> _asyncRequests; - - bool _batchStreamInUse; - int _batchRequestNum; - BasicStream _batchStream; - size_t _batchMarker; + std::map<Ice::Int, OutgoingBase*> _requests; + std::map<Ice::Int, OutgoingAsyncBasePtr> _asyncRequests; }; typedef IceUtil::Handle<CollocatedRequestHandler> CollocatedRequestHandlerPtr; diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp index 018e743233a..6ddd5544c91 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -279,11 +279,11 @@ Ice::CommunicatorI::__begin_flushBatchRequests(const IceInternal::CallbackBasePt // This callback object receives the results of all invocations // of Connection::begin_flushBatchRequests. // - CommunicatorFlushBatchPtr result = new CommunicatorFlushBatch(this, - _instance, - __flushBatchRequests_name, - cb, - cookie); + CommunicatorFlushBatchAsyncPtr result = new CommunicatorFlushBatchAsync(this, + _instance, + __flushBatchRequests_name, + cb, + cookie); connectionFactory->flushAsyncBatchRequests(result); adapterFactory->flushAsyncBatchRequests(result); diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp index fce13d5e88a..993cb065c23 100644 --- a/cpp/src/Ice/ConnectRequestHandler.cpp +++ b/cpp/src/Ice/ConnectRequestHandler.cpp @@ -23,14 +23,13 @@ using namespace std; using namespace IceInternal; +IceUtil::Shared* IceInternal::upCast(ConnectRequestHandler* p) { return p; } + ConnectRequestHandler::ConnectRequestHandler(const ReferencePtr& ref, const Ice::ObjectPrx& proxy) : RequestHandler(ref), - _connect(true), _proxy(proxy), _initialized(false), - _flushing(false), - _batchRequestInProgress(false), - _batchStream(ref->getInstance().get(), Ice::currentProtocolEncoding) + _flushing(false) { } @@ -41,39 +40,27 @@ ConnectRequestHandler::~ConnectRequestHandler() RequestHandlerPtr ConnectRequestHandler::connect(const Ice::ObjectPrx& proxy) { - // - // Initiate the connection if connect() is called by the proxy that - // created the handler. - // - if(proxy.get() == _proxy.get() && _connect) - { - _connect = false; // Call getConnection only once - _reference->getConnection(this); - } - + Lock sync(*this); try { - Lock sync(*this); if(!initialized()) { _proxies.insert(proxy); - return this; } } catch(const Ice::LocalException&) { - throw; - } - - if(_connectionRequestHandler) - { - proxy->__setRequestHandler(this, _connectionRequestHandler); - return _connectionRequestHandler; - } - else - { - return this; + // + // Only throw if the connection didn't get established. If + // it died after being established, we allow the caller to + // retry the connection establishment by not throwing here. + // + if(!_connection) + { + throw; + } } + return _requestHandler ? _requestHandler : this; } RequestHandlerPtr @@ -82,70 +69,8 @@ ConnectRequestHandler::update(const RequestHandlerPtr& previousHandler, const Re return previousHandler.get() == this ? newHandler : this; } -void -ConnectRequestHandler::prepareBatchRequest(BasicStream* os) -{ - { - Lock sync(*this); - while(_batchRequestInProgress) - { - wait(); - } - - if(!initialized()) - { - _batchRequestInProgress = true; - _batchStream.swap(*os); - return; - } - } - _connection->prepareBatchRequest(os); -} - -void -ConnectRequestHandler::finishBatchRequest(BasicStream* os) -{ - { - Lock sync(*this); - if(!initialized()) // This can't throw until _batchRequestInProgress = false - { - assert(_batchRequestInProgress); - _batchRequestInProgress = false; - notifyAll(); - - _batchStream.swap(*os); - - Request req; - req.os = new BasicStream(_reference->getInstance().get(), Ice::currentProtocolEncoding); - req.os->swap(_batchStream); - _requests.push_back(req); - return; - } - } - _connection->finishBatchRequest(os, _compress); -} - -void -ConnectRequestHandler::abortBatchRequest() -{ - { - Lock sync(*this); - if(!initialized()) // This can't throw until _batchRequestInProgress = false - { - assert(_batchRequestInProgress); - _batchRequestInProgress = false; - notifyAll(); - - BasicStream dummy(_reference->getInstance().get(), Ice::currentProtocolEncoding); - _batchStream.swap(dummy); - return; - } - } - _connection->abortBatchRequest(); -} - bool -ConnectRequestHandler::sendRequest(OutgoingBase* out) +ConnectRequestHandler::sendRequest(ProxyOutgoingBase* out) { { Lock sync(*this); @@ -164,11 +89,11 @@ ConnectRequestHandler::sendRequest(OutgoingBase* out) throw RetryException(ex); } } - return out->send(_connection, _compress, _response) && !_response; // Finished if sent and no response. + return out->invokeRemote(_connection, _compress, _response) && !_response; // Finished if sent and no response. } AsyncStatus -ConnectRequestHandler::sendAsyncRequest(const OutgoingAsyncBasePtr& out) +ConnectRequestHandler::sendAsyncRequest(const ProxyOutgoingAsyncBasePtr& out) { { Lock sync(*this); @@ -192,7 +117,7 @@ ConnectRequestHandler::sendAsyncRequest(const OutgoingAsyncBasePtr& out) throw RetryException(ex); } } - return out->send(_connection, _compress, _response); + return out->invokeRemote(_connection, _compress, _response); } void @@ -350,18 +275,13 @@ ConnectRequestHandler::setException(const Ice::LocalException& ex) { p->out->completed(*_exception.get()); } - else if(p->outAsync) + else { if(p->outAsync->completed(*_exception.get())) { p->outAsync->invokeCompletedAsync(); } } - else - { - assert(p->os); - delete p->os; - } } _requests.clear(); notifyAll(); @@ -413,11 +333,6 @@ ConnectRequestHandler::flushRequests() Lock sync(*this); assert(_connection && !_initialized); - while(_batchRequestInProgress) - { - wait(); - } - // // We set the _flushing flag to true to prevent any additional queuing. Callers // might block for a little while as the queued requests are being sent but this @@ -434,29 +349,9 @@ ConnectRequestHandler::flushRequests() { if(req.out) { - req.out->send(_connection, _compress, _response); - } - else if(req.os) - { - BasicStream os(req.os->instance(), Ice::currentProtocolEncoding); - _connection->prepareBatchRequest(&os); - try - { - const Ice::Byte* bytes; - req.os->i = req.os->b.begin(); - req.os->readBlob(bytes, req.os->b.size()); - os.writeBlob(bytes, req.os->b.size()); - } - catch(const Ice::LocalException&) - { - _connection->abortBatchRequest(); - throw; - } - - _connection->finishBatchRequest(&os, _compress); - delete req.os; + req.out->invokeRemote(_connection, _compress, _response); } - else if(req.outAsync->send(_connection, _compress, _response) & AsyncStatusInvokeSentCallback) + else if(req.outAsync->invokeRemote(_connection, _compress, _response) & AsyncStatusInvokeSentCallback) { req.outAsync->invokeSentAsync(); } @@ -464,24 +359,14 @@ ConnectRequestHandler::flushRequests() catch(const RetryException& ex) { exception.reset(ex.get()->ice_clone()); - try - { - // Remove the request handler before retrying. - _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, this); - } - catch(const Ice::CommunicatorDestroyedException&) - { - // Ignore - } + + // Remove the request handler before retrying. + _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, this); if(req.out) { req.out->retryException(*ex.get()); } - else if(req.os) - { - delete req.os; - } else { req.outAsync->retryException(*ex.get()); @@ -494,10 +379,6 @@ ConnectRequestHandler::flushRequests() { req.out->completed(ex); } - else if(req.os) - { - delete req.os; - } else if(req.outAsync->completed(ex)) { req.outAsync->invokeCompletedAsync(); @@ -514,10 +395,10 @@ ConnectRequestHandler::flushRequests() // if(_reference->getCacheConnection() && !exception.get()) { - _connectionRequestHandler = new ConnectionRequestHandler(_reference, _connection, _compress); + _requestHandler = new ConnectionRequestHandler(_reference, _connection, _compress); for(set<Ice::ObjectPrx>::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p) { - (*p)->__setRequestHandler(this, _connectionRequestHandler); + (*p)->__updateRequestHandler(this, _requestHandler); } } @@ -527,18 +408,13 @@ ConnectRequestHandler::flushRequests() _exception.swap(exception); _initialized = !_exception.get(); _flushing = false; - try - { - // - // Only remove once all the requests are flushed to - // guarantee serialization. - // - _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, this); - } - catch(const Ice::CommunicatorDestroyedException&) - { - // Ignore - } + + // + // Only remove once all the requests are flushed to + // guarantee serialization. + // + _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, this); + _proxies.clear(); _proxy = 0; // Break cyclic reference count. notifyAll(); diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h index 75686fd4bb7..fc202d1c893 100644 --- a/cpp/src/Ice/ConnectRequestHandler.h +++ b/cpp/src/Ice/ConnectRequestHandler.h @@ -12,15 +12,15 @@ #include <IceUtil/Monitor.h> #include <IceUtil/Mutex.h> +#include <IceUtil/UniquePtr.h> +#include <Ice/ConnectRequestHandlerF.h> #include <Ice/RequestHandler.h> #include <Ice/Reference.h> #include <Ice/RouterInfo.h> #include <Ice/ProxyF.h> #include <Ice/BasicStream.h> -#include <IceUtil/UniquePtr.h> - #include <deque> #include <set> @@ -37,15 +37,11 @@ public: ConnectRequestHandler(const ReferencePtr&, const Ice::ObjectPrx&); virtual ~ConnectRequestHandler(); - virtual RequestHandlerPtr connect(const Ice::ObjectPrx&); + RequestHandlerPtr connect(const Ice::ObjectPrx&); virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&); - virtual void prepareBatchRequest(BasicStream*); - virtual void finishBatchRequest(BasicStream*); - virtual void abortBatchRequest(); - - virtual bool sendRequest(OutgoingBase*); - virtual AsyncStatus sendAsyncRequest(const OutgoingAsyncBasePtr&); + virtual bool sendRequest(ProxyOutgoingBase*); + virtual AsyncStatus sendAsyncRequest(const ProxyOutgoingAsyncBasePtr&); virtual void requestCanceled(OutgoingBase*, const Ice::LocalException&); virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, const Ice::LocalException&); @@ -65,16 +61,14 @@ private: struct Request { - Request() : out(0), os(0) + Request() : out(0) { } - OutgoingBase* out; - OutgoingAsyncBasePtr outAsync; - BasicStream* os; + ProxyOutgoingBase* out; + ProxyOutgoingAsyncBasePtr outAsync; }; - bool _connect; Ice::ObjectPrx _proxy; std::set<Ice::ObjectPrx> _proxies; @@ -85,12 +79,9 @@ private: bool _flushing; std::deque<Request> _requests; - bool _batchRequestInProgress; - BasicStream _batchStream; - RequestHandlerPtr _connectionRequestHandler; + RequestHandlerPtr _requestHandler; }; -typedef IceUtil::Handle<ConnectRequestHandler> ConnectRequestHandlerPtr; } diff --git a/cpp/src/Ice/ConnectRequestHandlerF.h b/cpp/src/Ice/ConnectRequestHandlerF.h new file mode 100644 index 00000000000..f60cdaa1804 --- /dev/null +++ b/cpp/src/Ice/ConnectRequestHandlerF.h @@ -0,0 +1,25 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 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. +// +// ********************************************************************** + +#ifndef ICE_CONNECT_REQUEST_HANDLER_F_H +#define ICE_CONNECT_REQUEST_HANDLER_F_H + +#include <IceUtil/Shared.h> +#include <Ice/Handle.h> + +namespace IceInternal +{ + +class ConnectRequestHandler; +ICE_API IceUtil::Shared* upCast(ConnectRequestHandler*); +typedef IceInternal::Handle<ConnectRequestHandler> ConnectRequestHandlerPtr; + +} + +#endif diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp index 730211c6aac..cfcef92d9bc 100644 --- a/cpp/src/Ice/ConnectionFactory.cpp +++ b/cpp/src/Ice/ConnectionFactory.cpp @@ -266,7 +266,7 @@ IceInternal::OutgoingConnectionFactory::removeAdapter(const ObjectAdapterPtr& ad } void -IceInternal::OutgoingConnectionFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchPtr& outAsync) +IceInternal::OutgoingConnectionFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync) { list<ConnectionIPtr> c; @@ -1191,7 +1191,7 @@ IceInternal::IncomingConnectionFactory::connections() const } void -IceInternal::IncomingConnectionFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchPtr& outAsync) +IceInternal::IncomingConnectionFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync) { list<ConnectionIPtr> c = connections(); // connections() is synchronized, so no need to synchronize here. @@ -1556,10 +1556,10 @@ IceInternal::IncomingConnectionFactory::setState(State state) if(_acceptor) { // - // If possible, close the acceptor now to prevent new connections from + // If possible, close the acceptor now to prevent new connections from // being accepted while we are deactivating. This is especially useful // if there are no more threads in the thread pool available to dispatch - // the finish() call. Not all selector implementations do support this + // the finish() call. Not all selector implementations do support this // however. // if(_adapter->getThreadPool()->finish(this, true)) @@ -1640,4 +1640,3 @@ IceInternal::IncomingConnectionFactory::closeAcceptor() _acceptor->close(); } - diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h index 64c8d130f4e..b6429b80e7f 100644 --- a/cpp/src/Ice/ConnectionFactory.h +++ b/cpp/src/Ice/ConnectionFactory.h @@ -66,7 +66,7 @@ public: const CreateConnectionCallbackPtr&); void setRouterInfo(const RouterInfoPtr&); void removeAdapter(const Ice::ObjectAdapterPtr&); - void flushAsyncBatchRequests(const CommunicatorFlushBatchPtr&); + void flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr&); private: @@ -177,7 +177,7 @@ public: EndpointIPtr endpoint() const; std::list<Ice::ConnectionIPtr> connections() const; - void flushAsyncBatchRequests(const CommunicatorFlushBatchPtr&); + void flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr&); // // Operations from EventHandler diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index 1c22af06bb8..734e9c48695 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -27,6 +27,7 @@ #include <Ice/RequestHandler.h> // For RetryException #include <Ice/ReferenceFactory.h> // For createProxy(). #include <Ice/ProxyFactory.h> // For createProxy(). +#include <Ice/BatchRequestQueue.h> #ifdef ICE_HAS_BZIP2 # include <bzlib.h> @@ -71,7 +72,7 @@ public: DispatchCall(const ConnectionIPtr& connection, const ConnectionI::StartCallbackPtr& startCB, const vector<ConnectionI::OutgoingMessage>& sentCBs, Byte compress, Int requestId, Int invokeNum, const ServantManagerPtr& servantManager, const ObjectAdapterPtr& adapter, - const OutgoingAsyncPtr& outAsync, const ConnectionCallbackPtr& heartbeatCallback, + const OutgoingAsyncBasePtr& outAsync, const ConnectionCallbackPtr& heartbeatCallback, BasicStream& stream) : DispatchWorkItem(connection), _connection(connection), @@ -106,7 +107,7 @@ private: const Int _invokeNum; const ServantManagerPtr _servantManager; const ObjectAdapterPtr _adapter; - const OutgoingAsyncPtr _outAsync; + const OutgoingAsyncBasePtr _outAsync; const ConnectionCallbackPtr _heartbeatCallback; BasicStream _stream; }; @@ -597,7 +598,7 @@ Ice::ConnectionI::monitor(const IceUtil::Time& now, const ACMConfig& acm) setState(StateClosed, ConnectionTimeoutException(__FILE__, __LINE__)); } else if(acm.close != CloseOnInvocation && - _dispatchCount == 0 && _batchStream.b.empty() && _requests.empty() && _asyncRequests.empty()) + _dispatchCount == 0 && _batchRequestQueue->isEmpty() && _requests.empty() && _asyncRequests.empty()) { // // The connection is idle, close it. @@ -608,7 +609,7 @@ Ice::ConnectionI::monitor(const IceUtil::Time& now, const ACMConfig& acm) } bool -Ice::ConnectionI::sendRequest(Outgoing* out, bool compress, bool response) +Ice::ConnectionI::sendRequest(OutgoingBase* out, bool compress, bool response, int batchRequestNum) { BasicStream* os = out->os(); @@ -655,6 +656,15 @@ Ice::ConnectionI::sendRequest(Outgoing* out, bool compress, bool response) copy(p, p + sizeof(Int), os->b.begin() + headerSize); #endif } + else if(batchRequestNum > 0) + { + const Byte* p = reinterpret_cast<const Byte*>(&batchRequestNum); +#ifdef ICE_BIG_ENDIAN + reverse_copy(p, p + sizeof(Int), os->b.begin() + headerSize); +#else + copy(p, p + sizeof(Int), os->b.begin() + headerSize); +#endif + } out->attachRemoteObserver(initConnectionInfo(), _endpoint, requestId); @@ -680,14 +690,14 @@ Ice::ConnectionI::sendRequest(Outgoing* out, bool compress, bool response) // // Add to the requests map. // - _requestsHint = _requests.insert(_requests.end(), pair<const Int, Outgoing*>(requestId, out)); + _requestsHint = _requests.insert(_requests.end(), pair<const Int, OutgoingBase*>(requestId, out)); } return sent; } AsyncStatus -Ice::ConnectionI::sendAsyncRequest(const OutgoingAsyncPtr& out, bool compress, bool response) +Ice::ConnectionI::sendAsyncRequest(const OutgoingAsyncBasePtr& out, bool compress, bool response, int batchRequestNum) { BasicStream* os = out->getOs(); @@ -740,6 +750,15 @@ Ice::ConnectionI::sendAsyncRequest(const OutgoingAsyncPtr& out, bool compress, b copy(p, p + sizeof(Int), os->b.begin() + headerSize); #endif } + else if(batchRequestNum > 0) + { + const Byte* p = reinterpret_cast<const Byte*>(&batchRequestNum); +#ifdef ICE_BIG_ENDIAN + reverse_copy(p, p + sizeof(Int), os->b.begin() + headerSize); +#else + copy(p, p + sizeof(Int), os->b.begin() + headerSize); +#endif + } out->attachRemoteObserver(initConnectionInfo(), _endpoint, requestId); @@ -762,211 +781,21 @@ Ice::ConnectionI::sendAsyncRequest(const OutgoingAsyncPtr& out, bool compress, b // Add to the async requests map. // _asyncRequestsHint = _asyncRequests.insert(_asyncRequests.end(), - pair<const Int, OutgoingAsyncPtr>(requestId, out)); + pair<const Int, OutgoingAsyncBasePtr>(requestId, out)); } return status; } -void -Ice::ConnectionI::prepareBatchRequest(BasicStream* os) -{ - IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); - - // - // Wait if flushing is currently in progress. - // - while(_batchStreamInUse && !_exception.get()) - { - wait(); - } - - if(_exception.get()) - { - // - // If there were no batch requests queued when the connection failed, we can safely - // retry with a new connection. Otherwise, we must throw to notify the caller that - // some previous batch requests were not sent. - // - if(_batchStream.b.empty()) - { - throw RetryException(*_exception.get()); - } - else - { - _exception->ice_throw(); - } - } - - assert(_state > StateNotValidated); - assert(_state < StateClosing); - - if(_batchStream.b.empty()) - { - try - { - _batchStream.writeBlob(requestBatchHdr, sizeof(requestBatchHdr)); - } - catch(const LocalException& ex) - { - setState(StateClosed, ex); - ex.ice_throw(); - } - } - - _batchStreamInUse = true; - _batchMarker = _batchStream.b.size(); - _batchStream.swap(*os); - - // - // The batch stream now belongs to the caller, until - // finishBatchRequest() or abortBatchRequest() is called. - // -} - -void -Ice::ConnectionI::finishBatchRequest(BasicStream* os, bool compress) -{ - try - { - IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); - - // - // Get the batch stream back. - // - _batchStream.swap(*os); - - if(_exception.get()) - { - return; - } - - bool flush = false; - if(_batchAutoFlushSize > 0) - { - if(_batchStream.b.size() > _batchAutoFlushSize) - { - flush = true; - } - - // - // Throw memory limit exception if the first message added causes us to - // go over limit. Otherwise put aside the marshalled message that caused - // limit to be exceeded and rollback stream to the marker. - // - try - { - _transceiver->checkSendSize(_batchStream); - } - catch(const Ice::Exception&) - { - if(_batchRequestNum > 0) - { - flush = true; - } - else - { - throw; - } - } - } - - if(flush) - { - // - // Temporarily save the last request. - // - vector<Ice::Byte> lastRequest(_batchStream.b.begin() + _batchMarker, _batchStream.b.end()); - _batchStream.b.resize(_batchMarker); - - // - // Send the batch stream without the last request. - // - try - { - // - // Fill in the number of requests in the batch. - // - const Byte* p = reinterpret_cast<const Byte*>(&_batchRequestNum); -#ifdef ICE_BIG_ENDIAN - reverse_copy(p, p + sizeof(Int), _batchStream.b.begin() + headerSize); -#else - copy(p, p + sizeof(Int), _batchStream.b.begin() + headerSize); -#endif - - OutgoingMessage message(&_batchStream, _batchRequestCompress); - sendMessage(message); - } - catch(const Ice::LocalException& ex) - { - setState(StateClosed, ex); - assert(_exception.get()); - _exception->ice_throw(); - } - - // - // Reset the batch. - // - BasicStream dummy(_instance.get(), currentProtocolEncoding); - _batchStream.swap(dummy); - _batchRequestNum = 0; - _batchRequestCompress = false; - _batchMarker = 0; - - // - // Start a new batch with the last message that caused us to go over the limit. - // - _batchStream.writeBlob(requestBatchHdr, sizeof(requestBatchHdr)); - _batchStream.writeBlob(&lastRequest[0], lastRequest.size()); - } - - // - // Increment the number of requests in the batch. - // - ++_batchRequestNum; - - // - // We compress the whole batch if there is at least one compressed - // message. - // - if(compress) - { - _batchRequestCompress = true; - } - - // - // Notify about the batch stream not being in use anymore. - // - assert(_batchStreamInUse); - _batchStreamInUse = false; - notifyAll(); - } - catch(const Ice::LocalException&) - { - abortBatchRequest(); - throw; - } -} - -void -Ice::ConnectionI::abortBatchRequest() +BatchRequestQueuePtr +Ice::ConnectionI::getBatchRequestQueue() const { - IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); - - BasicStream dummy(_instance.get(), currentProtocolEncoding); - _batchStream.swap(dummy); - _batchRequestNum = 0; - _batchRequestCompress = false; - _batchMarker = 0; - - assert(_batchStreamInUse); - _batchStreamInUse = false; - notifyAll(); + return _batchRequestQueue; } void Ice::ConnectionI::flushBatchRequests() { - FlushBatch out(this, _instance.get(), __flushBatchRequests_name); + ConnectionFlushBatch out(this, _instance.get(), __flushBatchRequests_name); out.invoke(); } @@ -1032,12 +861,12 @@ Ice::ConnectionI::begin_flushBatchRequests(const IceInternal::Function<void (con AsyncResultPtr Ice::ConnectionI::__begin_flushBatchRequests(const CallbackBasePtr& cb, const LocalObjectPtr& cookie) { - ConnectionFlushBatchPtr result = new ConnectionFlushBatch(this, - _communicator, - _instance, - __flushBatchRequests_name, - cb, - cookie); + ConnectionFlushBatchAsyncPtr result = new ConnectionFlushBatchAsync(this, + _communicator, + _instance, + __flushBatchRequests_name, + cb, + cookie); result->invoke(); return result; } @@ -1049,136 +878,6 @@ Ice::ConnectionI::end_flushBatchRequests(const AsyncResultPtr& r) r->__wait(); } -bool -Ice::ConnectionI::flushBatchRequests(OutgoingBase* out) -{ - IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); - while(_batchStreamInUse && !_exception.get()) - { - wait(); - } - - if(_exception.get()) - { - _exception->ice_throw(); - } - - if(_batchRequestNum == 0) - { - out->sent(); - return true; - } - - // - // Fill in the number of requests in the batch. - // - const Byte* p = reinterpret_cast<const Byte*>(&_batchRequestNum); -#ifdef ICE_BIG_ENDIAN - reverse_copy(p, p + sizeof(Int), _batchStream.b.begin() + headerSize); -#else - copy(p, p + sizeof(Int), _batchStream.b.begin() + headerSize); -#endif - _batchStream.swap(*out->os()); - - out->attachRemoteObserver(initConnectionInfo(), _endpoint, 0); - - // - // Send the batch stream. - // - bool sent = false; - try - { - OutgoingMessage message(out, out->os(), _batchRequestCompress, 0); - sent = sendMessage(message) & AsyncStatusSent; - } - catch(const Ice::LocalException& ex) - { - setState(StateClosed, ex); - assert(_exception.get()); - _exception->ice_throw(); - } - - // - // Reset the batch stream. - // - BasicStream dummy(_instance.get(), Ice::currentProtocolEncoding); - _batchStream.swap(dummy); - _batchRequestNum = 0; - _batchRequestCompress = false; - _batchMarker = 0; - return sent; -} - -AsyncStatus -Ice::ConnectionI::flushAsyncBatchRequests(const OutgoingAsyncBasePtr& outAsync) -{ - IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); - while(_batchStreamInUse && !_exception.get()) - { - wait(); - } - - if(_exception.get()) - { - _exception->ice_throw(); - } - - if(_batchRequestNum == 0) - { - AsyncStatus status = AsyncStatusSent; - if(outAsync->sent()) - { - status = static_cast<AsyncStatus>(status | AsyncStatusInvokeSentCallback); - } - return status; - } - - // - // Notify the request that it's cancelable with this connection. - // This will throw if the request is canceled. - // - outAsync->cancelable(this); - - // - // Fill in the number of requests in the batch. - // - const Byte* p = reinterpret_cast<const Byte*>(&_batchRequestNum); -#ifdef ICE_BIG_ENDIAN - reverse_copy(p, p + sizeof(Int), _batchStream.b.begin() + headerSize); -#else - copy(p, p + sizeof(Int), _batchStream.b.begin() + headerSize); -#endif - _batchStream.swap(*outAsync->getOs()); - - outAsync->attachRemoteObserver(initConnectionInfo(), _endpoint, 0); - - // - // Send the batch stream. - // - AsyncStatus status = AsyncStatusQueued; - try - { - OutgoingMessage message(outAsync, outAsync->getOs(), _batchRequestCompress, 0); - status = sendMessage(message); - } - catch(const Ice::LocalException& ex) - { - setState(StateClosed, ex); - assert(_exception.get()); - _exception->ice_throw(); - } - - // - // Reset the batch stream. - // - BasicStream dummy(_instance.get(), Ice::currentProtocolEncoding); - _batchStream.swap(dummy); - _batchRequestNum = 0; - _batchRequestCompress = false; - _batchMarker = 0; - return status; -} - void Ice::ConnectionI::setCallback(const ConnectionCallbackPtr& callback) { @@ -1295,7 +994,7 @@ Ice::ConnectionI::requestCanceled(OutgoingBase* out, const Ice::LocalException& { if(o->requestId) { - if(_requestsHint != _requests.end() && _requestsHint->second == dynamic_cast<Outgoing*>(out)) + if(_requestsHint != _requests.end() && _requestsHint->second == out) { _requests.erase(_requestsHint); _requestsHint = _requests.end(); @@ -1331,10 +1030,9 @@ Ice::ConnectionI::requestCanceled(OutgoingBase* out, const Ice::LocalException& } } - Outgoing* o = dynamic_cast<Outgoing*>(out); - if(o) + if(dynamic_cast<Outgoing*>(out)) { - if(_requestsHint != _requests.end() && _requestsHint->second == o) + if(_requestsHint != _requests.end() && _requestsHint->second == out) { if(dynamic_cast<const Ice::ConnectionTimeoutException*>(&ex)) { @@ -1342,7 +1040,7 @@ Ice::ConnectionI::requestCanceled(OutgoingBase* out, const Ice::LocalException& } else { - o->completed(ex); + out->completed(ex); _requests.erase(_requestsHint); _requestsHint = _requests.end(); } @@ -1350,9 +1048,9 @@ Ice::ConnectionI::requestCanceled(OutgoingBase* out, const Ice::LocalException& } else { - for(map<Int, Outgoing*>::iterator p = _requests.begin(); p != _requests.end(); ++p) + for(map<Int, OutgoingBase*>::iterator p = _requests.begin(); p != _requests.end(); ++p) { - if(p->second == o) + if(p->second == out) { if(dynamic_cast<const Ice::ConnectionTimeoutException*>(&ex)) { @@ -1360,7 +1058,7 @@ Ice::ConnectionI::requestCanceled(OutgoingBase* out, const Ice::LocalException& } else { - o->completed(ex); + p->second->completed(ex); assert(p != _requestsHint); _requests.erase(p); } @@ -1430,12 +1128,11 @@ Ice::ConnectionI::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, con } } - OutgoingAsyncPtr o = OutgoingAsyncPtr::dynamicCast(outAsync); - if(o) + if(OutgoingAsyncPtr::dynamicCast(outAsync)) { if(_asyncRequestsHint != _asyncRequests.end()) { - if(_asyncRequestsHint->second == o) + if(_asyncRequestsHint->second == outAsync) { if(dynamic_cast<const Ice::ConnectionTimeoutException*>(&ex)) { @@ -1454,9 +1151,9 @@ Ice::ConnectionI::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, con } } - for(map<Int, OutgoingAsyncPtr>::iterator p = _asyncRequests.begin(); p != _asyncRequests.end(); ++p) + for(map<Int, OutgoingAsyncBasePtr>::iterator p = _asyncRequests.begin(); p != _asyncRequests.end(); ++p) { - if(p->second.get() == o.get()) + if(p->second.get() == outAsync.get()) { if(dynamic_cast<const Ice::ConnectionTimeoutException*>(&ex)) { @@ -1769,7 +1466,7 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current) Int invokeNum = 0; ServantManagerPtr servantManager; ObjectAdapterPtr adapter; - OutgoingAsyncPtr outAsync; + OutgoingAsyncBasePtr outAsync; ConnectionCallbackPtr heartbeatCallback; int dispatchCount = 0; @@ -2039,7 +1736,7 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current) void ConnectionI::dispatch(const StartCallbackPtr& startCB, const vector<OutgoingMessage>& sentCBs, Byte compress, Int requestId, Int invokeNum, const ServantManagerPtr& servantManager, - const ObjectAdapterPtr& adapter, const OutgoingAsyncPtr& outAsync, + const ObjectAdapterPtr& adapter, const OutgoingAsyncBasePtr& outAsync, const ConnectionCallbackPtr& heartbeatCallback, BasicStream& stream) { int dispatchedCount = 0; @@ -2290,13 +1987,13 @@ Ice::ConnectionI::finish(bool close) _sendStreams.clear(); // Must be cleared before _requests because of Outgoing* references in OutgoingMessage } - for(map<Int, Outgoing*>::const_iterator p = _requests.begin(); p != _requests.end(); ++p) + for(map<Int, OutgoingBase*>::const_iterator p = _requests.begin(); p != _requests.end(); ++p) { p->second->completed(*_exception.get()); } _requests.clear(); - for(map<Int, OutgoingAsyncPtr>::const_iterator q = _asyncRequests.begin(); q != _asyncRequests.end(); ++q) + for(map<Int, OutgoingAsyncBasePtr>::const_iterator q = _asyncRequests.begin(); q != _asyncRequests.end(); ++q) { if(q->second->completed(*_exception.get())) { @@ -2429,12 +2126,7 @@ Ice::ConnectionI::ConnectionI(const CommunicatorPtr& communicator, _requestsHint(_requests.end()), _asyncRequestsHint(_asyncRequests.end()), _messageSizeMax(adapter ? adapter->messageSizeMax() : _instance->messageSizeMax()), - _batchAutoFlushSize(_instance->batchAutoFlushSize()), - _batchStream(_instance.get(), Ice::currentProtocolEncoding), - _batchStreamInUse(false), - _batchRequestNum(0), - _batchRequestCompress(false), - _batchMarker(0), + _batchRequestQueue(new BatchRequestQueue(instance, endpoint->datagram())), _readStream(_instance.get(), Ice::currentProtocolEncoding), _readHeader(false), _writeStream(_instance.get(), Ice::currentProtocolEncoding), @@ -2647,6 +2339,8 @@ Ice::ConnectionI::setState(State state) return; } + _batchRequestQueue->destroy(*_exception.get()); + // // Don't need to close now for connections so only close the transceiver // if the selector request it. @@ -3431,7 +3125,7 @@ Ice::ConnectionI::doUncompress(BasicStream& compressed, BasicStream& uncompresse SocketOperation Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& requestId, Byte& compress, ServantManagerPtr& servantManager, ObjectAdapterPtr& adapter, - OutgoingAsyncPtr& outAsync, ConnectionCallbackPtr& heartbeatCallback, + OutgoingAsyncBasePtr& outAsync, ConnectionCallbackPtr& heartbeatCallback, int& dispatchCount) { assert(_state > StateNotValidated && _state < StateClosed); @@ -3556,8 +3250,8 @@ Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& request stream.read(requestId); - map<Int, Outgoing*>::iterator p = _requests.end(); - map<Int, OutgoingAsyncPtr>::iterator q = _asyncRequests.end(); + map<Int, OutgoingBase*>::iterator p = _requests.end(); + map<Int, OutgoingAsyncBasePtr>::iterator q = _asyncRequests.end(); if(_requestsHint != _requests.end()) { diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h index adcdd8ea318..aeedf315342 100644 --- a/cpp/src/Ice/ConnectionI.h +++ b/cpp/src/Ice/ConnectionI.h @@ -36,6 +36,7 @@ #include <Ice/Dispatcher.h> #include <Ice/ObserverHelper.h> #include <Ice/ConnectionAsync.h> +#include <Ice/BatchRequestQueueF.h> #include <Ice/ACM.h> #include <deque> @@ -166,12 +167,10 @@ public: void monitor(const IceUtil::Time&, const IceInternal::ACMConfig&); - bool sendRequest(IceInternal::Outgoing*, bool, bool); - IceInternal::AsyncStatus sendAsyncRequest(const IceInternal::OutgoingAsyncPtr&, bool, bool); + bool sendRequest(IceInternal::OutgoingBase*, bool, bool, int); + IceInternal::AsyncStatus sendAsyncRequest(const IceInternal::OutgoingAsyncBasePtr&, bool, bool, int); - void prepareBatchRequest(IceInternal::BasicStream*); - void finishBatchRequest(IceInternal::BasicStream*, bool); - void abortBatchRequest(); + IceInternal::BatchRequestQueuePtr getBatchRequestQueue() const; virtual void flushBatchRequests(); // From Connection. @@ -186,9 +185,6 @@ public: virtual void end_flushBatchRequests(const AsyncResultPtr&); - bool flushBatchRequests(IceInternal::OutgoingBase*); - IceInternal::AsyncStatus flushAsyncBatchRequests(const IceInternal::OutgoingAsyncBasePtr&); - virtual void setCallback(const ConnectionCallbackPtr&); virtual void setACM(const IceUtil::Optional<int>&, const IceUtil::Optional<ACMClose>&, @@ -235,7 +231,8 @@ public: void exception(const LocalException&); void dispatch(const StartCallbackPtr&, const std::vector<OutgoingMessage>&, Byte, Int, Int, - const IceInternal::ServantManagerPtr&, const ObjectAdapterPtr&, const IceInternal::OutgoingAsyncPtr&, + const IceInternal::ServantManagerPtr&, const ObjectAdapterPtr&, + const IceInternal::OutgoingAsyncBasePtr&, const ConnectionCallbackPtr&, IceInternal::BasicStream&); void finish(bool); @@ -280,7 +277,7 @@ private: #endif IceInternal::SocketOperation parseMessage(IceInternal::BasicStream&, Int&, Int&, Byte&, IceInternal::ServantManagerPtr&, ObjectAdapterPtr&, - IceInternal::OutgoingAsyncPtr&, ConnectionCallbackPtr&, int&); + IceInternal::OutgoingAsyncBasePtr&, ConnectionCallbackPtr&, int&); void invokeAll(IceInternal::BasicStream&, Int, Int, Byte, const IceInternal::ServantManagerPtr&, const ObjectAdapterPtr&); @@ -333,21 +330,16 @@ private: Int _nextRequestId; - std::map<Int, IceInternal::Outgoing*> _requests; - std::map<Int, IceInternal::Outgoing*>::iterator _requestsHint; + std::map<Int, IceInternal::OutgoingBase*> _requests; + std::map<Int, IceInternal::OutgoingBase*>::iterator _requestsHint; - std::map<Int, IceInternal::OutgoingAsyncPtr> _asyncRequests; - std::map<Int, IceInternal::OutgoingAsyncPtr>::iterator _asyncRequestsHint; + std::map<Int, IceInternal::OutgoingAsyncBasePtr> _asyncRequests; + std::map<Int, IceInternal::OutgoingAsyncBasePtr>::iterator _asyncRequestsHint; IceUtil::UniquePtr<LocalException> _exception; const size_t _messageSizeMax; - const size_t _batchAutoFlushSize; - IceInternal::BasicStream _batchStream; - bool _batchStreamInUse; - int _batchRequestNum; - bool _batchRequestCompress; - size_t _batchMarker; + IceInternal::BatchRequestQueuePtr _batchRequestQueue; std::deque<OutgoingMessage> _sendStreams; diff --git a/cpp/src/Ice/ConnectionRequestHandler.cpp b/cpp/src/Ice/ConnectionRequestHandler.cpp index f6d0adf7ae8..cab544915e6 100644 --- a/cpp/src/Ice/ConnectionRequestHandler.cpp +++ b/cpp/src/Ice/ConnectionRequestHandler.cpp @@ -28,12 +28,6 @@ ConnectionRequestHandler::ConnectionRequestHandler(const ReferencePtr& reference } RequestHandlerPtr -ConnectionRequestHandler::connect(const Ice::ObjectPrx&) -{ - return this; -} - -RequestHandlerPtr ConnectionRequestHandler::update(const RequestHandlerPtr& previousHandler, const RequestHandlerPtr& newHandler) { assert(previousHandler); @@ -60,34 +54,16 @@ ConnectionRequestHandler::update(const RequestHandlerPtr& previousHandler, const return this; } -void -ConnectionRequestHandler::prepareBatchRequest(BasicStream* out) -{ - _connection->prepareBatchRequest(out); -} - -void -ConnectionRequestHandler::finishBatchRequest(BasicStream* out) -{ - _connection->finishBatchRequest(out, _compress); -} - -void -ConnectionRequestHandler::abortBatchRequest() -{ - _connection->abortBatchRequest(); -} - bool -ConnectionRequestHandler::sendRequest(OutgoingBase* out) +ConnectionRequestHandler::sendRequest(ProxyOutgoingBase* out) { - return out->send(_connection, _compress, _response) && !_response; // Finished if sent and no response + return out->invokeRemote(_connection, _compress, _response) && !_response; // Finished if sent and no response } AsyncStatus -ConnectionRequestHandler::sendAsyncRequest(const OutgoingAsyncBasePtr& out) +ConnectionRequestHandler::sendAsyncRequest(const ProxyOutgoingAsyncBasePtr& out) { - return out->send(_connection, _compress, _response); + return out->invokeRemote(_connection, _compress, _response); } void diff --git a/cpp/src/Ice/ConnectionRequestHandler.h b/cpp/src/Ice/ConnectionRequestHandler.h index b560ab0f7cc..cef3df68f4d 100644 --- a/cpp/src/Ice/ConnectionRequestHandler.h +++ b/cpp/src/Ice/ConnectionRequestHandler.h @@ -23,15 +23,10 @@ public: ConnectionRequestHandler(const ReferencePtr&, const Ice::ConnectionIPtr&, bool); - virtual RequestHandlerPtr connect(const Ice::ObjectPrx&); virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&); - virtual void prepareBatchRequest(BasicStream*); - virtual void finishBatchRequest(BasicStream*); - virtual void abortBatchRequest(); - - virtual bool sendRequest(OutgoingBase*); - virtual AsyncStatus sendAsyncRequest(const OutgoingAsyncBasePtr&); + virtual bool sendRequest(ProxyOutgoingBase*); + virtual AsyncStatus sendAsyncRequest(const ProxyOutgoingAsyncBasePtr&); virtual void requestCanceled(OutgoingBase*, const Ice::LocalException&); virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, const Ice::LocalException&); diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index 3fa6474aa7b..0db2702359a 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -84,28 +84,30 @@ IceInternal::IncomingBase::__adopt(IncomingBase& other) other._responseHandler = 0; } -BasicStream* +BasicStream* IncomingBase::__startWriteParams(FormatType format) { - if(_response) + if(!_response) { - assert(_os.b.size() == headerSize + 4); // Reply status position. - assert(_current.encoding >= Ice::Encoding_1_0); // Encoding for reply is known. - _os.write(static_cast<Ice::Byte>(0)); - _os.startWriteEncaps(_current.encoding, format); + throw MarshalException(__FILE__, __LINE__, "can't marshal out parameters for oneway dispatch"); } - + + assert(_os.b.size() == headerSize + 4); // Reply status position. + assert(_current.encoding >= Ice::Encoding_1_0); // Encoding for reply is known. + _os.write(static_cast<Ice::Byte>(0)); + _os.startWriteEncaps(_current.encoding, format); + // // We still return the stream even if no response is expected. The // servant code might still write some out parameters if for // example a method with out parameters somehow and erroneously - // invoked as oneway (or if the invocation is invoked on a + // invoked as oneway (or if the invocation is invoked on a // blobject and the blobject erroneously writes a response). // return &_os; } -void +void IncomingBase::__endWriteParams(bool ok) { if(!ok) @@ -120,7 +122,7 @@ IncomingBase::__endWriteParams(bool ok) } } -void +void IncomingBase::__writeEmptyParams() { if(_response) @@ -132,7 +134,7 @@ IncomingBase::__writeEmptyParams() } } -void +void IncomingBase::__writeParamEncaps(const Byte* v, Ice::Int sz, bool ok) { if(!ok) @@ -156,7 +158,7 @@ IncomingBase::__writeParamEncaps(const Byte* v, Ice::Int sz, bool ok) } } -void +void IncomingBase::__writeUserException(const Ice::UserException& ex, Ice::FormatType format) { ::IceInternal::BasicStream* __os = __startWriteParams(format); @@ -479,7 +481,7 @@ IceInternal::IncomingBase::__handleException(bool amd) } -IceInternal::Incoming::Incoming(Instance* instance, ResponseHandler* responseHandler, Ice::Connection* connection, +IceInternal::Incoming::Incoming(Instance* instance, ResponseHandler* responseHandler, Ice::Connection* connection, const ObjectAdapterPtr& adapter, bool response, Byte compress, Int requestId) : IncomingBase(instance, responseHandler, connection, adapter, response, compress, requestId), _inParamPos(0) @@ -490,7 +492,7 @@ IceInternal::Incoming::Incoming(Instance* instance, ResponseHandler* responseHan if(response) { _os.writeBlob(replyHdr, sizeof(replyHdr)); - + // // Add the request ID. // @@ -603,10 +605,10 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre const CommunicatorObserverPtr& obsv = _is->instance()->initializationData().observer; if(obsv) - { + { // Read the parameter encapsulation size. Ice::Int sz; - _is->read(sz); + _is->read(sz); _is->i -= 4; _observer.attach(obsv->getDispatchObserver(_current, static_cast<Int>(_is->i - start + sz))); @@ -684,7 +686,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre // to indicate async dispatch. // if(_servant->__dispatch(*this, _current) == DispatchAsync) - { + { return; } @@ -699,7 +701,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre // Skip the input parameters, this is required for reading // the next batch request if dispatching batch requests. // - _is->skipEncaps(); + _is->skipEncaps(); if(servantManager && servantManager->hasServant(_current.id)) { diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index e17e405bf7b..0e286f99c0c 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -194,8 +194,8 @@ inline void checkIceVersion(Int version) { throw VersionMismatchException(__FILE__, __LINE__); } - -# endif + +# endif #endif } @@ -381,17 +381,17 @@ Ice::newDispatcher(const ::std::function<void (const DispatcherCallPtr&, const C class Cpp11Dispatcher : public Dispatcher { public: - + Cpp11Dispatcher(const ::std::function<void (const DispatcherCallPtr&, const ConnectionPtr)>& cb) : _cb(cb) { } - + virtual void dispatch(const DispatcherCallPtr& call, const ConnectionPtr& conn) { _cb(call, conn); } - + private: const ::std::function<void (const DispatcherCallPtr&, const ConnectionPtr)> _cb; }; @@ -399,3 +399,29 @@ Ice::newDispatcher(const ::std::function<void (const DispatcherCallPtr&, const C return new Cpp11Dispatcher(cb); } #endif + +#ifdef ICE_CPP11 +Ice::BatchRequestInterceptorPtr +Ice::newBatchRequestInterceptor(const ::std::function<void (const BatchRequest&, int, int)>& cb) +{ + class Cpp11BatchRequestInterceptor : public BatchRequestInterceptor + { + public: + + Cpp11BatchRequestInterceptor(const ::std::function<void (const BatchRequest&, int, int)>& cb) : + _cb(cb) + { + } + + virtual void enqueue(const BatchRequest& request, int count, int size) + { + _cb(request, count, size); + } + + private: + const ::std::function<void (const BatchRequest&, int, int)> _cb; + }; + + return new Cpp11BatchRequestInterceptor(cb); +} +#endif diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile index 94f87cc8d2e..e6f133ca4f9 100644 --- a/cpp/src/Ice/Makefile +++ b/cpp/src/Ice/Makefile @@ -60,6 +60,7 @@ OBJS = Acceptor.o \ AsyncResult.o \ Base64.o \ BasicStream.o \ + BatchRequestQueue.o \ Buffer.o \ CollocatedRequestHandler.o \ CommunicatorI.o \ diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index c32c98f573a..070185adbb3 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -62,6 +62,7 @@ OBJS = .\Acceptor.obj \ .\AsyncResult.obj \ .\Base64.obj \ .\BasicStream.obj \ + .\BatchRequestQueue.obj \ .\Buffer.obj \ .\CollocatedRequestHandler.obj \ .\CommunicatorI.obj \ diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp index 5004a337b59..492ba389f70 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.cpp +++ b/cpp/src/Ice/ObjectAdapterFactory.cpp @@ -27,7 +27,7 @@ IceInternal::ObjectAdapterFactory::shutdown() { IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); - + // // Ignore shutdown requests if the object adapter factory has // already been shut down. @@ -36,15 +36,15 @@ IceInternal::ObjectAdapterFactory::shutdown() { return; } - + adapters = _adapters; - + _instance = 0; _communicator = 0; - + notifyAll(); } - + // // Deactivate outside the thread synchronization, to avoid // deadlocks. @@ -59,7 +59,7 @@ IceInternal::ObjectAdapterFactory::waitForShutdown() { IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this); - + // // First we wait for the shutdown of the factory itself. // @@ -167,7 +167,7 @@ IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy) { return 0; } - + adapters = _adapters; } @@ -211,7 +211,7 @@ IceInternal::ObjectAdapterFactory::removeObjectAdapter(const ObjectAdapterPtr& a } void -IceInternal::ObjectAdapterFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchPtr& outAsync) const +IceInternal::ObjectAdapterFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync) const { list<ObjectAdapterIPtr> adapters; { diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h index 1ab5d753d6a..6434a25b178 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.h +++ b/cpp/src/Ice/ObjectAdapterFactory.h @@ -33,7 +33,7 @@ public: ::Ice::ObjectAdapterPtr createObjectAdapter(const std::string&, const Ice::RouterPrx&); ::Ice::ObjectAdapterPtr findObjectAdapter(const ::Ice::ObjectPrx&); void removeObjectAdapter(const ::Ice::ObjectAdapterPtr&); - void flushAsyncBatchRequests(const CommunicatorFlushBatchPtr&) const; + void flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr&) const; private: diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 2c2472e1d00..b2e556991d0 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -738,7 +738,7 @@ Ice::ObjectAdapterI::isLocal(const ObjectPrx& proxy) const } void -Ice::ObjectAdapterI::flushAsyncBatchRequests(const CommunicatorFlushBatchPtr& outAsync) +Ice::ObjectAdapterI::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync) { vector<IncomingConnectionFactoryPtr> f; { diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index a0082608ad7..6ae147d9907 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -84,10 +84,10 @@ public: virtual EndpointSeq getEndpoints() const; virtual EndpointSeq getPublishedEndpoints() const; - + bool isLocal(const ObjectPrx&) const; - void flushAsyncBatchRequests(const IceInternal::CommunicatorFlushBatchPtr&); + void flushAsyncBatchRequests(const IceInternal::CommunicatorFlushBatchAsyncPtr&); void updateConnectionObservers(); void updateThreadObservers(); @@ -102,12 +102,12 @@ public: private: - ObjectAdapterI(const IceInternal::InstancePtr&, const CommunicatorPtr&, + ObjectAdapterI(const IceInternal::InstancePtr&, const CommunicatorPtr&, const IceInternal::ObjectAdapterFactoryPtr&, const std::string&, bool); virtual ~ObjectAdapterI(); void initialize(const RouterPrx&); friend class IceInternal::ObjectAdapterFactory; - + ObjectPrx newProxy(const Identity&, const std::string&) const; ObjectPrx newDirectProxy(const Identity&, const std::string&) const; ObjectPrx newIndirectProxy(const Identity&, const std::string&, const std::string&) const; diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp index 3699c3ee29a..23cccd2708a 100644 --- a/cpp/src/Ice/Outgoing.cpp +++ b/cpp/src/Ice/Outgoing.cpp @@ -23,134 +23,29 @@ using namespace Ice; using namespace Ice::Instrumentation; using namespace IceInternal; -OutgoingBase::OutgoingBase(Instance* instance, const string& operation) : - _os(instance, Ice::currentProtocolEncoding), _sent(false) +OutgoingBase::OutgoingBase(Instance* instance) : _os(instance, Ice::currentProtocolEncoding), _sent(false) { } -Outgoing::Outgoing(IceProxy::Ice::Object* proxy, const string& operation, OperationMode mode, const Context* context) : - OutgoingBase(proxy->__reference()->getInstance().get(), operation), +ProxyOutgoingBase::ProxyOutgoingBase(IceProxy::Ice::Object* proxy, OperationMode mode) : + OutgoingBase(proxy->__reference()->getInstance().get()), _proxy(proxy), _mode(mode), - _state(StateUnsent), - _encoding(getCompatibleEncoding(proxy->__reference()->getEncoding())), - _is(proxy->__reference()->getInstance().get(), Ice::currentProtocolEncoding) -{ - checkSupportedProtocol(getCompatibleProtocol(proxy->__reference()->getProtocol())); - - _observer.attach(proxy, operation, context); - + _state(StateUnsent) +{ int invocationTimeout = _proxy->__reference()->getInvocationTimeout(); if(invocationTimeout > 0) { _invocationTimeoutDeadline = Time::now(Time::Monotonic) + Time::milliSeconds(invocationTimeout); } - - switch(_proxy->__reference()->getMode()) - { - case Reference::ModeTwoway: - case Reference::ModeOneway: - case Reference::ModeDatagram: - { - _os.writeBlob(requestHdr, sizeof(requestHdr)); - break; - } - - case Reference::ModeBatchOneway: - case Reference::ModeBatchDatagram: - { - while(true) - { - try - { - _handler = proxy->__getRequestHandler(); - _handler->prepareBatchRequest(&_os); - break; - } - catch(const RetryException&) - { - _proxy->__setRequestHandler(_handler, 0); // Clear request handler and retry. - } - catch(const Ice::LocalException& ex) - { - _observer.failed(ex.ice_name()); - _proxy->__setRequestHandler(_handler, 0); // Clear request handler - throw; - } - } - break; - } - } - - try - { - _os.write(_proxy->__reference()->getIdentity()); - - // - // For compatibility with the old FacetPath. - // - if(_proxy->__reference()->getFacet().empty()) - { - _os.write(static_cast<string*>(0), static_cast<string*>(0)); - } - else - { - string facet = _proxy->__reference()->getFacet(); - _os.write(&facet, &facet + 1); - } - - _os.write(operation, false); - - _os.write(static_cast<Ice::Byte>(mode)); - - if(context != 0) - { - // - // Explicit context - // - _os.write(*context); - } - else - { - // - // Implicit context - // - const ImplicitContextIPtr& implicitContext = _proxy->__reference()->getInstance()->getImplicitContext(); - const Context& prxContext = _proxy->__reference()->getContext()->getValue(); - if(implicitContext == 0) - { - _os.write(prxContext); - } - else - { - implicitContext->write(prxContext, &_os); - } - } - } - catch(const LocalException& ex) - { - abort(ex); - } } -Outgoing::~Outgoing() -{ -} - -bool -Outgoing::send(const Ice::ConnectionIPtr& connection, bool compress, bool response) +ProxyOutgoingBase::~ProxyOutgoingBase() { - return connection->sendRequest(this, compress, response); } void -Outgoing::invokeCollocated(CollocatedRequestHandler* handler) -{ - handler->invokeRequest(this); -} - -void -Outgoing::sent() +ProxyOutgoingBase::sent() { Monitor<Mutex>::Lock sync(_monitor); if(_proxy->__reference()->getMode() != Reference::ModeTwoway) @@ -162,14 +57,14 @@ Outgoing::sent() _monitor.notify(); // - // NOTE: At this point the stack allocated Outgoing object can be destroyed + // NOTE: At this point the stack allocated ProxyOutgoingBase object can be destroyed // since the notify() on the monitor will release the thread waiting on the // synchronous Ice call. // } void -Outgoing::completed(const Ice::Exception& ex) +ProxyOutgoingBase::completed(const Ice::Exception& ex) { Monitor<Mutex>::Lock sync(_monitor); //assert(_state <= StateInProgress); @@ -197,7 +92,13 @@ Outgoing::completed(const Ice::Exception& ex) } void -Outgoing::retryException(const Ice::Exception&) +ProxyOutgoingBase::completed(BasicStream& is) +{ + assert(false); // Must be overriden +} + +void +ProxyOutgoingBase::retryException(const Ice::Exception&) { Monitor<Mutex>::Lock sync(_monitor); assert(_state <= StateInProgress); @@ -206,22 +107,14 @@ Outgoing::retryException(const Ice::Exception&) } bool -Outgoing::invoke() +ProxyOutgoingBase::invokeImpl() { assert(_state == StateUnsent); - - const Reference::Mode mode = _proxy->__reference()->getMode(); - if(mode == Reference::ModeBatchOneway || mode == Reference::ModeBatchDatagram) - { - _state = StateInProgress; - _handler->finishBatchRequest(&_os); - return true; - } const int invocationTimeout = _proxy->__reference()->getInvocationTimeout(); int cnt = 0; while(true) - { + { try { if(invocationTimeout > 0 && _invocationTimeoutDeadline <= Time::now(Time::Monotonic)) @@ -256,7 +149,7 @@ Outgoing::invoke() { } } - + bool timedOut = false; { Monitor<Mutex>::Lock sync(_monitor); @@ -274,7 +167,7 @@ Outgoing::invoke() break; } _monitor.timedWait(_invocationTimeoutDeadline - now); - + if((_state == StateInProgress || !_sent) && _state != StateFailed) { now = Time::now(Time::Monotonic); @@ -290,7 +183,7 @@ Outgoing::invoke() } } } - + if(timedOut) { if(invocationTimeout == -2) @@ -304,8 +197,8 @@ Outgoing::invoke() // // Wait for the exception to propagate. It's possible the request handler ignores - // the timeout if there was a failure shortly before requestCanceled got called. - // In this case, the exception should be set on the Outgoing. + // the timeout if there was a failure shortly before requestCanceled got called. + // In this case, the exception should be set on the ProxyOutgoingBase. // Monitor<Mutex>::Lock sync(_monitor); while(_state == StateInProgress) @@ -313,14 +206,14 @@ Outgoing::invoke() _monitor.wait(); } } - + if(_exception.get()) { _exception->ice_throw(); } else if(_state == StateRetry) { - _proxy->__setRequestHandler(_handler, 0); // Clear request handler and retry. + _proxy->__updateRequestHandler(_handler, 0); // Clear request handler and retry. continue; } else @@ -331,7 +224,7 @@ Outgoing::invoke() } catch(const RetryException&) { - _proxy->__setRequestHandler(_handler, 0); // Clear request handler and retry. + _proxy->__updateRequestHandler(_handler, 0); // Clear request handler and retry. } catch(const Ice::Exception& ex) { @@ -348,8 +241,8 @@ Outgoing::invoke() // // Wait until either the retry and invocation timeout deadline is reached. - // Note that we're using a loop here because sleep() precision isn't as - // good as the motonic clock and it can return few hundred micro-seconds + // Note that we're using a loop here because sleep() precision isn't as + // good as the motonic clock and it can return few hundred micro-seconds // earlier which breaks the check for the invocation timeout. // while(retryDeadline > now && _invocationTimeoutDeadline > now) @@ -388,22 +281,129 @@ Outgoing::invoke() return false; } +Outgoing::Outgoing(IceProxy::Ice::Object* proxy, const string& operation, OperationMode mode, const Context* context) : + ProxyOutgoingBase(proxy, mode), + _encoding(getCompatibleEncoding(proxy->__reference()->getEncoding())), + _is(proxy->__reference()->getInstance().get(), Ice::currentProtocolEncoding), + _operation(operation) +{ + checkSupportedProtocol(getCompatibleProtocol(proxy->__reference()->getProtocol())); + _observer.attach(proxy, operation, context); + + switch(_proxy->__reference()->getMode()) + { + case Reference::ModeTwoway: + case Reference::ModeOneway: + case Reference::ModeDatagram: + { + _os.writeBlob(requestHdr, sizeof(requestHdr)); + break; + } + + case Reference::ModeBatchOneway: + case Reference::ModeBatchDatagram: + { + _proxy->__getBatchRequestQueue()->prepareBatchRequest(&_os); + break; + } + } + + try + { + _os.write(_proxy->__reference()->getIdentity()); + + // + // For compatibility with the old FacetPath. + // + if(_proxy->__reference()->getFacet().empty()) + { + _os.write(static_cast<string*>(0), static_cast<string*>(0)); + } + else + { + string facet = _proxy->__reference()->getFacet(); + _os.write(&facet, &facet + 1); + } + + _os.write(operation, false); + + _os.write(static_cast<Ice::Byte>(mode)); + + if(context != 0) + { + // + // Explicit context + // + _os.write(*context); + } + else + { + // + // Implicit context + // + const ImplicitContextIPtr& implicitContext = _proxy->__reference()->getInstance()->getImplicitContext(); + const Context& prxContext = _proxy->__reference()->getContext()->getValue(); + if(implicitContext == 0) + { + _os.write(prxContext); + } + else + { + implicitContext->write(prxContext, &_os); + } + } + } + catch(const LocalException& ex) + { + abort(ex); + } +} + +Outgoing::~Outgoing() +{ +} + +bool +Outgoing::invokeRemote(const Ice::ConnectionIPtr& connection, bool compress, bool response) +{ + return connection->sendRequest(this, compress, response, 0); +} + +void +Outgoing::invokeCollocated(CollocatedRequestHandler* handler) +{ + handler->invokeRequest(this, 0); +} + +bool +Outgoing::invoke() +{ + const Reference::Mode mode = _proxy->__reference()->getMode(); + if(mode == Reference::ModeBatchOneway || mode == Reference::ModeBatchDatagram) + { + _state = StateInProgress; + _proxy->__getBatchRequestQueue()->finishBatchRequest(&_os, _proxy, _operation); + return true; + } + return invokeImpl(); +} + void Outgoing::abort(const LocalException& ex) { assert(_state == StateUnsent); - + // // If we didn't finish a batch oneway or datagram request, we must // notify the connection about that we give up ownership of the // batch stream. // - if(_proxy->__reference()->getMode() == Reference::ModeBatchOneway || - _proxy->__reference()->getMode() == Reference::ModeBatchDatagram) + const Reference::Mode mode = _proxy->__reference()->getMode(); + if(mode == Reference::ModeBatchOneway || mode == Reference::ModeBatchDatagram) { - _handler->abortBatchRequest(); + _proxy->__getBatchRequestQueue()->abortBatchRequest(&_os); } - + ex.ice_throw(); } @@ -425,7 +425,7 @@ Outgoing::completed(BasicStream& is) Ice::Byte replyStatus; _is.read(replyStatus); - + switch(replyStatus) { case replyOK: @@ -433,14 +433,14 @@ Outgoing::completed(BasicStream& is) _state = StateOK; // The state must be set last, in case there is an exception. break; } - + case replyUserException: { _observer.userException(); _state = StateUserException; // The state must be set last, in case there is an exception. break; } - + case replyObjectNotExist: case replyFacetNotExist: case replyOperationNotExist: @@ -470,7 +470,7 @@ Outgoing::completed(BasicStream& is) string operation; _is.read(operation, false); - + RequestFailedException* ex; switch(replyStatus) { @@ -479,19 +479,19 @@ Outgoing::completed(BasicStream& is) ex = new ObjectNotExistException(__FILE__, __LINE__); break; } - + case replyFacetNotExist: { ex = new FacetNotExistException(__FILE__, __LINE__); break; } - + case replyOperationNotExist: { ex = new OperationNotExistException(__FILE__, __LINE__); break; } - + default: { ex = 0; // To keep the compiler from complaining. @@ -499,7 +499,7 @@ Outgoing::completed(BasicStream& is) break; } } - + ex->id = ident; ex->facet = facet; ex->operation = operation; @@ -508,7 +508,7 @@ Outgoing::completed(BasicStream& is) _state = StateLocalException; // The state must be set last, in case there is an exception. break; } - + case replyUnknownException: case replyUnknownLocalException: case replyUnknownUserException: @@ -520,7 +520,7 @@ Outgoing::completed(BasicStream& is) // string unknown; _is.read(unknown, false); - + UnknownException* ex; switch(replyStatus) { @@ -529,19 +529,19 @@ Outgoing::completed(BasicStream& is) ex = new UnknownException(__FILE__, __LINE__); break; } - + case replyUnknownLocalException: { ex = new UnknownLocalException(__FILE__, __LINE__); break; } - + case replyUnknownUserException: { ex = new UnknownUserException(__FILE__, __LINE__); break; } - + default: { ex = 0; // To keep the compiler from complaining. @@ -549,14 +549,14 @@ Outgoing::completed(BasicStream& is) break; } } - + ex->unknown = unknown; _exception.reset(ex); _state = StateLocalException; // The state must be set last, in case there is an exception. break; } - + default: { _exception.reset(new UnknownReplyStatusException(__FILE__, __LINE__)); @@ -583,145 +583,94 @@ Outgoing::throwUserException() } } -FlushBatch::FlushBatch(IceProxy::Ice::Object* proxy, const string& operation) : - OutgoingBase(proxy->__reference()->getInstance().get(), operation), _proxy(proxy), _connection(0) +ProxyFlushBatch::ProxyFlushBatch(IceProxy::Ice::Object* proxy, const string& operation) : + ProxyOutgoingBase(proxy, Ice::Normal) { - checkSupportedProtocol(proxy->__reference()->getProtocol()); + checkSupportedProtocol(getCompatibleProtocol(proxy->__reference()->getProtocol())); + _observer.attach(proxy, operation, 0); - _observer.attach(proxy->__reference()->getInstance().get(), operation); + _batchRequestNum = proxy->__getBatchRequestQueue()->swap(&_os); } -FlushBatch::FlushBatch(ConnectionI* connection, Instance* instance, const string& operation) : - OutgoingBase(instance, operation), _proxy(0), _connection(connection) +bool +ProxyFlushBatch::invokeRemote(const Ice::ConnectionIPtr& connection, bool compress, bool response) { - _observer.attach(instance, operation); + return connection->sendRequest(this, compress, response, _batchRequestNum); } void -FlushBatch::invoke() +ProxyFlushBatch::invokeCollocated(CollocatedRequestHandler* handler) { - assert(_proxy || _connection); + handler->invokeRequest(this, _batchRequestNum); +} - if(_connection) +void +ProxyFlushBatch::invoke() +{ + if(_batchRequestNum == 0) { - if(_connection->flushBatchRequests(this)) - { - return; - } - - Monitor<Mutex>::Lock sync(_monitor); - while(!_exception.get() && !_sent) - { - _monitor.wait(); - } - if(_exception.get()) - { - _exception->ice_throw(); - } - return; + sent(); } + else + { + invokeImpl(); + } +} + +ConnectionFlushBatch::ConnectionFlushBatch(ConnectionI* connection, Instance* instance, const string& operation) : + OutgoingBase(instance), _connection(connection) +{ + _observer.attach(instance, operation); +} + +void +ConnectionFlushBatch::invoke() +{ + int batchRequestNum = _connection->getBatchRequestQueue()->swap(&_os); - RequestHandlerPtr handler; try { - handler = _proxy->__getRequestHandler(); - if(handler->sendRequest(this)) + if(batchRequestNum == 0) { - return; + sent(); } - - bool timedOut = false; + else if(!_connection->sendRequest(this, false, false, batchRequestNum)) { Monitor<Mutex>::Lock sync(_monitor); - int timeout = _proxy->__reference()->getInvocationTimeout(); - if(timeout > 0) - { - Time now = Time::now(Time::Monotonic); - Time deadline = now + Time::milliSeconds(timeout); - while(!_exception.get() && !_sent && !timedOut) - { - _monitor.timedWait(deadline - now); - if(!_exception.get() && !_sent) - { - now = Time::now(Time::Monotonic); - timedOut = now >= deadline; - } - } - } - else - { - while(!_exception.get() && !_sent) - { - _monitor.wait(); - } - } - } - - if(timedOut) - { - Ice::InvocationTimeoutException ex(__FILE__, __LINE__); - handler->requestCanceled(this, ex); - - // - // Wait for the exception to propagate. It's possible the request handler ignores - // the timeout if there was a failure shortly before requestTimedOut got called. - // In this case, the exception should be set on the Outgoing. - // - Monitor<Mutex>::Lock sync(_monitor); while(!_exception.get() && !_sent) { _monitor.wait(); } - } - - if(_exception.get()) - { - _exception->ice_throw(); + if(_exception.get()) + { + _exception->ice_throw(); + } } } catch(const RetryException& ex) { - _proxy->__setRequestHandler(handler, 0); // Clear request handler - ex.get()->ice_throw(); // Throw to notify the user that batch requests were potentially lost. + ex.get()->ice_throw(); } - catch(const Ice::Exception& ex) - { - _proxy->__setRequestHandler(handler, 0); // Clear request handler - _observer.failed(ex.ice_name()); - throw; // Throw to notify the user that batch requests were potentially lost. - } -} - -bool -FlushBatch::send(const Ice::ConnectionIPtr& connection, bool, bool) -{ - return connection->flushBatchRequests(this); -} - -void -FlushBatch::invokeCollocated(CollocatedRequestHandler* handler) -{ - handler->invokeBatchRequests(this); } void -FlushBatch::sent() +ConnectionFlushBatch::sent() { Monitor<Mutex>::Lock sync(_monitor); _childObserver.detach(); - + _sent = true; _monitor.notify(); // - // NOTE: At this point the stack allocated FlushBatch object - // can be destroyed since the notify() on the monitor will release - // the thread waiting on the synchronous Ice call. + // NOTE: At this point the stack allocated ConnectionFlushBatch + // object can be destroyed since the notify() on the monitor will + // release the thread waiting on the synchronous Ice call. // } void -FlushBatch::completed(const Ice::Exception& ex) +ConnectionFlushBatch::completed(const Ice::Exception& ex) { Monitor<Mutex>::Lock sync(_monitor); _childObserver.failed(ex.ice_name()); @@ -731,7 +680,13 @@ FlushBatch::completed(const Ice::Exception& ex) } void -FlushBatch::retryException(const Ice::Exception& ex) +ConnectionFlushBatch::completed(BasicStream& is) +{ + assert(false); +} + +void +ConnectionFlushBatch::retryException(const Ice::Exception& ex) { completed(ex); } diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index f32e5f3b547..513ba5b287d 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -26,7 +26,7 @@ using namespace IceInternal; IceUtil::Shared* IceInternal::upCast(OutgoingAsyncBase* p) { return p; } IceUtil::Shared* IceInternal::upCast(ProxyOutgoingAsyncBase* p) { return p; } IceUtil::Shared* IceInternal::upCast(OutgoingAsync* p) { return p; } -IceUtil::Shared* IceInternal::upCast(CommunicatorFlushBatch* p) { return p; } +IceUtil::Shared* IceInternal::upCast(CommunicatorFlushBatchAsync* p) { return p; } bool OutgoingAsyncBase::sent() @@ -40,10 +40,17 @@ OutgoingAsyncBase::completed(const Exception& ex) return finished(ex); } -void -OutgoingAsyncBase::retryException(const Exception& ex) +bool +OutgoingAsyncBase::completed() +{ + assert(false); // Must be overriden by request that can handle responses + return false; +} + +BasicStream* +OutgoingAsyncBase::getIs() { - assert(false); + return 0; // Must be overriden by request that can handle responses } OutgoingAsyncBase::OutgoingAsyncBase(const CommunicatorPtr& communicator, @@ -129,7 +136,7 @@ ProxyOutgoingAsyncBase::retryException(const Exception& ex) // require could end up waiting for the flush of the // connection to be done. // - handleRetryException(ex); + _proxy->__updateRequestHandler(_handler, 0); // Clear request handler and always retry. _instance->retryQueue()->add(this, 0); } catch(const Ice::Exception& exc) @@ -238,9 +245,9 @@ ProxyOutgoingAsyncBase::invokeImpl(bool userThread) } return; // We're done! } - catch(const RetryException& ex) + catch(const RetryException&) { - handleRetryException(*ex.get()); + _proxy->__updateRequestHandler(_handler, 0); // Clear request handler and always retry. } catch(const Exception& ex) { @@ -267,8 +274,8 @@ ProxyOutgoingAsyncBase::invokeImpl(bool userThread) // // If called from the user thread we re-throw, the exception // will be catch by the caller and abort() will be called. - // - if(userThread) + // + if(userThread) { throw; } @@ -313,12 +320,6 @@ ProxyOutgoingAsyncBase::finished(bool ok) return AsyncResult::finished(ok); } -void -ProxyOutgoingAsyncBase::handleRetryException(const Ice::Exception&) -{ - _proxy->__setRequestHandler(_handler, 0); // Clear request handler and always retry. -} - int ProxyOutgoingAsyncBase::handleException(const Exception& exc) { @@ -338,8 +339,8 @@ ProxyOutgoingAsyncBase::runTimerTask() } } -OutgoingAsync::OutgoingAsync(const ObjectPrx& prx, - const string& operation, +OutgoingAsync::OutgoingAsync(const ObjectPrx& prx, + const string& operation, const CallbackBasePtr& delegate, const LocalObjectPtr& cookie) : ProxyOutgoingAsyncBase(prx, operation, delegate, cookie), @@ -368,26 +369,7 @@ OutgoingAsync::prepare(const string& operation, OperationMode mode, const Contex case Reference::ModeBatchOneway: case Reference::ModeBatchDatagram: { - while(true) - { - try - { - _handler = _proxy->__getRequestHandler(); - _handler->prepareBatchRequest(&_os); - break; - } - catch(const RetryException&) - { - _proxy->__setRequestHandler(_handler, 0); // Clear request handler and retry. - } - catch(const LocalException& ex) - { - _observer.failed(ex.ice_name()); - _proxy->__setRequestHandler(_handler, 0); // Clear request handler - _handler = 0; - throw; - } - } + _proxy->__getBatchRequestQueue()->prepareBatchRequest(&_os); break; } } @@ -445,16 +427,16 @@ OutgoingAsync::sent() } AsyncStatus -OutgoingAsync::send(const ConnectionIPtr& connection, bool compress, bool response) +OutgoingAsync::invokeRemote(const ConnectionIPtr& connection, bool compress, bool response) { _cachedConnection = connection; - return connection->sendAsyncRequest(this, compress, response); + return connection->sendAsyncRequest(this, compress, response, 0); } AsyncStatus OutgoingAsync::invokeCollocated(CollocatedRequestHandler* handler) { - return handler->invokeAsyncRequest(this); + return handler->invokeAsyncRequest(this, 0); } void @@ -463,17 +445,14 @@ OutgoingAsync::abort(const Exception& ex) const Reference::Mode mode = _proxy->__reference()->getMode(); if(mode == Reference::ModeBatchOneway || mode == Reference::ModeBatchDatagram) { - if(_handler) - { - // - // If we didn't finish a batch oneway or datagram request, we - // must notify the connection about that we give up ownership - // of the batch stream. - // - _handler->abortBatchRequest(); - } + // + // If we didn't finish a batch oneway or datagram request, we + // must notify the connection about that we give up ownership + // of the batch stream. + // + _proxy->__getBatchRequestQueue()->abortBatchRequest(&_os); } - + ProxyOutgoingAsyncBase::abort(ex); } @@ -483,12 +462,9 @@ OutgoingAsync::invoke() const Reference::Mode mode = _proxy->__reference()->getMode(); if(mode == Reference::ModeBatchOneway || mode == Reference::ModeBatchDatagram) { - if(_handler) - { - _sentSynchronously = true; - _handler->finishBatchRequest(&_os); - finished(true); - } + _sentSynchronously = true; + _proxy->__getBatchRequestQueue()->finishBatchRequest(&_os, _proxy, getOperation()); + finished(true); return; // Don't call sent/completed callback for batch AMI requests } @@ -645,50 +621,58 @@ OutgoingAsync::completed() } } -ProxyFlushBatch::ProxyFlushBatch(const ObjectPrx& proxy, - const string& operation, - const CallbackBasePtr& delegate, - const LocalObjectPtr& cookie) : +ProxyFlushBatchAsync::ProxyFlushBatchAsync(const ObjectPrx& proxy, + const string& operation, + const CallbackBasePtr& delegate, + const LocalObjectPtr& cookie) : ProxyOutgoingAsyncBase(proxy, operation, delegate, cookie) { _observer.attach(proxy.get(), operation, 0); + _batchRequestNum = proxy->__getBatchRequestQueue()->swap(&_os); } AsyncStatus -ProxyFlushBatch::send(const ConnectionIPtr& connection, bool, bool) +ProxyFlushBatchAsync::invokeRemote(const ConnectionIPtr& connection, bool compress, bool) { + if(_batchRequestNum == 0) + { + if(sent()) + { + return static_cast<AsyncStatus>(AsyncStatusSent | AsyncStatusInvokeSentCallback); + } + else + { + return AsyncStatusSent; + } + } _cachedConnection = connection; - return connection->flushAsyncBatchRequests(this); + return connection->sendAsyncRequest(this, compress, false, _batchRequestNum); } AsyncStatus -ProxyFlushBatch::invokeCollocated(CollocatedRequestHandler* handler) +ProxyFlushBatchAsync::invokeCollocated(CollocatedRequestHandler* handler) { - return handler->invokeAsyncBatchRequests(this); + if(_batchRequestNum == 0) + { + if(sent()) + { + return static_cast<AsyncStatus>(AsyncStatusSent | AsyncStatusInvokeSentCallback); + } + else + { + return AsyncStatusSent; + } + } + return handler->invokeAsyncRequest(this, _batchRequestNum); } void -ProxyFlushBatch::invoke() +ProxyFlushBatchAsync::invoke() { checkSupportedProtocol(getCompatibleProtocol(_proxy->__reference()->getProtocol())); invokeImpl(true); // userThread = true } -void -ProxyFlushBatch::handleRetryException(const Ice::Exception& ex) -{ - _proxy->__setRequestHandler(_handler, 0); // Clear request handler - ex.ice_throw(); // No retries, we want to notify the user of potentially lost batch requests -} - -int -ProxyFlushBatch::handleException(const Exception& ex) -{ - _proxy->__setRequestHandler(_handler, 0); // Clear request handler - ex.ice_throw(); // No retries, we want to notify the user of potentially lost batch requests - return 0; -} - ProxyGetConnection::ProxyGetConnection(const ObjectPrx& prx, const string& operation, const CallbackBasePtr& delegate, @@ -699,7 +683,7 @@ ProxyGetConnection::ProxyGetConnection(const ObjectPrx& prx, } AsyncStatus -ProxyGetConnection::send(const ConnectionIPtr& connection, bool, bool) +ProxyGetConnection::invokeRemote(const ConnectionIPtr& connection, bool, bool) { _cachedConnection = connection; if(finished(true)) @@ -725,29 +709,43 @@ ProxyGetConnection::invoke() invokeImpl(true); // userThread = true } -ConnectionFlushBatch::ConnectionFlushBatch(const ConnectionIPtr& connection, - const CommunicatorPtr& communicator, - const InstancePtr& instance, - const string& operation, - const CallbackBasePtr& delegate, - const LocalObjectPtr& cookie) : +ConnectionFlushBatchAsync::ConnectionFlushBatchAsync(const ConnectionIPtr& connection, + const CommunicatorPtr& communicator, + const InstancePtr& instance, + const string& operation, + const CallbackBasePtr& delegate, + const LocalObjectPtr& cookie) : OutgoingAsyncBase(communicator, instance, operation, delegate, cookie), _connection(connection) { _observer.attach(instance.get(), operation); } -ConnectionPtr -ConnectionFlushBatch::getConnection() const +ConnectionPtr +ConnectionFlushBatchAsync::getConnection() const { return _connection; } void -ConnectionFlushBatch::invoke() +ConnectionFlushBatchAsync::invoke() { try { - AsyncStatus status = _connection->flushAsyncBatchRequests(this); + AsyncStatus status; + int batchRequestNum = _connection->getBatchRequestQueue()->swap(&_os); + if(batchRequestNum == 0) + { + status = AsyncStatusSent; + if(sent()) + { + status = static_cast<AsyncStatus>(status | AsyncStatusInvokeSentCallback); + } + } + else + { + status = _connection->sendAsyncRequest(this, false, false, batchRequestNum); + } + if(status & AsyncStatusSent) { _sentSynchronously = true; @@ -757,6 +755,13 @@ ConnectionFlushBatch::invoke() } } } + catch(const RetryException& ex) + { + if(completed(*ex.get())) + { + invokeCompletedAsync(); + } + } catch(const Exception& ex) { if(completed(ex)) @@ -766,11 +771,11 @@ ConnectionFlushBatch::invoke() } } -CommunicatorFlushBatch::CommunicatorFlushBatch(const CommunicatorPtr& communicator, - const InstancePtr& instance, - const string& operation, - const CallbackBasePtr& cb, - const LocalObjectPtr& cookie) : +CommunicatorFlushBatchAsync::CommunicatorFlushBatchAsync(const CommunicatorPtr& communicator, + const InstancePtr& instance, + const string& operation, + const CallbackBasePtr& cb, + const LocalObjectPtr& cookie) : AsyncResult(communicator, instance, operation, cb, cookie) { _observer.attach(instance.get(), operation); @@ -784,17 +789,17 @@ CommunicatorFlushBatch::CommunicatorFlushBatch(const CommunicatorPtr& communicat } void -CommunicatorFlushBatch::flushConnection(const ConnectionIPtr& con) +CommunicatorFlushBatchAsync::flushConnection(const ConnectionIPtr& con) { class FlushBatch : public OutgoingAsyncBase { public: - - FlushBatch(const CommunicatorFlushBatchPtr& outAsync, - const InstancePtr& instance, + + FlushBatch(const CommunicatorFlushBatchAsyncPtr& outAsync, + const InstancePtr& instance, InvocationObserver& observer) : OutgoingAsyncBase(outAsync->getCommunicator(), instance, outAsync->getOperation(), __dummyCallback, 0), - _outAsync(outAsync), + _outAsync(outAsync), _observer(observer) { } @@ -821,7 +826,7 @@ CommunicatorFlushBatch::flushConnection(const ConnectionIPtr& con) return _observer; } - const CommunicatorFlushBatchPtr _outAsync; + const CommunicatorFlushBatchAsyncPtr _outAsync; InvocationObserver& _observer; }; @@ -832,7 +837,16 @@ CommunicatorFlushBatch::flushConnection(const ConnectionIPtr& con) try { - con->flushAsyncBatchRequests(new FlushBatch(this, _instance, _observer)); + IceUtil::Handle<FlushBatch> flushBatch = new FlushBatch(this, _instance, _observer); + int batchRequestNum = con->getBatchRequestQueue()->swap(flushBatch->getOs()); + if(batchRequestNum == 0) + { + flushBatch->sent(); + } + else + { + con->sendAsyncRequest(flushBatch, false, false, batchRequestNum); + } } catch(const LocalException&) { @@ -842,13 +856,13 @@ CommunicatorFlushBatch::flushConnection(const ConnectionIPtr& con) } void -CommunicatorFlushBatch::ready() +CommunicatorFlushBatchAsync::ready() { check(true); } void -CommunicatorFlushBatch::check(bool userThread) +CommunicatorFlushBatchAsync::check(bool userThread) { { IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor); diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index db0a0c0826c..48e85f9dc36 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -14,7 +14,6 @@ #include <Ice/ObjectAdapterFactory.h> #include <Ice/Outgoing.h> #include <Ice/OutgoingAsync.h> -#include <Ice/RequestHandlerFactory.h> #include <Ice/Reference.h> #include <Ice/EndpointI.h> #include <Ice/Instance.h> @@ -1359,7 +1358,7 @@ IceProxy::Ice::Object::ice_getConnection() } catch(const IceInternal::RetryException&) { - __setRequestHandler(handler, 0); // Clear request handler and retry. + __updateRequestHandler(handler, 0); // Clear request handler and retry. } catch(const Exception& ex) { @@ -1430,7 +1429,7 @@ IceProxy::Ice::Object::ice_getCachedConnection() const void IceProxy::Ice::Object::ice_flushBatchRequests() { - FlushBatch og(this, ice_flushBatchRequests_name); + ProxyFlushBatch og(this, ice_flushBatchRequests_name); og.invoke(); } @@ -1438,7 +1437,7 @@ IceProxy::Ice::Object::ice_flushBatchRequests() IceProxy::Ice::Object::begin_ice_flushBatchRequestsInternal(const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie) { - ProxyFlushBatchPtr result = new ProxyFlushBatch(this, ice_flushBatchRequests_name, del, cookie); + ProxyFlushBatchAsyncPtr result = new ProxyFlushBatchAsync(this, ice_flushBatchRequests_name, del, cookie); try { result->invoke(); @@ -1478,7 +1477,7 @@ IceProxy::Ice::Object::__handleException(const Exception& ex, bool sent, int& cnt) { - __setRequestHandler(handler, 0); // Clear the request handler + __updateRequestHandler(handler, 0); // Clear the request handler // // We only retry local exception, system exceptions aren't retried. @@ -1624,19 +1623,39 @@ IceProxy::Ice::Object::__getRequestHandler() { return _requestHandler; } - handler = _reference->getInstance()->requestHandlerFactory()->getRequestHandler(_reference, this); - _requestHandler = handler; } - else + return _reference->getRequestHandler(this); +} + +IceInternal::BatchRequestQueuePtr +IceProxy::Ice::Object::__getBatchRequestQueue() +{ + IceUtil::Mutex::Lock sync(_mutex); + if(!_batchRequestQueue) + { + _batchRequestQueue = _reference->getBatchRequestQueue(); + } + return _batchRequestQueue; +} + +::IceInternal::RequestHandlerPtr +IceProxy::Ice::Object::__setRequestHandler(const ::IceInternal::RequestHandlerPtr& handler) +{ + if(_reference->getCacheConnection()) { - handler = _reference->getInstance()->requestHandlerFactory()->getRequestHandler(_reference, this); + IceUtil::Mutex::Lock sync(_mutex); + if(!_requestHandler) + { + _requestHandler = handler; + } + return _requestHandler; } - return handler->connect(this); + return handler; } void -IceProxy::Ice::Object::__setRequestHandler(const ::IceInternal::RequestHandlerPtr& previous, - const ::IceInternal::RequestHandlerPtr& handler) +IceProxy::Ice::Object::__updateRequestHandler(const ::IceInternal::RequestHandlerPtr& previous, + const ::IceInternal::RequestHandlerPtr& handler) { if(_reference->getCacheConnection() && previous) { diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index 63abb0d5e13..5bbfd7e27f6 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -24,6 +24,8 @@ #include <Ice/LoggerUtil.h> #include <Ice/TraceLevels.h> #include <Ice/HashUtil.h> +#include <Ice/RequestHandlerFactory.h> +#include <Ice/ConnectionRequestHandler.h> #include <Ice/DefaultsAndOverrides.h> #include <IceUtil/StringUtil.h> #include <IceUtil/Random.h> @@ -143,7 +145,7 @@ IceInternal::Reference::changeInvocationTimeout(int invocationTimeout) const r->_invocationTimeout = invocationTimeout; return r; } - + ReferencePtr IceInternal::Reference::changeEncoding(const Ice::EncodingVersion& encoding) const { @@ -155,7 +157,7 @@ IceInternal::Reference::changeEncoding(const Ice::EncodingVersion& encoding) con r->_encoding = encoding; return r; } - + ReferencePtr IceInternal::Reference::changeCompress(bool newCompress) const { @@ -315,7 +317,7 @@ IceInternal::Reference::toString() const // Always print the encoding version to ensure a stringified proxy // will convert back to a proxy with the same encoding with // stringToProxy (and won't use Ice.Default.EncodingVersion). - // + // s << " -e " << _encoding; return s.str(); @@ -365,7 +367,7 @@ IceInternal::Reference::operator==(const Reference& r) const return false; } - if(_encoding != r._encoding) + if(_encoding != r._encoding) { return false; } @@ -460,25 +462,25 @@ IceInternal::Reference::operator<(const Reference& r) const { return true; } - else if(r._protocol < _protocol) + else if(r._protocol < _protocol) { return false; } - if(_encoding < r._encoding) + if(_encoding < r._encoding) { return true; } - else if(r._encoding < _encoding) + else if(r._encoding < _encoding) { return false; } - if(_invocationTimeout < r._invocationTimeout) + if(_invocationTimeout < r._invocationTimeout) { return true; } - else if(r._invocationTimeout < _invocationTimeout) + else if(r._invocationTimeout < _invocationTimeout) { return false; } @@ -508,10 +510,10 @@ public: } }; -IceInternal::Reference::Reference(const InstancePtr& instance, - const CommunicatorPtr& communicator, +IceInternal::Reference::Reference(const InstancePtr& instance, + const CommunicatorPtr& communicator, const Identity& id, - const string& facet, + const string& facet, Mode mode, bool secure, const ProtocolVersion& protocol, @@ -576,10 +578,10 @@ IceInternal::Reference::hashInit() const IceUtil::Shared* IceInternal::upCast(IceInternal::FixedReference* p) { return p; } -IceInternal::FixedReference::FixedReference(const InstancePtr& instance, - const CommunicatorPtr& communicator, +IceInternal::FixedReference::FixedReference(const InstancePtr& instance, + const CommunicatorPtr& communicator, const Identity& id, - const string& facet, + const string& facet, Mode mode, bool secure, const EncodingVersion& encoding, @@ -750,75 +752,76 @@ IceInternal::FixedReference::toProperty(const string&) const return PropertyDict(); // To keep the compiler from complaining. } -void -IceInternal::FixedReference::getConnection(const GetConnectionCallbackPtr& callback) const +RequestHandlerPtr +IceInternal::FixedReference::getRequestHandler(const Ice::ObjectPrx& proxy) const { - try + switch(getMode()) { - switch(getMode()) - { - case Reference::ModeTwoway: - case Reference::ModeOneway: - case Reference::ModeBatchOneway: - { - if(_fixedConnection->endpoint()->datagram()) - { - throw NoEndpointException(__FILE__, __LINE__, ""); - } - break; - } - - case Reference::ModeDatagram: - case Reference::ModeBatchDatagram: + case Reference::ModeTwoway: + case Reference::ModeOneway: + case Reference::ModeBatchOneway: + { + if(_fixedConnection->endpoint()->datagram()) { - if(!_fixedConnection->endpoint()->datagram()) - { - throw NoEndpointException(__FILE__, __LINE__, ""); - } - break; - } + throw NoEndpointException(__FILE__, __LINE__, ""); } + break; + } - // - // If a secure connection is requested or secure overrides is set, - // check if the connection is secure. - // - bool secure; - DefaultsAndOverridesPtr defaultsAndOverrides = getInstance()->defaultsAndOverrides(); - if(defaultsAndOverrides->overrideSecure) - { - secure = defaultsAndOverrides->overrideSecureValue; - } - else - { - secure = getSecure(); - } - if(secure && !_fixedConnection->endpoint()->secure()) + case Reference::ModeDatagram: + case Reference::ModeBatchDatagram: + { + if(!_fixedConnection->endpoint()->datagram()) { throw NoEndpointException(__FILE__, __LINE__, ""); } + break; + } + } - _fixedConnection->throwException(); // Throw in case our connection is already destroyed. - - bool compress; - if(defaultsAndOverrides->overrideCompress) - { - compress = defaultsAndOverrides->overrideCompressValue; - } - else if(_overrideCompress) - { - compress = _compress; - } - else - { - compress = _fixedConnection->endpoint()->compress(); - } - callback->setConnection(_fixedConnection, compress); + // + // If a secure connection is requested or secure overrides is set, + // check if the connection is secure. + // + bool secure; + DefaultsAndOverridesPtr defaultsAndOverrides = getInstance()->defaultsAndOverrides(); + if(defaultsAndOverrides->overrideSecure) + { + secure = defaultsAndOverrides->overrideSecureValue; + } + else + { + secure = getSecure(); + } + if(secure && !_fixedConnection->endpoint()->secure()) + { + throw NoEndpointException(__FILE__, __LINE__, ""); + } + + _fixedConnection->throwException(); // Throw in case our connection is already destroyed. + + bool compress; + if(defaultsAndOverrides->overrideCompress) + { + compress = defaultsAndOverrides->overrideCompressValue; + } + else if(_overrideCompress) + { + compress = _compress; } - catch(const Ice::LocalException& ex) + else { - callback->setException(ex); + compress = _fixedConnection->endpoint()->compress(); } + + ReferencePtr ref = const_cast<FixedReference*>(this); + return proxy->__setRequestHandler(new ConnectionRequestHandler(ref, _fixedConnection, compress)); +} + +BatchRequestQueuePtr +IceInternal::FixedReference::getBatchRequestQueue() const +{ + return _fixedConnection->getBatchRequestQueue(); } bool @@ -857,7 +860,7 @@ IceInternal::FixedReference::operator<(const Reference& r) const { return false; } - + const FixedReference* rhs = dynamic_cast<const FixedReference*>(&r); if(!rhs) { @@ -881,12 +884,12 @@ IceInternal::FixedReference::FixedReference(const FixedReference& r) : IceUtil::Shared* IceInternal::upCast(IceInternal::RoutableReference* p) { return p; } -IceInternal::RoutableReference::RoutableReference(const InstancePtr& instance, +IceInternal::RoutableReference::RoutableReference(const InstancePtr& instance, const CommunicatorPtr& communicator, - const Identity& id, + const Identity& id, const string& facet, - Mode mode, - bool secure, + Mode mode, + bool secure, const ProtocolVersion& protocol, const EncodingVersion& encoding, const vector<EndpointIPtr>& endpoints, @@ -895,7 +898,7 @@ IceInternal::RoutableReference::RoutableReference(const InstancePtr& instance, const RouterInfoPtr& routerInfo, bool collocationOptimized, bool cacheConnection, - bool preferSecure, + bool preferSecure, EndpointSelectionType endpointSelection, int locatorCacheTimeout, int invocationTimeout, @@ -1501,6 +1504,18 @@ IceInternal::RoutableReference::clone() const return new RoutableReference(*this); } +RequestHandlerPtr +IceInternal::RoutableReference::getRequestHandler(const Ice::ObjectPrx& proxy) const +{ + return getInstance()->requestHandlerFactory()->getRequestHandler(const_cast<RoutableReference*>(this), proxy); +} + +BatchRequestQueuePtr +IceInternal::RoutableReference::getBatchRequestQueue() const +{ + return new BatchRequestQueue(getInstance(), getMode() == Reference::ModeBatchDatagram); +} + void IceInternal::RoutableReference::getConnection(const GetConnectionCallbackPtr& callback) const { @@ -1650,7 +1665,7 @@ IceInternal::RoutableReference::getConnectionNoRouterInfo(const GetConnectionCal createConnection(_endpoints, callback); return; } - + if(_locatorInfo) { RoutableReference* self = const_cast<RoutableReference*>(this); @@ -1685,7 +1700,7 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all virtual void setConnection(const Ice::ConnectionIPtr& connection, bool compress) - { + { // // If we have a router, set the object adapter for this router // (if any) to the new connection, so that callbacks from the @@ -1703,7 +1718,7 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all { _callback->setException(ex); } - + CB1(const RouterInfoPtr& routerInfo, const GetConnectionCallbackPtr& callback) : _routerInfo(routerInfo), _callback(callback) { @@ -1750,21 +1765,21 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all { _exception.reset(ex.ice_clone()); } - + if(++_i == _endpoints.size()) { _callback->setException(*_exception.get()); return; } - + const bool more = _i != _endpoints.size() - 1; vector<EndpointIPtr> endpoint; endpoint.push_back(_endpoints[_i]); - + OutgoingConnectionFactoryPtr factory = _reference->getInstance()->outgoingConnectionFactory(); factory->create(endpoint, more, _reference->getEndpointSelection(), this); } - + CB2(const RoutableReferencePtr& reference, const vector<EndpointIPtr>& endpoints, const GetConnectionCallbackPtr& callback) : _reference(reference), diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h index d2de0c7ac2d..a8d1b773c46 100644 --- a/cpp/src/Ice/Reference.h +++ b/cpp/src/Ice/Reference.h @@ -20,6 +20,8 @@ #include <Ice/RouterInfoF.h> #include <Ice/LocatorInfoF.h> #include <Ice/ConnectionIF.h> +#include <Ice/RequestHandlerF.h> +#include <Ice/BatchRequestQueue.h> #include <Ice/SharedContext.h> #include <Ice/Identity.h> #include <Ice/Protocol.h> @@ -37,7 +39,7 @@ public: class GetConnectionCallback : virtual public IceUtil::Shared { public: - + virtual void setConnection(const Ice::ConnectionIPtr&, bool) = 0; virtual void setException(const Ice::LocalException&) = 0; }; @@ -103,7 +105,7 @@ public: virtual ReferencePtr changeTimeout(int) const = 0; virtual ReferencePtr changeConnectionId(const std::string&) const = 0; - + int hash() const; // Conceptually const. // @@ -130,7 +132,8 @@ public: // // Get a suitable connection for this reference. // - virtual void getConnection(const GetConnectionCallbackPtr&) const = 0; + virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const = 0; + virtual BatchRequestQueuePtr getBatchRequestQueue() const = 0; virtual bool operator==(const Reference&) const; virtual bool operator!=(const Reference&) const; @@ -205,7 +208,8 @@ public: virtual std::string toString() const; virtual Ice::PropertyDict toProperty(const std::string&) const; - virtual void getConnection(const GetConnectionCallbackPtr&) const; + virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const; + virtual BatchRequestQueuePtr getBatchRequestQueue() const; virtual bool operator==(const Reference&) const; virtual bool operator!=(const Reference&) const; @@ -226,7 +230,7 @@ public: RoutableReference(const InstancePtr&, const Ice::CommunicatorPtr&, const Ice::Identity&, const std::string&, Mode, bool, const Ice::ProtocolVersion&, const Ice::EncodingVersion&, const std::vector<EndpointIPtr>&, - const std::string&, const LocatorInfoPtr&, const RouterInfoPtr&, bool, bool, bool, + const std::string&, const LocatorInfoPtr&, const RouterInfoPtr&, bool, bool, bool, Ice::EndpointSelectionType, int, int, const Ice::Context&); virtual std::vector<EndpointIPtr> getEndpoints() const; @@ -268,8 +272,11 @@ public: virtual ReferencePtr clone() const; - virtual void getConnection(const GetConnectionCallbackPtr&) const; - virtual void getConnectionNoRouterInfo(const GetConnectionCallbackPtr&) const; + virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const; + virtual BatchRequestQueuePtr getBatchRequestQueue() const; + + void getConnection(const GetConnectionCallbackPtr&) const; + void getConnectionNoRouterInfo(const GetConnectionCallbackPtr&) const; void createConnection(const std::vector<EndpointIPtr>&, const GetConnectionCallbackPtr&) const; void applyOverrides(std::vector<EndpointIPtr>&) const; @@ -283,7 +290,7 @@ protected: virtual int hashInit() const; private: - + std::vector<EndpointIPtr> _endpoints; // Empty if indirect proxy. std::string _adapterId; // Empty if direct proxy. diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h index 7900c055a03..03a55f7773d 100644 --- a/cpp/src/Ice/RequestHandler.h +++ b/cpp/src/Ice/RequestHandler.h @@ -32,6 +32,7 @@ namespace IceInternal class BasicStream; class OutgoingBase; +class ProxyOutgoingBase; // // An exception wrapper, which is used to notify that the request @@ -63,15 +64,10 @@ class RequestHandler : public CancellationHandler { public: - virtual RequestHandlerPtr connect(const Ice::ObjectPrx&) = 0; virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&) = 0; - virtual void prepareBatchRequest(BasicStream*) = 0; - virtual void finishBatchRequest(BasicStream*) = 0; - virtual void abortBatchRequest() = 0; - - virtual bool sendRequest(OutgoingBase*) = 0; - virtual AsyncStatus sendAsyncRequest(const OutgoingAsyncBasePtr&) = 0; + virtual bool sendRequest(ProxyOutgoingBase*) = 0; + virtual AsyncStatus sendAsyncRequest(const ProxyOutgoingAsyncBasePtr&) = 0; const ReferencePtr& getReference() const { return _reference; } // Inlined for performances. diff --git a/cpp/src/Ice/RequestHandlerFactory.cpp b/cpp/src/Ice/RequestHandlerFactory.cpp index 0ca1ce15115..0b2d0ff10ed 100644 --- a/cpp/src/Ice/RequestHandlerFactory.cpp +++ b/cpp/src/Ice/RequestHandlerFactory.cpp @@ -22,49 +22,57 @@ RequestHandlerFactory::RequestHandlerFactory(const InstancePtr& instance) : _ins { } -RequestHandlerPtr -IceInternal::RequestHandlerFactory::getRequestHandler(const ReferencePtr& ref, const Ice::ObjectPrx& proxy) +RequestHandlerPtr +IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr& ref, const Ice::ObjectPrx& proxy) { if(ref->getCollocationOptimized()) { Ice::ObjectAdapterPtr adapter = _instance->objectAdapterFactory()->findObjectAdapter(proxy); if(adapter) { - return new CollocatedRequestHandler(ref, adapter); + return proxy->__setRequestHandler(new CollocatedRequestHandler(ref, adapter)); } } + ConnectRequestHandlerPtr handler; + bool connect = false; if(ref->getCacheConnection()) { Lock sync(*this); - - map<ReferencePtr, RequestHandlerPtr>::iterator p = _handlers.find(ref); - if(p != _handlers.end()) + map<ReferencePtr, ConnectRequestHandlerPtr>::iterator p = _handlers.find(ref); + if(p == _handlers.end()) { - return p->second; + handler = new ConnectRequestHandler(ref, proxy); + _handlers.insert(make_pair(ref, handler)); + connect = true; + } + else + { + handler = p->second; } - - RequestHandlerPtr handler = new ConnectRequestHandler(ref, proxy); - _handlers.insert(make_pair(ref, handler)); - return handler; } else { - return new ConnectRequestHandler(ref, proxy); + handler = new ConnectRequestHandler(ref, proxy); + connect = true; } + if(connect) + { + ref->getConnection(handler.get()); + } + return proxy->__setRequestHandler(handler->connect(proxy)); } -void +void IceInternal::RequestHandlerFactory::removeRequestHandler(const ReferencePtr& ref, const RequestHandlerPtr& handler) { if(ref->getCacheConnection()) { Lock sync(*this); - map<ReferencePtr, RequestHandlerPtr>::iterator p = _handlers.find(ref); + map<ReferencePtr, ConnectRequestHandlerPtr>::iterator p = _handlers.find(ref); if(p != _handlers.end() && p->second.get() == handler.get()) { _handlers.erase(p); } } } - diff --git a/cpp/src/Ice/RequestHandlerFactory.h b/cpp/src/Ice/RequestHandlerFactory.h index b71e73455b6..6a9aec0114d 100644 --- a/cpp/src/Ice/RequestHandlerFactory.h +++ b/cpp/src/Ice/RequestHandlerFactory.h @@ -14,6 +14,7 @@ #include <IceUtil/Mutex.h> #include <Ice/RequestHandlerF.h> +#include <Ice/ConnectRequestHandlerF.h> #include <Ice/ProxyF.h> #include <Ice/ReferenceF.h> #include <Ice/InstanceF.h> @@ -26,14 +27,14 @@ class RequestHandlerFactory : public IceUtil::Shared, private IceUtil::Mutex public: RequestHandlerFactory(const InstancePtr&); - - RequestHandlerPtr getRequestHandler(const ReferencePtr&, const Ice::ObjectPrx&); + + RequestHandlerPtr getRequestHandler(const RoutableReferencePtr&, const Ice::ObjectPrx&); void removeRequestHandler(const ReferencePtr&, const RequestHandlerPtr&); private: const InstancePtr _instance; - std::map<ReferencePtr, RequestHandlerPtr> _handlers; + std::map<ReferencePtr, ConnectRequestHandlerPtr> _handlers; }; } diff --git a/cpp/src/Ice/winrt/Makefile.mak b/cpp/src/Ice/winrt/Makefile.mak index 2a8a242b0bf..0eb005f1ebe 100644 --- a/cpp/src/Ice/winrt/Makefile.mak +++ b/cpp/src/Ice/winrt/Makefile.mak @@ -18,6 +18,7 @@ OBJS = $(ARCH)\$(CONFIG)\Acceptor.obj \ $(ARCH)\$(CONFIG)\Base64.obj \ $(ARCH)\$(CONFIG)\Buffer.obj \ $(ARCH)\$(CONFIG)\BasicStream.obj \ + $(ARCH)\$(CONFIG)\BatchRequestQueue.obj \ $(ARCH)\$(CONFIG)\BuiltinSequences.obj \ $(ARCH)\$(CONFIG)\CommunicatorI.obj \ $(ARCH)\$(CONFIG)\Communicator.obj \ diff --git a/cpp/src/IceBox/.depend.mak b/cpp/src/IceBox/.depend.mak index 3ed1ab2f67c..4557da6387c 100755 --- a/cpp/src/IceBox/.depend.mak +++ b/cpp/src/IceBox/.depend.mak @@ -58,6 +58,7 @@ Service.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -80,6 +81,7 @@ Service.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -183,6 +185,7 @@ ServiceManagerI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -205,6 +208,7 @@ ServiceManagerI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -325,6 +329,7 @@ Admin.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -347,6 +352,7 @@ Admin.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -435,6 +441,7 @@ IceBox.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -518,6 +525,7 @@ Exception.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ diff --git a/cpp/src/IceDiscovery/.depend.mak b/cpp/src/IceDiscovery/.depend.mak index fa677259f17..8b10504c3bd 100755 --- a/cpp/src/IceDiscovery/.depend.mak +++ b/cpp/src/IceDiscovery/.depend.mak @@ -42,6 +42,7 @@ LocatorI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -134,6 +135,7 @@ LookupI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -185,6 +187,7 @@ LookupI.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "LookupI.h" \ "IceDiscovery.h" \ "LocatorI.h" \ @@ -254,6 +257,7 @@ PluginI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -275,6 +279,7 @@ PluginI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -360,6 +365,7 @@ IceDiscovery.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ diff --git a/cpp/src/IceGrid/.depend.mak b/cpp/src/IceGrid/.depend.mak index 23a52167f57..7593c7e4e53 100755 --- a/cpp/src/IceGrid/.depend.mak +++ b/cpp/src/IceGrid/.depend.mak @@ -80,6 +80,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -102,6 +103,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -203,6 +205,7 @@ DescriptorBuilder.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -315,6 +318,7 @@ DescriptorHelper.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -337,6 +341,7 @@ DescriptorHelper.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -450,6 +455,7 @@ DescriptorParser.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -472,6 +478,7 @@ DescriptorParser.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -573,6 +580,7 @@ FileParserI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -687,6 +695,7 @@ Parser.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -708,6 +717,7 @@ Parser.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -824,6 +834,7 @@ Util.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -846,6 +857,7 @@ Util.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -944,6 +956,7 @@ Internal.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1041,6 +1054,7 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1137,6 +1151,7 @@ Grammar.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1159,6 +1174,7 @@ Grammar.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1265,6 +1281,7 @@ Scanner.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1287,6 +1304,7 @@ Scanner.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1394,6 +1412,7 @@ AdminRouter.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1416,6 +1435,7 @@ AdminRouter.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1499,6 +1519,7 @@ FileCache.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1588,6 +1609,7 @@ PlatformInfo.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1704,6 +1726,7 @@ SessionManager.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1726,6 +1749,7 @@ SessionManager.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1823,6 +1847,7 @@ TraceLevels.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1919,6 +1944,7 @@ Activator.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1941,6 +1967,7 @@ Activator.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -2052,6 +2079,7 @@ NodeAdminRouter.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ @@ -2115,6 +2143,7 @@ NodeAdminRouter.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ @@ -2201,6 +2230,7 @@ NodeI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -2223,6 +2253,7 @@ NodeI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -2350,6 +2381,7 @@ NodeSessionManager.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -2372,6 +2404,7 @@ NodeSessionManager.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -2490,6 +2523,7 @@ ServerAdapterI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -2512,6 +2546,7 @@ ServerAdapterI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -2633,6 +2668,7 @@ ServerI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -2655,6 +2691,7 @@ ServerI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -2770,6 +2807,7 @@ AdapterCache.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -2856,6 +2894,7 @@ AdapterCache.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\CommunicatorAsync.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ @@ -2933,6 +2972,7 @@ AdminCallbackRouter.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -2955,6 +2995,7 @@ AdminCallbackRouter.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -3058,6 +3099,7 @@ AdminI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -3080,6 +3122,7 @@ AdminI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -3256,6 +3299,7 @@ AdminSessionI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -3278,6 +3322,7 @@ AdminSessionI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -3443,6 +3488,7 @@ Allocatable.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ @@ -3498,6 +3544,7 @@ Allocatable.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\RemoteLogger.h" \ @@ -3574,6 +3621,7 @@ AllocatableObjectCache.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -3650,6 +3698,7 @@ AllocatableObjectCache.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\CommunicatorAsync.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ @@ -3726,6 +3775,7 @@ Database.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -3776,6 +3826,7 @@ Database.obj: \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -3899,6 +3950,7 @@ FileUserAccountMapperI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -4002,6 +4054,7 @@ IdentityObjectInfoDict.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -4009,6 +4062,7 @@ IdentityObjectInfoDict.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -4117,6 +4171,7 @@ InternalRegistryI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -4139,6 +4194,7 @@ InternalRegistryI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -4307,6 +4363,7 @@ LocatorI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -4329,6 +4386,7 @@ LocatorI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -4489,6 +4547,7 @@ LocatorRegistryI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -4511,6 +4570,7 @@ LocatorRegistryI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -4650,6 +4710,7 @@ NodeCache.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -4732,6 +4793,7 @@ NodeCache.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\CommunicatorAsync.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ @@ -4819,6 +4881,7 @@ NodeSessionI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -4841,6 +4904,7 @@ NodeSessionI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -4978,6 +5042,7 @@ ObjectCache.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -5062,6 +5127,7 @@ ObjectCache.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\CommunicatorAsync.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ @@ -5128,6 +5194,7 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -5194,6 +5261,7 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ @@ -5298,6 +5366,7 @@ QueryI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -5363,6 +5432,7 @@ QueryI.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ @@ -5480,6 +5550,7 @@ ReapThread.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -5502,6 +5573,7 @@ ReapThread.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -5602,6 +5674,7 @@ RegistryAdminRouter.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -5624,6 +5697,7 @@ RegistryAdminRouter.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -5772,6 +5846,7 @@ RegistryI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -5794,6 +5869,7 @@ RegistryI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -5975,6 +6051,7 @@ ReplicaCache.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -6100,6 +6177,7 @@ ReplicaSessionI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -6122,6 +6200,7 @@ ReplicaSessionI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -6273,6 +6352,7 @@ ReplicaSessionManager.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -6295,6 +6375,7 @@ ReplicaSessionManager.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -6464,6 +6545,7 @@ SerialsDict.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -6471,6 +6553,7 @@ SerialsDict.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -6565,6 +6648,7 @@ ServerCache.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -6647,6 +6731,7 @@ ServerCache.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\CommunicatorAsync.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ @@ -6726,6 +6811,7 @@ SessionI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -6748,6 +6834,7 @@ SessionI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -6904,6 +6991,7 @@ SessionServantManager.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -6942,6 +7030,7 @@ SessionServantManager.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -7058,6 +7147,7 @@ StringAdapterInfoDict.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -7065,6 +7155,7 @@ StringAdapterInfoDict.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -7190,6 +7281,7 @@ StringApplicationInfoDict.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -7197,6 +7289,7 @@ StringApplicationInfoDict.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -7304,6 +7397,7 @@ Topics.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -7326,6 +7420,7 @@ Topics.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -7428,6 +7523,7 @@ WellKnownObjectsManager.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -7494,6 +7590,7 @@ WellKnownObjectsManager.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ @@ -7615,6 +7712,7 @@ IceGridNode.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -7637,6 +7735,7 @@ IceGridNode.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -7776,6 +7875,7 @@ IceGridRegistry.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -7798,6 +7898,7 @@ IceGridRegistry.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/src/IceGridLib/.depend.mak b/cpp/src/IceGridLib/.depend.mak index e9afd2e4634..8c45d59ffd5 100755 --- a/cpp/src/IceGridLib/.depend.mak +++ b/cpp/src/IceGridLib/.depend.mak @@ -140,6 +140,7 @@ PluginFacadeI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -233,6 +234,7 @@ Admin.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -324,6 +326,7 @@ Descriptor.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -462,6 +465,7 @@ FileParser.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -554,6 +558,7 @@ Locator.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -639,6 +644,7 @@ Observer.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -731,6 +737,7 @@ PluginFacade.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -823,6 +830,7 @@ Query.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -906,6 +914,7 @@ Registry.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -999,6 +1008,7 @@ Session.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1087,6 +1097,7 @@ UserAccountMapper.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ diff --git a/cpp/src/IceLocatorDiscovery/.depend.mak b/cpp/src/IceLocatorDiscovery/.depend.mak index ae7b8155e87..895bb7af000 100755 --- a/cpp/src/IceLocatorDiscovery/.depend.mak +++ b/cpp/src/IceLocatorDiscovery/.depend.mak @@ -65,6 +65,7 @@ PluginI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -86,6 +87,7 @@ PluginI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -169,6 +171,7 @@ IceLocatorDiscovery.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ diff --git a/cpp/src/IcePatch2/.depend.mak b/cpp/src/IcePatch2/.depend.mak index 7b932fe9474..427a64f2942 100755 --- a/cpp/src/IcePatch2/.depend.mak +++ b/cpp/src/IcePatch2/.depend.mak @@ -54,6 +54,7 @@ FileServerI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -76,6 +77,7 @@ FileServerI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -180,6 +182,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -202,6 +205,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -305,6 +309,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -327,6 +332,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -431,6 +437,7 @@ Calc.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -453,6 +460,7 @@ Calc.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/src/IcePatch2Lib/.depend.mak b/cpp/src/IcePatch2Lib/.depend.mak index 75812348d16..790dbe71f1a 100755 --- a/cpp/src/IcePatch2Lib/.depend.mak +++ b/cpp/src/IcePatch2Lib/.depend.mak @@ -61,6 +61,7 @@ ClientUtil.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -83,6 +84,7 @@ ClientUtil.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -197,6 +199,7 @@ Util.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -218,6 +221,7 @@ Util.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -352,6 +356,7 @@ FileServer.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ diff --git a/cpp/src/IceSSL/.depend.mak b/cpp/src/IceSSL/.depend.mak index 2852f15e97c..df64d3b2d8e 100755 --- a/cpp/src/IceSSL/.depend.mak +++ b/cpp/src/IceSSL/.depend.mak @@ -54,6 +54,7 @@ ConnectionInfo.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -183,6 +184,7 @@ AcceptorI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -245,6 +247,7 @@ AcceptorI.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "..\..\src\Ice\ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -323,6 +326,7 @@ Certificate.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -397,6 +401,7 @@ ConnectorI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -453,6 +458,7 @@ ConnectorI.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "..\..\src\Ice\ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -547,6 +553,7 @@ EndpointI.obj: \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ @@ -602,6 +609,7 @@ EndpointI.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "..\..\src\Ice\ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -663,6 +671,7 @@ Instance.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -717,6 +726,7 @@ Instance.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "..\..\src\Ice\ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -784,6 +794,7 @@ PluginI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -842,6 +853,7 @@ PluginI.obj: \ "..\..\src\Ice\NetworkProxyF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "..\..\src\Ice\ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -912,6 +924,7 @@ RFC2253.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -984,6 +997,7 @@ SChannelEngine.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1085,6 +1099,7 @@ SChannelTransceiverI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1147,6 +1162,7 @@ SChannelTransceiverI.obj: \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "..\..\src\Ice\ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -1215,6 +1231,7 @@ SSLEngine.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1318,6 +1335,7 @@ TrustManager.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1413,6 +1431,7 @@ Util.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ diff --git a/cpp/src/IceStorm/.depend.mak b/cpp/src/IceStorm/.depend.mak index 01b2097ccdc..cf9512a82e7 100755 --- a/cpp/src/IceStorm/.depend.mak +++ b/cpp/src/IceStorm/.depend.mak @@ -146,6 +146,7 @@ Instance.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -199,6 +200,7 @@ Instance.obj: \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -297,6 +299,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -339,6 +342,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\MetricsFunctional.h" \ "Instrumentation.h" \ "$(includedir)\IceStorm\IceStorm.h" \ @@ -423,6 +427,7 @@ LLUMap.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -430,6 +435,7 @@ LLUMap.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -541,6 +547,7 @@ NodeI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -562,6 +569,7 @@ NodeI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -668,6 +676,7 @@ Observers.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -690,6 +699,7 @@ Observers.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -800,6 +810,7 @@ Service.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -850,6 +861,7 @@ Service.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -945,6 +957,7 @@ Subscriber.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1009,6 +1022,7 @@ Subscriber.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -1129,6 +1143,7 @@ SubscriberMap.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -1136,6 +1151,7 @@ SubscriberMap.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1243,6 +1259,7 @@ TopicI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1265,6 +1282,7 @@ TopicI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1403,6 +1421,7 @@ TopicManagerI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1425,6 +1444,7 @@ TopicManagerI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1551,6 +1571,7 @@ TraceLevels.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1627,6 +1648,7 @@ TransientTopicI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1685,6 +1707,7 @@ TransientTopicI.obj: \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -1776,6 +1799,7 @@ TransientTopicManagerI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1834,6 +1858,7 @@ TransientTopicManagerI.obj: \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -1921,6 +1946,7 @@ Util.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1943,6 +1969,7 @@ Util.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -2074,6 +2101,7 @@ V31FormatDB.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -2081,6 +2109,7 @@ V31FormatDB.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -2208,6 +2237,7 @@ V32FormatDB.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -2215,6 +2245,7 @@ V32FormatDB.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -2312,6 +2343,7 @@ Election.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -2398,6 +2430,7 @@ IceStormInternal.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -2485,6 +2518,7 @@ Instrumentation.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -2569,6 +2603,7 @@ LinkRecord.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -2705,6 +2740,7 @@ SubscriberRecord.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -2789,6 +2825,7 @@ V31Format.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -2878,6 +2915,7 @@ V32Format.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -2983,6 +3021,7 @@ Admin.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -3005,6 +3044,7 @@ Admin.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -3106,6 +3146,7 @@ Parser.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -3128,6 +3169,7 @@ Parser.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -3232,6 +3274,7 @@ Grammar.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -3254,6 +3297,7 @@ Grammar.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -3355,6 +3399,7 @@ Scanner.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -3377,6 +3422,7 @@ Scanner.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -3481,6 +3527,7 @@ Migrate.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -3503,6 +3550,7 @@ Migrate.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/src/IceStormLib/.depend.mak b/cpp/src/IceStormLib/.depend.mak index c1fa8542c61..90076091925 100755 --- a/cpp/src/IceStormLib/.depend.mak +++ b/cpp/src/IceStormLib/.depend.mak @@ -50,6 +50,7 @@ IceStorm.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -134,6 +135,7 @@ Metrics.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ diff --git a/cpp/src/iceserviceinstall/.depend.mak b/cpp/src/iceserviceinstall/.depend.mak index a4d538923d7..fd954d1c20e 100755 --- a/cpp/src/iceserviceinstall/.depend.mak +++ b/cpp/src/iceserviceinstall/.depend.mak @@ -50,6 +50,7 @@ ServiceInstaller.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -72,6 +73,7 @@ ServiceInstaller.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -176,6 +178,7 @@ Install.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -198,6 +201,7 @@ Install.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Freeze/complex/.depend.mak b/cpp/test/Freeze/complex/.depend.mak index 31fd1cf343d..80aa948d527 100755 --- a/cpp/test/Freeze/complex/.depend.mak +++ b/cpp/test/Freeze/complex/.depend.mak @@ -40,6 +40,7 @@ Complex.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -118,6 +119,7 @@ Grammar.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -202,6 +204,7 @@ Scanner.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -224,6 +227,7 @@ Scanner.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -313,6 +317,7 @@ Parser.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -396,6 +401,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -418,6 +424,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -557,6 +564,7 @@ ComplexDict.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -564,6 +572,7 @@ ComplexDict.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Freeze/dbmap/.depend.mak b/cpp/test/Freeze/dbmap/.depend.mak index c7e86b008a0..ffe393126d3 100755 --- a/cpp/test/Freeze/dbmap/.depend.mak +++ b/cpp/test/Freeze/dbmap/.depend.mak @@ -67,6 +67,7 @@ ByteIntMap.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -74,6 +75,7 @@ ByteIntMap.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -191,6 +193,7 @@ IntIdentityMap.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -198,6 +201,7 @@ IntIdentityMap.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -315,6 +319,7 @@ IntIdentityMapWithIndex.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -322,6 +327,7 @@ IntIdentityMapWithIndex.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -439,6 +445,7 @@ SortedMap.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -446,6 +453,7 @@ SortedMap.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -563,6 +571,7 @@ WstringWstringMap.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -570,6 +579,7 @@ WstringWstringMap.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -681,6 +691,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -702,6 +713,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Freeze/evictor/.depend.mak b/cpp/test/Freeze/evictor/.depend.mak index 7e119098dcc..07f9dbfbd0f 100755 --- a/cpp/test/Freeze/evictor/.depend.mak +++ b/cpp/test/Freeze/evictor/.depend.mak @@ -41,6 +41,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -133,6 +134,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -155,6 +157,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -262,6 +265,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -284,6 +288,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -416,6 +421,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -437,6 +443,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Freeze/fileLock/.depend.mak b/cpp/test/Freeze/fileLock/.depend.mak index 931bfb2d2b1..13e4e97ec53 100755 --- a/cpp/test/Freeze/fileLock/.depend.mak +++ b/cpp/test/Freeze/fileLock/.depend.mak @@ -61,6 +61,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -82,6 +83,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -202,6 +204,7 @@ ClientFail.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -223,6 +226,7 @@ ClientFail.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/FreezeScript/dbmap/.depend.mak b/cpp/test/FreezeScript/dbmap/.depend.mak index 98c7a8ecb9c..5be964193fc 100755 --- a/cpp/test/FreezeScript/dbmap/.depend.mak +++ b/cpp/test/FreezeScript/dbmap/.depend.mak @@ -40,6 +40,7 @@ TestOld.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -149,6 +150,7 @@ IntSMap.obj: \ "$(includedir)\Ice\EndpointF.h" \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\AsyncResultF.h" \ @@ -156,6 +158,7 @@ IntSMap.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -268,6 +271,7 @@ makedb.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -289,6 +293,7 @@ makedb.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/FreezeScript/evictor/.depend.mak b/cpp/test/FreezeScript/evictor/.depend.mak index ff112f05711..ba18ba9015d 100755 --- a/cpp/test/FreezeScript/evictor/.depend.mak +++ b/cpp/test/FreezeScript/evictor/.depend.mak @@ -40,6 +40,7 @@ TestOld.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -133,6 +134,7 @@ makedb.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -155,6 +157,7 @@ makedb.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Glacier2/attack/.depend.mak b/cpp/test/Glacier2/attack/.depend.mak index 1b0ae0b505b..7913e56c685 100755 --- a/cpp/test/Glacier2/attack/.depend.mak +++ b/cpp/test/Glacier2/attack/.depend.mak @@ -40,6 +40,7 @@ Backend.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ BackendI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ BackendI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -250,6 +253,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -272,6 +276,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -381,6 +386,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -403,6 +409,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Glacier2/dynamicFiltering/.depend.mak b/cpp/test/Glacier2/dynamicFiltering/.depend.mak index 1f03e205d3c..0be9673d56e 100755 --- a/cpp/test/Glacier2/dynamicFiltering/.depend.mak +++ b/cpp/test/Glacier2/dynamicFiltering/.depend.mak @@ -44,6 +44,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -140,6 +141,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -162,6 +164,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -271,6 +274,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -293,6 +297,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -395,6 +400,7 @@ SessionI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -417,6 +423,7 @@ SessionI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -518,6 +525,7 @@ BackendI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -540,6 +548,7 @@ BackendI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -640,6 +649,7 @@ TestControllerI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -662,6 +672,7 @@ TestControllerI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Glacier2/override/.depend.mak b/cpp/test/Glacier2/override/.depend.mak index 1dacbb0f057..5c4d6d584b2 100755 --- a/cpp/test/Glacier2/override/.depend.mak +++ b/cpp/test/Glacier2/override/.depend.mak @@ -41,6 +41,7 @@ Callback.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -131,6 +132,7 @@ CallbackI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -153,6 +155,7 @@ CallbackI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -269,6 +272,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -290,6 +294,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -391,6 +396,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -413,6 +419,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Glacier2/router/.depend.mak b/cpp/test/Glacier2/router/.depend.mak index f5b42e2f092..58434e1ac14 100755 --- a/cpp/test/Glacier2/router/.depend.mak +++ b/cpp/test/Glacier2/router/.depend.mak @@ -41,6 +41,7 @@ Callback.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -133,6 +134,7 @@ CallbackI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -155,6 +157,7 @@ CallbackI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -272,6 +275,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -293,6 +297,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -394,6 +399,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -416,6 +422,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Glacier2/sessionControl/.depend.mak b/cpp/test/Glacier2/sessionControl/.depend.mak index 2bf9ff8af34..123361c48fe 100755 --- a/cpp/test/Glacier2/sessionControl/.depend.mak +++ b/cpp/test/Glacier2/sessionControl/.depend.mak @@ -44,6 +44,7 @@ Session.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -141,6 +142,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -163,6 +165,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -272,6 +275,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -294,6 +298,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -394,6 +399,7 @@ SessionI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -416,6 +422,7 @@ SessionI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Glacier2/sessionHelper/.depend.mak b/cpp/test/Glacier2/sessionHelper/.depend.mak index e06df98b57a..58e0963767d 100755 --- a/cpp/test/Glacier2/sessionHelper/.depend.mak +++ b/cpp/test/Glacier2/sessionHelper/.depend.mak @@ -40,6 +40,7 @@ Callback.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -141,6 +142,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -162,6 +164,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -276,6 +279,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -297,6 +301,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Glacier2/ssl/.depend.mak b/cpp/test/Glacier2/ssl/.depend.mak index f893e8a0ab6..8e0ff8adab6 100755 --- a/cpp/test/Glacier2/ssl/.depend.mak +++ b/cpp/test/Glacier2/ssl/.depend.mak @@ -50,6 +50,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -72,6 +73,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -180,6 +182,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -202,6 +205,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Glacier2/staticFiltering/.depend.mak b/cpp/test/Glacier2/staticFiltering/.depend.mak index d2d54d92ac0..1287067fe22 100755 --- a/cpp/test/Glacier2/staticFiltering/.depend.mak +++ b/cpp/test/Glacier2/staticFiltering/.depend.mak @@ -40,6 +40,7 @@ Backend.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ BackendI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ BackendI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -249,6 +252,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -271,6 +275,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -380,6 +385,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -402,6 +408,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/acm/.depend.mak b/cpp/test/Ice/acm/.depend.mak index a773fafac13..f8991f0fded 100755 --- a/cpp/test/Ice/acm/.depend.mak +++ b/cpp/test/Ice/acm/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -255,6 +258,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -277,6 +281,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -391,6 +396,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -412,6 +418,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -507,6 +514,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -529,6 +537,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/adapterDeactivation/.depend.mak b/cpp/test/Ice/adapterDeactivation/.depend.mak index d09ace720b5..6cb3f66574c 100755 --- a/cpp/test/Ice/adapterDeactivation/.depend.mak +++ b/cpp/test/Ice/adapterDeactivation/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -130,6 +131,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -152,6 +154,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -255,6 +258,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -277,6 +281,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -391,6 +396,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -412,6 +418,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -508,6 +515,7 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -530,6 +538,7 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -636,6 +645,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -658,6 +668,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -762,6 +773,7 @@ Collocated.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -784,6 +796,7 @@ Collocated.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/admin/.depend.mak b/cpp/test/Ice/admin/.depend.mak index 09e17551168..209d5c0aecb 100755 --- a/cpp/test/Ice/admin/.depend.mak +++ b/cpp/test/Ice/admin/.depend.mak @@ -43,6 +43,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -135,6 +136,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -157,6 +159,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -261,6 +264,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -283,6 +287,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -377,6 +382,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -422,6 +428,7 @@ TestI.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ @@ -507,6 +514,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -529,6 +537,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/ami/.depend.mak b/cpp/test/Ice/ami/.depend.mak index c2a7554f069..22f86157e49 100755 --- a/cpp/test/Ice/ami/.depend.mak +++ b/cpp/test/Ice/ami/.depend.mak @@ -44,6 +44,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -136,6 +137,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -158,6 +160,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -262,6 +265,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -284,6 +288,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -378,6 +383,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -423,6 +429,7 @@ TestI.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -508,6 +515,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -530,6 +538,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -635,6 +644,7 @@ Collocated.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -657,6 +667,7 @@ Collocated.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/ami/AllTests.cpp b/cpp/test/Ice/ami/AllTests.cpp index 677955dc8e3..7ae4514bb09 100644 --- a/cpp/test/Ice/ami/AllTests.cpp +++ b/cpp/test/Ice/ami/AllTests.cpp @@ -1241,7 +1241,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) Ice::ObjectPrx obj = ic->stringToProxy(p->ice_toString()); Test::TestIntfPrx p2 = Test::TestIntfPrx::checkedCast(obj); ic->destroy(); - + try { p2->begin_op(); @@ -1820,13 +1820,13 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) Test::TestIntfPrx b1 = p->ice_batchOneway(); b1->opBatch(); b1->ice_getConnection()->close(false); - FlushExCallbackPtr cb = new FlushExCallback(); + FlushCallbackPtr cb = new FlushCallback(); Ice::AsyncResultPtr r = b1->begin_ice_flushBatchRequests( - Ice::newCallback(cb, &FlushExCallback::completedAsync, &FlushExCallback::sentAsync)); + Ice::newCallback(cb, &FlushCallback::completedAsync, &FlushCallback::sentAsync)); cb->check(); - test(!r->isSent()); + test(r->isSent()); test(r->isCompleted()); - test(p->opBatchCount() == 0); + test(p->waitForBatch(1)); } { @@ -1837,11 +1837,11 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) Test::TestIntfPrx b1 = p->ice_batchOneway(); b1->opBatch(); b1->ice_getConnection()->close(false); - FlushExCallbackPtr cb = new FlushExCallback(cookie); + FlushCallbackPtr cb = new FlushCallback(cookie); b1->begin_ice_flushBatchRequests( - Ice::newCallback(cb, &FlushExCallback::completedAsync, &FlushExCallback::sentAsync), cookie); + Ice::newCallback(cb, &FlushCallback::completedAsync, &FlushCallback::sentAsync), cookie); cb->check(); - test(p->opBatchCount() == 0); + test(p->waitForBatch(1)); } } @@ -1855,8 +1855,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) b1->opBatch(); FlushCallbackPtr cb = new FlushCallback(); Ice::AsyncResultPtr r = b1->begin_ice_flushBatchRequests( - Ice::newCallback_Object_ice_flushBatchRequests(cb, &FlushCallback::exception, - &FlushCallback::sent)); + Ice::newCallback_Object_ice_flushBatchRequests(cb, &FlushCallback::exception, &FlushCallback::sent)); cb->check(); test(r->isSent()); test(r->isCompleted()); @@ -1889,14 +1888,14 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) Test::TestIntfPrx b1 = p->ice_batchOneway(); b1->opBatch(); b1->ice_getConnection()->close(false); - FlushExCallbackPtr cb = new FlushExCallback(); + FlushCallbackPtr cb = new FlushCallback(); Ice::AsyncResultPtr r = b1->begin_ice_flushBatchRequests( - Ice::newCallback_Object_ice_flushBatchRequests(cb, &FlushExCallback::exception, - &FlushExCallback::sent)); + Ice::newCallback_Object_ice_flushBatchRequests(cb, &FlushCallback::exception, + &FlushCallback::sent)); cb->check(); - test(!r->isSent()); + test(r->isSent()); test(r->isCompleted()); - test(p->opBatchCount() == 0); + test(p->waitForBatch(1)); } { @@ -1907,12 +1906,12 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) Test::TestIntfPrx b1 = p->ice_batchOneway(); b1->opBatch(); b1->ice_getConnection()->close(false); - FlushExCallbackPtr cb = new FlushExCallback(cookie); + FlushCallbackPtr cb = new FlushCallback(cookie); b1->begin_ice_flushBatchRequests( - Ice::newCallback_Object_ice_flushBatchRequests(cb, &FlushExCallback::exceptionWC, - &FlushExCallback::sentWC), cookie); + Ice::newCallback_Object_ice_flushBatchRequests(cb, &FlushCallback::exceptionWC, + &FlushCallback::sentWC), cookie); cb->check(); - test(p->opBatchCount() == 0); + test(p->waitForBatch(1)); } } } @@ -1944,14 +1943,14 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) Test::TestIntfPrx b1 = p->ice_batchOneway(); b1->opBatch(); b1->ice_getConnection()->close(false); - FlushExCallbackPtr cb = new FlushExCallback(); + FlushCallbackPtr cb = new FlushCallback(); Ice::AsyncResultPtr r = b1->begin_ice_flushBatchRequests( [=](const Ice::Exception& ex){ cb->exception(ex);}, [=](bool sent){ cb->sent(sent); }); cb->check(); - test(!r->isSent()); + test(r->isSent()); test(r->isCompleted()); - test(p->opBatchCount() == 0); + test(p->waitForBatch(1)); } } cout << "ok" << endl; @@ -1968,7 +1967,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // AsyncResult without cookie. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->opBatch(); FlushCallbackPtr cb = new FlushCallback(); @@ -1993,7 +1993,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // AsyncResult with cookie. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->opBatch(); FlushCallbackPtr cb = new FlushCallback(cookie); @@ -2008,7 +2009,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // AsyncResult exception without cookie. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->ice_getConnection()->close(false); FlushExCallbackPtr cb = new FlushExCallback(); @@ -2025,7 +2027,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // AsyncResult exception with cookie. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->ice_getConnection()->close(false); FlushExCallbackPtr cb = new FlushExCallback(cookie); @@ -2040,7 +2043,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // Without cookie. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->opBatch(); FlushCallbackPtr cb = new FlushCallback(); @@ -2057,7 +2061,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // With cookie. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->opBatch(); FlushCallbackPtr cb = new FlushCallback(cookie); @@ -2073,7 +2078,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // Exception without cookie. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->ice_getConnection()->close(false); FlushExCallbackPtr cb = new FlushExCallback(); @@ -2091,7 +2097,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // Exception with cookie. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->ice_getConnection()->close(false); FlushExCallbackPtr cb = new FlushExCallback(cookie); @@ -2113,7 +2120,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // Without cookie. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->opBatch(); FlushCallbackPtr cb = new FlushCallback(); @@ -2132,7 +2140,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // Exception without cookie. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->ice_getConnection()->close(false); FlushExCallbackPtr cb = new FlushExCallback(); @@ -2157,7 +2166,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // AsyncResult without cookie - 1 connection. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->opBatch(); FlushCallbackPtr cb = new FlushCallback(); @@ -2174,7 +2184,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // AsyncResult with cookie - 1 connection. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->opBatch(); FlushCallbackPtr cb = new FlushCallback(cookie); @@ -2189,7 +2200,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // AsyncResult exception without cookie - 1 connection. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->ice_getConnection()->close(false); FlushCallbackPtr cb = new FlushCallback(); @@ -2206,7 +2218,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // AsyncResult exception with cookie - 1 connection. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->ice_getConnection()->close(false); FlushCallbackPtr cb = new FlushCallback(cookie); @@ -2221,8 +2234,11 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // AsyncResult - 2 connections. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); - Test::TestIntfPrx b2 = p->ice_connectionId("2")->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); + Test::TestIntfPrx b2 = Test::TestIntfPrx::uncheckedCast( + p->ice_connectionId("2")->ice_getConnection()->createProxy( + p->ice_getIdentity())->ice_batchOneway()); b2->ice_getConnection(); // Ensure connection is established. b1->opBatch(); b1->opBatch(); @@ -2245,8 +2261,12 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // Exceptions should not be reported. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); - Test::TestIntfPrx b2 = p->ice_connectionId("2")->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); + Test::TestIntfPrx b2 = Test::TestIntfPrx::uncheckedCast( + p->ice_connectionId("2")->ice_getConnection()->createProxy( + p->ice_getIdentity())->ice_batchOneway()); + b2->ice_getConnection(); // Ensure connection is established. b1->opBatch(); b2->opBatch(); @@ -2267,8 +2287,12 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // The sent callback should be invoked even if all connections fail. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); - Test::TestIntfPrx b2 = p->ice_connectionId("2")->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); + Test::TestIntfPrx b2 = Test::TestIntfPrx::uncheckedCast( + p->ice_connectionId("2")->ice_getConnection()->createProxy( + p->ice_getIdentity())->ice_batchOneway()); + b2->ice_getConnection(); // Ensure connection is established. b1->opBatch(); b2->opBatch(); @@ -2288,12 +2312,14 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // Without cookie - 1 connection. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->opBatch(); FlushCallbackPtr cb = new FlushCallback(); Ice::AsyncResultPtr r = communicator->begin_flushBatchRequests( - Ice::newCallback_Communicator_flushBatchRequests(cb, &FlushCallback::exception, &FlushCallback::sent)); + Ice::newCallback_Communicator_flushBatchRequests(cb, &FlushCallback::exception, + &FlushCallback::sent)); cb->check(); test(r->isSent()); test(r->isCompleted()); @@ -2305,7 +2331,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // With cookie - 1 connection. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->opBatch(); FlushCallbackPtr cb = new FlushCallback(cookie); @@ -2321,12 +2348,14 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // Exception without cookie - 1 connection. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->ice_getConnection()->close(false); FlushCallbackPtr cb = new FlushCallback(); Ice::AsyncResultPtr r = communicator->begin_flushBatchRequests( - Ice::newCallback_Communicator_flushBatchRequests(cb, &FlushCallback::exception, &FlushCallback::sent)); + Ice::newCallback_Communicator_flushBatchRequests(cb, &FlushCallback::exception, + &FlushCallback::sent)); cb->check(); test(r->isSent()); // Exceptions are ignored! test(r->isCompleted()); @@ -2338,7 +2367,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // Exception with cookie - 1 connection. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->ice_getConnection()->close(false); FlushCallbackPtr cb = new FlushCallback(cookie); @@ -2354,8 +2384,12 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // 2 connections. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); - Test::TestIntfPrx b2 = p->ice_connectionId("2")->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); + Test::TestIntfPrx b2 = Test::TestIntfPrx::uncheckedCast( + p->ice_connectionId("2")->ice_getConnection()->createProxy( + p->ice_getIdentity())->ice_batchOneway()); + b2->ice_getConnection(); // Ensure connection is established. b1->opBatch(); b1->opBatch(); @@ -2363,7 +2397,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) b2->opBatch(); FlushCallbackPtr cb = new FlushCallback(); Ice::AsyncResultPtr r = communicator->begin_flushBatchRequests( - Ice::newCallback_Communicator_flushBatchRequests(cb, &FlushCallback::exception, &FlushCallback::sent)); + Ice::newCallback_Communicator_flushBatchRequests(cb, &FlushCallback::exception, + &FlushCallback::sent)); cb->check(); test(r->isSent()); test(r->isCompleted()); @@ -2378,15 +2413,20 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // Exceptions should not be reported. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); - Test::TestIntfPrx b2 = p->ice_connectionId("2")->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); + Test::TestIntfPrx b2 = Test::TestIntfPrx::uncheckedCast( + p->ice_connectionId("2")->ice_getConnection()->createProxy( + p->ice_getIdentity())->ice_batchOneway()); + b2->ice_getConnection(); // Ensure connection is established. b1->opBatch(); b2->opBatch(); b1->ice_getConnection()->close(false); FlushCallbackPtr cb = new FlushCallback(); Ice::AsyncResultPtr r = communicator->begin_flushBatchRequests( - Ice::newCallback_Communicator_flushBatchRequests(cb, &FlushCallback::exception, &FlushCallback::sent)); + Ice::newCallback_Communicator_flushBatchRequests(cb, &FlushCallback::exception, + &FlushCallback::sent)); cb->check(); test(r->isSent()); // Exceptions are ignored! test(r->isCompleted()); @@ -2400,8 +2440,12 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // The sent callback should be invoked even if all connections fail. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); - Test::TestIntfPrx b2 = p->ice_connectionId("2")->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); + Test::TestIntfPrx b2 = Test::TestIntfPrx::uncheckedCast( + p->ice_connectionId("2")->ice_getConnection()->createProxy( + p->ice_getIdentity())->ice_batchOneway()); + b2->ice_getConnection(); // Ensure connection is established. b1->opBatch(); b2->opBatch(); @@ -2409,7 +2453,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) b2->ice_getConnection()->close(false); FlushCallbackPtr cb = new FlushCallback(); Ice::AsyncResultPtr r = communicator->begin_flushBatchRequests( - Ice::newCallback_Communicator_flushBatchRequests(cb, &FlushCallback::exception, &FlushCallback::sent)); + Ice::newCallback_Communicator_flushBatchRequests(cb, &FlushCallback::exception, + &FlushCallback::sent)); cb->check(); test(r->isSent()); // Exceptions are ignored! test(r->isCompleted()); @@ -2426,7 +2471,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // Without cookie - 1 connection. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->opBatch(); FlushCallbackPtr cb = new FlushCallback(); @@ -2444,7 +2490,8 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // Exception without cookie - 1 connection. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); b1->opBatch(); b1->ice_getConnection()->close(false); FlushCallbackPtr cb = new FlushCallback(); @@ -2462,8 +2509,12 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // 2 connections. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); - Test::TestIntfPrx b2 = p->ice_connectionId("2")->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); + Test::TestIntfPrx b2 = Test::TestIntfPrx::uncheckedCast( + p->ice_connectionId("2")->ice_getConnection()->createProxy( + p->ice_getIdentity())->ice_batchOneway()); + b2->ice_getConnection(); // Ensure connection is established. b1->opBatch(); b1->opBatch(); @@ -2487,8 +2538,12 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // Exceptions should not be reported. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); - Test::TestIntfPrx b2 = p->ice_connectionId("2")->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); + Test::TestIntfPrx b2 = Test::TestIntfPrx::uncheckedCast( + p->ice_connectionId("2")->ice_getConnection()->createProxy( + p->ice_getIdentity())->ice_batchOneway()); + b2->ice_getConnection(); // Ensure connection is established. b1->opBatch(); b2->opBatch(); @@ -2510,8 +2565,12 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // The sent callback should be invoked even if all connections fail. // test(p->opBatchCount() == 0); - Test::TestIntfPrx b1 = p->ice_batchOneway(); - Test::TestIntfPrx b2 = p->ice_connectionId("2")->ice_batchOneway(); + Test::TestIntfPrx b1 = Test::TestIntfPrx::uncheckedCast( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); + Test::TestIntfPrx b2 = Test::TestIntfPrx::uncheckedCast( + p->ice_connectionId("2")->ice_getConnection()->createProxy( + p->ice_getIdentity())->ice_batchOneway()); + b2->ice_getConnection(); // Ensure connection is established. b1->opBatch(); b2->opBatch(); @@ -2696,7 +2755,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) p->ice_ping(); test(!r1->isSent() && r1->isCompleted()); test(!r2->isSent() && r2->isCompleted()); - + testController->holdAdapter(); r1 = p->begin_op(); r2 = p->begin_ice_id(); diff --git a/cpp/test/Ice/background/.depend.mak b/cpp/test/Ice/background/.depend.mak index dec1a880d7c..4e138638def 100755 --- a/cpp/test/Ice/background/.depend.mak +++ b/cpp/test/Ice/background/.depend.mak @@ -44,6 +44,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -147,6 +148,7 @@ Configuration.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -236,6 +238,7 @@ Connector.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -317,6 +320,7 @@ Acceptor.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -420,6 +424,7 @@ EndpointI.obj: \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -523,6 +528,7 @@ Transceiver.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -623,6 +629,7 @@ EndpointFactory.obj: \ "$(includedir)\Ice\RequestHandlerF.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -714,6 +721,7 @@ PluginI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -740,6 +748,7 @@ PluginI.obj: \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "..\..\..\src\Ice\ProtocolPluginFacade.h" \ "..\..\..\src\Ice\ProtocolPluginFacadeF.h" \ "..\..\..\src\Ice\EndpointFactoryF.h" \ @@ -818,6 +827,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -840,6 +850,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -963,6 +974,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -984,6 +996,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1077,6 +1090,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1136,6 +1150,7 @@ TestI.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\Properties.h" \ @@ -1223,6 +1238,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1245,6 +1261,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/background/AllTests.cpp b/cpp/test/Ice/background/AllTests.cpp index 9b8ea1fce4f..85599f4b8f4 100644 --- a/cpp/test/Ice/background/AllTests.cpp +++ b/cpp/test/Ice/background/AllTests.cpp @@ -62,18 +62,18 @@ class OpAMICallback : public IceUtil::Shared { public: - void + void response() { _response.called(); } - void + void responseNoOp() { } - void + void noResponse() { test(false); @@ -330,11 +330,11 @@ allTests(const Ice::CommunicatorPtr& communicator) background->begin_op(); background->ice_getCachedConnection()->close(true); background->begin_op(); - + vector<Ice::AsyncResultPtr> results; OpAMICallbackPtr cb = new OpAMICallback(); - Callback_Background_opPtr callback = newCallback_Background_op(cb, - &OpAMICallback::responseNoOp, + Callback_Background_opPtr callback = newCallback_Background_op(cb, + &OpAMICallback::responseNoOp, &OpAMICallback::noException); for(int i = 0; i < 10000; ++i) { @@ -408,7 +408,7 @@ connectTests(const ConfigurationPtr& configuration, const Test::BackgroundPrx& b { } test(r->isCompleted()); - + OpAMICallbackPtr cbEx = new OpAMICallback(); r = prx->begin_op(Test::newCallback_Background_op(cbEx, &OpAMICallback::exception)); test(!r->sentSynchronously()); @@ -491,7 +491,7 @@ initializeTests(const ConfigurationPtr& configuration, #endif } BackgroundPrx prx = (i == 1 || i == 3) ? background : background->ice_oneway(); - + try { prx->op(); @@ -805,7 +805,7 @@ validationTests(const ConfigurationPtr& configuration, test(!r->sentSynchronously() && !r2->sentSynchronously()); test(!r->isCompleted() && !r2->isCompleted()); ctl->resumeAdapter(); - background->end_op(r); + background->end_op(r); background->end_op(r2); test(r->isCompleted() && r2->isCompleted()); @@ -875,16 +875,6 @@ validationTests(const ConfigurationPtr& configuration, // // First send small requests to test without auto-flushing. // - backgroundBatchOneway->ice_ping(); - backgroundBatchOneway->ice_getConnection()->close(false); - try - { - backgroundBatchOneway->ice_ping(); - test(false); - } - catch(const Ice::CloseConnectionException&) - { - } ctl->holdAdapter(); backgroundBatchOneway->op(); backgroundBatchOneway->op(); @@ -904,16 +894,6 @@ validationTests(const ConfigurationPtr& configuration, // // Send bigger requests to test with auto-flushing. // - backgroundBatchOneway->ice_ping(); - backgroundBatchOneway->ice_getConnection()->close(false); - try - { - backgroundBatchOneway->ice_ping(); - test(false); - } - catch(const Ice::CloseConnectionException&) - { - } ctl->holdAdapter(); backgroundBatchOneway->opWithPayload(seq); backgroundBatchOneway->opWithPayload(seq); @@ -934,16 +914,6 @@ validationTests(const ConfigurationPtr& configuration, // Then try the same thing with async flush. // - backgroundBatchOneway->ice_ping(); - backgroundBatchOneway->ice_getConnection()->close(false); - try - { - backgroundBatchOneway->ice_ping(); - test(false); - } - catch(const Ice::CloseConnectionException&) - { - } ctl->holdAdapter(); backgroundBatchOneway->op(); backgroundBatchOneway->op(); @@ -953,16 +923,6 @@ validationTests(const ConfigurationPtr& configuration, backgroundBatchOneway->begin_ice_flushBatchRequests(); backgroundBatchOneway->ice_getConnection()->close(false); - backgroundBatchOneway->ice_ping(); - backgroundBatchOneway->ice_getConnection()->close(false); - try - { - backgroundBatchOneway->ice_ping(); - test(false); - } - catch(const Ice::CloseConnectionException&) - { - } ctl->holdAdapter(); backgroundBatchOneway->opWithPayload(seq); backgroundBatchOneway->opWithPayload(seq); @@ -1042,7 +1002,7 @@ readWriteTests(const ConfigurationPtr& configuration, { configuration->readException(0); } - + background->ice_ping(); configuration->readReady(false); // Required in C# to make sure beginRead() doesn't throw too soon. configuration->readException(new Ice::SocketException(__FILE__, __LINE__)); @@ -1198,8 +1158,8 @@ readWriteTests(const ConfigurationPtr& configuration, *p = static_cast<Ice::Byte>(IceUtilInternal::random(255)); } OpAMICallbackPtr cb = new OpAMICallback(); - Callback_Background_opWithPayloadPtr callbackWP = newCallback_Background_opWithPayload(cb, - &OpAMICallback::noResponse, + Callback_Background_opWithPayloadPtr callbackWP = newCallback_Background_opWithPayload(cb, + &OpAMICallback::noResponse, &OpAMICallback::noException); // Fill up the receive and send buffers @@ -1211,14 +1171,14 @@ readWriteTests(const ConfigurationPtr& configuration, Callback_Background_opPtr callback; cb = new OpAMICallback(); Ice::AsyncResultPtr r1 = background->begin_op(newCallback_Background_op(cb, - &OpAMICallback::response, + &OpAMICallback::response, &OpAMICallback::noException, &OpAMICallback::sent)); test(!r1->sentSynchronously() && !r1->isSent()); OpAMICallbackPtr cb2 = new OpAMICallback(); Ice::AsyncResultPtr r2 = background->begin_op(newCallback_Background_op(cb2, - &OpAMICallback::response, + &OpAMICallback::response, &OpAMICallback::noException, &OpAMICallback::sent)); test(!r2->sentSynchronously() && !r2->isSent()); diff --git a/cpp/test/Ice/binding/.depend.mak b/cpp/test/Ice/binding/.depend.mak index 823d5b6499d..58890423051 100755 --- a/cpp/test/Ice/binding/.depend.mak +++ b/cpp/test/Ice/binding/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -256,6 +259,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -278,6 +282,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -382,6 +387,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -404,6 +410,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -501,6 +508,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -523,6 +531,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/checksum/.depend.mak b/cpp/test/Ice/checksum/.depend.mak index 489c635e8d0..05b1a948382 100755 --- a/cpp/test/Ice/checksum/.depend.mak +++ b/cpp/test/Ice/checksum/.depend.mak @@ -44,6 +44,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -123,6 +124,7 @@ Types.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -216,6 +218,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -238,6 +241,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -343,6 +347,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -365,6 +370,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/checksum/server/.depend.mak b/cpp/test/Ice/checksum/server/.depend.mak index a8a781b7498..26f5cca6b39 100755 --- a/cpp/test/Ice/checksum/server/.depend.mak +++ b/cpp/test/Ice/checksum/server/.depend.mak @@ -44,6 +44,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -123,6 +124,7 @@ Types.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -216,6 +218,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -238,6 +241,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -337,6 +341,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -359,6 +364,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/custom/.depend.mak b/cpp/test/Ice/custom/.depend.mak index 249eee50d49..504bee96c8c 100755 --- a/cpp/test/Ice/custom/.depend.mak +++ b/cpp/test/Ice/custom/.depend.mak @@ -49,6 +49,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -97,6 +98,7 @@ Test.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -172,6 +174,7 @@ Wstring.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -263,6 +266,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -285,6 +289,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -394,6 +399,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -416,6 +422,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -529,6 +536,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -587,6 +595,7 @@ TestI.obj: \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ @@ -653,6 +662,7 @@ WstringI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -737,6 +747,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -759,6 +770,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -859,6 +871,7 @@ TestAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -908,6 +921,7 @@ TestAMD.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\Properties.h" \ @@ -982,6 +996,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1040,6 +1055,7 @@ TestAMDI.obj: \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ @@ -1105,6 +1121,7 @@ WstringAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1186,6 +1203,7 @@ WstringAMDI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1271,6 +1289,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1293,6 +1312,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1405,6 +1425,7 @@ Collocated.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1427,6 +1448,7 @@ Collocated.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/defaultServant/.depend.mak b/cpp/test/Ice/defaultServant/.depend.mak index b8433616182..0487c493a62 100755 --- a/cpp/test/Ice/defaultServant/.depend.mak +++ b/cpp/test/Ice/defaultServant/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -248,6 +251,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -270,6 +274,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -374,6 +379,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -396,6 +402,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/defaultValue/.depend.mak b/cpp/test/Ice/defaultValue/.depend.mak index 08dfda03415..318234c4aac 100755 --- a/cpp/test/Ice/defaultValue/.depend.mak +++ b/cpp/test/Ice/defaultValue/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -131,6 +132,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -153,6 +155,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -257,6 +260,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -279,6 +283,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/dispatcher/.depend.mak b/cpp/test/Ice/dispatcher/.depend.mak index 6e0b634c8a8..d242cfe36cc 100755 --- a/cpp/test/Ice/dispatcher/.depend.mak +++ b/cpp/test/Ice/dispatcher/.depend.mak @@ -44,6 +44,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -134,6 +135,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -156,6 +158,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -261,6 +264,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -283,6 +287,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -427,6 +432,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -469,6 +475,7 @@ TestI.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -566,6 +573,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -588,6 +596,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -694,6 +703,7 @@ Collocated.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -716,6 +726,7 @@ Collocated.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/echo/.depend.mak b/cpp/test/Ice/echo/.depend.mak index 9664c9c091b..7087f6eded4 100755 --- a/cpp/test/Ice/echo/.depend.mak +++ b/cpp/test/Ice/echo/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ BlobjectI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ BlobjectI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -247,6 +250,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -269,6 +273,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/enums/.depend.mak b/cpp/test/Ice/enums/.depend.mak index 8a65ec7c790..91092585253 100755 --- a/cpp/test/Ice/enums/.depend.mak +++ b/cpp/test/Ice/enums/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -130,6 +131,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -152,6 +154,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -256,6 +259,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -278,6 +282,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -382,6 +387,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -404,6 +410,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -501,6 +508,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -523,6 +531,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/exceptions/.depend.mak b/cpp/test/Ice/exceptions/.depend.mak index c6d317b88a7..44a4f33af25 100755 --- a/cpp/test/Ice/exceptions/.depend.mak +++ b/cpp/test/Ice/exceptions/.depend.mak @@ -45,6 +45,7 @@ ExceptionsI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -118,6 +119,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -209,6 +211,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -231,6 +234,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -335,6 +339,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -357,6 +362,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -461,6 +467,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -483,6 +490,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -588,6 +596,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -610,6 +619,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -703,6 +713,7 @@ TestAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -795,6 +806,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -817,6 +829,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -922,6 +935,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -944,6 +958,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1049,6 +1064,7 @@ Collocated.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1071,6 +1087,7 @@ Collocated.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/facets/.depend.mak b/cpp/test/Ice/facets/.depend.mak index ab669cc88a5..c593f3ff035 100755 --- a/cpp/test/Ice/facets/.depend.mak +++ b/cpp/test/Ice/facets/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -255,6 +258,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -277,6 +281,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -381,6 +386,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -403,6 +409,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -500,6 +507,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -522,6 +530,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -627,6 +636,7 @@ Collocated.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -649,6 +659,7 @@ Collocated.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/faultTolerance/.depend.mak b/cpp/test/Ice/faultTolerance/.depend.mak index 16237f2e302..c20ad846394 100755 --- a/cpp/test/Ice/faultTolerance/.depend.mak +++ b/cpp/test/Ice/faultTolerance/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -255,6 +258,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -277,6 +281,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -381,6 +386,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -403,6 +409,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -500,6 +507,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -522,6 +530,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/gc/.depend.mak b/cpp/test/Ice/gc/.depend.mak index e10a49de33e..e00b420d319 100755 --- a/cpp/test/Ice/gc/.depend.mak +++ b/cpp/test/Ice/gc/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -133,6 +134,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -155,6 +157,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/hash/.depend.mak b/cpp/test/Ice/hash/.depend.mak index ac85e3ab998..53836359452 100755 --- a/cpp/test/Ice/hash/.depend.mak +++ b/cpp/test/Ice/hash/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -131,6 +132,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -153,6 +155,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/hold/.depend.mak b/cpp/test/Ice/hold/.depend.mak index 3ed5114cd1a..aa4076ce9c6 100755 --- a/cpp/test/Ice/hold/.depend.mak +++ b/cpp/test/Ice/hold/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -255,6 +258,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -277,6 +281,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -382,6 +387,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -404,6 +410,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -509,6 +516,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -531,6 +539,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/info/.depend.mak b/cpp/test/Ice/info/.depend.mak index caed5955b7e..daac6e77dd2 100755 --- a/cpp/test/Ice/info/.depend.mak +++ b/cpp/test/Ice/info/.depend.mak @@ -45,6 +45,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -134,6 +135,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -156,6 +158,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -266,6 +269,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -288,6 +292,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -392,6 +397,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -414,6 +420,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -524,6 +531,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -546,6 +554,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/inheritance/.depend.mak b/cpp/test/Ice/inheritance/.depend.mak index 52235f97871..df857defd93 100755 --- a/cpp/test/Ice/inheritance/.depend.mak +++ b/cpp/test/Ice/inheritance/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -131,6 +132,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -153,6 +155,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -257,6 +260,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -279,6 +283,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -383,6 +388,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -405,6 +411,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -502,6 +509,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -524,6 +532,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -629,6 +638,7 @@ Collocated.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -651,6 +661,7 @@ Collocated.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/interceptor/.depend.mak b/cpp/test/Ice/interceptor/.depend.mak index 50dd23fb627..7edc313e563 100755 --- a/cpp/test/Ice/interceptor/.depend.mak +++ b/cpp/test/Ice/interceptor/.depend.mak @@ -52,6 +52,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -74,6 +75,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -182,6 +184,7 @@ InterceptorI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -204,6 +207,7 @@ InterceptorI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -311,6 +315,7 @@ AMDInterceptorI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -333,6 +338,7 @@ AMDInterceptorI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -437,6 +443,7 @@ MyObjectI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -459,6 +466,7 @@ MyObjectI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -552,6 +560,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -644,6 +653,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -666,6 +676,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/invoke/.depend.mak b/cpp/test/Ice/invoke/.depend.mak index 835ac082371..10c8a4a78ee 100755 --- a/cpp/test/Ice/invoke/.depend.mak +++ b/cpp/test/Ice/invoke/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -131,6 +132,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -153,6 +155,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -257,6 +260,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -279,6 +283,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -383,6 +388,7 @@ BlobjectI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -405,6 +411,7 @@ BlobjectI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -510,6 +517,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -532,6 +540,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/location/.depend.mak b/cpp/test/Ice/location/.depend.mak index 4a4d0cc61c0..55e2563a388 100755 --- a/cpp/test/Ice/location/.depend.mak +++ b/cpp/test/Ice/location/.depend.mak @@ -43,6 +43,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -137,6 +138,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -159,6 +161,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -263,6 +266,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -285,6 +289,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -389,6 +394,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -411,6 +417,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -509,6 +516,7 @@ ServerLocator.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -531,6 +539,7 @@ ServerLocator.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -636,6 +645,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -658,6 +668,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/logger/.depend.mak b/cpp/test/Ice/logger/.depend.mak index d20d9bc890d..4b89449fb7d 100755 --- a/cpp/test/Ice/logger/.depend.mak +++ b/cpp/test/Ice/logger/.depend.mak @@ -49,6 +49,7 @@ Client1.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -71,6 +72,7 @@ Client1.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -174,6 +176,7 @@ Client2.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -196,6 +199,7 @@ Client2.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -299,6 +303,7 @@ Client3.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -321,6 +326,7 @@ Client3.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -424,6 +430,7 @@ Client4.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -446,6 +453,7 @@ Client4.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/metrics/.depend.mak b/cpp/test/Ice/metrics/.depend.mak index 1d312c8301b..3db7cdb344c 100755 --- a/cpp/test/Ice/metrics/.depend.mak +++ b/cpp/test/Ice/metrics/.depend.mak @@ -43,6 +43,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -134,6 +135,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -156,6 +158,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -261,6 +264,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -283,6 +287,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -388,6 +393,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -410,6 +416,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -507,6 +514,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -529,6 +537,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -622,6 +631,7 @@ TestAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -714,6 +724,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -736,6 +747,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -833,6 +845,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -855,6 +868,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -960,6 +974,7 @@ Collocated.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -982,6 +997,7 @@ Collocated.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/networkProxy/.depend.mak b/cpp/test/Ice/networkProxy/.depend.mak index e63ef7adc13..3cd86a16033 100755 --- a/cpp/test/Ice/networkProxy/.depend.mak +++ b/cpp/test/Ice/networkProxy/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -255,6 +258,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -277,6 +281,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -381,6 +386,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -403,6 +409,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/objects/.depend.mak b/cpp/test/Ice/objects/.depend.mak index abb5f5419b5..8a508652cba 100755 --- a/cpp/test/Ice/objects/.depend.mak +++ b/cpp/test/Ice/objects/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -131,6 +132,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -153,6 +155,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -250,6 +253,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -272,6 +276,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -377,6 +382,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -399,6 +405,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -503,6 +510,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -525,6 +533,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -630,6 +639,7 @@ Collocated.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -652,6 +662,7 @@ Collocated.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/operations/.depend.mak b/cpp/test/Ice/operations/.depend.mak index da5096226d1..4216a04cded 100755 --- a/cpp/test/Ice/operations/.depend.mak +++ b/cpp/test/Ice/operations/.depend.mak @@ -53,6 +53,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -144,6 +145,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -166,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -270,6 +273,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -292,6 +296,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -396,6 +401,7 @@ Twoways.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -418,6 +424,7 @@ Twoways.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -522,6 +529,7 @@ Oneways.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -544,6 +552,7 @@ Oneways.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -648,6 +657,7 @@ TwowaysAMI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -670,6 +680,7 @@ TwowaysAMI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -774,6 +785,7 @@ OnewaysAMI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -796,6 +808,7 @@ OnewaysAMI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -900,6 +913,7 @@ BatchOneways.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -922,6 +936,7 @@ BatchOneways.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1026,6 +1041,7 @@ BatchOnewaysAMI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1048,6 +1064,7 @@ BatchOnewaysAMI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1152,6 +1169,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1174,6 +1192,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1279,6 +1298,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1301,6 +1321,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1394,6 +1415,7 @@ TestAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1425,9 +1447,11 @@ TestAMD.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -1484,6 +1508,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1506,6 +1531,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1611,6 +1637,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1633,6 +1660,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1738,6 +1766,7 @@ Collocated.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1760,6 +1789,7 @@ Collocated.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/operations/BatchOneways.cpp b/cpp/test/Ice/operations/BatchOneways.cpp index 26f4541fa77..e34456d7207 100644 --- a/cpp/test/Ice/operations/BatchOneways.cpp +++ b/cpp/test/Ice/operations/BatchOneways.cpp @@ -13,31 +13,74 @@ using namespace std; -void -batchOneways(const Test::MyClassPrx& p) +namespace { - const Test::ByteS bs1(10 * 1024); - const Test::ByteS bs2(99 * 1024); - try + +class BatchRequestInterceptorI : public Ice::BatchRequestInterceptor +{ +public: + + BatchRequestInterceptorI() : _enabled(false), _count(0), _size(0), _lastRequestSize(0) { - p->opByteSOneway(bs1); } - catch(const Ice::MemoryLimitException&) + + virtual void + enqueue(const Ice::BatchRequest& request, Ice::Int count, Ice::Int size) { - test(false); + test(request.getOperation() == "opByteSOneway" || request.getOperation() == "ice_ping"); + test(request.getProxy()->ice_isBatchOneway()); + + if(count > 0) + { + test(_lastRequestSize + _size == size); + } + _count = count; + _size = size; + + if(_size + request.getSize() > 25000) + { + request.getProxy()->begin_ice_flushBatchRequests(); + _size = 18; // header + } + + if(_enabled) + { + _lastRequestSize = request.getSize(); + ++_count; + request.enqueue(); + } } - try + void + enqueue(bool enabled) { - p->opByteSOneway(bs2); + _enabled = enabled; } - catch(const Ice::MemoryLimitException&) + + int + count() { - test(false); + return _count; } +private: + + bool _enabled; + int _count; + int _size; + int _lastRequestSize; +}; + +} + +void +batchOneways(const Test::MyClassPrx& p) +{ + const Test::ByteS bs1(10 * 1024); + Test::MyClassPrx batch = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway()); - batch->ice_flushBatchRequests(); + + batch->ice_flushBatchRequests(); // Empty flush int i; p->opByteSOnewayCallCount(); // Reset the call count @@ -62,39 +105,22 @@ batchOneways(const Test::MyClassPrx& p) if(batch->ice_getConnection()) { - batch->ice_getConnection()->flushBatchRequests(); - + Test::MyClassPrx batch1 = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway()); Test::MyClassPrx batch2 = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway()); - batch->ice_ping(); + batch1->ice_ping(); batch2->ice_ping(); - batch->ice_flushBatchRequests(); - batch->ice_getConnection()->close(false); - batch->ice_ping(); + batch1->ice_flushBatchRequests(); + batch1->ice_getConnection()->close(false); + batch1->ice_ping(); batch2->ice_ping(); - batch->ice_getConnection(); + batch1->ice_getConnection(); batch2->ice_getConnection(); - batch->ice_ping(); - batch->ice_getConnection()->close(false); - try - { - batch->ice_ping(); - test(false); - } - catch(const Ice::CloseConnectionException&) - { - } - try - { - batch2->ice_ping(); - test(false); - } - catch(const Ice::CloseConnectionException&) - { - } - batch->ice_ping(); + batch1->ice_ping(); + batch1->ice_getConnection()->close(false); + batch1->ice_ping(); batch2->ice_ping(); } @@ -109,4 +135,54 @@ batchOneways(const Test::MyClassPrx& p) batch->ice_ping(); batch->ice_flushBatchRequests(); batch->ice_ping(); + + if(batch->ice_getConnection()) + { + Ice::InitializationData initData; + initData.properties = p->ice_getCommunicator()->getProperties()->clone(); + BatchRequestInterceptorI* interceptor = new BatchRequestInterceptorI; + +#ifdef ICE_CPP11 + // Ensure lambda factory method works. + initData.batchRequestInterceptor = Ice::newBatchRequestInterceptor( + [=](const Ice::BatchRequest& request, int count, int size) + { + interceptor->enqueue(request, count, size); + }); +#else + initData.batchRequestInterceptor = interceptor; +#endif + Ice::CommunicatorPtr ic = Ice::initialize(initData); + + Test::MyClassPrx batch = + Test::MyClassPrx::uncheckedCast(ic->stringToProxy(p->ice_toString()))->ice_batchOneway(); + + test(interceptor->count() == 0); + batch->ice_ping(); + batch->ice_ping(); + batch->ice_ping(); + test(interceptor->count() == 0); + + interceptor->enqueue(true); + batch->ice_ping(); + batch->ice_ping(); + batch->ice_ping(); + test(interceptor->count() == 3); + + batch->ice_flushBatchRequests(); + batch->ice_ping(); + test(interceptor->count() == 1); + + batch->opByteSOneway(bs1); + test(interceptor->count() == 2); + batch->opByteSOneway(bs1); + test(interceptor->count() == 3); + + batch->opByteSOneway(bs1); // This should trigger the flush + batch->ice_ping(); + test(interceptor->count() == 2); + + ic->destroy(); + } + } diff --git a/cpp/test/Ice/operations/BatchOnewaysAMI.cpp b/cpp/test/Ice/operations/BatchOnewaysAMI.cpp index 27f4f2e1b45..876a60eac52 100644 --- a/cpp/test/Ice/operations/BatchOnewaysAMI.cpp +++ b/cpp/test/Ice/operations/BatchOnewaysAMI.cpp @@ -53,28 +53,7 @@ private: }; typedef IceUtil::Handle<Callback> CallbackPtr; -class Callback_ByteSOneway1 : public IceUtil::Shared -{ - CallbackPtr _cb; - -public: - - Callback_ByteSOneway1(const CallbackPtr& cb) : _cb(cb) - { - } - - void response() - { - _cb->called(); - } - - void exception(const ::Ice::Exception&) - { - test(false); - } -}; - -class Callback_ByteSOneway3 : public IceUtil::Shared +class Callback_ByteSOneway : public IceUtil::Shared { public: @@ -115,57 +94,48 @@ void batchOnewaysAMI(const Test::MyClassPrx& p) { const Test::ByteS bs1(10 * 1024); - const Test::ByteS bs2(99 * 1024); - const Test::ByteS bs3(100 * 1024); - - CallbackPtr cb = new Callback(); - p->begin_opByteSOneway(bs1, Test::newCallback_MyClass_opByteSOneway(new Callback_ByteSOneway1(cb), - &Callback_ByteSOneway1::response, &Callback_ByteSOneway1::exception)); - cb->check(); - - p->begin_opByteSOneway(bs2, Test::newCallback_MyClass_opByteSOneway(new Callback_ByteSOneway1(cb), - &Callback_ByteSOneway1::response, &Callback_ByteSOneway1::exception)); - cb->check(); Test::MyClassPrx batch = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway()); - batch->end_ice_flushBatchRequests(batch->begin_ice_flushBatchRequests()); + batch->end_ice_flushBatchRequests(batch->begin_ice_flushBatchRequests()); // Empty flush - int i; + test(batch->begin_ice_flushBatchRequests()->isSent()); // Empty flush + test(batch->begin_ice_flushBatchRequests()->isCompleted()); // Empty flush + test(batch->begin_ice_flushBatchRequests()->sentSynchronously()); // Empty flush - for(i = 0 ; i < 30 ; ++i) + for(int i = 0 ; i < 30 ; ++i) { - p->begin_opByteSOneway(bs1, Test::newCallback_MyClass_opByteSOneway(new Callback_ByteSOneway3(), - &Callback_ByteSOneway3::response, - &Callback_ByteSOneway3::exception)); + batch->begin_opByteSOneway(bs1, Test::newCallback_MyClass_opByteSOneway(new Callback_ByteSOneway(), + &Callback_ByteSOneway::response, + &Callback_ByteSOneway::exception)); } - - if(batch->ice_getConnection()) + + int count = 0; + while(count < 27) // 3 * 9 requests auto-flushed. { - batch->ice_getConnection()->end_flushBatchRequests(batch->ice_getConnection()->begin_flushBatchRequests()); + count += p->opByteSOnewayCallCount(); + IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(10)); + } + if(batch->ice_getConnection()) + { + Test::MyClassPrx batch1 = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway()); Test::MyClassPrx batch2 = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway()); - batch->begin_ice_ping(); - batch2->begin_ice_ping(); - batch->end_ice_flushBatchRequests(batch->begin_ice_flushBatchRequests()); - batch->ice_getConnection()->close(false); - batch->begin_ice_ping(); - batch2->begin_ice_ping(); + batch1->end_ice_ping(batch1->begin_ice_ping()); + batch2->end_ice_ping(batch2->begin_ice_ping()); + batch1->end_ice_flushBatchRequests(batch1->begin_ice_flushBatchRequests()); + batch1->ice_getConnection()->close(false); + batch1->end_ice_ping(batch1->begin_ice_ping()); + batch2->end_ice_ping(batch2->begin_ice_ping()); - batch->ice_getConnection(); + batch1->ice_getConnection(); batch2->ice_getConnection(); - batch->begin_ice_ping(); - batch->ice_getConnection()->close(false); - - batch->begin_ice_ping(Ice::newCallback_Object_ice_ping(new Callback_ping(cb), &Callback_ping::response, &Callback_ping::exception)); - cb->check(); - - batch2->begin_ice_ping(Ice::newCallback_Object_ice_ping(new Callback_ping(cb), &Callback_ping::response, &Callback_ping::exception)); - cb->check(); + batch1->end_ice_ping(batch1->begin_ice_ping()); + batch1->ice_getConnection()->close(false); - batch->begin_ice_ping(); - batch2->begin_ice_ping(); + batch1->end_ice_ping(batch1->begin_ice_ping()); + batch2->end_ice_ping(batch2->begin_ice_ping()); } Ice::Identity identity; diff --git a/cpp/test/Ice/optional/.depend.mak b/cpp/test/Ice/optional/.depend.mak index 425d535960f..fb87c966597 100755 --- a/cpp/test/Ice/optional/.depend.mak +++ b/cpp/test/Ice/optional/.depend.mak @@ -43,6 +43,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -89,6 +90,7 @@ Test.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -176,6 +178,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -198,6 +201,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -297,6 +301,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -319,6 +324,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -426,6 +432,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -448,6 +455,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -554,6 +562,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -576,6 +585,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -671,6 +681,7 @@ TestAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -718,6 +729,7 @@ TestAMD.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\Properties.h" \ @@ -804,6 +816,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -826,6 +839,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -925,6 +939,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -947,6 +962,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/plugin/.depend.mak b/cpp/test/Ice/plugin/.depend.mak index e9fd324e7ca..32ff8e37512 100755 --- a/cpp/test/Ice/plugin/.depend.mak +++ b/cpp/test/Ice/plugin/.depend.mak @@ -49,6 +49,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -71,6 +72,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -174,6 +176,7 @@ Plugin.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -196,6 +199,7 @@ Plugin.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/properties/.depend.mak b/cpp/test/Ice/properties/.depend.mak index f7793fd0581..26a93e211b3 100755 --- a/cpp/test/Ice/properties/.depend.mak +++ b/cpp/test/Ice/properties/.depend.mak @@ -49,6 +49,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -71,6 +72,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/proxy/.depend.mak b/cpp/test/Ice/proxy/.depend.mak index f735d547fe3..a47e979c798 100755 --- a/cpp/test/Ice/proxy/.depend.mak +++ b/cpp/test/Ice/proxy/.depend.mak @@ -53,6 +53,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -142,6 +143,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -164,6 +166,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -268,6 +271,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -290,6 +294,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -394,6 +399,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -416,6 +422,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -521,6 +528,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -543,6 +551,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -636,6 +645,7 @@ TestAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -726,6 +736,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -748,6 +759,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -853,6 +865,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -875,6 +888,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -980,6 +994,7 @@ Collocated.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1002,6 +1017,7 @@ Collocated.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/retry/.depend.mak b/cpp/test/Ice/retry/.depend.mak index d3cb545fb1e..308c09f8558 100755 --- a/cpp/test/Ice/retry/.depend.mak +++ b/cpp/test/Ice/retry/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -256,6 +259,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -278,6 +282,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -381,6 +386,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -403,6 +409,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -509,6 +516,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -531,6 +539,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -629,6 +638,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -651,6 +661,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -756,6 +767,7 @@ Collocated.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -778,6 +790,7 @@ Collocated.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/servantLocator/.depend.mak b/cpp/test/Ice/servantLocator/.depend.mak index 0515e4492f8..3fb65f00a03 100755 --- a/cpp/test/Ice/servantLocator/.depend.mak +++ b/cpp/test/Ice/servantLocator/.depend.mak @@ -43,6 +43,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -135,6 +136,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -157,6 +159,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -260,6 +263,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -282,6 +286,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -396,6 +401,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -417,6 +423,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -513,6 +520,7 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -535,6 +543,7 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -640,6 +649,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -662,6 +672,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -755,6 +766,7 @@ TestAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -857,6 +869,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -878,6 +891,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -974,6 +988,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -996,6 +1011,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1102,6 +1118,7 @@ Collocated.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1124,6 +1141,7 @@ Collocated.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/slicing/exceptions/.depend.mak b/cpp/test/Ice/slicing/exceptions/.depend.mak index 407f3870e81..3481586fc66 100755 --- a/cpp/test/Ice/slicing/exceptions/.depend.mak +++ b/cpp/test/Ice/slicing/exceptions/.depend.mak @@ -55,6 +55,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -147,6 +148,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -169,6 +171,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -261,6 +264,7 @@ ClientPrivate.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -354,6 +358,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -376,6 +381,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -469,6 +475,7 @@ ServerPrivate.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -551,6 +558,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -596,6 +604,7 @@ TestI.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -690,6 +699,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -712,6 +722,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -806,6 +817,7 @@ TestAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -887,6 +899,7 @@ ServerPrivateAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -970,6 +983,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1016,6 +1030,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\Properties.h" \ @@ -1109,6 +1124,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1131,6 +1147,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/slicing/objects/.depend.mak b/cpp/test/Ice/slicing/objects/.depend.mak index 05e9f72c6bf..5741b61b9c2 100755 --- a/cpp/test/Ice/slicing/objects/.depend.mak +++ b/cpp/test/Ice/slicing/objects/.depend.mak @@ -58,6 +58,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -139,6 +140,7 @@ ClientPrivate.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -233,6 +235,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -255,6 +258,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -360,6 +364,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -382,6 +387,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -475,6 +481,7 @@ Forward.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -554,6 +561,7 @@ ServerPrivate.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -637,6 +645,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -684,6 +693,7 @@ TestI.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\Properties.h" \ @@ -777,6 +787,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -799,6 +810,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -894,6 +906,7 @@ TestAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -975,6 +988,7 @@ ServerPrivateAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1058,6 +1072,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -1105,6 +1120,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\Properties.h" \ @@ -1198,6 +1214,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -1220,6 +1237,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/stream/.depend.mak b/cpp/test/Ice/stream/.depend.mak index 686f517a0d3..55fb33088ba 100755 --- a/cpp/test/Ice/stream/.depend.mak +++ b/cpp/test/Ice/stream/.depend.mak @@ -41,6 +41,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -133,6 +134,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -155,6 +157,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/stringConverter/.depend.mak b/cpp/test/Ice/stringConverter/.depend.mak index 85ae3c0f25a..ae3e09bc9c3 100755 --- a/cpp/test/Ice/stringConverter/.depend.mak +++ b/cpp/test/Ice/stringConverter/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -131,6 +132,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -153,6 +155,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -257,6 +260,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -279,6 +283,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/threadPoolPriority/.depend.mak b/cpp/test/Ice/threadPoolPriority/.depend.mak index f2b9a223aa4..5b34874d808 100755 --- a/cpp/test/Ice/threadPoolPriority/.depend.mak +++ b/cpp/test/Ice/threadPoolPriority/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -255,6 +258,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -277,6 +281,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -381,6 +386,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -403,6 +409,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -500,6 +507,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -522,6 +530,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -627,6 +636,7 @@ ServerCustomThreadPool.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -649,6 +659,7 @@ ServerCustomThreadPool.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/timeout/.depend.mak b/cpp/test/Ice/timeout/.depend.mak index dd2c34c7c49..5cb3f9c45a8 100755 --- a/cpp/test/Ice/timeout/.depend.mak +++ b/cpp/test/Ice/timeout/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -118,6 +119,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -159,6 +161,7 @@ TestI.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ @@ -248,6 +251,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -270,6 +274,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -374,6 +379,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -396,6 +402,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -501,6 +508,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -523,6 +531,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Ice/udp/.depend.mak b/cpp/test/Ice/udp/.depend.mak index 9e3dee98d21..34b4ca3e559 100755 --- a/cpp/test/Ice/udp/.depend.mak +++ b/cpp/test/Ice/udp/.depend.mak @@ -41,6 +41,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -130,6 +131,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -152,6 +154,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -256,6 +259,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -278,6 +282,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -392,6 +397,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -413,6 +419,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -508,6 +515,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -530,6 +538,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceBox/admin/.depend.mak b/cpp/test/IceBox/admin/.depend.mak index 2ace8c419a3..dd4bfa6a146 100755 --- a/cpp/test/IceBox/admin/.depend.mak +++ b/cpp/test/IceBox/admin/.depend.mak @@ -43,6 +43,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -135,6 +136,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -157,6 +159,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -261,6 +264,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -283,6 +287,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -387,6 +392,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -409,6 +415,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -506,6 +513,7 @@ Service.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -528,6 +536,7 @@ Service.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceBox/configuration/.depend.mak b/cpp/test/IceBox/configuration/.depend.mak index cc350609f3d..fb8be597743 100755 --- a/cpp/test/IceBox/configuration/.depend.mak +++ b/cpp/test/IceBox/configuration/.depend.mak @@ -41,6 +41,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -130,6 +131,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -152,6 +154,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -256,6 +259,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -278,6 +282,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -382,6 +387,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -404,6 +410,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -501,6 +508,7 @@ Service.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -523,6 +531,7 @@ Service.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceDiscovery/simple/.depend.mak b/cpp/test/IceDiscovery/simple/.depend.mak index a773fafac13..f8991f0fded 100755 --- a/cpp/test/IceDiscovery/simple/.depend.mak +++ b/cpp/test/IceDiscovery/simple/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -255,6 +258,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -277,6 +281,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -391,6 +396,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -412,6 +418,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -507,6 +514,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -529,6 +537,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceGrid/activation/.depend.mak b/cpp/test/IceGrid/activation/.depend.mak index aad1a55207d..a5f45c30dee 100755 --- a/cpp/test/IceGrid/activation/.depend.mak +++ b/cpp/test/IceGrid/activation/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -255,6 +258,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -277,6 +281,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -398,6 +403,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -420,6 +426,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -517,6 +524,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -539,6 +547,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceGrid/admin/.depend.mak b/cpp/test/IceGrid/admin/.depend.mak index a807a87044b..ff5c513836e 100755 --- a/cpp/test/IceGrid/admin/.depend.mak +++ b/cpp/test/IceGrid/admin/.depend.mak @@ -49,6 +49,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -71,6 +72,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceGrid/allocation/.depend.mak b/cpp/test/IceGrid/allocation/.depend.mak index 69646483d5a..50719990bdf 100755 --- a/cpp/test/IceGrid/allocation/.depend.mak +++ b/cpp/test/IceGrid/allocation/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -256,6 +259,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -278,6 +282,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -401,6 +406,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -423,6 +429,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -520,6 +527,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -542,6 +550,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -647,6 +656,7 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -669,6 +679,7 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceGrid/deployer/.depend.mak b/cpp/test/IceGrid/deployer/.depend.mak index 4f5c6df32a2..fc24f622cac 100755 --- a/cpp/test/IceGrid/deployer/.depend.mak +++ b/cpp/test/IceGrid/deployer/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -255,6 +258,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -277,6 +281,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -398,6 +403,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -420,6 +426,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -518,6 +525,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -540,6 +548,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -645,6 +654,7 @@ Service.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -667,6 +677,7 @@ Service.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceGrid/distribution/.depend.mak b/cpp/test/IceGrid/distribution/.depend.mak index 470ebcd89de..1a28cca7dd7 100755 --- a/cpp/test/IceGrid/distribution/.depend.mak +++ b/cpp/test/IceGrid/distribution/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -255,6 +258,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -277,6 +281,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -398,6 +403,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -420,6 +426,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -517,6 +524,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -539,6 +547,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceGrid/noRestartUpdate/.depend.mak b/cpp/test/IceGrid/noRestartUpdate/.depend.mak index e0c4f47b887..5f855a30a4e 100755 --- a/cpp/test/IceGrid/noRestartUpdate/.depend.mak +++ b/cpp/test/IceGrid/noRestartUpdate/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -255,6 +258,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -277,6 +281,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -398,6 +403,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -420,6 +426,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -517,6 +524,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -539,6 +547,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -644,6 +653,7 @@ Service.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -666,6 +676,7 @@ Service.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceGrid/replicaGroup/.depend.mak b/cpp/test/IceGrid/replicaGroup/.depend.mak index bb2e6341800..2fde5b0ba1e 100755 --- a/cpp/test/IceGrid/replicaGroup/.depend.mak +++ b/cpp/test/IceGrid/replicaGroup/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -255,6 +258,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -277,6 +281,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -398,6 +403,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -420,6 +426,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -517,6 +524,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -539,6 +547,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -644,6 +653,7 @@ Service.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -666,6 +676,7 @@ Service.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceGrid/replication/.depend.mak b/cpp/test/IceGrid/replication/.depend.mak index 59d5a951949..5b906484ee9 100755 --- a/cpp/test/IceGrid/replication/.depend.mak +++ b/cpp/test/IceGrid/replication/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -255,6 +258,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -277,6 +281,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -398,6 +403,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -420,6 +426,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -517,6 +524,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -539,6 +547,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceGrid/session/.depend.mak b/cpp/test/IceGrid/session/.depend.mak index 7b8ed1aca66..255716eac53 100755 --- a/cpp/test/IceGrid/session/.depend.mak +++ b/cpp/test/IceGrid/session/.depend.mak @@ -43,6 +43,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -138,6 +139,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -160,6 +162,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -263,6 +266,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -285,6 +289,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -408,6 +413,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -430,6 +436,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -540,6 +547,7 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -562,6 +570,7 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceGrid/simple/.depend.mak b/cpp/test/IceGrid/simple/.depend.mak index 74b75bca654..5c15ae7eccd 100755 --- a/cpp/test/IceGrid/simple/.depend.mak +++ b/cpp/test/IceGrid/simple/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -265,6 +268,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -286,6 +290,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -398,6 +403,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -420,6 +426,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -517,6 +524,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -539,6 +547,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceGrid/update/.depend.mak b/cpp/test/IceGrid/update/.depend.mak index 470ebcd89de..1a28cca7dd7 100755 --- a/cpp/test/IceGrid/update/.depend.mak +++ b/cpp/test/IceGrid/update/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -255,6 +258,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -277,6 +281,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -398,6 +403,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -420,6 +426,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -517,6 +524,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -539,6 +547,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceSSL/configuration/.depend.mak b/cpp/test/IceSSL/configuration/.depend.mak index 5f2139e1baf..28e74acf2f1 100755 --- a/cpp/test/IceSSL/configuration/.depend.mak +++ b/cpp/test/IceSSL/configuration/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -251,6 +254,7 @@ AllTests.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -273,6 +277,7 @@ AllTests.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -380,6 +385,7 @@ TestI.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -402,6 +408,7 @@ TestI.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -510,6 +517,7 @@ Server.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -532,6 +540,7 @@ Server.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceStorm/federation/.depend.mak b/cpp/test/IceStorm/federation/.depend.mak index b1273db9395..cfd02795efe 100755 --- a/cpp/test/IceStorm/federation/.depend.mak +++ b/cpp/test/IceStorm/federation/.depend.mak @@ -40,6 +40,7 @@ Event.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Publisher.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Publisher.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -252,6 +255,7 @@ Subscriber.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -274,6 +278,7 @@ Subscriber.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceStorm/federation2/.depend.mak b/cpp/test/IceStorm/federation2/.depend.mak index e739ccf4718..1a8be68668a 100755 --- a/cpp/test/IceStorm/federation2/.depend.mak +++ b/cpp/test/IceStorm/federation2/.depend.mak @@ -40,6 +40,7 @@ Event.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -140,6 +141,7 @@ Publisher.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -161,6 +163,7 @@ Publisher.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -260,6 +263,7 @@ Subscriber.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -282,6 +286,7 @@ Subscriber.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceStorm/rep1/.depend.mak b/cpp/test/IceStorm/rep1/.depend.mak index 8fed875c03c..67c413f1249 100755 --- a/cpp/test/IceStorm/rep1/.depend.mak +++ b/cpp/test/IceStorm/rep1/.depend.mak @@ -40,6 +40,7 @@ Single.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Publisher.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Publisher.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -271,6 +274,7 @@ Subscriber.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -292,6 +296,7 @@ Subscriber.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -403,6 +408,7 @@ Sub.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -424,6 +430,7 @@ Sub.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceStorm/repgrid/.depend.mak b/cpp/test/IceStorm/repgrid/.depend.mak index c7a7a768819..d5a1ba4c938 100755 --- a/cpp/test/IceStorm/repgrid/.depend.mak +++ b/cpp/test/IceStorm/repgrid/.depend.mak @@ -40,6 +40,7 @@ Single.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -130,6 +131,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -152,6 +154,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceStorm/repstress/.depend.mak b/cpp/test/IceStorm/repstress/.depend.mak index 93e7844a613..3eaba74dd20 100755 --- a/cpp/test/IceStorm/repstress/.depend.mak +++ b/cpp/test/IceStorm/repstress/.depend.mak @@ -43,6 +43,7 @@ Single.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -120,6 +121,7 @@ Controller.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -209,6 +211,7 @@ Publisher.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -231,6 +234,7 @@ Publisher.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -350,6 +354,7 @@ Subscriber.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\InstanceF.h" \ @@ -371,6 +376,7 @@ Subscriber.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -471,6 +477,7 @@ Control.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -493,6 +500,7 @@ Control.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceStorm/single/.depend.mak b/cpp/test/IceStorm/single/.depend.mak index e6d5d9ae9f3..28e9e41bf8a 100755 --- a/cpp/test/IceStorm/single/.depend.mak +++ b/cpp/test/IceStorm/single/.depend.mak @@ -40,6 +40,7 @@ Single.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Publisher.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Publisher.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -252,6 +255,7 @@ Subscriber.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -274,6 +278,7 @@ Subscriber.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/IceStorm/stress/.depend.mak b/cpp/test/IceStorm/stress/.depend.mak index 4dab0611b55..76952c78ee5 100755 --- a/cpp/test/IceStorm/stress/.depend.mak +++ b/cpp/test/IceStorm/stress/.depend.mak @@ -40,6 +40,7 @@ Event.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -129,6 +130,7 @@ Publisher.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -151,6 +153,7 @@ Publisher.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -254,6 +257,7 @@ Subscriber.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -276,6 +280,7 @@ Subscriber.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Slice/keyword/.depend.mak b/cpp/test/Slice/keyword/.depend.mak index 49cce7d17ab..1f34db9671d 100755 --- a/cpp/test/Slice/keyword/.depend.mak +++ b/cpp/test/Slice/keyword/.depend.mak @@ -40,6 +40,7 @@ Key.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -133,6 +134,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -155,6 +157,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Slice/macros/.depend.mak b/cpp/test/Slice/macros/.depend.mak index b19f6363e4a..9955bc62feb 100755 --- a/cpp/test/Slice/macros/.depend.mak +++ b/cpp/test/Slice/macros/.depend.mak @@ -40,6 +40,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -132,6 +133,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -154,6 +156,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ diff --git a/cpp/test/Slice/parser/.depend.mak b/cpp/test/Slice/parser/.depend.mak index 48506a10fc3..f106724fef2 100755 --- a/cpp/test/Slice/parser/.depend.mak +++ b/cpp/test/Slice/parser/.depend.mak @@ -45,6 +45,7 @@ CircularA.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -123,6 +124,7 @@ CircularB.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ diff --git a/cpp/test/Slice/structure/.depend.mak b/cpp/test/Slice/structure/.depend.mak index 00a0353b916..b7483dc7bdd 100755 --- a/cpp/test/Slice/structure/.depend.mak +++ b/cpp/test/Slice/structure/.depend.mak @@ -43,6 +43,7 @@ Test.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -122,6 +123,7 @@ Forward.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ @@ -197,6 +199,7 @@ Client.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\ConnectionF.h" \ @@ -219,6 +222,7 @@ Client.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ |