diff options
-rw-r--r-- | ace/OS.h | 3 | ||||
-rw-r--r-- | ace/Service_Config.h | 5 | ||||
-rw-r--r-- | ace/Service_Repository.h | 2 | ||||
-rw-r--r-- | tests/Process_Manager_Test.cpp | 9 |
4 files changed, 13 insertions, 6 deletions
@@ -52,6 +52,9 @@ enum ACE_Recyclable_State // Unknown state. }; +#if !defined (ACE_DEFAULT_SERVICE_REPOSITORY_SIZE) +#define ACE_DEFAULT_SERVICE_REPOSITORY_SIZE 1024 +#endif /* ACE_DEFAULT_SERVICE_REPOSITORY_SIZE */ // Do not change these values wantonly since GPERF depends on them.. #define ACE_ASCII_SIZE 128 diff --git a/ace/Service_Config.h b/ace/Service_Config.h index c27f8000dea..159a484c52d 100644 --- a/ace/Service_Config.h +++ b/ace/Service_Config.h @@ -102,7 +102,10 @@ class ACE_Export ACE_Service_Config // not eliminated, by _not_ #defining // ACE_HAS_NONSTATIC_OBJECT_MANAGER. public: - enum {MAX_SERVICES = ACE_DEFAULT_SELECT_REACTOR_SIZE}; + enum + { + MAX_SERVICES = ACE_DEFAULT_SERVICE_REPOSITORY_SIZE + }; // = Initialization and termination methods. diff --git a/ace/Service_Repository.h b/ace/Service_Repository.h index c38db47b0b3..8618fce097d 100644 --- a/ace/Service_Repository.h +++ b/ace/Service_Repository.h @@ -43,7 +43,7 @@ public: enum { - DEFAULT_SIZE = 50 + DEFAULT_SIZE = ACE_DEFAULT_SERVICE_REPOSITORY_SIZE }; // = Initialization and termination methods. diff --git a/tests/Process_Manager_Test.cpp b/tests/Process_Manager_Test.cpp index 0e6ad30b687..0574d1e6884 100644 --- a/tests/Process_Manager_Test.cpp +++ b/tests/Process_Manager_Test.cpp @@ -45,7 +45,7 @@ ACE_RCSID(tests, Process_Manager_Test, "$Id$") #if !defined (ACE_LACKS_FORK) && defined (ACE_HAS_THREADS) // Global options. -static int n_iterations = 100000; +static size_t n_iterations = 100000; enum { @@ -67,7 +67,7 @@ static ACE_Atomic_Op<ACE_Thread_Mutex, int> shut_down (0); // control for the <ACE_TEST_ONE_CHILD> test. static void * -one_child_sig_handler (void *arg) +one_child_sig_handler (void *) { ACE_Sig_Set sigset; @@ -211,7 +211,7 @@ one_child_worker_child (void *) // control for the <ACE_TEST_MULTIPLE_CHILDREN> test. static void * -multiple_children_sig_handler (void *arg) +multiple_children_sig_handler (void *) { ACE_Sig_Set sigset; @@ -370,7 +370,7 @@ multiple_children_worker_parent (void *) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) child pids =\n"))); - for (int i = 0; i < ACE_MAX_PROCESSES; i++) + for (size_t i = 0; i < ACE_MAX_PROCESSES; i++) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("[%d]\n"), child_pids[i])); @@ -514,6 +514,7 @@ main (int argc, ASYS_TCHAR *argv[]) ACE_END_TEST; return 0; } + return 0; } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) |