Rewritten to avoid including header from examples

Author: j18ter

TAO/tests/GIOP_Fragments/Big_String_Sequence/.gitignore

@@ -7,5 +7,3 @@ server_log.txt
 client_log.txt
 client
 server
-client_log.txt
-server_log.txt

…P_Fragments/Big_String_Sequence/echo.mpc …_String_Sequence/Big_String_Sequence.mpcTAO/tests/GIOP_Fragments/Big_String_Sequence/echo.mpc renamed to TAO/tests/GIOP_Fragments/Big_String_Sequence/Big_String_Sequence.mpc TAO/tests/GIOP_Fragments/Big_String_Sequence/echo.mpc renamed to TAO/tests/GIOP_Fragments/Big_String_Sequence/Big_String_Sequence.mpc

@@ -6,12 +6,11 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*Server): taoserver, namingexe, iortable, utils {
+project(*Server): taoserver {
   exename = server
   after += *idl
   Source_Files {
     Echo_i.cpp
-    ../../../examples/Simple/Simple_util.cpp
     server.cpp
     EchoS.cpp
     EchoC.cpp
@@ -20,12 +19,10 @@ project(*Server): taoserver, namingexe, iortable, utils {
   }
 }
 
-project(*Client): taoclient, namingexe, iortable, utils {
+project(*Client): taoclient {
   exename = client
   after += *IDL
   Source_Files {
-    Echo_Client_i.cpp
-    ../../../examples/Simple/Simple_util.cpp
     client.cpp
     EchoC.cpp
   }

TAO/tests/GIOP_Fragments/Big_String_Sequence/Echo.idl

@@ -6,11 +6,13 @@ interface Echo
 {
   // = TITLE
   // Defines an interface that encapsulates an operation that returns
-  // a string sequence.
+  // a string sequence, or a wstring sequence, respectively.
 
   typedef sequence<string> List;
+  typedef sequence<wstring> WList;
 
   List return_list ();
+  WList return_wlist ();
 
   oneway void shutdown ();
 };

TAO/tests/GIOP_Fragments/Big_String_Sequence/Echo_Client_i.cpp

@@ -3,24 +3,17 @@
 
 // Constructor.
 
-Echo_i::Echo_i (void)
+Echo_i::Echo_i (CORBA::ORB_ptr o)
+   : orb_(o)
 {
 }
 
 // Destructor.
 
-Echo_i::~Echo_i (void)
+Echo_i::~Echo_i ()
 {
 }
 
-// Set the ORB pointer.
-
-void
-Echo_i::orb (CORBA::ORB_ptr o)
-{
-  this->orb_ = CORBA::ORB::_duplicate (o);
-}
-
 // Return a list of strings.
 
 Echo::List *
@@ -33,22 +26,44 @@ Echo_i::return_list ()
     ACE_NEW_RETURN (tmp,
                     Echo::List (2),
                     0);
-    // Pass ownership to the _var, pitty that ACE_NEW_RETURN cannot
-    // assign to T_vars directly.
     list = tmp;
   }
 
   list->length (2);
 
   // Just do something to get a 'big' list of strings.
-  std::string big(4 * 1024 * 1024, 'A');
+  std::string big(4 * 1024, 'A');
   std::string small("Hello World");
   list[CORBA::ULong(0)] = CORBA::string_dup(big.c_str());
   list[CORBA::ULong(1)] = CORBA::string_dup(small.c_str());
 
   return list._retn ();
 }
 
+Echo::WList *
+Echo_i::return_wlist ()
+{
+  Echo::WList_var list;
+
+  {
+    Echo::WList *tmp = 0;
+    ACE_NEW_RETURN (tmp,
+                    Echo::WList (2),
+                    0);
+    list = tmp;
+  }
+
+  list->length (2);
+
+  // Just do something to get a 'big' list of wide strings.
+  std::wstring big(4 * 1024, 'A');
+  std::wstring small(17, 'B');
+  list[CORBA::ULong(0)] = CORBA::wstring_dup(big.c_str());
+  list[CORBA::ULong(1)] = CORBA::wstring_dup(small.c_str());
+
+  return list._retn ();
+}
+
 // Shutdown the server application.
 
 void

TAO/tests/GIOP_Fragments/Big_String_Sequence/Echo_Client_i.h

@@ -6,7 +6,6 @@
  *
  *  This class implements the Echo IDL interface.
  *
- *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
  */
 //=============================================================================
 
@@ -21,29 +20,23 @@
  *
  * @brief Echo Object Implementation
  *
- * The object implementation  performs the following functions:
- * -- To return the string which needs to be displayed
- * from the server.
- * -- shuts down the server
  */
 class Echo_i : public POA_Echo
 {
 public:
   /// Constructor.
-  Echo_i (void);
+  Echo_i (CORBA::ORB_ptr o);
 
   /// Destructor.
   virtual ~Echo_i (void);
 
-  /// Return the mesg string back from the server.
+  /// Return the result sequences to the cllient.
   virtual Echo::List *return_list ();
+  virtual Echo::WList *return_wlist ();
 
   /// Shutdown the server.
   virtual void shutdown ();
 
-  /// Set the ORB pointer.
-  void orb (CORBA::ORB_ptr o);
-
 private:
   /// ORB pointer.
   CORBA::ORB_var orb_;

TAO/tests/GIOP_Fragments/Big_String_Sequence/Echo_i.cpp

@@ -2,18 +2,9 @@
 ## Reproduces a bug when GIOP fragmentation is used 
 
 The server returns a string sequence with two elements, the first is a
-long 4MB string with repeating character 'A', the second element is
+long 4kB string with repeating character 'A', the second element is
 the string "Hello World". If one removes the command line parameters
-`-ORBMaxMessageSize 1048576` from `run_test.pl` everything
+`-ORBMaxMessageSize 1024` from `run_test.pl` everything
 works as expected, but with these settings, which cause GIOP
 fragmentation, the client receives an empty string as the second
 element of the sequence.
-
-We discovered problems in a more complicated application when big
-sequences are returned, often the client encountering
-`CORBA::MARSHAL` or `CORBA::COMM_FAILURE` exceptions. In one
-case, it worked if the sequence contained a single element, even if
-big, but a small second element caused client exceptions. The complex
-application encountered problems with big sequences even without the
-`-ORBMaxMessageSize` parameter, but problems start at smaller
-sizes if it is used.