diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/FtRtEvent')
13 files changed, 36 insertions, 30 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp index adac1b323a4..febf8fbe014 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp @@ -47,7 +47,7 @@ namespace TAO_FTRT { { curarg++; if (curarg < argc) - transaction_depth = atoi(argv[curarg]); + transaction_depth = ACE_OS::atoi(argv[curarg]); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp index 0bae38d051d..8dc99941883 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp @@ -120,7 +120,7 @@ AMI_Primary_Replication_Strategy::replicate_request( size_t num_backups = backups.length(); if ((size_t)transaction_depth > num_backups) { - TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::TransactionDepthTooHigh\n")); ACE_THROW(FTRT::TransactionDepthTooHigh()); } @@ -167,7 +167,7 @@ AMI_Primary_Replication_Strategy::replicate_request( } ACE_ENDTRY; } - TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::TransactionDepthTooHigh\n")); ACE_THROW(FTRT::TransactionDepthTooHigh()); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp index 50a4a5f4dff..319840261ec 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp @@ -32,7 +32,7 @@ Basic_Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL) FTRT::SequenceNumber seq_no = Request_Context_Repository().get_sequence_number(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - TAO_FTRTEC::Log(1 , "check_validity : sequence no = %d\n", sequence_num_); + TAO_FTRTEC::Log(1 , ACE_TEXT("check_validity : sequence no = %d\n"), sequence_num_); if (this->sequence_num_ == 0) { // this is the first set_update received from the primary @@ -45,7 +45,7 @@ Basic_Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL) // client_interceptor_->sequence_num_--; FTRT::OutOfSequence exception; exception.current = this->sequence_num_; - TAO_FTRTEC::Log(3, "Throwing FTRT::OutOfSequence (old sequence_num_ = %d)\n", this->sequence_num_); + TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::OutOfSequence (old sequence_num_ = %d)\n"), this->sequence_num_); ACE_THROW(FTRT::OutOfSequence(exception)); } else @@ -92,7 +92,7 @@ Basic_Replication_Strategy::replicate_request( if (info_publisher->is_primary()) this->sequence_num_++; - TAO_FTRTEC::Log(1, "replicate_request : sequence no = %d\n", sequence_num_); + TAO_FTRTEC::Log(1, ACE_TEXT("replicate_request : sequence no = %d\n"), sequence_num_); Request_Context_Repository().set_sequence_number(sequence_num_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -114,7 +114,7 @@ Basic_Replication_Strategy::replicate_request( } } else if (transaction_depth > 1) { - TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::TransactionDepthTooHigh\n")); ACE_THROW(FTRT::TransactionDepthTooHigh()); } } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp index 80c7ba30a06..2b92cb3cf38 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp @@ -77,7 +77,7 @@ void TAO_FTEC_Group_Manager::create_group ( CORBA::ULong object_group_ref_version ACE_ENV_ARG_DECL) { - TAO_FTRTEC::Log(1, "create_group\n"); + TAO_FTRTEC::Log(1, ACE_TEXT("create_group\n")); impl_->info_list = info_list; impl_->my_position = find_by_location(info_list, @@ -117,7 +117,7 @@ void TAO_FTEC_Group_Manager::join_group ( const FTRT::ManagerInfo & info ACE_ENV_ARG_DECL) { - TAO_FTRTEC::Log(1, "join group\n"); + TAO_FTRTEC::Log(1, ACE_TEXT("join group\n")); if (impl_->my_position == 0) { FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc); @@ -131,7 +131,7 @@ void TAO_FTEC_Group_Manager::add_member ( CORBA::ULong object_group_ref_version ACE_ENV_ARG_DECL) { - TAO_FTRTEC::Log(1, "add_member location = <%s>\n", + TAO_FTRTEC::Log(1, ACE_TEXT("add_member location = <%s>\n"), (const char*)info.the_location[0].id); auto_ptr<TAO_FTEC_Group_Manager_Impl> new_impl(new TAO_FTEC_Group_Manager_Impl); @@ -238,14 +238,14 @@ void TAO_FTEC_Group_Manager::add_member ( #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */ } - TAO_FTRTEC::Log(2, "Setting state\n"); + TAO_FTRTEC::Log(2, ACE_TEXT("Setting state\n")); info.ior->set_state(s ACE_ENV_ARG_PARAMETER); ACE_CHECK; info.ior->create_group(new_impl->info_list, object_group_ref_version ACE_ENV_ARG_PARAMETER); ACE_CHECK; - TAO_FTRTEC::Log(2, "After create_group\n"); + TAO_FTRTEC::Log(2, ACE_TEXT("After create_group\n")); } // commit the changes @@ -269,7 +269,7 @@ void TAO_FTEC_Group_Manager::replica_crashed ( const FTRT::Location & location ACE_ENV_ARG_DECL) { - TAO_FTRTEC::Log(1, "TAO_FTEC_Group_Manager::replica_crashed\n"); + TAO_FTRTEC::Log(1, ACE_TEXT("TAO_FTEC_Group_Manager::replica_crashed\n")); FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance(); ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc); remove_member(location, IOGR_Maker::instance()->get_ref_version()+1 @@ -319,14 +319,14 @@ void TAO_FTEC_Group_Manager::remove_member ( ACE_ENDTRY; } - TAO_FTRTEC::Log(3, "my_position = %d, crashed_pos = %d\n", impl_->my_position, crashed_pos); + TAO_FTRTEC::Log(3, ACE_TEXT("my_position = %d, crashed_pos = %d\n"), impl_->my_position, crashed_pos); if (impl_->my_position == crashed_pos && impl_->my_position > 0) Fault_Detector::instance()->connect(impl_->info_list[impl_->my_position-1].the_location); } void TAO_FTEC_Group_Manager::connection_closed() { - TAO_FTRTEC::Log(1, "TAO_FTEC_Group_Manager::connection_closed\n"); + TAO_FTRTEC::Log(1, ACE_TEXT("TAO_FTEC_Group_Manager::connection_closed\n")); ACE_ASSERT(impl_->my_position > 0); // do not use referere here, because the the value pointed by the pointer to diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp index a7cc3c7a391..7e225602e4b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp @@ -42,7 +42,7 @@ Fault_Detector* Fault_Detector::instance() return detector; } -int Fault_Detector::init(int argc, char** argv) +int Fault_Detector::init(int argc, ACE_TCHAR** argv) { detector = this; if (this->parse_conf(argc, argv)==0 && @@ -67,7 +67,7 @@ void Fault_Detector::set_listener(TAO_FTEC_Fault_Listener* listener) listener_ = listener; } -int Fault_Detector::parse_conf(int , char** ) +int Fault_Detector::parse_conf(int , ACE_TCHAR** ) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp index bcf68ca9e98..573a6cb8464 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp @@ -30,10 +30,16 @@ Fault_Detector_T<ACCEPTOR, CONNECTOR, DETECTION_HANDLER>::init_acceptor() ACE_DEBUG((LM_DEBUG, "listening at %s:%d\n", listen_addr.get_host_name(), listen_addr.get_port_number())); - char* buf = CORBA::string_alloc(MAXHOSTNAMELEN); + + ACE_TCHAR* buf = new ACE_TCHAR[ MAXHOSTNAMELEN + 1 ]; listen_addr.addr_to_string(buf, MAXHOSTNAMELEN, 0); location_.length(1); +#if defined (ACE_USES_WCHAR) + location_[0].id = ACE::String_Conversion::Convert_Out<char>( buf ).c_str(); + delete buf; +#else location_[0].id = buf; +#endif return 0; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index ee750df8f22..cb23d1aa537 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -192,7 +192,7 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques // pass a new IOGR if the client use an outdated version IOGR_Maker* maker = IOGR_Maker::instance(); - TAO_FTRTEC::Log(3, "Current GROUP Version = %d, received version = %d\n", + TAO_FTRTEC::Log(3, ACE_TEXT("Current GROUP Version = %d, received version = %d\n"), maker->get_ref_version(), version); if (version < maker->get_ref_version()) { diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index 779396ce1ee..7ff6e8951e4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -224,7 +224,7 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp(operation.in(), "push") == 0) { - TAO_FTRTEC::Log(3, "Received push command\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("Received push command\n")); return; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp index 63d7801689e..94b7ca5acb7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -153,7 +153,7 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info) } if (!CORBA::is_nil(naming_context_.in())) { - TAO_FTRTEC::Log(1, "Registering to the Name Service\n"); + TAO_FTRTEC::Log(1, ACE_TEXT("Registering to the Name Service\n")); ACE_TRY_NEW_ENV { naming_context_->rebind(FTRTEC::Identification_Service::instance()->name(), info->iogr.in() ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp index 7b356e36f4d..78fe674a026 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp @@ -43,7 +43,7 @@ namespace FTRTEC { --argc; ++argv; if (argv[0][0] == '-') continue; else if (argv[0][0] != '$') { - UUID uuid(argv[0]); + UUID uuid(ACE_TEXT_TO_CHAR_IN (argv[0])); if (!uuid.is_valid()) ACE_ERROR_RETURN((LM_ERROR, "Invalid Object_ID\n"), -1); object_id_.length(16); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp index 753cd359248..dacd04341ae 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp @@ -68,11 +68,11 @@ namespace FTRTEC Replication_Strategy* strategy; if (ami) { ACE_NEW_RETURN (strategy, AMI_Replication_Strategy(threads() > 1), -1); - TAO_FTRTEC::Log(3, "AMI replication strategy\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("AMI replication strategy\n")); } else { ACE_NEW_RETURN (strategy, Basic_Replication_Strategy(threads() > 1), -1); - TAO_FTRTEC::Log(3, "Basic replication strategy\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("Basic replication strategy\n")); } ACE_AUTO_PTR_RESET (replication_strategy, strategy, Replication_Strategy); @@ -108,7 +108,7 @@ namespace FTRTEC void Replication_Service::become_primary() { - TAO_FTRTEC::Log(3, "become_primary\n"); + TAO_FTRTEC::Log(3, ACE_TEXT("become_primary\n")); Replication_Strategy* strategy = replication_strategy->make_primary_strategy(); @@ -170,21 +170,21 @@ namespace FTRTEC int Replication_Service::acquire_read (void) { int r = replication_strategy->acquire_read(); - TAO_FTRTEC::Log(3, "Read Lock acquired %d\n", r); + TAO_FTRTEC::Log(3, ACE_TEXT("Read Lock acquired %d\n"), r); return r; } int Replication_Service::acquire_write (void) { int r= replication_strategy->acquire_write(); - TAO_FTRTEC::Log(3, "Write Lock acqured %d\n", r); + TAO_FTRTEC::Log(3, ACE_TEXT("Write Lock acqured %d\n"), r); return r; } int Replication_Service::release (void) { int r= replication_strategy->release(); - TAO_FTRTEC::Log(3, "Lock Released %d\n", r); + TAO_FTRTEC::Log(3, ACE_TEXT("Lock Released %d\n"), r); return r; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp index 6319f696946..44476a3fc23 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp @@ -17,7 +17,7 @@ unsigned int Log::log_level_; if (log_level_ >= log_level) { va_list p; va_start(p, format); - char str[1024]; + ACE_TCHAR str[1024]; ACE_OS::vsprintf(str, format, p); ACE_DEBUG((LM_DEBUG, str)); va_end(p); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl index 120a88f6557..7008345edee 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl @@ -22,7 +22,7 @@ namespace TAO_FTRTEC { void Log::hexdump(unsigned int level, const char* buf, size_t len, const char* msg) { if (Log::log_level_ >= level) - ACE_HEX_DUMP((LM_DEBUG, buf, len, msg)); + ACE_HEX_DUMP((LM_DEBUG, buf, len, ACE_TEXT_TO_TCHAR_IN(msg))); } #else // NDEBUG ACE_INLINE |