diff options
| author | mitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-04-12 22:47:02 +0000 |
|---|---|---|
| committer | mitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-04-12 22:47:02 +0000 |
| commit | 4763430ca49834f855cb538a5a867ae43a0a403e (patch) | |
| tree | 51fd3bf65fca69b840033a5a5dd7d086c96a4194 /TAO/orbsvcs/orbsvcs/Event | |
| parent | 9d5564b342e794dc79bcf4ffe3a1381086b8d960 (diff) | |
| download | ATCD-4763430ca49834f855cb538a5a867ae43a0a403e.tar.gz | |
ChangeLogTag: Fri Apr 12 22:41:43 UTC 2013 Adam Mitz <mitza@ociweb.com>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event')
38 files changed, 216 insertions, 187 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp index 6a6c0d61941..8b67077e1b3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/ECG_CDR_Message_Receiver.h" #include "orbsvcs/Event/ECG_CDR_Message_Sender.h" @@ -263,20 +264,20 @@ TAO_ECG_CDR_Message_Receiver::handle_input ( if (errno == EWOULDBLOCK) return 0; - ACE_ERROR_RETURN ((LM_ERROR, "Error reading mcast fragment (%m).\n"), + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error reading mcast fragment (%m).\n"), -1); } if (n == 0) { - ACE_ERROR_RETURN ((LM_ERROR, "Trying to read mcast fragment: " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Trying to read mcast fragment: " "read 0 bytes from socket.\n"), 0); } if (n < TAO_ECG_CDR_Message_Sender::ECG_HEADER_SIZE) { - ACE_ERROR_RETURN ((LM_ERROR, "Trying to read mcast fragment: " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Trying to read mcast fragment: " "# of bytes read < mcast header size.\n"), -1); } @@ -305,33 +306,33 @@ TAO_ECG_CDR_Message_Receiver::handle_input ( if ( this->check_crc_ && header.crc != crc) { static unsigned int err_count = 0; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "******************************\n")); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "ERROR DETECTED\n")); if (crc == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Sending process may not have computed CRC\n")); } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, " NETWORK CRC CHECKSUM FAILED\n")); } - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Message was received from [%s:%s:%d]\n", from.get_host_name (), from.get_host_addr (), from.get_port_number())); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Num errors = %d\n", ++err_count)); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "This is a bad thing. Attempting to ignore ..\n")); return 0; @@ -371,19 +372,19 @@ TAO_ECG_CDR_Message_Receiver::mark_received (const ACE_INET_Addr &from, if (request == 0) { - ACE_DEBUG ((LM_WARNING, "Received mcast request with sequence" + ORBSVCS_DEBUG ((LM_WARNING, "Received mcast request with sequence" "below currently expected range.\n")); return 0; } if (*request == &Request_Completed_) { - ACE_DEBUG ((LM_INFO, "Received duplicate mcast fragment. " + ORBSVCS_DEBUG ((LM_INFO, "Received duplicate mcast fragment. " "(Request already complete).\n")); return 0; } if (*request != 0) { - ACE_ERROR_RETURN ((LM_ERROR, "Inconsistent fragments for " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Inconsistent fragments for " "mcast request.\n"), -1); } @@ -410,13 +411,13 @@ TAO_ECG_CDR_Message_Receiver::process_fragment ( if (request == 0) { - ACE_DEBUG ((LM_WARNING, "Received mcast request with sequence " + ORBSVCS_DEBUG ((LM_WARNING, "Received mcast request with sequence " "below currently expected range.\n")); return 0; } if (*request == &Request_Completed_) { - ACE_DEBUG ((LM_INFO, "Received duplicate mcast fragment. " + ORBSVCS_DEBUG ((LM_INFO, "Received duplicate mcast fragment. " "(Request already complete).\n")); return 0; } @@ -439,7 +440,7 @@ TAO_ECG_CDR_Message_Receiver::process_fragment ( header.fragment_id, header.fragment_count) == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Received invalid mcast fragment.\n"), -1); } @@ -447,7 +448,7 @@ TAO_ECG_CDR_Message_Receiver::process_fragment ( // Check whether this fragment was already received. if ((*request)->test_received (header.fragment_id) == 1) { - ACE_DEBUG ((LM_INFO, "Received duplicate mcast fragment.\n")); + ORBSVCS_DEBUG ((LM_INFO, "Received duplicate mcast fragment.\n")); return 0; } @@ -494,7 +495,7 @@ TAO_ECG_CDR_Message_Receiver::get_source_entry (const ACE_INET_Addr &from) if (requests->init (this->max_requests_, this->min_purge_count_) == -1 || this->request_map_.bind (from, requests, entry) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, "Unable to create hash map " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to create hash map " "entry for a new request.\n"), 0); } @@ -531,7 +532,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header, this->byte_order = header[0]; if(this->byte_order != 0 && this->byte_order != 1) { - ACE_ERROR_RETURN ((LM_ERROR, "Reading mcast packet header: byte " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Reading mcast packet header: byte " "order is neither 0 nor 1, it is %d.\n", this->byte_order), -1); @@ -548,7 +549,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header, || !header_cdr.read_octet (c) || a != 'A' || b != 'B' || c != 'C') { - ACE_ERROR_RETURN ((LM_ERROR, "Error reading magic bytes " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error reading magic bytes " "in mcast packet header.\n"), -1); } @@ -560,7 +561,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header, || !header_cdr.read_ulong (this->fragment_id) || !header_cdr.read_ulong (this->fragment_count)) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error decoding mcast packet header.\n"), -1); } @@ -591,7 +592,7 @@ TAO_ECG_CDR_Message_Receiver::Mcast_Header::read (char *header, && (this->fragment_size != this->request_size || this->request_size != data_bytes_received))) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Invalid mcast fragment: " "inconsistent header fields.\n"), -1); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp index 7d725174738..ea0ad2cdb97 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/ECG_CDR_Message_Sender.h" #include "tao/CDR.h" #include "ace/SOCK_Dgram.h" @@ -21,7 +22,7 @@ TAO_ECG_CDR_Message_Sender::init ( if (endpoint_rptr.get () == 0 || endpoint_rptr->dgram ().get_handle () == ACE_INVALID_HANDLE) { - ACE_ERROR ((LM_ERROR, "TAO_ECG_CDR_Message_Sender::init(): " + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_CDR_Message_Sender::init(): " "nil or unitialized endpoint argument.\n")); throw CORBA::INTERNAL (); } @@ -35,7 +36,7 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr, { if (this->endpoint_rptr_.get () == 0) { - ACE_ERROR ((LM_ERROR, "Attempt to invoke send_message() " + ORBSVCS_ERROR ((LM_ERROR, "Attempt to invoke send_message() " "on non-initialized sender object.\n")); throw CORBA::INTERNAL (); } @@ -244,7 +245,7 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr, expected_n += iov[i].iov_len; if (n > 0 && size_t(n) != expected_n) { - ACE_ERROR ((LM_ERROR, ("Sent only %d out of %d bytes " + ORBSVCS_ERROR ((LM_ERROR, ("Sent only %d out of %d bytes " "for mcast fragment.\n"), n, expected_n)); @@ -254,18 +255,18 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr, { if (errno == EWOULDBLOCK) { - ACE_ERROR ((LM_ERROR, "Send of mcast fragment failed (%m).\n")); + ORBSVCS_ERROR ((LM_ERROR, "Send of mcast fragment failed (%m).\n")); // @@ TODO Use a Event Channel specific exception throw CORBA::COMM_FAILURE (); } else { - ACE_DEBUG ((LM_WARNING, "Send of mcast fragment blocked (%m).\n")); + ORBSVCS_DEBUG ((LM_WARNING, "Send of mcast fragment blocked (%m).\n")); } } else if (n == 0) { - ACE_DEBUG ((LM_WARNING, "EOF on send of mcast fragment (%m).\n")); + ORBSVCS_DEBUG ((LM_WARNING, "EOF on send of mcast fragment (%m).\n")); } } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp index 322bbef29bd..df74a62ce97 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/ECG_Complex_Address_Server.h" #include "ace/SString.h" #include "ace/streams.h" @@ -37,7 +38,7 @@ TAO_ECG_Complex_Address_Server::init (const char *arg) location = ACE_OS::strchr (data, '@'); if (!location) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to initialize address " "server: cannot find <@> separator " "in initialization string " @@ -83,7 +84,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key, && *key == '*') { if (this->default_addr_.set (mcast_addr) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid " "mcast address specified: %s.\n", mcast_addr), -1); @@ -95,7 +96,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key, CORBA::Long header_value = ACE_OS::strtol (key, &endptr, 0); if (*endptr != '\0') { - ACE_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid " "source/type specified: %s.\n", key), -1); @@ -104,7 +105,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key, ACE_INET_Addr addr; if (addr.set (mcast_addr) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to initialize: invalid " "mcast address specified: %s.\n", mcast_addr), -1); @@ -112,7 +113,7 @@ TAO_ECG_Complex_Address_Server::add_entry (const char * key, if (this->mcast_mapping_.bind (header_value, addr) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, "Unable to initialize: error adding " + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to initialize: error adding " "new entry to the mapping.\n"), -1); } @@ -191,7 +192,7 @@ TAO_ECG_Complex_Address_Server::get_address ( void TAO_ECG_Complex_Address_Server::dump_content (void) { - ACE_DEBUG ((LM_DEBUG, "Default address: %s:%d\n", + ORBSVCS_DEBUG ((LM_DEBUG, "Default address: %s:%d\n", this->default_addr_.get_host_addr (), this->default_addr_.get_port_number ())); @@ -200,7 +201,7 @@ TAO_ECG_Complex_Address_Server::dump_content (void) iter++) { MAP::ENTRY & entry = *iter; - ACE_DEBUG ((LM_DEBUG, "%d --> %s:%d\n", + ORBSVCS_DEBUG ((LM_DEBUG, "%d --> %s:%d\n", entry.ext_id_, this->default_addr_.get_host_addr (), this->default_addr_.get_port_number ())); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 498477b8bc0..5aac6d70046 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/ECG_Mcast_EH.h" #include "orbsvcs/Event/ECG_UDP_Receiver.h" #include "orbsvcs/Event_Service_Constants.h" @@ -46,7 +47,7 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec) if (CORBA::is_nil (ec)) { - ACE_ERROR ((LM_ERROR, "TAO_ECG_Mcast_EH::open(): " + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_Mcast_EH::open(): " "nil ec argument")); throw CORBA::INTERNAL (); } @@ -246,19 +247,19 @@ TAO_ECG_Mcast_EH::add_new_subscriptions (Address_Set& multicast_addresses) ACE_SOCK_Dgram_Mcast *socket = new_subscription.dgram; if (socket->open (new_subscription.mcast_addr, this->net_if_, 1) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error: %d - Unable to open multicast socket\n", ACE_ERRNO_GET)); } if ( socket->enable (ACE_NONBLOCK) != 0 ) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error: %d - Unable to enable nonblocking on mcast_eh\n", ACE_ERRNO_GET)); } if (socket->join (new_subscription.mcast_addr, 1, this->net_if_) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error: %d - Unable to join multicast group\n", ACE_ERRNO_GET)); } @@ -270,7 +271,7 @@ TAO_ECG_Mcast_EH::add_new_subscriptions (Address_Set& multicast_addresses) sizeof (this->recvbuf_size_)) == -1) && errno != ENOTSUP ) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error: %d - Unable to set mcast_eh recvbuf_size:%d\n", ACE_ERRNO_GET, this->recvbuf_size_)); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp index 3dfa28aa6c9..b97ffe9e144 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/ECG_Mcast_Gateway.h" #include "orbsvcs/Event/EC_Lifetime_Utils_T.h" @@ -68,7 +69,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[]) this->service_type_ = ECG_MCAST_TWO_WAY; else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Unsupported <-ECGService> option ") ACE_TEXT ("value: <%s>. Ignoring this option ") ACE_TEXT ("- using defaults instead.\n"), @@ -94,7 +95,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[]) this->address_server_type_ = ECG_ADDRESS_SERVER_TYPE; else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Unsupported <-ECGAddressServer> ") ACE_TEXT ("option value: <%s>. Ignoring this ") ACE_TEXT ("option - using defaults instead.\n"), @@ -132,7 +133,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[]) this->handler_type_ = ECG_HANDLER_UDP; else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("Unsupported <-ECGHandler> ") ACE_TEXT ("option value: <%s>. Ignoring this ") ACE_TEXT ("option - using defaults instead.\n"), @@ -194,7 +195,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[]) else { arg_shifter.ignore_arg (); - ACE_DEBUG ((LM_WARNING, + ORBSVCS_DEBUG ((LM_WARNING, ACE_TEXT ("Ignoring <%s> option ") ACE_TEXT ("during initialization.\n"), arg)); @@ -244,7 +245,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void) && this->service_type_ != ECG_MCAST_SENDER && this->address_server_type_ != ECG_ADDRESS_SERVER_BASIC) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, "Configurations for mcast handler and " "address server do not match.\n")); return -1; @@ -255,7 +256,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void) // implementation, which does not, we'll have to remove this check. if (this->address_server_arg_.length () == 0) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, "Address server initializaton " "argument not specified.\n")); return -1; @@ -264,7 +265,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void) if (this->ip_multicast_loop_ != 0 && this->ip_multicast_loop_ != 1) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, "IP MULTICAST LOOP option must have a boolean value.\n")); return -1; } @@ -272,7 +273,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void) if (this->non_blocking_ != 0 && this->non_blocking_ != 1) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, "NON BLOCKING flag must have a boolean value.\n")); return -1; } @@ -303,7 +304,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void) if (dgram.open (ACE_Addr::sap_any) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Cannot open dgram " "for sending mcast messages.\n")); return TAO_ECG_Refcounted_Endpoint (); @@ -322,7 +323,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void) sizeof (this->ttl_value_)) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error setting TTL option on dgram " "for sending mcast messages.\n")); return TAO_ECG_Refcounted_Endpoint (); @@ -334,7 +335,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void) &this->ip_multicast_loop_, sizeof (this->ip_multicast_loop_)) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error setting MULTICAST_LOOP option " "on dgram for sending mcast messages.\n")); return TAO_ECG_Refcounted_Endpoint (); @@ -343,7 +344,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void) if (this->non_blocking_ && dgram.enable(ACE_NONBLOCK) == -1) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error setting NON BLOCKING option.\n")); return TAO_ECG_Refcounted_Endpoint (); } @@ -402,7 +403,7 @@ TAO_ECG_Mcast_Gateway::init_address_server (void) else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Cannot create address server: " "unknown address server type specified.\n")); return 0; @@ -460,7 +461,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver, ACE_INET_Addr ipaddr; if (ipaddr.set (address_server_arg) != 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "ERROR using address server argument " "in ACE_INET_Addr.set ().\n")); return TAO_ECG_Refcounted_Handler (); @@ -471,7 +472,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver, else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Cannot create handler: unknown " "handler type specified.\n")); return handler; @@ -561,14 +562,14 @@ TAO_ECG_Mcast_Gateway::verify_args (CORBA::ORB_ptr orb, { if (CORBA::is_nil (ec)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Nil event channel argument passed to " "TAO_ECG_Mcast_Gateway::run().\n")); throw CORBA::INTERNAL (); } if (CORBA::is_nil (orb)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Nil orb argument passed to " "TAO_ECG_Mcast_Gateway::run().\n")); throw CORBA::INTERNAL (); @@ -592,7 +593,7 @@ TAO_ECG_Mcast_Gateway::run (CORBA::ORB_ptr orb, this->init_address_server (); if (!address_server_servant.in ()) { - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, "Unable to create address server.\n")); throw CORBA::INTERNAL (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp index 49d935a6757..a5a4218981e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Gateway_IIOP.h" #include "orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h" #include "tao/Messaging/Messaging.h" @@ -170,7 +171,7 @@ TAO_ECG_Reactive_ConsumerEC_Control::event_channel_not_exist ( { try { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "EC_Reactive_ConsumerControl(%P|%t) - " "channel %x does not exists\n")); gateway->cleanup_consumer_ec (); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp index 8f5891204de..3f076ddbb58 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp @@ -210,7 +210,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::event_channel_not_exist ( { try { - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "ECG_Reconnect_ConsumerControl(%P|%t) - " // "channel %x does not exists\n")); is_consumer_ec_connected_ = 0; @@ -244,7 +244,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::system_exception ( // return; // Anything else is serious, including timeouts... - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "ECG_Reconnect_ConsumerControl(%P|%t) - " // "channel %x does not exists system except\n")); is_consumer_ec_connected_ = 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp index 1e101055c0f..202c2540f6b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp @@ -1,7 +1,7 @@ // $Id$ #include "orbsvcs/Event/ECG_Simple_Mcast_EH.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "ace/Reactor.h" #include "ace/os_include/os_fcntl.h" @@ -30,7 +30,7 @@ TAO_ECG_Simple_Mcast_EH::open (const char * mcast_addr, ACE_INET_Addr mcast_group; if (mcast_group.set (mcast_addr) != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to open mcast handler: " "error using specified address %s " "in ACE_INET.set ().\n", @@ -38,7 +38,7 @@ TAO_ECG_Simple_Mcast_EH::open (const char * mcast_addr, -1); if (this->dgram_.join (mcast_group, 1, net_if) != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to open mcast handler: error " "joining to %s\n", mcast_addr), @@ -52,7 +52,7 @@ TAO_ECG_Simple_Mcast_EH::open (const char * mcast_addr, ACE_Event_Handler::READ_MASK)) { this->dgram_.close (); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Cannot register handler with reactor.\n"), -1); } @@ -74,13 +74,13 @@ TAO_ECG_Simple_Mcast_EH::shutdown (void) ACE_Event_Handler::READ_MASK); } if (result != 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to deregister handler from reactor " "on shutdown.\n")); result = this->dgram_.close (); if (result != 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to close mcast receiving dgram " "on shutdown.\n")); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp index b47650a3a8b..a6d5f20ef27 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/ECG_UDP_EH.h" #include "ace/Reactor.h" #include "ace/INET_Addr.h" @@ -31,7 +32,7 @@ TAO_ECG_UDP_EH::open (const ACE_INET_Addr& ipaddr, return -1; if (this->dgram_.open (ipaddr, PF_INET, 0, reuse_addr) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Unable to open udp handler: " "error opening receiving dgram.\n"), -1); @@ -42,7 +43,7 @@ TAO_ECG_UDP_EH::open (const ACE_INET_Addr& ipaddr, ACE_Event_Handler::READ_MASK)) { this->dgram_.close (); - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Cannot register handler with reactor.\n"), -1); } @@ -64,13 +65,13 @@ TAO_ECG_UDP_EH::shutdown (void) ACE_Event_Handler::READ_MASK); } if (result != 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to deregister handler from reactor " "on shutdown.\n")); result = this->dgram_.close (); if (result != 0) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Unable to close receiving dgram on shutdown.\n")); this->receiver_ = 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp index ef969994abd..869e623b18b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/ECG_UDP_Receiver.h" #include "orbsvcs/Event_Utilities.h" #include "ace/SString.h" @@ -29,7 +30,7 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, // is invoked, it throws an exception. if (CORBA::is_nil (lcl_ec)) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_UDP_Receiver::init(): " "<lcl_ec> argument is nil.\n")); throw CORBA::INTERNAL (); @@ -50,7 +51,7 @@ TAO_ECG_UDP_Receiver::connect (const RtecEventChannelAdmin::SupplierQOS& pub) if (CORBA::is_nil (this->lcl_ec_.in ())) { //FUZZ: disable check_for_lack_ACE_OS - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Error initializing TAO_ECG_UDP_Receiver: " "init() hasn't been called before connect().\n")); //FUZZ: enable check_for_lack_ACE_OS @@ -60,7 +61,7 @@ TAO_ECG_UDP_Receiver::connect (const RtecEventChannelAdmin::SupplierQOS& pub) if (pub.publications.length () == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_UDP_Receiver::connect(): " "0-length publications argument.\n")); throw CORBA::INTERNAL (); @@ -168,7 +169,7 @@ TAO_ECG_Event_CDR_Decoder::decode (TAO_InputCDR &cdr) { if (!(cdr >> this->events)) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error decoding events cdr.\n"), -1); } @@ -184,7 +185,7 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram) // any further. if (CORBA::is_nil (this->consumer_proxy_.in ())) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_UDP_Receiver::handle_input() " "called but the Receiver is not connected " "to an event channel. Shutting down the Receiver.\n")); @@ -204,7 +205,7 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram) } if (result == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "Error receiving multicasted events.\n"), 0); } @@ -214,7 +215,7 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram) catch (const CORBA::Exception& ex) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "Caught and swallowed EXCEPTION in " "ECG_UDP_Receiver::handle_input: %C\n", ex._info ().c_str ())); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl index f344699998c..a913c696385 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl @@ -2,6 +2,9 @@ // // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE @@ -89,7 +92,7 @@ TAO_ECG_UDP_Receiver::get_addr (const RtecEventComm::EventHeader& header, { if (CORBA::is_nil (this->addr_server_.in ())) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_UDP_Receiver::get_addr() called but " "nil Address Server was supplied during " "initialization through init().\n")); @@ -106,7 +109,7 @@ TAO_ECG_UDP_Receiver::get_address (const RtecEventComm::EventHeader& header, { if (CORBA::is_nil (this->addr_server_.in ())) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_UDP_Receiver::get_addr() called but " "nil Address Server was supplied during " "initialization through init().\n")); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp index 30078b9b547..7517514d8e3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -9,6 +9,7 @@ * */ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/ECG_UDP_Sender.h" #include "orbsvcs/Event_Utilities.h" #include "tao/CDR.h" @@ -30,14 +31,14 @@ TAO_ECG_UDP_Sender::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, { if (CORBA::is_nil (lcl_ec)) { - ACE_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::init(): " + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::init(): " "<lcl_ec> argument is nil.")); throw CORBA::INTERNAL (); } if (CORBA::is_nil (addr_server)) { - ACE_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::init(): " + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::init(): " "address server argument is nil.")); throw CORBA::INTERNAL (); } @@ -57,7 +58,7 @@ TAO_ECG_UDP_Sender::connect (const RtecEventChannelAdmin::ConsumerQOS& sub) if (CORBA::is_nil (this->lcl_ec_.in ())) { //FUZZ: disable check_for_lack_ACE_OS - ACE_ERROR ((LM_ERROR, "Error initializing TAO_ECG_UDP_Sender: " + ORBSVCS_ERROR ((LM_ERROR, "Error initializing TAO_ECG_UDP_Sender: " "init() has not been called before connect().")); //FUZZ: enable check_for_lack_ACE_OS @@ -66,7 +67,7 @@ TAO_ECG_UDP_Sender::connect (const RtecEventChannelAdmin::ConsumerQOS& sub) if (sub.dependencies.length () == 0) { - ACE_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::connect(): " + ORBSVCS_ERROR ((LM_ERROR, "TAO_ECG_UDP_Sender::connect(): " "0-length subscriptions argument.")); throw CORBA::INTERNAL (); } @@ -161,7 +162,7 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events) { if (events.length () == 0) { - // ACE_DEBUG ((EC_FORMAT (DEBUG, + // ORBSVCS_DEBUG ((EC_FORMAT (DEBUG, // "Nothing to multicast: " // "0-length EventSet."))); return; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index bc6e10440b4..ec83a5c164e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Default_Factory.h" #include "orbsvcs/Event/EC_Reactive_Dispatching.h" #include "orbsvcs/Event/EC_MT_Dispatching.h" @@ -59,7 +60,7 @@ void TAO_EC_Default_Factory::unsupported_option_value (const ACE_TCHAR * option_name, const ACE_TCHAR * option_value) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC_Default_Factory - " "Unsupported <%s> option value: <%s>. " "Ignoring this option - using defaults instead.\n", @@ -267,7 +268,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (arg, ACE_TEXT("delayed")) == 0) iteration_type = 3; else - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC_Default_Factory - " "Unknown consumer collection modifier <%s>.\n", arg)); } @@ -312,7 +313,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (arg, ACE_TEXT("delayed")) == 0) iteration_type = 3; else - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC_Default_Factory - " "Unknown supplier collection modifier <%s>.\n", arg)); } @@ -471,7 +472,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECPushSupplierSet")) == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC_Default_Factory - " "obsolete option <%s>, ignored\n", arg)); arg_shifter.consume_arg (); @@ -490,7 +491,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECConsumerAdminLock")) == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC_Default_Factory - " "obsolete option <%s>, ignored\n", arg)); arg_shifter.consume_arg (); @@ -498,7 +499,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECSupplierAdminLock")) == 0) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC_Default_Factory - " "obsolete option <%s>, ignored\n", arg)); arg_shifter.consume_arg (); @@ -507,7 +508,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else if (ACE_OS::strncmp (arg, ACE_TEXT("-EC"), 3) == 0) { arg_shifter.consume_arg (); - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC_Default_Factory - " "unknown option <%s>\n", arg)); @@ -515,7 +516,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) else { arg_shifter.consume_arg (); - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "EC_Default_Factory - " "ignoring option <%s>\n", arg)); @@ -541,7 +542,7 @@ TAO_EC_Default_Factory::find_service_object (const ACE_TCHAR* wanted, if (so != 0) return so; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC (%P|%t) EC_Default_Factory::find_service_object " "unable to find queue full service object '%s'; " "using '%s' instead\n", @@ -552,7 +553,7 @@ TAO_EC_Default_Factory::find_service_object (const ACE_TCHAR* wanted, if (so != 0) return so; - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC (%P|%t) EC_Default_Factory::find_service_object " "unable find default queue full service object '%s'; " "aborting.\n", diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp index aaef0d96cdf..dad5e5bc70c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp @@ -68,7 +68,7 @@ TAO_EC_Default_ProxyPushConsumer::connect_push_supplier ( this->qos_ = qos; #if TAO_EC_ENABLE_DEBUG_MESSAGES - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Building filter for supplier <%x>.\n", this)); #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp index e408364f8b5..f7d07b20315 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp @@ -78,7 +78,7 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer ( CORBA::PolicyList_var unused; int status = push_consumer->_validate_connection (unused); #if TAO_EC_ENABLE_DEBUG_MESSAGES - ACE_DEBUG ((LM_DEBUG, "Validated connection to PushConsumer on connect. Status[%d]\n", status)); + ORBSVCS_DEBUG ((LM_DEBUG, "Validated connection to PushConsumer on connect. Status[%d]\n", status)); #else ACE_UNUSED_ARG(status); #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */ @@ -90,7 +90,7 @@ TAO_EC_Default_ProxyPushSupplier::connect_push_consumer ( this->qos_ = qos; #if TAO_EC_ENABLE_DEBUG_MESSAGES - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Building filters for consumer <%x>.\n", this)); #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp index 18d5024f68c..44e52d115ed 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Dispatching_Task.h" #include "orbsvcs/Event/EC_ProxySupplier.h" #include "orbsvcs/Event/EC_Defaults.h" @@ -110,7 +111,7 @@ TAO_EC_Dispatching_Task::svc (void) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC (%P|%t) getq error in Dispatching Queue\n")); } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp index 7c645873577..99505ae065d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Gateway_IIOP.h" #include "orbsvcs/Event/ECG_Defaults.h" #include "orbsvcs/Event_Utilities.h" @@ -84,7 +85,7 @@ TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr supplier_ec return 0; } else - ACE_ERROR_RETURN ((LM_ERROR, + ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_EC_Gateway_IIOP - init_i " "Supplier and consumer event channel reference " "should be nil.\n"), -1); @@ -116,7 +117,7 @@ TAO_EC_Gateway_IIOP::cleanup_consumer_proxies (void) void TAO_EC_Gateway_IIOP::close_i (void) { - // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n")); + // ORBSVCS_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n")); this->disconnect_consumer_proxies_i (); this->disconnect_supplier_proxy_i (); @@ -240,7 +241,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( || CORBA::is_nil (this->supplier_ec_.in ())) return; - // ACE_DEBUG ((LM_DEBUG, "ECG (%t) update_consumer_i\n")); + // ORBSVCS_DEBUG ((LM_DEBUG, "ECG (%t) update_consumer_i\n")); this->open_i (c_qos); } @@ -269,7 +270,7 @@ TAO_EC_Gateway_IIOP::open_i ( RtecEventComm::EventSourceID sid = h.source; - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "ECG (%t) trying (%d,%d)\n", // sid, h.type)); @@ -285,14 +286,14 @@ TAO_EC_Gateway_IIOP::open_i ( if (this->consumer_proxy_map_.find (sid, proxy) == -1) { - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "ECG (%t) binding source %d\n", // sid)); proxy = supplier_admin->obtain_push_consumer (); this->consumer_proxy_map_.bind (sid, proxy); } } - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "ECG (%t) consumer map computed (%d entries)\n", // this->consumer_proxy_map_.current_size ())); @@ -332,7 +333,7 @@ TAO_EC_Gateway_IIOP::open_i ( pub.publications[c].dependency_info.rt_info = this->consumer_info_; c++; } - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "ECG (%t) supplier id %d has %d elements\n", // sid, c)); if (c == 0) @@ -340,7 +341,7 @@ TAO_EC_Gateway_IIOP::open_i ( pub.publications.length (c); - // ACE_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Supplier ")); + // ORBSVCS_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Supplier ")); // ACE_SupplierQOS_Factory::debug (pub); (*j).int_id_->connect_push_supplier (supplier_ref.in (), pub); @@ -390,7 +391,7 @@ TAO_EC_Gateway_IIOP::open_i ( supplier_admin->obtain_push_consumer (); pub.publications.length (c); - // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Supplier ")); + // ORBSVCS_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Supplier ")); // ACE_SupplierQOS_Factory::debug (pub); this->default_consumer_proxy_->connect_push_supplier (supplier_ref.in (), pub); @@ -406,7 +407,7 @@ TAO_EC_Gateway_IIOP::open_i ( RtecEventComm::PushConsumer_var consumer_ref = this->consumer_._this (); - // ACE_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Consumer ")); + // ORBSVCS_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Consumer ")); // ACE_ConsumerQOS_Factory::debug (sub); this->supplier_proxy_->connect_push_consumer (consumer_ref.in (), @@ -423,7 +424,7 @@ TAO_EC_Gateway_IIOP::update_supplier ( void TAO_EC_Gateway_IIOP::disconnect_push_consumer (void) { - // ACE_DEBUG ((LM_DEBUG, + // ORBSVCS_DEBUG ((LM_DEBUG, // "ECG (%t): Supplier-consumer received " // "disconnect from channel.\n")); } @@ -431,7 +432,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_consumer (void) void TAO_EC_Gateway_IIOP::disconnect_push_supplier (void) { - // ACE_DEBUG ((LM_DEBUG, + // ORBSVCS_DEBUG ((LM_DEBUG, // "ECG (%t): Supplier received " // "disconnect from channel.\n")); } @@ -439,11 +440,11 @@ TAO_EC_Gateway_IIOP::disconnect_push_supplier (void) void TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events) { - // ACE_DEBUG ((LM_DEBUG, "TAO_EC_Gateway_IIOP::push (%P|%t) -\n")); + // ORBSVCS_DEBUG ((LM_DEBUG, "TAO_EC_Gateway_IIOP::push (%P|%t) -\n")); if (events.length () == 0) { - // ACE_DEBUG ((LM_DEBUG, "no events\n")); + // ORBSVCS_DEBUG ((LM_DEBUG, "no events\n")); return; } @@ -453,7 +454,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events) this->busy_count_++; } - // ACE_DEBUG ((LM_DEBUG, "ECG: %d event(s)\n", events.length ())); + // ORBSVCS_DEBUG ((LM_DEBUG, "ECG: %d event(s)\n", events.length ())); // @@ TODO, there is an extra data copy here, we should do the event // modification without it and only compact the necessary events. @@ -485,7 +486,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events) if (this->use_ttl_ == 1) out[0].header.ttl--; - // ACE_DEBUG ((LM_DEBUG, "ECG: event sent to proxy\n")); + // ORBSVCS_DEBUG ((LM_DEBUG, "ECG: event sent to proxy\n")); this->push_to_consumer(proxy, out); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index b1711600126..a10b2098cc6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h" #include "orbsvcs/Event/ECG_Defaults.h" #include "orbsvcs/Event_Utilities.h" @@ -141,7 +142,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, ACE_TCHAR* argv[]) else { arg_shifter.ignore_arg (); - ACE_DEBUG ((LM_WARNING, + ORBSVCS_DEBUG ((LM_WARNING, "Ignoring <%s> option " "during initialization.\n", arg)); @@ -156,7 +157,7 @@ void TAO_EC_Gateway_IIOP_Factory::unsupported_option_value (const ACE_TCHAR * option_name, const ACE_TCHAR * option_value) { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC_Gateway_IIOP_Factory -" "Unsupported <%s> option value: <%s>. " "Ignoring this option - using defaults instead.\n", diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index 205f4429e00..d5e04983a7b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -45,7 +45,7 @@ TAO_EC_Kokyu_Dispatching::activate (void) this->dispatcher_->activate (); - //ACE_DEBUG ((LM_DEBUG, "Kokyu dispatcher activated\n")); + //ORBSVCS_DEBUG ((LM_DEBUG, "Kokyu dispatcher activated\n")); } void @@ -94,7 +94,7 @@ TAO_EC_Kokyu_Dispatching::setup_lanes (void) this->dispatcher_ = tmp; this->lanes_setup_ = 1; - //ACE_DEBUG ((LM_DEBUG, "Kokyu dispatcher setup\n")); + //ORBSVCS_DEBUG ((LM_DEBUG, "Kokyu dispatcher setup\n")); } void @@ -179,7 +179,7 @@ TAO_EC_Kokyu_Push_Command::execute () try { - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "(%t) Command object executed.\n")); this->proxy_->push_to_consumer (this->consumer_.in (), diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp index 35d28320b76..b30a44d6b65 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Kokyu_Factory.h" #include "orbsvcs/Event/EC_Kokyu_Dispatching.h" #include "orbsvcs/Event/EC_Kokyu_Scheduling.h" @@ -58,7 +60,7 @@ TAO_EC_Kokyu_Factory::init (int argc, ACE_TCHAR* argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("EC_Kokyu_Factory - ") ACE_TEXT("unsupported dispatching <%s>\n"), opt)); @@ -127,7 +129,7 @@ TAO_EC_Kokyu_Factory::init (int argc, ACE_TCHAR* argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("EC_Kokyu_Factory - ") ACE_TEXT("unsupported filtering <%s>\n"), opt)); @@ -155,7 +157,7 @@ TAO_EC_Kokyu_Factory::init (int argc, ACE_TCHAR* argv[]) #endif /* 0 */ else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("EC_Kokyu_Factory - ") ACE_TEXT("unsupported timeout <%s>\n"), opt)); @@ -185,7 +187,7 @@ TAO_EC_Kokyu_Factory::init (int argc, ACE_TCHAR* argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("EC_Kokyu_Factory - ") ACE_TEXT("unsupported scheduling <%s>\n"), opt)); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp index 9c5b3c5bbb7..e297ac02047 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/Event/EC_Kokyu_Filter.h" #include "orbsvcs/Event/EC_QOS_Info.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" @@ -169,12 +169,12 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info) { #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "Entering EC_Kokyu_Filter::add_dependencies\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Entering EC_Kokyu_Filter::add_dependencies\n")); #endif this->init_rt_info (); #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "this->rt_info_ = %d, header.type = %d, qos_info.rt_info = %d\n", this->rt_info_, header.type, qos_info.rt_info)); #endif @@ -186,14 +186,14 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header, if (matches != 0) { #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "Kokyu_Filter::matches != 0\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Kokyu_Filter::matches != 0\n")); #endif this->scheduler_->add_dependency (this->rt_info_, qos_info.rt_info, 1, RtecBase::ONE_WAY_CALL); RtecScheduler::RT_Info_var info = this->scheduler_->get (qos_info.rt_info); - ACE_DEBUG ((LM_DEBUG, "[%s][%d] ----> [%s][%d]\n", + ORBSVCS_DEBUG ((LM_DEBUG, "[%s][%d] ----> [%s][%d]\n", this->name_.c_str (), this->rt_info_, info->entry_point.in (), @@ -202,12 +202,12 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header, else { #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "Kokyu_Filter::matches == 0\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Kokyu_Filter::matches == 0\n")); #endif } #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "about to iterate thru children\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "about to iterate thru children\n")); #endif ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) @@ -215,7 +215,7 @@ TAO_EC_Kokyu_Filter::add_dependencies (const RtecEventComm::EventHeader& header, (*i)->add_dependencies (header, qos_info); } #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "Exiting EC_Kokyu_Filter: add_dependencies\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Exiting EC_Kokyu_Filter: add_dependencies\n")); #endif return 0; } @@ -260,7 +260,7 @@ TAO_EC_Kokyu_Filter::init_rt_info (void) RtecScheduler::RT_Info_var info = this->scheduler_->get (this->body_info_); - ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", + ORBSVCS_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), this->name_.c_str ())); } @@ -274,7 +274,7 @@ TAO_EC_Kokyu_Filter::init_rt_info (void) RtecScheduler::RT_Info_var info = this->scheduler_->get (this->parent_info_); - ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", + ORBSVCS_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", this->name_.c_str (), info->entry_point.in ())); #endif /* 0 */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp index 4da636491ea..2c474004024 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp @@ -56,7 +56,7 @@ TAO_EC_Kokyu_Filter_Builder::build ( #ifdef EC_KOKYU_LOGGING for (i=0; i<qos.dependencies.length (); ++i) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "consumerqos[%d] event.header.type = %s," "rt_info = %d\n", i, @@ -100,7 +100,7 @@ TAO_EC_Kokyu_Filter_Builder::build ( RtecScheduler::handle_t h_final_consumer_rep_rt_info = 0; #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "consumer rt_info found in consumerqos[%d]\n", npos)); + ORBSVCS_DEBUG ((LM_DEBUG, "consumer rt_info found in consumerqos[%d]\n", npos)); #endif if (npos >= 0 && establish_final_consumer_dependency == 1) @@ -109,7 +109,7 @@ TAO_EC_Kokyu_Filter_Builder::build ( h_final_consumer_rt_info = qos.dependencies[npos].rt_info; #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "about to get rt_info = %d\n", + ORBSVCS_DEBUG ((LM_DEBUG, "about to get rt_info = %d\n", h_final_consumer_rep_rt_info)); #endif @@ -120,7 +120,7 @@ TAO_EC_Kokyu_Filter_Builder::build ( final_consumer_rep_name += "#rep"; #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "about to create consumer rep %s\n", + ORBSVCS_DEBUG ((LM_DEBUG, "about to create consumer rep %s\n", final_consumer_rep_name.c_str ())); #endif @@ -128,7 +128,7 @@ TAO_EC_Kokyu_Filter_Builder::build ( h_final_consumer_rep_rt_info = scheduler->create (final_consumer_rep_name.c_str ()); #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "consumer rep created\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "consumer rep created\n")); #endif } @@ -144,7 +144,7 @@ TAO_EC_Kokyu_Filter_Builder::build ( ); #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Filter_Builder::Verifying whether root filter" " dependency can be established\n")); #endif @@ -152,7 +152,7 @@ TAO_EC_Kokyu_Filter_Builder::build ( if (npos >= 0 && establish_final_consumer_dependency == 1) { #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Filter_Builder::root filter dependency " "can be established\n")); #endif @@ -183,13 +183,13 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build ( const RtecEventComm::Event& e = qos.dependencies[pos].event; #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "Filter_Builder::In recursive build\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Filter_Builder::In recursive build\n")); #endif if (e.header.type == ACE_ES_CONJUNCTION_DESIGNATOR) { #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "Filter_Builder::Conjuction designator\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Filter_Builder::Conjuction designator\n")); #endif CORBA::ULong npos = pos; ACE_CString name; @@ -231,7 +231,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build ( else if (e.header.type == ACE_ES_DISJUNCTION_DESIGNATOR) { #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "Filter_Builder::Disjunction designator\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Filter_Builder::Disjunction designator\n")); #endif CORBA::ULong npos = pos; ACE_CString name; @@ -274,7 +274,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build ( || e.header.type == ACE_ES_EVENT_DEADLINE_TIMEOUT) { #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, "Filter_Builder::Timeout designator\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "Filter_Builder::Timeout designator\n")); #endif // @@ We need a unique name for each timeout, assigned by the // application? @@ -337,7 +337,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build ( else { #ifdef EC_KOKYU_LOGGING - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "Kokyu_Filter_Builder::No designator for this entry. " "Must be a body\n")); #endif diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp index 898172f5895..619835dc43a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_MT_Dispatching.h" @@ -40,11 +41,11 @@ TAO_EC_MT_Dispatching::activate (void) { if (this->force_activate_ != 0) { - ACE_DEBUG ((LM_DEBUG, + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t) activating dispatching queue at" " default priority\n")); if (this->task_.activate (THR_BOUND, this->nthreads_) == -1) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC (%P|%t) cannot activate dispatching queue.\n")); } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index d9aaf04d5a9..63824d13eda 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -82,7 +82,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier) pub.publications[j].event; #if TAO_EC_ENABLE_DEBUG_MESSAGES - ACE_DEBUG ((LM_DEBUG, "Connecting consumer <%x> to <%x>, " + ORBSVCS_DEBUG ((LM_DEBUG, "Connecting consumer <%x> to <%x>, " "trying event <%d:%d> ", supplier, this, event.header.source, event.header.type)); @@ -90,13 +90,13 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier) if (supplier->can_match (event.header)) { #if TAO_EC_ENABLE_DEBUG_MESSAGES - ACE_DEBUG ((LM_DEBUG, " matched\n")); + ORBSVCS_DEBUG ((LM_DEBUG, " matched\n")); #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */ this->collection_->connected (supplier); return; } #if TAO_EC_ENABLE_DEBUG_MESSAGES - ACE_DEBUG ((LM_DEBUG, " not matched\n")); + ORBSVCS_DEBUG ((LM_DEBUG, " not matched\n")); #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */ } } @@ -117,12 +117,12 @@ TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier) const RtecEventComm::Event& event = pub.publications[j].event; - // ACE_DEBUG ((LM_DEBUG, "Trying %d:%d in %x\n", + // ORBSVCS_DEBUG ((LM_DEBUG, "Trying %d:%d in %x\n", // event.header.source, event.header.type, // this)); if (supplier->can_match (event.header)) { - // ACE_DEBUG ((LM_DEBUG, " matched %x\n", supplier)); + // ORBSVCS_DEBUG ((LM_DEBUG, " matched %x\n", supplier)); this->collection_->connected (supplier); return; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index a7f902c9b55..16b71d22bd1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Priority_Dispatching.h" #include "orbsvcs/Event/EC_Dispatching_Task.h" #include "orbsvcs/Event/EC_Event_Channel_Base.h" @@ -77,7 +78,7 @@ TAO_EC_Priority_Dispatching::activate (void) priority = ACE_Sched_Params::priority_min (ACE_SCHED_OTHER, ACE_SCOPE_THREAD); if (this->tasks_[i]->activate (flags, 1, 1, priority) == -1) - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "EC (%P|%t) cannot activate queue %d", i)); } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp index 84c00ffa45f..d4e40a598d7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Priority_Scheduling.h" #include "orbsvcs/Event/EC_QOS_Info.h" #include "orbsvcs/Event/EC_ProxyConsumer.h" @@ -23,7 +24,7 @@ TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, TAO_EC_ProxyPushConsumer *consumer) { - ACE_DEBUG ((LM_DEBUG, "add_proxy_supplier_dependencies - %x %x\n", + ORBSVCS_DEBUG ((LM_DEBUG, "add_proxy_supplier_dependencies - %x %x\n", supplier, consumer)); const RtecEventChannelAdmin::SupplierQOS& qos = consumer->publications (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp index 436d0ff5b62..d85bdee6d82 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp @@ -153,7 +153,7 @@ TAO_EC_Reactive_ConsumerControl::consumer_not_exist ( { try { - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "EC_Reactive_ConsumerControl(%P|%t) - " // "Consumer %x does not exists\n", long(proxy))); proxy->disconnect_push_supplier (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp index a8d388bdef5..369add84a12 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp @@ -146,7 +146,7 @@ TAO_EC_Reactive_SupplierControl::supplier_not_exist ( { try { - //ACE_DEBUG ((LM_DEBUG, + //ORBSVCS_DEBUG ((LM_DEBUG, // "EC_Reactive_SupplierControl(%P|%t) - " // "Consumer %x does not exists\n", long(proxy))); proxy->disconnect_push_consumer (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp index 4732e146e71..c24e66102ae 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_Sched_Factory.h" #include "orbsvcs/Event/EC_Priority_Dispatching.h" #include "orbsvcs/Event/EC_Priority_Scheduling.h" @@ -53,7 +54,7 @@ TAO_EC_Sched_Factory::init (int argc, ACE_TCHAR* argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("EC_Sched_Factory - ") ACE_TEXT("unsupported dispatching <%s>\n"), opt)); @@ -87,7 +88,7 @@ TAO_EC_Sched_Factory::init (int argc, ACE_TCHAR* argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("EC_Sched_Factory - ") ACE_TEXT("unsupported filtering <%s>\n"), opt)); @@ -115,7 +116,7 @@ TAO_EC_Sched_Factory::init (int argc, ACE_TCHAR* argv[]) #endif /* 0 */ else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("EC_Sched_Factory - ") ACE_TEXT("unsupported timeout <%s>\n"), opt)); @@ -145,7 +146,7 @@ TAO_EC_Sched_Factory::init (int argc, ACE_TCHAR* argv[]) } else { - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT("EC_Sched_Factory - ") ACE_TEXT("unsupported scheduling <%s>\n"), opt)); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp index 1ae39568dea..7828330e5c2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/Event/EC_Sched_Filter.h" #include "orbsvcs/Event/EC_QOS_Info.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" @@ -152,7 +152,7 @@ TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header, RtecScheduler::RT_Info_var info = this->scheduler_->get (qos_info.rt_info); - ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", + ORBSVCS_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", this->name_.c_str (), info->entry_point.in ())); } @@ -207,7 +207,7 @@ TAO_EC_Sched_Filter::init_rt_info (void) RtecScheduler::RT_Info_var info = this->scheduler_->get (child.rt_info); - ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", + ORBSVCS_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), this->name_.c_str ())); @@ -224,7 +224,7 @@ TAO_EC_Sched_Filter::init_rt_info (void) RtecScheduler::RT_Info_var info = this->scheduler_->get (this->body_info_); - ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", + ORBSVCS_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), this->name_.c_str ())); } @@ -238,7 +238,7 @@ TAO_EC_Sched_Filter::init_rt_info (void) RtecScheduler::RT_Info_var info = this->scheduler_->get (this->parent_info_); - ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", + ORBSVCS_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", this->name_.c_str (), info->entry_point.in ())); #endif /* 0 */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp index facf8b9ae78..658d83cd482 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_TPC_Dispatching.h" #include "orbsvcs/Event/EC_Defaults.h" @@ -48,21 +49,21 @@ TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer) RtecEventComm::PushConsumer::_duplicate(consumer); if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::add_consumer(%@)\n", pc.in())); + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::add_consumer(%@)\n", pc.in())); TAO_EC_Dispatching_Task* dtask = new TAO_EC_TPC_Dispatching_Task (&this->thread_manager_, this->queue_full_service_object_); if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::add_consumer(%@): new task %@\n", pc.in(), dtask)); + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::add_consumer(%@): new task %@\n", pc.in(), dtask)); if ((dtask->activate (this->thread_creation_flags_, 1, // we only want one thread to dispatch to a consumer 1, // magic number?? this->thread_priority_)) == -1) { - ACE_DEBUG ((LM_WARNING, + ORBSVCS_DEBUG ((LM_WARNING, "EC (%P|%t): TPC_Dispatching::add_consumer unable to activate" " dispatching task for consumer (%@)\n", consumer)); @@ -81,7 +82,7 @@ TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer) if (explanation != 0) { - ACE_DEBUG ((LM_WARNING, + ORBSVCS_DEBUG ((LM_WARNING, "EC (%P|%t): TPC_Dispatching::add_consumer failed to bind consumer (%@)" " and dispatch task in map (%s): %p\n", consumer, explanation)); @@ -103,7 +104,7 @@ TAO_EC_TPC_Dispatching::remove_consumer (RtecEventComm::PushConsumer_ptr consume if (this->consumer_task_map_.find (consumer, dtask) == -1) { - ACE_DEBUG ((LM_WARNING, + ORBSVCS_DEBUG ((LM_WARNING, "EC (%P|%t): TPC_Dispatching::remove_consumer failed to" " find consumer (%@) in map\n", consumer)); return -1; @@ -112,7 +113,7 @@ TAO_EC_TPC_Dispatching::remove_consumer (RtecEventComm::PushConsumer_ptr consume // Must have found it...first try to unbind if (this->consumer_task_map_.unbind (consumer) == -1) { - ACE_DEBUG ((LM_WARNING, + ORBSVCS_DEBUG ((LM_WARNING, "EC (%P|%t): TPC_Dispatching::remove_consumer failed to" " unbind consumer (%@) and task in map\n", consumer)); return -1; @@ -181,14 +182,14 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, TAO_EC_QOS_Info&) { if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::push_nocopy(supplier=%@,consumer=%@)\n", proxy, consumer)); + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::push_nocopy(supplier=%@,consumer=%@)\n", proxy, consumer)); ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); TAO_EC_Dispatching_Task* dtask = 0; if (this->consumer_task_map_.find (consumer, dtask) == -1) { - ACE_DEBUG ((LM_WARNING, + ORBSVCS_DEBUG ((LM_WARNING, "EC (%P|%t): TPC_Dispatching::push_nocopy failed to" " find consumer (%@) in map\n", consumer)); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp index 390c3832b2f..2502bbbe980 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_TPC_Factory.h" #include "orbsvcs/Event/EC_TPC_Dispatching.h" @@ -54,7 +55,7 @@ TAO_EC_TPC_Factory::init (int argc, ACE_TCHAR* argv[]) // option isn't valid with this factory and that it's // being ignored. - ACE_DEBUG ((LM_ERROR, + ORBSVCS_DEBUG ((LM_ERROR, "EC_TPC_Factory - " "-ECDispatching not supported with TPC_Factory; ignoring the option and using thread-per-consumer dispatch strategy\n")); arg_shifter.consume_arg (); @@ -81,7 +82,7 @@ TAO_EC_Dispatching* TAO_EC_TPC_Factory::create_dispatching (TAO_EC_Event_Channel_Base *) { if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_dispatching\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_dispatching\n")); TAO_EC_Queue_Full_Service_Object* so = this->find_service_object (this->queue_full_service_object_name_.fast_rep(), @@ -99,7 +100,7 @@ TAO_EC_ProxyPushSupplier* TAO_EC_TPC_Factory::create_proxy_push_supplier (TAO_EC_Event_Channel_Base *ec) { if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_proxy_push_supplier\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_proxy_push_supplier\n")); return new TAO_EC_TPC_ProxyPushSupplier (ec, this->consumer_validate_connection_); } @@ -108,7 +109,7 @@ TAO_EC_ProxyPushConsumer* TAO_EC_TPC_Factory::create_proxy_push_consumer (TAO_EC_Event_Channel_Base *ec) { if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_proxy_push_consumer\n")); + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t) EC_TPC_Factory::create_proxy_push_consumer\n")); return new TAO_EC_TPC_ProxyPushConsumer (ec); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp index 8ed6366b614..4519384a419 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_TPC_ProxyConsumer.h" @@ -32,7 +33,7 @@ TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer (void) // to fact that "remove" code out of just the // disconnect_push_consumer. if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "RTEC (%P|%t): inside ~TAO_EC_TPC_ProxyPushConsumer (%x)\n", this)); + ORBSVCS_DEBUG ((LM_DEBUG, "RTEC (%P|%t): inside ~TAO_EC_TPC_ProxyPushConsumer (%x)\n", this)); } void diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp index d70bf720539..28489c6aa39 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp @@ -1,5 +1,6 @@ // $Id$ +#include "orbsvcs/Log_Macros.h" #include "orbsvcs/Event/EC_TPC_ProxySupplier.h" #if ! defined (__ACE_INLINE__) @@ -24,7 +25,7 @@ void TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (void) { if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): enter EC_TPC_ProxySupplier::disconnect_push_supplier (%@): refcount=%u,consumer=%@\n", + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t): enter EC_TPC_ProxySupplier::disconnect_push_supplier (%@): refcount=%u,consumer=%@\n", this, this->refcount_, this->consumer_.in())); @@ -36,7 +37,7 @@ TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (void) BASECLASS::disconnect_push_supplier (); if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): leave EC_TPC_ProxySupplier::disconnect_push_supplier (%@)\n", this)); + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t): leave EC_TPC_ProxySupplier::disconnect_push_supplier (%@)\n", this)); } TAO_EC_TPC_Dispatching* @@ -55,7 +56,7 @@ TAO_EC_TPC_ProxyPushSupplier::connect_push_consumer ( BASECLASS::connect_push_consumer (push_consumer, qos); if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): EC_ProxySupplier(%@): refcount=%u,consumer=%@\n", + ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t): EC_ProxySupplier(%@): refcount=%u,consumer=%@\n", this, this->refcount_, this->consumer_.in())); TAO_EC_TPC_Dispatching* tpcdispatcher = this->tpc_dispatching (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl index 89900d54216..0ef108f34d2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl @@ -2,6 +2,9 @@ // // $Id$ +#include "orbsvcs/Log_Macros.h" +#include "orbsvcs/Log_Macros.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL extern unsigned long TAO_EC_TPC_debug_level; @@ -11,7 +14,7 @@ TAO_EC_TPC_ProxyPushSupplier::TAO_EC_TPC_ProxyPushSupplier (TAO_EC_Event_Channel : TAO_EC_Default_ProxyPushSupplier (ec, validate_connection) { if (TAO_EC_TPC_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) EC_TPC_ProxyPushSupplier::CTOR (%@)\n", this)); + ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) EC_TPC_ProxyPushSupplier::CTOR (%@)\n", this)); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp index d4107aababb..d08f0c146ec 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp @@ -5,7 +5,7 @@ #include "ace/OS_NS_Thread.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_strings.h" -#include "ace/Log_Msg.h" +#include "orbsvcs/Log_Macros.h" #include "ace/Sched_Params.h" @@ -111,7 +111,7 @@ TAO_EC_Thread_Flags::parse_symbols (const char* syms) { // Ideally this would call some sort of on-error function... // but, it doesn't. - ACE_ERROR ((LM_ERROR, + ORBSVCS_ERROR ((LM_ERROR, "RTEC (%P|%t) unable to parse %C as a thread flag - skipping\n", tok)); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp index 9af62d1d36a..27161888e63 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -51,7 +51,7 @@ TAO_EC_Timeout_Filter::TAO_EC_Timeout_Filter ( ACE_Time_Value::zero); } - // ACE_DEBUG ((LM_DEBUG, + // ORBSVCS_DEBUG ((LM_DEBUG, // "EC_Timeout_Filter - interval = %d:%d, ID = %d\n", // tv_interval.sec (), tv_interval.usec (), // this->id_)); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index 19724045232..2b219948810 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -20,7 +20,7 @@ int TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */, const void *vp) { - // ACE_DEBUG ((LM_DEBUG, + // ORBSVCS_DEBUG ((LM_DEBUG, // "TAO_EC_Timeout_Adapter::handle_timeout -" // " expire at %d:%d\n", // tv.sec (), tv.usec ())); |