diff options
| author | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-09-27 22:14:32 +0000 |
|---|---|---|
| committer | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-09-27 22:14:32 +0000 |
| commit | 479abb31b8c093446044d93801687d476877e235 (patch) | |
| tree | 4249f0ecf9342019815f4711d380c34847ac2205 | |
| parent | e1e4841a849ff7b9bf59e81dd755605e45af9920 (diff) | |
| download | ATCD-479abb31b8c093446044d93801687d476877e235.tar.gz | |
ChangeLogTag: Thu Sep 27 17:12:06 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 11 | ||||
| -rw-r--r-- | TAO/tests/File_IO/client.cpp | 13 | ||||
| -rw-r--r-- | TAO/tests/File_IO/server.cpp | 12 |
3 files changed, 17 insertions, 19 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index d93568c6346..6793d06e93a 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,14 @@ +Thu Sep 27 17:12:06 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/File_IO/client.cpp: + * tests/File_IO/server.cpp: scaled this program down as it was + creating problems with our daily builds on many + platforms. Retained the essence of the prgoram though. We now run + only 2 threads on the server end 4 threads on the client + end. We now request only 128 K of data (ie. twice the normal + socket buffer size). Hopefully this will go well on all + platforms. + Thu Sep 27 16:23:34 2001 Jeff Parsons <parsons@cs.wustl.edu> * tao/Smart_Proxies/SmartProxies_Static.dsp: diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp index 79704a37f41..78754b993cc 100644 --- a/TAO/tests/File_IO/client.cpp +++ b/TAO/tests/File_IO/client.cpp @@ -28,15 +28,7 @@ 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 const int NUM_THREADS = 4; static CORBA::ORB_var orb; @@ -110,7 +102,8 @@ MTTEST (void *args) ACE_TRY_CHECK; // Read back the written message - File::Descriptor::DataBuffer_var data_received = fd->read (1024*1024, + // Twice the size of the socket buffer + File::Descriptor::DataBuffer_var data_received = fd->read (128*1024, ACE_TRY_ENV); ACE_TRY_CHECK; } diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp index db1218e166e..0251ad176c8 100644 --- a/TAO/tests/File_IO/server.cpp +++ b/TAO/tests/File_IO/server.cpp @@ -24,15 +24,7 @@ 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 @@ -234,7 +226,9 @@ Worker::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_TRY_ENV); + // Run the ORB for atmost 60 seconds + ACE_Time_Value tv (75, 0); + this->orb_->run (tv, ACE_TRY_ENV); ACE_TRY_CHECK; } ACE_CATCHANY |