diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-02-11 11:33:12 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-02-11 11:33:12 +0000 |
| commit | 4df04cc27ef1e77bcc941afaba7d4c943b98a936 (patch) | |
| tree | 5054c2bde24d048d4790ff659b61be0838cd0d69 /ACE/examples | |
| parent | b723802f85ac66026a503827677a2fb1e9a77933 (diff) | |
| download | ATCD-4df04cc27ef1e77bcc941afaba7d4c943b98a936.tar.gz | |
Fri Feb 11 11:16:00 UTC 2011 Martin Corino <mcorino@remedy.nl>
Merged changes from Remedy work branch.
Diffstat (limited to 'ACE/examples')
| -rw-r--r-- | ACE/examples/Reactor/Misc/notification.cpp | 5 | ||||
| -rw-r--r-- | ACE/examples/Reactor/Misc/pingpong.cpp | 10 |
2 files changed, 3 insertions, 12 deletions
diff --git a/ACE/examples/Reactor/Misc/notification.cpp b/ACE/examples/Reactor/Misc/notification.cpp index 639ce5e1b21..af1f5aac845 100644 --- a/ACE/examples/Reactor/Misc/notification.cpp +++ b/ACE/examples/Reactor/Misc/notification.cpp @@ -11,12 +11,7 @@ #if defined (ACE_HAS_THREADS) -#if defined (CHORUS) -// Chorus does not have signal, so we'll stop after a number of rounds. -#define MAX_ITERATIONS 3 -#else #define MAX_ITERATIONS 10000 -#endif /* CHORUS */ class Thread_Handler : public ACE_Event_Handler { diff --git a/ACE/examples/Reactor/Misc/pingpong.cpp b/ACE/examples/Reactor/Misc/pingpong.cpp index 5d17495b21e..e207fb385cf 100644 --- a/ACE/examples/Reactor/Misc/pingpong.cpp +++ b/ACE/examples/Reactor/Misc/pingpong.cpp @@ -43,13 +43,11 @@ #include "ace/OS_NS_string.h" #include "ace/Null_Mutex.h" #include "ace/OS_NS_unistd.h" -#if defined (ACE_WIN32) || defined (CHORUS) +#if defined (ACE_WIN32) # include "ace/Barrier.h" # include "ace/Thread.h" #endif - - class Ping_Pong : public ACE_Test_and_Set<ACE_Null_Mutex, sig_atomic_t> { public: @@ -211,10 +209,8 @@ run_svc (ACE_HANDLE handle) if (reactor.register_handler (callback, ACE_Event_Handler::READ_MASK | ACE_Event_Handler::WRITE_MASK) == -1 -#if !defined (CHORUS) || reactor.register_handler (SIGINT, callback) == -1 -#endif /* CHORUS */ || reactor.schedule_timer (callback, 0, SHUTDOWN_TIME) == -1) @@ -234,7 +230,7 @@ run_svc (ACE_HANDLE handle) ACE_TEXT ("handle_events"))); } -#if defined (ACE_WIN32) || defined (CHORUS) +#if defined (ACE_WIN32) static ACE_Barrier barrier (3); static void * @@ -272,7 +268,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_Pipe pipe (handles); //FUZZ: enable check_for_lack_ACE_OS -#if defined (ACE_WIN32) || defined (CHORUS) +#if defined (ACE_WIN32) if (ACE_Thread::spawn (ACE_THR_FUNC (worker), (void *) handles[0], THR_DETACHED) == -1 |