diff options
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ChangeLog | 12 | ||||
| -rw-r--r-- | ACE/examples/Reactor/Proactor/Proactor.mpc | 16 | ||||
| -rw-r--r-- | ACE/examples/Reactor/Proactor/test_aiosig.cpp | 18 | ||||
| -rw-r--r-- | ACE/examples/Reactor/Proactor/test_proactor3.cpp | 10 |
4 files changed, 47 insertions, 9 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 5d96840c146..5687fe34a7f 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,15 @@ +Mon Jul 16 10:01:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/Reactor/Proactor/test_aiosig.cpp: + Fixed compile problems, thanks to Craig Rodrigues + <rodrigc at crodrigues dot org> for reporting these + + * examples/Reactor/Proactor/Proactor.mpc: + Added proactor2 and proactor3 + + * examples/Reactor/Proactor/test_proactor3.cpp: + Fixed compile warnings + Sun Jul 15 18:45:03 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> * bin/fuzz.pl: diff --git a/ACE/examples/Reactor/Proactor/Proactor.mpc b/ACE/examples/Reactor/Proactor/Proactor.mpc index c2c52207ca1..f6182b5bffb 100644 --- a/ACE/examples/Reactor/Proactor/Proactor.mpc +++ b/ACE/examples/Reactor/Proactor/Proactor.mpc @@ -41,6 +41,22 @@ project(*proactor) : aceexe { } } +project(*proactor2) : aceexe { + avoids += ace_for_tao + exename = test_proactor2 + Source_Files { + test_proactor2.cpp + } +} + +project(*proactor3) : aceexe { + avoids += ace_for_tao + exename = test_proactor3 + Source_Files { + test_proactor3.cpp + } +} + project(*timeout) : aceexe { avoids += ace_for_tao exename = test_timeout diff --git a/ACE/examples/Reactor/Proactor/test_aiosig.cpp b/ACE/examples/Reactor/Proactor/test_aiosig.cpp index 15e479e345b..8b6702d6f23 100644 --- a/ACE/examples/Reactor/Proactor/test_aiosig.cpp +++ b/ACE/examples/Reactor/Proactor/test_aiosig.cpp @@ -31,6 +31,7 @@ #include <stdio.h> #include <limits.h> +#include <pthread.h> #include <aio.h> @@ -118,7 +119,6 @@ issue_aio_calls (void) int query_aio_completions (void) { - int result = 0; size_t number_of_compleions = 0; for (number_of_compleions = 0; number_of_compleions < 2; @@ -250,6 +250,13 @@ test_aio_calls (void) return 0; } +void +null_handler (int /* signal_number */, + siginfo_t * /* info */, + void * /* context */) +{ +} + int setup_signal_handler (int signal_number) { @@ -274,15 +281,8 @@ setup_signal_handler (int signal_number) return 0; } -void -null_handler (int /* signal_number */, - siginfo_t * /* info */, - void * /* context */) -{ -} - int -ACE_TMAIN (int, ACE_TCHAR *[]) +main (int, char *[]) { if (test_aio_calls () == 0) printf ("RT SIG test successful:\n" diff --git a/ACE/examples/Reactor/Proactor/test_proactor3.cpp b/ACE/examples/Reactor/Proactor/test_proactor3.cpp index 6aaaa50b4dd..f0b201c721d 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor3.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor3.cpp @@ -27,6 +27,7 @@ #include "ace/Asynch_IO_Impl.h" #include "ace/Asynch_Acceptor.h" #include "ace/INET_Addr.h" +#include "ace/Manual_Event.h" #include "ace/SOCK_Connector.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Stream.h" @@ -421,6 +422,7 @@ public: int open (const ACE_TCHAR *host, u_short port); void close (void); ACE_HANDLE handle (void) const; + virtual void handle (ACE_HANDLE); protected: // These methods are called by the freamwork @@ -476,6 +478,11 @@ ACE_HANDLE Sender::handle (void) const return this->stream_.get_handle (); } +void Sender::handle (ACE_HANDLE handle) +{ + this->stream_.set_handle (handle); +} + int Sender::open (const ACE_TCHAR *host, u_short port) { // Initialize stuff @@ -821,6 +828,9 @@ disable_signal (int sigmin, int sigmax) ACE_ERROR ((LM_ERROR, "Error:(%P | %t):%p\n", "pthread_sigmask failed")); +#else + ACE_UNUSED_ARG (sigmin); + ACE_UNUSED_ARG (sigmax); #endif /* ACE_WIN32 */ return 1; |