diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-09-11 20:48:35 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-09-11 20:48:35 +0000 |
| commit | db80dd8bd5152275bf379bda041a059fa000235f (patch) | |
| tree | b87e835c6dbce04b01977da6e34ca08fd0ca2a4f | |
| parent | 03d0911f29e97d7f1170a3299ac76f80b366d32d (diff) | |
| download | ATCD-db80dd8bd5152275bf379bda041a059fa000235f.tar.gz | |
ChangeLogTag: Tue Sep 11 15:46:44 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/tests/File_IO/client.cpp | 11 | ||||
| -rw-r--r-- | TAO/tests/File_IO/server.cpp | 11 |
3 files changed, 27 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index dc2dc7b0556..fe1d9be368d 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Tue Sep 11 15:46:44 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/File_IO/client.cpp: + * tests/File_IO/server.cpp: Reduced the number of threads a bit + for Sun CC alone. Bug 957 is in action again. + Mon Sep 10 20:00:25 2001 Priyanka Gontla <pgontla@ece.uci.edu> * tao/MCAST_Parser.cpp: diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp index 757ba9a4afe..79704a37f41 100644 --- a/TAO/tests/File_IO/client.cpp +++ b/TAO/tests/File_IO/client.cpp @@ -27,7 +27,18 @@ ACE_RCSID(Default_Servant, client, "client.cpp,v 1.8 2001/03/26 21:16:52 coryan static const char *iorfile = "ior"; static const char *filename = "big.txt"; + +// Hack for Sun CC. Sun CC has problems when trying to get lots of +// data. See bug 957 for details. If we have lots of threads getting +// data we run into the problem again. To offset that, we have this +// compiler specific hack:( +# if !(defined (__SUNPRO_CC) && (__SUNPRO_CC > 0x500)) static const int NUM_THREADS = 10; +# else +static const int NUM_THREADS = 6; +#endif /*(__SUNPRO_CC) && (__SUNPRO_CC > 0x500) */ + + static CORBA::ORB_var orb; static int loops=100; diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp index 7c52a4a3128..db1218e166e 100644 --- a/TAO/tests/File_IO/server.cpp +++ b/TAO/tests/File_IO/server.cpp @@ -24,7 +24,16 @@ ACE_RCSID(Default_Servant, server, "server.cpp,v 1.13 2001/03/26 21:16:52 coryan Exp") static const char *ior_output_file = "ior"; +// Hack for Sun CC. Sun CC has problems when trying to get lots of +// data. See bug 957 for details. If we have lots of threads getting +// data we run into the problem again. To offset that, we have this +// compiler specific hack:( +# if !(defined (__SUNPRO_CC) && (__SUNPRO_CC > 0x500)) static const int nthreads = 4; +# else +static const int nthreads = 2; +#endif /*(__SUNPRO_CC) && (__SUNPRO_CC > 0x500) */ + class Worker : public ACE_Task_Base { @@ -188,7 +197,7 @@ main (int argc, char **argv) // set the state of the poa_manager to active i.e ready to process requests poa_manager->activate (ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_TRY_CHECK; Worker worker (orb.in ()); if (worker.activate (THR_NEW_LWP | THR_JOINABLE, |