diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-04-15 23:59:23 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-04-15 23:59:23 +0000 |
| commit | 8e4510e9774d8fc0ee8d8d5afd09aa09a0c24d12 (patch) | |
| tree | a6ed04194c8be30e36af162ae33139ce162c5b44 | |
| parent | cf3b7c50f653de38795658602c8e216562983492 (diff) | |
| download | ATCD-8e4510e9774d8fc0ee8d8d5afd09aa09a0c24d12.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-97a | 18 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | ace/OS.h | 4 | ||||
| -rw-r--r-- | examples/Connection/Makefile | 3 | ||||
| -rw-r--r-- | examples/Connection/blocking/SPIPE-acceptor.cpp | 12 |
5 files changed, 23 insertions, 16 deletions
diff --git a/ChangeLog-97a b/ChangeLog-97a index 09f8ed33c0f..02156e8b63c 100644 --- a/ChangeLog-97a +++ b/ChangeLog-97a @@ -1,12 +1,9 @@ -Tue Apr 15 17:09:33 1997 Irfan Pyarali <irfan@flamenco.cs.wustl.edu> - - * examples/Connection/blocking/Makefile: Removed the Makefile - for this test. This example is only suppose to work on WIN32 - and therefore the Makefile is not necessary. I have replace - this file with a MSVC++ make file. - Tue Apr 15 17:09:33 1997 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu> + * ace/OS.h: Added a #define for WNOHANG since this is missing on + NT. Thanks to Brian Mendel <bmendel@mdc.com> for reporting + this. + * examples/Connection/non_blocking/test_sock_connector.cpp: Added a typedef for ACE_RW_Mutex so that the code compiles on non-MT platforms. Thanks to Ganesh Pai <gpai@voicetek.com> for @@ -91,6 +88,13 @@ Tue Apr 15 13:01:13 1997 David L. Levine <levine@cs.wustl.edu> declaration of local variable "handle" up before its first use. +Tue Apr 15 17:09:33 1997 Irfan Pyarali <irfan@flamenco.cs.wustl.edu> + + * examples/Connection/blocking/Makefile: Removed the Makefile + for this test. This example is only suppose to work on WIN32 + and therefore the Makefile is not necessary. I have replace + this file with a MSVC++ make file. + Mon Apr 14 23:08:27 1997 <irfan@TWOSTEP> * INSTALL: Updated install files for Win32. @@ -501,6 +501,8 @@ Tom Wright <twright@gem-net.demon.co.uk> Torbjorn Lindgren <tl@funcom.no> Darrell Brunsch <brunsch@cs.wustl.edu> Mike Bernat <sagmb@sagus.com> +Brian Mendel <bmendel@mdc.com> +Dave Mayerhoefer <mayerhoefer@svappl36.mdc.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson and is now at ObjectSpace. Paul devised the recursive @@ -2265,6 +2265,10 @@ struct sigaction #define PROT_RDWR (PROT_READ|PROT_WRITE) #endif /* PROT_RDWR */ +#if !defined (WNOHANG) +#define WNOHANG 0 +#endif /* WNOHANG */ + #if defined (ACE_HAS_POSIX_NONBLOCK) #define ACE_NONBLOCK O_NONBLOCK #else diff --git a/examples/Connection/Makefile b/examples/Connection/Makefile index 96c53892d51..f9345400a93 100644 --- a/examples/Connection/Makefile +++ b/examples/Connection/Makefile @@ -10,8 +10,7 @@ INFO = README -DIRS = blocking \ - misc \ +DIRS = misc \ non_blocking #---------------------------------------------------------------------------- diff --git a/examples/Connection/blocking/SPIPE-acceptor.cpp b/examples/Connection/blocking/SPIPE-acceptor.cpp index 38074a77c0f..c7ec25eb8eb 100644 --- a/examples/Connection/blocking/SPIPE-acceptor.cpp +++ b/examples/Connection/blocking/SPIPE-acceptor.cpp @@ -148,14 +148,12 @@ IPC_Server::svc (void) // Run single-threaded. if (n_threads_ <= 1) run_reactor_event_loop (0); - else + else if (ACE_Service_Config::thr_mgr ()->spawn_n (n_threads_, + run_reactor_event_loop, + 0, THR_NEW_LWP) + == -1) { - // Run thread pool. - if (ACE_Service_Config::thr_mgr ()->spawn_n (n_threads_, - run_reactor_event_loop, - 0, THR_NEW_LWP) - == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn_n"), 1); + ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn_n"), 1); ACE_Service_Config::thr_mgr ()->wait (); } |