(file) Return to AnonymousPipe.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/AnonymousPipe.cpp between version 1.5.8.1 and 1.15

version 1.5.8.1, 2005/09/30 16:28:15 version 1.15, 2008/11/12 17:22:32
Line 1 
Line 1 
 //%2005////////////////////////////////////////////////////////////////////////  //%2006////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 // EMC Corporation; VERITAS Software Corporation; The Open Group. // EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; Symantec Corporation; The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 25 
Line 27 
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // //
 //==============================================================================  //=============================================================================
 // //
 // Author: Carol Ann Krug Graves, Hewlett-Packard Company  //%////////////////////////////////////////////////////////////////////////////
 //             (carolann_graves@hp.com)  
 //  
 // Modified By: David Dillard, VERITAS Software Corp.  
 //                  (david.dillard@veritas.com)  
 //              Sean Keenan (sean.keenan@hp.com)  
 //  
 //%/////////////////////////////////////////////////////////////////////////////  
  
   #if defined(PEGASUS_ENABLE_INTERNAL_BINARY_PROTOCOL)
   # include <Pegasus/Common/CIMBinMsgSerializer.h>
   # include <Pegasus/Common/CIMBinMsgDeserializer.h>
   #else
 #include <Pegasus/Common/CIMMessageSerializer.h> #include <Pegasus/Common/CIMMessageSerializer.h>
 #include <Pegasus/Common/CIMMessageDeserializer.h> #include <Pegasus/Common/CIMMessageDeserializer.h>
   #endif
   
 #include <Pegasus/Common/MessageLoader.h> #include <Pegasus/Common/MessageLoader.h>
 #include <Pegasus/Common/Exception.h> #include <Pegasus/Common/Exception.h>
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
Line 48 
Line 49 
 #if defined (PEGASUS_OS_TYPE_WINDOWS) #if defined (PEGASUS_OS_TYPE_WINDOWS)
 # include "AnonymousPipeWindows.cpp" # include "AnonymousPipeWindows.cpp"
 #elif defined (PEGASUS_OS_TYPE_UNIX) #elif defined (PEGASUS_OS_TYPE_UNIX)
 # include "AnonymousPipeUnix.cpp"  # include "AnonymousPipePOSIX.cpp"
 #elif defined (PEGASUS_OS_VMS) #elif defined (PEGASUS_OS_VMS)
 # include "AnonymousPipeVms.cpp"  # include "AnonymousPipePOSIX.cpp"
 #else #else
 # error "Unsupported platform" # error "Unsupported platform"
 #endif #endif
  
   
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
 AnonymousPipe::Status AnonymousPipe::writeMessage (CIMMessage * message) AnonymousPipe::Status AnonymousPipe::writeMessage (CIMMessage * message)
Line 64 
Line 66 
     //     //
     // Serialize the request     // Serialize the request
     //     //
   #if defined(PEGASUS_ENABLE_INTERNAL_BINARY_PROTOCOL)
       CIMBuffer messageBuffer(4096);
   #else
     Buffer messageBuffer;     Buffer messageBuffer;
     messageBuffer.reserveCapacity (4096);     messageBuffer.reserveCapacity (4096);
   #endif
   
     try     try
     {     {
   #if defined(PEGASUS_ENABLE_INTERNAL_BINARY_PROTOCOL)
           CIMBinMsgSerializer::serialize(messageBuffer, message);
   #else
         CIMMessageSerializer::serialize (messageBuffer, message);         CIMMessageSerializer::serialize (messageBuffer, message);
   #endif
     }     }
     catch (Exception & e)     catch (Exception & e)
     {     {
         PEG_TRACE_STRING (TRC_OS_ABSTRACTION, Tracer::LEVEL2,          PEG_TRACE((TRC_OS_ABSTRACTION, Tracer::LEVEL2,
             "Failed to serialize message: " + e.getMessage ());              "Failed to serialize message: %s",
               (const char*)e.getMessage().getCString()));
         PEG_METHOD_EXIT ();         PEG_METHOD_EXIT ();
         throw;         throw;
     }     }
Line 81 
Line 93 
     //     //
     // Write the serialized message to the pipe     // Write the serialized message to the pipe
     //     //
     Status writeStatus;  
     try  
     {  
         Uint32 messageLength = messageBuffer.size ();         Uint32 messageLength = messageBuffer.size ();
         const char * messageData = messageBuffer.getData ();         const char * messageData = messageBuffer.getData ();
  
         writeStatus = writeBuffer ((const char *) &messageLength,      Status writeStatus =
             sizeof (Uint32));          writeBuffer((const char*) &messageLength, sizeof(Uint32));
  
         if (writeStatus == STATUS_SUCCESS)         if (writeStatus == STATUS_SUCCESS)
         {         {
             writeStatus = writeBuffer (messageBuffer.getData (),          writeStatus = writeBuffer(messageData, messageLength);
                 messageLength);  
         }  
     }  
     catch (...)  
     {  
         PEG_METHOD_EXIT ();  
         throw;  
     }     }
  
     PEG_METHOD_EXIT ();     PEG_METHOD_EXIT ();
Line 136 
Line 138 
     //     //
     //  Read the message data     //  Read the message data
     //     //
   #if defined(PEGASUS_ENABLE_INTERNAL_BINARY_PROTOCOL)
       // CIMBuffer uses realloc() and free() so the buffer must be allocated
       // with malloc().
       AutoPtr<char, FreeCharPtr> messageBuffer((char*)malloc(messageLength + 1));
   #else
     AutoArrayPtr <char> messageBuffer (new char [messageLength + 1]);     AutoArrayPtr <char> messageBuffer (new char [messageLength + 1]);
   #endif
  
     //     //
     //  We know a message is coming     //  We know a message is coming
Line 158 
Line 166 
         //         //
         //  De-serialize the message         //  De-serialize the message
         //         //
   #if defined(PEGASUS_ENABLE_INTERNAL_BINARY_PROTOCOL)
           // CIMBuffer frees messageBuffer upon destruction.
           CIMBuffer buf(messageBuffer.release(), messageLength);
           message = CIMBinMsgDeserializer::deserialize(buf, messageLength);
   
           if (!message)
           {
               throw CIMException(CIM_ERR_FAILED, "deserialize() failed");
           }
   #else
         message = CIMMessageDeserializer::deserialize (messageBuffer.get ());         message = CIMMessageDeserializer::deserialize (messageBuffer.get ());
   #endif
     }     }
     catch (Exception & e)     catch (Exception & e)
     {     {
         //         //
         //  De-serialization failed         //  De-serialization failed
         //         //
         PEG_TRACE_STRING (TRC_OS_ABSTRACTION, Tracer::LEVEL2,          PEG_TRACE ((TRC_OS_ABSTRACTION, Tracer::LEVEL2,
             "Failed to de-serialize message: " + e.getMessage ());              "Failed to de-serialize message: %s",
               (const char*)e.getMessage().getCString()));
         PEG_METHOD_EXIT ();         PEG_METHOD_EXIT ();
         throw;         throw;
     }     }


Legend:
Removed from v.1.5.8.1  
changed lines
  Added in v.1.15

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2