diff options
Diffstat (limited to 'TAO/tao/ZIOP/ZIOP.cpp')
| -rw-r--r-- | TAO/tao/ZIOP/ZIOP.cpp | 138 |
1 files changed, 69 insertions, 69 deletions
diff --git a/TAO/tao/ZIOP/ZIOP.cpp b/TAO/tao/ZIOP/ZIOP.cpp index 0ada145378a..910811b7fc9 100644 --- a/TAO/tao/ZIOP/ZIOP.cpp +++ b/TAO/tao/ZIOP/ZIOP.cpp @@ -115,7 +115,7 @@ TAO_ZIOP_Loader::decompress (Compression::Compressor_ptr compressor, } catch (::Compression::CompressionException &e) { - ACE_ERROR_RETURN((LM_ERROR, + ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT ("Decompression failed: %C\n"), e._info ().c_str ()), false); @@ -125,7 +125,7 @@ TAO_ZIOP_Loader::decompress (Compression::Compressor_ptr compressor, } bool -TAO_ZIOP_Loader::decompress (ACE_Data_Block **db, TAO_Queued_Data& qd, +TAO_ZIOP_Loader::decompress (ACE_Data_Block **db, TAO_Queued_Data& qd, TAO_ORB_Core& orb_core) { CORBA::Object_var compression_manager = @@ -153,27 +153,27 @@ TAO_ZIOP_Loader::decompress (ACE_Data_Block **db, TAO_Queued_Data& qd, if (!(cdr >> data)) return false; - - Compression::Compressor_var compressor = + + Compression::Compressor_var compressor = manager->get_compressor (data.compressorid, 6); CORBA::OctetSeq myout; myout.length (data.original_length); if (decompress(compressor.in(), data.data, myout)) { - ACE_Message_Block *mb = new ACE_Message_Block(); - - mb->size ((size_t)(data.original_length + + ACE_Message_Block *mb = new ACE_Message_Block(); + + mb->size ((size_t)(data.original_length + TAO_GIOP_MESSAGE_HEADER_LEN)); - + qd.msg_block ()->rd_ptr (initial_rd_ptr); - - mb->copy(qd.msg_block ()->base () + begin, + + mb->copy(qd.msg_block ()->base () + begin, TAO_GIOP_MESSAGE_HEADER_LEN); - if (mb->copy((char*)myout.get_buffer(true), + if (mb->copy((char*)myout.get_buffer(true), (size_t)data.original_length) != 0) - ACE_ERROR_RETURN((LM_ERROR, + ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT ("TAO - (%P|%t) - ") ACE_TEXT ("Failed to copy decompressed data : ") ACE_TEXT ("Buffer too small\n")), @@ -226,7 +226,7 @@ TAO_ZIOP_Loader::compress (Compression::Compressor_ptr compressor, } catch (::Compression::CompressionException &e) { - ACE_ERROR_RETURN((LM_ERROR, + ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT ("Compression failed: %C\n"), e._info ().c_str ()), false); @@ -254,13 +254,13 @@ TAO_ZIOP_Loader::check_min_ratio (::Compression::CompressionRatio ratio, bool TAO_ZIOP_Loader::get_compressor_details ( ::Compression::CompressorIdLevelList *list, - Compression::CompressorId &compressor_id, + Compression::CompressorId &compressor_id, Compression::CompressionLevel &compression_level) { if (list) { - compressor_id = (*list)[0].compressor_id; + compressor_id = (*list)[0].compressor_id; compression_level = (*list)[0].compression_level; } else @@ -278,7 +278,7 @@ bool TAO_ZIOP_Loader::get_compression_details( CORBA::Policy_ptr compression_enabling_policy, CORBA::Policy_ptr compression_level_list_policy, - Compression::CompressorId &compressor_id, + Compression::CompressorId &compressor_id, Compression::CompressionLevel &compression_level) { bool use_ziop = false; @@ -301,12 +301,12 @@ TAO_ZIOP_Loader::get_compression_details( } else { - ACE_ERROR((LM_ERROR, + ACE_ERROR((LM_ERROR, ACE_TEXT("TAO (%P|%t) - ") ACE_TEXT("TAO_ZIOP_Loader::get_compression_details : ") ACE_TEXT("compression_enabling_policy is NIL. No ZIOP\n"))); } - + if (use_ziop) { if (!CORBA::is_nil (compression_level_list_policy)) @@ -316,13 +316,13 @@ TAO_ZIOP_Loader::get_compression_details( if (!CORBA::is_nil (srp.in ())) { - use_ziop = get_compressor_details (srp->compressor_ids (), + use_ziop = get_compressor_details (srp->compressor_ids (), compressor_id, compression_level); } } else { - ACE_ERROR((LM_ERROR, + ACE_ERROR((LM_ERROR, ACE_TEXT("TAO (%P|%t) - ") ACE_TEXT("TAO_ZIOP_Loader::get_compression_details : ") ACE_TEXT("Compression level policy not found\n"))); @@ -333,10 +333,10 @@ TAO_ZIOP_Loader::get_compression_details( void TAO_ZIOP_Loader::complete_compression (Compression::Compressor_ptr compressor, - TAO_OutputCDR &cdr, + TAO_OutputCDR &cdr, ACE_Message_Block& mb, - char *initial_rd_ptr, - CORBA::ULong low_value, + char *initial_rd_ptr, + CORBA::ULong low_value, CORBA::Long min_ratio, CORBA::ULong original_data_length, Compression::CompressorId compressor_id) @@ -349,9 +349,9 @@ TAO_ZIOP_Loader::complete_compression (Compression::Compressor_ptr compressor, bool compressed = this->compress (compressor, input, myout); - if (compressed && + if (compressed && (myout.length () < original_data_length) && - (this->check_min_ratio (compressor->compression_ratio(), + (this->check_min_ratio (compressor->compression_ratio(), min_ratio))) { mb.wr_ptr (mb.rd_ptr ()); @@ -363,8 +363,8 @@ TAO_ZIOP_Loader::complete_compression (Compression::Compressor_ptr compressor, cdr << data; mb.rd_ptr(initial_rd_ptr); int begin = (mb.rd_ptr() - mb.base ()); - mb.data_block ()->base ()[0 + begin] = 0x5A; - mb.data_block ()->base ()[TAO_GIOP_MESSAGE_SIZE_OFFSET + begin] = + mb.data_block ()->base ()[0 + begin] = 0x5A; + mb.data_block ()->base ()[TAO_GIOP_MESSAGE_SIZE_OFFSET + begin] = cdr.length() - TAO_GIOP_MESSAGE_HEADER_LEN; } } @@ -379,24 +379,24 @@ TAO_ZIOP_Loader::complete_compression (Compression::Compressor_ptr compressor, } bool -TAO_ZIOP_Loader::compress_data (TAO_OutputCDR &cdr, +TAO_ZIOP_Loader::compress_data (TAO_OutputCDR &cdr, CORBA::Object_ptr compression_manager, CORBA::ULong low_value, CORBA::Long min_ratio, - Compression::CompressorId compressor_id, + Compression::CompressorId compressor_id, Compression::CompressionLevel compression_level) { cdr.consolidate (); - + ACE_Message_Block* current = const_cast <ACE_Message_Block*> (cdr.current ()); char* initial_rd_ptr = current->rd_ptr(); // Set the read pointer to the point where the data starts current->rd_ptr (TAO_GIOP_MESSAGE_HEADER_LEN); - + current = const_cast <ACE_Message_Block*> (cdr.current()); - CORBA::ULong const original_data_length = + CORBA::ULong const original_data_length = (CORBA::ULong)(current->wr_ptr() - current->rd_ptr()); if (original_data_length > 0) @@ -406,12 +406,12 @@ TAO_ZIOP_Loader::compress_data (TAO_OutputCDR &cdr, if (!CORBA::is_nil(manager.in ())) { - Compression::Compressor_var compressor = + Compression::Compressor_var compressor = manager->get_compressor (compressor_id, compression_level); - - complete_compression(compressor.in (), cdr, *current, - initial_rd_ptr, low_value, min_ratio, - original_data_length, compressor_id); + + complete_compression(compressor.in (), cdr, *current, + initial_rd_ptr, low_value, min_ratio, + original_data_length, compressor_id); } } //set back read pointer in case no compression was done... @@ -430,14 +430,14 @@ TAO_ZIOP_Loader::marshal_data (TAO_OutputCDR &cdr, TAO_Stub& stub) CORBA::Boolean use_ziop = false; Compression::CompressorId compressor_id = Compression::COMPRESSORID_ZLIB; Compression::CompressionLevel compression_level = 0; - - CORBA::Policy_var compression_enabling_policy = + + CORBA::Policy_var compression_enabling_policy = stub.get_cached_policy (TAO_CACHED_COMPRESSION_ENABLING_POLICY); - CORBA::Policy_var compression_level_list_policy = + CORBA::Policy_var compression_level_list_policy = stub.get_cached_policy (TAO_CACHED_COMPRESSION_ID_LEVEL_LIST_POLICY); - - use_ziop = get_compression_details(compression_enabling_policy.in (), - compression_level_list_policy.in (), + + use_ziop = get_compression_details(compression_enabling_policy.in (), + compression_level_list_policy.in (), compressor_id, compression_level); if (use_ziop) @@ -445,19 +445,19 @@ TAO_ZIOP_Loader::marshal_data (TAO_OutputCDR &cdr, TAO_Stub& stub) CORBA::Object_var compression_manager = stub.orb_core ()->resolve_compression_manager(); - CORBA::Policy_var policy_low_value = + CORBA::Policy_var policy_low_value = stub.get_cached_policy (TAO_CACHED_COMPRESSION_LOW_VALUE_POLICY); - CORBA::Policy_var policy_min_ratio = + CORBA::Policy_var policy_min_ratio = stub.get_cached_policy (TAO_CACHED_MIN_COMPRESSION_RATIO_POLICY); - CORBA::ULong low_value = + CORBA::ULong low_value = this->compression_policy_value (policy_low_value.in ()); - CORBA::Long min_ratio = + CORBA::Long min_ratio = this->compression_policy_value (policy_min_ratio.in ()); - return compress_data(cdr, compression_manager.in (), + return compress_data(cdr, compression_manager.in (), low_value, min_ratio, - compressor_id, compression_level); + compressor_id, compression_level); } return false; #endif @@ -475,39 +475,39 @@ TAO_ZIOP_Loader::marshal_data (TAO_OutputCDR& cdr, TAO_ORB_Core& orb_core) Compression::CompressorId compressor_id = Compression::COMPRESSORID_ZLIB; Compression::CompressionLevel compression_level = 0; - CORBA::Policy_var compression_enabling_policy = - orb_core.get_cached_policy_including_current + CORBA::Policy_var compression_enabling_policy = + orb_core.get_cached_policy_including_current (TAO_CACHED_COMPRESSION_ENABLING_POLICY); - - CORBA::Policy_var compression_level_list_policy = - orb_core.get_cached_policy_including_current + + CORBA::Policy_var compression_level_list_policy = + orb_core.get_cached_policy_including_current (TAO_CACHED_COMPRESSION_ID_LEVEL_LIST_POLICY); - - use_ziop = get_compression_details(compression_enabling_policy.in (), - compression_level_list_policy.in (), + + use_ziop = get_compression_details(compression_enabling_policy.in (), + compression_level_list_policy.in (), compressor_id, compression_level); - + if (use_ziop) { CORBA::Object_var compression_manager = orb_core.resolve_compression_manager(); - - CORBA::Policy_var policy_low_value = - orb_core.get_cached_policy_including_current + + CORBA::Policy_var policy_low_value = + orb_core.get_cached_policy_including_current (TAO_CACHED_COMPRESSION_LOW_VALUE_POLICY); - - CORBA::Policy_var policy_min_ratio = - orb_core.get_cached_policy_including_current + + CORBA::Policy_var policy_min_ratio = + orb_core.get_cached_policy_including_current (TAO_CACHED_MIN_COMPRESSION_RATIO_POLICY); - CORBA::ULong low_value = + CORBA::ULong low_value = this->compression_policy_value (policy_low_value.in ()); - CORBA::Long min_ratio = + CORBA::Long min_ratio = this->compression_policy_value (policy_min_ratio.in ()); - - return compress_data(cdr, compression_manager.in (), + + return compress_data(cdr, compression_manager.in (), low_value, min_ratio, - compressor_id, compression_level); + compressor_id, compression_level); } return false; |