From bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6 Mon Sep 17 00:00:00 2001 From: Matthew Newhook Date: Thu, 6 Mar 2008 14:26:07 +0800 Subject: Squashed commit of the following: commit c2f83d9a3e0e1f97e76f33d7992ef8e3e2994d91 Author: Matthew Newhook Date: Thu Mar 6 14:22:52 2008 +0800 Cleanup some IceGrid configuration files. commit 4e33903c9ae238b9e317fc3f1f3e281c816374dd Author: Matthew Newhook Date: Thu Mar 6 14:17:10 2008 +0800 remove ttl setting. commit c418b308ff7cc8e8a4296819938b88dfedc16a97 Author: Matthew Newhook Date: Thu Mar 6 14:16:32 2008 +0800 remove useless PopulateEmptyIndices config. commit da70d3936f921aa2c92bd2db7b1fcddb4467a9bd Author: Matthew Newhook Date: Thu Mar 6 13:59:51 2008 +0800 - Removed interrupt handlers for interactive C++ demos. - Lots of cleanups to demos. --- cpp/demo/Ice/nested/Client.cpp | 43 ++++++++++----------------------------- cpp/demo/Ice/nested/config.client | 21 +++++++++++++++++-- cpp/demo/Ice/nested/config.server | 14 ++++++++++++- 3 files changed, 43 insertions(+), 35 deletions(-) (limited to 'cpp/demo/Ice/nested') diff --git a/cpp/demo/Ice/nested/Client.cpp b/cpp/demo/Ice/nested/Client.cpp index fa91add84c2..f3129a8d7f3 100644 --- a/cpp/demo/Ice/nested/Client.cpp +++ b/cpp/demo/Ice/nested/Client.cpp @@ -18,8 +18,8 @@ class NestedClient : public Ice::Application { public: + NestedClient(); virtual int run(int, char*[]); - virtual void interruptCallback(int); }; int @@ -29,6 +29,15 @@ main(int argc, char* argv[]) return app.main(argc, argv, "config.client"); } +NestedClient::NestedClient() : + // + // Since this is an interactive demo we don't want any signal + // handling. + // + Application(Ice::NoSignalHandling) +{ +} + int NestedClient::run(int argc, char* argv[]) { @@ -38,13 +47,7 @@ NestedClient::run(int argc, char* argv[]) return EXIT_FAILURE; } - // - // Since this is an interactive demo we want the custom interrupt - // callback to be called when the process is interrupted. - // - callbackOnInterrupt(); - - NestedPrx nested = NestedPrx::checkedCast(communicator()->propertyToProxy("Nested.NestedServer")); + NestedPrx nested = NestedPrx::checkedCast(communicator()->propertyToProxy("Nested.Proxy")); if(!nested) { cerr << appName() << ": invalid proxy" << endl; @@ -84,27 +87,3 @@ NestedClient::run(int argc, char* argv[]) return EXIT_SUCCESS; } - -void -NestedClient::interruptCallback(int) -{ -/* - * For this demo we won't destroy the communicator since it has to - * wait for any outstanding invocations to complete which may take - * some time if the nesting level is exceeded. - * - try - { - communicator()->destroy(); - } - catch(const IceUtil::Exception& ex) - { - cerr << appName() << ": " << ex << endl; - } - catch(...) - { - cerr << appName() << ": unknown exception" << endl; - } -*/ - exit(EXIT_SUCCESS); -} diff --git a/cpp/demo/Ice/nested/config.client b/cpp/demo/Ice/nested/config.client index 7463a518e08..8917bfac6fb 100644 --- a/cpp/demo/Ice/nested/config.client +++ b/cpp/demo/Ice/nested/config.client @@ -1,6 +1,23 @@ -Nested.NestedServer=nestedServer:default -p 10000 -t 10000 +# +# The client reads this property to create the reference to the +# "Nested" object in the server. +# +Nested.Proxy=nestedServer:default -p 10000 -t 10000 + +# +# The client creates one single object adapter with the name +# "Nested.Client". The following line sets the endpoints for this +# adapter. +# Nested.Client.Endpoints=default -t 10000 +# +# The following properties configure the server thread pool. The +# thread pool initially contains 5 threads, and the Ice run time +# starts emitting warnings once 5 threads are in use. The Ice run time +# creates more threads once all 5 are in use, up to a maximum of 10 +# threads. +# Ice.ThreadPool.Server.Size=5 Ice.ThreadPool.Server.SizeWarn=5 Ice.ThreadPool.Server.SizeMax=10 @@ -8,7 +25,7 @@ Ice.ThreadPool.Server.SizeMax=10 # # Warn about connection exceptions # -#Ice.Warn.Connections=1 +Ice.Warn.Connections=1 # # Network Tracing diff --git a/cpp/demo/Ice/nested/config.server b/cpp/demo/Ice/nested/config.server index f7e06bd36a7..e5829d719e1 100644 --- a/cpp/demo/Ice/nested/config.server +++ b/cpp/demo/Ice/nested/config.server @@ -1,5 +1,17 @@ +# +# The server creates one single object adapter with the name +# "Nested.Server". The following line sets the endpoints for this +# adapter. +# Nested.Server.Endpoints=default -p 10000 -t 10000 +# +# The following properties configure the server thread pool. The +# thread pool initially contains 5 threads, and the Ice run time +# starts emitting warnings once 5 threads are in use. The Ice run time +# creates more threads once all 5 are in use, up to a maximum of 10 +# threads. +# Ice.ThreadPool.Server.Size=5 Ice.ThreadPool.Server.SizeWarn=5 Ice.ThreadPool.Server.SizeMax=10 @@ -7,7 +19,7 @@ Ice.ThreadPool.Server.SizeMax=10 # # Warn about connection exceptions # -#Ice.Warn.Connections=1 +Ice.Warn.Connections=1 # # Network Tracing -- cgit v1.2.3