diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-05-08 14:22:01 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-05-08 14:22:01 +0000 |
| commit | 74bc1a6ae95311079d67ae9b3764a08191468490 (patch) | |
| tree | 0666598b0c41daeb40877e2303d0733eeff6698e | |
| parent | 248ab48f97113b8ed4bcf38d12de6760bd28b886 (diff) | |
| download | ATCD-74bc1a6ae95311079d67ae9b3764a08191468490.tar.gz | |
Merge from trunk
299 files changed, 3954 insertions, 2677 deletions
diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html index 62cf735d010..d1070b665a4 100644 --- a/ACE/ACE-INSTALL.html +++ b/ACE/ACE-INSTALL.html @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +http://www.dre.vanderbilt.edu/~schmidt/PDF/Svc-Conf.pdf<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html><head><!-- $Id$ --> <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>Building and Installing ACE and Its Auxiliary Libraries and Services</title> diff --git a/ACE/ChangeLog b/ACE/ChangeLog index ae8908157b1..3414f95f05a 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,466 @@ +Tue May 7 15:04:24 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/OS_NS_Thread.{h,inl}: Added a new ACE_OS::thr_id() method + that stores a string version of the current thread id into + buffer and returns the size of this thread id in bytes. + +Thu Apr 25 16:51:06 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Svc_Handler.h: + ace/Connector.h: + ace/Acceptor.h: Added template parameter documentation. + Thanks to Clyde Gerber <clyde_gerber at symantec dot com> for + contributing this. + +Thu Apr 25 07:20:58 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * etc/ace.doxygen: + Set MAX_DOT_GRAPH_DEPTH to 5, thanks to Clyde Gerber + <clyde_gerber at symantec dot com> for motivating this. + +Wed Apr 24 14:43:25 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Acceptor.{h,cpp}, ace/Connector.{h,cpp}: + * ace/Svc_Handler.{h,cpp}: Replaced all the obsolete + ACE_PEER_{STREAM,ACCEPTOR,CONNECTOR} macros that have been + deprecated. Thanks to Clyde Gerber <clyde_gerber at symantec + dot com> for motivating this. + +Wed Apr 24 14:42:50 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Global_Macros.h: Added comments that indicate the + ACE_PEER_{STREAM,ACCEPTOR,CONNECTOR} macros have been + deprecated. Thanks to Clyde Gerber <clyde_gerber at symantec + dot com> for motivating this. + +Wed Apr 24 13:57:02 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Svc_Handler.{h,cpp}: Zapped the obsolete ACE_PEER_STREAM* + macros since compilers that ACE supports now should handle the + traits classes properly. + +Thu Apr 18 16:42:03 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Svc_Handler.h: Updated the documentation for + ACE_Svc_Handler::open() method. Thanks to Andreas Florath + <andreas at florath dot org> for motivating this. + +Mon Apr 15 01:59:34 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * examples/Connection/misc/Connection_Handler.cpp: Improved the + documentation. + +Mon Apr 22 14:43:53 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Hash_Map_Manager_T.inl: + * ace/Hash_Map_Manager_T.cpp: + Fixed maybe unitialized warnings + +Fri Apr 19 19:15:42 UTC 2013 Adam Mitz <mitza@ociweb.com> + + * bin/fuzz.pl: + + Added a fuzz check for the category-specifc ACE log macros. + + * ace/XML_Utils/XML_Helper.tpp: + + Fixed fuzz error. + +Fri Apr 19 14:39:41 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> + + * ace/Log_Category.cpp: + * ace/Log_Record.cpp: + + Fixed Coverity warnings. + +Fri Apr 19 12:02:36 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * contrib/minizip/unzip.c: + * contrib/minizip/zip.c: + Fixed warnings + +Fri Apr 19 11:15:43 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: + * examples/IPC_SAP/SSL_SAP/SSL-client.cpp: + Fixed warnings in single threaded builds + +Thu Apr 18 16:21:32 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> + + * ace/Log_Category.h: + * ace/Log_Category.cpp: + + Fixed main thread Log_Category_TSS object not cleaned up before + program exits. + +Mon Apr 15 22:45:14 UTC 2013 Steve Huston <shuston@riverace.com> + + * ace/Dev_Poll_Reactor.h: + * ace/Dev_Poll_Reactor.cpp: Changed the repository lock (repo_token_) + from an ACE_DEV_POLL_TOKEN to ACE_SYNCH_MUTEX and renamed it + repo_lock_. Gets a few more percent improvement in performance. + +Mon Apr 15 17:46:24 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> + + * ace/Log_Category.inl: + + Fixed linking problem for ST build. + +Mon Apr 15 14:28:43 UTC 2013 Steve Huston <shuston@riverace.com> + + * ace/Dev_Poll_Reactor.cpp: Fixed single-threaded build issues. + Fuzz tweaks. + +Mon Apr 15 13:59:55 UTC 2013 Adam Mitz <mitza@ociweb.com> + + * ace/Log_Record.inl: + + Fixed ACE_TRACE macro to match actual method name. + +Fri Apr 12 19:49:50 UTC 2013 Steve Huston <shuston@riverace.com> + + * ace/Dev_Poll_Reactor.cpp: + * ace/Dev_Poll_Reactor.h: Take advantage of the thread-safe behavior + of epoll_ctl/epoll_wait and allow changes to the wait set to be made + without interrupting the waiting leader thread. To make timers and + notifies more predictable, still allow only one thread to wait for + events at a time, but allow registrations, removals, etc. to the + wait set to be made by any thread. The "reactor token" now controls + the leader/followers for event dispatching; a new repository token + is added to synchronize access to the handler repository, independent + of waiting for events. + +Fri Apr 12 19:43:34 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> + + * ace/Log_Category.cpp: + Fixed problem caused by pervious commit. + +Fri Apr 12 19:30:05 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> + + * ace/Log_Category.h: + * ace/Log_Category.cpp: + Fixed problem for ST build + + * tests/Log_Msg_Test.cpp: + Fixed problem for WCHAR build + +>>>>>>> .r97068 +Thu Apr 11 19:53:22 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> + + * ace/Log_Category.h: + Fixed some documentation problems. + +Thu Apr 11 19:42:14 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> + + * ace/Log_Category.h: + Fixed ACELIB_ERROR_RETURN() control reaches end of non-void function warning. + + * tests/Log_Msg_Test.cpp: + Added test for ACE_Log_Category + +Thu Apr 11 17:54:55 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> + + * ace/ace_for_tao.mpc: + Added missing file. + +Thu Apr 11 15:45:41 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> + + * ace/ACE.cpp: + * ace/ARGV.cpp: + * ace/ATM_Acceptor.inl: + * ace/ATM_Acceptor.cpp: + * ace/ATM_Addr.cpp: + * ace/ATM_Connector.inl: + * ace/ATM_Connector.cpp: + * ace/ATM_QoS.cpp: + * ace/ATM_Stream.cpp: + * ace/Acceptor.cpp: + * ace/Activation_Queue.cpp: + * ace/Addr.cpp: + * ace/Assert.cpp: + * ace/Asynch_Acceptor.cpp: + * ace/Asynch_Connector.cpp: + * ace/Asynch_Pseudo_Task.cpp: + * ace/Atomic_Op.cpp: + * ace/Atomic_Op_GCC_T.cpp: + * ace/Atomic_Op_T.cpp: + * ace/Auto_IncDec_T.cpp: + * ace/Barrier.cpp: + * ace/Based_Pointer_T.cpp: + * ace/Basic_Stats.cpp: + * ace/Bound_Ptr.inl: + * ace/CE_Screen_Output.cpp: + * ace/Cache_Map_Manager_T.cpp: + * ace/Cached_Connect_Strategy_T.cpp: + * ace/Caching_Strategies_T.inl: + * ace/Caching_Strategies_T.cpp: + * ace/Capabilities.cpp: + * ace/Codecs.cpp: + * ace/Condition_Recursive_Thread_Mutex.cpp: + * ace/Condition_T.cpp: + * ace/Condition_Thread_Mutex.cpp: + * ace/Configuration.cpp: + * ace/Connector.cpp: + * ace/Containers_T.cpp: + * ace/DEV_Addr.cpp: + * ace/DEV_Connector.h: + * ace/DEV_Connector.inl: + * ace/DEV_IO.cpp: + * ace/DLL.cpp: + * ace/DLL_Manager.cpp: + * ace/Dev_Poll_Reactor.inl: + * ace/Dev_Poll_Reactor.cpp: + * ace/Dirent.inl: + * ace/Dump.cpp: + * ace/Dynamic_Message_Strategy.cpp: + * ace/Dynamic_Service_Base.cpp: + * ace/Dynamic_Service_Dependency.cpp: + * ace/Event.cpp: + * ace/Event_Base.cpp: + * ace/FIFO.cpp: + * ace/FIFO_Recv.cpp: + * ace/FIFO_Recv_Msg.cpp: + * ace/FIFO_Send.cpp: + * ace/FIFO_Send_Msg.cpp: + * ace/FILE_Addr.cpp: + * ace/FILE_Connector.h: + * ace/FILE_Connector.inl: + * ace/FILE_Connector.cpp: + * ace/FILE_IO.cpp: + * ace/File_Lock.cpp: + * ace/Filecache.cpp: + * ace/Framework_Component.cpp: + * ace/Future.cpp: + * ace/Get_Opt.cpp: + * ace/Guard_T.cpp: + * ace/Handle_Set.inl: + * ace/Handle_Set.cpp: + * ace/Hash_Map_Manager_T.h: + * ace/Hash_Map_Manager_T.inl: + * ace/Hash_Map_Manager_T.cpp: + * ace/Hash_Multi_Map_Manager_T.h: + * ace/Hash_Multi_Map_Manager_T.inl: + * ace/Hash_Multi_Map_Manager_T.cpp: + * ace/High_Res_Timer.cpp: + * ace/ICMP_Socket.cpp: + * ace/INET_Addr.cpp: + * ace/IO_SAP.cpp: + * ace/IPC_SAP.cpp: + * ace/Intrusive_Auto_Ptr.inl: + * ace/LSOCK.cpp: + * ace/LSOCK_Acceptor.cpp: + * ace/LSOCK_CODgram.cpp: + * ace/LSOCK_Connector.cpp: + * ace/LSOCK_Dgram.cpp: + * ace/LSOCK_Stream.cpp: + * ace/Lib_Find.cpp: + * ace/Local_Memory_Pool.cpp: + * ace/Local_Name_Space_T.cpp: + * ace/Local_Tokens.h: + * ace/Local_Tokens.inl: + * ace/Local_Tokens.cpp: + * ace/Log_Category.h: + * ace/Log_Msg.cpp: + * ace/Log_Msg_NT_Event_Log.cpp: + * ace/Log_Msg_UNIX_Syslog.cpp: + * ace/Log_Record.cpp: + * ace/Logging_Strategy.h: + * ace/Logging_Strategy.cpp: + * ace/MEM_Acceptor.cpp: + * ace/MEM_Addr.cpp: + * ace/MEM_Connector.cpp: + * ace/MEM_IO.cpp: + * ace/MEM_SAP.cpp: + * ace/MMAP_Memory_Pool.cpp: + * ace/Malloc.h: + * ace/Malloc.cpp: + * ace/Malloc_Allocator.cpp: + * ace/Malloc_T.cpp: + * ace/Map_Manager.inl: + * ace/Map_Manager.cpp: + * ace/Mem_Map.cpp: + * ace/Message_Block.cpp: + * ace/Message_Queue.cpp: + * ace/Message_Queue_NT.cpp: + * ace/Message_Queue_T.cpp: + * ace/Message_Queue_Vx.cpp: + * ace/Module.cpp: + * ace/Monitor_Admin.cpp: + * ace/Monitor_Base.cpp: + + * ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp: + * ace/Monitor_Control/CPU_Load_Monitor.cpp: + * ace/Monitor_Control/Constraint_Interpreter.cpp: + * ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp: + * ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp: + * ace/Monitor_Control/Memory_Usage_Monitor.cpp: + * ace/Monitor_Control/Monitor_Query.cpp: + * ace/Monitor_Control/Num_Threads_Monitor.cpp: + * ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp: + * ace/Monitor_Control/Windows_Monitor.cpp: + * ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp: + + * ace/Monitor_Point_Registry.cpp: + * ace/Multihomed_INET_Addr.cpp: + * ace/Mutex.cpp: + * ace/NT_Service.cpp: + * ace/Name_Proxy.cpp: + * ace/Name_Request_Reply.cpp: + * ace/Naming_Context.cpp: + * ace/OS_NS_Thread.cpp: + * ace/OS_NS_dirent.cpp: + * ace/OS_NS_stdio.cpp: + * ace/OS_NS_unistd.cpp: + * ace/Obchunk.cpp: + * ace/Object_Manager.cpp: + * ace/Obstack_T.cpp: + * ace/PI_Malloc.cpp: + * ace/POSIX_Asynch_IO.cpp: + * ace/POSIX_CB_Proactor.cpp: + * ace/POSIX_Proactor.cpp: + * ace/Pagefile_Memory_Pool.cpp: + * ace/Parse_Node.cpp: + * ace/Ping_Socket.cpp: + * ace/Pipe.cpp: + * ace/Priority_Reactor.cpp: + * ace/Proactor.cpp: + * ace/Process.cpp: + * ace/Process_Manager.cpp: + * ace/Process_Mutex.cpp: + * ace/Process_Semaphore.cpp: + * ace/Profile_Timer.cpp: + + * ace/QoS/QoS_Manager.cpp: + * ace/QoS/QoS_Session_Factory.cpp: + * ace/QoS/QoS_Session_Impl.inl: + * ace/QoS/QoS_Session_Impl.cpp: + * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp: + + * ace/RB_Tree.inl: + * ace/RB_Tree.cpp: + * ace/RW_Mutex.cpp: + * ace/RW_Process_Mutex.cpp: + * ace/Reactor_Token_T.cpp: + * ace/Read_Buffer.cpp: + * ace/Recursive_Thread_Mutex.cpp: + * ace/Refcounted_Auto_Ptr.inl: + * ace/Registry_Name_Space.cpp: + * ace/Remote_Name_Space.cpp: + * ace/Remote_Tokens.cpp: + * ace/SOCK.cpp: + * ace/SOCK_Acceptor.cpp: + * ace/SOCK_CODgram.cpp: + * ace/SOCK_Connector.cpp: + * ace/SOCK_Dgram.cpp: + * ace/SOCK_Dgram_Bcast.cpp: + * ace/SOCK_Dgram_Mcast.cpp: + * ace/SOCK_Netlink.cpp: + * ace/SOCK_SEQPACK_Acceptor.cpp: + * ace/SOCK_SEQPACK_Association.cpp: + * ace/SOCK_SEQPACK_Connector.cpp: + * ace/SPIPE_Acceptor.cpp: + * ace/SPIPE_Connector.cpp: + + * ace/SSL/SSL_Asynch_Stream.cpp: + * ace/SSL/SSL_Context.cpp: + * ace/SSL/SSL_SOCK_Acceptor.cpp: + * ace/SSL/SSL_SOCK_Connector.cpp: + * ace/SSL/SSL_SOCK_Stream.cpp: + + * ace/SUN_Proactor.cpp: + * ace/SV_Message_Queue.cpp: + * ace/SV_Semaphore_Complex.cpp: + * ace/SV_Semaphore_Simple.cpp: + * ace/SV_Shared_Memory.cpp: + * ace/Sample_History.cpp: + * ace/Sbrk_Memory_Pool.cpp: + * ace/Select_Reactor_Base.cpp: + * ace/Select_Reactor_T.cpp: + * ace/Semaphore.cpp: + * ace/Service_Config.cpp: + * ace/Service_Gestalt.cpp: + * ace/Service_Manager.cpp: + * ace/Service_Object.cpp: + * ace/Service_Repository.cpp: + * ace/Shared_Memory_Pool.cpp: + * ace/Signal.cpp: + * ace/Singleton.cpp: + * ace/Sock_Connect.cpp: + * ace/Stack_Trace.h: + * ace/Stats.h: + * ace/Stats.inl: + * ace/Strategies_T.inl: + * ace/Strategies_T.cpp: + * ace/Stream.cpp: + * ace/Svc_Conf_y.cpp: + * ace/Svc_Handler.cpp: + * ace/System_Time.cpp: + * ace/TLI.cpp: + * ace/TLI_Acceptor.cpp: + * ace/TLI_Connector.h: + * ace/TLI_Connector.inl: + * ace/TP_Reactor.cpp: + * ace/TSS_T.inl: + * ace/TSS_T.cpp: + * ace/Task_Ex_T.cpp: + * ace/Task_T.cpp: + * ace/Thread_Manager.h: + * ace/Thread_Manager.cpp: + * ace/Thread_Mutex.cpp: + * ace/Throughput_Stats.cpp: + * ace/Timeprobe_T.cpp: + * ace/Timer_Hash_T.cpp: + * ace/Timer_Heap_T.cpp: + * ace/Timer_List_T.cpp: + * ace/Timer_Queue_Adapters.cpp: + * ace/Timer_Queue_Iterator.cpp: + * ace/Timer_Queue_T.cpp: + * ace/Timer_Wheel_T.cpp: + * ace/Token.cpp: + * ace/Token_Collection.cpp: + * ace/Token_Invariants.cpp: + * ace/Token_Manager.cpp: + * ace/Token_Request_Reply.cpp: + * ace/Trace.cpp: + * ace/Typed_SV_Message_Queue.cpp: + * ace/UNIX_Addr.h: + * ace/UPIPE_Acceptor.cpp: + * ace/UPIPE_Connector.inl: + * ace/UPIPE_Connector.cpp: + * ace/UUID.cpp: + * ace/Unbounded_Queue.cpp: + * ace/Unbounded_Set.cpp: + * ace/Unbounded_Set_Ex.cpp: + * ace/WFMO_Reactor.inl: + * ace/WFMO_Reactor.cpp: + * ace/WIN32_Asynch_IO.cpp: + * ace/WIN32_Proactor.cpp: + + * ace/XML_Utils/XML_Error_Handler.cpp: + + * ace/XTI_ATM_Mcast.inl: + Change the use of ACE_ERROR/ACE_DEBUG macros inside ace to ACELIB_ERROR/ACELIB_DEBUG. + + +Thu Apr 11 15:20:21 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> + + * ace/Log_Category.h: + * ace/Log_Category.inl: + * ace/Log_Category.cpp: + * ace/Log_Msg.h: + * ace/Log_Msg.cpp: + * ace/Log_Record.h: + * ace/Log_Record.inl: + * ace/Log_Record.cpp: + * ace/ace.mpc: + * tests/Log_Msg_Test.cpp: + Added ACE_Log_Category class so that log messages can be separated into + different categories and be enabled/disabled independently. + +Thu Apr 11 11:13:34 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * README: Updated this file, which was horribly out of date! + Sun Apr 7 00:20:49 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> * ace/Global_Macros.h: Added documentation for the arguments to @@ -1,4 +1,4 @@ -USER VISIBLE CHANGES BETWEEN ACE-6.1.8 and ACE-6.2.0 +USER VISIBLE CHANGES BETWEEN ACE-6.1.8 and ACE-6.1.9 ==================================================== . Added MinGW64 as supported platform diff --git a/ACE/README b/ACE/README index 4994a94f1f9..98db9ebf8a8 100644 --- a/ACE/README +++ b/ACE/README @@ -2,10 +2,10 @@ $Id$ This document is also available at the following URL: -http://www.cs.wustl.edu/~schmidt/ACE.html +http://www.dre.vanderbilt.edu/~schmidt/ACE.html All software and documentation is available via both anonymous ftp and -the World Wide Web.] +the http.] THE ADAPTIVE COMMUNICATION ENVIRONMENT (ACE) @@ -149,17 +149,15 @@ applications provided with the ACE release include: OBTAINING ACE -The current ACE release is provided as a tar file that is around 3 Meg -compressed using GNU gzip. ACE may be obtained electronically from -http://www.cs.wustl.edu/~schmidt/ACE-obtain.html. This release -contains the source code, test drivers, and example applications -(including JAWS) for C++ wrapper libraries and the higher-level ACE -network programming framework developed as part of the ADAPTIVE -project at the University of California, Irvine and at Washington -University, St. Louis. +ACE may be obtained electronically from +http://download.dre.vanderbilt.edu. This release contains the source +code, test drivers, and example applications (including JAWS) for C++ +wrapper libraries and the higher-level ACE network programming +framework developed as part of the ADAPTIVE project at the University +of California, Irvine, Washington University, St. Louis, and +Vanderbilt University. -You can get The ACE ORB (TAO) in a companion release at -http://www.cs.wustl.edu/~schmidt/TAO.html. +You can get The ACE ORB (TAO) in a companion release at the same URL. ---------------------------------------- @@ -170,45 +168,45 @@ described in issues of the C++ Report, as well as in proceedings of many journals, conferences, and workshops. A collection of white papers and tutorial handouts are included at -ftp://wuarchive.wustl.edu/languages/c++/ACE/ACE-documentation. This -directory contains postscript versions of various papers that describe -different aspects of ACE. -I update these papers periodically to reflect changes to the ACE -architecture. Therefore, you might want to check the date on the -files to make sure that you have read the most recent versions of -these papers. +http://www.dre.vanderbilt.edu/~schmidt/ACE-papers.html + +This page contains PDF versions of various papers that describe +different aspects of ACE. This material is also available available via the WWW at URL: -http://www.cs.wustl.edu/~schmidt/ACE.html +http://www.dre.vanderbilt.edu/~schmidt/ACE.html ---------------------------------------- ACE MAILING LIST AND NEWSGROUP -A mailing list, ace-users@list.isis.vanderbilt.edu, is available for discussing -bug fixes, enhancements, and porting issues regarding ACE. Please -send mail to me at the ace-users-request@list.isis.vanderbilt.edu -if you'd like to join the mailing list. There is also a USENET newsgroup -called comp.soft-sys.ace. Please see -http://www.cs.wustl.edu/~schmidt/ACE-mail.html for details on how to -subscribe to the mailing list. +A mailing list, ace-users@list.isis.vanderbilt.edu, is available for +discussing bug fixes, enhancements, and porting issues regarding ACE. +Please send mail to me at the +ace-users-request@list.isis.vanderbilt.edu if you'd like to join the +mailing list. There is also a USENET newsgroup called +comp.soft-sys.ace. Please see +http://www.dre.vanderbilt.edu/~schmidt/ACE-mail.html for details on +how to subscribe to the mailing list. ---------------------------------------- BUILDING AND INSTALLING ACE -Please refer to the http://www.cs.wustl.edu/~schmidt/ACE-install.html -file for information on how to build and test the ACE wrappers. The +Please refer to the +http://www.dre.vanderbilt.edu/~schmidt/ACE-install.html file for +information on how to build and test the ACE wrappers. The BIBLIOGRAPHY file contains information on where to obtain articles that describe the ACE wrappers and the ADAPTIVE system in more detail. The current release has been tested extensively, but if you find any bugs, please report them to the ACE mailing list -ace-users@cs.wustl.edu using the $ACE_ROOT/PROBLEM-REPORT-FORM. -Please use the same form to submit questions, comments, etc. -To ensure that you see responses, please do one of the following: +ace-users@list.isis.vanderbilt.edu using the +$ACE_ROOT/PROBLEM-REPORT-FORM. Please use the same form to submit +questions, comments, etc. To ensure that you see responses, please do +one of the following: 1) Subscribe to the ace-users mail list, by sending email with contents "subscribe ace-users" to diff --git a/ACE/THANKS b/ACE/THANKS index 0193e0fbce7..b9ac37833d2 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2378,6 +2378,8 @@ Phillip LaBanca <labancap at ociweb dot com> Journeyer J. Joh <oosaprogrammer at gmail dot com> Rudy Pot <rpot at aweta dot nl> Neil Youngman <ny at youngman dot org dot uk> +Andreas Florath <andreas at florath dot org> +Clyde Gerber <clyde_gerber at symantec dot com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 67b510e9084..8d635d8f399 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -8,7 +8,7 @@ #include "ace/SString.h" #include "ace/Version.h" #include "ace/Message_Block.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_sys_select.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_strings.h" @@ -159,7 +159,7 @@ ACE::nibble2hex (u_int n) bool ACE::debug (void) { - static const char* debug = ACE_OS::getenv ("ACE_DEBUG"); + static const char* debug = ACE_OS::getenv ("ACELIB_DEBUG"); return (ACE::debug_ != 0) ? ACE::debug_ : (debug != 0 ? (*debug != '0') : false); } diff --git a/ACE/ace/ARGV.cpp b/ACE/ace/ARGV.cpp index 1e1e73dcf2b..ca502bfd868 100644 --- a/ACE/ace/ARGV.cpp +++ b/ACE/ace/ARGV.cpp @@ -3,7 +3,7 @@ #ifndef ACE_ARGV_CPP #define ACE_ARGV_CPP -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" #include "ace/OS_Memory.h" @@ -25,10 +25,10 @@ ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_ARGV_Queue_Entry_T::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("arg_ = %s"), this->arg_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("quote_arg_ = %d"), (int)this->quote_arg_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("arg_ = %s"), this->arg_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("quote_arg_ = %d"), (int)this->quote_arg_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -39,20 +39,20 @@ ACE_ARGV_T<CHAR_TYPE>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_ARGV_T::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("argc_ = %d"), this->argc_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("argc_ = %d"), this->argc_)); ACE_ARGV *this_obj = const_cast<ACE_ARGV *> (this); for (int i = 0; i < this->argc_; i++) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nargv_[%i] = %s"), i, this_obj->argv ()[i])); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nbuf = %s\n"), this->buf_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nbuf = %s\n"), this->buf_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -96,7 +96,7 @@ ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (const CHAR_TYPE buf[], // Create this->argv_. if (this->string_to_argv () == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("string_to_argv"))); } @@ -249,7 +249,7 @@ ACE_ARGV_T<CHAR_TYPE>::add (const CHAR_TYPE *next_arg, bool quote_arg) // Put the new argument at the end of the queue. if (this->queue_.enqueue_tail (ACE_ARGV_Queue_Entry_T<CHAR_TYPE> (next_arg, quote_arg)) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Can't add more to ARGV queue")), -1); diff --git a/ACE/ace/ATM_Acceptor.cpp b/ACE/ace/ATM_Acceptor.cpp index c643dccd0bd..1d009eb644d 100644 --- a/ACE/ace/ATM_Acceptor.cpp +++ b/ACE/ace/ATM_Acceptor.cpp @@ -75,7 +75,7 @@ ACE_ATM_Acceptor::get_local_addr (ACE_ATM_Addr &local_addr) if (ACE_OS::getsockname (acceptor_.get_handle (), (struct sockaddr *) & (myaddr->sockaddratmsvc), &addrlen) < 0) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ATM_Acceptor (get_local_addr): ioctl: %d\n"), errno)); return -1; @@ -172,7 +172,7 @@ ACE_ATM_Acceptor::open (const ACE_Addr &remote_sap, params.get_flags () )) == ACE_INVALID_HANDLE) { - ACE_DEBUG (LM_DEBUG, + ACELIB_DEBUG (LM_DEBUG, ACE_TEXT ("Acceptor (socket): socket %d\n"), errno); return (ACE_INVALID_HANDLE); @@ -209,7 +209,7 @@ ACE_ATM_Acceptor::open (const ACE_Addr &remote_sap, &(local_sap_addr->sockaddratmsvc)), sizeof (local_sap_addr->sockaddratmsvc) ) == -1) { - ACE_DEBUG (LM_DEBUG, + ACELIB_DEBUG (LM_DEBUG, ACE_TEXT ("Acceptor (open): bind %d\n"), errno); return -1; @@ -218,7 +218,7 @@ ACE_ATM_Acceptor::open (const ACE_Addr &remote_sap, if (ACE_OS::listen (handle, backlog) == -1) { - ACE_DEBUG (LM_DEBUG, + ACELIB_DEBUG (LM_DEBUG, ACE_TEXT ("Acceptor (listen): listen %d\n"), errno); return -1; diff --git a/ACE/ace/ATM_Acceptor.inl b/ACE/ace/ATM_Acceptor.inl index c08fd048f68..c840e8b845d 100644 --- a/ACE/ace/ATM_Acceptor.inl +++ b/ACE/ace/ATM_Acceptor.inl @@ -23,7 +23,7 @@ ACE_ATM_Acceptor::ACE_ATM_Acceptor (const ACE_Addr &remote_sap, //FUZZ: disable check_for_lack_ACE_OS if (open (remote_sap, backlog, params) < 0) //FUZZ: enable check_for_lack_ACE_OS - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_ATM_Acceptor::ACE_ATM_Acceptor"))); } diff --git a/ACE/ace/ATM_Addr.cpp b/ACE/ace/ATM_Addr.cpp index 89469aeef74..6eb00b881c1 100644 --- a/ACE/ace/ATM_Addr.cpp +++ b/ACE/ace/ATM_Addr.cpp @@ -5,7 +5,7 @@ #include "ace/ATM_Addr.h" #if defined (ACE_HAS_ATM) -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if defined (ACE_HAS_FORE_ATM_WS2) #include /**/ "forews2.h" @@ -353,7 +353,7 @@ ACE_ATM_Addr::string_to_addr (const ACE_TCHAR sap[]) (struct sockaddr *)& (atm_addr_.sockaddratmsvc), sizeof (atm_addr_.sockaddratmsvc), T2A_SVC | T2A_NAME) < 0) { - ACE_DEBUG (LM_DEBUG, + ACELIB_DEBUG (LM_DEBUG, "Error : text2atm failed!\n"); errno = EINVAL; return -1; @@ -420,7 +420,7 @@ ACE_ATM_Addr::addr_to_string (ACE_TCHAR addr[], sizeof buffer, (struct sockaddr *)& (atm_addr_.sockaddratmsvc), A2T_PRETTY)) < 0) { - ACE_DEBUG ((LM_DEBUG,"ACE_ATM_Addr (addr_to_string): atm2text failed\n")); + ACELIB_DEBUG ((LM_DEBUG,"ACE_ATM_Addr (addr_to_string): atm2text failed\n")); return -1; } if (addrlen < (size_t)total_len) @@ -506,14 +506,14 @@ ACE_ATM_Addr::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_ATM_Addr::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_TCHAR s[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16]; ACE_OS::sprintf (s, ACE_TEXT ("%s"), this->addr_to_string ()); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s"), s)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%s"), s)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/ATM_Connector.cpp b/ACE/ace/ATM_Connector.cpp index f7dcdab32e5..83c9b84004a 100644 --- a/ACE/ace/ATM_Connector.cpp +++ b/ACE/ace/ATM_Connector.cpp @@ -52,7 +52,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream, params.get_user_data(), &options.get_qos()); #elif defined (ACE_HAS_FORE_ATM_WS2) - ACE_DEBUG(LM_DEBUG, + ACELIB_DEBUG(LM_DEBUG, ACE_TEXT ("ATM_Connector(connect): set QoS parameters\n" )); ACE_HANDLE s = new_stream.get_handle(); @@ -65,7 +65,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream, 0, 0); - ACE_DEBUG(LM_DEBUG, + ACELIB_DEBUG(LM_DEBUG, ACE_TEXT ("ATM_Connector(connect): connecting...\n")); int result = ACE_OS::connect( s, @@ -103,7 +103,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream, SO_ATMQOS, reinterpret_cast<char*> (&qos), sizeof(qos)) < 0) { - ACE_DEBUG((LM_DEBUG,ACE_TEXT ("ATM_Connector(connect): unable to set qos %d\n"), + ACELIB_DEBUG((LM_DEBUG,ACE_TEXT ("ATM_Connector(connect): unable to set qos %d\n"), errno)); return -1; } @@ -113,7 +113,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream, sizeof( remote_addr->sockaddratmsvc)); if ( result != 0 ) - ACE_DEBUG(LM_DEBUG, + ACELIB_DEBUG(LM_DEBUG, ACE_TEXT ("ATM_Connector(connect): connection failed, %d\n"), errno); diff --git a/ACE/ace/ATM_Connector.inl b/ACE/ace/ATM_Connector.inl index dcf4b80284a..8f0af562bd4 100644 --- a/ACE/ace/ATM_Connector.inl +++ b/ACE/ace/ATM_Connector.inl @@ -35,7 +35,7 @@ ACE_ATM_Connector::ACE_ATM_Connector (ACE_ATM_Stream &new_stream, flags, perms) == ACE_INVALID_HANDLE && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_ATM_Stream::ACE_ATM_Stream"))); } diff --git a/ACE/ace/ATM_QoS.cpp b/ACE/ace/ATM_QoS.cpp index 4f16f1d4444..6550860d5c3 100644 --- a/ACE/ace/ATM_QoS.cpp +++ b/ACE/ace/ATM_QoS.cpp @@ -117,7 +117,7 @@ ACE_ATM_QoS::ACE_ATM_QoS(int rate, qos_.ProviderSpecific.buf = (char *) ACE_OS::malloc(size); if (qos_.ProviderSpecific.buf == 0) { - ACE_ERROR((LM_ERROR, + ACELIB_ERROR((LM_ERROR, ACE_TEXT ("ACE_ATM_QoS::ACE_ATM_QoS: Unable to allocate %d bytes for qos_.ProviderSpecific.buf\n"), size)); return; @@ -297,7 +297,7 @@ ACE_ATM_QoS::set_cbr_rate (int rate, qos_.ProviderSpecific.buf = (char *) ACE_OS::malloc(size); if (qos_.ProviderSpecific.buf == 0) { - ACE_ERROR((LM_ERROR, + ACELIB_ERROR((LM_ERROR, ACE_TEXT ("ACE_ATM_QoS::ACE_ATM_QoS: Unable to allocate %d bytes for qos_.ProviderSpecific.buf\n"), size)); return; @@ -467,7 +467,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd, buf = (char *) ACE_OS::malloc (info.options); if (buf == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unable to allocate %d bytes for options\n"), info.options), 0); @@ -503,7 +503,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd, LOCALNAME) < 0) { ACE_OS::t_error("t_getname (local_address)"); - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Can't get local address!\n"))); ACE_OS::free (buf); return 0; diff --git a/ACE/ace/ATM_Stream.cpp b/ACE/ace/ATM_Stream.cpp index 14c07bc03bf..b68156e3682 100644 --- a/ACE/ace/ATM_Stream.cpp +++ b/ACE/ace/ATM_Stream.cpp @@ -116,7 +116,7 @@ ACE_ATM_Stream::get_peer_name (void) const if ((total_len = atm2text (buffer,sizeof buffer, (struct sockaddr *) & (name.sockaddratmsvc), A2T_PRETTY|A2T_NAME)) < 0) { - ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("ACE_ATM_Stream (get_peer_name) :%d"),errno)); + ACELIB_DEBUG ((LM_DEBUG,ACE_TEXT ("ACE_ATM_Stream (get_peer_name) :%d"),errno)); return 0; } @@ -245,7 +245,7 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, SO_ATMPVC, reinterpret_cast<char*> (&mypvcaddr), &addrpvclen) < 0) { - ACE_DEBUG (LM_DEBUG, + ACELIB_DEBUG (LM_DEBUG, ACE_TEXT ("ACE_ATM_Stream::get_vpi_vci: getsockopt %d\n"), errno); return -1; @@ -261,7 +261,7 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, SOL_ATM,SO_VCID, reinterpret_cast<char*> (&mypvcid), &pvcidlen) < 0) { - ACE_DEBUG (LM_DEBUG, + ACELIB_DEBUG (LM_DEBUG, ACE_TEXT ("ACE_ATM_Stream::get_vpi_vci: getsockopt %d\n"), errno); return -1; @@ -271,7 +271,7 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, return 0; #else - ACE_DEBUG (LM_DEBUG, + ACELIB_DEBUG (LM_DEBUG, ACE_TEXT ("ACE_ATM_Stream::get_vpi_vci: Not implemented in this ATM version. Update to >= 0.62\n Or patch 0.59")); ACE_UNUSED_ARG (vci); ACE_UNUSED_ARG (vpi); diff --git a/ACE/ace/Acceptor.cpp b/ACE/ace/Acceptor.cpp index d2752b39703..fdd53a4720c 100644 --- a/ACE/ace/Acceptor.cpp +++ b/ACE/ace/Acceptor.cpp @@ -19,38 +19,38 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Acceptor) -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> void -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> void +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump"); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->peer_acceptor_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::operator ACE_PEER_ACCEPTOR & () const +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::operator PEER_ACCEPTOR & () const { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::operator ACE_PEER_ACCEPTOR &"); - return (ACE_PEER_ACCEPTOR &) this->peer_acceptor_; + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::operator PEER_ACCEPTOR &"); + return (PEER_ACCEPTOR &) this->peer_acceptor_; } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_PEER_ACCEPTOR & -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor (void) const +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> PEER_ACCEPTOR & +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor (void) const { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor"); - return const_cast<ACE_PEER_ACCEPTOR &> (this->peer_acceptor_); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor"); + return const_cast<PEER_ACCEPTOR &> (this->peer_acceptor_); } // Returns ACE_HANDLE of the underlying Acceptor_Strategy. -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_HANDLE -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle (void) const +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> ACE_HANDLE +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle (void) const { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle"); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle"); return this->peer_acceptor_.get_handle (); } @@ -59,15 +59,15 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle (void) const // with the Reactor and listen for connection requests at the // designated <local_addr>. -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open - (const ACE_PEER_ACCEPTOR_ADDR &local_addr, +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open + (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr, ACE_Reactor *reactor, int flags, int use_select, int reuse_addr) { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open"); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open"); this->flags_ = flags; this->use_select_ = use_select; this->reuse_addr_ = reuse_addr; @@ -81,6 +81,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open return -1; } + // Open the underlying PEER_ACCEPTOR. if (this->peer_acceptor_.open (local_addr, reuse_addr) == -1) return -1; @@ -104,69 +105,69 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open // Simple constructor. -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Acceptor (ACE_Reactor *reactor, +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Acceptor (ACE_Reactor *reactor, int use_select) :flags_ (0), use_select_ (use_select), reuse_addr_ (1) { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Acceptor"); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Acceptor"); this->reactor (reactor); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Acceptor - (const ACE_PEER_ACCEPTOR_ADDR &addr, +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Acceptor + (const typename PEER_ACCEPTOR::PEER_ADDR &addr, ACE_Reactor *reactor, int flags, int use_select, int reuse_addr) { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Acceptor"); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Acceptor"); if (this->open (addr, reactor, flags, use_select, reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Acceptor::ACE_Acceptor"))); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Acceptor (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Acceptor (void) { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Acceptor"); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Acceptor"); this->handle_close (); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::fini (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini (void) { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::fini"); - return ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini"); + return ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close (); } // Hook called by the explicit dynamic linking facility. -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::init (int, ACE_TCHAR *[]) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::init (int, ACE_TCHAR *[]) { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::init"); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::init"); return -1; } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp, +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info (ACE_TCHAR **strp, size_t length) const { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info"); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info"); ACE_TCHAR buf[BUFSIZ]; ACE_TCHAR addr_str[BUFSIZ]; - ACE_PEER_ACCEPTOR_ADDR addr; + typename PEER_ACCEPTOR::PEER_ADDR addr; if (this->acceptor ().get_local_addr (addr) == -1) return -1; @@ -186,42 +187,42 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp, return static_cast<int> (ACE_OS::strlen (buf)); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::suspend (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend (void) { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::suspend"); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend"); return this->reactor ()->suspend_handler (this); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::resume (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void) { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::resume"); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume"); return this->reactor ()->resume_handler (this); } // Perform termination activities when <this> is removed from the // <reactor>. -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::close (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close (void) { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::close"); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close"); return this->handle_close (); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_accept_error (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_accept_error (void) { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_accept_error"); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_accept_error"); return 0; } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE, +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close (ACE_HANDLE, ACE_Reactor_Mask) { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close"); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close"); // Guard against multiple closes. if (this->reactor () != 0) { @@ -235,7 +236,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE, // Shut down the listen socket to recycle the handles. if (this->peer_acceptor_.close () == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("close\n"))); // Set the Reactor to 0 so that we don't try to close down // again. @@ -252,10 +253,10 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE, // subclass instances of SVC_HANDLER, using a singleton, dynamically // linking the handler, etc.). -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handler (SVC_HANDLER *&sh) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::make_svc_handler (SVC_HANDLER *&sh) { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handler"); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::make_svc_handler"); if (sh == 0) ACE_NEW_RETURN (sh, @@ -272,11 +273,11 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handler (SVC_HANDLER *& // <svc_handler>. The default behavior delegates to the // <PEER_ACCEPTOR::accept> in the Acceptor_Strategy. -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::accept_svc_handler (SVC_HANDLER *svc_handler) { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler"); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::accept_svc_handler"); // Try to find out if the implementation of the reactor that we are // using requires us to reset the event association for the newly @@ -326,11 +327,11 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler // concurrency activations (such as creating the SVC_HANDLER as an // "active object" via multi-threading or multi-processing). -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::activate_svc_handler (SVC_HANDLER *svc_handler) { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler"); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::activate_svc_handler"); int result = 0; @@ -361,10 +362,10 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler // creation strategy), accept the connection into the SVC_HANDLER, and // then activate the SVC_HANDLER. -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listener) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_input (ACE_HANDLE listener) { - ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input"); + ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_input"); // Default is "timeout (0, 0)," which means "poll." ACE_Time_Value timeout; @@ -399,7 +400,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene { if (ACE::debug ()) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%p\n"), ACE_TEXT ("make_svc_handler"))); } @@ -412,7 +413,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene // on failure. if (ACE::debug ()) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%p\n"), ACE_TEXT ("accept_svc_handler"))); } @@ -435,7 +436,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene if (ACE::debug ()) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%p\n"), ACE_TEXT ("activate_svc_handler"))); } @@ -450,75 +451,75 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene ACE_ALLOC_HOOK_DEFINE(ACE_Strategy_Acceptor) -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::suspend (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend (void) { - ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::suspend"); + ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend"); // First suspend the SVC_HANDLER's we've created. if (this->scheduling_strategy_->suspend () == -1) return -1; else // Then suspend ourselves. - return ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::suspend (); + return ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend (); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::resume (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void) { - ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::resume"); + ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume"); // First resume ourselves. - if (ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::resume () == -1) + if (ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume () == -1) return -1; else // Then resume the SVC_HANDLER's we've created. return this->scheduling_strategy_->resume (); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> void -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> void +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump"); + ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump (); this->creation_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_creation_strategy_ = %d"), delete_creation_strategy_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_creation_strategy_ = %d"), delete_creation_strategy_)); this->accept_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_accept_strategy_ = %d"), delete_accept_strategy_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_accept_strategy_ = %d"), delete_accept_strategy_)); this->concurrency_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_concurrency_strategy_ = %d"), delete_concurrency_strategy_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_concurrency_strategy_ = %d"), delete_concurrency_strategy_)); this->scheduling_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_scheduling_strategy_ = %d"), delete_scheduling_strategy_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nservice_name_ = %s"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_scheduling_strategy_ = %d"), delete_scheduling_strategy_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nservice_name_ = %s"), this->service_name_ == 0 ? ACE_TEXT ("<unknown>") : this->service_name_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nservice_description_ = %s"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nservice_description_ = %s"), this->service_description_ == 0 ? ACE_TEXT ("<unknown>") : this->service_description_)); this->service_addr_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_PEER_ACCEPTOR & -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor (void) const +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> PEER_ACCEPTOR & +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor (void) const { - ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor"); + ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor"); return this->accept_strategy_->acceptor (); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::operator ACE_PEER_ACCEPTOR & () const +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::operator PEER_ACCEPTOR & () const { - ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::operator ACE_PEER_ACCEPTOR &"); + ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::operator PEER_ACCEPTOR &"); return this->accept_strategy_->acceptor (); } // Returns ACE_HANDLE of the underlying Acceptor_Strategy. -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_HANDLE -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle (void) const +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> ACE_HANDLE +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle (void) const { - ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle"); + ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle"); return this->accept_strategy_->get_handle (); } @@ -526,26 +527,26 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle (void) const // connection acceptance, and concurrency, and then register <this> // with the Reactor and listen for connection requests at the // designated <local_addr>. -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open - (const ACE_PEER_ACCEPTOR_ADDR &local_addr, +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open + (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr, ACE_Reactor *reactor, int /* flags unused */, int use_select, int reuse_addr) { - ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open"); + ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open"); return this->open (local_addr, reactor, 0, 0, 0, 0, 0, 0, use_select, reuse_addr); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open - (const ACE_PEER_ACCEPTOR_ADDR &local_addr, +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open + (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr, ACE_Reactor *reactor, ACE_Creation_Strategy<SVC_HANDLER> *cre_s, - ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> *acc_s, + ACE_Accept_Strategy<SVC_HANDLER, PEER_ACCEPTOR> *acc_s, ACE_Concurrency_Strategy<SVC_HANDLER> *con_s, ACE_Scheduling_Strategy<SVC_HANDLER> *sch_s, const ACE_TCHAR *service_name, @@ -553,7 +554,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open int use_select, int reuse_addr) { - ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open"); + ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open"); if (this->service_name_ == 0 && service_name != 0) ACE_ALLOCATOR_RETURN (this->service_name_, @@ -637,8 +638,8 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open // Simple constructor. -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Strategy_Acceptor (const ACE_TCHAR service_name[], const ACE_TCHAR service_description[], int use_select, @@ -654,7 +655,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor service_name_ (0), service_description_ (0) { - ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor"); + ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Strategy_Acceptor"); if (service_name != 0) ACE_ALLOCATOR (this->service_name_, @@ -666,12 +667,12 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor this->reuse_addr_ = reuse_addr; } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor - (const ACE_PEER_ACCEPTOR_ADDR &addr, +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Strategy_Acceptor + (const typename PEER_ACCEPTOR::PEER_ADDR &addr, ACE_Reactor *reactor, ACE_Creation_Strategy<SVC_HANDLER> *cre_s, - ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> *acc_s, + ACE_Accept_Strategy<SVC_HANDLER, PEER_ACCEPTOR> *acc_s, ACE_Concurrency_Strategy<SVC_HANDLER> *con_s, ACE_Scheduling_Strategy<SVC_HANDLER> *sch_s, const ACE_TCHAR service_name[], @@ -689,7 +690,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor service_name_ (0), service_description_ (0) { - ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor"); + ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Strategy_Acceptor"); if (this->open (addr, reactor, @@ -701,7 +702,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor service_description, use_select, reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Strategy_Acceptor::ACE_Strategy_Acceptor"))); } @@ -709,11 +710,11 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor // Perform termination activities when <this> is removed from the // <ACE_Reactor>. -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE, +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close (ACE_HANDLE, ACE_Reactor_Mask) { - ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close"); + ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close"); // Guard against multiple closes. if (this->reactor () != 0) { @@ -761,10 +762,10 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDL // creating subclass instances of <SVC_HANDLER>, using a singleton, // dynamically linking the handler, etc.). -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handler (SVC_HANDLER *&sh) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::make_svc_handler (SVC_HANDLER *&sh) { - ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handler"); + ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::make_svc_handler"); return this->creation_strategy_->make_svc_handler (sh); } @@ -772,11 +773,11 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::make_svc_handler (SVC_H // <svc_handler>. The default behavior delegates to the // <Strategy_Acceptor::accept> in the Acceptor_Strategy. -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::accept_svc_handler (SVC_HANDLER *svc_handler) { - ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler"); + ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::accept_svc_handler"); return this->accept_strategy_->accept_svc_handler (svc_handler); } @@ -788,20 +789,20 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler // concurrency activations (such as creating the SVC_HANDLER as an // "active object" via multi-threading or multi-processing). -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::activate_svc_handler (SVC_HANDLER *svc_handler) { - ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler"); + ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::activate_svc_handler"); return this->concurrency_strategy_->activate_svc_handler (svc_handler, (void *) this); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Strategy_Acceptor (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Strategy_Acceptor (void) { - ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Strategy_Acceptor"); + ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Strategy_Acceptor"); ACE_OS::free ((void *) this->service_name_); ACE_OS::free ((void *) this->service_description_); this->handle_close (); @@ -809,22 +810,22 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Strategy_Acceptor // Signal the server to shutdown gracefully. -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_signal (int, siginfo_t *, ucontext_t *) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_signal (int, siginfo_t *, ucontext_t *) { ACE_Reactor::instance()->end_reactor_event_loop (); return 0; } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp, +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info (ACE_TCHAR **strp, size_t length) const { ACE_TRACE ("ACE_Strategy_Acceptor::info"); ACE_TCHAR buf[BUFSIZ]; ACE_TCHAR service_addr_str[BUFSIZ]; - ACE_PEER_ACCEPTOR_ADDR addr; + typename PEER_ACCEPTOR::PEER_ADDR addr; if (this->acceptor ().get_local_addr (addr) == -1) return -1; @@ -850,39 +851,39 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp, return static_cast<int> (ACE_OS::strlen (buf)); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::fini (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini (void) { - ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::fini"); - return this->ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (); + ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini"); + return this->ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close (); } ACE_ALLOC_HOOK_DEFINE(ACE_Oneshot_Acceptor) -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> void -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> void +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsvc_handler_ = %x"), this->svc_handler_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nrestart_ = %d"), this->restart_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsvc_handler_ = %x"), this->svc_handler_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nrestart_ = %d"), this->restart_)); this->peer_acceptor_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_concurrency_strategy_ = %d"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_concurrency_strategy_ = %d"), delete_concurrency_strategy_)); this->concurrency_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open - (const ACE_PEER_ACCEPTOR_ADDR &local_addr, +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open + (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr, ACE_Reactor *reactor, ACE_Concurrency_Strategy<SVC_HANDLER> *con_s) { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open"); this->reactor (reactor); // Initialize the concurrency strategy. @@ -900,20 +901,20 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open return this->peer_acceptor_.open (local_addr, 1); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Oneshot_Acceptor (void) : svc_handler_ (0), restart_ (false), concurrency_strategy_ (0), delete_concurrency_strategy_ (false) { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Oneshot_Acceptor"); this->reactor (0); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor - (const ACE_PEER_ACCEPTOR_ADDR &local_addr, +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Oneshot_Acceptor + (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr, ACE_Reactor *reactor, ACE_Concurrency_Strategy<SVC_HANDLER> *cs) : svc_handler_ (0), @@ -921,32 +922,32 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor concurrency_strategy_ (0), delete_concurrency_strategy_ (false) { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Oneshot_Acceptor"); if (this->open (local_addr, reactor, cs) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Oneshot_Acceptor::ACE_Oneshot_Acceptor"))); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Oneshot_Acceptor (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Oneshot_Acceptor (void) { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Oneshot_Acceptor"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Oneshot_Acceptor"); this->handle_close (); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::close (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close (void) { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::close"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close"); return this->handle_close (); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE, +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close (ACE_HANDLE, ACE_Reactor_Mask) { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close"); // Guard against multiple closes. if (this->delete_concurrency_strategy_) @@ -964,17 +965,17 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE ACE_Event_Handler::ACCEPT_MASK | ACE_Event_Handler::DONT_CALL); if (this->peer_acceptor_.close () == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("close\n"))); return 0; } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_timeout +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_timeout (const ACE_Time_Value &tv, const void *arg) { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_timeout"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_timeout"); errno = ETIME; if (this->svc_handler_->handle_timeout (tv, arg) == -1) @@ -989,20 +990,20 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_timeout return 0; } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::cancel (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::cancel (void) { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::cancel"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::cancel"); return this->reactor () && this->reactor ()->cancel_timer (this); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::register_handler +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::register_handler (SVC_HANDLER *svc_handler, const ACE_Synch_Options &synch_options, bool restart) { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::register_handler"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::register_handler"); // Can't do this if we don't have a Reactor. if (this->reactor () == 0) { @@ -1035,11 +1036,11 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::register_handler // concurrency activations (such as creating the SVC_HANDLER as an // "active object" via multi-threading or multi-processing). -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::activate_svc_handler (SVC_HANDLER *svc_handler) { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::activate_svc_handler"); return this->concurrency_strategy_->activate_svc_handler (svc_handler, (void *) this); @@ -1048,15 +1049,15 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::activate_svc_handler // Factors out the code shared between the <accept> and <handle_input> // methods. -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::shared_accept +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::shared_accept (SVC_HANDLER *svc_handler, - ACE_PEER_ACCEPTOR_ADDR *remote_addr, + typename PEER_ACCEPTOR::PEER_ADDR *remote_addr, ACE_Time_Value *timeout, bool restart, bool reset_new_handle) { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::shared_accept"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::shared_accept"); if (svc_handler == 0) return -1; @@ -1085,15 +1086,15 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::shared_accept // then activate the SVC_HANDLER. Note that SVC_HANDLER::open() // decides what type of concurrency strategy to use. -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::accept (SVC_HANDLER *svc_handler, - ACE_PEER_ACCEPTOR_ADDR *remote_addr, + typename PEER_ACCEPTOR::PEER_ADDR *remote_addr, const ACE_Synch_Options &synch_options, bool restart, bool reset_new_handle) { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::accept"); // Note that if timeout == ACE_Time_Value (x, y) where (x > 0 || y > // 0) then this->connector_.connect() will block synchronously. If // <use_reactor> is set then we don't want this to happen (since we @@ -1130,10 +1131,10 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept // Accepts one pending connection from a client (since we're the // "oneshot" Acceptor). -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_input (ACE_HANDLE) { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_input"); int result = 0; // Cancel any timer that might be pending. @@ -1172,28 +1173,28 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE // Hook called by the explicit dynamic linking facility. -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::init (int, ACE_TCHAR *[]) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::init (int, ACE_TCHAR *[]) { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::init"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::init"); return -1; } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::fini (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini (void) { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::fini"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini"); return this->handle_close (); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp, - size_t length) const +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info (ACE_TCHAR **strp, + size_t length) const { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info"); ACE_TCHAR buf[BUFSIZ]; ACE_TCHAR addr_str[BUFSIZ]; - ACE_PEER_ACCEPTOR_ADDR addr; + typename PEER_ACCEPTOR::PEER_ADDR addr; if (this->peer_acceptor_.get_local_addr (addr) == -1) return -1; @@ -1213,41 +1214,41 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp, return static_cast<int> (ACE_OS::strlen (buf)); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::suspend (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend (void) { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::suspend"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend"); return this->reactor () && this->reactor ()->suspend_handler (this); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::resume (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void) { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::resume"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume"); return this->reactor () && this->reactor ()->resume_handler (this); } // Returns ACE_HANDLE of the underlying peer_acceptor. -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_HANDLE -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle (void) const +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> ACE_HANDLE +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle (void) const { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle"); + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle"); return this->peer_acceptor_.get_handle (); } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_PEER_ACCEPTOR & -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor (void) const +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> PEER_ACCEPTOR & +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor (void) const { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor"); - return (ACE_PEER_ACCEPTOR &) this->peer_acceptor_; + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor"); + return (PEER_ACCEPTOR &) this->peer_acceptor_; } -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> -ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::operator ACE_PEER_ACCEPTOR & () const +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::operator PEER_ACCEPTOR & () const { - ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::operator ACE_PEER_ACCEPTOR &"); - return (ACE_PEER_ACCEPTOR &) this->peer_acceptor_; + ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::operator PEER_ACCEPTOR &"); + return (PEER_ACCEPTOR &) this->peer_acceptor_; } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Acceptor.h b/ACE/ace/Acceptor.h index b673015bb84..8ea84f19f03 100644 --- a/ACE/ace/Acceptor.h +++ b/ACE/ace/Acceptor.h @@ -34,30 +34,38 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * activating the SVC_HANDLER. * * Implements the basic strategy for passively establishing - * connections with clients. An ACE_Acceptor is parameterized - * by concrete types that conform to the interfaces of - * PEER_ACCEPTOR and SVC_HANDLER. The PEER_ACCEPTOR is - * instantiated with a transport mechanism that passively - * establishes connections. The SVC_HANDLER is instantiated - * with a concrete type that performs the application-specific - * service. An ACE_Acceptor inherits from ACE_Service_Object, - * which in turn inherits from ACE_Event_Handler. This enables - * the ACE_Reactor to dispatch the ACE_Acceptor's handle_input - * method when connection events occur. The handle_input method - * performs the ACE_Acceptor's default creation, connection - * establishment, and service activation strategies. These - * strategies can be overridden by subclasses individually or as - * a group. + * connections with clients. An ACE_Acceptor inherits from + * ACE_Service_Object, which in turn inherits from ACE_Event_Handler. + * This enables the ACE_Reactor to dispatch the ACE_Acceptor's + * handle_input method when connection events occur. The handle_input + * method performs the ACE_Acceptor's default creation, connection + * establishment, and service activation strategies. These strategies + * can be overridden by subclasses individually or as a group. + * + * An ACE_Acceptor is parameterized by concrete types that conform to + * the interfaces of SVC_HANDLER and PEER_ACCEPTOR described below. + * + * @tparam SVC_HANDLER The name of the concrete type that performs the + * application-specific service. The SVC_HANDLER typically + * inherits from ACE_Svc_Handler. @see Svc_Handler.h. + * + * @tparam PEER_ACCEPTOR The name of the class that implements the + * PEER_ACCEPTOR endpoint (e.g., ACE_SOCK_Acceptor) to + * passively establish connections. A PEER_ACCEPTOR + * implementation must provide a PEER_STREAM and PEER_ADDR + * trait to identify the type of stream (e.g., + * ACE_SOCK_Stream) and type of address (e.g., ACE_INET_Addr) + * used by the endpoint. */ -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> class ACE_Acceptor : public ACE_Service_Object { public: // Useful STL-style traits. - typedef ACE_PEER_ACCEPTOR_ADDR addr_type; - typedef ACE_PEER_ACCEPTOR acceptor_type; - typedef SVC_HANDLER handler_type; + typedef typename PEER_ACCEPTOR::PEER_ADDR addr_type; + typedef PEER_ACCEPTOR acceptor_type; + typedef SVC_HANDLER handler_type; typedef typename SVC_HANDLER::stream_type stream_type; /// "Do-nothing" constructor. @@ -97,7 +105,7 @@ public: * @p local_addr. Generally used to request that the * OS allow reuse of the listen port. The default is 1. */ - ACE_Acceptor (const ACE_PEER_ACCEPTOR_ADDR &local_addr, + ACE_Acceptor (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr, ACE_Reactor *reactor = ACE_Reactor::instance (), int flags = 0, int use_select = 1, @@ -139,7 +147,7 @@ public: * @retval 0 Success * @retval -1 Failure, @c errno contains an error code. */ - virtual int open (const ACE_PEER_ACCEPTOR_ADDR &local_addr, + virtual int open (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr, ACE_Reactor *reactor = ACE_Reactor::instance (), int flags = 0, int use_select = 1, @@ -149,10 +157,10 @@ public: virtual ~ACE_Acceptor (void); /// Return the underlying PEER_ACCEPTOR object. - virtual operator ACE_PEER_ACCEPTOR &() const; + virtual operator PEER_ACCEPTOR &() const; /// Return the underlying PEER_ACCEPTOR object. - virtual ACE_PEER_ACCEPTOR &acceptor (void) const; + virtual PEER_ACCEPTOR &acceptor (void) const; /// Returns the listening acceptor's {ACE_HANDLE}. virtual ACE_HANDLE get_handle (void) const; @@ -235,10 +243,10 @@ public: protected: /// Concrete factory for accepting connections from clients... - ACE_PEER_ACCEPTOR peer_acceptor_; + PEER_ACCEPTOR peer_acceptor_; /// Needed to reopen the socket if {accept} fails. - ACE_PEER_ACCEPTOR_ADDR peer_acceptor_addr_; + typename PEER_ACCEPTOR::PEER_ADDR peer_acceptor_addr_; /** * Flags that indicate how {SVC_HANDLER}'s should be initialized @@ -270,26 +278,26 @@ protected: * SVC_HANDLER, and (3) activating the SVC_HANDLER with a * particular concurrency mechanism. */ -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> class ACE_Strategy_Acceptor - : public ACE_Acceptor <SVC_HANDLER, ACE_PEER_ACCEPTOR_2> + : public ACE_Acceptor <SVC_HANDLER, PEER_ACCEPTOR> { public: // Useful STL-style traits. typedef ACE_Creation_Strategy<SVC_HANDLER> creation_strategy_type; - typedef ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> + typedef ACE_Accept_Strategy<SVC_HANDLER, PEER_ACCEPTOR> accept_strategy_type; typedef ACE_Concurrency_Strategy<SVC_HANDLER> concurrency_strategy_type; typedef ACE_Scheduling_Strategy<SVC_HANDLER> scheduling_strategy_type; - typedef ACE_Acceptor <SVC_HANDLER, ACE_PEER_ACCEPTOR_2> + typedef ACE_Acceptor <SVC_HANDLER, PEER_ACCEPTOR> base_type; // = Define some useful (old style) traits. typedef ACE_Creation_Strategy<SVC_HANDLER> CREATION_STRATEGY; - typedef ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> ACCEPT_STRATEGY; + typedef ACE_Accept_Strategy<SVC_HANDLER, PEER_ACCEPTOR> ACCEPT_STRATEGY; typedef ACE_Concurrency_Strategy<SVC_HANDLER> CONCURRENCY_STRATEGY; typedef ACE_Scheduling_Strategy<SVC_HANDLER> SCHEDULING_STRATEGY; @@ -305,10 +313,10 @@ public: * with the Reactor and listen for connection requests at the * designated {local_addr}. */ - ACE_Strategy_Acceptor (const ACE_PEER_ACCEPTOR_ADDR &local_addr, + ACE_Strategy_Acceptor (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr, ACE_Reactor * = ACE_Reactor::instance (), ACE_Creation_Strategy<SVC_HANDLER> * = 0, - ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> * = 0, + ACE_Accept_Strategy<SVC_HANDLER, PEER_ACCEPTOR> * = 0, ACE_Concurrency_Strategy<SVC_HANDLER> * = 0, ACE_Scheduling_Strategy<SVC_HANDLER> * = 0, const ACE_TCHAR service_name[] = 0, @@ -350,7 +358,7 @@ public: * @retval 0 Success * @retval -1 Failure, @c errno contains an error code. */ - virtual int open (const ACE_PEER_ACCEPTOR_ADDR &local_addr, + virtual int open (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr, ACE_Reactor *reactor, int flags = 0, int use_select = 1, @@ -362,10 +370,10 @@ public: * with the Reactor and listen for connection requests at the * designated {local_addr}. */ - virtual int open (const ACE_PEER_ACCEPTOR_ADDR &, + virtual int open (const typename PEER_ACCEPTOR::PEER_ADDR &, ACE_Reactor * = ACE_Reactor::instance (), ACE_Creation_Strategy<SVC_HANDLER> * = 0, - ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> * =0, + ACE_Accept_Strategy<SVC_HANDLER, PEER_ACCEPTOR> * =0, ACE_Concurrency_Strategy<SVC_HANDLER> * = 0, ACE_Scheduling_Strategy<SVC_HANDLER> * = 0, const ACE_TCHAR *service_name = 0, @@ -377,10 +385,10 @@ public: virtual ~ACE_Strategy_Acceptor (void); /// Return the underlying PEER_ACCEPTOR object. - virtual operator ACE_PEER_ACCEPTOR &() const; + virtual operator PEER_ACCEPTOR &() const; /// Return the underlying PEER_ACCEPTOR object. - virtual ACE_PEER_ACCEPTOR &acceptor (void) const; + virtual PEER_ACCEPTOR &acceptor (void) const; /// Returns the listening acceptor's {ACE_HANDLE}. virtual ACE_HANDLE get_handle (void) const; @@ -496,7 +504,7 @@ protected: /// Address that the {Strategy_Acceptor} uses to listen for /// connections. - ACE_PEER_ACCEPTOR_ADDR service_addr_; + typename PEER_ACCEPTOR::PEER_ADDR service_addr_; }; /** @@ -528,15 +536,15 @@ protected: * immediately. If there is no immediately available connection to accept, * behavior is governed by the ACE_Synch_Options argument passed to open(). */ -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> class ACE_Oneshot_Acceptor : public ACE_Service_Object { public: // Useful STL-style traits. - typedef ACE_PEER_ACCEPTOR_ADDR addr_type; - typedef ACE_PEER_ACCEPTOR acceptor_type; - typedef SVC_HANDLER handler_type; + typedef typename PEER_ACCEPTOR::PEER_ADDR addr_type; + typedef PEER_ACCEPTOR acceptor_type; + typedef SVC_HANDLER handler_type; typedef typename SVC_HANDLER::stream_type stream_type; /// Constructor. @@ -550,7 +558,7 @@ public: * this point -- the @a reactor parameter is saved in case it's * needed later. */ - ACE_Oneshot_Acceptor (const ACE_PEER_ACCEPTOR_ADDR &local_addr, + ACE_Oneshot_Acceptor (const typename PEER_ACCEPTOR::PEER_ADDR &local_addr, ACE_Reactor *reactor = ACE_Reactor::instance (), ACE_Concurrency_Strategy<SVC_HANDLER> * = 0); @@ -562,7 +570,7 @@ public: * this point -- the @a reactor parameter is saved in case it's * needed later. */ - int open (const ACE_PEER_ACCEPTOR_ADDR &, + int open (const typename PEER_ACCEPTOR::PEER_ADDR &, ACE_Reactor *reactor = ACE_Reactor::instance (), ACE_Concurrency_Strategy<SVC_HANDLER> * = 0); @@ -573,7 +581,7 @@ public: /// Create a {SVC_HANDLER}, accept the connection into the /// {SVC_HANDLER}, and activate the {SVC_HANDLER}. virtual int accept (SVC_HANDLER * = 0, - ACE_PEER_ACCEPTOR_ADDR *remote_addr = 0, + typename PEER_ACCEPTOR::PEER_ADDR *remote_addr = 0, const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults, bool restart = true, bool reset_new_handle = false); @@ -582,10 +590,10 @@ public: virtual int cancel (void); /// Return the underlying {PEER_ACCEPTOR} object. - virtual operator ACE_PEER_ACCEPTOR &() const; + virtual operator PEER_ACCEPTOR &() const; /// Return the underlying {PEER_ACCEPTOR} object. - virtual ACE_PEER_ACCEPTOR &acceptor (void) const; + virtual PEER_ACCEPTOR &acceptor (void) const; /// Close down the {Oneshot_Acceptor}. virtual int close (void); @@ -610,7 +618,7 @@ protected: /// Factors out the code shared between the {accept} and /// {handle_input} methods. int shared_accept (SVC_HANDLER *svc_handler, - ACE_PEER_ACCEPTOR_ADDR *remote_addr, + typename PEER_ACCEPTOR::PEER_ADDR *remote_addr, ACE_Time_Value *timeout, bool restart, bool reset_new_handle); @@ -670,7 +678,7 @@ private: bool restart_; /// Factory that establishes connections passively. - ACE_PEER_ACCEPTOR peer_acceptor_; + PEER_ACCEPTOR peer_acceptor_; /// Concurrency strategy for an Acceptor. ACE_Concurrency_Strategy<SVC_HANDLER> *concurrency_strategy_; diff --git a/ACE/ace/Activation_Queue.cpp b/ACE/ace/Activation_Queue.cpp index 22fa6a899be..4b7e468cd04 100644 --- a/ACE/ace/Activation_Queue.cpp +++ b/ACE/ace/Activation_Queue.cpp @@ -6,7 +6,7 @@ #include "ace/Activation_Queue.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Method_Request.h" #include "ace/Malloc_Base.h" #include "ace/Time_Value.h" @@ -17,19 +17,19 @@ void ACE_Activation_Queue::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_queue_ = %d\n"), this->delete_queue_)); - ACE_DEBUG ((LM_INFO, ACE_TEXT ("queue_:\n"))); + ACELIB_DEBUG ((LM_INFO, ACE_TEXT ("queue_:\n"))); if (this->queue_) this->queue_->dump(); else //FUZZ: disable check_for_NULL - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(NULL)\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(NULL)\n"))); //FUZZ: enable check_for_NULL - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Addr.cpp b/ACE/ace/Addr.cpp index b2aea3e2082..e98d703615c 100644 --- a/ACE/ace/Addr.cpp +++ b/ACE/ace/Addr.cpp @@ -6,7 +6,7 @@ #include "ace/Addr.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/os_include/sys/os_socket.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -57,10 +57,10 @@ ACE_Addr::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Addr::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("addr_type_ = %d"), this->addr_type_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\naddr_size_ = %d"), this->addr_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("addr_type_ = %d"), this->addr_type_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\naddr_size_ = %d"), this->addr_size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Assert.cpp b/ACE/ace/Assert.cpp index ccd7ffa504a..babd0c213f4 100644 --- a/ACE/ace/Assert.cpp +++ b/ACE/ace/Assert.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Assert.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Asynch_Acceptor.cpp b/ACE/ace/Asynch_Acceptor.cpp index 5418a90b078..04dd69e593e 100644 --- a/ACE/ace/Asynch_Acceptor.cpp +++ b/ACE/ace/Asynch_Acceptor.cpp @@ -16,7 +16,7 @@ #include "ace/OS_Errno.h" #include "ace/OS_Memory.h" #include "ace/OS_NS_sys_socket.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Message_Block.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Stream.h" @@ -69,7 +69,7 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, // Create the listener socket this->listen_handle_ = ACE_OS::socket (address.get_type (), SOCK_STREAM, 0); if (this->listen_handle_ == ACE_INVALID_HANDLE) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_OS::socket")), -1); @@ -80,7 +80,7 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, this->proactor ()) == -1) { ACE_Errno_Guard g (errno); - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Asynch_Accept::open"))); ACE_OS::closesocket (this->listen_handle_); @@ -99,7 +99,7 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, sizeof one) == -1) { ACE_Errno_Guard g (errno); - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_OS::setsockopt"))); ACE_OS::closesocket (this->listen_handle_); @@ -117,7 +117,7 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, address.get_type()) == -1) { ACE_Errno_Guard g (errno); - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE::bind_port"))); ACE_OS::closesocket (this->listen_handle_); @@ -131,7 +131,7 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, address.get_size ()) == -1) { ACE_Errno_Guard g (errno); - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_OS::bind"))); ACE_OS::closesocket (this->listen_handle_); @@ -143,7 +143,7 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, if (ACE_OS::listen (this->listen_handle_, backlog) == -1) { ACE_Errno_Guard g (errno); - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_OS::listen"))); ACE_OS::closesocket (this->listen_handle_); @@ -161,7 +161,7 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, if (this->accept (bytes_to_read) == -1) { ACE_Errno_Guard g (errno); - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Asynch_Acceptor::accept"))); ACE_OS::closesocket (this->listen_handle_); @@ -186,7 +186,7 @@ ACE_Asynch_Acceptor<HANDLER>::set_handle (ACE_HANDLE listen_handle) this->listen_handle_, 0, this->proactor ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Asynch_Accept::open")), -1); diff --git a/ACE/ace/Asynch_Connector.cpp b/ACE/ace/Asynch_Connector.cpp index 2a484cc4655..60e2f4549dd 100644 --- a/ACE/ace/Asynch_Connector.cpp +++ b/ACE/ace/Asynch_Connector.cpp @@ -15,7 +15,7 @@ #include "ace/OS_NS_sys_socket.h" #include "ace/OS_Memory.h" #include "ace/Flag_Manip.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Message_Block.h" #include "ace/INET_Addr.h" @@ -48,7 +48,7 @@ ACE_Asynch_Connector<HANDLER>::open (bool pass_addresses, ACE_INVALID_HANDLE, 0, this->proactor ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Asynch_Connect::open")), -1); @@ -67,7 +67,7 @@ ACE_Asynch_Connector<HANDLER>::connect (const ACE_INET_Addr & remote_sap, local_sap, reuse_addr, act) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Asynch_Connect::connect")), -1); @@ -98,7 +98,7 @@ ACE_Asynch_Connector<HANDLER>::handle_connect (const ACE_Asynch_Connect::Result (result.connect_handle (), ACE_NONBLOCK) != 0) { error = 1; - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Asynch_Connector::handle_connect : Set blocking mode"))); } @@ -128,7 +128,7 @@ ACE_Asynch_Connector<HANDLER>::handle_connect (const ACE_Asynch_Connect::Result if (new_handler == 0) { error = 1; - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Asynch_Connector::handle_connect : Making of new handler failed"))); } @@ -203,7 +203,7 @@ ACE_Asynch_Connector<HANDLER>::parse_address (const ACE_Asynch_Connect::Result & if (ACE_OS::getsockname (result.connect_handle (), reinterpret_cast<sockaddr *> (&local_addr), &local_size) < 0) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("ACE_Asynch_Connector::<getsockname> failed"))); @@ -211,7 +211,7 @@ ACE_Asynch_Connector<HANDLER>::parse_address (const ACE_Asynch_Connect::Result & if (ACE_OS::getpeername (result.connect_handle (), reinterpret_cast<sockaddr *> (&remote_addr), &remote_size) < 0) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("ACE_Asynch_Connector::<getpeername> failed"))); diff --git a/ACE/ace/Asynch_Pseudo_Task.cpp b/ACE/ace/Asynch_Pseudo_Task.cpp index 1ec2329521c..7952b2d8858 100644 --- a/ACE/ace/Asynch_Pseudo_Task.cpp +++ b/ACE/ace/Asynch_Pseudo_Task.cpp @@ -22,7 +22,7 @@ int ACE_Asynch_Pseudo_Task::start (void) { if (this->reactor_.initialized () == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%N:%l:%p\n"), ACE_TEXT ("start reactor is not initialized")), -1); @@ -56,7 +56,7 @@ ACE_Asynch_Pseudo_Task::svc (void) sigaddset (&RT_signals, si); if (ACE_OS::pthread_sigmask (SIG_BLOCK, &RT_signals, 0) != 0) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Error:(%P | %t):%p\n"), ACE_TEXT ("pthread_sigmask"))); #endif @@ -86,7 +86,7 @@ ACE_Asynch_Pseudo_Task::register_io_handler (ACE_HANDLE handle, // by the application. if (this->reactor_.suspend_handler (handle) == -1) { - ACE_ERROR + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%N:%l:%p\n"), ACE_TEXT ("register_io_handler (suspended)"))); diff --git a/ACE/ace/Atomic_Op.cpp b/ACE/ace/Atomic_Op.cpp index 78344b063b5..ec26a715fe9 100644 --- a/ACE/ace/Atomic_Op.cpp +++ b/ACE/ace/Atomic_Op.cpp @@ -263,8 +263,8 @@ void ACE_Atomic_Op<ACE_Thread_Mutex, long>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -296,8 +296,8 @@ void ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Atomic_Op_GCC_T.cpp b/ACE/ace/Atomic_Op_GCC_T.cpp index 0892dc5a5b7..71b4f0e8162 100644 --- a/ACE/ace/Atomic_Op_GCC_T.cpp +++ b/ACE/ace/Atomic_Op_GCC_T.cpp @@ -15,8 +15,8 @@ void ACE_Atomic_Op_GCC<T>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Atomic_Op_T.cpp b/ACE/ace/Atomic_Op_T.cpp index 2163ac7f678..c40ceac4596 100644 --- a/ACE/ace/Atomic_Op_T.cpp +++ b/ACE/ace/Atomic_Op_T.cpp @@ -6,7 +6,7 @@ #include "ace/Atomic_Op_T.h" #ifdef ACE_HAS_DUMP -# include "ace/Log_Msg.h" +# include "ace/Log_Category.h" #endif /* ACE_HAS_DUMP */ #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -36,9 +36,9 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::dump (void) const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->mutex_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Auto_IncDec_T.cpp b/ACE/ace/Auto_IncDec_T.cpp index cf33efd7d6e..454b3fea710 100644 --- a/ACE/ace/Auto_IncDec_T.cpp +++ b/ACE/ace/Auto_IncDec_T.cpp @@ -8,7 +8,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Auto_IncDec_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) #include "ace/Auto_IncDec_T.inl" @@ -24,8 +24,8 @@ ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE>::dump (void) const #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Barrier.cpp b/ACE/ace/Barrier.cpp index b5eb518a5d2..e3d35039e3e 100644 --- a/ACE/ace/Barrier.cpp +++ b/ACE/ace/Barrier.cpp @@ -12,7 +12,7 @@ #include "ace/OS_NS_errno.h" #if defined (ACE_HAS_DUMP) -# include "ace/Log_Msg.h" +# include "ace/Log_Category.h" #endif /* ACE_HAS_DUMP */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -25,10 +25,10 @@ ACE_Sub_Barrier::dump (void) const #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Sub_Barrier::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->barrier_finished_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("running_threads_ = %d\n"), this->running_threads_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("running_threads_ = %d\n"), this->running_threads_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -50,13 +50,13 @@ ACE_Barrier::dump (void) const #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Barrier::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("current_generation_ = %d"), this->current_generation_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncount_ = %d"), this->count_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("current_generation_ = %d"), this->current_generation_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncount_ = %d"), this->count_)); this->sub_barrier_1_.dump (); this->sub_barrier_2_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Based_Pointer_T.cpp b/ACE/ace/Based_Pointer_T.cpp index 217e1634690..0a64f016da0 100644 --- a/ACE/ace/Based_Pointer_T.cpp +++ b/ACE/ace/Based_Pointer_T.cpp @@ -5,7 +5,7 @@ #include "ace/Based_Pointer_T.h" #include "ace/Based_Pointer_Repository.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" # define ACE_TRACEX(X) ACE_Trace ____ (ACE_TEXT (X), __LINE__, ACE_TEXT (__FILE__)) @@ -27,12 +27,12 @@ ACE_Based_Pointer_Basic<CONCRETE>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntarget_ = %d\n"), this->target_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base_offset_ = %d\n"), this->base_offset_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("computed pointer = %x\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntarget_ = %d\n"), this->target_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("base_offset_ = %d\n"), this->base_offset_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("computed pointer = %x\n"), (CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this)))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Basic_Stats.cpp b/ACE/ace/Basic_Stats.cpp index 21a1ffe5d6d..ceec59a27f4 100644 --- a/ACE/ace/Basic_Stats.cpp +++ b/ACE/ace/Basic_Stats.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Basic_Stats.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) #include "ace/Basic_Stats.inl" @@ -49,7 +49,7 @@ ACE_Basic_Stats::dump_results ( #ifndef ACE_NLOGGING if (this->samples_count () == 0u) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%s : no data collected\n"), msg)); return; } @@ -60,7 +60,7 @@ ACE_Basic_Stats::dump_results ( ACE_UINT64 l_max = this->max_ / sf; ACE_UINT64 l_avg = avg / sf; - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%s latency : %Q[%d]/%Q/%Q[%d] (min/avg/max)\n"), msg, l_min, this->min_at_, diff --git a/ACE/ace/Bound_Ptr.inl b/ACE/ace/Bound_Ptr.inl index 570404e8520..9380c6f4c70 100644 --- a/ACE/ace/Bound_Ptr.inl +++ b/ACE/ace/Bound_Ptr.inl @@ -5,7 +5,7 @@ #include "ace/Guard_T.h" #if !defined (ACE_NEW_THROWS_EXCEPTIONS) -# include "ace/Log_Msg.h" +# include "ace/Log_Category.h" #endif /* ACE_NEW_THROWS_EXCEPTIONS */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/CE_Screen_Output.cpp b/ACE/ace/CE_Screen_Output.cpp index 800cc1c0926..780b6d6e2f3 100644 --- a/ACE/ace/CE_Screen_Output.cpp +++ b/ACE/ace/CE_Screen_Output.cpp @@ -3,7 +3,7 @@ #include "ace/CE_Screen_Output.h" #if defined (ACE_HAS_WINCE) -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Cache_Map_Manager_T.cpp b/ACE/ace/Cache_Map_Manager_T.cpp index cd041afc75d..f0637800629 100644 --- a/ACE/ace/Cache_Map_Manager_T.cpp +++ b/ACE/ace/Cache_Map_Manager_T.cpp @@ -9,7 +9,7 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Malloc_Base.h" #if !defined (__ACE_INLINE__) @@ -31,7 +31,7 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP : caching_strategy_ (caching_s) { if (this->open (size, alloc) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Cache_Map_Manager::ACE_Cache_Map_Manager"))); diff --git a/ACE/ace/Cached_Connect_Strategy_T.cpp b/ACE/ace/Cached_Connect_Strategy_T.cpp index f0dfee7119c..2ccb2ac090b 100644 --- a/ACE/ace/Cached_Connect_Strategy_T.cpp +++ b/ACE/ace/Cached_Connect_Strategy_T.cpp @@ -29,7 +29,7 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE connection_cache_ (caching_s) { if (this->open (cre_s, con_s, rec_s) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX>\n"))); } @@ -643,7 +643,7 @@ ACE_Bounded_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_S { ACE_ASSERT (0); // just to see it coming - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("(%t)ACE_Bounded_Cached_Connect_Strategy<>::") ACE_TEXT ("find_or_create_svc_handler_i - ") ACE_TEXT ("error polling server socket state.\n"))); diff --git a/ACE/ace/Caching_Strategies_T.cpp b/ACE/ace/Caching_Strategies_T.cpp index db2f9067ec9..35b69b7c514 100644 --- a/ACE/ace/Caching_Strategies_T.cpp +++ b/ACE/ace/Caching_Strategies_T.cpp @@ -4,7 +4,7 @@ #define ACECACHING_STRATEGIES_T_CPP #include "ace/Caching_Strategies_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) #include "ace/Caching_Strategies_T.inl" diff --git a/ACE/ace/Caching_Strategies_T.inl b/ACE/ace/Caching_Strategies_T.inl index 69f1ac99807..5e25e387aa8 100644 --- a/ACE/ace/Caching_Strategies_T.inl +++ b/ACE/ace/Caching_Strategies_T.inl @@ -109,8 +109,8 @@ ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, IMPLEMENTATION>::dump #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Caching_Strategy_Adapter::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -198,9 +198,9 @@ ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_LRU_Caching_Strategy::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("timer_ = %d "), this->timer_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("timer_ = %d "), this->timer_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -275,8 +275,8 @@ ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_LFU_Caching_Strategy::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -363,9 +363,9 @@ ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_FIFO_Caching_Strategy::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("order_ = %d "), this->order_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("order_ = %d "), this->order_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -446,8 +446,8 @@ ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Null_Caching_Strategy::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Capabilities.cpp b/ACE/ace/Capabilities.cpp index 46d45204a39..7b103a80eee 100644 --- a/ACE/ace/Capabilities.cpp +++ b/ACE/ace/Capabilities.cpp @@ -220,7 +220,7 @@ ACE_Capabilities::is_entry (const ACE_TCHAR *name, const ACE_TCHAR *line) ++line; else { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Invalid entry\n"))); break; } @@ -311,7 +311,7 @@ ACE_Capabilities::getent (const ACE_TCHAR *fname, const ACE_TCHAR *name) FILE *fp = ACE_OS::fopen (fname, ACE_TEXT ("r")); if (fp == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Can't open %s file\n"), fname), -1); diff --git a/ACE/ace/Codecs.cpp b/ACE/ace/Codecs.cpp index 19718c03aff..fe744329043 100644 --- a/ACE/ace/Codecs.cpp +++ b/ACE/ace/Codecs.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Codecs.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_Memory.h" #include "ace/OS_NS_ctype.h" @@ -179,7 +179,7 @@ ACE_Base64::decode (const ACE_Byte* input, size_t* output_len) { if (char_count) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Decoding incomplete: atleast %d bits truncated\n"), (4 - char_count) * 6)); ++errors; @@ -190,7 +190,7 @@ ACE_Base64::decode (const ACE_Byte* input, size_t* output_len) switch (char_count) { case 1: - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Decoding incomplete: atleast 2 bits missing\n"))); ++errors; break; diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp index ffbbfd3053d..4a1b3d8beff 100644 --- a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp +++ b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp @@ -14,7 +14,7 @@ #if defined (ACE_HAS_THREADS) -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -30,12 +30,12 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::dump (void) const #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Condition<MUTEX>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); // No dump method for ACE_cond_t even in emulated mode. // cond_.dump (); this->mutex_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -48,7 +48,7 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition (ACE_Recursive_Thread_M : mutex_ (m) { if (ACE_OS::cond_init (&this->cond_) != 0) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition<ACE_Recursive_Thread_Mutex>"))); } @@ -58,7 +58,7 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition (ACE_Recursive_Thread_M { if (ACE_OS::cond_init (&this->cond_, const_cast<ACE_condattr_t &> (attributes.attributes ())) != 0) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Condition<ACE_Recursive_Thread_Mutex>::ACE_Condition<ACE_Recursive_Thread_Mutex>"))); } diff --git a/ACE/ace/Condition_T.cpp b/ACE/ace/Condition_T.cpp index ce1b981e59d..56bd187910e 100644 --- a/ACE/ace/Condition_T.cpp +++ b/ACE/ace/Condition_T.cpp @@ -11,7 +11,7 @@ #if defined (ACE_HAS_THREADS) -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) #include "ace/Condition_T.inl" @@ -28,9 +28,9 @@ ACE_Condition<MUTEX>::dump (void) const #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Condition<MUTEX>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -67,7 +67,7 @@ ACE_Condition<MUTEX>::ACE_Condition (MUTEX &m, (short) type, name, arg) != 0) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Condition::ACE_Condition"))); } @@ -83,7 +83,7 @@ ACE_Condition<MUTEX>::ACE_Condition (MUTEX &m, if (ACE_OS::cond_init (&this->cond_, const_cast<ACE_condattr_t &> (attributes.attributes ()), name, arg) != 0) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Condition::ACE_Condition"))); } @@ -94,7 +94,7 @@ ACE_Condition<MUTEX>::~ACE_Condition (void) // ACE_TRACE ("ACE_Condition<MUTEX>::~ACE_Condition"); if (this->remove () == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Condition::~ACE_Condition"))); } diff --git a/ACE/ace/Condition_Thread_Mutex.cpp b/ACE/ace/Condition_Thread_Mutex.cpp index b83f86ef6c3..d6f8d295212 100644 --- a/ACE/ace/Condition_Thread_Mutex.cpp +++ b/ACE/ace/Condition_Thread_Mutex.cpp @@ -17,7 +17,7 @@ #include "ace/Condition_Thread_Mutex.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -29,14 +29,14 @@ ACE_Condition<ACE_Thread_Mutex>::dump (void) const #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Condition<ACE_Thread_Mutex>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); #if defined (ACE_WIN32) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("waiters = %d\n"), this->cond_.waiters ())); #endif /* ACE_WIN32 */ - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -51,7 +51,7 @@ ACE_Condition<ACE_Thread_Mutex>::ACE_Condition (ACE_Thread_Mutex &m, (short) USYNC_THREAD, name, arg) != 0) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Condition<ACE_Thread_Mutex>::ACE_Condition<ACE_Thread_Mutex>"))); } @@ -67,7 +67,7 @@ ACE_Condition<ACE_Thread_Mutex>::ACE_Condition (ACE_Thread_Mutex &m, if (ACE_OS::cond_init (&this->cond_, const_cast<ACE_condattr_t &> (attributes.attributes ()), name, arg) != 0) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Condition<ACE_Thread_Mutex>::ACE_Condition<ACE_Thread_Mutex>"))); } diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp index b6a0875e4ae..745dee80cee 100644 --- a/ACE/ace/Configuration.cpp +++ b/ACE/ace/Configuration.cpp @@ -1289,7 +1289,7 @@ ACE_Configuration_Heap::open (const ACE_TCHAR* file_name, #if !defined (ACE_LACKS_ACCESS) // Now check if the backing store has been created successfully. if (ACE_OS::access (file_name, F_OK) != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("create_index\n")), -1); #endif /* ACE_LACKS_ACCESS */ @@ -1320,7 +1320,7 @@ ACE_Configuration_Heap::create_index (void) section_index) == -1) { // Attempt to clean up. - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("create_index failed\n"))); this->allocator_->remove (); return -1; diff --git a/ACE/ace/Connector.cpp b/ACE/ace/Connector.cpp index 66f60da3044..c0415faf56e 100644 --- a/ACE/ace/Connector.cpp +++ b/ACE/ace/Connector.cpp @@ -17,15 +17,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Connector) -template <class SVC_HANDLER> -ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::ACE_NonBlocking_Connect_Handler -(ACE_Connector_Base<SVC_HANDLER> &connector, - SVC_HANDLER *sh, - long id) - : connector_ (connector) - , svc_handler_ (sh) - , cleanup_svc_handler_ (0) - , timer_id_ (id) +template <typename SVC_HANDLER> +ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::ACE_NonBlocking_Connect_Handler (ACE_Connector_Base<SVC_HANDLER> &connector, + SVC_HANDLER *sh, + long id) + : connector_ (connector), + svc_handler_ (sh), + cleanup_svc_handler_ (0), + timer_id_ (id) { ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::ACE_NonBlocking_Connect_Handler"); @@ -44,50 +43,48 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::ACE_NonBlocking_Connect_Handler } } -template <class SVC_HANDLER> +template <typename SVC_HANDLER> ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::~ACE_NonBlocking_Connect_Handler (void) { if (this->cleanup_svc_handler_) - { - this->cleanup_svc_handler_->remove_reference (); - } + this->cleanup_svc_handler_->remove_reference (); } -template <class SVC_HANDLER> SVC_HANDLER * +template <typename SVC_HANDLER> SVC_HANDLER * ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::svc_handler (void) { ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::svc_handler"); return this->svc_handler_; } -template <class SVC_HANDLER> long +template <typename SVC_HANDLER> long ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::timer_id (void) { ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::timer_id"); return this->timer_id_; } -template <class SVC_HANDLER> void +template <typename SVC_HANDLER> void ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::timer_id (long id) { ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::timer_id"); this->timer_id_ = id; } -template <class SVC_HANDLER> void +template <typename SVC_HANDLER> void ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("svc_handler_ = %x"), this->svc_handler_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_id_ = %d"), this->timer_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("svc_handler_ = %x"), this->svc_handler_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_id_ = %d"), this->timer_id_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } -template <class SVC_HANDLER> bool +template <typename SVC_HANDLER> bool ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::close (SVC_HANDLER *&sh) { // Make sure that we haven't already initialized the Svc_Handler. @@ -131,7 +128,7 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::close (SVC_HANDLER *&sh) } -template <class SVC_HANDLER> int +template <typename SVC_HANDLER> int ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_timeout (const ACE_Time_Value &tv, const void *arg) @@ -154,7 +151,7 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_timeout } -template <class SVC_HANDLER> int +template <typename SVC_HANDLER> int ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_input (ACE_HANDLE) { // Called when a failure occurs during asynchronous connection @@ -173,7 +170,7 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_input (ACE_HANDLE) return retval; } -template <class SVC_HANDLER> int +template <typename SVC_HANDLER> int ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_close (ACE_HANDLE handle, ACE_Reactor_Mask m) { @@ -187,7 +184,7 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_close (ACE_HANDLE handle, return -1; } -template <class SVC_HANDLER> int +template <typename SVC_HANDLER> int ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_output (ACE_HANDLE handle) { // Called when a connection is establishment asynchronous. @@ -206,7 +203,7 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_output (ACE_HANDLE handle) return retval; } -template <class SVC_HANDLER> int +template <typename SVC_HANDLER> int ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_exception (ACE_HANDLE h) { // On Win32, the except mask must also be set for asynchronous @@ -215,28 +212,28 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_exception (ACE_HANDLE h) return this->handle_output (h); } -template <class SVC_HANDLER> int +template <typename SVC_HANDLER> int ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::resume_handler (void) { return ACE_Event_Handler::ACE_EVENT_HANDLER_NOT_RESUMED; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> void -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump (void) const +template <typename SVC_HANDLER, typename PEER_CONNECTOR> void +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump"); + ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = %d"), this->flags_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = %d"), this->flags_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::make_svc_handler (SVC_HANDLER *&sh) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::make_svc_handler (SVC_HANDLER *&sh) { - ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::make_svc_handler"); + ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::make_svc_handler"); if (sh == 0) ACE_NEW_RETURN (sh, @@ -249,10 +246,10 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::make_svc_handler (SVC_HANDLER return 0; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::activate_svc_handler (SVC_HANDLER *svc_handler) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::activate_svc_handler (SVC_HANDLER *svc_handler) { - ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::activate_svc_handler"); + ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::activate_svc_handler"); // No errors initially int error = 0; @@ -281,23 +278,23 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::activate_svc_handler (SVC_HAND return 0; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_PEER_CONNECTOR & -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connector (void) const +template <typename SVC_HANDLER, typename PEER_CONNECTOR> PEER_CONNECTOR & +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connector (void) const { - return const_cast<ACE_PEER_CONNECTOR &> (this->connector_); + return const_cast<PEER_CONNECTOR &> (this->connector_); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_svc_handler (SVC_HANDLER *&svc_handler, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, + const typename PEER_CONNECTOR::PEER_ADDR &remote_addr, ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, + const typename PEER_CONNECTOR::PEER_ADDR &local_addr, int reuse_addr, int flags, int perms) { - ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler"); + ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_svc_handler"); return this->connector_.connect (svc_handler->peer (), remote_addr, @@ -308,18 +305,18 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler perms); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_svc_handler (SVC_HANDLER *&svc_handler, SVC_HANDLER *&sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, + const typename PEER_CONNECTOR::PEER_ADDR &remote_addr, ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, + const typename PEER_CONNECTOR::PEER_ADDR &local_addr, int reuse_addr, int flags, int perms) { - ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler"); + ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_svc_handler"); sh_copy = svc_handler; return this->connector_.connect (svc_handler->peer (), @@ -331,29 +328,29 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler perms); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open (ACE_Reactor *r, int flags) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::open (ACE_Reactor *r, int flags) { - ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open"); + ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::open"); this->reactor (r); this->flags_ = flags; return 0; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Connector (ACE_Reactor *r, +template <typename SVC_HANDLER, typename PEER_CONNECTOR> +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::ACE_Connector (ACE_Reactor *r, int flags) { - ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Connector"); + ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::ACE_Connector"); (void) this->open (r, flags); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, + const typename PEER_CONNECTOR::PEER_ADDR &remote_addr, const ACE_Synch_Options &synch_options, - const ACE_PEER_CONNECTOR_ADDR &local_addr, + const typename PEER_CONNECTOR::PEER_ADDR &local_addr, int reuse_addr, int flags, int perms) @@ -369,13 +366,13 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect perms); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect (SVC_HANDLER *&sh, SVC_HANDLER *&sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, + const typename PEER_CONNECTOR::PEER_ADDR &remote_addr, const ACE_Synch_Options &synch_options, - const ACE_PEER_CONNECTOR_ADDR &local_addr, + const typename PEER_CONNECTOR::PEER_ADDR &local_addr, int reuse_addr, int flags, int perms) @@ -391,18 +388,18 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect perms); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_i +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_i (SVC_HANDLER *&sh, SVC_HANDLER **sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, + const typename PEER_CONNECTOR::PEER_ADDR &remote_addr, const ACE_Synch_Options &synch_options, - const ACE_PEER_CONNECTOR_ADDR &local_addr, + const typename PEER_CONNECTOR::PEER_ADDR &local_addr, int reuse_addr, int flags, int perms) { - ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_i"); + ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_i"); // If the user hasn't supplied us with a <SVC_HANDLER> we'll use the // factory method to create one. Otherwise, things will remain as @@ -481,11 +478,11 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_i return -1; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_n +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_n (size_t n, SVC_HANDLER *sh[], - ACE_PEER_CONNECTOR_ADDR remote_addrs[], + typename PEER_CONNECTOR::PEER_ADDR remote_addrs[], ACE_TCHAR *failed_svc_handlers, const ACE_Synch_Options &synch_options) { @@ -511,10 +508,10 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_n } // Cancel a <svc_handler> that was started asynchronously. -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::cancel (SVC_HANDLER *sh) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::cancel (SVC_HANDLER *sh) { - ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::cancel"); + ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::cancel"); ACE_Event_Handler *handler = this->reactor ()->find_handler (sh->get_handle ()); @@ -539,12 +536,12 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::cancel (SVC_HANDLER *sh) return 0; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::nonblocking_connect +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::nonblocking_connect (SVC_HANDLER *sh, const ACE_Synch_Options &synch_options) { - ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::nonblocking_connect"); + ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::nonblocking_connect"); // Must have a valid Reactor for non-blocking connects to work. if (this->reactor () == 0) @@ -617,16 +614,16 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::nonblocking_connect return -1; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::~ACE_Connector (void) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Connector (void) { - ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::~ACE_Connector"); + ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Connector"); this->close (); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> void -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::initialize_svc_handler +template <typename SVC_HANDLER, typename PEER_CONNECTOR> void +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::initialize_svc_handler (ACE_HANDLE handle, SVC_HANDLER *svc_handler) { @@ -641,7 +638,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::initialize_svc_handler // Transfer ownership of the ACE_HANDLE to the SVC_HANDLER. svc_handler->set_handle (handle); - ACE_PEER_CONNECTOR_ADDR raddr; + typename PEER_CONNECTOR::PEER_ADDR raddr; // Check to see if we're connected. if (svc_handler->peer ().get_remote_addr (raddr) != -1) @@ -662,26 +659,26 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::initialize_svc_handler } } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> void -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::reactor (ACE_Reactor *reactor) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> void +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::reactor (ACE_Reactor *reactor) { this->reactor_ = reactor; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_Reactor * -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::reactor (void) const +template <typename SVC_HANDLER, typename PEER_CONNECTOR> ACE_Reactor * +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::reactor (void) const { return this->reactor_; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_Unbounded_Set<ACE_HANDLE> & -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::non_blocking_handles (void) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> ACE_Unbounded_Set<ACE_HANDLE> & +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::non_blocking_handles (void) { return this->non_blocking_handles_; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::close (void) { // If there are no non-blocking handle pending, return immediately. if (this->non_blocking_handles ().size () == 0) @@ -705,7 +702,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void) this->reactor ()->find_handler (*handle); if (handler == 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%t: Connector::close h %d, no handler\n"), *handle)); // Remove handle from the set of non-blocking handles. @@ -718,7 +715,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void) NBCH *nbch = dynamic_cast<NBCH *> (handler); if (nbch == 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%t: Connector::close h %d handler %@ ") ACE_TEXT ("not a legit handler\n"), *handle, @@ -739,41 +736,41 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void) return 0; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::fini (void) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::fini (void) { - ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::fini"); + ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::fini"); return this->close (); } // Hook called by the explicit dynamic linking facility. -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::init (int, ACE_TCHAR *[]) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::init (int, ACE_TCHAR *[]) { - ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::init"); + ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::init"); return -1; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::suspend (void) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::suspend (void) { - ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::suspend"); + ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::suspend"); return -1; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::resume (void) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::resume (void) { - ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::resume"); + ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::resume"); return -1; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::info (ACE_TCHAR **strp, size_t length) const +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::info (ACE_TCHAR **strp, size_t length) const { - ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::info"); + ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::info"); ACE_TCHAR buf[BUFSIZ]; ACE_OS::sprintf (buf, @@ -788,23 +785,23 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::info (ACE_TCHAR **strp, size_t return static_cast<int> (ACE_OS::strlen (buf)); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open (ACE_Reactor *r, +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::open (ACE_Reactor *r, int flags) { - ACE_TRACE ("ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open"); + ACE_TRACE ("ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::open"); return this->open (r, 0, 0, 0, flags); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::open (ACE_Reactor *r, ACE_Creation_Strategy<SVC_HANDLER> *cre_s, - ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> *conn_s, + ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR> *conn_s, ACE_Concurrency_Strategy<SVC_HANDLER> *con_s, int flags) { - ACE_TRACE ("ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open"); + ACE_TRACE ("ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::open"); this->reactor (r); @@ -880,11 +877,11 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::open return 0; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> -ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Strategy_Connector +template <typename SVC_HANDLER, typename PEER_CONNECTOR> +ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::ACE_Strategy_Connector (ACE_Reactor *reactor, ACE_Creation_Strategy<SVC_HANDLER> *cre_s, - ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> *conn_s, + ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR> *conn_s, ACE_Concurrency_Strategy<SVC_HANDLER> *con_s, int flags) : base_type (reactor), @@ -895,23 +892,23 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Strategy_Connecto concurrency_strategy_ (0), delete_concurrency_strategy_ (false) { - ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Strategy_Connector"); + ACE_TRACE ("ACE_Connector<SVC_HANDLER, PEER_CONNECTOR>::ACE_Strategy_Connector"); if (this->open (reactor, cre_s, conn_s, con_s, flags) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Strategy_Connector::ACE_Strategy_Connector"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Strategy_Connector::ACE_Strategy_Connector"))); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> -ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::~ACE_Strategy_Connector (void) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> +ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Strategy_Connector (void) { - ACE_TRACE ("ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::~ACE_Strategy_Connector"); + ACE_TRACE ("ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::~ACE_Strategy_Connector"); // Close down this->close (); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::close (void) { if (this->delete_creation_strategy_) delete this->creation_strategy_; @@ -931,18 +928,18 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void) return SUPER::close (); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::make_svc_handler (SVC_HANDLER *&sh) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::make_svc_handler (SVC_HANDLER *&sh) { return this->creation_strategy_->make_svc_handler (sh); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_svc_handler (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, + const typename PEER_CONNECTOR::PEER_ADDR &remote_addr, ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, + const typename PEER_CONNECTOR::PEER_ADDR &local_addr, int reuse_addr, int flags, int perms) @@ -956,13 +953,13 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler perms); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_svc_handler (SVC_HANDLER *&sh, SVC_HANDLER *&sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, + const typename PEER_CONNECTOR::PEER_ADDR &remote_addr, ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, + const typename PEER_CONNECTOR::PEER_ADDR &local_addr, int reuse_addr, int flags, int perms) @@ -977,26 +974,26 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler perms); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> int -ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::activate_svc_handler (SVC_HANDLER *svc_handler) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::activate_svc_handler (SVC_HANDLER *svc_handler) { return this->concurrency_strategy_->activate_svc_handler (svc_handler, this); } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_Creation_Strategy<SVC_HANDLER> * -ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::creation_strategy (void) const +template <typename SVC_HANDLER, typename PEER_CONNECTOR> ACE_Creation_Strategy<SVC_HANDLER> * +ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::creation_strategy (void) const { return this->creation_strategy_; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> * -ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_strategy (void) const +template <typename SVC_HANDLER, typename PEER_CONNECTOR> ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR> * +ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::connect_strategy (void) const { return this->connect_strategy_; } -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_Concurrency_Strategy<SVC_HANDLER> * -ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::concurrency_strategy (void) const +template <typename SVC_HANDLER, typename PEER_CONNECTOR> ACE_Concurrency_Strategy<SVC_HANDLER> * +ACE_Strategy_Connector<SVC_HANDLER, PEER_CONNECTOR>::concurrency_strategy (void) const { return this->concurrency_strategy_; } diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h index 0063d9498b8..a5e77d8c875 100644 --- a/ACE/ace/Connector.h +++ b/ACE/ace/Connector.h @@ -147,26 +147,36 @@ private: * service handlers (SVC_HANDLERs). * * Implements the strategy for actively establishing connections with - * clients. An ACE_Connector is parameterized by concrete types that - * conform to the interfaces of PEER_CONNECTOR and SVC_HANDLER. The - * PEER_CONNECTOR is instantiated with a transport mechanism that - * actively establishes connections. The SVC_HANDLER is instantiated - * with a concrete type that performs the application-specific - * service. Both blocking and non-blocking connects are supported. - * Further, non-blocking connects support timeouts. + * clients. Both blocking and non-blocking connects are supported. + * Moreover, non-blocking connects support timeouts. + * + * An ACE_Connector is parameterized by concrete types that conform to + * the interfaces of SVC_HANDLER and PEER_CONNECTOR described below. + * + * @tparam SVC_HANDLER The name of the concrete type that performs the + * application-specific service. The SVC_HANDLER typically + * inherits from ACE_Svc_Handler. @see Svc_Handler.h. + * + * @tparam PEER_CONNECTOR The name of the class that implements the + * PEER_CONNECTOR endpoint (e.g., ACE_SOCK_Connector) to + * passively establish connections. A PEER_CONNECTOR + * implementation must provide a PEER_STREAM and PEER_ADDR + * trait to identify the type of stream (e.g., + * ACE_SOCK_Stream) and type of address (e.g., ACE_INET_Addr) + * used by the endpoint. */ -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> +template <typename SVC_HANDLER, typename PEER_CONNECTOR> class ACE_Connector : public ACE_Connector_Base<SVC_HANDLER>, public ACE_Service_Object { public: // Useful STL-style traits. - typedef typename SVC_HANDLER::addr_type addr_type; - typedef ACE_PEER_CONNECTOR connector_type; - typedef SVC_HANDLER handler_type; - typedef typename SVC_HANDLER::stream_type stream_type; - typedef typename ACE_PEER_CONNECTOR::PEER_ADDR peer_addr_type; - typedef ACE_PEER_CONNECTOR_ADDR ACE_PEER_ADDR_TYPEDEF; + typedef typename SVC_HANDLER::addr_type addr_type; + typedef PEER_CONNECTOR connector_type; + typedef SVC_HANDLER handler_type; + typedef typename SVC_HANDLER::stream_type stream_type; + typedef typename PEER_CONNECTOR::PEER_ADDR peer_addr_type; + typedef typename PEER_CONNECTOR::PEER_ADDR PEER_ADDR_TYPEDEF; /** * Initialize a connector. @a flags indicates how SVC_HANDLER's @@ -203,10 +213,10 @@ public: * automatically to prevent resource leaks. */ virtual int connect (SVC_HANDLER *&svc_handler, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, + const typename PEER_CONNECTOR::PEER_ADDR &remote_addr, const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults, - const ACE_PEER_CONNECTOR_ADDR &local_addr - = (peer_addr_type &) ACE_PEER_CONNECTOR_ADDR_ANY, + const typename PEER_CONNECTOR::PEER_ADDR &local_addr + = (peer_addr_type &) peer_addr_type::sap_any, int reuse_addr = 0, int flags = O_RDWR, int perms = 0); @@ -223,10 +233,10 @@ public: */ virtual int connect (SVC_HANDLER *&svc_handler_hint, SVC_HANDLER *&svc_handler, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, + const typename PEER_CONNECTOR::PEER_ADDR &remote_addr, const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults, - const ACE_PEER_CONNECTOR_ADDR &local_addr - = (peer_addr_type &) ACE_PEER_CONNECTOR_ADDR_ANY, + const typename PEER_CONNECTOR::PEER_ADDR &local_addr + = (peer_addr_type &) peer_addr_type::sap_any, int reuse_addr = 0, int flags = O_RDWR, int perms = 0); @@ -241,7 +251,7 @@ public: */ virtual int connect_n (size_t n, SVC_HANDLER *svc_handlers[], - ACE_PEER_CONNECTOR_ADDR remote_addrs[], + typename PEER_CONNECTOR::PEER_ADDR remote_addrs[], ACE_TCHAR *failed_svc_handlers = 0, const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults); @@ -259,7 +269,7 @@ public: virtual int close (void); /// Return the underlying PEER_CONNECTOR object. - virtual ACE_PEER_CONNECTOR &connector (void) const; + virtual PEER_CONNECTOR &connector (void) const; /// Initialize Svc_Handler. virtual void initialize_svc_handler (ACE_HANDLE handle, @@ -301,17 +311,17 @@ protected: * <PEER_CONNECTOR::connect>. */ virtual int connect_svc_handler (SVC_HANDLER *&svc_handler, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, + const typename PEER_CONNECTOR::PEER_ADDR &remote_addr, ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, + const typename PEER_CONNECTOR::PEER_ADDR &local_addr, int reuse_addr, int flags, int perms); virtual int connect_svc_handler (SVC_HANDLER *&svc_handler, SVC_HANDLER *&sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, + const typename PEER_CONNECTOR::PEER_ADDR &remote_addr, ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, + const typename PEER_CONNECTOR::PEER_ADDR &local_addr, int reuse_addr, int flags, int perms); @@ -335,9 +345,9 @@ protected: /// Implementation of the connect methods. virtual int connect_i (SVC_HANDLER *&svc_handler, SVC_HANDLER **sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, + const typename PEER_CONNECTOR::PEER_ADDR &remote_addr, const ACE_Synch_Options &synch_options, - const ACE_PEER_CONNECTOR_ADDR &local_addr, + const typename PEER_CONNECTOR::PEER_ADDR &local_addr, int reuse_addr, int flags, int perms); @@ -368,7 +378,7 @@ protected: private: /// This is the peer connector factory. - ACE_PEER_CONNECTOR connector_; + PEER_CONNECTOR connector_; /** * Flags that indicate how SVC_HANDLER's should be initialized @@ -400,30 +410,30 @@ private: * and (3) activating the SVC_HANDLER with a * particular concurrency mechanism after the connection is established. */ -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> +template <class SVC_HANDLER, typename PEER_CONNECTOR> class ACE_Strategy_Connector - : public ACE_Connector <SVC_HANDLER, ACE_PEER_CONNECTOR_2> + : public ACE_Connector <SVC_HANDLER, PEER_CONNECTOR> { public: // Useful STL-style traits. typedef ACE_Creation_Strategy<SVC_HANDLER> creation_strategy_type; - typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> + typedef ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR> connect_strategy_type; typedef ACE_Concurrency_Strategy<SVC_HANDLER> concurrency_strategy_type; - typedef ACE_Connector <SVC_HANDLER, ACE_PEER_CONNECTOR_2> + typedef ACE_Connector <SVC_HANDLER, PEER_CONNECTOR> base_type; // = Define some useful (old style) traits. typedef ACE_Creation_Strategy<SVC_HANDLER> CREATION_STRATEGY; - typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> + typedef ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR> CONNECT_STRATEGY; typedef ACE_Concurrency_Strategy<SVC_HANDLER> CONCURRENCY_STRATEGY; - typedef ACE_Connector <SVC_HANDLER, ACE_PEER_CONNECTOR_2> + typedef ACE_Connector <SVC_HANDLER, PEER_CONNECTOR> SUPER; /** @@ -434,7 +444,7 @@ public: */ ACE_Strategy_Connector (ACE_Reactor *r = ACE_Reactor::instance (), ACE_Creation_Strategy<SVC_HANDLER> * = 0, - ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> * = 0, + ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR> * = 0, ACE_Concurrency_Strategy<SVC_HANDLER> * = 0, int flags = 0); @@ -456,7 +466,7 @@ public: */ virtual int open (ACE_Reactor *r = ACE_Reactor::instance (), ACE_Creation_Strategy<SVC_HANDLER> * = 0, - ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> * = 0, + ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR> * = 0, ACE_Concurrency_Strategy<SVC_HANDLER> * = 0, int flags = 0); @@ -468,7 +478,7 @@ public: // = Strategies accessors virtual ACE_Creation_Strategy<SVC_HANDLER> *creation_strategy (void) const; - virtual ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> *connect_strategy (void) const; + virtual ACE_Connect_Strategy<SVC_HANDLER, PEER_CONNECTOR> *connect_strategy (void) const; virtual ACE_Concurrency_Strategy<SVC_HANDLER> *concurrency_strategy (void) const; protected: @@ -495,9 +505,9 @@ protected: * <PEER_CONNECTOR::connect> in the <Connect_Strategy>. */ virtual int connect_svc_handler (SVC_HANDLER *&sh, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, + const typename PEER_CONNECTOR::PEER_ADDR &remote_addr, ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, + const typename PEER_CONNECTOR::PEER_ADDR &local_addr, int reuse_addr, int flags, int perms); @@ -514,9 +524,9 @@ protected: */ virtual int connect_svc_handler (SVC_HANDLER *&sh, SVC_HANDLER *&sh_copy, - const ACE_PEER_CONNECTOR_ADDR &remote_addr, + const typename PEER_CONNECTOR::PEER_ADDR &remote_addr, ACE_Time_Value *timeout, - const ACE_PEER_CONNECTOR_ADDR &local_addr, + const typename PEER_CONNECTOR::PEER_ADDR &local_addr, int reuse_addr, int flags, int perms); diff --git a/ACE/ace/Containers_T.cpp b/ACE/ace/Containers_T.cpp index 6f2bd86b23f..38db39b167d 100644 --- a/ACE/ace/Containers_T.cpp +++ b/ACE/ace/Containers_T.cpp @@ -3,7 +3,7 @@ #ifndef ACE_CONTAINERS_T_CPP #define ACE_CONTAINERS_T_CPP -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Malloc_Base.h" #include "ace/OS_Memory.h" @@ -442,9 +442,9 @@ ACE_Double_Linked_List_Iterator_Base<T>::do_retreat (void) template <class T> void ACE_Double_Linked_List_Iterator_Base<T>::dump_i (void) const { - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("current_ = %x"), this->current_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("current_ = %x"), this->current_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } //-------------------------------------------------- @@ -1622,10 +1622,10 @@ ACE_Ordered_MultiSet<T>::dump (void) const #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Ordered_MultiSet<T>::dump"); // - // ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_ = %u"), this->head_)); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_ = %u"), this->head_)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); // // T *item = 0; // size_t count = 1; @@ -1633,9 +1633,9 @@ ACE_Ordered_MultiSet<T>::dump (void) const // for (ACE_Ordered_MultiSet_Iterator<T> iter (*(ACE_Ordered_MultiSet<T> *) this); // iter.next (item) != 0; // iter.advance ()) - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("count = %d\n"), count++)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("count = %d\n"), count++)); // - // ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/DEV_Addr.cpp b/ACE/ace/DEV_Addr.cpp index 2b0a4f7cd7b..c2e75e35082 100644 --- a/ACE/ace/DEV_Addr.cpp +++ b/ACE/ace/DEV_Addr.cpp @@ -5,7 +5,7 @@ #include "ace/DEV_Addr.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_string.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -39,9 +39,9 @@ ACE_DEV_Addr::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_DEV_Addr::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("devname_ = %s"), this->devname_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("devname_ = %s"), this->devname_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/DEV_Connector.h b/ACE/ace/DEV_Connector.h index 66fdaa84059..5a491eba8b9 100644 --- a/ACE/ace/DEV_Connector.h +++ b/ACE/ace/DEV_Connector.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" #include "ace/DEV_IO.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/os_include/os_fcntl.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/ACE/ace/DEV_Connector.inl b/ACE/ace/DEV_Connector.inl index 9ece5f47f13..51a674be98c 100644 --- a/ACE/ace/DEV_Connector.inl +++ b/ACE/ace/DEV_Connector.inl @@ -19,7 +19,7 @@ ACE_DEV_Connector::ACE_DEV_Connector (ACE_DEV_IO &new_io, if (this->connect (new_io, remote_sap, timeout, local_sap, reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("address %s, %p\n"), + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("address %s, %p\n"), remote_sap.get_path_name (), ACE_TEXT ("ACE_DEV_IO"))); } diff --git a/ACE/ace/DEV_IO.cpp b/ACE/ace/DEV_IO.cpp index 24e6f64a155..9b0e3684ff9 100644 --- a/ACE/ace/DEV_IO.cpp +++ b/ACE/ace/DEV_IO.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/DEV_IO.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) #include "ace/DEV_IO.inl" @@ -42,9 +42,9 @@ ACE_DEV_IO::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_DEV_IO::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->addr_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/DLL.cpp b/ACE/ace/DLL.cpp index fc7e65c980d..c9887dec76a 100644 --- a/ACE/ace/DLL.cpp +++ b/ACE/ace/DLL.cpp @@ -2,7 +2,7 @@ #include "ace/DLL.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/ACE.h" #include "ace/DLL_Manager.h" #include "ace/OS_NS_string.h" @@ -43,7 +43,7 @@ ACE_DLL::ACE_DLL (const ACE_DLL &rhs) rhs.open_mode_, rhs.close_handle_on_destruction_) != 0 && ACE::debug ()) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_DLL::copy_ctor: error: %s\n"), this->error ())); } @@ -84,7 +84,7 @@ ACE_DLL::ACE_DLL (const ACE_TCHAR *dll_name, if (this->open (dll_name, this->open_mode_, close_handle_on_destruction) != 0 && ACE::debug ()) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_DLL::open: error calling open: %s\n"), this->error ())); } @@ -140,7 +140,7 @@ ACE_DLL::open_i (const ACE_TCHAR *dll_filename, if (!dll_filename) { if (ACE::debug ()) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_DLL::open_i: dll_name is %s\n"), this->dll_name_ == 0 ? ACE_TEXT ("(null)") : this->dll_name_)); diff --git a/ACE/ace/DLL_Manager.cpp b/ACE/ace/DLL_Manager.cpp index 01dc236a7ab..ad9477b7a8c 100644 --- a/ACE/ace/DLL_Manager.cpp +++ b/ACE/ace/DLL_Manager.cpp @@ -2,7 +2,7 @@ #include "ace/DLL_Manager.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/ACE.h" #include "ace/Framework_Component.h" @@ -54,7 +54,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, if (ACE_OS::strcmp (this->dll_name_, dll_name) != 0) { if (ACE::debug ()) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) DLL_Handle::open: error, ") ACE_TEXT ("tried to reopen %s with name %s\n"), this->dll_name_, @@ -121,7 +121,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, if (ACE::debug ()) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) DLL_Handle::open ") ACE_TEXT ("(\"%s\", 0x%x) -> %s: %s\n"), name->c_str (), @@ -142,7 +142,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, // @TODO: If we've found our DLL _and_ it's // broken, should we continue at all? if ((errno != 0) && (errno != ENOENT) && ACE::debug ()) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) DLL_Handle::open ") ACE_TEXT ("(\'%s\') failed, errno=") ACE_TEXT ("%d: <%s>\n"), @@ -166,7 +166,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, if (ACE::debug ()) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) DLL_Handle::open ") ACE_TEXT ("(\"%s\", 0x%x) -> %s: %s\n"), aix_pathname, @@ -188,7 +188,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, // @TODO: If we've found our DLL _and_ it's broken, // should we continue at all? if (ACE::debug () && (errno != 0) && (errno != ENOENT)) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) DLL_Handle::open ") ACE_TEXT ("(\'%s\') failed, errno=") ACE_TEXT ("%d: %s\n"), @@ -205,7 +205,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, if (this->handle_ == ACE_SHLIB_INVALID_HANDLE) { if (ACE::debug ()) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) DLL_Handle::open (\"%s\"): ") ACE_TEXT ("Invalid handle error: %s\n"), this->dll_name_, @@ -219,7 +219,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, ++this->refcount_; if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) DLL_Handle::open - %s (%d), refcount=%d\n"), this->dll_name_, this->handle_, @@ -251,7 +251,7 @@ ACE_DLL_Handle::close (int unload) this->refcount_ = 0; if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) DLL_Handle::close - ") ACE_TEXT ("%s (handle=%d, refcount=%d)\n"), this->dll_name_, @@ -263,7 +263,7 @@ ACE_DLL_Handle::close (int unload) unload == 1) { if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) DLL_Handle::close: ") ACE_TEXT ("Unloading %s (handle=%d)\n"), this->dll_name_, @@ -286,7 +286,7 @@ ACE_DLL_Handle::close (int unload) retval = ACE_OS::dlclose (h); if (retval != 0 && ACE::debug ()) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) DLL_Handle::close - ") ACE_TEXT ("Failed with: \"%s\".\n"), this->error ()->c_str ())); @@ -325,7 +325,7 @@ ACE_DLL_Handle::symbol (const ACE_TCHAR *sym_name, bool ignore_errors) if (!sym && !ignore_errors) { if (ACE::debug ()) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) DLL_Handle::symbol (\"%s\") ") ACE_TEXT (" failed with \"%s\".\n"), auto_name.get (), @@ -347,7 +347,7 @@ ACE_DLL_Handle::get_handle (bool become_owner) if (this->refcount_ == 0 && become_owner) { if (ACE::debug ()) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) DLL_Handle::get_handle: ") ACE_TEXT ("cannot become owner, refcount == 0.\n"))); @@ -363,7 +363,7 @@ ACE_DLL_Handle::get_handle (bool become_owner) } if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) DLL_Handle::get_handle: ") ACE_TEXT ("post call: handle %s, refcount %d\n"), this->handle_ == ACE_SHLIB_INVALID_HANDLE ? @@ -530,7 +530,7 @@ ACE_DLL_Manager::ACE_DLL_Manager (int size) ACE_TRACE ("ACE_DLL_Manager::ACE_DLL_Manager"); if (this->open (size) != 0 && ACE::debug ()) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) DLL_Manager ctor failed to allocate ") ACE_TEXT ("handle_vector_.\n"))); } @@ -540,7 +540,7 @@ ACE_DLL_Manager::~ACE_DLL_Manager (void) ACE_TRACE ("ACE_DLL_Manager::~ACE_DLL_Manager"); if (this->close () != 0 && ACE::debug ()) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) DLL_Manager dtor failed to close ") ACE_TEXT ("properly.\n"))); } @@ -576,7 +576,7 @@ ACE_DLL_Manager::open_dll (const ACE_TCHAR *dll_name, { // Error while opening dll. Free temp handle if (ACE::debug ()) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) DLL_Manager::open_dll: Could not ") ACE_TEXT ("open dll %s.\n"), dll_name)); @@ -759,7 +759,7 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload) if (dll_handle->close (unload) != 0) { if (ACE::debug ()) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) DLL_Manager::unload error.\n"))); return -1; @@ -768,7 +768,7 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload) else { if (ACE::debug ()) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) DLL_Manager::unload_dll called with ") ACE_TEXT ("null pointer.\n"))); diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp index 85b296e1849..ec0817a070b 100644 --- a/ACE/ace/Dev_Poll_Reactor.cpp +++ b/ACE/ace/Dev_Poll_Reactor.cpp @@ -279,7 +279,7 @@ int ACE_Dev_Poll_Reactor_Notify::handle_input (ACE_HANDLE /*handle*/) { ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::handle_input"); - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("SHOULD NOT BE HERE.\n")), -1); + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("SHOULD NOT BE HERE.\n")), -1); } ACE_HANDLE @@ -331,7 +331,7 @@ ACE_Dev_Poll_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer) break; default: // Should we bail out if we get an invalid mask? - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("dispatch_notify invalid mask = %d\n"), buffer.mask_)); } @@ -386,12 +386,12 @@ ACE_Dev_Poll_Reactor_Notify::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Dev_Poll_Reactor_Notify::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("dp_reactor_ = %@"), this->dp_reactor_)); this->notification_pipe_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -582,17 +582,14 @@ ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (ACE_Sig_Handler *sh, : initialized_ (false) , poll_fd_ (ACE_INVALID_HANDLE) // , ready_set_ () -#if defined (ACE_HAS_EVENT_POLL) - , epoll_wait_in_progress_ (false) -#endif /* ACE_HAS_EVENT_POLL */ #if defined (ACE_HAS_DEV_POLL) , dp_fds_ (0) , start_pfds_ (0) , end_pfds_ (0) #endif /* ACE_HAS_DEV_POLL */ - , deactivated_ (0) , token_ (*this, s_queue) , lock_adapter_ (token_) + , deactivated_ (0) , timer_queue_ (0) , delete_timer_queue_ (false) , signal_handler_ (0) @@ -610,7 +607,7 @@ ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (ACE_Sig_Handler *sh, tq, disable_notify_pipe, notify) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Dev_Poll_Reactor::open ") ACE_TEXT ("failed inside ") @@ -633,9 +630,9 @@ ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (size_t size, , start_pfds_ (0) , end_pfds_ (0) #endif /* ACE_HAS_DEV_POLL */ - , deactivated_ (0) , token_ (*this, s_queue) , lock_adapter_ (token_) + , deactivated_ (0) , timer_queue_ (0) , delete_timer_queue_ (false) , signal_handler_ (0) @@ -651,7 +648,7 @@ ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (size_t size, tq, disable_notify_pipe, notify) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Dev_Poll_Reactor::open ") ACE_TEXT ("failed inside ACE_Dev_Poll_Reactor::CTOR"))); @@ -941,33 +938,11 @@ ACE_Dev_Poll_Reactor::work_pending_i (ACE_Time_Value * max_wait_time) #if defined (ACE_HAS_EVENT_POLL) - // See if there are handlers that have to be resumed before waiting. - { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->to_be_resumed_lock_, -1); - this->epoll_wait_in_progress_ = true; - for (Resume_Map::iterator i = this->to_be_resumed_.begin (); - i != this->to_be_resumed_.end (); - ++i) - { - // Make sure that 1) the handle is still registered, - // 2) the registered handler is the one we're waiting to resume. - Event_Tuple *info = this->handler_rep_.find (i->first); - if (info != 0 && info->event_handler == i->second) - { - this->resume_handler_i (i->first); - } - } - this->to_be_resumed_.clear (); - } - // Wait for an event. int const nfds = ::epoll_wait (this->poll_fd_, &this->event_, 1, static_cast<int> (timeout)); - // Count on this being an atomic update; at worst, we may get an - // extraneous notify() from dispatch_io_event. - this->epoll_wait_in_progress_ = false; #else @@ -1042,7 +1017,7 @@ ACE_Dev_Poll_Reactor::handle_events_i (ACE_Time_Value *max_wait_time, { result = this->work_pending_i (max_wait_time); if (result == -1 && (this->restart_ == 0 || errno != EINTR)) - ACE_ERROR ((LM_ERROR, ACE_TEXT("%t: %p\n"), ACE_TEXT("work_pending_i"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%t: %p\n"), ACE_TEXT("work_pending_i"))); } while (result == -1 && this->restart_ != 0 && errno == EINTR); @@ -1188,86 +1163,90 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard) handler together with descriptor, instead of looking it up in a repository ? Could it boost performance ? */ - Event_Tuple *info = this->handler_rep_.find (handle); - if (info == 0) // No registered handler any longer - { -#ifdef ACE_HAS_EVENT_POLL - this->event_.data.fd = ACE_INVALID_HANDLE; // Dump the event -#endif /* ACE_HAS_EVENT_POLL */ - return 0; - } - // Figure out what to do first in order to make it easier to manage - // the bit twiddling and possible pfds increment before releasing - // the token for dispatch. - // Note that if there's an error (such as the handle was closed - // without being removed from the event set) the EPOLLHUP and/or - // EPOLLERR bits will be set in revents. + // Going to access handler repo, so lock it. If the lock is + // unobtainable, something is very wrong so bail out. + Event_Tuple *info = 0; ACE_Reactor_Mask disp_mask = 0; - ACE_Event_Handler *eh = info->event_handler; + ACE_Event_Handler *eh = 0; int (ACE_Event_Handler::*callback)(ACE_HANDLE) = 0; - if (ACE_BIT_ENABLED (revents, out_event)) - { - disp_mask = ACE_Event_Handler::WRITE_MASK; - callback = &ACE_Event_Handler::handle_output; - ACE_CLR_BITS (revents, out_event); - } - else if (ACE_BIT_ENABLED (revents, exc_event)) - { - disp_mask = ACE_Event_Handler::EXCEPT_MASK; - callback = &ACE_Event_Handler::handle_exception; - ACE_CLR_BITS (revents, exc_event); - } - else if (ACE_BIT_ENABLED (revents, in_event)) - { - disp_mask = ACE_Event_Handler::READ_MASK; - callback = &ACE_Event_Handler::handle_input; - ACE_CLR_BITS (revents, in_event); - } - else if (ACE_BIT_ENABLED (revents, err_event)) - { - this->remove_handler_i (handle, - ACE_Event_Handler::ALL_EVENTS_MASK, - info->event_handler); + bool reactor_resumes_eh = false; + { + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1); + info = this->handler_rep_.find (handle); + if (info == 0) // No registered handler any longer + return 0; + + // Figure out what to do first in order to make it easier to manage + // the bit twiddling and possible pfds increment before releasing + // the token for dispatch. + // Note that if there's an error (such as the handle was closed + // without being removed from the event set) the EPOLLHUP and/or + // EPOLLERR bits will be set in revents. + eh = info->event_handler; + if (ACE_BIT_ENABLED (revents, out_event)) + { + disp_mask = ACE_Event_Handler::WRITE_MASK; + callback = &ACE_Event_Handler::handle_output; + ACE_CLR_BITS (revents, out_event); + } + else if (ACE_BIT_ENABLED (revents, exc_event)) + { + disp_mask = ACE_Event_Handler::EXCEPT_MASK; + callback = &ACE_Event_Handler::handle_exception; + ACE_CLR_BITS (revents, exc_event); + } + else if (ACE_BIT_ENABLED (revents, in_event)) + { + disp_mask = ACE_Event_Handler::READ_MASK; + callback = &ACE_Event_Handler::handle_input; + ACE_CLR_BITS (revents, in_event); + } + else if (ACE_BIT_ENABLED (revents, err_event)) + { + this->remove_handler_i (handle, + ACE_Event_Handler::ALL_EVENTS_MASK, + grd, + info->event_handler); #ifdef ACE_HAS_DEV_POLL - ++pfds; + ++pfds; #endif /* ACE_HAS_DEV_POLL */ - return 1; - } - else - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%t) dispatch_io h %d unknown events 0x%x\n"), - handle, revents)); - } + return 1; + } + else + { + ACELIB_ERROR ((LM_ERROR, + ACE_TEXT ("(%t) dispatch_io h %d unknown events 0x%x\n"), + handle, revents)); + } #ifdef ACE_HAS_DEV_POLL - // Increment the pointer to the next element before we - // release the token. Otherwise event handlers end up being - // dispatched multiple times for the same poll. - if (revents == 0) - ++pfds; + // Increment the pointer to the next element before we + // release the token. Otherwise event handlers end up being + // dispatched multiple times for the same poll. + if (revents == 0) + ++pfds; #else - // With epoll, events are registered with oneshot, so the handle is - // effectively suspended; future calls to epoll_wait() will select - // the next event, so they're not managed here. - // The hitch to this is that the notify handler is always registered - // WITHOUT oneshot and is never suspended/resumed. This avoids endless - // notify loops caused by the notify handler requiring a resumption - // which requires the token, which requires a notify, etc. described - // in Bugzilla 3714. So, never suspend the notify handler. - - bool reactor_resumes_eh = false; - if (eh != this->notify_handler_) - { - info->suspended = true; + // With epoll, events are registered with oneshot, so the handle is + // effectively suspended; future calls to epoll_wait() will select + // the next event, so they're not managed here. + // The hitch to this is that the notify handler is always registered + // WITHOUT oneshot and is never suspended/resumed. This avoids endless + // notify loops caused by the notify handler requiring a resumption + // which requires the token, which requires a notify, etc. described + // in Bugzilla 3714. So, never suspend the notify handler. + if (eh != this->notify_handler_) + { + info->suspended = true; - reactor_resumes_eh = - eh->resume_handler () == - ACE_Event_Handler::ACE_REACTOR_RESUMES_HANDLER; - } + reactor_resumes_eh = + eh->resume_handler () == + ACE_Event_Handler::ACE_REACTOR_RESUMES_HANDLER; + } #endif /* ACE_HAS_DEV_POLL */ + } // End scope for ACE_GUARD holding repo lock + int status = 0; // gets callback status, below. // Dispatch notifies directly. The notify dispatcher locates a @@ -1305,10 +1284,6 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard) // If the callback returned 0, epoll-based needs to resume the // suspended handler but dev/poll doesn't. - // The epoll case is optimized to not acquire the token in order - // to resume the handler; the handler is added to a list of those - // that need to be resumed and is handled by the next leader - // that does an epoll_wait(). // In both epoll and dev/poll cases, if the callback returns <0, // the token needs to be acquired and the handler checked and // removed if it hasn't already been. @@ -1316,34 +1291,30 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard) { #ifdef ACE_HAS_EVENT_POLL // epoll-based effectively suspends handlers around the upcall. - // If the handler must be resumed, add it to the list. + // If the handler must be resumed, check to be sure it's the + // same handle/handler combination still. if (reactor_resumes_eh) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, - grd, - this->to_be_resumed_lock_, - -1); - bool map_was_empty = this->to_be_resumed_.empty(); - this->to_be_resumed_.insert - (Resume_Map::value_type (handle, eh)); - if (this->epoll_wait_in_progress_ && map_was_empty) - this->notify(); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1); + info = this->handler_rep_.find (handle); + if (info != 0 && info->event_handler == eh) + this->resume_handler_i (handle); } #endif /* ACE_HAS_EVENT_POLL */ return 1; } // All state in the handler repository may have changed during the - // upcall while other threads had the token. Thus, reacquire the - // token and evaluate what's needed. If the upcalled handler is still - // the handler of record for handle, continue with checking whether - // or not to remove or resume the handler. - guard.acquire (); + // upcall. Thus, reacquire the repo lock and evaluate what's needed. + // If the upcalled handler is still the handler of record for handle, + // continue with checking whether or not to remove or resume the + // handler. + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, 1); info = this->handler_rep_.find (handle); if (info != 0 && info->event_handler == eh) { if (status < 0) - this->remove_handler_i (handle, disp_mask); + this->remove_handler_i (handle, disp_mask, grd); } } // Scope close handles eh ref count decrement, if needed. @@ -1397,7 +1368,7 @@ ACE_Dev_Poll_Reactor::register_handler (ACE_Event_Handler *handler, { ACE_TRACE ("ACE_Dev_Poll_Reactor::register_handler"); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1)); return this->register_handler_i (handler->get_handle (), handler, @@ -1411,7 +1382,7 @@ ACE_Dev_Poll_Reactor::register_handler (ACE_HANDLE handle, { ACE_TRACE ("ACE_Dev_Poll_Reactor::register_handler"); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1)); return this->register_handler_i (handle, event_handler, @@ -1456,7 +1427,7 @@ ACE_Dev_Poll_Reactor::register_handler_i (ACE_HANDLE handle, if (::epoll_ctl (this->poll_fd_, op, handle, &epev) == -1) { - ACE_ERROR ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("epoll_ctl"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("epoll_ctl"))); (void) this->handler_rep_.unbind (handle); return -1; } @@ -1470,7 +1441,7 @@ ACE_Dev_Poll_Reactor::register_handler_i (ACE_HANDLE handle, // again, possibly for different event. Add new mask to the // current one. if (this->mask_ops_i (handle, mask, ACE_Reactor::ADD_MASK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("mask_ops_i")), + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("mask_ops_i")), -1); } @@ -1517,7 +1488,7 @@ ACE_Dev_Poll_Reactor::register_handler (const ACE_Handle_Set &handle_set, ACE_Handle_Set_Iterator handle_iter (handle_set); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1)); // @@ It might be more efficient to construct a pollfd array and // pass it to the write () call in register_handler_i () only once, @@ -1584,9 +1555,8 @@ ACE_Dev_Poll_Reactor::remove_handler (ACE_Event_Handler *handler, { ACE_TRACE ("ACE_Dev_Poll_Reactor::remove_handler"); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); - - return this->remove_handler_i (handler->get_handle (), mask); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1); + return this->remove_handler_i (handler->get_handle (), mask, grd); } int @@ -1595,15 +1565,18 @@ ACE_Dev_Poll_Reactor::remove_handler (ACE_HANDLE handle, { ACE_TRACE ("ACE_Dev_Poll_Reactor::remove_handler"); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1); - return this->remove_handler_i (handle, mask); + return this->remove_handler_i (handle, mask, grd); } +// FUZZ: disable check_for_ACE_Guard int ACE_Dev_Poll_Reactor::remove_handler_i (ACE_HANDLE handle, ACE_Reactor_Mask mask, + ACE_Guard<ACE_SYNCH_MUTEX> &repo_guard, ACE_Event_Handler *eh) +// FUZZ: enable check_for_ACE_Guard { ACE_TRACE ("ACE_Dev_Poll_Reactor::remove_handler_i"); @@ -1627,7 +1600,12 @@ ACE_Dev_Poll_Reactor::remove_handler_i (ACE_HANDLE handle, ACE_Event_Handler::Reference_Counting_Policy::ENABLED; if (ACE_BIT_DISABLED (mask, ACE_Event_Handler::DONT_CALL)) - (void) eh->handle_close (handle, mask); + { + // It would be great if ACE_Reverse_Lock worked with the Guard. + repo_guard.release (); + eh->handle_close (handle, mask); + repo_guard.acquire (); + } // If there are no longer any outstanding events on the given handle // then remove it from the handler repository. @@ -1644,20 +1622,14 @@ ACE_Dev_Poll_Reactor::remove_handler (const ACE_Handle_Set &handle_set, ACE_TRACE ("ACE_Dev_Poll_Reactor::remove_handler"); ACE_Handle_Set_Iterator handle_iter (handle_set); - - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); - - // @@ It might be more efficient to construct a pollfd array and - // pass it to the write () call in register_handler_i () only once, - // instead of calling write () (a system call) once for each file - // descriptor. - for (ACE_HANDLE h = handle_iter (); h != ACE_INVALID_HANDLE; h = handle_iter ()) - if (this->remove_handler_i (h, mask) == -1) - return -1; - + { + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1); + if (this->remove_handler_i (h, mask, grd) == -1) + return -1; + } return 0; } @@ -1711,7 +1683,7 @@ ACE_Dev_Poll_Reactor::suspend_handler (ACE_Event_Handler *event_handler) ACE_HANDLE handle = event_handler->get_handle (); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1)); return this->suspend_handler_i (handle); } @@ -1721,7 +1693,7 @@ ACE_Dev_Poll_Reactor::suspend_handler (ACE_HANDLE handle) { ACE_TRACE ("ACE_Dev_Poll_Reactor::suspend_handler"); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1)); return this->suspend_handler_i (handle); } @@ -1734,7 +1706,7 @@ ACE_Dev_Poll_Reactor::suspend_handler (const ACE_Handle_Set &handles) ACE_Handle_Set_Iterator handle_iter (handles); ACE_HANDLE h; - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1)); while ((h = handle_iter ()) != ACE_INVALID_HANDLE) if (this->suspend_handler_i (h) == -1) @@ -1748,7 +1720,7 @@ ACE_Dev_Poll_Reactor::suspend_handlers (void) { ACE_TRACE ("ACE_Dev_Poll_Reactor::suspend_handlers"); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1)); size_t const len = this->handler_rep_.max_size (); @@ -1822,7 +1794,7 @@ ACE_Dev_Poll_Reactor::resume_handler (ACE_Event_Handler *event_handler) ACE_HANDLE handle = event_handler->get_handle (); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1)); return this->resume_handler_i (handle); } @@ -1832,7 +1804,7 @@ ACE_Dev_Poll_Reactor::resume_handler (ACE_HANDLE handle) { ACE_TRACE ("ACE_Dev_Poll_Reactor::resume_handler"); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1)); return this->resume_handler_i (handle); } @@ -1845,7 +1817,7 @@ ACE_Dev_Poll_Reactor::resume_handler (const ACE_Handle_Set &handles) ACE_Handle_Set_Iterator handle_iter (handles); ACE_HANDLE h; - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1)); while ((h = handle_iter ()) != ACE_INVALID_HANDLE) if (this->resume_handler_i (h) == -1) @@ -1859,7 +1831,7 @@ ACE_Dev_Poll_Reactor::resume_handlers (void) { ACE_TRACE ("ACE_Dev_Poll_Reactor::resume_handlers"); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1)); size_t const len = this->handler_rep_.max_size (); @@ -1986,8 +1958,8 @@ ACE_Dev_Poll_Reactor::cancel_timer (ACE_Event_Handler *event_handler, { ACE_TRACE ("ACE_Dev_Poll_Reactor::cancel_timer"); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); - + // Don't bother waking the poll - the worse that will happen is it will + // wake up for a timer that doesn't exist then go back to waiting. return (this->timer_queue_ == 0 ? 0 : this->timer_queue_->cancel (event_handler, @@ -2001,8 +1973,8 @@ ACE_Dev_Poll_Reactor::cancel_timer (long timer_id, { ACE_TRACE ("ACE_Dev_Poll_Reactor::cancel_timer"); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); - + // Don't bother waking the poll - the worse that will happen is it will + // wake up for a timer that doesn't exist then go back to waiting. return (this->timer_queue_ == 0 ? 0 : this->timer_queue_->cancel (timer_id, @@ -2097,7 +2069,7 @@ ACE_Dev_Poll_Reactor::purge_pending_notifications (ACE_Event_Handler * eh, ACE_Event_Handler * ACE_Dev_Poll_Reactor::find_handler (ACE_HANDLE handle) { - ACE_MT (ACE_READ_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, 0)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, 0)); Event_Tuple *info = this->handler_rep_.find (handle); if (info) @@ -2118,7 +2090,7 @@ ACE_Dev_Poll_Reactor::handler (ACE_HANDLE handle, { ACE_TRACE ("ACE_Dev_Poll_Reactor::handler"); - ACE_MT (ACE_READ_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1)); Event_Tuple *info = this->handler_rep_.find (handle); @@ -2185,7 +2157,7 @@ ACE_Dev_Poll_Reactor::wakeup_all_threads (void) // it. this->notify (0, ACE_Event_Handler::NULL_MASK, - (ACE_Time_Value *) &ACE_Time_Value::zero); + (ACE_Time_Value *) &ACE_Time_Value::zero); } int @@ -2254,7 +2226,7 @@ ACE_Dev_Poll_Reactor::mask_ops (ACE_Event_Handler *event_handler, { ACE_TRACE ("ACE_Dev_Poll_Reactor::mask_ops"); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1)); return this->mask_ops_i (event_handler->get_handle (), mask, ops); } @@ -2266,7 +2238,7 @@ ACE_Dev_Poll_Reactor::mask_ops (ACE_HANDLE handle, { ACE_TRACE ("ACE_Dev_Poll_Reactor::mask_ops"); - ACE_MT (ACE_GUARD_RETURN (ACE_Dev_Poll_Reactor_Token, mon, this->token_, -1)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->repo_lock_, -1)); return this->mask_ops_i (handle, mask, ops); } @@ -2434,17 +2406,17 @@ ACE_Dev_Poll_Reactor::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Dev_Poll_Reactor::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("restart_ = %d\n"), this->restart_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("restart_ = %d\n"), this->restart_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("initialized_ = %d"), this->initialized_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("poll_fd_ = %d"), this->poll_fd_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("size_ = %u"), this->handler_rep_.size ())); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("poll_fd_ = %d"), this->poll_fd_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("size_ = %u"), this->handler_rep_.size ())); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("deactivated_ = %d"), this->deactivated_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -2532,7 +2504,7 @@ ACE_Dev_Poll_Reactor::Token_Guard::acquire_quietly (ACE_Time_Value *max_wait) return 0; else { - ACE_ERROR ((LM_ERROR, ACE_TEXT("%t: %p\n"), ACE_TEXT("token acquire_read"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%t: %p\n"), ACE_TEXT("token acquire_read"))); return -1; } } diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h index 064a278fa7b..39aa955c9d8 100644 --- a/ACE/ace/Dev_Poll_Reactor.h +++ b/ACE/ace/Dev_Poll_Reactor.h @@ -310,7 +310,7 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl * * @note Calls to any method in this class, and any modification to a * Event_Tuple returned from this class's methods, must be made - * while holding the reactor token. + * while holding the repository lock. */ class Handler_Repository { @@ -809,7 +809,7 @@ public: /// table. virtual size_t size (void) const; - /// Returns a reference to the Reactor's internal lock. + /// Returns a reference to the Reactor's internal repository lock. virtual ACE_Lock &lock (void); /// Wake up all threads waiting in the event loop. @@ -967,12 +967,18 @@ protected: ACE_Reactor_Mask mask); /// Remove the event handler associated with the given handle and - /// event mask from the "interest set." If @a eh is supplied, only - /// do the remove if @eh matches the event handler that's registered - /// for @a handle. + /// event mask from the "interest set." If @a eh is supplied, only do the + /// remove if @eh matches the event handler that's registered for @a handle. + /// The caller is expected to be holding the repo token on entry and have + /// @repo_guard referencing that token. It will be temporarily released + /// during a handle_close() callback if needed; if it is released for the + //// callback it will be reacquired before return. + // FUZZ: disable check_for_ACE_Guard int remove_handler_i (ACE_HANDLE handle, ACE_Reactor_Mask mask, + ACE_Guard<ACE_SYNCH_MUTEX> &repo_guard, ACE_Event_Handler *eh = 0); + // FUZZ: enable check_for_ACE_Guard /// Temporarily remove the given handle from the "interest set." int suspend_handler_i (ACE_HANDLE handle); @@ -1015,17 +1021,6 @@ protected: /// epoll_wait() but not yet processed. struct epoll_event event_; - /// Event handlers that are suspended/resumed around upcalls are not - /// immediately resumed; they're added to this list for resumption at - /// the next epoll_wait() call. This avoids always needing to acquire the - /// token just to resume a handler. Of course, if there are no other - /// handlers in the to-be-resumed list and an epoll_wait is already in - /// progress, the reactor needs to be notified to force another run around - /// the epoll_wait() call. - typedef ACE_Array_Map<ACE_HANDLE, ACE_Event_Handler *> Resume_Map; - Resume_Map to_be_resumed_; - volatile bool epoll_wait_in_progress_; - ACE_SYNCH_MUTEX to_be_resumed_lock_; #else /// The pollfd array that `/dev/poll' will feed its results to. struct pollfd *dp_fds_; @@ -1043,16 +1038,21 @@ protected: struct pollfd *end_pfds_; #endif /* ACE_HAS_EVENT_POLL */ - /// This flag is used to keep track of whether we are actively handling - /// events or not. - sig_atomic_t deactivated_; - - /// Lock used for synchronization of reactor state. + /// Token serializing event waiter threads. ACE_Dev_Poll_Reactor_Token token_; /// Adapter used to return internal lock to outside world. ACE_Lock_Adapter<ACE_Dev_Poll_Reactor_Token> lock_adapter_; + /// This flag is used to keep track of whether we are actively handling + /// events or not. + sig_atomic_t deactivated_; + + /// Token used to protect manipulation of the handler repository. + /// No need to hold the waiter token to change the repo. + // ACE_DEV_POLL_TOKEN repo_token_; + ACE_SYNCH_MUTEX repo_lock_; + /// The repository that contains all registered event handlers. Handler_Repository handler_rep_; @@ -1123,8 +1123,7 @@ protected: /// 2) wait quietly for the token, not waking another thread. This /// is appropriate for cases where a thread wants to wait for and /// dispatch an event, not causing an existing waiter to relinquish the - /// token, and also queuing up behind other threads waiting to modify - /// event records. + /// token. int acquire_quietly (ACE_Time_Value *max_wait = 0); /// A helper method that acquires the token at a high priority, and @@ -1147,7 +1146,6 @@ protected: int owner_; }; - }; diff --git a/ACE/ace/Dev_Poll_Reactor.inl b/ACE/ace/Dev_Poll_Reactor.inl index 391de5c290d..1bdb81e73d5 100644 --- a/ACE/ace/Dev_Poll_Reactor.inl +++ b/ACE/ace/Dev_Poll_Reactor.inl @@ -1,7 +1,7 @@ // -*- C++ -*- // $Id$ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Dirent.inl b/ACE/ace/Dirent.inl index 5f6af5a3218..190a21abdd0 100644 --- a/ACE/ace/Dirent.inl +++ b/ACE/ace/Dirent.inl @@ -2,7 +2,7 @@ // // $Id$ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -37,7 +37,7 @@ ACE_Dirent::ACE_Dirent (const ACE_TCHAR *dirname) : dirp_ (0) { if (this->open (dirname) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Dirent::ACE_Dirent"))); } diff --git a/ACE/ace/Dump.cpp b/ACE/ace/Dump.cpp index 6cd2c20e4bb..fb97f6a6e26 100644 --- a/ACE/ace/Dump.cpp +++ b/ACE/ace/Dump.cpp @@ -4,7 +4,7 @@ #include "ace/Guard_T.h" #include "ace/Thread_Mutex.h" #include "ace/Object_Manager.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" diff --git a/ACE/ace/Dynamic_Message_Strategy.cpp b/ACE/ace/Dynamic_Message_Strategy.cpp index 3a9b3ed385c..6bed42567fa 100644 --- a/ACE/ace/Dynamic_Message_Strategy.cpp +++ b/ACE/ace/Dynamic_Message_Strategy.cpp @@ -7,7 +7,7 @@ #endif /* __ACE_INLINE__ */ #include "ace/Guard_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Malloc_Base.h" #include "ace/OS_NS_string.h" @@ -89,9 +89,9 @@ ACE_Dynamic_Message_Strategy::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Dynamic_Message_Strategy::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("static_bit_field_mask_ = %u\n") ACE_TEXT ("static_bit_field_shift_ = %u\n") ACE_TEXT ("dynamic_priority_max_ = %u\n") @@ -110,7 +110,7 @@ ACE_Dynamic_Message_Strategy::dump (void) const this->pending_shift_.sec (), this->pending_shift_.usec ())); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -145,14 +145,14 @@ ACE_Deadline_Message_Strategy::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Deadline_Message_Strategy::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class:\n"))); this->ACE_Dynamic_Message_Strategy::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nderived class: ACE_Deadline_Message_Strategy\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nderived class: ACE_Deadline_Message_Strategy\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -188,14 +188,14 @@ ACE_Laxity_Message_Strategy::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Laxity_Message_Strategy::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class:\n"))); this->ACE_Dynamic_Message_Strategy::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nderived class: ACE_Laxity_Message_Strategy\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nderived class: ACE_Laxity_Message_Strategy\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } // Dump the state of the strategy. diff --git a/ACE/ace/Dynamic_Service_Base.cpp b/ACE/ace/Dynamic_Service_Base.cpp index fa4bda1d03b..4e9644faa81 100644 --- a/ACE/ace/Dynamic_Service_Base.cpp +++ b/ACE/ace/Dynamic_Service_Base.cpp @@ -5,7 +5,7 @@ #include "ace/Service_Config.h" #include "ace/Service_Repository.h" #include "ace/Service_Types.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -17,9 +17,9 @@ ACE_Dynamic_Service_Base::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Dynamic_Service_Base::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -82,7 +82,7 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo, if (repo->repo_ != repo_found->repo_) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) DSB::instance, repo=%@, name=%s") ACE_TEXT (" type=%@ => %@") ACE_TEXT (" [in repo=%@]\n"), @@ -91,7 +91,7 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo, } else { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) DSB::instance, repo=%@, name=%s") ACE_TEXT (" type=%@ => %@\n"), repo->repo_, name, type, obj)); diff --git a/ACE/ace/Dynamic_Service_Dependency.cpp b/ACE/ace/Dynamic_Service_Dependency.cpp index 768460912e9..f3c812fbe66 100644 --- a/ACE/ace/Dynamic_Service_Dependency.cpp +++ b/ACE/ace/Dynamic_Service_Dependency.cpp @@ -4,7 +4,7 @@ #include "ace/DLL_Manager.h" #include "ace/Dynamic_Service_Dependency.h" #include "ace/Service_Config.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -23,7 +23,7 @@ ACE_Dynamic_Service_Dependency::ACE_Dynamic_Service_Dependency (const ACE_Servic ACE_Dynamic_Service_Dependency::~ACE_Dynamic_Service_Dependency (void) { if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) DSD, this=%@ - destroying\n"), this)); } @@ -36,7 +36,7 @@ ACE_Dynamic_Service_Dependency::init (const ACE_Service_Gestalt *cfg, ACE_Dynamic_Service_Base::find_i (cfg, principal,false); if (ACE::debug ()) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) DSD, this=%@ - creating dependency on "), this)); st->dump (); } diff --git a/ACE/ace/Event.cpp b/ACE/ace/Event.cpp index 95ed88c0968..a1f359336f1 100644 --- a/ACE/ace/Event.cpp +++ b/ACE/ace/Event.cpp @@ -6,7 +6,7 @@ #include "ace/Event.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Condition_Attributes.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -29,7 +29,7 @@ ACE_Event_T<TIME_POLICY>::ACE_Event_T (int manual_reset, name, arg, sa) != 0) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Event_T<TIME_POLICY>::ACE_Event_T"))); } diff --git a/ACE/ace/Event_Base.cpp b/ACE/ace/Event_Base.cpp index 277427d46c2..0d30f375e9b 100644 --- a/ACE/ace/Event_Base.cpp +++ b/ACE/ace/Event_Base.cpp @@ -6,7 +6,7 @@ #include "ace/Event_Base.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -68,8 +68,8 @@ void ACE_Event_Base::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/FIFO.cpp b/ACE/ace/FIFO.cpp index a1f79c24c91..2a17a9ea686 100644 --- a/ACE/ace/FIFO.cpp +++ b/ACE/ace/FIFO.cpp @@ -6,7 +6,7 @@ #include "ace/FIFO.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_sys_stat.h" @@ -22,9 +22,9 @@ ACE_FIFO::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_FIFO::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("rendezvous_ = %s"), this->rendezvous_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("rendezvous_ = %s"), this->rendezvous_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -51,7 +51,7 @@ ACE_FIFO::ACE_FIFO (const ACE_TCHAR *fifo_name, { ACE_TRACE ("ACE_FIFO::ACE_FIFO"); if (this->open (fifo_name, flags, perms, sa) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_FIFO"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_FIFO"))); } ACE_FIFO::ACE_FIFO (void) diff --git a/ACE/ace/FIFO_Recv.cpp b/ACE/ace/FIFO_Recv.cpp index fc29407d4ca..aff88375d04 100644 --- a/ACE/ace/FIFO_Recv.cpp +++ b/ACE/ace/FIFO_Recv.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/FIFO_Recv.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_fcntl.h" #if !defined (__ACE_INLINE__) @@ -19,10 +19,10 @@ ACE_FIFO_Recv::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_FIFO_Recv::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_FIFO::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("aux_handle_ = %d"), this->aux_handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("aux_handle_ = %d"), this->aux_handle_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -82,7 +82,7 @@ ACE_FIFO_Recv::ACE_FIFO_Recv (const ACE_TCHAR *fifo_name, perms, persistent, sa) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_FIFO_Recv"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_FIFO_Recv"))); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/FIFO_Recv_Msg.cpp b/ACE/ace/FIFO_Recv_Msg.cpp index 4755e41981c..71cd98aa743 100644 --- a/ACE/ace/FIFO_Recv_Msg.cpp +++ b/ACE/ace/FIFO_Recv_Msg.cpp @@ -2,7 +2,7 @@ #include "ace/FIFO_Recv_Msg.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) #include "ace/FIFO_Recv_Msg.inl" @@ -59,7 +59,7 @@ ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (const ACE_TCHAR *fifo_name, perms, persistent, sa) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_FIFO_Recv_Msg"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_FIFO_Recv_Msg"))); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/FIFO_Send.cpp b/ACE/ace/FIFO_Send.cpp index 3245e2e3d99..854859f660e 100644 --- a/ACE/ace/FIFO_Send.cpp +++ b/ACE/ace/FIFO_Send.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/FIFO_Send.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) #include "ace/FIFO_Send.inl" @@ -50,7 +50,7 @@ ACE_FIFO_Send::ACE_FIFO_Send (const ACE_TCHAR *fifo_name, flags, perms, sa) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_FIFO_Send::ACE_FIFO_Send"))); } diff --git a/ACE/ace/FIFO_Send_Msg.cpp b/ACE/ace/FIFO_Send_Msg.cpp index 63ea992021e..fd40e2fc767 100644 --- a/ACE/ace/FIFO_Send_Msg.cpp +++ b/ACE/ace/FIFO_Send_Msg.cpp @@ -2,7 +2,7 @@ #include "ace/FIFO_Send_Msg.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_sys_uio.h" #if !defined (__ACE_INLINE__) @@ -74,7 +74,7 @@ ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (const ACE_TCHAR *fifo_name, { ACE_TRACE ("ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg"); if (this->ACE_FIFO_Send_Msg::open (fifo_name, flags, perms, sa) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_FIFO_Send_Msg"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_FIFO_Send_Msg"))); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/FILE_Addr.cpp b/ACE/ace/FILE_Addr.cpp index 0d359c1dea7..c501f0ee615 100644 --- a/ACE/ace/FILE_Addr.cpp +++ b/ACE/ace/FILE_Addr.cpp @@ -2,7 +2,7 @@ #include "ace/FILE_Addr.h" #include "ace/Lib_Find.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_string.h" #include "ace/os_include/sys/os_socket.h" @@ -36,7 +36,7 @@ ACE_FILE_Addr::set (const ACE_FILE_Addr &sa) if (ACE::get_temp_dir (this->filename_, MAXPATHLEN - 15) == -1) // -15 for ace-file-XXXXXX { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Temporary path too long, ") ACE_TEXT ("defaulting to current directory\n"))); this->filename_[0] = 0; @@ -116,9 +116,9 @@ ACE_FILE_Addr::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_FILE_Addr::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("filename_ = %s"), this->filename_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("filename_ = %s"), this->filename_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/FILE_Connector.cpp b/ACE/ace/FILE_Connector.cpp index c341a6fa4c4..a3d65777d2c 100644 --- a/ACE/ace/FILE_Connector.cpp +++ b/ACE/ace/FILE_Connector.cpp @@ -20,9 +20,9 @@ ACE_FILE_Connector::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_FILE_Connector::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/FILE_Connector.h b/ACE/ace/FILE_Connector.h index aefa688f23b..d998301963b 100644 --- a/ACE/ace/FILE_Connector.h +++ b/ACE/ace/FILE_Connector.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" #include "ace/FILE_IO.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/os_include/os_fcntl.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/ACE/ace/FILE_Connector.inl b/ACE/ace/FILE_Connector.inl index 75a941ff220..0cf91293ba8 100644 --- a/ACE/ace/FILE_Connector.inl +++ b/ACE/ace/FILE_Connector.inl @@ -19,7 +19,7 @@ ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io, if (this->connect (new_io, remote_sap, timeout, local_sap, reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("address %s, %p\n"), remote_sap.get_path_name (), ACE_TEXT ("ACE_FILE_IO"))); diff --git a/ACE/ace/FILE_IO.cpp b/ACE/ace/FILE_IO.cpp index d8890eecb68..0013fb7fe0f 100644 --- a/ACE/ace/FILE_IO.cpp +++ b/ACE/ace/FILE_IO.cpp @@ -2,7 +2,7 @@ #include "ace/FILE_IO.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_sys_stat.h" #include "ace/OS_Memory.h" #include "ace/Truncate.h" @@ -23,9 +23,9 @@ ACE_FILE_IO::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_FILE_IO::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->addr_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/File_Lock.cpp b/ACE/ace/File_Lock.cpp index 619876f72a4..10347392600 100644 --- a/ACE/ace/File_Lock.cpp +++ b/ACE/ace/File_Lock.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/File_Lock.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) #include "ace/File_Lock.inl" @@ -19,9 +19,9 @@ ACE_File_Lock::dump (void) const #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_File_Lock::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -32,7 +32,7 @@ ACE_File_Lock::ACE_File_Lock (ACE_HANDLE h, { // ACE_TRACE ("ACE_File_Lock::ACE_File_Lock"); if (ACE_OS::flock_init (&this->lock_) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_File_Lock::ACE_File_Lock"))); this->set_handle (h); @@ -47,7 +47,7 @@ ACE_File_Lock::ACE_File_Lock (const ACE_TCHAR *name, // ACE_TRACE ("ACE_File_Lock::ACE_File_Lock"); if (this->open (name, flags, perms) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p %s\n"), ACE_TEXT ("ACE_File_Lock::ACE_File_Lock"), name)); diff --git a/ACE/ace/Filecache.cpp b/ACE/ace/Filecache.cpp index 9b70a7d3203..18d6246f909 100644 --- a/ACE/ace/Filecache.cpp +++ b/ACE/ace/Filecache.cpp @@ -2,7 +2,7 @@ #include "ace/Filecache.h" #include "ace/Object_Manager.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/ACE.h" #include "ace/Guard_T.h" #include "ace/OS_NS_string.h" @@ -247,7 +247,7 @@ ACE_Filecache::insert_i (const ACE_TCHAR *filename, ACE_Filecache_Object (filename, filelock, 0, mapit), 0); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%t) CVF: creating %s\n"), filename)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (%t) CVF: creating %s\n"), filename)); if (this->hash_.bind (filename, handle) == -1) { @@ -370,7 +370,7 @@ ACE_Filecache::fetch (const ACE_TCHAR *filename, int mapit) filelock.release (); } } - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%t) CVF: found %s\n"), filename)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (%t) CVF: found %s\n"), filename)); } return handle; @@ -692,7 +692,7 @@ int ACE_Filecache_Object::error_i (int error_value, const ACE_TCHAR *s) { s = s; - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p.\n"), s)); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p.\n"), s)); this->error_ = error_value; return error_value; } diff --git a/ACE/ace/Framework_Component.cpp b/ACE/ace/Framework_Component.cpp index be7af61ecca..7261063af61 100644 --- a/ACE/ace/Framework_Component.cpp +++ b/ACE/ace/Framework_Component.cpp @@ -7,7 +7,7 @@ #endif /* __ACE_INLINE__ */ #include "ace/Object_Manager.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/DLL_Manager.h" #include "ace/Recursive_Thread_Mutex.h" #include "ace/OS_NS_string.h" @@ -133,7 +133,7 @@ ACE_Framework_Repository::register_component (ACE_Framework_Component *fc) if (this->component_vector_[i] && fc->this_ == this->component_vector_[i]->this_) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "AFR::register_component: error, compenent already registered\n"), -1); } @@ -193,7 +193,7 @@ ACE_Framework_Repository::remove_dll_components_i (const ACE_TCHAR *dll_name) ACE_OS::strcmp (this->component_vector_[i]->dll_name_, dll_name) == 0) { if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("AFR::remove_dll_components_i (%s) ") ACE_TEXT ("component \"%s\"\n"), dll_name, this->component_vector_[i]->name_)); @@ -268,7 +268,7 @@ ACE_Framework_Repository::ACE_Framework_Repository (int size) ACE_TRACE ("ACE_Framework_Repository::ACE_Framework_Repository"); if (this->open (size) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Framework_Repository"))); } diff --git a/ACE/ace/Future.cpp b/ACE/ace/Future.cpp index 8515e221046..7f9a9ce8444 100644 --- a/ACE/ace/Future.cpp +++ b/ACE/ace/Future.cpp @@ -48,23 +48,23 @@ template <class T> void ACE_Future_Rep<T>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, "ref_count_ = %d\n", (int) this->ref_count_)); - ACE_DEBUG ((LM_INFO,"value_:\n")); + ACELIB_DEBUG ((LM_INFO,"value_:\n")); if (this->value_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (NON-NULL)\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (NON-NULL)\n"))); else //FUZZ: disable check_for_NULL - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (NULL)\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (NULL)\n"))); //FUZZ: enable check_for_NULL - ACE_DEBUG ((LM_INFO,"value_ready_:\n")); + ACELIB_DEBUG ((LM_INFO,"value_ready_:\n")); this->value_ready_.dump (); - ACE_DEBUG ((LM_INFO,"value_ready_mutex_:\n")); + ACELIB_DEBUG ((LM_INFO,"value_ready_mutex_:\n")); this->value_ready_mutex_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -408,13 +408,13 @@ template <class T> void ACE_Future<T>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); if (this->future_rep_) this->future_rep_->dump (); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Get_Opt.cpp b/ACE/ace/Get_Opt.cpp index b70e3d18248..e83f44786fc 100644 --- a/ACE/ace/Get_Opt.cpp +++ b/ACE/ace/Get_Opt.cpp @@ -7,7 +7,7 @@ #endif /* __ACE_INLINE__ */ #include "ace/ACE.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/SString.h" #include "ace/OS_Memory.h" #include "ace/OS_NS_string.h" @@ -280,7 +280,7 @@ ACE_Get_Opt::long_option_i (void) // Great, we found a match, but unfortunately we found more than // one and it wasn't exact. if (this->opterr) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%s: option `%s' is ambiguous\n"), this->argv_[0], this->argv_[this->optind])); this->nextchar_ = 0; @@ -305,7 +305,7 @@ ACE_Get_Opt::long_option_i (void) // Whoops, we've got what looks like an argument, but we // don't want one. if (this->opterr) - ACE_ERROR + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%s: long option `--%s' doesn't allow ") ACE_TEXT ("an argument\n"), @@ -326,7 +326,7 @@ ACE_Get_Opt::long_option_i (void) { // All out of elements, so we have to punt... if (this->opterr) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%s: long option '--%s' requires ") ACE_TEXT ("an argument\n"), this->argv_[0], pfound->name_)); @@ -350,7 +350,7 @@ ACE_Get_Opt::long_option_i (void) // signature was passed, e.g. "--", or it's not a short (not sure when // this could happen) it's an error. if (this->opterr) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%s: illegal long option '--%s'\n"), this->argv_[0], this->nextchar_)); this->nextchar_ = 0; @@ -381,7 +381,7 @@ ACE_Get_Opt::short_option_i (void) if (oli == 0 || opt == ':') { if (this->opterr) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%s: illegal short option -- %c\n"), this->argv_[0], opt)); return '?'; @@ -422,7 +422,7 @@ ACE_Get_Opt::short_option_i (void) { // Ran out of arguments before finding required argument. if (this->opterr) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%s: short option requires ") ACE_TEXT ("an argument -- %c\n"), this->argv_[0], opt)); @@ -506,7 +506,7 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name, if (has_arg != ARG_OPTIONAL) { if (this->opterr) - ACE_ERROR + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Existing short option '%c' takes ") ACE_TEXT ("optional argument; adding %s ") @@ -519,7 +519,7 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name, if (has_arg != ARG_REQUIRED) { if (this->opterr) - ACE_ERROR + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Existing short option '%c' requires ") ACE_TEXT ("an argument; adding %s ") @@ -531,7 +531,7 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name, else if (has_arg != NO_ARG) { if (this->opterr) - ACE_ERROR + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Existing short option '%c' does not ") ACE_TEXT ("accept an argument; adding %s ") @@ -563,7 +563,7 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name, || this->long_opts_.set (option, size) != 0) { delete option; - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Could not add long option to array.\n")), -1); } @@ -597,8 +597,8 @@ ACE_Get_Opt::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Get_Opt::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n") + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n") ACE_TEXT ("opstring_ = %s\n") ACE_TEXT ("long_only_ = %d\n") ACE_TEXT ("has_colon_ = %d\n") @@ -618,7 +618,7 @@ ACE_Get_Opt::dump (void) const size_t size = this->long_opts_.size (); for (u_int i = 0; i < size ; ++i) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n") + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n") ACE_TEXT ("long_option name_ = %s\n") ACE_TEXT ("has_arg_ = %d\n") ACE_TEXT ("val_ = %d\n"), @@ -626,7 +626,7 @@ ACE_Get_Opt::dump (void) const this->long_opts_[i]->has_arg_, this->long_opts_[i]->val_)); } - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index cf24327650b..447e997d5f8 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -948,32 +948,35 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC #endif /* ACE_WIN32 */ // Handle ACE_Message_Queue. -# define ACE_SYNCH_DECL class _ACE_SYNCH +# define ACE_SYNCH_DECL typename _ACE_SYNCH # define ACE_SYNCH_USE _ACE_SYNCH # define ACE_SYNCH_MUTEX_T typename _ACE_SYNCH::MUTEX # define ACE_SYNCH_CONDITION_T typename _ACE_SYNCH::CONDITION # define ACE_SYNCH_SEMAPHORE_T typename _ACE_SYNCH::SEMAPHORE // Handle ACE_Malloc* -# define ACE_MEM_POOL_1 class _ACE_MEM_POOL +# define ACE_MEM_POOL_1 typename _ACE_MEM_POOL # define ACE_MEM_POOL_2 _ACE_MEM_POOL # define ACE_MEM_POOL _ACE_MEM_POOL # define ACE_MEM_POOL_OPTIONS typename _ACE_MEM_POOL::OPTIONS +// @deprecated These macros are not longer used in ACE_Svc_Handler. // Handle ACE_Svc_Handler -# define ACE_PEER_STREAM_1 class _ACE_PEER_STREAM +# define ACE_PEER_STREAM_1 typename _ACE_PEER_STREAM # define ACE_PEER_STREAM_2 _ACE_PEER_STREAM # define ACE_PEER_STREAM _ACE_PEER_STREAM # define ACE_PEER_STREAM_ADDR typename _ACE_PEER_STREAM::PEER_ADDR +// @deprecated These macros are not longer used in ACE_Acceptor. // Handle ACE_Acceptor -# define ACE_PEER_ACCEPTOR_1 class _ACE_PEER_ACCEPTOR +# define ACE_PEER_ACCEPTOR_1 typename _ACE_PEER_ACCEPTOR # define ACE_PEER_ACCEPTOR_2 _ACE_PEER_ACCEPTOR # define ACE_PEER_ACCEPTOR _ACE_PEER_ACCEPTOR # define ACE_PEER_ACCEPTOR_ADDR typename _ACE_PEER_ACCEPTOR::PEER_ADDR +// @deprecated These macros are not longer used in ACE_Connector. // Handle ACE_Connector -# define ACE_PEER_CONNECTOR_1 class _ACE_PEER_CONNECTOR +# define ACE_PEER_CONNECTOR_1 typename _ACE_PEER_CONNECTOR # define ACE_PEER_CONNECTOR_2 _ACE_PEER_CONNECTOR # define ACE_PEER_CONNECTOR _ACE_PEER_CONNECTOR # define ACE_PEER_CONNECTOR_ADDR typename ACE_PEER_CONNECTOR::PEER_ADDR diff --git a/ACE/ace/Guard_T.cpp b/ACE/ace/Guard_T.cpp index cabdf3c0d37..2951649bcef 100644 --- a/ACE/ace/Guard_T.cpp +++ b/ACE/ace/Guard_T.cpp @@ -15,7 +15,7 @@ #endif /* __ACE_INLINE__ */ #if defined (ACE_HAS_DUMP) -# include "ace/Log_Msg.h" +# include "ace/Log_Category.h" #endif /* ACE_HAS_DUMP */ // **************************************************************** @@ -30,10 +30,10 @@ ACE_Guard<ACE_LOCK>::dump (void) const #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Guard<ACE_LOCK>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_ = %x\n"), this->lock_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_ = %d\n"), this->owner_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_ = %x\n"), this->lock_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_ = %d\n"), this->owner_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Handle_Set.cpp b/ACE/ace/Handle_Set.cpp index cc2d9b10af7..0be33d35c59 100644 --- a/ACE/ace/Handle_Set.cpp +++ b/ACE/ace/Handle_Set.cpp @@ -35,23 +35,23 @@ ACE_Handle_Set::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Handle_Set::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d"), this->size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmax_handle_ = %d"), this->max_handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n[ "))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d"), this->size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmax_handle_ = %d"), this->max_handle_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n[ "))); #if defined (ACE_WIN32) for (size_t i = 0; i < (size_t) this->mask_.fd_count + 1; i++) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" %x "), this->mask_.fd_array[i])); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" %x "), this->mask_.fd_array[i])); #else /* !ACE_WIN32 */ for (ACE_HANDLE i = 0; i < this->max_handle_ + 1; i++) if (this->is_set (i)) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" %d "), i)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" %d "), i)); #endif /* ACE_WIN32 */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" ]\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" ]\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -247,15 +247,15 @@ ACE_Handle_Set_Iterator::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Handle_Set_Iterator::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); #if defined(ACE_WIN32) || !defined(ACE_HAS_BIG_FD_SET) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandle_index_ = %d"), this->handle_index_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandle_index_ = %d"), this->handle_index_)); #elif defined(ACE_HAS_BIG_FD_SET) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nword_max_ = %d"), this->word_max_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nword_val_ = %d"), this->word_val_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nword_max_ = %d"), this->word_max_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nword_val_ = %d"), this->word_val_)); #endif - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nword_num_ = %d"), this->word_num_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nword_num_ = %d"), this->word_num_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Handle_Set.inl b/ACE/ace/Handle_Set.inl index 7d453669bff..2d5f6dc222d 100644 --- a/ACE/ace/Handle_Set.inl +++ b/ACE/ace/Handle_Set.inl @@ -2,7 +2,7 @@ // // $Id$ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" // AIX defines bzero() in this odd file... used by FD_ZERO #if defined (ACE_HAS_STRINGS) diff --git a/ACE/ace/Hash_Map_Manager_T.cpp b/ACE/ace/Hash_Map_Manager_T.cpp index c503e603ccd..7b84272ec32 100644 --- a/ACE/ace/Hash_Map_Manager_T.cpp +++ b/ACE/ace/Hash_Map_Manager_T.cpp @@ -80,10 +80,10 @@ template <class EXT_ID, class INT_ID> void ACE_Hash_Map_Entry<EXT_ID, INT_ID>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %d"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("prev_ = %d"), this->prev_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %d"), this->next_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("prev_ = %d"), this->prev_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -91,13 +91,13 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("total_size_ = %d\n"), this->total_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("cur_size_ = %d\n"), this->cur_size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("total_size_ = %d\n"), this->total_size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("cur_size_ = %d\n"), this->cur_size_)); this->table_allocator_->dump (); this->entry_allocator_->dump (); this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -277,7 +277,7 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::unbind_i (const EXT_ID &ext_id, INT_ID &int_id) { - ACE_Hash_Map_Entry<EXT_ID, INT_ID> *temp; + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *temp = 0; size_t loc = 0; if (this->shared_find (ext_id, temp, loc) == -1) @@ -398,10 +398,10 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>: { ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("index_ = %d "), this->index_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %x"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("index_ = %d "), this->index_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %x"), this->next_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int @@ -472,10 +472,10 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_ { ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("index_ = %d "), this->index_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %x"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("index_ = %d "), this->index_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %x"), this->next_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int diff --git a/ACE/ace/Hash_Map_Manager_T.h b/ACE/ace/Hash_Map_Manager_T.h index 5e33720753c..8b71c49335f 100644 --- a/ACE/ace/Hash_Map_Manager_T.h +++ b/ACE/ace/Hash_Map_Manager_T.h @@ -22,7 +22,7 @@ #include "ace/Default_Constants.h" #include "ace/Functor_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include <iterator> ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Hash_Map_Manager_T.inl b/ACE/ace/Hash_Map_Manager_T.inl index 491a598730e..a4ff4d0a5a9 100644 --- a/ACE/ace/Hash_Map_Manager_T.inl +++ b/ACE/ace/Hash_Map_Manager_T.inl @@ -17,7 +17,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_H cur_size_ (0) { if (this->open (size, table_alloc, entry_alloc) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Map_Manager_Ex\n"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Map_Manager_Ex\n"))); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE @@ -30,7 +30,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_H cur_size_ (0) { if (this->open (ACE_DEFAULT_MAP_SIZE, table_alloc, entry_alloc) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Hash_Map_Manager_Ex open"))); } @@ -120,7 +120,7 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::trybind_i (const EXT_ID &ext_id, INT_ID &int_id) { - ACE_Hash_Map_Entry<EXT_ID, INT_ID> *temp; + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *temp = 0; int result = this->trybind_i (ext_id, int_id, temp); if (result == 1) @@ -204,7 +204,7 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::find_i (const EXT_ID &ext_id, INT_ID &int_id) { - ACE_Hash_Map_Entry<EXT_ID, INT_ID> *entry; + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *entry = 0; size_t dummy; if (this->shared_find (ext_id, entry, dummy) == -1) @@ -275,7 +275,7 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rebind_i (const EXT_ID &ext_id, const INT_ID &int_id) { - ACE_Hash_Map_Entry<EXT_ID, INT_ID> *node; + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *node = 0; return this->rebind_i (ext_id, int_id, @@ -287,7 +287,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rebin const INT_ID &int_id, INT_ID &old_int_id) { - ACE_Hash_Map_Entry<EXT_ID, INT_ID> *node; + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *node = 0; return this->rebind_i (ext_id, int_id, @@ -301,7 +301,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rebin EXT_ID &old_ext_id, INT_ID &old_int_id) { - ACE_Hash_Map_Entry<EXT_ID, INT_ID> *node; + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *node = 0; return this->rebind_i (ext_id, int_id, diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.cpp b/ACE/ace/Hash_Multi_Map_Manager_T.cpp index 19f9dc8929e..b6526c9a09d 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.cpp +++ b/ACE/ace/Hash_Multi_Map_Manager_T.cpp @@ -67,10 +67,10 @@ template <class EXT_ID, class INT_ID> void ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %d"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("prev_ = %d"), this->prev_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %d"), this->next_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("prev_ = %d"), this->prev_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -78,13 +78,13 @@ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("total_size_ = %d"), this->total_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("total_size_ = %d"), this->total_size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_)); this->table_allocator_->dump (); this->entry_allocator_->dump (); this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -457,10 +457,10 @@ ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOC { ACE_TRACE ("ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("index_ = %d "), this->index_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %x"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("index_ = %d "), this->index_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %x"), this->next_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int @@ -531,10 +531,10 @@ ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, A { ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("index_ = %d "), this->index_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %x"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("index_ = %d "), this->index_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %x"), this->next_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.h b/ACE/ace/Hash_Multi_Map_Manager_T.h index 4ed756af841..1da26db8109 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.h +++ b/ACE/ace/Hash_Multi_Map_Manager_T.h @@ -34,7 +34,7 @@ #include "ace/Default_Constants.h" #include "ace/Functor_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Unbounded_Set.h" diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.inl b/ACE/ace/Hash_Multi_Map_Manager_T.inl index 245870834c9..355d75f121a 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.inl +++ b/ACE/ace/Hash_Multi_Map_Manager_T.inl @@ -17,7 +17,7 @@ ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::AC cur_size_ (0) { if (this->open (size, table_alloc, entry_alloc) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Multi_Map_Manager\n"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Multi_Map_Manager\n"))); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE @@ -30,7 +30,7 @@ ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::AC cur_size_ (0) { if (this->open (ACE_DEFAULT_MAP_SIZE, table_alloc, entry_alloc) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Multi_Map_Manager\n"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Multi_Map_Manager\n"))); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int diff --git a/ACE/ace/High_Res_Timer.cpp b/ACE/ace/High_Res_Timer.cpp index f32cfd5c5d5..6295767b4a9 100644 --- a/ACE/ace/High_Res_Timer.cpp +++ b/ACE/ace/High_Res_Timer.cpp @@ -95,7 +95,7 @@ ACE_High_Res_Timer::get_cpuinfo (void) { char buf[128]; - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nReading /proc/cpuinfo..."))); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nReading /proc/cpuinfo..."))); while (ACE_OS::fgets (buf, sizeof buf, cpuinfo)) { @@ -162,12 +162,12 @@ ACE_High_Res_Timer::get_cpuinfo (void) if (supported) { scale_factor = (ACE_UINT32) (bmips + 0.5); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" setting the clock scale factor to %u"), scale_factor)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" setting the clock scale factor to %u"), scale_factor)); } #if 0 else { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nThe BogoMIPS metric is not supported on this platform" "\n\tReport the results of the clock calibration and" "\n\tthe contents of /proc/cpuinfo to the ace-users mailing list"))); @@ -178,7 +178,7 @@ ACE_High_Res_Timer::get_cpuinfo (void) #endif /* __alpha__ */ } - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (done)\n"))); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (done)\n"))); ACE_OS::fclose (cpuinfo); } @@ -302,10 +302,10 @@ ACE_High_Res_Timer::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_High_Res_Timer::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nglobal_scale_factor_: %u\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nglobal_scale_factor_: %u\n"), global_scale_factor ())); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (":\nstart_.hi (): %8x; start_.lo (): %8x;\n") ACE_TEXT ("end_.hi (): %8x; end_.lo (): %8x;\n") ACE_TEXT ("total_.hi (): %8x; total_.lo (): %8x;\n") @@ -318,7 +318,7 @@ ACE_High_Res_Timer::dump (void) const static_cast<ACE_UINT32> (total_ & 0xfffffffful), static_cast<ACE_UINT32> (start_incr_ >> 32), static_cast<ACE_UINT32> (start_incr_ & 0xfffffffful))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/ICMP_Socket.cpp b/ACE/ace/ICMP_Socket.cpp index eff3d456c8e..1187f4f0a81 100644 --- a/ACE/ace/ICMP_Socket.cpp +++ b/ACE/ace/ICMP_Socket.cpp @@ -5,7 +5,7 @@ #if defined (ACE_HAS_ICMP_SUPPORT) && (ACE_HAS_ICMP_SUPPORT == 1) #include "ace/ACE.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_netdb.h" #include "ace/OS_NS_sys_socket.h" @@ -89,7 +89,7 @@ ACE_ICMP_Socket::open (ACE_Addr const & local, if (! (proto = ACE_OS::getprotobyname ("icmp"))) { - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ACE_ICMP_Socket::open: %p; %s\n"), ACE_TEXT ("getprotobyname"), @@ -101,7 +101,7 @@ ACE_ICMP_Socket::open (ACE_Addr const & local, if (proto_number != IPPROTO_ICMP || proto_number != protocol) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ACE::ICMP_Socket::open - ") ACE_TEXT ("only IPPROTO_ICMP protocol is ") ACE_TEXT ("currently supported.\n")), diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp index 55ee6917181..d5ca0cec2e4 100644 --- a/ACE/ace/INET_Addr.cpp +++ b/ACE/ace/INET_Addr.cpp @@ -8,7 +8,7 @@ #include "ace/INET_Addr.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_stdlib.h" @@ -80,12 +80,12 @@ ACE_INET_Addr::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_INET_Addr::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_TCHAR s[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16]; this->addr_to_string(s, ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s"), s)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%s"), s)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -541,7 +541,7 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number, host_name, 1, address_family) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr: %p\n"), ACE_TEXT_CHAR_TO_TCHAR ((host_name == 0) ? "<unknown>" : host_name))); @@ -559,7 +559,7 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number, host_name, 1, address_family) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr: %p\n"), ACE_TEXT_WCHAR_TO_TCHAR ((host_name == 0) ? ACE_TEXT_WIDE ("<unknown>") : @@ -666,7 +666,7 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number, ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr"); this->reset (); if (this->set (port_number, inet_address) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); } @@ -684,7 +684,7 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[], if (this->set (port_name, host_name, protocol) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); } @@ -699,7 +699,7 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[], if (this->set (port_name, host_name, protocol) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); } #endif /* ACE_HAS_WCHAR */ @@ -716,7 +716,7 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[], if (this->set (port_name, ACE_HTONL (inet_address), protocol) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); } @@ -731,7 +731,7 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[], if (this->set (port_name, ACE_HTONL (inet_address), protocol) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); } #endif /* ACE_HAS_WCHAR */ @@ -1127,7 +1127,7 @@ ACE_INET_Addr::get_ip_address (void) const return ACE_NTOHL (addr); } - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_INET_Addr::get_ip_address: address is a IPv6 address not IPv4\n"))); errno = EAFNOSUPPORT; return 0; diff --git a/ACE/ace/IO_SAP.cpp b/ACE/ace/IO_SAP.cpp index ac6a9cc7466..e9257ec5482 100644 --- a/ACE/ace/IO_SAP.cpp +++ b/ACE/ace/IO_SAP.cpp @@ -2,7 +2,7 @@ #include "ace/IO_SAP.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_fcntl.h" @@ -31,10 +31,10 @@ ACE_IO_SAP::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_IO_SAP::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %d"), this->handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %d"), this->pid_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %d"), this->handle_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %d"), this->pid_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/IPC_SAP.cpp b/ACE/ace/IPC_SAP.cpp index dbcdaf41977..8c40a3df5c0 100644 --- a/ACE/ace/IPC_SAP.cpp +++ b/ACE/ace/IPC_SAP.cpp @@ -2,7 +2,7 @@ #include "ace/IPC_SAP.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_unistd.h" #include "ace/os_include/os_signal.h" #include "ace/OS_NS_errno.h" @@ -24,10 +24,10 @@ ACE_IPC_SAP::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_IPC_SAP::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %d"), this->handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %d"), this->pid_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %d"), this->handle_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %d"), this->pid_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Intrusive_Auto_Ptr.inl b/ACE/ace/Intrusive_Auto_Ptr.inl index 64f45e0c3ac..d366cb75926 100644 --- a/ACE/ace/Intrusive_Auto_Ptr.inl +++ b/ACE/ace/Intrusive_Auto_Ptr.inl @@ -3,7 +3,7 @@ // $Id$ #include "ace/Guard_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/LSOCK.cpp b/ACE/ace/LSOCK.cpp index 1a57b61ab9b..6d2de4dfa2d 100644 --- a/ACE/ace/LSOCK.cpp +++ b/ACE/ace/LSOCK.cpp @@ -6,7 +6,7 @@ #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_sys_socket.h" #if !defined (__ACE_INLINE__) @@ -23,9 +23,9 @@ ACE_LSOCK::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_LSOCK::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("aux_handle_ = %d"), this->aux_handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("aux_handle_ = %d"), this->aux_handle_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/LSOCK_Acceptor.cpp b/ACE/ace/LSOCK_Acceptor.cpp index 9239f631327..01f7a9ba6a5 100644 --- a/ACE/ace/LSOCK_Acceptor.cpp +++ b/ACE/ace/LSOCK_Acceptor.cpp @@ -4,7 +4,7 @@ #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_socket.h" @@ -34,9 +34,9 @@ ACE_LSOCK_Acceptor::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_LSOCK_Acceptor::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->local_addr_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -74,7 +74,7 @@ ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor (const ACE_Addr &remote_sap, protocol_family, backlog, protocol) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, "ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor")); } diff --git a/ACE/ace/LSOCK_CODgram.cpp b/ACE/ace/LSOCK_CODgram.cpp index d5aa1938736..15df0597df5 100644 --- a/ACE/ace/LSOCK_CODgram.cpp +++ b/ACE/ace/LSOCK_CODgram.cpp @@ -3,7 +3,7 @@ #include "ace/LSOCK_CODgram.h" #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" @@ -21,10 +21,10 @@ ACE_LSOCK_CODgram::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_LSOCK_CODgram::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_SOCK_CODgram::dump (); ACE_LSOCK::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -54,7 +54,7 @@ ACE_LSOCK_CODgram::ACE_LSOCK_CODgram (const ACE_Addr &remote, ACE_TRACE ("ACE_LSOCK_CODgram::ACE_LSOCK_CODgram"); if (this->open (remote, local, protocol_family, protocol) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_LSOCK_CODgram"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_LSOCK_CODgram"))); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/LSOCK_Connector.cpp b/ACE/ace/LSOCK_Connector.cpp index 2f0fc2ef0dc..69f0176af2b 100644 --- a/ACE/ace/LSOCK_Connector.cpp +++ b/ACE/ace/LSOCK_Connector.cpp @@ -3,7 +3,7 @@ #include "ace/LSOCK_Connector.h" #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" @@ -21,9 +21,9 @@ ACE_LSOCK_Connector::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_LSOCK_Connector::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/LSOCK_Dgram.cpp b/ACE/ace/LSOCK_Dgram.cpp index a6c41e8b11b..d5894b416bc 100644 --- a/ACE/ace/LSOCK_Dgram.cpp +++ b/ACE/ace/LSOCK_Dgram.cpp @@ -3,7 +3,7 @@ #include "ace/LSOCK_Dgram.h" #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" @@ -21,10 +21,10 @@ ACE_LSOCK_Dgram::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_LSOCK_Dgram::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_SOCK_Dgram::dump (); ACE_LSOCK::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -61,7 +61,7 @@ ACE_LSOCK_Dgram::ACE_LSOCK_Dgram (const ACE_Addr &local, if (this->open (local, protocol_family, protocol) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_LSOCK_Dgram"))); } diff --git a/ACE/ace/LSOCK_Stream.cpp b/ACE/ace/LSOCK_Stream.cpp index 2418cd398a3..bf676fef0b5 100644 --- a/ACE/ace/LSOCK_Stream.cpp +++ b/ACE/ace/LSOCK_Stream.cpp @@ -3,7 +3,7 @@ #include "ace/LSOCK_Stream.h" #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_sys_socket.h" @@ -50,10 +50,10 @@ ACE_LSOCK_Stream::dump (void) const { ACE_TRACE ("ACE_LSOCK_Stream::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_SOCK_Stream::dump (); ACE_LSOCK::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } #if defined (ACE_HAS_MSG) diff --git a/ACE/ace/Lib_Find.cpp b/ACE/ace/Lib_Find.cpp index d7229030d4d..85004497660 100644 --- a/ACE/ace/Lib_Find.cpp +++ b/ACE/ace/Lib_Find.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Lib_Find.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_stdio.h" @@ -75,13 +75,13 @@ ACE_LD_Symbol_Registry::register_symbol (const ACE_TCHAR* symname, int const result = symbol_registry_.bind (symname, symaddr); if (result == 1) { - ACE_DEBUG((LM_INFO, ACE_TEXT ("ACE_LD_Symbol_Registry:") + ACELIB_DEBUG((LM_INFO, ACE_TEXT ("ACE_LD_Symbol_Registry:") ACE_TEXT (" duplicate symbol %s registered\n"), ACE_TEXT_ALWAYS_CHAR (symname))); } else if (result == -1) { - ACE_ERROR((LM_ERROR, ACE_TEXT ("ACE_LD_Symbol_Registry:") + ACELIB_ERROR((LM_ERROR, ACE_TEXT ("ACE_LD_Symbol_Registry:") ACE_TEXT (" failed to register symbol %s\n"), ACE_TEXT_ALWAYS_CHAR (symname))); } @@ -268,7 +268,7 @@ ACE::ldfind (const ACE_TCHAR* filename, if (ACE_OS::strcmp (s, dll_suffix) != 0) #endif /* ACE_WIN32 */ { - ACE_ERROR ((LM_WARNING, + ACELIB_ERROR ((LM_WARNING, ACE_TEXT ("Warning: improper suffix for a ") ACE_TEXT ("shared library on this platform: %s\n"), s)); diff --git a/ACE/ace/Local_Memory_Pool.cpp b/ACE/ace/Local_Memory_Pool.cpp index 65bd7bc14a9..745ee1bb0ab 100644 --- a/ACE/ace/Local_Memory_Pool.cpp +++ b/ACE/ace/Local_Memory_Pool.cpp @@ -4,7 +4,7 @@ #include "ace/Local_Memory_Pool.h" #include "ace/Auto_Ptr.h" #include "ace/OS_Memory.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" @@ -62,7 +62,7 @@ ACE_Local_Memory_Pool::acquire (size_t nbytes, ACE_Auto_Basic_Array_Ptr<char> cp (temp); if (this->allocated_chunks_.insert (cp.get ()) != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) insertion into set failed\n")), 0); diff --git a/ACE/ace/Local_Name_Space_T.cpp b/ACE/ace/Local_Name_Space_T.cpp index cfe9c762e12..1e3ac36f5c9 100644 --- a/ACE/ace/Local_Name_Space_T.cpp +++ b/ACE/ace/Local_Name_Space_T.cpp @@ -372,7 +372,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Local_Name_Space ( { ACE_TRACE ("ACE_Local_Name_Space::ACE_Local_Name_Space"); if (this->open (scope_in) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Local_Name_Space::ACE_Local_Name_Space"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Local_Name_Space::ACE_Local_Name_Space"))); } template <ACE_MEM_POOL_1, class ACE_LOCK> @@ -469,7 +469,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) &options), -1); if (ACE_LOG_MSG->op_status ()) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Allocator::Allocator\n")), -1); @@ -480,7 +480,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) #if !defined (ACE_LACKS_ACCESS) // Now check if the backing store has been created successfully if (ACE_OS::access (this->context_file_, F_OK) != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("create_manager\n")), -1); #endif /* ACE_LACKS_ACCESS */ @@ -493,7 +493,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) { this->name_space_map_ = (ACE_Name_Space_Map <ALLOCATOR> *) ns_map; if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("name_space_map_ = %@, ns_map = %@\n"), this->name_space_map_, ns_map)); } @@ -510,7 +510,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) { this->name_space_map_ = (ACE_Name_Space_Map <ALLOCATOR> *) ns_map; if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("name_space_map_ = %@, ns_map = %@\n"), this->name_space_map_, ns_map)); } @@ -524,12 +524,12 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) new (ns_map) ACE_Name_Space_Map <ALLOCATOR> (this->allocator_); if (this->allocator_->bind (ACE_NAME_SERVER_MAP, ns_map) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("create_manager\n")), -1); } if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("name_space_map_ = %@, ns_map = %@\n"), this->name_space_map_, ns_map)); } @@ -798,7 +798,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump_i (void) const { ACE_TRACE ("ACE_Local_Name_Space::dump_i"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); MAP_MANAGER::ITERATOR map_iterator (*this->name_space_map_); MAP_MANAGER::ENTRY *map_entry; @@ -813,7 +813,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump_i (void) const const char *type = map_entry->int_id_.type (); #endif /* ! ACE_NLOGGING */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key=%C\nvalue=%C\ntype=%C\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("key=%C\nvalue=%C\ntype=%C\n"), key, value, type)); // We need to delete key and value since char_rep allocates // memory for them @@ -821,7 +821,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump_i (void) const delete [] value; } - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } template <ACE_MEM_POOL_1, class ACE_LOCK> int diff --git a/ACE/ace/Local_Tokens.cpp b/ACE/ace/Local_Tokens.cpp index 8f9611a18c8..ff5a4057cca 100644 --- a/ACE/ace/Local_Tokens.cpp +++ b/ACE/ace/Local_Tokens.cpp @@ -20,14 +20,14 @@ ACE_Tokens::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Tokens::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Tokens::dump:\n") + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Tokens::dump:\n") ACE_TEXT (" reference_cont_ = %d\n") ACE_TEXT (" token_name_ = %s\n"), reference_count_, token_name_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("waiters_\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("waiters_\n"))); this->waiters_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -78,8 +78,8 @@ ACE_TPQ_Entry::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_TPQ_Entry::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TPQ_Entry::dump:\n") ACE_TEXT (" nesting_level_ = %d\n") ACE_TEXT (" client_id_ = %s\n"), @@ -88,12 +88,12 @@ ACE_TPQ_Entry::dump (void) const if (next_ != 0) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next:.\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("next:.\n"))); next_->dump (); } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TPQ_Entry::dump end.\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TPQ_Entry::dump end.\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -186,13 +186,13 @@ ACE_TSS_TPQ_Entry::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_TSS_TPQ_Entry::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TSS_TPQ_Entry::dump:\n") + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TSS_TPQ_Entry::dump:\n") ACE_TEXT (" client_id_ = %s\n"), client_id_ == 0 ? ACE_TEXT ("0") : client_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_TPQ_ENTRY::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -270,12 +270,12 @@ ACE_TPQ_Iterator::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_TPQ_Iterator::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TPQ_Iterator::dump:\n") + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TPQ_Iterator::dump:\n") ACE_TEXT (" current_ = %d\n"), (long) this->current_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("head_ and tail_\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("head_ and tail_\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -284,16 +284,16 @@ ACE_Token_Proxy_Queue::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Proxy_Queue::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy_Queue::dump:\n") + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy_Queue::dump:\n") ACE_TEXT (" size_ = %d\n"), size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("head_ and tail_\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("head_ and tail_\n"))); if (this->head_ != 0) this->head_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy_Queue::dump end.\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy_Queue::dump end.\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -374,7 +374,7 @@ ACE_Token_Proxy_Queue::dequeue (void) --this->size_; if (this->head_ == 0 && this->size_ != 0) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("incorrect size = %d\n"), this->size_)); } @@ -448,14 +448,14 @@ ACE_Mutex_Token::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Mutex_Token::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Mutex_Token::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("lock_\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Mutex_Token::dump:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("lock_\n"))); lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_Tokens::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Mutex_Token::dump end.\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Mutex_Token::dump end.\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -703,15 +703,15 @@ ACE_RW_Token::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_RW_Token::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_RW_Token::dump:\n") + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_RW_Token::dump:\n") ACE_TEXT ("num_writers_ = %d\n"), num_writers_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("lock_\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("lock_\n"))); this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_Tokens::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_RW_Token::dump end.\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_RW_Token::dump end.\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -1085,20 +1085,20 @@ ACE_Token_Proxy::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Proxy::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy::dump:\n") + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy::dump:\n") ACE_TEXT (" type = %d\n") ACE_TEXT (" ignore_deadlock_ = %d\n") ACE_TEXT (" debug_ = %d\n"), (int) this->type (), ignore_deadlock_, debug_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_, and waiter_\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_, and waiter_\n"))); if (this->token_ != 0) this->token_->dump (); this->waiter_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy::dump end.\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy::dump end.\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -1203,7 +1203,7 @@ ACE_Token_Proxy::open (const ACE_TCHAR *token_name, if (this->token_ == 0) { errno = ENOMEM; - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Can't allocate mutex")), -1); + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Can't allocate mutex")), -1); } return 0; @@ -1218,7 +1218,7 @@ ACE_Token_Proxy::acquire (int notify, if (this->token_ == 0) { errno = ENOENT; - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Not open.\n")), -1); + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Not open.\n")), -1); } // Make sure no one calls our token_acquired until we have a chance @@ -1247,7 +1247,7 @@ ACE_Token_Proxy::acquire (int notify, case EWOULDBLOCK : if (this->debug_) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) waiting for %s, owner is %s, ") ACE_TEXT ("total waiters == %d\n"), this->name (), @@ -1268,7 +1268,7 @@ ACE_Token_Proxy::acquire (int notify, default : waiter_->cond_var_.mutex ().release (); - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("Token Proxy acquire.")), -1); @@ -1278,7 +1278,7 @@ ACE_Token_Proxy::acquire (int notify, // we have the token { if (debug_) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) acquired %s\n"), this->name ())); waiter_->cond_var_.mutex ().release (); @@ -1294,7 +1294,7 @@ ACE_Token_Proxy::tryacquire (void (*sleep_hook)(void *)) if (this->token_ == 0) { errno = ENOENT; - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Not open.\n")), -1); } @@ -1312,7 +1312,7 @@ ACE_Token_Proxy::renew (int requeue_position, if (this->token_ == 0) { errno = ENOENT; - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Not open.\n")), -1); } @@ -1325,11 +1325,11 @@ ACE_Token_Proxy::renew (int requeue_position, { // check for error if (errno != EWOULDBLOCK) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p renew failed\n"), ACE_TEXT ("ACE_Token_Proxy")), -1); if (this->debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) renew blocking for %s, owner is %s\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) renew blocking for %s, owner is %s\n"), this->name (), token_->owner_id ())); @@ -1340,7 +1340,7 @@ ACE_Token_Proxy::renew (int requeue_position, // we have the token { if (this->debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) renewed %s\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) renewed %s\n"), this->name ())); waiter_->cond_var_.mutex ().release (); return 0; @@ -1375,12 +1375,12 @@ ACE_Token_Proxy::handle_options (ACE_Synch_Options &options, // We come here if a timeout occurs or some serious // ACE_Condition object error. cv.mutex ().release (); - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("condition variable wait") + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("condition variable wait") ACE_TEXT (" bombed.")), -1); } if (this->debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) unblocking %s.\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) unblocking %s.\n"), this->client_id ())); cv.mutex ().release (); return 0; // operation succeeded @@ -1396,7 +1396,7 @@ ACE_Token_Proxy::release (ACE_Synch_Options &) { errno = ENOENT; if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Must open before releasing.\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Must open before releasing.\n"))); ACE_RETURN (-1); } @@ -1405,13 +1405,13 @@ ACE_Token_Proxy::release (ACE_Synch_Options &) // Release failed. this->token_->remove (this->waiter_); if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %p.\n"), ACE_TEXT ("release failed"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %p.\n"), ACE_TEXT ("release failed"))); return -1; } else { if (this->debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) released %s, owner is %s\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) released %s, owner is %s\n"), this->name (), token_->owner_id ())); @@ -1510,11 +1510,11 @@ ACE_Token_Name::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Name::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Name::dump:\n") + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Name::dump:\n") ACE_TEXT (" token_name_ = %s\n"), token_name_ == 0 ? ACE_TEXT ("no name") : token_name_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Local_Tokens.h b/ACE/ace/Local_Tokens.h index 30ecf4fa877..883d8c7353d 100644 --- a/ACE/ace/Local_Tokens.h +++ b/ACE/ace/Local_Tokens.h @@ -59,7 +59,7 @@ #include "ace/Containers.h" #include "ace/Synch_Options.h" #include "ace/Map_Manager.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_string.h" #include "ace/os_include/os_netdb.h" diff --git a/ACE/ace/Local_Tokens.inl b/ACE/ace/Local_Tokens.inl index 17c015c4c91..9c2449d01cc 100644 --- a/ACE/ace/Local_Tokens.inl +++ b/ACE/ace/Local_Tokens.inl @@ -74,7 +74,7 @@ ACE_Tokens::dec_reference (void) ACE_TRACE ("ACE_Tokens::dec_reference"); if (this->reference_count_ == 0) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("dec_reference already zero"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("dec_reference already zero"))); return 0; } diff --git a/ACE/ace/Log_Category.cpp b/ACE/ace/Log_Category.cpp new file mode 100644 index 00000000000..5c26db40f92 --- /dev/null +++ b/ACE/ace/Log_Category.cpp @@ -0,0 +1,137 @@ +// $Id$ + +#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" +#include "ace/Atomic_Op.h" +#include "ace/OS_NS_Thread.h" + + +#if !defined (__ACE_INLINE__) +#include "ace/Log_Category.inl" +#endif /* __ACE_INLINE__ */ + + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + +#if defined (ACE_HAS_THREADS) +extern "C" void +ACE_Log_Category_tss_destroy(void * p) +{ + delete static_cast<ACE_Log_Category_TSS*>(p); +} +#endif // defined (ACE_HAS_THREADS) + + +ACE_Log_Category::ACE_Log_Category(const char* name) + : name_(name) + , id_(0) +/// Default per-process priority mask +/// By default, all priorities are enabled. + , priority_mask_(LM_SHUTDOWN + | LM_TRACE + | LM_DEBUG + | LM_INFO + | LM_NOTICE + | LM_WARNING + | LM_STARTUP + | LM_ERROR + | LM_CRITICAL + | LM_ALERT + | LM_EMERGENCY) +#if defined (ACE_HAS_THREADS) + , key_(ACE_OS::NULL_key) +#else + , per_thr_obj_(this, 0) +#endif +{ +} + +ACE_Log_Category::~ACE_Log_Category() +{ +#if defined (ACE_HAS_THREADS) + ACE_GUARD (ACE_Thread_Mutex, ace_mon, this->keylock_); + + if (this->id_ > 0) + { + void *temp = 0; + if (ACE_OS::thr_getspecific (this->key_, &temp) == -1) + { + return; // This should not happen! + } + if (temp != 0) { + delete static_cast <ACE_Log_Category_TSS *> (temp); + ACE_OS::thr_setspecific (this->key_, 0); + } + ACE_OS::thr_keyfree (this->key_); + } +#endif +} + +ACE_Log_Category_TSS::ACE_Log_Category_TSS(ACE_Log_Category* category, ACE_Log_Msg* logger) + : category_(category) + , logger_(logger) + , priority_mask_(0) +{ +} + +ACE_Log_Category_TSS* +ACE_Log_Category::per_thr_obj() +{ +#if defined (ACE_HAS_THREADS) + { + // Ensure that we are serialized! + ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->keylock_, 0); + + // make sure we only create the key once! + if (this->id_ == 0) + { + static ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int> log_category_id_assigner(1); + id_ = log_category_id_assigner++; // for atomic integers, post increment is more efficient + + if (ACE_OS::thr_keycreate (&this->key_, + &ACE_Log_Category_tss_destroy) != 0) + return 0; // Major problems, this should *never* happen! + } + } + + void *temp = 0; + if (ACE_OS::thr_getspecific (this->key_, &temp) == -1) + { + return 0; // This should not happen! + } + if (temp != 0) + return static_cast <ACE_Log_Category_TSS *> (temp); + + ACE_Log_Category_TSS * result; + + ACE_NEW_RETURN(result, + ACE_Log_Category_TSS(this, ACE_Log_Msg::instance()), + 0); + + if (ACE_OS::thr_setspecific (this->key_, + result) != 0) + { + return 0; + } + + return result; +#else // defined (ACE_HAS_THREADS) + if (this->id_ == 0) { + static unsigned int log_category_id_assigner = 0; + id_ = log_category_id_assigner++; + per_thr_obj_.logger_ = ACE_Log_Msg::instance(); + } + return &per_thr_obj_; +#endif // defined (ACE_HAS_THREADS) +} + + + +ACE_Log_Category& +ACE_Log_Category::ace_lib() +{ + static ACE_Log_Category ace_lib_category("ACE"); + return ace_lib_category; +} + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Log_Category.h b/ACE/ace/Log_Category.h new file mode 100644 index 00000000000..1938f20c0da --- /dev/null +++ b/ACE/ace/Log_Category.h @@ -0,0 +1,270 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file Log_Category.h + * + * $Id$ + * + * @author Huang-Ming Huang <huangh@ociweb.com> + */ +//============================================================================= + +#ifndef ACE_LOG_CATEGORY_H +#define ACE_LOG_CATEGORY_H + +#include /**/ "ace/pre.h" + +#include "ace/Log_Priority.h" +#include "ace/Log_Msg.h" +#include "ace/Thread_Mutex.h" + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + +#if defined (ACE_NLOGGING) +#if !defined (ACELIB_HEX_DUMP) +# define ACELIB_HEX_DUMP(X) do {} while (0) +#endif +#if !defined (ACELIB_RETURN) +# define ACELIB_RETURN(Y) do { return (Y); } while (0) +#endif +#if !defined (ACELIB_ERROR_RETURN) +# define ACELIB_ERROR_RETURN(X, Y) return (Y) +#endif +#if !defined (ACELIB_ERROR_BREAK) +# define ACELIB_ERROR_BREAK(X) { break; } +#endif +#if !defined (ACELIB_ERROR) +# define ACELIB_ERROR(X) do {} while (0) +#endif +#if !defined (ACELIB_DEBUG) +# define ACELIB_DEBUG(X) do {} while (0) +#endif +#if !defined (ACELIB_ERROR_INIT) +# define ACELIB_ERROR_INIT(VALUE, FLAGS) +#endif +#else +#if !defined (ACELIB_HEX_DUMP) +#define ACELIB_HEX_DUMP(X) \ + do { \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ + ACE_Log_Category_TSS *ace___ = ACE_Log_Category::ace_lib().per_thr_obj(); \ + if (ace___ == 0) break;\ + ace___->conditional_set (__FILE__, __LINE__, 0, __ace_error); \ + ace___->log_hexdump X; \ + } while (0) +#endif +#if !defined (ACELIB_RETURN) +#define ACELIB_RETURN(Y) \ + do { \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ + ACE_Log_Msg *ace___ = ACE_Log_Msg::instance(); \ + ace___->set (__FILE__, __LINE__, Y, __ace_error, ace___->restart (), \ + ace___->msg_ostream (), ace___->msg_callback ()); \ + return Y; \ + } while (0) +#endif +#if !defined (ACELIB_ERROR_RETURN) +#define ACELIB_ERROR_RETURN(X, Y) \ + do { \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ + ACE_Log_Category_TSS *ace___ = ACE_Log_Category::ace_lib().per_thr_obj(); \ + if (ace___ == 0) return Y;\ + ace___->conditional_set (__FILE__, __LINE__, Y, __ace_error); \ + ace___->log X; \ + return Y; \ + } while (0) +#endif +#if !defined (ACELIB_ERROR) +#define ACELIB_ERROR(X) \ + do { \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ + ACE_Log_Category_TSS *ace___ = ACE_Log_Category::ace_lib().per_thr_obj(); \ + if (ace___ == 0) break;\ + ace___->conditional_set (__FILE__, __LINE__, -1, __ace_error); \ + ace___->log X; \ + } while (0) +#endif +#if !defined (ACELIB_DEBUG) +#define ACELIB_DEBUG(X) \ + do { \ + int const __ace_error = ACE_Log_Msg::last_error_adapter (); \ + ACE_Log_Category_TSS *ace___ = ACE_Log_Category::ace_lib().per_thr_obj(); \ + if (ace___ == 0) break;\ + ace___->conditional_set (__FILE__, __LINE__, 0, __ace_error); \ + ace___->log X; \ + } while (0) +#endif +#if !defined (ACELIB_ERROR_BREAK) +#define ACELIB_ERROR_BREAK(X) { ACELIB_ERROR (X); break; } +#endif +#endif /* ACE_NLOGGING */ + + +class ACE_Log_Msg; +class ACE_Log_Category; + + +/** + * @class ACE_Log_Category_TSS + * + * @brief The thread specific object for a ACE_Log_Categy object. + * + * @see ACE_Log_Categy + */ + +class ACE_Export ACE_Log_Category_TSS +{ +public: + ACE_Log_Category_TSS(ACE_Log_Category* category, ACE_Log_Msg* logger); + + const char* name(); + unsigned int id(); + + ACE_Log_Msg* logger(); + /// Get the current ACE_Log_Priority mask. + u_long priority_mask (); + + /// Set the ACE_Log_Priority mask, returns original mask. + u_long priority_mask (u_long); + /// Return true if the requested priority is enabled. + int log_priority_enabled (ACE_Log_Priority log_priority); + + /** + * Set the line number, file name, operational status, error number, + * restart flag, ostream, and the callback object. This combines + * all the other set methods into a single method. + */ + void set (const char *file, + int line, + int op_status = -1, + int errnum = 0); + + /// These values are only actually set if the requested priority is + /// enabled. + void conditional_set (const char *file, + int line, + int op_status, + int errnum); + + ssize_t log (ACE_Log_Priority priority, const ACE_TCHAR *format, ...); + +#if defined (ACE_HAS_WCHAR) + ssize_t log (ACE_Log_Priority priority, const ACE_ANTI_TCHAR *format, ...); +#endif /* ACE_HAS_WCHAR */ + + ssize_t log (const ACE_TCHAR *format, + ACE_Log_Priority priority, + va_list argp); + + /** + * Method to log hex dump. This is useful for debugging. Calls + * log() to do the actual print, but formats first to make the chars + * printable. + */ + int log_hexdump (ACE_Log_Priority log_priority, + const char * buffer, + size_t size, + const ACE_TCHAR *text = 0); + +private: + friend class ACE_Log_Category; + ACE_Log_Category* category_; + ACE_Log_Msg* logger_; + u_long priority_mask_; +}; + +/** + * @class ACE_Log_Category + * + * @brief Provides a categorized message logging + * abstraction. + * + * This class added another level of abstraction to + * @c ACE_Log_Msg to separate log messages into different + * categories. Logs in different categories can be independently + * enabled or disabled. Each cateogry can have a name which + * is fixed at construction. The name is not used for + * formating the messages. However, it can be used by a + * message backend object for identification and reformat + * accordingly. + * + * To log a message into a category. Create a new @c ACE_Log_Category + * and then use @c per_thr_obj() for logging. For example, + * + * \code{.cpp} + * ACE_Log_Category test_catogory("Test"); + * test_cateogry.per_thr_obj()->log(LM_DEBUG, "Log into the Test category."); + * + * // set the process wide priority mask + * test_catogory.priority_mask(LM_DEBUG|LM_ERROR); + * + * // set the thread specific priority mask + * test_cateogry.per_thr_obj()->priority_mask(LM_DEBUG); + * \endcode + */ +class ACE_Export ACE_Log_Category +{ +public: + + /** + * Initialize the logger with a name. + * + * Notice that ACE_Log_Category does not + * deep copy the passed \a name; therefore, + * you must keep the lifetime of \a name + * longer than the newly create ACE_Log_Category + * object. The rational for the design is to avoid + * static initialization problem when the ACE_Log_Category + * is created in static storage. + */ + ACE_Log_Category(const char* name); + ~ACE_Log_Category(); + + unsigned int id(); + const char* name(); + + ACE_Log_Category_TSS* per_thr_obj(); + + /// Get the process ACE_Log_Priority mask. + u_long priority_mask (); + + /// Set the process ACE_Log_Priority mask, returns original mask. + u_long priority_mask (u_long); + + + static ACE_Log_Category& ace_lib(); + +private: + friend class ACE_Log_Category_TSS; + + // disable copying + ACE_Log_Category(const ACE_Log_Category&); + ACE_Log_Category& operator = (const ACE_Log_Category&); + + const char* name_; + unsigned int id_; + u_long priority_mask_; + + /// we couldn't directly use ACE_TSS because it would + /// create circular dependency +#if defined (ACE_HAS_THREADS) + /// Avoid race conditions during initialization. + ACE_Thread_Mutex keylock_; + /// "First time in" flag. + /// Key for the thread-specific error data. + ACE_thread_key_t key_; +#else // defined (ACE_HAS_THREADS) + ACE_Log_Category_TSS per_thr_obj_; +#endif // defined (ACE_HAS_THREADS) +}; + + +ACE_END_VERSIONED_NAMESPACE_DECL + +#if defined (__ACE_INLINE__) +#include "ace/Log_Category.inl" +#endif /* __ACE_INLINE__ */ + +#include /**/ "ace/post.h" +#endif /* ACE_LOG_CATEGORY_H */ diff --git a/ACE/ace/Log_Category.inl b/ACE/ace/Log_Category.inl new file mode 100644 index 00000000000..7649da7f3b8 --- /dev/null +++ b/ACE/ace/Log_Category.inl @@ -0,0 +1,159 @@ +// -*- C++ -*- +// +// $Id$ + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + +ACE_INLINE unsigned int +ACE_Log_Category::id() +{ + return id_; +} + +ACE_INLINE const char* +ACE_Log_Category::name () +{ + return name_; +} + +ACE_INLINE unsigned int +ACE_Log_Category_TSS::id() +{ + return category_->id_; +} + +ACE_INLINE const char* +ACE_Log_Category_TSS::name () +{ + return category_->name_; +} + +ACE_INLINE ACE_Log_Msg* +ACE_Log_Category_TSS::logger () +{ + return logger_; +} + +/// Get the current ACE_Log_Priority mask. +ACE_INLINE u_long +ACE_Log_Category_TSS::priority_mask () +{ + return priority_mask_; +} + +/// Set the ACE_Log_Priority mask, returns original mask. +ACE_INLINE u_long +ACE_Log_Category_TSS::priority_mask (u_long n_mask) +{ + u_long o_mask = this->priority_mask_; + this->priority_mask_ = n_mask; + return o_mask; +} +/// Return true if the requested priority is enabled. +ACE_INLINE int +ACE_Log_Category_TSS::log_priority_enabled (ACE_Log_Priority log_priority) +{ + return ACE_BIT_ENABLED (this->priority_mask_ | + category_->priority_mask(), + log_priority); +} + +ACE_INLINE void +ACE_Log_Category_TSS::set (const char *file, + int line, + int op_status, + int errnum) +{ + logger_->set(file, line, op_status, errnum, logger_->restart (), logger_->msg_ostream (), logger_->msg_callback ()); +} + +/// These values are only actually set if the requested priority is +/// enabled. +ACE_INLINE +void ACE_Log_Category_TSS::conditional_set (const char *file, + int line, + int op_status, + int errnum) +{ + logger_->conditional_set(file, line, op_status, errnum); +} + +ACE_INLINE ssize_t +ACE_Log_Category_TSS::log (ACE_Log_Priority priority, const ACE_TCHAR *format_str, ...) +{ + // Start of variable args section. + va_list argp; + + va_start (argp, format_str); + + ssize_t const result = this->log (format_str, + priority, + argp); + va_end (argp); + + return result; +} + +#if defined (ACE_HAS_WCHAR) +ACE_INLINE ssize_t +ACE_Log_Category_TSS::log (ACE_Log_Priority priority, const ACE_ANTI_TCHAR *format_str, ...) +{ + // Start of variable args section. + va_list argp; + + va_start (argp, format_str); + + ssize_t const result = this->log (ACE_TEXT_ANTI_TO_TCHAR (format_str), + priority, + argp); + va_end (argp); + + return result; +} +#endif /* ACE_HAS_WCHAR */ + +/** + * An alternative logging mechanism that makes it possible to + * integrate variable argument lists from other logging mechanisms + * into the ACE mechanism. + */ + +ACE_INLINE ssize_t +ACE_Log_Category_TSS::log (const ACE_TCHAR *format, + ACE_Log_Priority priority, + va_list argp) +{ + if (this->log_priority_enabled (priority) == 0) + return 0; + return logger_->log(format, priority, argp, this); +} + + +ACE_INLINE int +ACE_Log_Category_TSS::log_hexdump (ACE_Log_Priority priority, + const char *buffer, + size_t size, + const ACE_TCHAR *text) +{ + if (this->log_priority_enabled (priority) == 0) + return 0; + return logger_->log_hexdump(priority, buffer, size, text, this); +} + +/// Get the current ACE_Log_Priority mask. +ACE_INLINE u_long +ACE_Log_Category::priority_mask () +{ + return priority_mask_; +} + +/// Set the ACE_Log_Priority mask, returns original mask. +ACE_INLINE u_long +ACE_Log_Category::priority_mask (u_long n_mask) +{ + u_long o_mask = this->priority_mask_; + this->priority_mask_ = n_mask; + return o_mask; +} + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index 957a6628ae6..47b3f535c1f 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -393,7 +393,7 @@ ACE_Log_Msg::instance (void) } // Not inlined to help prevent having to include OS.h just to -// get ACE_DEBUG, et al, macros. +// get ACELIB_DEBUG, et al, macros. int ACE_Log_Msg::last_error_adapter (void) { @@ -971,7 +971,8 @@ ACE_Log_Msg::log (ACE_Log_Priority log_priority, ssize_t ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE_Log_Priority log_priority, - va_list argp) + va_list argp, + ACE_Log_Category_TSS* category) { ACE_TRACE ("ACE_Log_Msg::log"); // External decls. @@ -1009,6 +1010,8 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE_OS::gettimeofday (), this->getpid ()); + log_record.category(category); + // bp is pointer to where to put next part of logged message. // bspace is the number of characters remaining in msg_. ACE_TCHAR *bp = const_cast<ACE_TCHAR *> (this->msg ()); @@ -2292,61 +2295,73 @@ int ACE_Log_Msg::log_hexdump (ACE_Log_Priority log_priority, const char *buffer, size_t size, - const ACE_TCHAR *text) + const ACE_TCHAR *text, + ACE_Log_Category_TSS* category) { // Only print the message if <priority_mask_> hasn't been reset to // exclude this logging priority. if (this->log_priority_enabled (log_priority) == 0) return 0; - ACE_TCHAR* buf = 0; - size_t const buf_sz = - ACE_Log_Record::MAXLOGMSGLEN - ACE_Log_Record::VERBOSE_LEN - 58; - ACE_NEW_RETURN (buf, ACE_TCHAR[buf_sz], -1); + size_t text_sz = 0; + if (text) + text_sz = ACE_OS::strlen (text); - ACE_TCHAR *msg_buf = 0; - const size_t text_sz = text ? ACE_OS::strlen(text) : 0; - ACE_NEW_RETURN (msg_buf, - ACE_TCHAR[text_sz + 58], - -1); + size_t total_buffer_size = ACE_Log_Record::MAXLOGMSGLEN - ACE_Log_Record::VERBOSE_LEN +text_sz; - buf[0] = 0; // in case size = 0 + ACE_Array<ACE_TCHAR> msg_buf(total_buffer_size); + if (msg_buf.size() == 0) + return -1; - size_t const len = ACE::format_hexdump - (buffer, size, buf, buf_sz / sizeof (ACE_TCHAR) - text_sz); + ACE_TCHAR* end_ptr = &msg_buf[0] + total_buffer_size; + ACE_TCHAR* wr_ptr = &msg_buf[0]; + msg_buf[0] = 0; // in case size = 0 - int sz = 0; if (text) - sz = ACE_OS::sprintf (msg_buf, + wr_ptr += ACE_OS::snprintf (wr_ptr, + end_ptr - wr_ptr, #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_TEXT ("%ls - "), + ACE_TEXT ("%ls - "), #else - ACE_TEXT ("%s - "), + ACE_TEXT ("%s - "), #endif - text); - - sz += ACE_OS::sprintf (msg_buf + sz, - ACE_TEXT ("HEXDUMP ") - ACE_SIZE_T_FORMAT_SPECIFIER - ACE_TEXT (" bytes"), - size); + text); + + wr_ptr += ACE_OS::snprintf (wr_ptr, + end_ptr - wr_ptr, + ACE_TEXT ("HEXDUMP ") + ACE_SIZE_T_FORMAT_SPECIFIER + ACE_TEXT (" bytes"), + size); + + // estimate how many bytes can be output + // We can fit 16 bytes output in text mode per line, 4 chars per byte; + // i.e. we need 68 bytes of buffer per line. + size_t hexdump_size = (end_ptr - wr_ptr -58)/68*16; + + if (hexdump_size < size) { + wr_ptr += ACE_OS::snprintf (wr_ptr, + end_ptr - wr_ptr, + ACE_TEXT (" (showing first ") + ACE_SIZE_T_FORMAT_SPECIFIER + ACE_TEXT (" bytes)"), + hexdump_size); + size = hexdump_size; + } - if (len < size) - ACE_OS::sprintf (msg_buf + sz, - ACE_TEXT (" (showing first ") - ACE_SIZE_T_FORMAT_SPECIFIER - ACE_TEXT (" bytes)"), - len); + *wr_ptr++ = '\n'; + ACE::format_hexdump(buffer, size, wr_ptr, end_ptr - wr_ptr); // Now print out the formatted buffer. - this->log (log_priority, - ACE_TEXT ("%s\n%s"), - msg_buf, - buf); + ACE_Log_Record log_record (log_priority, + ACE_OS::gettimeofday (), + this->getpid ()); + + log_record.category(category); + log_record.msg_data(&msg_buf[0]); - delete [] msg_buf; - delete [] buf; + this->log (log_record, false); return 0; } @@ -2388,36 +2403,36 @@ ACE_Log_Msg::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Log_Msg::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("status_ = %d\n"), this->status_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nerrnum_ = %d\n"), this->errnum_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nlinenum_ = %d\n"), this->linenum_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nfile_ = %C\n"), this->file_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_ = %s\n"), this->msg_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nrestart_ = %d\n"), this->restart_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nostream_ = %@\n"), this->ostream_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_callback_ = %@\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("status_ = %d\n"), this->status_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nerrnum_ = %d\n"), this->errnum_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nlinenum_ = %d\n"), this->linenum_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nfile_ = %C\n"), this->file_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_ = %s\n"), this->msg_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nrestart_ = %d\n"), this->restart_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nostream_ = %@\n"), this->ostream_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_callback_ = %@\n"), this->msg_callback_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nprogram_name_ = %s\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nprogram_name_ = %s\n"), this->program_name_ ? this->program_name_ : ACE_TEXT ("<unknown>"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nlocal_host_ = %s\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nlocal_host_ = %s\n"), this->local_host_ ? this->local_host_ : ACE_TEXT ("<unknown>"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %d\n"), this->getpid ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = 0x%x\n"), this->flags_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntrace_depth_ = %d\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %d\n"), this->getpid ())); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = 0x%x\n"), this->flags_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntrace_depth_ = %d\n"), this->trace_depth_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntrace_active_ = %d\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntrace_active_ = %d\n"), this->trace_active_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntracing_enabled_ = %d\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntracing_enabled_ = %d\n"), this->tracing_enabled_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npriority_mask_ = 0x%x\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\npriority_mask_ = 0x%x\n"), this->priority_mask_)); if (this->thr_desc_ != 0 && this->thr_desc_->state () != 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_state_ = %d\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_state_ = %d\n"), this->thr_desc_->state ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_off_ = %d\n"), this->msg_off_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_off_ = %d\n"), this->msg_off_)); // Be sure that there is a message_queue_, with multiple threads. ACE_MT (ACE_Log_Msg_Manager::init_backend ()); @@ -2425,7 +2440,7 @@ ACE_Log_Msg::dump (void) const ACE_MT (ACE_Log_Msg_Manager::get_lock ()->dump ()); // Synchronize output operations. - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h index f847c4ede0e..0f837babcd2 100644 --- a/ACE/ace/Log_Msg.h +++ b/ACE/ace/Log_Msg.h @@ -143,6 +143,7 @@ class ACE_Log_Msg_Backend; // Forward declaration class ACE_Thread_Descriptor; class ACE_Log_Record; +class ACE_Log_Category_TSS; template<typename M, typename T> class ACE_Atomic_Op; /** @@ -539,7 +540,8 @@ public: */ ssize_t log (const ACE_TCHAR *format, ACE_Log_Priority priority, - va_list argp); + va_list argp, + ACE_Log_Category_TSS* category=0); /// Log a custom built log record to the currently enabled logging /// sinks. @@ -554,7 +556,8 @@ public: int log_hexdump (ACE_Log_Priority log_priority, const char *buffer, size_t size, - const ACE_TCHAR *text = 0); + const ACE_TCHAR *text = 0, + ACE_Log_Category_TSS* category=0); /** * Init hook, create a Log_Msg_Attribute object, initialize its @@ -743,6 +746,7 @@ ACE_TSS_CLEANUP_NAME (void *ptr); # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */ #endif /* ACE_MT_SAFE */ + #if defined (__ACE_INLINE__) #include "ace/Log_Msg.inl" #endif /* __ACE_INLINE__ */ diff --git a/ACE/ace/Log_Msg_NT_Event_Log.cpp b/ACE/ace/Log_Msg_NT_Event_Log.cpp index 344b286ea92..89cfe6f8ef9 100644 --- a/ACE/ace/Log_Msg_NT_Event_Log.cpp +++ b/ACE/ace/Log_Msg_NT_Event_Log.cpp @@ -5,7 +5,7 @@ #if defined (ACE_HAS_LOG_MSG_NT_EVENT_LOG) #include "ace/Log_Msg_NT_Event_Log.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Log_Record.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" diff --git a/ACE/ace/Log_Msg_UNIX_Syslog.cpp b/ACE/ace/Log_Msg_UNIX_Syslog.cpp index 8fe420bc030..b55e4bb8297 100644 --- a/ACE/ace/Log_Msg_UNIX_Syslog.cpp +++ b/ACE/ace/Log_Msg_UNIX_Syslog.cpp @@ -5,7 +5,7 @@ #if !defined (ACE_LACKS_UNIX_SYSLOG) #include "ace/ACE.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Log_Msg_UNIX_Syslog.h" #include "ace/Log_Record.h" #include "ace/OS_NS_string.h" diff --git a/ACE/ace/Log_Record.cpp b/ACE/ace/Log_Record.cpp index 299b66bb480..37501bb1749 100644 --- a/ACE/ace/Log_Record.cpp +++ b/ACE/ace/Log_Record.cpp @@ -8,6 +8,7 @@ #include "ace/CDR_Stream.h" #include "ace/Auto_Ptr.h" #include "ace/Truncate.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) # include "ace/Log_Record.inl" @@ -105,17 +106,17 @@ ACE_Log_Record::dump (void) const #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Log_Record::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("length_ = %d\n"), this->length_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntype_ = %u\n"), this->type_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntime_stamp_ = (%:, %d)\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("length_ = %d\n"), this->length_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntype_ = %u\n"), this->type_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntime_stamp_ = (%:, %d)\n"), this->secs_, this->usecs_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %u\n"), this->pid_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_data_ (0x%@) = %s\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %u\n"), this->pid_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_data_ (0x%@) = %s\n"), this->msg_data_, this->msg_data_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_data_size_ = %B\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_data_size_ = %B\n"), this->msg_data_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -146,7 +147,8 @@ ACE_Log_Record::ACE_Log_Record (ACE_Log_Priority lp, usecs_ (0), pid_ (ACE_UINT32 (p)), msg_data_ (0), - msg_data_size_ (0) + msg_data_size_ (0), + category_(0) { // ACE_TRACE ("ACE_Log_Record::ACE_Log_Record"); ACE_NEW_NORETURN (this->msg_data_, ACE_TCHAR[MAXLOGMSGLEN]); @@ -166,7 +168,8 @@ ACE_Log_Record::ACE_Log_Record (ACE_Log_Priority lp, usecs_ ((ACE_UINT32) ts.usec ()), pid_ (ACE_UINT32 (p)), msg_data_ (0), - msg_data_size_ (0) + msg_data_size_ (0), + category_(0) { // ACE_TRACE ("ACE_Log_Record::ACE_Log_Record"); ACE_NEW_NORETURN (this->msg_data_, ACE_TCHAR[MAXLOGMSGLEN]); @@ -197,7 +200,8 @@ ACE_Log_Record::ACE_Log_Record (void) usecs_ (0), pid_ (0), msg_data_ (0), - msg_data_size_ (0) + msg_data_size_ (0), + category_(0) { // ACE_TRACE ("ACE_Log_Record::ACE_Log_Record"); ACE_NEW_NORETURN (this->msg_data_, ACE_TCHAR[MAXLOGMSGLEN]); @@ -269,12 +273,20 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[], return 0; } +inline bool +log_priority_enabled(ACE_Log_Category_TSS* category, ACE_Log_Priority priority) +{ + if (category && !category->log_priority_enabled (priority)) + return false; + return ACE_LOG_MSG->log_priority_enabled (priority); +} + int ACE_Log_Record::print (const ACE_TCHAR host_name[], u_long verbose_flag, FILE *fp) { - if (ACE_LOG_MSG->log_priority_enabled (ACE_Log_Priority (this->type_))) + if ( log_priority_enabled(this->category(), ACE_Log_Priority (this->type_)) ) { ACE_TCHAR *verbose_msg = 0; ACE_NEW_RETURN (verbose_msg, ACE_TCHAR[MAXVERBOSELOGMSGLEN], -1); @@ -374,7 +386,7 @@ ACE_Log_Record::print (const ACE_TCHAR host_name[], u_long verbose_flag, ACE_OSTREAM_TYPE &s) { - if (ACE_LOG_MSG->log_priority_enabled (ACE_Log_Priority (this->type_))) + if ( log_priority_enabled(this->category(), ACE_Log_Priority (this->type_)) ) { ACE_TCHAR* verbose_msg = 0; ACE_NEW_RETURN (verbose_msg, ACE_TCHAR[MAXVERBOSELOGMSGLEN], -1); diff --git a/ACE/ace/Log_Record.h b/ACE/ace/Log_Record.h index e4c9dcff4bf..cf05c940f74 100644 --- a/ACE/ace/Log_Record.h +++ b/ACE/ace/Log_Record.h @@ -32,6 +32,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; +class ACE_Log_Category_TSS; /// Defines the structure of an ACE logging record. class ACE_Export ACE_Log_Record @@ -109,6 +110,11 @@ public: /// Set the type of the Log_Record. void type (ACE_UINT32); + /// Get the category of the Log_Record. + ACE_Log_Category_TSS* category (void) const; + /// Set the category of the Log_Record. + void category (ACE_Log_Category_TSS*); + /** * Get the priority of the Log_Record <type_>. This is computed * as the base 2 logarithm of <type_> (which must be a power of 2, @@ -186,6 +192,9 @@ private: /// Allocated size of msg_data_ in ACE_TCHARs size_t msg_data_size_; + /// + ACE_Log_Category_TSS* category_; + /// disallow copying... ACE_Log_Record (const ACE_Log_Record& rhs); ACE_Log_Record& operator= (const ACE_Log_Record& rhs); diff --git a/ACE/ace/Log_Record.inl b/ACE/ace/Log_Record.inl index bf283301335..5594d83ecce 100644 --- a/ACE/ace/Log_Record.inl +++ b/ACE/ace/Log_Record.inl @@ -24,6 +24,21 @@ ACE_Log_Record::type (void) const } ACE_INLINE void +ACE_Log_Record::category (ACE_Log_Category_TSS* t) +{ + ACE_TRACE ("ACE_Log_Record::category"); + this->category_ = t; +} + + +ACE_INLINE ACE_Log_Category_TSS* +ACE_Log_Record::category (void) const +{ + ACE_TRACE ("ACE_Log_Record::category"); + return this->category_; +} + +ACE_INLINE void ACE_Log_Record::type (ACE_UINT32 t) { ACE_TRACE ("ACE_Log_Record::type"); diff --git a/ACE/ace/Logging_Strategy.cpp b/ACE/ace/Logging_Strategy.cpp index ae7e7d45f6f..63f52993aa0 100644 --- a/ACE/ace/Logging_Strategy.cpp +++ b/ACE/ace/Logging_Strategy.cpp @@ -10,7 +10,7 @@ #include "ace/streams.h" #include "ace/Lib_Find.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Reactor.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_stdio.h" @@ -251,7 +251,7 @@ ACE_Logging_Strategy::ACE_Logging_Strategy (void) (this->filename_, MAXPATHLEN - 7) == -1) // 7 for "logfile" { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Temporary path too long, ") ACE_TEXT ("defaulting to current directory\n"))); this->filename_[0] = 0; @@ -406,7 +406,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, { // Lock out any other logging. if (this->log_msg_->acquire ()) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Cannot acquire lock!\n")), -1); @@ -519,7 +519,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, ACE_OS::rename (this->filename_, backup); } else - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Backup file name too long; ") ACE_TEXT ("backup logfile not saved.\n"))); diff --git a/ACE/ace/Logging_Strategy.h b/ACE/ace/Logging_Strategy.h index 87bc0bdb727..edad20ce98d 100644 --- a/ACE/ace/Logging_Strategy.h +++ b/ACE/ace/Logging_Strategy.h @@ -15,7 +15,7 @@ #define ACE_LOGGING_STRATEGY_H #include "ace/Service_Object.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ACE/ace/MEM_Acceptor.cpp b/ACE/ace/MEM_Acceptor.cpp index 8cbd63c1ddd..89df3ae728b 100644 --- a/ACE/ace/MEM_Acceptor.cpp +++ b/ACE/ace/MEM_Acceptor.cpp @@ -58,7 +58,7 @@ ACE_MEM_Acceptor::ACE_MEM_Acceptor (const ACE_MEM_Addr &remote_sap, reuse_addr, backlog, protocol) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_MEM_Acceptor::ACE_MEM_Acceptor"))); } @@ -150,7 +150,7 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream, // - 24 is so we can append name to the end. if (ACE::get_temp_dir (buf, MAXPATHLEN - 24) == -1) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Temporary path too long, ") ACE_TEXT ("defaulting to current directory\n"))); buf[0] = 0; @@ -184,14 +184,14 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream, #endif /* ACE_WIN32 || !_ACE_USE_SV_SEM */ if (ACE::send (new_handle, &client_signaling, sizeof (ACE_INT16)) == -1) - ACE_ERROR_RETURN ((LM_DEBUG, + ACELIB_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("ACE_MEM_Acceptor::accept error sending strategy\n")), -1); // Now we get the signaling strategy the client support. if (ACE::recv (new_handle, &client_signaling, sizeof (ACE_INT16)) == -1) - ACE_ERROR_RETURN ((LM_DEBUG, + ACELIB_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("ACE_MEM_Acceptor::%p error receiving strategy\n"), ACE_TEXT ("accept")), -1); diff --git a/ACE/ace/MEM_Addr.cpp b/ACE/ace/MEM_Addr.cpp index 206dc6cd64c..cb63a15907d 100644 --- a/ACE/ace/MEM_Addr.cpp +++ b/ACE/ace/MEM_Addr.cpp @@ -10,7 +10,7 @@ #include "ace/MEM_Addr.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_unistd.h" #include "ace/os_include/os_netdb.h" @@ -154,10 +154,10 @@ ACE_MEM_Addr::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_MEM_Addr::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->external_.dump (); this->internal_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/MEM_Connector.cpp b/ACE/ace/MEM_Connector.cpp index 4a9a96c1382..0230bd2d1b0 100644 --- a/ACE/ace/MEM_Connector.cpp +++ b/ACE/ace/MEM_Connector.cpp @@ -21,9 +21,9 @@ ACE_MEM_Connector::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_MEM_Connector::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -69,7 +69,7 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, ACE_TRACE ("ACE_MEM_Connector::connect"); if (!this->address_.same_host (remote_sap)) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) MEM_Connector can't connect ") ACE_TEXT ("to %C:%d which is not a local endpoint ") ACE_TEXT ("(local address is %C:%d)\n"), @@ -88,7 +88,7 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, this->address_.get_local_addr (), timeout, local_sap, reuse_addr, flags, perms) == -1) - ACE_ERROR_RETURN ((LM_DEBUG, + ACELIB_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_MEM_Connector::connect")), -1); @@ -107,7 +107,7 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, // Receive the signaling strategy theserver support. if (ACE::recv (new_handle, &server_strategy, sizeof (ACE_INT16)) == -1) - ACE_ERROR_RETURN ((LM_DEBUG, + ACELIB_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("ACE_MEM_Connector::connect error receiving strategy\n")), -1); @@ -120,19 +120,19 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, if (ACE::send (new_handle, &server_strategy, sizeof (ACE_INT16)) == -1) - ACE_ERROR_RETURN ((LM_DEBUG, + ACELIB_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("ACE_MEM_Connector::connect error sending strategy\n")), -1); ACE_INT16 buf_len; // Byte-order is not a problem for this read. if (ACE::recv (new_handle, &buf_len, sizeof (buf_len)) == -1) - ACE_ERROR_RETURN ((LM_DEBUG, + ACELIB_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("ACE_MEM_Connector::connect error receiving shm filename length\n")), -1); if (ACE::recv (new_handle, buf, buf_len) == -1) - ACE_ERROR_RETURN ((LM_DEBUG, + ACELIB_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("ACE_MEM_Connector::connect error receiving shm filename.\n")), -1); diff --git a/ACE/ace/MEM_IO.cpp b/ACE/ace/MEM_IO.cpp index b51b5a53c8c..5a051f580a5 100644 --- a/ACE/ace/MEM_IO.cpp +++ b/ACE/ace/MEM_IO.cpp @@ -50,7 +50,7 @@ ACE_Reactive_MEM_IO::recv_buf (ACE_MEM_SAP_Node *&buf, if (retv == 0) { - // ACE_DEBUG ((LM_INFO, "MEM_Stream closed\n")); + // ACELIB_DEBUG ((LM_INFO, "MEM_Stream closed\n")); buf = 0; return 0; } diff --git a/ACE/ace/MEM_SAP.cpp b/ACE/ace/MEM_SAP.cpp index c4a6e572ea7..133af140f2c 100644 --- a/ACE/ace/MEM_SAP.cpp +++ b/ACE/ace/MEM_SAP.cpp @@ -20,12 +20,12 @@ ACE_MEM_SAP::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_MEM_SAP::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); if (this->shm_malloc_ != 0) this->shm_malloc_->dump (); else - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_MEM_SAP uninitialized.\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_MEM_SAP uninitialized.\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/MMAP_Memory_Pool.cpp b/ACE/ace/MMAP_Memory_Pool.cpp index 6405e8cbcd2..e5eb2a4be1a 100644 --- a/ACE/ace/MMAP_Memory_Pool.cpp +++ b/ACE/ace/MMAP_Memory_Pool.cpp @@ -6,7 +6,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_sys_stat.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Truncate.h" #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) @@ -168,7 +168,7 @@ ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool ( MAXPATHLEN - 17) == -1) // -17 for ace-malloc-XXXXXX { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Temporary path too long, ") ACE_TEXT ("defaulting to current directory\n"))); this->backing_store_name_[0] = 0; @@ -192,7 +192,7 @@ ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool ( if (this->install_signal_handler_) { if (this->signal_handler_.register_handler (SIGSEGV, this) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p\n"), this->backing_store_name_)); } #endif /* ACE_WIN32 */ @@ -241,7 +241,7 @@ ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, || ACE_OS::write (this->mmap_.handle (), "", 1) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), this->backing_store_name_), -1); @@ -293,7 +293,7 @@ ACE_MMAP_Memory_Pool::map_file (size_t map_size) #endif // ACE_HAS_WINCE { #if 0 - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) addr = %@, base_addr = %@, map_size = %B, %p\n"), this->mmap_.addr (), this->base_addr_, @@ -330,7 +330,7 @@ ACE_MMAP_Memory_Pool::acquire (size_t nbytes, ACE_TRACE ("ACE_MMAP_Memory_Pool::acquire"); rounded_bytes = this->round_up (nbytes); - // ACE_DEBUG ((LM_DEBUG, "(%P|%t) acquiring more chunks, nbytes = + // ACELIB_DEBUG ((LM_DEBUG, "(%P|%t) acquiring more chunks, nbytes = // %B, rounded_bytes = %B\n", nbytes, rounded_bytes)); size_t map_size; @@ -341,7 +341,7 @@ ACE_MMAP_Memory_Pool::acquire (size_t nbytes, else if (this->map_file (map_size) == -1) return 0; - // ACE_DEBUG ((LM_DEBUG, "(%P|%t) acquired more chunks, nbytes = %B, + // ACELIB_DEBUG ((LM_DEBUG, "(%P|%t) acquired more chunks, nbytes = %B, // rounded_bytes = %B, map_size = %B\n", nbytes, rounded_bytes, // map_size)); @@ -391,7 +391,7 @@ ACE_MMAP_Memory_Pool::init_acquire (size_t nbytes, this->base_addr_, 0, this->sa_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("MMAP_Memory_Pool::init_acquire, EEXIST")), 0); @@ -410,7 +410,7 @@ ACE_MMAP_Memory_Pool::init_acquire (size_t nbytes, return this->mmap_.addr (); } else - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("MMAP_Memory_Pool::init_acquire")), 0); @@ -439,7 +439,7 @@ int ACE_MMAP_Memory_Pool::remap (void *addr) { ACE_TRACE ("ACE_MMAP_Memory_Pool::remap"); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Remapping with fault address at: %@\n"), addr)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Remapping with fault address at: %@\n"), addr)); size_t const current_map_size = ACE_Utils::truncate_cast<size_t> (ACE_OS::filesize (this->mmap_.handle ())); // ACE_OS::lseek (this->mmap_.handle (), 0, SEEK_END); @@ -488,9 +488,9 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t return -1; #if 0 else - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) received %S\n"), signum)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) received %S\n"), signum)); #endif - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) new mapping address = %@\n"), (char *) this->base_addr_ + current_map_size)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) new mapping address = %@\n"), (char *) this->base_addr_ + current_map_size)); #if defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR) // Make sure that the pointer causing the problem is within the @@ -498,10 +498,10 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t if (siginfo != 0) { - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %@\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %@\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); if (this->remap ((void *) siginfo->si_addr) == -1) return -1; - // ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) address %@ out of range\n", + // ACELIB_ERROR_RETURN ((LM_ERROR, "(%P|%t) address %@ out of range\n", // siginfo->si_addr), -1); return 0; } diff --git a/ACE/ace/Malloc.cpp b/ACE/ace/Malloc.cpp index a31ff854f7e..3e957063a12 100644 --- a/ACE/ace/Malloc.cpp +++ b/ACE/ace/Malloc.cpp @@ -27,10 +27,10 @@ ACE_Control_Block::ACE_Malloc_Header::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Control_Block::ACE_Malloc_Header::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_block = %@"), (ACE_Malloc_Header *) this->next_block_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize = %d\n"), this->size_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_block = %@"), (ACE_Malloc_Header *) this->next_block_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize = %d\n"), this->size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -39,8 +39,8 @@ ACE_Control_Block::print_alignment_info (void) { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Control_Block::print_alignment_info"); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Start ---> ACE_Control_Block::print_alignment_info:\n"))); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Start ---> ACE_Control_Block::print_alignment_info:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Sizeof ptr: %d\n") ACE_TEXT ("Sizeof size_t: %d\n") ACE_TEXT ("Sizeof long: %d\n") @@ -66,7 +66,7 @@ ACE_Control_Block::print_alignment_info (void) sizeof (ACE_Malloc_Header), sizeof (ACE_Control_Block) )); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("End <--- ACE_Control_Block::print_alignment_info:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("End <--- ACE_Control_Block::print_alignment_info:\n"))); #endif /* ACE_HAS_DUMP */ } @@ -76,24 +76,24 @@ ACE_Control_Block::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Control_Block::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Name Node:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Name Node:\n"))); for (ACE_Name_Node *nextn = this->name_head_; nextn != 0; nextn = nextn->next_) nextn->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("freep_ = %@"), (ACE_Malloc_Header *) this->freep_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("freep_ = %@"), (ACE_Malloc_Header *) this->freep_)); this->base_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nMalloc Header:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nMalloc Header:\n"))); for (ACE_Malloc_Header *nexth = ((ACE_Malloc_Header *)this->freep_)->next_block_; nexth != 0 && nexth != &this->base_; nexth = nexth->next_block_) nexth->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -140,14 +140,14 @@ ACE_Control_Block::ACE_Name_Node::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("pointer = %@"), (const char *) this->pointer_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %@"), (ACE_Name_Node *) this->next_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("pointer = %@"), (const char *) this->pointer_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %@"), (ACE_Name_Node *) this->next_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nname_ = (%@, %C)\n"), (const char *) this->name_, (const char *) this->name_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -167,16 +167,16 @@ ACE_Malloc_Stats::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Malloc_Stats::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); int const nblocks = this->nblocks_.value (); int const ninuse = this->ninuse_.value (); int const nchunks = this->nchunks_.value (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("nblocks = %d"), nblocks)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nninuse = %d"), ninuse)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nnchunks = %d"), nchunks)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("nblocks = %d"), nblocks)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("\nninuse = %d"), ninuse)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("\nnchunks = %d"), nchunks)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Malloc.h b/ACE/ace/Malloc.h index d14733690d4..ad79b150094 100644 --- a/ACE/ace/Malloc.h +++ b/ACE/ace/Malloc.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if defined (ACE_HAS_MALLOC_STATS) # include "ace/Atomic_Op.h" diff --git a/ACE/ace/Malloc_Allocator.cpp b/ACE/ace/Malloc_Allocator.cpp index 0d45a33347c..2a7653b5a8c 100644 --- a/ACE/ace/Malloc_Allocator.cpp +++ b/ACE/ace/Malloc_Allocator.cpp @@ -9,7 +9,7 @@ #include "ace/Guard_T.h" #include "ace/Recursive_Thread_Mutex.h" -#include "ace/Log_Msg.h" // for ACE_ASSERT +#include "ace/Log_Category.h" // for ACE_ASSERT #include "ace/OS_NS_string.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -346,13 +346,13 @@ ACE_Static_Allocator_Base::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Static_Allocator_Base::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\noffset_ = %d"), this->offset_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d\n"), this->size_)); - ACE_HEX_DUMP ((LM_DEBUG, this->buffer_, this->size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\noffset_ = %d"), this->offset_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d\n"), this->size_)); + ACELIB_HEX_DUMP ((LM_DEBUG, this->buffer_, this->size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp index ffa9772644a..d98b5c95672 100644 --- a/ACE/ace/Malloc_T.cpp +++ b/ACE/ace/Malloc_T.cpp @@ -363,15 +363,15 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->memory_pool_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("cb_ptr_ = %@\n"), this->cb_ptr_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("cb_ptr_ = %@\n"), this->cb_ptr_)); this->cb_ptr_->dump (); #if defined (ACE_HAS_MALLOC_STATS) if (this->cb_ptr_ != 0) this->cb_ptr_->malloc_stats_.dump (); #endif /* ACE_HAS_MALLOC_STATS */ - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -386,14 +386,14 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::print_stats (void) const if (this->cb_ptr_ == 0) return; this->cb_ptr_->malloc_stats_.dump (); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) contents of freelist:\n"))); for (MALLOC_HEADER *currp = this->cb_ptr_->freep_->next_block_; ; currp = currp->next_block_) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ptr = %@, MALLOC_HEADER units = %d, byte units = %d\n"), currp, currp->size_, @@ -436,13 +436,13 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::open (void) rounded_bytes, first_time); if (this->cb_ptr_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("init_acquire failed")), -1); else if (first_time) { - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) first time in, control block = %@\n"), this->cb_ptr_)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) first time in, control block = %@\n"), this->cb_ptr_)); MALLOC_HEADER::init_ptr (&this->cb_ptr_->freep_, &this->cb_ptr_->base_, @@ -513,7 +513,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p this->bad_flag_ = this->open (); if (this->bad_flag_ == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); } @@ -537,7 +537,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p this->bad_flag_ = this->open (); if (this->bad_flag_ == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); } @@ -564,7 +564,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p this->bad_flag_ = this->open (); if (this->bad_flag_ == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); } @@ -586,7 +586,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove (void) { ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove"); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) destroying ACE_Malloc_T\n"))); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) destroying ACE_Malloc_T\n"))); #if defined (ACE_HAS_MALLOC_STATS) this->print_stats (); @@ -714,10 +714,10 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_malloc (size_t nbytes) else return 0; // Shouldn't do this here because of errors with the wchar ver - // This is because ACE_ERROR_RETURN converts the __FILE__ to + // This is because ACELIB_ERROR_RETURN converts the __FILE__ to // wchar before printing out. The compiler will complain // about this since a destructor would present in a SEH block - //ACE_ERROR_RETURN ((LM_ERROR, + //ACELIB_ERROR_RETURN ((LM_ERROR, // ACE_TEXT ("(%P|%t) %p\n"), // ACE_TEXT ("malloc")), // 0); @@ -1051,11 +1051,11 @@ ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->curr_->dump (); this->guard_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %C\n"), this->name_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %C\n"), this->name_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -1145,11 +1145,11 @@ ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->curr_->dump (); this->guard_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %s\n"), this->name_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %s\n"), this->name_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Map_Manager.cpp b/ACE/ace/Map_Manager.cpp index 90854213915..8201b129e79 100644 --- a/ACE/ace/Map_Manager.cpp +++ b/ACE/ace/Map_Manager.cpp @@ -595,15 +595,15 @@ template <class EXT_ID, class INT_ID> void ACE_Map_Entry<EXT_ID, INT_ID>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %d"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("prev_ = %d"), this->prev_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %d"), this->next_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("prev_ = %d"), this->prev_)); #if defined (ACE_HAS_LAZY_MAP_MANAGER) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("free_ = %d"), this->free_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("free_ = %d"), this->free_)); #endif /* ACE_HAS_LAZY_MAP_MANAGER */ - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -611,12 +611,12 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> void ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("total_size_ = %d"), this->total_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("total_size_ = %d"), this->total_size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_)); this->allocator_->dump (); this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -624,9 +624,9 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> void ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %d"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %d"), this->next_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -634,9 +634,9 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> void ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %d"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %d"), this->next_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Map_Manager.inl b/ACE/ace/Map_Manager.inl index 6e0ff227a1d..230a9621b43 100644 --- a/ACE/ace/Map_Manager.inl +++ b/ACE/ace/Map_Manager.inl @@ -3,7 +3,7 @@ // $Id$ #include "ace/Guard_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -56,7 +56,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Manager (size_t size, cur_size_ (0) { if (this->open (size, alloc) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Map_Manager\n"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Map_Manager\n"))); } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE @@ -67,7 +67,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Manager (ACE_Allocator *alloc cur_size_ (0) { if (this->open (ACE_DEFAULT_MAP_SIZE, alloc) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Map_Manager\n"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Map_Manager\n"))); } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int diff --git a/ACE/ace/Mem_Map.cpp b/ACE/ace/Mem_Map.cpp index 477bd8b6a50..eb14eb1e764 100644 --- a/ACE/ace/Mem_Map.cpp +++ b/ACE/ace/Mem_Map.cpp @@ -11,7 +11,7 @@ #include "ace/OS_NS_sys_stat.h" #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_string.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Truncate.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -24,14 +24,14 @@ ACE_Mem_Map::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Mem_Map::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base_addr_ = %x"), this->base_addr_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nfilename_ = %s"), this->filename_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nlength_ = %d"), this->length_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandle_ = %d"), this->handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nfile_mapping_ = %d"), this->file_mapping_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nclose_handle_ = %d"), this->close_handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("base_addr_ = %x"), this->base_addr_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nfilename_ = %s"), this->filename_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nlength_ = %d"), this->length_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandle_ = %d"), this->handle_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nfile_mapping_ = %d"), this->file_mapping_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nclose_handle_ = %d"), this->close_handle_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -273,7 +273,7 @@ ACE_Mem_Map::ACE_Mem_Map (const ACE_TCHAR *file_name, addr, offset, sa) < 0) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Mem_Map::ACE_Mem_Map"))); } @@ -306,7 +306,7 @@ ACE_Mem_Map::ACE_Mem_Map (ACE_HANDLE handle, addr, offset, sa) < 0) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Mem_Map::ACE_Mem_Map"))); } diff --git a/ACE/ace/Message_Block.cpp b/ACE/ace/Message_Block.cpp index e9d09349780..7d4dbc58155 100644 --- a/ACE/ace/Message_Block.cpp +++ b/ACE/ace/Message_Block.cpp @@ -6,7 +6,7 @@ #endif /* __ACE_INLINE__ */ #include "ace/Guard_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Malloc_Base.h" #include "ace/OS_NS_string.h" @@ -144,8 +144,8 @@ ACE_Data_Block::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Data_Block::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("-----( Data Block )-----\n") ACE_TEXT ("type_ = %d\n") ACE_TEXT ("cur_size_ = %u\n") @@ -163,7 +163,7 @@ ACE_Data_Block::dump (void) const this->locking_strategy_, this->reference_count_)); this->allocator_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -172,8 +172,8 @@ ACE_Message_Block::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Message_Block::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("-----( Message Block )-----\n") ACE_TEXT ("priority_ = %d\n") ACE_TEXT ("next_ = %@\n") @@ -189,7 +189,7 @@ ACE_Message_Block::dump (void) const this->rd_ptr_, this->wr_ptr_)); this->data_block ()->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -404,7 +404,7 @@ ACE_Message_Block::ACE_Message_Block (const char *data, 0, // data block 0, // data_block allocator 0) == -1) // message_block allocator - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Message_Block"))); } @@ -427,7 +427,7 @@ ACE_Message_Block::ACE_Message_Block (ACE_Allocator *message_block_allocator) 0, // data block 0, // data_block allocator message_block_allocator) == -1) // message_block allocator - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Message_Block"))); } @@ -460,7 +460,7 @@ ACE_Message_Block::ACE_Message_Block (size_t size, 0, // data block data_block_allocator, message_block_allocator) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Message_Block"))); } @@ -547,7 +547,7 @@ ACE_Message_Block::ACE_Message_Block (size_t size, db, data_block_allocator, message_block_allocator) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Message_Block"))); } @@ -572,7 +572,7 @@ ACE_Message_Block::ACE_Message_Block (ACE_Data_Block *data_block, data_block, // data block data_block->data_block_allocator (), message_block_allocator) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Message_Block"))); } @@ -599,7 +599,7 @@ ACE_Message_Block::ACE_Message_Block (const ACE_Message_Block &mb, mb.data_block ()->duplicate (), // data block mb.data_block ()->data_block_allocator (), mb.message_block_allocator_) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Message_Block"))); #if !defined (ACE_LACKS_CDR_ALIGNMENT) // Align ourselves @@ -629,7 +629,7 @@ ACE_Message_Block::ACE_Message_Block (const ACE_Message_Block &mb, mb.data_block ()->clone_nocopy (),// data block mb.data_block ()->data_block_allocator (), mb.message_block_allocator_) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Message_Block"))); #if !defined (ACE_LACKS_CDR_ALIGNMENT) diff --git a/ACE/ace/Message_Queue.cpp b/ACE/ace/Message_Queue.cpp index db939ede170..d468cf6e247 100644 --- a/ACE/ace/Message_Queue.cpp +++ b/ACE/ace/Message_Queue.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Message_Queue.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) #include "ace/Message_Queue.inl" diff --git a/ACE/ace/Message_Queue_NT.cpp b/ACE/ace/Message_Queue_NT.cpp index 94a8f042ec7..7793eeb498b 100644 --- a/ACE/ace/Message_Queue_NT.cpp +++ b/ACE/ace/Message_Queue_NT.cpp @@ -2,7 +2,7 @@ #include "ace/Message_Queue.h" #include "ace/Message_Queue_NT.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) #include "ace/Message_Queue_NT.inl" @@ -197,24 +197,24 @@ ACE_Message_Queue_NT::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Message_Queue_NT::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); switch (this->state_) { case ACE_Message_Queue_Base::ACTIVATED: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("state = ACTIVATED\n"))); break; case ACE_Message_Queue_Base::DEACTIVATED: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("state = DEACTIVATED\n"))); break; case ACE_Message_Queue_Base::PULSED: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("state = PULSED\n"))); break; } - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("max_cthrs_ = %d\n") ACE_TEXT ("cur_thrs_ = %d\n") ACE_TEXT ("cur_bytes = %d\n") @@ -227,7 +227,7 @@ ACE_Message_Queue_NT::dump (void) const this->cur_length_, this->cur_count_, this->completion_port_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Message_Queue_T.cpp b/ACE/ace/Message_Queue_T.cpp index ffb66781a45..cc526cd72a9 100644 --- a/ACE/ace/Message_Queue_T.cpp +++ b/ACE/ace/Message_Queue_T.cpp @@ -7,7 +7,7 @@ // circular include problems. #include "ace/Message_Queue.h" #include "ace/Message_Queue_Vx.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_sys_time.h" #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) @@ -69,7 +69,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_ ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_Queue_Ex"); if (this->queue_.open (high_water_mark, low_water_mark, ns) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Message_Queue_Ex"))); } @@ -984,23 +984,23 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); switch (this->state_) { case ACE_Message_Queue_Base::ACTIVATED: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("state = ACTIVATED\n"))); break; case ACE_Message_Queue_Base::DEACTIVATED: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("state = DEACTIVATED\n"))); break; case ACE_Message_Queue_Base::PULSED: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("state = PULSED\n"))); break; } - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("low_water_mark = %d\n") ACE_TEXT ("high_water_mark = %d\n") ACE_TEXT ("cur_bytes = %d\n") @@ -1015,11 +1015,11 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const this->cur_count_, this->head_, this->tail_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_full_cond:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("not_full_cond:\n"))); not_full_cond_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_empty_cond:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("not_empty_cond:\n"))); not_empty_cond_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -1056,7 +1056,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_Queue (size_t hwm, ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_Queue"); if (this->open (hwm, lwm, ns) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("open"))); #if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1) @@ -1087,7 +1087,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue (void) { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue"); if (this->head_ != 0 && this->close () == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("close"))); #if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1) @@ -1478,7 +1478,7 @@ template <ACE_SYNCH_DECL, class TIME_POLICY> int ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_head_i (ACE_Message_Block *&first_item) { if (this->head_ ==0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Attempting to dequeue from empty queue")), -1); ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_head_i"); @@ -1604,7 +1604,7 @@ template <ACE_SYNCH_DECL, class TIME_POLICY> int ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_tail_i (ACE_Message_Block *&dequeued) { if (this->head_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Attempting to dequeue from empty queue")), -1); ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_tail_i"); @@ -1654,7 +1654,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_deadline_i (ACE_Message_B { #if defined (ACE_HAS_TIMED_MESSAGE_BLOCKS) if (this->head_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Attempting to dequeue from empty queue")), -1); ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_deadline_i"); @@ -2267,12 +2267,12 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY> (base class):\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY> (base class):\n"))); this->ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("pending_head_ = %u\n") ACE_TEXT ("pending_tail_ = %u\n") ACE_TEXT ("late_head_ = %u\n") @@ -2286,10 +2286,10 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const this->beyond_late_head_, this->beyond_late_tail_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("message_strategy_ :\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("message_strategy_ :\n"))); message_strategy_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } // dump the state of the queue @@ -2712,7 +2712,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::refresh_pending_queue (co else if (current_status != ACE_Dynamic_Message_Strategy::LATE) { // if we got here, something is *seriously* wrong with the queue - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unexpected message priority status [%d] (expected LATE)"), (int) current_status), -1); @@ -2754,7 +2754,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::refresh_pending_queue (co { if (current_status != ACE_Dynamic_Message_Strategy::PENDING) // if we got here, something is *seriously* wrong with the queue - ACE_ERROR_RETURN((LM_ERROR, + ACELIB_ERROR_RETURN((LM_ERROR, ACE_TEXT ("Unexpected message priority status [%d] (expected PENDING)"), (int) current_status), -1); @@ -2776,7 +2776,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::refresh_pending_queue (co break; // switch default: // if we got here, something is *seriously* wrong with the queue - ACE_ERROR_RETURN((LM_ERROR, + ACELIB_ERROR_RETURN((LM_ERROR, ACE_TEXT ("Unknown message priority status [%d]"), (int) current_status), -1); @@ -2832,7 +2832,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::refresh_late_queue (const } else if (current_status != ACE_Dynamic_Message_Strategy::LATE) // if we got here, something is *seriously* wrong with the queue - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unexpected message priority status [%d] (expected LATE)"), (int) current_status), -1); @@ -2853,14 +2853,14 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::refresh_late_queue (const case ACE_Dynamic_Message_Strategy::PENDING: // if we got here, something is *seriously* wrong with the queue - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unexpected message priority status ") ACE_TEXT ("[%d] (expected LATE or BEYOND_LATE)"), (int) current_status), -1); default: // if we got here, something is *seriously* wrong with the queue - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unknown message priority status [%d]"), (int) current_status), -1); diff --git a/ACE/ace/Message_Queue_Vx.cpp b/ACE/ace/Message_Queue_Vx.cpp index 369c4d3e656..c6cd1fdd438 100644 --- a/ACE/ace/Message_Queue_Vx.cpp +++ b/ACE/ace/Message_Queue_Vx.cpp @@ -2,7 +2,7 @@ #include "ace/Message_Queue.h" #include "ace/Message_Queue_Vx.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) #include "ace/Message_Queue_Vx.inl" @@ -21,23 +21,23 @@ ACE_Message_Queue_Vx::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Message_Queue_Vx::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); switch (this->state_) { case ACE_Message_Queue_Base::ACTIVATED: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("state = ACTIVATED\n"))); break; case ACE_Message_Queue_Base::DEACTIVATED: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("state = DEACTIVATED\n"))); break; case ACE_Message_Queue_Base::PULSED: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("state = PULSED\n"))); break; } - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("low_water_mark = %d\n") ACE_TEXT ("high_water_mark = %d\n") ACE_TEXT ("cur_bytes = %d\n") @@ -52,7 +52,7 @@ ACE_Message_Queue_Vx::dump (void) const this->cur_count_, this->head_, this->tail_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -66,7 +66,7 @@ ACE_Message_Queue_Vx::ACE_Message_Queue_Vx (size_t max_messages, ACE_TRACE ("ACE_Message_Queue_Vx::ACE_Message_Queue_Vx"); if (this->open (max_messages_, max_message_length_, ns) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("open"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("open"))); } ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx (void) @@ -74,7 +74,7 @@ ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx (void) ACE_TRACE ("ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx"); if (this->tail_ != 0 && this->close () == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("close"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("close"))); } // Don't bother locking since if someone calls this function more than diff --git a/ACE/ace/Module.cpp b/ACE/ace/Module.cpp index 23ce361d789..a0850d489f6 100644 --- a/ACE/ace/Module.cpp +++ b/ACE/ace/Module.cpp @@ -193,7 +193,7 @@ ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::ACE_Module (const ACE_TCHAR *module_name this->q_pair_[1] = 0; if (this->open (module_name, writer_q, reader_q, args, flags) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Module"))); } diff --git a/ACE/ace/Monitor_Admin.cpp b/ACE/ace/Monitor_Admin.cpp index f0770451f7f..90a03c22212 100644 --- a/ACE/ace/Monitor_Admin.cpp +++ b/ACE/ace/Monitor_Admin.cpp @@ -58,7 +58,7 @@ namespace ACE if (!good_reg_add) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "registration of %s failed\n", monitor_point->name ()), good_reg_add); diff --git a/ACE/ace/Monitor_Base.cpp b/ACE/ace/Monitor_Base.cpp index a23f509eb9f..0e6295ad408 100644 --- a/ACE/ace/Monitor_Base.cpp +++ b/ACE/ace/Monitor_Base.cpp @@ -53,7 +53,7 @@ namespace ACE { if (this->data_.type_ == Monitor_Control_Types::MC_LIST) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("receive: can't store numeric value - ") ACE_TEXT ("%s is a string type monitor\n"), this->name_.c_str ())); @@ -108,7 +108,7 @@ namespace ACE { if (this->data_.type_ != Monitor_Control_Types::MC_LIST) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("receive: can't store string values - ") ACE_TEXT ("%s is a numeric type monitor\n"), this->name_.c_str ())); @@ -211,7 +211,7 @@ namespace ACE if (!mgr->admin ().monitor_point (this, time)) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, "monitor point %s registration failed\n", this->name ())); } @@ -228,7 +228,7 @@ namespace ACE // is using malloc with placement, then free, which may bypass the // normal destructors. In any case, it happens only at shutdown // and there seems to be no memory leak. -// ACE_ERROR ((LM_ERROR, +// ACELIB_ERROR ((LM_ERROR, // "monitor point %s unregistration failed\n", // this->name ())); } @@ -241,7 +241,7 @@ namespace ACE || this->data_.type_ == Monitor_Control_Types::MC_GROUP || this->data_.type_ == Monitor_Control_Types::MC_LIST) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("average: %s is wrong monitor type\n"), this->name_.c_str ()), 0); @@ -261,7 +261,7 @@ namespace ACE || this->data_.type_ == Monitor_Control_Types::MC_GROUP || this->data_.type_ == Monitor_Control_Types::MC_LIST) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("sum_of_squares: %s ") ACE_TEXT ("is wrong monitor type\n"), this->name_.c_str ()), @@ -278,7 +278,7 @@ namespace ACE { if (this->data_.type_ == Monitor_Control_Types::MC_GROUP) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("count: %s is a monitor group\n"), this->name_.c_str ()), 0UL); @@ -297,7 +297,7 @@ namespace ACE if (this->data_.type_ == Monitor_Control_Types::MC_GROUP || this->data_.type_ == Monitor_Control_Types::MC_LIST) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("minimum_sample: %s ") ACE_TEXT ("is wrong monitor type\n"), this->name_.c_str ()), @@ -315,7 +315,7 @@ namespace ACE if (this->data_.type_ == Monitor_Control_Types::MC_GROUP || this->data_.type_ == Monitor_Control_Types::MC_LIST) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("maximum_sample: %s ") ACE_TEXT ("is wrong monitor type\n"), this->name_.c_str ()), @@ -333,7 +333,7 @@ namespace ACE if (this->data_.type_ == Monitor_Control_Types::MC_GROUP || this->data_.type_ == Monitor_Control_Types::MC_LIST) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("last_sample: %s ") ACE_TEXT ("is wrong monitor type\n"), this->name_.c_str ()), @@ -352,7 +352,7 @@ namespace ACE if (this->data_.type_ != Monitor_Control_Types::MC_LIST) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("get_list: %s is not a ") ACE_TEXT ("list monitor type\n"), this->name_.c_str ())); diff --git a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp index d79247a4466..165143d4020 100644 --- a/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp @@ -4,7 +4,7 @@ #if defined (__NetBSD__) || defined (__OpenBSD__) -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_stdio.h" #include <sys/types.h> #include <sys/socket.h> @@ -56,7 +56,7 @@ namespace ACE if (fd == -1) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("socket failed\n"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("socket failed\n"))); return; } @@ -64,7 +64,7 @@ namespace ACE if (getifaddrs (&ifap) < 0) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("getifaddrs failed\n"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("getifaddrs failed\n"))); close (fd); return; } @@ -96,7 +96,7 @@ namespace ACE #endif if (ioctl (fd, SIOCGIFDATA, &ifdr) == -1) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("SIOCGIFDATA failed\n"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("SIOCGIFDATA failed\n"))); } #if defined (__OpenBSD__) diff --git a/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp b/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp index 8d11650fea5..f7b4e862436 100644 --- a/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp +++ b/ACE/ace/Monitor_Control/CPU_Load_Monitor.cpp @@ -126,7 +126,7 @@ namespace ACE if (this->file_ptr_ == 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("CPU load - opening /proc/stat failed\n"))); return; } @@ -168,7 +168,7 @@ namespace ACE if (this->kstats_ == 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("opening kstats file failed\n"))); return; } @@ -224,7 +224,7 @@ namespace ACE if (! this->kstat_id_ > 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("kstat chain update ") ACE_TEXT ("returned null id\n"))); return; @@ -241,7 +241,7 @@ namespace ACE if (status != 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("closing kstats file failed\n"))); } } diff --git a/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp b/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp index 42a3b854a84..276c2304d31 100644 --- a/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp +++ b/ACE/ace/Monitor_Control/Constraint_Interpreter.cpp @@ -4,7 +4,7 @@ #if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1) -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/ETCL/ETCL_Constraint.h" @@ -39,7 +39,7 @@ namespace ACE /// root_ is set in this base class call. if (ETCL_Interpreter::build_tree (constraints) != 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "Constraint_Interpreter::build_tree() - " "ETCL_Interpreter::build_tree() failed\n"), -1); diff --git a/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp index 3d6e4b2e177..9bebd03dacb 100644 --- a/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp @@ -4,7 +4,7 @@ #if defined (__FreeBSD__) || defined (__Lynx__) -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_stdio.h" #include <sys/types.h> @@ -66,7 +66,7 @@ namespace ACE if (::sysctl(req_name, 5, &ifcount, &ifcount_len, (void *)0, 0) == -1) { - ACE_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) %p\n"), + ACELIB_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) %p\n"), ACE_TEXT("sysctl failed"))); return; @@ -87,7 +87,7 @@ namespace ACE if(::sysctl(name, 6, &ifmd, &len, (void *)0, 0) == -1) { - ACE_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) %p\n"), + ACELIB_ERROR((LM_ERROR, ACE_TEXT("(%P|%t) %p\n"), ACE_TEXT("sysctl failed"))); break; diff --git a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp index 32588390ccd..255354250b5 100644 --- a/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp @@ -4,7 +4,7 @@ #if defined (ACE_LINUX) || defined (AIX) -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_stdio.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -31,7 +31,7 @@ namespace ACE if (fp == 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("bytes sent - opening ") ACE_TEXT ("/proc/net/dev failed\n"))); return; @@ -90,7 +90,7 @@ namespace ACE if (fp == 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("bytes sent - opening ") ACE_TEXT ("/proc/net/dev failed\n"))); return; diff --git a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp index 179c6c144ef..c56fd4add75 100644 --- a/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Memory_Usage_Monitor.cpp @@ -34,7 +34,7 @@ namespace ACE #elif defined (ACE_HAS_LINUX_SYSINFO) if (::sysinfo (&this->sysinfo_) != 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Memory usage - sysinfo() failed\n"))); return; } diff --git a/ACE/ace/Monitor_Control/Monitor_Query.cpp b/ACE/ace/Monitor_Control/Monitor_Query.cpp index 997ffcbcd6a..30c0768c9b9 100644 --- a/ACE/ace/Monitor_Control/Monitor_Query.cpp +++ b/ACE/ace/Monitor_Control/Monitor_Query.cpp @@ -41,7 +41,7 @@ namespace ACE if (this->monitor_ == 0) { - ACE_ERROR ((LM_ERROR, "Monitor_Query - monitor lookup failed\n")); + ACELIB_ERROR ((LM_ERROR, "Monitor_Query - monitor lookup failed\n")); } } @@ -50,7 +50,7 @@ namespace ACE { if (this->monitor_ == 0) { - ACE_ERROR ((LM_ERROR, "Monitor_Query::query - null monitor\n")); + ACELIB_ERROR ((LM_ERROR, "Monitor_Query::query - null monitor\n")); return; } diff --git a/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp b/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp index 7c9c5e6e177..2609f569ad2 100644 --- a/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Num_Threads_Monitor.cpp @@ -40,7 +40,7 @@ namespace ACE if (this->file_ptr_ == 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Num threads - opening ") ACE_TEXT ("/proc/self/status failed\n"))); return; diff --git a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp index 86170fd6c6d..b1db0ebebcc 100644 --- a/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp @@ -4,7 +4,7 @@ #if defined (ACE_HAS_KSTAT) -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_stdio.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -61,7 +61,7 @@ namespace ACE if (this->kstats_ == 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("opening kstats file failed\n"))); return; } @@ -139,7 +139,7 @@ namespace ACE if (! this->kstat_id_ > 0) { - ACE_ERROR ((LM_ERROR, "kstat is is not > 0.\n")); + ACELIB_ERROR ((LM_ERROR, "kstat is is not > 0.\n")); break; } } @@ -153,7 +153,7 @@ namespace ACE if (status != 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("closing kstats file failed\n"))); } } @@ -168,7 +168,7 @@ namespace ACE { if (! (ks_instance < which_max)) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "%s exceeded.\n", max_str), -1); @@ -201,7 +201,7 @@ namespace ACE if (value->data_type != KSTAT_DATA_UINT32) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "Wrong data type.\n"), -1); } diff --git a/ACE/ace/Monitor_Control/Windows_Monitor.cpp b/ACE/ace/Monitor_Control/Windows_Monitor.cpp index 4177eb87ed7..f5ed8dd8115 100644 --- a/ACE/ace/Monitor_Control/Windows_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Windows_Monitor.cpp @@ -4,7 +4,7 @@ #if defined (ACE_HAS_WIN32_PDH) -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -52,7 +52,7 @@ namespace ACE if (ERROR_SUCCESS != this->status_) { - ACE_ERROR ((LM_DEBUG, ACE_TEXT ("PdhOpenQuery failed\n"))); + ACELIB_ERROR ((LM_DEBUG, ACE_TEXT ("PdhOpenQuery failed\n"))); } this->status_ = @@ -63,7 +63,7 @@ namespace ACE if (ERROR_SUCCESS != this->status_) { - ACE_ERROR ((LM_DEBUG, + ACELIB_ERROR ((LM_DEBUG, ACE_TEXT ("PdhAddCounter %s failed\n"), this->path_.c_str ())); } diff --git a/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp b/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp index 7bd77a67637..bf388fe5f58 100644 --- a/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp +++ b/ACE/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp @@ -4,7 +4,7 @@ #if defined (ACE_HAS_WIN32_PDH) -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/SString.h" #include "ace/os_include/os_pdhmsg.h" @@ -44,7 +44,7 @@ namespace ACE if (PDH_CSTATUS_VALID_DATA != static_cast<DWORD> (this->status_)) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%s: PdhExpandCounterPath failed\n"), wildcard_path)); } diff --git a/ACE/ace/Monitor_Point_Registry.cpp b/ACE/ace/Monitor_Point_Registry.cpp index a451484b846..d38165b445f 100644 --- a/ACE/ace/Monitor_Point_Registry.cpp +++ b/ACE/ace/Monitor_Point_Registry.cpp @@ -29,7 +29,7 @@ namespace ACE { if (type == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "registry add: null type\n"), false); } @@ -44,12 +44,12 @@ namespace ACE status = this->map_.bind (type->name (), type); /// Temporary debugging code. -// ACE_DEBUG ((LM_DEBUG, "adding %s\n", type->name ())); +// ACELIB_DEBUG ((LM_DEBUG, "adding %s\n", type->name ())); } if (status == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "registry add: map bind failed\n"), false); } @@ -62,7 +62,7 @@ namespace ACE { if (name == 0) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "registry remove: null name\n"), false); } @@ -77,7 +77,7 @@ namespace ACE status = this->map_.unbind (name_str, mp); /// Temporary debugging code. -// ACE_DEBUG ((LM_DEBUG, "removing %s\n", name_str.c_str ())); +// ACELIB_DEBUG ((LM_DEBUG, "removing %s\n", name_str.c_str ())); } if (status == -1) @@ -88,7 +88,7 @@ namespace ACE // is using malloc with placement, then free, which may bypass the // normal destructors. In any case, it happens only at shutdown // and there seems to be no memory leak. -// ACE_ERROR_RETURN ((LM_ERROR, +// ACELIB_ERROR_RETURN ((LM_ERROR, // "registry remove: unbind failed for %s\n", // name), // false); diff --git a/ACE/ace/Multihomed_INET_Addr.cpp b/ACE/ace/Multihomed_INET_Addr.cpp index 692b00168cf..fa1aa8e5ab1 100644 --- a/ACE/ace/Multihomed_INET_Addr.cpp +++ b/ACE/ace/Multihomed_INET_Addr.cpp @@ -3,7 +3,7 @@ // Extends ACE_INET_Addr with support for multi-homed addresses. #include "ace/Multihomed_INET_Addr.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) # include "ace/Multihomed_INET_Addr.inl" @@ -49,7 +49,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, encode, address_family); if (ret) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Invalid INET addr (%C:%u) will be ignored\n"), secondary_host_names[i], port_number)); this->secondaries_.size(this->secondaries_.size() - 1); @@ -85,7 +85,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, encode, address_family); if (ret) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"), ACE_TEXT_WCHAR_TO_TCHAR (secondary_host_names[i]), port_number)); this->secondaries_.size(this->secondaries_.size() - 1); @@ -120,7 +120,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, encode); if (ret) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "Invalid INET addr (%u:%u) will be ignored\n", secondary_ip_addrs[i], port_number)); this->secondaries_.size(this->secondaries_.size() - 1); diff --git a/ACE/ace/Mutex.cpp b/ACE/ace/Mutex.cpp index c908aacbb13..7841cdaaddf 100644 --- a/ACE/ace/Mutex.cpp +++ b/ACE/ace/Mutex.cpp @@ -6,7 +6,7 @@ #include "ace/Mutex.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_string.h" #include "ace/os_include/sys/os_mman.h" @@ -20,13 +20,13 @@ ACE_Mutex::dump (void) const #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Mutex::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); #if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("lockname_ = %s\n"), this->lockname_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("process_lock_ = %x\n"), this->process_lock_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("lockname_ = %s\n"), this->lockname_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("process_lock_ = %x\n"), this->process_lock_)); #endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -88,7 +88,7 @@ ACE_Mutex::ACE_Mutex (int type, const ACE_TCHAR *name, name, arg) != 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Mutex::ACE_Mutex"))); return; @@ -105,7 +105,7 @@ ACE_Mutex::ACE_Mutex (int type, const ACE_TCHAR *name, type, name, arg) != 0) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Mutex::ACE_Mutex"))); #if defined(ACE_HAS_PTHREADS) || defined (ACE_HAS_STHREADS) diff --git a/ACE/ace/NT_Service.cpp b/ACE/ace/NT_Service.cpp index 73ced4c2997..9b56bd3570b 100644 --- a/ACE/ace/NT_Service.cpp +++ b/ACE/ace/NT_Service.cpp @@ -9,7 +9,7 @@ #include "ace/NT_Service.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Service_Object.h" #include "ace/OS_NS_errno.h" diff --git a/ACE/ace/Name_Proxy.cpp b/ACE/ace/Name_Proxy.cpp index 2b9b77ce65c..6666c60d670 100644 --- a/ACE/ace/Name_Proxy.cpp +++ b/ACE/ace/Name_Proxy.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Name_Proxy.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/os_include/arpa/os_inet.h" @@ -14,11 +14,11 @@ ACE_Name_Proxy::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Name_Proxy::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->connector_.dump (); this->peer_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("reactor_ = %x"), this->reactor_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("reactor_ = %x"), this->reactor_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -58,7 +58,7 @@ ACE_Name_Proxy::ACE_Name_Proxy ( ACE_TRACE ("ACE_Name_Proxy::ACE_Name_Proxy"); if (this->open (remote_addr, options) == -1 && options[ACE_Synch_Options::USE_TIMEOUT] && errno != EWOULDBLOCK) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Name_Proxy::ACE_Name_Proxy"))); } @@ -80,7 +80,7 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request) ssize_t length = request.encode (buffer); if (length == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("encode failed")), -1); @@ -88,7 +88,7 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request) // Transmit request via a blocking send. if (this->peer_.send_n (buffer, length) != length) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("send_n failed")), -1); @@ -100,12 +100,12 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request) if (this->peer_.recv_n (&reply, sizeof reply) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("recv failed")), -1); else if (reply.decode () == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("decode failed")), -1); @@ -122,7 +122,7 @@ ACE_Name_Proxy::send_request (ACE_Name_Request &request) ssize_t length = request.encode (buffer); if (length == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("encode failed")), -1); @@ -130,7 +130,7 @@ ACE_Name_Proxy::send_request (ACE_Name_Request &request) // Transmit request via a blocking send. else if (this->peer_.send_n (buffer, length) != length) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("send_n failed")), -1); @@ -150,10 +150,10 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) { case -1: // FALLTHROUGH - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("****************** recv_reply returned -1\n"))); default: - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p got %d bytes, expected %d bytes\n"), ACE_TEXT ("recv failed"), n, @@ -177,7 +177,7 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) // Subtract off the size of the part we skipped over... if (n != ssize_t (length - sizeof (ACE_UINT32))) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p expected %d, got %d\n"), ACE_TEXT ("invalid length"), length, @@ -188,7 +188,7 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) // Decode the request into host byte order. if (reply.decode () == -1) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("decode failed"))); return -1; diff --git a/ACE/ace/Name_Request_Reply.cpp b/ACE/ace/Name_Request_Reply.cpp index 43c61e79303..af13c9ae964 100644 --- a/ACE/ace/Name_Request_Reply.cpp +++ b/ACE/ace/Name_Request_Reply.cpp @@ -3,7 +3,7 @@ #include "ace/Name_Request_Reply.h" #include "ace/Basic_Types.h" #include "ace/CDR_Base.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Time_Value.h" #include "ace/Truncate.h" #include "ace/OS_NS_string.h" @@ -333,82 +333,82 @@ ACE_Name_Request::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Name_Request::dump"); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("*******\nlength = %d\n"), this->length ())); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("message-type = "))); switch (this->msg_type ()) { case ACE_Name_Request::BIND: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("BIND\n"))); break; case ACE_Name_Request::REBIND: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("REBIND\n"))); break; case ACE_Name_Request::RESOLVE: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("RESOLVE\n"))); break; case ACE_Name_Request::UNBIND: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("UNBIND\n"))); break; case ACE_Name_Request::LIST_NAMES: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("LIST_NAMES\n"))); break; case ACE_Name_Request::LIST_VALUES: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("LIST_VALUES\n"))); break; case ACE_Name_Request::LIST_TYPES: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("LIST_TYPES\n"))); break; case ACE_Name_Request::LIST_NAME_ENTRIES: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("LIST_NAME_ENTRIES\n"))); break; case ACE_Name_Request::LIST_VALUE_ENTRIES: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("LIST_VALUE_ENTRIES\n"))); break; case ACE_Name_Request::LIST_TYPE_ENTRIES: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("LIST_TYPE_ENTRIES\n"))); break; default: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("<unknown type> = %d\n"), this->msg_type ())); break; } if (this->block_forever ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("blocking forever\n"))); else { #if !defined (ACE_NLOGGING) ACE_Time_Value tv = this->timeout (); #endif /* ! ACE_NLOGGING */ - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("waiting for %d secs and %d usecs\n"), tv.sec (), tv.usec ())); } - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("*******\nname_len = %d\n"), this->name_len ())); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("*******\nvalue_len = %d\n"), this->value_len ())); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("+++++++\n"))); #endif /* ACE_HAS_DUMP */ } @@ -548,24 +548,24 @@ ACE_Name_Reply::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Name_Reply::dump"); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("*******\nlength = %d\nerrnum = %d"), this->length (), this->errnum ())); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("type = "))); switch (this->msg_type ()) { case 0: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("SUCCESS\n"))); break; case -1: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("FAILURE\n"))); break; default: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("<unknown type> = %d\n"), this->msg_type ())); break; diff --git a/ACE/ace/Naming_Context.cpp b/ACE/ace/Naming_Context.cpp index f45c355c59b..f588c153131 100644 --- a/ACE/ace/Naming_Context.cpp +++ b/ACE/ace/Naming_Context.cpp @@ -110,7 +110,7 @@ ACE_Naming_Context::open (Context_Scope_Type scope_in, int lite) } if (ACE_LOG_MSG->op_status () != 0 || this->name_space_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("NAME_SPACE::NAME_SPACE\n")), -1); return 0; @@ -162,7 +162,7 @@ ACE_Naming_Context::ACE_Naming_Context (Context_Scope_Type scope_in, // Initialize. if (this->open (scope_in, lite) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Naming_Context::ACE_Naming_Context"))); } @@ -399,7 +399,7 @@ int ACE_Naming_Context::init (int argc, ACE_TCHAR *argv[]) { if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Naming_Context::init\n"))); this->name_options_->parse_args (argc, argv); return this->open (this->name_options_->context ()); @@ -409,7 +409,7 @@ int ACE_Naming_Context::fini (void) { if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Naming_Context::fini\n"))); this->close_down (); return 0; @@ -435,7 +435,7 @@ ACE_Name_Options::ACE_Name_Options (void) if (ACE::get_temp_dir (this->namespace_dir_, MAXPATHLEN) == -1) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Temporary path too long, ") ACE_TEXT ("defaulting to current directory\n"))); ACE_OS::strcpy (this->namespace_dir_, ACE_TEXT (".")); diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index 02bf6c81b34..eac4e1627fa 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -14,7 +14,7 @@ #include "ace/Object_Manager_Base.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_ctype.h" -#include "ace/Log_Msg.h" // for ACE_ASSERT +#include "ace/Log_Category.h" // for ACE_ASSERT // This is necessary to work around nasty problems with MVS C++. #include "ace/Auto_Ptr.h" #include "ace/Thread_Mutex.h" @@ -400,10 +400,10 @@ ACE_TSS_Info::dump (void) // ACE_OS_TRACE ("ACE_TSS_Info::dump"); # if 0 - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %u\n"), this->key_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("destructor_ = %u\n"), this->destructor_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %u\n"), this->key_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("destructor_ = %u\n"), this->destructor_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); # endif /* 0 */ # endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h index 2cbe9679a77..c6db5db25df 100644 --- a/ACE/ace/OS_NS_Thread.h +++ b/ACE/ace/OS_NS_Thread.h @@ -1720,6 +1720,11 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION const char* thr_name (void); + // Stores a string version of the current thread id into buffer and + // returns the size of this thread id in bytes. + ACE_NAMESPACE_INLINE_FUNCTION + ssize_t thr_id (char buffer[], size_t buffer_length); + /// State is THR_CANCEL_ENABLE or THR_CANCEL_DISABLE ACE_NAMESPACE_INLINE_FUNCTION int thr_setcancelstate (int new_state, int *old_state); diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index 054f9187a3d..5ee6b331b15 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -3079,6 +3079,38 @@ ACE_OS::thr_min_stack (void) #endif /* ACE_HAS_THREADS */ } +ACE_INLINE ssize_t +ACE_OS::thr_id (char buffer[], size_t buffer_length) +{ +#if defined (ACE_WIN32) +#if defined (ACE_HAS_SNPRINTF) + return ACE_OS::snprintf (buffer, + buffer_length, + "u", + static_cast <unsigned> (ACE_Thread::self ())); +#else + ACE_UNUSED_ARG (buffer_length); + return ACE_OS::sprintf (buffer, + "u", + static_cast <unsigned> (ACE_Thread::self ())); +#endif /* ACE_HAS_SNPRINTF */ +#else + ACE_hthread_t t_id; + ACE_OS::thr_self (t_id); +#if defined (ACE_HAS_SNPRINTF) + return ACE_OS::snprintf (buffer, + buffer_length, + "%lu", + (unsigned long) t_id); +#else + ACE_UNUSED_ARG (buffer_length); + return ACE_OS::sprintf (buffer, + "%lu", + (unsigned long) t_id); +#endif /* ACE_HAS_SNPRINTF */ +#endif /* WIN32 */ +} + ACE_INLINE ACE_thread_t ACE_OS::thr_self (void) { diff --git a/ACE/ace/OS_NS_dirent.cpp b/ACE/ace/OS_NS_dirent.cpp index 1291059bfaa..261cb8e9599 100644 --- a/ACE/ace/OS_NS_dirent.cpp +++ b/ACE/ace/OS_NS_dirent.cpp @@ -10,7 +10,7 @@ #include "ace/OS_NS_errno.h" #include "ace/OS_NS_string.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_stdlib.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp index 09024950f4a..80bec1ada89 100644 --- a/ACE/ace/OS_NS_stdio.cpp +++ b/ACE/ace/OS_NS_stdio.cpp @@ -44,25 +44,25 @@ ACE_OS::ace_flock_t::dump (void) const ACE_OS_TRACE ("ACE_OS::ace_flock_t::dump"); # if 0 - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %u"), this->handle_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %u"), this->handle_)); # if defined (ACE_WIN32) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nInternal = %d"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nInternal = %d"), this->overlapped_.Internal)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nInternalHigh = %d"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nInternalHigh = %d"), this->overlapped_.InternalHigh)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nOffsetHigh = %d"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nOffsetHigh = %d"), this->overlapped_.OffsetHigh)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhEvent = %d"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhEvent = %d"), this->overlapped_.hEvent)); # else - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_whence = %d"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_whence = %d"), this->lock_.l_whence)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_start = %d"), this->lock_.l_start)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_len = %d"), this->lock_.l_len)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_type = %d"), this->lock_.l_type)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_start = %d"), this->lock_.l_start)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_len = %d"), this->lock_.l_len)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_type = %d"), this->lock_.l_type)); # endif /* ACE_WIN32 */ - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); # endif /* 0 */ #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp index dde0b7f7e3e..8d7de400a8a 100644 --- a/ACE/ace/OS_NS_unistd.cpp +++ b/ACE/ace/OS_NS_unistd.cpp @@ -344,7 +344,7 @@ ACE_OS::fork_exec (ACE_TCHAR *argv[]) if (ACE_OS::execv (argv[0], argv) == -1) { // The OS layer should not print stuff out - // ACE_ERROR ((LM_ERROR, + // ACELIB_ERROR ((LM_ERROR, // "%p Exec failed\n")); // If the execv fails, this child needs to exit. diff --git a/ACE/ace/Obchunk.cpp b/ACE/ace/Obchunk.cpp index 682de1d76f5..2ed974bfcd3 100644 --- a/ACE/ace/Obchunk.cpp +++ b/ACE/ace/Obchunk.cpp @@ -16,10 +16,10 @@ ACE_Obchunk::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Obchunk::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("end_ = %x\n"), this->end_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("cur_ = %x\n"), this->cur_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("end_ = %x\n"), this->end_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("cur_ = %x\n"), this->cur_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Object_Manager.cpp b/ACE/ace/Object_Manager.cpp index fc4279c28d8..3abbd4d8fe7 100644 --- a/ACE/ace/Object_Manager.cpp +++ b/ACE/ace/Object_Manager.cpp @@ -10,7 +10,7 @@ # include "ace/Service_Config.h" #endif /* ! ACE_LACKS_ACE_SVCCONF */ #include "ace/Signal.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Malloc.h" #include "ace/Sig_Adapter.h" #include "ace/Framework_Component.h" @@ -170,9 +170,9 @@ LONG _stdcall ACE_UnhandledExceptionFilter (PEXCEPTION_POINTERS pExceptionInfo) DWORD dwExceptionCode = pExceptionInfo->ExceptionRecord->ExceptionCode; if (dwExceptionCode == EXCEPTION_ACCESS_VIOLATION) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("\nERROR: ACCESS VIOLATION\n"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("\nERROR: ACCESS VIOLATION\n"))); else - ACE_ERROR ((LM_ERROR, ACE_TEXT ("\nERROR: UNHANDLED EXCEPTION\n"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("\nERROR: UNHANDLED EXCEPTION\n"))); return EXCEPTION_EXECUTE_HANDLER; } diff --git a/ACE/ace/Obstack_T.cpp b/ACE/ace/Obstack_T.cpp index 961f065213a..fe9a2f15482 100644 --- a/ACE/ace/Obstack_T.cpp +++ b/ACE/ace/Obstack_T.cpp @@ -25,11 +25,11 @@ ACE_Obstack_T<ACE_CHAR_T>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("size_ = %d\n"), this->size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("head_ = %x\n"), this->head_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("curr_ = %x\n"), this->curr_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("size_ = %d\n"), this->size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("head_ = %x\n"), this->head_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("curr_ = %x\n"), this->curr_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -190,7 +190,7 @@ ACE_Obstack_T<ACE_CHAR_T>::unwind_i (void* obj) this->curr_->block_ = this->curr_->cur_ = reinterpret_cast<char*> (obj); } else if (obj != 0) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Deletion of non-existent object.\n%a"))); } diff --git a/ACE/ace/PI_Malloc.cpp b/ACE/ace/PI_Malloc.cpp index 72eab3b9fdf..d05b89ddf96 100644 --- a/ACE/ace/PI_Malloc.cpp +++ b/ACE/ace/PI_Malloc.cpp @@ -23,10 +23,10 @@ ACE_PI_Control_Block::ACE_Malloc_Header::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_PI_Control_Block::ACE_Malloc_Header::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_block = %x"), (ACE_Malloc_Header *) this->next_block_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize = %d\n"), this->size_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_block = %x"), (ACE_Malloc_Header *) this->next_block_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize = %d\n"), this->size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -35,8 +35,8 @@ ACE_PI_Control_Block::print_alignment_info (void) { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_PI_Control_Block::ACE_Control_Block::print_alignment_info"); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Start ---> ACE_PI_Control_Block::print_alignment_info:\n"))); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Start ---> ACE_PI_Control_Block::print_alignment_info:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Sizeof ptr: %d\n") ACE_TEXT ("Sizeof size_t: %d\n") ACE_TEXT ("Sizeof long: %d\n") @@ -62,7 +62,7 @@ ACE_PI_Control_Block::print_alignment_info (void) sizeof (ACE_Malloc_Header), sizeof (ACE_PI_Control_Block) )); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("End <--- ACE_PI_Control_Block::print_alignment_info:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("End <--- ACE_PI_Control_Block::print_alignment_info:\n"))); #endif /* ACE_HAS_DUMP */ } @@ -72,24 +72,24 @@ ACE_PI_Control_Block::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_PI_Control_Block::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Name Node:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Name Node:\n"))); for (ACE_Name_Node *nextn = this->name_head_; nextn != 0; nextn = nextn->next_) nextn->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("freep_ = %x"), (ACE_Malloc_Header *) this->freep_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("freep_ = %x"), (ACE_Malloc_Header *) this->freep_)); this->base_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nMalloc Header:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nMalloc Header:\n"))); for (ACE_Malloc_Header *nexth = ((ACE_Malloc_Header *)this->freep_)->next_block_; nexth != 0 && nexth != &this->base_; nexth = nexth->next_block_) nexth->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -144,15 +144,15 @@ ACE_PI_Control_Block::ACE_Name_Node::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_PI_Control_Block::ACE_Name_Node::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("pointer = %x"), (const char *) this->pointer_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nnext_ = %x"), (ACE_Name_Node *) this->next_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("pointer = %x"), (const char *) this->pointer_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("\nnext_ = %x"), (ACE_Name_Node *) this->next_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("\nname_ = (%x, %s)"), (const char *) this->name_, (const char *) this->name_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/POSIX_Asynch_IO.cpp b/ACE/ace/POSIX_Asynch_IO.cpp index 80b2ef218bc..13d02bf1f2f 100644 --- a/ACE/ace/POSIX_Asynch_IO.cpp +++ b/ACE/ace/POSIX_Asynch_IO.cpp @@ -97,7 +97,7 @@ ACE_POSIX_Asynch_Result::post_completion (ACE_Proactor_Impl *proactor_impl) ACE_POSIX_Proactor *posix_proactor = dynamic_cast<ACE_POSIX_Proactor *> (proactor_impl); if (posix_proactor == 0) - ACE_ERROR_RETURN ((LM_ERROR, "Dynamic cast to POSIX Proactor failed\n"), -1); + ACELIB_ERROR_RETURN ((LM_ERROR, "Dynamic cast to POSIX Proactor failed\n"), -1); // Post myself. return posix_proactor->post_completion (this); @@ -411,7 +411,7 @@ ACE_POSIX_Asynch_Write_Stream::write (ACE_Message_Block &message_block, bytes_to_write = len; if (bytes_to_write == 0) - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_POSIX_Asynch_Write_Stream::write:") ACE_TEXT ("Attempt to write 0 bytes\n")), @@ -522,7 +522,7 @@ ACE_POSIX_Asynch_Read_File::read (ACE_Message_Block &message_block, bytes_to_read=space; if ( bytes_to_read == 0 ) - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_POSIX_Asynch_Read_File::read:") ACE_TEXT ("Attempt to read 0 bytes or no space in the message block\n")), @@ -649,7 +649,7 @@ ACE_POSIX_Asynch_Write_File::write (ACE_Message_Block &message_block, bytes_to_write = len; if (bytes_to_write == 0) - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_POSIX_Asynch_Write_File::write:") ACE_TEXT ("Attempt to write 0 bytes\n")), @@ -808,7 +808,7 @@ ACE_POSIX_Asynch_Accept::open (const ACE_Handler::Proxy_Ptr &handler_proxy, // if we are already opened, // we could not create a new handler without closing the previous if (this->flg_open_) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%N:%l:ACE_POSIX_Asynch_Accept::open:") ACE_TEXT("acceptor already open\n")), -1); @@ -849,7 +849,7 @@ ACE_POSIX_Asynch_Accept::accept (ACE_Message_Block &message_block, ACE_TRACE ("ACE_POSIX_Asynch_Accept::accept"); if (!this->flg_open_) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%N:%l:ACE_POSIX_Asynch_Accept::accept") ACE_TEXT("acceptor was not opened before\n")), -1); @@ -892,7 +892,7 @@ ACE_POSIX_Asynch_Accept::accept (ACE_Message_Block &message_block, ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1)); if (this->result_queue_.enqueue_tail (result) == -1) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_POSIX_Asynch_Accept::accept: %p\n") ACE_TEXT ("enqueue_tail"))); delete result; // to avoid memory leak @@ -950,7 +950,7 @@ ACE_POSIX_Asynch_Accept::cancel_uncompleted (int flg_notify) result->set_error (ECANCELED); if (this->posix_proactor ()->post_completion (result) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("(%P | %t):%p\n"), ACE_TEXT("ACE_POSIX_Asynch_Accept::") ACE_TEXT("cancel_uncompleted") @@ -1077,7 +1077,7 @@ ACE_POSIX_Asynch_Accept::handle_input (ACE_HANDLE /* fd */) // Deregister this info pertaining to this accept call. if (this->result_queue_.dequeue_head (result) != 0) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%N:%l:(%P | %t):%p\n"), ACE_TEXT("ACE_POSIX_Asynch_Accept::handle_input:") ACE_TEXT( " dequeueing failed"))); @@ -1107,7 +1107,7 @@ ACE_POSIX_Asynch_Accept::handle_input (ACE_HANDLE /* fd */) if (new_handle == ACE_INVALID_HANDLE) { result->set_error (errno); - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%N:%l:(%P | %t):%p\n"), ACE_TEXT("ACE_POSIX_Asynch_Accept::handle_input: ") ACE_TEXT("accept"))); @@ -1121,7 +1121,7 @@ ACE_POSIX_Asynch_Accept::handle_input (ACE_HANDLE /* fd */) // Notify the main process about this completion // Send the Result through the notification pipe. if (this->posix_proactor ()->post_completion (result) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("Error:(%P | %t):%p\n"), ACE_TEXT("ACE_POSIX_Asynch_Accept::handle_input: ") ACE_TEXT(" <post_completion> failed"))); @@ -1247,7 +1247,7 @@ ACE_POSIX_Asynch_Connect::connect (ACE_HANDLE connect_handle, ACE_TRACE ("ACE_POSIX_Asynch_Connect::connect"); if (this->flg_open_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%N:%l:ACE_POSIX_Asynch_Connect::connect") ACE_TEXT("connector was not opened before\n")), -1); @@ -1281,7 +1281,7 @@ ACE_POSIX_Asynch_Connect::connect (ACE_HANDLE connect_handle, if (this->result_map_.bind (connect_handle, result) == -1) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%N:%l:%p\n"), ACE_TEXT ("ACE_POSIX_Asynch_Connect::connect:") ACE_TEXT ("bind"))); @@ -1327,7 +1327,7 @@ int ACE_POSIX_Asynch_Connect::post_result (ACE_POSIX_Asynch_Connect_Result * res if (this->posix_proactor ()->post_completion (result) == 0) return 0; - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("Error:(%P | %t):%p\n"), ACE_TEXT("ACE_POSIX_Asynch_Connect::post_result: ") ACE_TEXT(" <post_completion> failed"))); @@ -1371,7 +1371,7 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result, if (handle == ACE_INVALID_HANDLE) { result->set_error (errno); - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ACE_POSIX_Asynch_Connect::connect_i: %p\n"), ACE_TEXT("socket")), @@ -1389,7 +1389,7 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result, sizeof one) == -1 ) { result->set_error (errno); - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ACE_POSIX_Asynch_Connect::connect_i: %p\n"), ACE_TEXT("setsockopt")), @@ -1405,7 +1405,7 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result, if (ACE_OS::bind (handle, laddr, size) == -1) { result->set_error (errno); - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ACE_POSIX_Asynch_Connect::connect_i: %p\n"), ACE_TEXT("bind")), @@ -1417,7 +1417,7 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result, if (ACE::set_flags (handle, ACE_NONBLOCK) != 0) { result->set_error (errno); - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("ACE_POSIX_Asynch_Connect::connect_i: %p\n") ACE_TEXT("set_flags")), @@ -1841,7 +1841,7 @@ ACE_POSIX_Asynch_Transmit_Handler::transmit (void) this->result_->file (), 0, 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "ACE_Asynch_Transmit_Handler:read_file open failed\n"), -1); @@ -1850,7 +1850,7 @@ ACE_POSIX_Asynch_Transmit_Handler::transmit (void) this->result_->socket (), 0, 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "ACE_Asynch_Transmit_Handler:write_stream open failed\n"), -1); @@ -1859,7 +1859,7 @@ ACE_POSIX_Asynch_Transmit_Handler::transmit (void) this->result_->header_and_trailer ()->header_bytes (), reinterpret_cast<void *> (&this->header_act_), 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "Asynch_Transmit_Handler:transmitting header:write_stream failed\n"), -1); return 0; @@ -1876,7 +1876,7 @@ ACE_POSIX_Asynch_Transmit_Handler::handle_write_stream (const ACE_Asynch_Write_S { // Failure. - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, "Asynch_Transmit_File failed.\n")); ACE_SEH_TRY @@ -1900,7 +1900,7 @@ ACE_POSIX_Asynch_Transmit_Handler::handle_write_stream (const ACE_Asynch_Write_S size_t unsent_data = result.bytes_to_write () - result.bytes_transferred (); if (unsent_data != 0) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "%N:%l:Partial write to socket: Asynch_write called again\n")); // Duplicate the message block and retry remaining data @@ -1911,7 +1911,7 @@ ACE_POSIX_Asynch_Transmit_Handler::handle_write_stream (const ACE_Asynch_Write_S this->result_->signal_number ()) == -1) { // @@ Handle this error. - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, "Asynch_Transmit_Handler:write_stream failed\n")); return; } @@ -1953,13 +1953,13 @@ ACE_POSIX_Asynch_Transmit_Handler::handle_write_stream (const ACE_Asynch_Write_S // If header/data was sent, initiate the file data transmission. if (this->initiate_read_file () == -1) // @@ Handle this error. - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, "Error:Asynch_Transmit_Handler:read_file couldnt be initiated\n")); break; default: // @@ Handle this error. - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, "Error:ACE_Asynch_Transmit_Handler::handle_write_stream::Unexpected act\n")); } } @@ -2000,7 +2000,7 @@ ACE_POSIX_Asynch_Transmit_Handler::handle_read_file (const ACE_Asynch_Read_File: this->result_->signal_number ()) == -1) { // @@ Handle this error. - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, "Error:ACE_Asynch_Transmit_File : write to the stream failed\n")); return; } @@ -2018,7 +2018,7 @@ ACE_POSIX_Asynch_Transmit_Handler::initiate_read_file (void) (void *)&this->trailer_act_, this->result_->priority (), this->result_->signal_number ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "Error:Asynch_Transmit_Handler:write_stream writing trailer failed\n"), -1); return 0; @@ -2039,7 +2039,7 @@ ACE_POSIX_Asynch_Transmit_Handler::initiate_read_file (void) 0, // Act this->result_->priority (), this->result_->signal_number ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "Error:Asynch_Transmit_Handler::read from file failed\n"), -1); return 0; @@ -2069,7 +2069,7 @@ ACE_POSIX_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, ssize_t file_size = ACE_OS::filesize (file); if (file_size == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Error:%N:%l:%p\n"), ACE_TEXT("POSIX_Asynch_Transmit_File:filesize failed")), -1); @@ -2078,7 +2078,7 @@ ACE_POSIX_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, bytes_to_write = file_size; if (offset > (size_t) file_size) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Error:%p\n"), ACE_TEXT("Asynch_Transmit_File:File size is less than offset")), -1); @@ -2378,7 +2378,7 @@ ACE_POSIX_Asynch_Write_Dgram::send (ACE_Message_Block *message_block, { size_t len = message_block->length (); if (len == 0) - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_POSIX_Asynch_Write_Stream::write:") ACE_TEXT ("Attempt to write 0 bytes\n")), diff --git a/ACE/ace/POSIX_CB_Proactor.cpp b/ACE/ace/POSIX_CB_Proactor.cpp index 8bc90f593f2..24b229f38a8 100644 --- a/ACE/ace/POSIX_CB_Proactor.cpp +++ b/ACE/ace/POSIX_CB_Proactor.cpp @@ -5,7 +5,7 @@ #if defined (ACE_HAS_AIO_CALLS) && !defined (ACE_HAS_BROKEN_SIGEVENT_STRUCT) #include "ace/Task_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Object_Manager.h" #include "ace/OS_NS_sys_time.h" @@ -125,7 +125,7 @@ ACE_POSIX_CB_Proactor::handle_events_i (u_long milli_seconds) int const lerror = errno; if (lerror != ETIME && // timeout lerror != EINTR ) // interrupted system call - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%N:%l:(%P | %t)::%p\n"), ACE_TEXT("ACE_POSIX_CB_Proactor::handle_events:") ACE_TEXT("semaphore acquire failed") @@ -164,7 +164,7 @@ ACE_POSIX_CB_Proactor::handle_events_i (u_long milli_seconds) // Uncomment this if you want to test // and research the behavior of you system - // ACE_DEBUG ((LM_DEBUG, + // ACELIB_DEBUG ((LM_DEBUG, // "(%t) NumAIO=%d NumQueue=%d\n", // ret_aio, ret_que)); diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp index eec70234c90..ae74441e01c 100644 --- a/ACE/ace/POSIX_Proactor.cpp +++ b/ACE/ace/POSIX_Proactor.cpp @@ -15,7 +15,7 @@ #include "ace/ACE.h" #include "ace/Flag_Manip.h" #include "ace/Task_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Object_Manager.h" #include "ace/OS_NS_sys_socket.h" #include "ace/OS_NS_signal.h" @@ -631,7 +631,7 @@ ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Pr { // Open the pipe. if (this->pipe_.open () == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%N:%l:%p\n"), ACE_TEXT("ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager:") ACE_TEXT("Open of pipe failed"))); @@ -651,7 +651,7 @@ ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Pr 0, // Completion Key 0) // Proactor == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%N:%l:%p\n"), ACE_TEXT("ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager:") ACE_TEXT("Open on Read Stream failed"))); @@ -662,7 +662,7 @@ ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Pr 0, // ACT 0) // Priority == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%N:%l:%p\n"), ACE_TEXT("ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager:") ACE_TEXT("Read from pipe failed"))); @@ -707,7 +707,7 @@ ACE_AIOCB_Notify_Pipe_Manager::notify () { if (errno != EWOULDBLOCK) #if 0 - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P %t):%p\n"), ACE_TEXT ("ACE_AIOCB_Notify_Pipe_Manager::notify") ACE_TEXT ("Error:Writing on to notify pipe failed"))); @@ -735,7 +735,7 @@ ACE_AIOCB_Notify_Pipe_Manager::handle_read_stream 1, // enough to read 1 byte 0, // ACT 0)) // Priority - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%N:%l:(%P | %t):%p\n"), ACE_TEXT ("ACE_AIOCB_Notify_Pipe_Manager::handle_read_stream:") ACE_TEXT ("Read from pipe failed"))); @@ -882,7 +882,7 @@ int ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list (void) "WRITE":"READ" ; - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("slot=%d op=%s status=%d xfercnt=%d %s\n"), ai, op, @@ -904,7 +904,7 @@ int ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list (void) // and complain about POSIX implementation. // We know that we have memory leaks, but it is better than // segmentation fault! - ACE_DEBUG + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list\n") ACE_TEXT(" number pending AIO=%d\n"), @@ -966,13 +966,13 @@ void ACE_POSIX_AIOCB_Proactor::check_max_aio_num () && aiocb_list_max_size_ > (unsigned long) max_num_files) aiocb_list_max_size_ = (unsigned long) max_num_files; - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "(%P | %t) ACE_POSIX_AIOCB_Proactor::Max Number of AIOs=%d\n", aiocb_list_max_size_)); #if defined(__sgi) - ACE_DEBUG((LM_DEBUG, + ACELIB_DEBUG((LM_DEBUG, ACE_TEXT( "SGI IRIX specific: aio_init!\n"))); //typedef struct aioinit { @@ -1071,7 +1071,7 @@ ACE_POSIX_AIOCB_Proactor::putq_result (ACE_POSIX_Asynch_Result *result) int ret_val = this->result_queue_.enqueue_tail (result); if (ret_val == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "%N:%l:ACE_POSIX_AIOCB_Proactor::putq_result failed\n"), -1); @@ -1092,7 +1092,7 @@ ACE_POSIX_Asynch_Result * ACE_POSIX_AIOCB_Proactor::getq_result (void) // don't waste time if queue is empty - it is normal // or check queue size before dequeue_head -// ACE_ERROR_RETURN ((LM_ERROR, +// ACELIB_ERROR_RETURN ((LM_ERROR, // ACE_TEXT("%N:%l:(%P | %t):%p\n"), // ACE_TEXT("ACE_POSIX_AIOCB_Proactor::getq_result failed")), // 0); @@ -1160,7 +1160,7 @@ ACE_POSIX_AIOCB_Proactor::handle_events_i (u_long milli_seconds) { if (errno != EAGAIN && // Timeout errno != EINTR ) // Interrupted call - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%N:%l:(%P|%t)::%p\n"), ACE_TEXT ("handle_events: aio_suspend failed"))); // let continue work @@ -1296,7 +1296,7 @@ ACE_POSIX_AIOCB_Proactor::start_aio (ACE_POSIX_Asynch_Result *result, break; default: - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%N:%l:(%P|%t)::") ACE_TEXT ("start_aio: Invalid op code %d\n"), op), @@ -1354,7 +1354,7 @@ ACE_POSIX_AIOCB_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) if (result_list_[i] != 0) // only 1 request { // is allowed errno = EAGAIN; - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "%N:%l:(%P | %t)::\n" "ACE_POSIX_AIOCB_Proactor::allocate_aio_slot:" "internal Proactor error 0\n"), @@ -1369,7 +1369,7 @@ ACE_POSIX_AIOCB_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) } if (i >= this->aiocb_list_max_size_) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "%N:%l:(%P | %t)::\n" "ACE_POSIX_AIOCB_Proactor::allocate_aio_slot:" "internal Proactor error 1\n"), @@ -1423,7 +1423,7 @@ ACE_POSIX_AIOCB_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) if (errno == EAGAIN || errno == ENOMEM) //Ok, it will be deferred AIO ret_val = 1; else - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%N:%l:(%P | %t)::start_aio_i: aio_%s %p\n"), ptype, ACE_TEXT ("queueing failed"))); @@ -1457,7 +1457,7 @@ ACE_POSIX_AIOCB_Proactor::start_deferred_aio () break; if (i >= this->aiocb_list_max_size_) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "%N:%l:(%P | %t)::\n" "start_deferred_aio:" "internal Proactor error 3\n"), @@ -1601,7 +1601,7 @@ ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor (size_t max_aio_operations) // Add the signal number to the signal set. if (ACE_OS::sigaddset (&this->RT_completion_signals_, ACE_SIGRTMIN) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_POSIX_SIG_Proactor: %p\n"), + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_POSIX_SIG_Proactor: %p\n"), ACE_TEXT ("sigaddset"))); this->block_signals (); // Set up the signal action for SIGRTMIN. @@ -1627,7 +1627,7 @@ ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor (const sigset_t signal_set, // Empty the signal set first. if (sigemptyset (&this->RT_completion_signals_) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("Error:(%P | %t):%p\n"), ACE_TEXT("sigemptyset failed"))); @@ -1640,7 +1640,7 @@ ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor (const sigset_t signal_set, member = sigismember (&signal_set, si); if (member == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%N:%l:(%P | %t)::%p\n"), ACE_TEXT("ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor:") ACE_TEXT("sigismember failed"))); @@ -1695,7 +1695,7 @@ ACE_POSIX_SIG_Proactor::notify_completion (int sig_num) // Get this process id. pid_t const pid = ACE_OS::getpid (); if (pid == (pid_t) -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Error:%N:%l(%P | %t):%p"), ACE_TEXT("<getpid> failed")), -1); @@ -1713,7 +1713,7 @@ ACE_POSIX_SIG_Proactor::notify_completion (int sig_num) return 0; if (errno != EAGAIN) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Error:%N:%l:(%P | %t):%p\n"), ACE_TEXT("<sigqueue> failed")), -1); @@ -1742,7 +1742,7 @@ ACE_POSIX_SIG_Proactor::create_asynch_timer is_member = sigismember (&this->RT_completion_signals_, si); if (is_member == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "%N:%l:(%P | %t)::%s\n", "ACE_POSIX_SIG_Proactor::create_asynch_timer:" "sigismember failed"), @@ -1750,7 +1750,7 @@ ACE_POSIX_SIG_Proactor::create_asynch_timer } if (is_member == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "Error:%N:%l:(%P | %t)::%s\n", "ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor:" "Signal mask set empty"), @@ -1777,7 +1777,7 @@ static void sig_handler (int sig_num, siginfo_t *, ucontext_t *) { // Should never be called - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "%N:%l:(%P | %t)::sig_handler received signal: %d\n", sig_num)); } @@ -1805,7 +1805,7 @@ ACE_POSIX_SIG_Proactor::setup_signal_handler (int signal_number) const &reaction, 0); if (sigaction_return == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("Error:%p\n"), ACE_TEXT("Proactor couldnt do sigaction for the RT SIGNAL")), -1); @@ -1833,7 +1833,7 @@ ACE_POSIX_SIG_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) break; if (i >= this->aiocb_list_max_size_) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "%N:%l:(%P | %t)::\n" "ACE_POSIX_SIG_Proactor::allocate_aio_slot " "internal Proactor error 1\n"), @@ -1922,7 +1922,7 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout) // may some other third-party libraries could send it // or message queue could also generate it ! // So print the message and check our completions - ACE_ERROR ((LM_DEBUG, + ACELIB_ERROR ((LM_DEBUG, ACE_TEXT ("%N:%l:(%P | %t): ") ACE_TEXT ("ACE_POSIX_SIG_Proactor::handle_events: ") ACE_TEXT ("Unexpected signal code (%d) returned ") @@ -1959,7 +1959,7 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout) // Uncomment this if you want to test // and research the behavior of you system #if 0 - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "(%t) NumAIO=%d NumQueue=%d\n", ret_aio, ret_que)); #endif diff --git a/ACE/ace/Pagefile_Memory_Pool.cpp b/ACE/ace/Pagefile_Memory_Pool.cpp index b3ee76fc942..fca8f11fc78 100644 --- a/ACE/ace/Pagefile_Memory_Pool.cpp +++ b/ACE/ace/Pagefile_Memory_Pool.cpp @@ -7,7 +7,7 @@ #include "ace/Pagefile_Memory_Pool.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Auto_Ptr.h" #include "ace/RW_Thread_Mutex.h" #include "ace/OS_NS_sys_mman.h" diff --git a/ACE/ace/Parse_Node.cpp b/ACE/ace/Parse_Node.cpp index 3e8cbdc7268..54359899228 100644 --- a/ACE/ace/Parse_Node.cpp +++ b/ACE/ace/Parse_Node.cpp @@ -69,7 +69,7 @@ ACE_Stream_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) { if (ACE::debug ()) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("dynamic initialization failed for Module %s\n"), module->name ())); } @@ -86,7 +86,7 @@ ACE_Stream_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) { if (ACE::debug ()) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("dynamic initialization failed for Stream %s\n"), this->node_->name ())); } @@ -97,7 +97,7 @@ ACE_Stream_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Did stream on %s, error = %d\n"), this->node_->name (), yyerrno)); @@ -181,7 +181,7 @@ ACE_Parse_Node::print (void) const { ACE_TRACE ("ACE_Parse_Node::print"); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("svc = %s\n"), this->name ())); @@ -247,7 +247,7 @@ ACE_Suspend_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("did suspend on %s, error = %d\n"), this->name (), yyerrno)); @@ -264,7 +264,7 @@ ACE_Resume_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("did resume on %s, error = %d\n"), this->name (), yyerrno)); @@ -301,7 +301,7 @@ ACE_Remove_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) Remove_Node::apply") ACE_TEXT (" - did remove on %s, error = %d\n"), this->name (), @@ -329,7 +329,7 @@ ACE_Dynamic_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) Dynamic_Node::apply") ACE_TEXT (" - Did dynamic on %s (yyerrno=%d)\n"), this->name (), @@ -399,7 +399,7 @@ ACE_Static_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) Static_Node::apply -") ACE_TEXT (" Did static on %s (yyerrno=%d)\n"), this->name (), @@ -472,7 +472,7 @@ ACE_Location_Node::open_dll (int & yyerrno) #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) LN::open_dll - path=%s\n"), this->pathname ())); #endif /* ACE_NLOGGING */ @@ -485,7 +485,7 @@ ACE_Location_Node::open_dll (int & yyerrno) if (ACE::debug ()) { ACE_TCHAR *errmsg = this->dll_.error (); - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) LN::open_dll - Failed to open %s: %s\n"), this->pathname (), errmsg ? errmsg : ACE_TEXT ("no error reported"))); @@ -544,7 +544,7 @@ ACE_Object_Node::symbol (ACE_Service_Gestalt *, if (ACE::debug ()) { ACE_TCHAR *errmsg = this->dll_.error (); - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) DLL::symbol -") ACE_TEXT (" Failed for object %s: %s\n"), object_name, @@ -673,7 +673,7 @@ ACE_Function_Node::symbol (ACE_Service_Gestalt *, if (ACE::debug ()) { ACE_TCHAR * const errmsg = this->dll_.error (); - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("DLL::symbol failed for function %s: ") ACE_TEXT ("%s\n"), function_name, @@ -701,7 +701,7 @@ ACE_Function_Node::symbol (ACE_Service_Gestalt *, ++yyerrno; if (ACE::debug ()) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), this->function_name_)); } @@ -744,7 +744,7 @@ ACE_Dummy_Node::apply (ACE_Service_Gestalt *, int &yyerrno) #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("did operations on stream %s, error = %d\n"), this->name (), yyerrno)); @@ -797,7 +797,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Gestalt *config, ++yyerrno; if (ACE::debug ()) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) No static service ") ACE_TEXT ("registered for function %s\n"), this->function_name_)); @@ -815,7 +815,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Gestalt *config, if (ACE::debug ()) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) No static service factory ") ACE_TEXT ("function registered for function %s\n"), this->function_name_)); @@ -832,7 +832,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Gestalt *config, ++yyerrno; if (ACE::debug ()) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), this->function_name_)); } @@ -904,7 +904,7 @@ ACE_Service_Type_Factory::make_service_type (ACE_Service_Gestalt *cfg) const #ifndef ACE_NLOGGING if (ACE::debug ()) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) Unable to create ") ACE_TEXT ("service object for %s\n"), this->name ())); diff --git a/ACE/ace/Ping_Socket.cpp b/ACE/ace/Ping_Socket.cpp index 400b53b6c81..b760b4abacf 100644 --- a/ACE/ace/Ping_Socket.cpp +++ b/ACE/ace/Ping_Socket.cpp @@ -5,7 +5,7 @@ #if defined (ACE_HAS_ICMP_SUPPORT) && (ACE_HAS_ICMP_SUPPORT == 1) #include "ace/INET_Addr.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_sys_socket.h" @@ -109,7 +109,7 @@ ACE_Ping_Socket::ACE_Ping_Socket (ACE_Addr const & local, if (this->open (local, protocol, reuse_addr) == -1) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Ping_Socket::ACE_Ping_Socket: %p\n"), ACE_TEXT ("open"))); return; @@ -221,12 +221,12 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len) if ((icmplen = len - hlen1) < ICMP_MIN) { - ACE_DEBUG + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram") ACE_TEXT (" - ICMP length is %d < 8.\n"), icmplen)); - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram - ") ACE_TEXT ("The ICMP header either not received or is corrupted.")), @@ -235,14 +235,14 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len) if (icmp->icmp_type == ICMP_ECHOREPLY) { - ACE_DEBUG + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram") ACE_TEXT (" - ICMP_ECHOREPLY received.\n"))); if (icmp->icmp_id != (ACE_OS::getpid () & 0xFFFF)) { - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ACE_Ping_Socket::") ACE_TEXT ("process_incoming_dgram ") @@ -253,7 +253,7 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len) } if (icmplen < 16) { - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ACE_Ping_Socket::") ACE_TEXT ("process_incoming_dgram - ICMP length ") @@ -262,7 +262,7 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len) -1); } - ACE_DEBUG + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ACE::Ping_Socket::process_incoming_dgram - ") ACE_TEXT ("received ") @@ -273,7 +273,7 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len) return 0; //= success } - ACE_DEBUG + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ACE::Ping_Socket::process_incoming_dgram - ") ACE_TEXT ("received datagram that is not ICMP_ECHOREPLY.\n"))); @@ -357,7 +357,7 @@ ACE_Ping_Socket::make_echo_check (ACE_INET_Addr & remote_addr, to_connect)) == -1) return -1; - ACE_DEBUG + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) ACE_Ping_Socket::make_echo_check - sent %d.\n"), rval_send)); diff --git a/ACE/ace/Pipe.cpp b/ACE/ace/Pipe.cpp index ff3914702d9..28677427147 100644 --- a/ACE/ace/Pipe.cpp +++ b/ACE/ace/Pipe.cpp @@ -3,7 +3,7 @@ #include "ace/Pipe.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_sys_socket.h" #include "ace/OS_Memory.h" #include "ace/Truncate.h" @@ -27,10 +27,10 @@ ACE_Pipe::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Pipe::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handles_[0] = %d"), this->handles_[0])); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandles_[1] = %d\n"), this->handles_[1])); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("handles_[0] = %d"), this->handles_[0])); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandles_[1] = %d\n"), this->handles_[1])); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -125,7 +125,7 @@ ACE_Pipe::open (int buffer_size) #elif defined (ACE_HAS_STREAM_PIPES) || defined (__QNX__) ACE_UNUSED_ARG (buffer_size); if (ACE_OS::pipe (this->handles_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("pipe")), -1); @@ -143,7 +143,7 @@ ACE_Pipe::open (int buffer_size) (void *) arg) == -1) { this->close (); - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ioctl")), -1); } @@ -154,7 +154,7 @@ ACE_Pipe::open (int buffer_size) SOCK_STREAM, 0, this->handles_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("socketpair")), -1); @@ -237,7 +237,7 @@ ACE_Pipe::ACE_Pipe (ACE_HANDLE handles[2]) ACE_TRACE ("ACE_Pipe::ACE_Pipe"); if (this->open (handles) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Pipe::ACE_Pipe"))); } diff --git a/ACE/ace/Priority_Reactor.cpp b/ACE/ace/Priority_Reactor.cpp index 26b83844fdb..8ac55085fae 100644 --- a/ACE/ace/Priority_Reactor.cpp +++ b/ACE/ace/Priority_Reactor.cpp @@ -177,11 +177,11 @@ ACE_Priority_Reactor::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Priority_Reactor::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_Select_Reactor::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp index b757b43e27f..11292eb1169 100644 --- a/ACE/ace/Proactor.cpp +++ b/ACE/ace/Proactor.cpp @@ -18,7 +18,7 @@ #include "ace/Task_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Framework_Component.h" #if defined (ACE_HAS_AIO_CALLS) @@ -168,7 +168,7 @@ ACE_Proactor_Timer_Handler::svc (void) break; default: // Error. - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%N:%l:(%P | %t):%p\n"), ACE_TEXT ("ACE_Proactor_Timer_Handler::svc:wait failed")), -1); @@ -224,7 +224,7 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (ACE_Proactor_Timer_Queue &, const ACE_Time_Value &time) { if (this->proactor_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) No Proactor set in ACE_Proactor_Handle_Timeout_Upcall,") ACE_TEXT (" no completion port to post timeout to?!@\n")), -1); @@ -239,7 +239,7 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (ACE_Proactor_Timer_Queue &, -1); if (asynch_timer == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%N:%l:(%P | %t):%p\n"), ACE_TEXT ("ACE_Proactor_Handle_Timeout_Upcall::timeout:") ACE_TEXT ("create_asynch_timer failed")), @@ -250,7 +250,7 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (ACE_Proactor_Timer_Queue &, // Post a completion. if (-1 == safe_asynch_timer->post_completion (this->proactor_->implementation ())) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Failure in dealing with timers: ") ACE_TEXT ("PostQueuedCompletionStatus failed\n")), -1); @@ -300,7 +300,7 @@ ACE_Proactor_Handle_Timeout_Upcall::proactor (ACE_Proactor &proactor) return 0; } else - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_Proactor_Handle_Timeout_Upcall is only suppose") ACE_TEXT (" to be used with ONE (and only one) Proactor\n")), -1); @@ -358,7 +358,7 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation, // Activate <timer_handler>. if (this->timer_handler_->activate () == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%N:%l:(%P | %t):%p\n"), ACE_TEXT ("Task::activate:could not create thread\n"))); } @@ -613,7 +613,7 @@ ACE_Proactor::close (void) { // Close the implementation. if (this->implementation ()->close () == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%N:%l:(%P | %t):%p\n"), ACE_TEXT ("ACE_Proactor::close: implementation close"))); diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp index 6ba69acbf0e..6b3dfb6f00f 100644 --- a/ACE/ace/Process.cpp +++ b/ACE/ace/Process.cpp @@ -10,7 +10,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Signal.h" #include "ace/SString.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_sys_socket.h" @@ -378,10 +378,10 @@ ACE_Process::spawn (ACE_Process_Options &options) options.getgroup ()) < 0) { #if !defined (ACE_HAS_THREADS) - // We can't emit this log message because ACE_ERROR(), etc. + // We can't emit this log message because ACELIB_ERROR(), etc. // will invoke async signal unsafe functions, which results // in undefined behavior in threaded programs. - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p.\n"), ACE_TEXT ("ACE_Process::spawn: setpgid failed."))); #endif @@ -395,10 +395,10 @@ ACE_Process::spawn (ACE_Process_Options &options) options.getegid ()) == -1) { #if !defined (ACE_HAS_THREADS) - // We can't emit this log message because ACE_ERROR(), etc. + // We can't emit this log message because ACELIB_ERROR(), etc. // will invoke async signal unsafe functions, which results // in undefined behavior in threaded programs. - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p.\n"), ACE_TEXT ("ACE_Process::spawn: setregid failed."))); #endif @@ -413,10 +413,10 @@ ACE_Process::spawn (ACE_Process_Options &options) options.geteuid ()) == -1) { #if !defined (ACE_HAS_THREADS) - // We can't emit this log message because ACE_ERROR(), etc. + // We can't emit this log message because ACELIB_ERROR(), etc. // will invoke async signal unsafe functions, which results // in undefined behavior in threaded programs. - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p.\n"), ACE_TEXT ("ACE_Process::spawn: setreuid failed."))); #endif @@ -906,7 +906,7 @@ ACE_Process_Options::inherit_environment (void) // Add the string to our env buffer. if (this->setenv_i (existing_environment + slot, len) == -1) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p.\n"), ACE_TEXT ("ACE_Process_Options::ACE_Process_Options"))); break; @@ -1203,7 +1203,7 @@ ACE_Process_Options::command_line (const ACE_TCHAR *const argv[]) if (cur_len > command_line_buf_len_) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_Process:command_line: ") ACE_TEXT ("command line is ") ACE_TEXT ("longer than %d\n"), diff --git a/ACE/ace/Process_Manager.cpp b/ACE/ace/Process_Manager.cpp index 1884bdadc7b..7c02ed1d8f1 100644 --- a/ACE/ace/Process_Manager.cpp +++ b/ACE/ace/Process_Manager.cpp @@ -12,7 +12,7 @@ #include "ace/Process.h" #include "ace/Signal.h" #include "ace/Object_Manager.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Reactor.h" #include "ace/Countdown_Time.h" #include "ace/OS_NS_sys_wait.h" @@ -69,12 +69,12 @@ ACE_Process_Manager::Process_Descriptor::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Process_Manager::Process_Descriptor::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nproc_id_ = %d"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nproc_id_ = %d"), this->process_->getpid( ))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -84,15 +84,15 @@ ACE_Process_Manager::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Process_Manager::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmax_process_table_size_ = %d"), this->max_process_table_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_count_ = %d"), this->current_count_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmax_process_table_size_ = %d"), this->max_process_table_size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_count_ = %d"), this->current_count_)); for (size_t i = 0; i < this->current_count_; i++) this->process_table_[i].dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -259,7 +259,7 @@ ACE_Process_Manager::ACE_Process_Manager (size_t size, if (this->open (size, r) == -1) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Process_Manager"))); } @@ -382,7 +382,7 @@ ACE_Process_Manager::handle_signal (int, return -1; // remove this HANDLE/Event_Handler combination } else - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Process still active") ACE_TEXT (" -- shouldn't have been called yet!\n")), 0); // return 0 : stay registered @@ -390,7 +390,7 @@ ACE_Process_Manager::handle_signal (int, else { // <GetExitCodeProcess> failed. - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("GetExitCodeProcess failed")), -1); // return -1: unregister } @@ -881,7 +881,7 @@ ACE_Process_Manager::wait (pid_t pid, // uh oh...handle removed from process_table_, even though // we're holding a lock! delete [] handles; - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Process removed") ACE_TEXT (" -- somebody's ignoring the lock!\n")), -1); @@ -964,7 +964,7 @@ ACE_Process_Manager::wait (pid_t pid, if (idx == -1) { // oops, reaped an unmanaged process! - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) oops, reaped unmanaged %d\n"), pid)); return pid; @@ -1011,7 +1011,7 @@ ACE_Process_Manager::notify_proc_handler (size_t i, } else { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P:%t|%T) ACE_Process_Manager::notify_proc_handler:") ACE_TEXT (" unknown/unmanaged process reaped\n"))); return 0; diff --git a/ACE/ace/Process_Mutex.cpp b/ACE/ace/Process_Mutex.cpp index 20925aee441..f2929c594a0 100644 --- a/ACE/ace/Process_Mutex.cpp +++ b/ACE/ace/Process_Mutex.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Process_Mutex.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/ACE.h" #include "ace/Guard_T.h" #include "ace/Process_Mutex.h" @@ -22,9 +22,9 @@ ACE_Process_Mutex::dump (void) const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Process_Mutex::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Process_Semaphore.cpp b/ACE/ace/Process_Semaphore.cpp index 5c83d613a82..1ca23748c41 100644 --- a/ACE/ace/Process_Semaphore.cpp +++ b/ACE/ace/Process_Semaphore.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Process_Semaphore.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_Memory.h" #if !defined (__ACE_INLINE__) @@ -19,9 +19,9 @@ ACE_Process_Semaphore::dump (void) const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Process_Semaphore::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Profile_Timer.cpp b/ACE/ace/Profile_Timer.cpp index 2afafa3ef25..9bab2e538d7 100644 --- a/ACE/ace/Profile_Timer.cpp +++ b/ACE/ace/Profile_Timer.cpp @@ -6,7 +6,7 @@ # include "ace/Profile_Timer.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_string.h" #if defined (ACE_HAS_PRUSAGE_T) @@ -49,7 +49,7 @@ ACE_Profile_Timer::ACE_Profile_Timer (void) this->proc_handle_ = ACE_OS::open (buf, O_RDONLY, 0); if (this->proc_handle_ == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), buf)); # elif defined (ACE_HAS_GETRUSAGE) @@ -65,7 +65,7 @@ ACE_Profile_Timer::~ACE_Profile_Timer (void) ACE_TRACE ("ACE_Profile_Timer::~ACE_Profile_Timer"); # if defined (ACE_HAS_PRUSAGE_T) if (ACE_OS::close (this->proc_handle_) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Profile_Timer::~ACE_Profile_Timer"))); # endif /* ACE_HAS_PRUSAGE_T */ } diff --git a/ACE/ace/QoS/QoS_Manager.cpp b/ACE/ace/QoS/QoS_Manager.cpp index 20f118cd789..4cfda1be0cb 100644 --- a/ACE/ace/QoS/QoS_Manager.cpp +++ b/ACE/ace/QoS/QoS_Manager.cpp @@ -2,7 +2,7 @@ // $Id$ #include "QoS_Manager.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -21,7 +21,7 @@ int ACE_QoS_Manager::join_qos_session (ACE_QoS_Session *qos_session) { if (this->qos_session_set ().insert (qos_session) != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Error in adding a new session to the ") ACE_TEXT ("socket session set\n")), -1); diff --git a/ACE/ace/QoS/QoS_Session_Factory.cpp b/ACE/ace/QoS/QoS_Session_Factory.cpp index 60122e5a5cb..296d8e2c3d4 100644 --- a/ACE/ace/QoS/QoS_Session_Factory.cpp +++ b/ACE/ace/QoS/QoS_Session_Factory.cpp @@ -3,7 +3,7 @@ #include "QoS_Session_Factory.h" #include "QoS_Session_Impl.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -51,7 +51,7 @@ ACE_QoS_Session_Factory::create_session (ACE_QoS_Session_Type qos_session_type) if (this->add_session (qos_session) == -1) { delete qos_session; - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Error in adding session\n")), 0); } @@ -65,7 +65,7 @@ ACE_QoS_Session_Factory::destroy_session (ACE_QoS_Session *qos_session) { if ((qos_session != 0) && (this->remove_session (qos_session) == -1)) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Error in destroying session\n")), -1); @@ -78,7 +78,7 @@ int ACE_QoS_Session_Factory::add_session (ACE_QoS_Session *qos_session) { if (this->qos_session_set_.insert (qos_session) != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Error in adding a new session") ACE_TEXT ("to the session set\n")), -1); @@ -92,7 +92,7 @@ int ACE_QoS_Session_Factory::remove_session (ACE_QoS_Session *qos_session) { if (this->qos_session_set_.remove (qos_session) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Error in removing a session") ACE_TEXT ("from the session set\n")), -1); diff --git a/ACE/ace/QoS/QoS_Session_Impl.cpp b/ACE/ace/QoS/QoS_Session_Impl.cpp index e96baa7f905..719aba164a7 100644 --- a/ACE/ace/QoS/QoS_Session_Impl.cpp +++ b/ACE/ace/QoS/QoS_Session_Impl.cpp @@ -5,7 +5,7 @@ #include "ace/SOCK.h" #include "QoS_Manager.h" #include "QoS_Session_Impl.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) #include "QoS_Session_Impl.inl" @@ -45,7 +45,7 @@ rsvp_callback (rapi_sid_t /* sid */, ) { if (args == 0) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "Argument in the call back function is null\n\n")); ACE_QoS_Session *qos_session = (ACE_QoS_Session *) args; @@ -54,7 +54,7 @@ rsvp_callback (rapi_sid_t /* sid */, if (!flow_spec_list) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "(%N|%l) Null flow_spec_list\n")); } else @@ -63,7 +63,7 @@ rsvp_callback (rapi_sid_t /* sid */, csxp = &flow_spec_list->specbody_qosx; if(!csxp) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "(%N|%l) Null csxp\n"), -1); } @@ -75,7 +75,7 @@ rsvp_callback (rapi_sid_t /* sid */, { case RAPI_PATH_EVENT: { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "RSVP PATH Event received\n" "No. of TSpecs received : %d %d\n", flow_spec_no, &flow_spec_list->len)); @@ -101,7 +101,7 @@ rsvp_callback (rapi_sid_t /* sid */, 0), -1); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "\nTSpec :\n" "\t Spec Type = %d\n" "\t Rate = %f\n" @@ -128,7 +128,7 @@ rsvp_callback (rapi_sid_t /* sid */, case RAPI_RESV_EVENT: { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "RSVP RESV Event received\n" "No. of FlowSpecs received : %d\n", flow_spec_no)); @@ -167,7 +167,7 @@ rsvp_callback (rapi_sid_t /* sid */, break; default: - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "(%N|%l) Unknown flowspec type: %u.\n", csxp->spec_type), -1); } @@ -180,7 +180,7 @@ rsvp_callback (rapi_sid_t /* sid */, case RAPI_PATH_ERROR: { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "PATH ERROR Event received\n" "Code=%d Val=%d Node= %s\n", errcode, @@ -192,7 +192,7 @@ rsvp_callback (rapi_sid_t /* sid */, case RAPI_RESV_ERROR: { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "RESV ERROR Event received\n" "Code=%d Val=%d Node= %s\n", errcode, @@ -204,14 +204,14 @@ rsvp_callback (rapi_sid_t /* sid */, case RAPI_RESV_CONFIRM: { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "RESV CONFIRM Event received\n")); qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_RESV_CONFIRM); } break; default: - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "Unknown RSVP Event Received\n")); break; @@ -241,7 +241,7 @@ ACE_RAPI_Session::open (ACE_INET_Addr dest_addr, char buf [BUFSIZ]; dest_addr.addr_to_string (buf, BUFSIZ); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "In RAPI SESSION OPEN %s\n", buf)); @@ -258,11 +258,11 @@ ACE_RAPI_Session::open (ACE_INET_Addr dest_addr, rsvp_callback, (void *) this, &rsvp_error)) == NULL_SID) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "rapi_session () call fails. Error\n"), -1); else - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "rapi_session () call succeeds. " "Session ID = %d\n", this->session_id_)); @@ -277,12 +277,12 @@ ACE_RAPI_Session::close (void) this->rsvp_error = rapi_release(this->session_id_); if (rsvp_error == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "Can't release RSVP session:\n\t%s\n", rapi_errlist[rsvp_error]), -1); else - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "rapi session with id %d released successfully.\n", this->session_id_)); return 0; @@ -338,12 +338,12 @@ ACE_RAPI_Session::sending_qos (const ACE_QoS &ace_qos) 0, 25); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "(%N|%l) rapi_sender error %d:\n\tPATH Generation can't be started\n", result), -1); else - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "rapi_sender () call succeeds with PATH Tear!\n")); return 0; @@ -351,7 +351,7 @@ ACE_RAPI_Session::sending_qos (const ACE_QoS &ace_qos) rapi_tspec_t *t_spec = this->init_tspec_simplified (*sending_flowspec); if (t_spec == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "(%N|%l) Error in translating from ACE Flow Spec to" " RAPI TSpec\n"), -1); @@ -362,12 +362,12 @@ ACE_RAPI_Session::sending_qos (const ACE_QoS &ace_qos) // be printed. (void) rapi_fmt_tspec(t_spec, buffer, sizeof(buffer)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "\nSender TSpec : %s\n", buffer)); // Print out all the fields separately. - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "\nTSpec :\n" "\t Spec Type = %d\n" "\t Rate = %f\n" @@ -387,7 +387,7 @@ ACE_RAPI_Session::sending_qos (const ACE_QoS &ace_qos) // This the source sender port. // ACE_INET_Addr sender_addr (this->source_port ()); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "Making the rapi_sender () call\n")); // Set the Sender TSpec for this QoS session. @@ -413,12 +413,12 @@ ACE_RAPI_Session::sending_qos (const ACE_QoS &ace_qos) sending_flowspec->ttl ()) ; */ if(result!= 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "(%N|%l) rapi_sender error %d:\n\tPATH Generation can't be started\n", result), -1); else - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "rapi_sender () call succeeds !\n")); return 0; } @@ -449,11 +449,11 @@ ACE_RAPI_Session::receiving_qos (const ACE_QoS &ace_qos) // WILDCARD. 0, 0) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "(%N|%l)rapi_reserve () error:\n\tRESV Generation can't be started\n"), -1); else - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "rapi_reserve () for RESV Tear call succeeds\n")); return 0; @@ -463,7 +463,7 @@ ACE_RAPI_Session::receiving_qos (const ACE_QoS &ace_qos) rapi_flowspec_t *flow_spec = init_flowspec_simplified (*receiving_flowspec); if (flow_spec == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "(%N|%l) Error in translating from ACE Flow Spec to" " RAPI FlowSpec\n"), -1); @@ -473,12 +473,12 @@ ACE_RAPI_Session::receiving_qos (const ACE_QoS &ace_qos) // This formats the flow_spec in a visually intuitive char * that can // be printed. (void)rapi_fmt_flowspec(flow_spec, buffer, sizeof(buffer)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "\nReceiver FlowSpec : %s\n", buffer)); // Print out all the fields separately. - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "\nFlowSpec :\n" "\t Spec Type = %d\n" "\t Rate = %f\n" @@ -517,11 +517,11 @@ ACE_RAPI_Session::receiving_qos (const ACE_QoS &ace_qos) // WILDCARD. 1, flow_spec) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "rapi_reserve () error:\n\tRESV Generation can't be started\n"), -1); else - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "rapi_reserve () call succeeds\n")); return 0; @@ -532,7 +532,7 @@ ACE_RAPI_Session::update_qos (void) { // Update the session QoS Parameters based on the RSVP Event Received. if ((rsvp_error = rapi_dispatch ()) != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "Error in rapi_dispatch () : %s\n", rapi_errlist[rsvp_error]), -1); @@ -610,7 +610,7 @@ ACE_RAPI_Session::init_flowspec_simplified(const ACE_Flow_Spec &flow_spec) break; default: - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "(%N|%l) Unknown flowspec type: %u\n",flow_spec.service_type () ), 0); } @@ -666,7 +666,7 @@ ACE_GQoS_Session::qos (ACE_SOCK *socket, // subscribed to by the given socket. if (qos_manager->qos_session_set ().find (this) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("This QoS session was not subscribed to") ACE_TEXT (" by the socket\n")), -1); @@ -681,12 +681,12 @@ ACE_GQoS_Session::qos (ACE_SOCK *socket, ACE_SIO_SET_QOS, qos, &ret_bytes) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Error in Qos set ACE_OS::ioctl() %d\n"), ret_bytes), -1); else - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Setting QoS with ACE_OS::ioctl () succeeds\n"))); return 0; diff --git a/ACE/ace/QoS/QoS_Session_Impl.inl b/ACE/ace/QoS/QoS_Session_Impl.inl index c5aa3a1e9f9..3f58fcc433f 100644 --- a/ACE/ace/QoS/QoS_Session_Impl.inl +++ b/ACE/ace/QoS/QoS_Session_Impl.inl @@ -49,7 +49,7 @@ ACE_RAPI_Session::rsvp_events_handle (void) if (rapi_fd == -1) { this->close (); - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "Error in rapi_getfd ()\n"), -1); } diff --git a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp index b80c34832a5..972823d1e9d 100644 --- a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp +++ b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp @@ -1,7 +1,7 @@ // $Id$ #include "SOCK_Dgram_Mcast_QoS.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_sys_socket.h" #if defined (ACE_WIN32) @@ -50,7 +50,7 @@ ACE_SOCK_Dgram_Mcast_QoS::open (const ACE_INET_Addr &addr, if (this->get_handle () != ACE_INVALID_HANDLE) return 0; - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "Get Handle Returns Invalid Handle\n")); if (ACE_SOCK::open (SOCK_DGRAM, @@ -216,16 +216,16 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe (const ACE_INET_Addr &mcast_addr, { // Subscribe to the QoS session. if (this->qos_manager_.join_qos_session (qos_session) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unable to join QoS Session\n")), -1); } else { if (this->close () != 0) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Unable to close socket\n"))); - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Dest Addr in the QoS Session does") ACE_TEXT (" not match the address passed into") ACE_TEXT (" subscribe\n")), diff --git a/ACE/ace/RB_Tree.cpp b/ACE/ace/RB_Tree.cpp index e68bb43b85f..f3d677156ca 100644 --- a/ACE/ace/RB_Tree.cpp +++ b/ACE/ace/RB_Tree.cpp @@ -15,7 +15,7 @@ #include "ace/RB_Tree.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -52,7 +52,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree (ACE_Allocator ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree (ACE_Allocator *alloc)"); allocator_ = alloc; if (this->open (alloc) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_RB_Tree::ACE_RB_Tree\n"))); } @@ -149,12 +149,12 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right (ACE_RB_Tre ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right"); if (!x) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("\nerror: x is a null pointer in ") ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n"))); else if (! (x->left())) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("\nerror: x->left () is a null pointer in ") ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n"))); @@ -188,12 +188,12 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left (ACE_RB_Tree ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left"); if (! x) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("\nerror: x is a null pointer in ") ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n"))); else if (! (x->right())) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("\nerror: x->right () is a null pointer ") ACE_TEXT ("in ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n"))); @@ -398,7 +398,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rebalance (ACE_RB_Tree_N if (! x->parent ()->parent ()) { // If we got here, something is drastically wrong! - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("\nerror: parent's parent is null in ") ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rebalance\n"))); @@ -632,7 +632,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, if (current->right ()) { // If there is already a right subtree, complain. - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("\nright subtree already present in ") ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), @@ -668,7 +668,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, { if (current->left ()) // If there is already a left subtree, complain. - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("\nleft subtree already present in ") ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), @@ -748,7 +748,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, if (current->right ()) { // If there is already a right subtree, complain. - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("\nright subtree already present in ") ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), @@ -783,7 +783,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, { if (current->left ()) // If there is already a left subtree, complain. - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("\nleft subtree already present in ") ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), @@ -865,17 +865,17 @@ dump_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> *node) const { dump_node_i (*node); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ndown left\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ndown left\n"))); this->dump_i (node->left ()); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nup left\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nup left\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ndown right\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ndown right\n"))); this->dump_i (node->right ()); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nup right\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nup right\n"))); } else { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nNULL POINTER (BLACK)\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nNULL POINTER (BLACK)\n"))); } #else /* !ACE_HAS_DUMP */ ACE_UNUSED_ARG (node); @@ -894,7 +894,7 @@ dump_node_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> &node) const const char * color_str = (node.color () == ACE_RB_Tree_Node_Base::RED) ? "RED" : "BLACK"; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" color=[%s]\n"), color_str)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" color=[%s]\n"), color_str)); #else /* !ACE_HAS_DUMP */ ACE_UNUSED_ARG (node); #endif /* ACE_HAS_DUMP */ @@ -916,7 +916,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_invariant (void) int expected_black_height = -1; if (this->test_invariant_recurse (this->root_, expected_black_height, 0) == 0) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("invariant holds\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("invariant holds\n"))); return 0; } @@ -943,7 +943,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_invariant_recurse (ACE } else if (expected_black_height != measured_black_height) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("\nexpected_black_height = %d but ") ACE_TEXT ("\nmeasured_black_height = %d in ") ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::test_invariant_recurse\n"), @@ -959,7 +959,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_invariant_recurse (ACE { if (x->left () && x->left ()->color () == ACE_RB_Tree_Node_Base::RED) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("\nRED parent has RED left child in ") ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::test_invariant_recurse\n")), @@ -968,7 +968,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_invariant_recurse (ACE if (x->right () && x->right ()->color () == ACE_RB_Tree_Node_Base::RED) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("\nRED parent has RED right child in ") ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::test_invariant_recurse\n")), @@ -1170,9 +1170,9 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i (void) { ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnode_ = %x\n"), this->node_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnode_ = %x\n"), this->node_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ACE/ace/RB_Tree.inl b/ACE/ace/RB_Tree.inl index d7e47fde7e5..fbeb19c3e98 100644 --- a/ACE/ace/RB_Tree.inl +++ b/ACE/ace/RB_Tree.inl @@ -4,7 +4,7 @@ #include "ace/Guard_T.h" #include "ace/Malloc_Base.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -568,13 +568,13 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_size_ = %d\n"), this->current_size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_size_ = %d\n"), this->current_size_)); this->allocator_->dump (); this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nDumping nodes from root\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nDumping nodes from root\n"))); this->dump_i (this->root_); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/RW_Mutex.cpp b/ACE/ace/RW_Mutex.cpp index e218dd50040..fa1b3dea8ec 100644 --- a/ACE/ace/RW_Mutex.cpp +++ b/ACE/ace/RW_Mutex.cpp @@ -16,7 +16,7 @@ #include "ace/RW_Mutex.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" @@ -28,9 +28,9 @@ ACE_RW_Mutex::dump (void) const #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_RW_Mutex::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -39,7 +39,7 @@ ACE_RW_Mutex::ACE_RW_Mutex (int type, const ACE_TCHAR *name, void *arg) { // ACE_TRACE ("ACE_RW_Mutex::ACE_RW_Mutex"); if (ACE_OS::rwlock_init (&this->lock_, type, name, arg) != 0) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_RW_Mutex::ACE_RW_Mutex"))); } diff --git a/ACE/ace/RW_Process_Mutex.cpp b/ACE/ace/RW_Process_Mutex.cpp index aa132df10fe..dac84a75960 100644 --- a/ACE/ace/RW_Process_Mutex.cpp +++ b/ACE/ace/RW_Process_Mutex.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/RW_Process_Mutex.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/ACE.h" @@ -45,9 +45,9 @@ ACE_RW_Process_Mutex::dump (void) const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_RW_Process_Mutex::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Reactor_Token_T.cpp b/ACE/ace/Reactor_Token_T.cpp index 42ef81fed3b..b9ea5b0e48c 100644 --- a/ACE/ace/Reactor_Token_T.cpp +++ b/ACE/ace/Reactor_Token_T.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Reactor_Token_T.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -11,9 +11,9 @@ ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Reactor_Token_T::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -70,7 +70,7 @@ ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::sleep_hook (void) } else { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("sleep_hook failed"))); } diff --git a/ACE/ace/Read_Buffer.cpp b/ACE/ace/Read_Buffer.cpp index 544b407f934..f16791fd241 100644 --- a/ACE/ace/Read_Buffer.cpp +++ b/ACE/ace/Read_Buffer.cpp @@ -8,7 +8,7 @@ #include "ace/Read_Buffer.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Malloc_Base.h" #include "ace/Service_Config.h" #include "ace/OS_NS_stdio.h" @@ -20,12 +20,12 @@ ACE_Read_Buffer::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Read_Buffer::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("size_ = %d"), this->size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\noccurrences_ = %d"), this->occurrences_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nstream_ = %x"), this->stream_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nallocator_ = %x"), this->allocator_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("size_ = %d"), this->size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\noccurrences_ = %d"), this->occurrences_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nstream_ = %x"), this->stream_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nallocator_ = %x"), this->allocator_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Recursive_Thread_Mutex.cpp b/ACE/ace/Recursive_Thread_Mutex.cpp index 1b43bbb6e61..300e134d20c 100644 --- a/ACE/ace/Recursive_Thread_Mutex.cpp +++ b/ACE/ace/Recursive_Thread_Mutex.cpp @@ -16,7 +16,7 @@ #include "ace/Recursive_Thread_Mutex.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -30,7 +30,7 @@ ACE_Recursive_Thread_Mutex::ACE_Recursive_Thread_Mutex (const ACE_TCHAR *name, if (ACE_OS::recursive_mutex_init (&this->lock_, name, arg) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("recursive_mutex_init"))); } @@ -109,8 +109,8 @@ ACE_Recursive_Thread_Mutex::dump (void) const #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Recursive_Thread_Mutex::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Refcounted_Auto_Ptr.inl b/ACE/ace/Refcounted_Auto_Ptr.inl index a8412d2d3a2..7ee81683aed 100644 --- a/ACE/ace/Refcounted_Auto_Ptr.inl +++ b/ACE/ace/Refcounted_Auto_Ptr.inl @@ -3,7 +3,7 @@ // $Id$ #include "ace/Guard_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Registry_Name_Space.cpp b/ACE/ace/Registry_Name_Space.cpp index 2cbace4d32c..49db2a65098 100644 --- a/ACE/ace/Registry_Name_Space.cpp +++ b/ACE/ace/Registry_Name_Space.cpp @@ -16,7 +16,7 @@ ACE_Registry_Name_Space::ACE_Registry_Name_Space (void) ACE_Registry_Name_Space::ACE_Registry_Name_Space (ACE_Name_Options *name_options) { if (this->open (name_options) != 0) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Registry_Name_Space::open"))); } @@ -36,7 +36,7 @@ ACE_Registry_Name_Space::open (ACE_Name_Options *name_options) HKEY_LOCAL_MACHINE, host); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Predefined_Naming_Context::connect")), result); else @@ -52,7 +52,7 @@ ACE_Registry_Name_Space::open (ACE_Name_Options *name_options) result = predefined.bind_context (name, this->context_); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Registry::Naming_Context::bind_context")), result); + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Registry::Naming_Context::bind_context")), result); } return 0; } @@ -254,7 +254,7 @@ ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set, value, type); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Registry::Naming_Context::resolve")), result); diff --git a/ACE/ace/Remote_Name_Space.cpp b/ACE/ace/Remote_Name_Space.cpp index f7767258c9d..b912847c6cb 100644 --- a/ACE/ace/Remote_Name_Space.cpp +++ b/ACE/ace/Remote_Name_Space.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Remote_Name_Space.h" #include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/SString.h" #include "ace/OS_NS_string.h" @@ -34,7 +34,7 @@ ACE_Remote_Name_Space::ACE_Remote_Name_Space (const ACE_TCHAR *hostname, { ACE_TRACE ("ACE_Remote_Name_Space::ACE_Remote_Name_Space"); if (this->open (hostname, port) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Remote_Name_Space::ACE_Remote_Name_Space"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Remote_Name_Space::ACE_Remote_Name_Space"))); } int @@ -150,7 +150,7 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set, while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { if (this->ns_proxy_.recv_reply (reply) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Remote_Name_Space::list_names")), -1); @@ -184,7 +184,7 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set, while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { if (this->ns_proxy_.recv_reply (reply) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Remote_Name_Space::list_values")), -1); @@ -220,7 +220,7 @@ ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set, while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { if (this->ns_proxy_.recv_reply (reply) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Remote_Name_Space::list_values")), -1); @@ -255,7 +255,7 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set, while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { if (this->ns_proxy_.recv_reply (reply) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Remote_Name_Space::list_names")), -1); @@ -296,7 +296,7 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set, while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { if (this->ns_proxy_.recv_reply (reply) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Remote_Name_Space::list_values")), -1); @@ -337,7 +337,7 @@ ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set, while (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { if (this->ns_proxy_.recv_reply (reply) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Remote_Name_Space::list_values")), -1); @@ -368,9 +368,9 @@ ACE_Remote_Name_Space::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Remote_Name_Space::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->ns_proxy_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Remote_Tokens.cpp b/ACE/ace/Remote_Tokens.cpp index 250a6d23a70..cb873d01bcc 100644 --- a/ACE/ace/Remote_Tokens.cpp +++ b/ACE/ace/Remote_Tokens.cpp @@ -69,7 +69,7 @@ ACE_TSS_Connection::make_TSS_TYPE (void) const return 0; } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TSS_Connection new connection\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TSS_Connection new connection\n"))); return stream; } @@ -83,13 +83,13 @@ ACE_TSS_Connection::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_TSS_Connection::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TSS_Connection::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("server_address_\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TSS_Connection::dump:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("server_address_\n"))); server_address_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_TSS<ACE_SOCK_Stream>::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -127,7 +127,7 @@ ACE_Remote_Token_Proxy::initiate_connection (void) if (token_ == 0) { errno = ENOENT; - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_Remote_Token_Proxy not open.\n")), -1); } @@ -146,19 +146,19 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request, ssize_t length; if ((length = request.encode (buffer)) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("encode failed")), -1); + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("encode failed")), -1); ACE_SOCK_Stream *peer = ACE_Token_Connections::instance ()->get_connection (); if (peer == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("(%P|%t) %p\n"), ACE_TEXT("BIG PROBLEMS with get_connection")), -1); // Transmit request via a blocking send. if (peer->send_n (buffer, length) != length) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("send_n failed")), -1); else @@ -168,10 +168,10 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request, // Receive reply via blocking read. if (peer->recv (&reply, sizeof reply) != sizeof reply) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("recv failed")), -1); + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("recv failed")), -1); if (reply.decode () == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("decode failed")), -1); + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("decode failed")), -1); errno = int (reply.errnum ()); if (errno != 0) @@ -199,14 +199,14 @@ ACE_Remote_Token_Proxy::acquire (int notify, case EWOULDBLOCK : // Whoah, we detected wouldblock via the shadow mutex! if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shadow: acquire will block, owner is %s\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shadow: acquire will block, owner is %s\n"), this->token_->owner_id ())); // No error, but would block, break; case EDEADLK : if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shadow: deadlock detected\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shadow: deadlock detected\n"))); if (ignore_shadow_deadlock_) break; @@ -217,7 +217,7 @@ ACE_Remote_Token_Proxy::acquire (int notify, } default : - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p shadow acquire failed\n"), ACE_TEXT ("ACE_Remote_Token_Proxy")), -1); @@ -238,12 +238,12 @@ ACE_Remote_Token_Proxy::acquire (int notify, if (result == -1) { // Update the local shadow copy. - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("error on remote acquire, releasing shadow mutex.\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("error on remote acquire, releasing shadow mutex.\n"))); ACE_Token_Proxy::release (); } else { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) acquired %s remotely.\n"), this->name ())); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) acquired %s remotely.\n"), this->name ())); // Our shadow call may have failed. However, it's still a race // to the remote server. If we beat the client which holds the // local token, we need to fix things locally to reflect the @@ -268,7 +268,7 @@ ACE_Remote_Token_Proxy::tryacquire (void (*sleep_hook)(void *)) { // Save/restore errno. ACE_Errno_Guard error (errno); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("shadow try acquire failed\n"))); } @@ -299,7 +299,7 @@ ACE_Remote_Token_Proxy::renew (int requeue_position, if (errno != EWOULDBLOCK) return -1; else if (debug_) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shadow: renew would block. owner %s.\n"), this->token_->owner_id ())); } @@ -322,14 +322,14 @@ ACE_Remote_Token_Proxy::renew (int requeue_position, ACE_Errno_Guard error (errno); ACE_Token_Proxy::release (); } - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p error on remote renew, releasing shadow mutex.\n"), ACE_TEXT ("ACE_Remote_Token_Proxy")), -1); } else { if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) renewed %s remotely.\n"), this->name ())); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) renewed %s remotely.\n"), this->name ())); // Make sure that the local shadow reflects our new ownership. token_->make_owner (waiter_); return result; @@ -350,13 +350,13 @@ ACE_Remote_Token_Proxy::release (ACE_Synch_Options &options) int result = this->request_reply (request, options); if (result == 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) released %s remotely.\n"), this->name ())); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) released %s remotely.\n"), this->name ())); // whether success or failure, we're going to release the shadow. // If race conditions exist such that we are no longer the owner, // this release will perform a remove. if (ACE_Token_Proxy::release () == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) shadow: release failed\n"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("(%t) shadow: release failed\n"))); return result; } @@ -372,7 +372,7 @@ void ACE_Remote_Token_Proxy::token_acquired (ACE_TPQ_Entry *) { ACE_TRACE ("ACE_Remote_Token_Proxy::token_acquired"); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %s shadow token %s acquired\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %s shadow token %s acquired\n"), this->client_id (), this->name ())); // ACE_Token_Proxy::token_acquired (vp); @@ -382,7 +382,7 @@ const ACE_TCHAR* ACE_Remote_Token_Proxy::owner_id (void) { ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id"); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_id called\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_id called\n"))); // @@ special operation return 0; } @@ -392,13 +392,13 @@ ACE_Remote_Token_Proxy::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Remote_Token_Proxy::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Tokens::dump:\n") + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Tokens::dump:\n") ACE_TEXT (" ignore_shadow_deadlock_ = %d\n"), ignore_shadow_deadlock_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_Token_Proxy::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -429,11 +429,11 @@ ACE_Remote_Mutex::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Remote_Mutex::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Remote_Mutex::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Remote_Mutex::dump:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_Remote_Token_Proxy::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -470,11 +470,11 @@ ACE_Remote_RLock::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Remote_RLock::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Remote_RLock::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Remote_RLock::dump:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_Remote_Token_Proxy::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -512,11 +512,11 @@ ACE_Remote_WLock::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Remote_WLock::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Remote_WLock::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Remote_WLock::dump:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_Remote_Token_Proxy::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/SOCK.cpp b/ACE/ace/SOCK.cpp index c008dba43c3..02f80738891 100644 --- a/ACE/ace/SOCK.cpp +++ b/ACE/ace/SOCK.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/SOCK.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) #include "ace/SOCK.inl" @@ -122,7 +122,7 @@ ACE_SOCK::ACE_SOCK (int type, protocol_family, protocol, reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK::ACE_SOCK"))); } @@ -177,7 +177,7 @@ ACE_SOCK::ACE_SOCK (int type, g, flags, reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK::ACE_SOCK"))); } diff --git a/ACE/ace/SOCK_Acceptor.cpp b/ACE/ace/SOCK_Acceptor.cpp index 542333bc6ad..9128232fed2 100644 --- a/ACE/ace/SOCK_Acceptor.cpp +++ b/ACE/ace/SOCK_Acceptor.cpp @@ -2,7 +2,7 @@ #include "ace/SOCK_Acceptor.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_Errno.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_sys_socket.h" @@ -340,7 +340,7 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap, protocol_family, backlog, protocol) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_Acceptor"))); } @@ -392,7 +392,7 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap, protocol_family, backlog, protocol) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_Acceptor"))); } diff --git a/ACE/ace/SOCK_CODgram.cpp b/ACE/ace/SOCK_CODgram.cpp index e038fb9c3b5..fe20f3948cd 100644 --- a/ACE/ace/SOCK_CODgram.cpp +++ b/ACE/ace/SOCK_CODgram.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/SOCK_CODgram.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_sys_socket.h" #if !defined (__ACE_INLINE__) @@ -34,7 +34,7 @@ ACE_SOCK_CODgram::ACE_SOCK_CODgram (const ACE_Addr &remote, protocol_family, protocol, reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_CODgram"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_CODgram"))); } /* This is the general-purpose open routine. Note that it performs diff --git a/ACE/ace/SOCK_Connector.cpp b/ACE/ace/SOCK_Connector.cpp index f45361473f7..0aa949b5c97 100644 --- a/ACE/ace/SOCK_Connector.cpp +++ b/ACE/ace/SOCK_Connector.cpp @@ -2,7 +2,7 @@ #include "ace/SOCK_Connector.h" #include "ace/INET_Addr.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_socket.h" #include "ace/os_include/os_fcntl.h" @@ -312,7 +312,7 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, protocol) == -1 && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT)) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); } @@ -343,7 +343,7 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, perms) == -1 && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT)) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); } diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp index 4195e439371..04889eb8c3d 100644 --- a/ACE/ace/SOCK_Dgram.cpp +++ b/ACE/ace/SOCK_Dgram.cpp @@ -2,7 +2,7 @@ #include "ace/SOCK_Dgram.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/INET_Addr.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" @@ -203,7 +203,7 @@ ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, protocol_family, protocol, reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_Dgram"))); } @@ -224,7 +224,7 @@ ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, g, flags, reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_Dgram"))); } @@ -530,7 +530,7 @@ ACE_SOCK_Dgram::set_nic (const ACE_TCHAR *net_if, // a non-null interface parameter in this function.) ACE_UNUSED_ARG (net_if); ACE_UNUSED_ARG (addr_family); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Send interface specification not ") ACE_TEXT ("supported - IGNORED.\n"))); #endif /* !IP_MULTICAST_IF */ diff --git a/ACE/ace/SOCK_Dgram_Bcast.cpp b/ACE/ace/SOCK_Dgram_Bcast.cpp index 1a44ce597b5..0dd31d46c1a 100644 --- a/ACE/ace/SOCK_Dgram_Bcast.cpp +++ b/ACE/ace/SOCK_Dgram_Bcast.cpp @@ -2,7 +2,7 @@ #include "ace/SOCK_Dgram_Bcast.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" #include "ace/os_include/net/os_if.h" @@ -80,7 +80,7 @@ ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast (const ACE_Addr &local, ACE_TRACE ("ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast"); if (this->mk_broadcast (host_name) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_Dgram_Bcast"))); } @@ -117,7 +117,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) SO_BROADCAST, (char *) &one, sizeof one) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: setsockopt failed")), -1); @@ -135,7 +135,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) if (ACE_OS::ioctl (s, SIOCGIFCONF, (char *) &ifc) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface configuration)")), ACE_INVALID_HANDLE); @@ -203,7 +203,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) // in "debugging" mode. if (ifr->ifr_addr.sa_family != 0 || ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("warning %p: sa_family: %d\n"), ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: Not AF_INET"), ifr->ifr_addr.sa_family)); @@ -217,7 +217,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) SIOCGIFFLAGS, (char *) &flags) == -1) { - ACE_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"), + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"), ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface flags)"), flags.ifr_name)); continue; @@ -226,7 +226,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) if (ACE_BIT_ENABLED (flags.ifr_flags, IFF_UP) == 0) { - ACE_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"), + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"), ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up"), flags.ifr_name)); continue; @@ -242,7 +242,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) if (ACE_OS::ioctl (s, SIOCGIFBRDADDR, (char *) &if_req) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"), + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"), ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)"), flags.ifr_name)); else @@ -259,7 +259,7 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) else { if (host_name != 0) - ACE_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"), + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"), ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: Broadcast is not enable for this interface."), flags.ifr_name)); } diff --git a/ACE/ace/SOCK_Dgram_Mcast.cpp b/ACE/ace/SOCK_Dgram_Mcast.cpp index a5d5e5e0c16..8c4e0900e3d 100644 --- a/ACE/ace/SOCK_Dgram_Mcast.cpp +++ b/ACE/ace/SOCK_Dgram_Mcast.cpp @@ -28,7 +28,7 @@ #include "ace/SOCK_Dgram_Mcast.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" // This is a workaround for platforms with non-standard // definitions of the ip_mreq structure @@ -74,12 +74,12 @@ ACE_SOCK_Dgram_Mcast::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_SOCK_Dgram_Mcast::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); # if defined (ACE_SOCK_DGRAM_MCAST_DUMPABLE) ACE_TCHAR addr_string[MAXNAMELEN + 1]; - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nOptions: bindaddr=%s, nulliface=%s\n"), ACE_BIT_ENABLED (this->opts_, OPT_BINDADDR_YES) ? ACE_TEXT ("<Bound>") : ACE_TEXT ("<Not Bound>"), @@ -89,14 +89,14 @@ ACE_SOCK_Dgram_Mcast::dump (void) const // Show default send addr, port#, and interface. ACE_SDM_helpers::addr_to_string (this->send_addr_, addr_string, sizeof addr_string, 0); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Send addr=%s iface=%s\n"), addr_string, this->send_net_if_ ? this->send_net_if_ : ACE_TEXT ("<default>"))); // Show list of subscribed addresses. - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Subscription list:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Subscription list:\n"))); ACE_MT (ACE_GUARD (ACE_SDM_LOCK, guard, this->subscription_list_lock_)); subscription_list_iter_t iter (this->subscription_list_); @@ -122,13 +122,13 @@ ACE_SOCK_Dgram_Mcast::dump (void) const ACE_OS::strcpy (iface_string, ACE_TEXT ("<default>")); // Dump info. - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\taddr=%s iface=%s\n"), addr_string, iface_string)); } # endif /* ACE_SOCK_DGRAM_MCAST_DUMPABLE */ - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -484,7 +484,7 @@ ACE_SOCK_Dgram_Mcast::join (const ACE_INET_Addr &mcast_addr, && def_port_number != 0 && sub_port_number != def_port_number) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Subscribed port# (%u) different than bound ") ACE_TEXT ("port# (%u).\n"), (u_int) sub_port_number, @@ -507,7 +507,7 @@ ACE_SOCK_Dgram_Mcast::join (const ACE_INET_Addr &mcast_addr, sizeof sub_addr_string, 1); ACE_SDM_helpers::addr_to_string (this->send_addr_, bound_addr_string, sizeof bound_addr_string, 1); - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Subscribed address (%s) different than ") ACE_TEXT ("bound address (%s).\n"), sub_addr_string, diff --git a/ACE/ace/SOCK_IO.h b/ACE/ace/SOCK_IO.h index f301c9c4085..ecdf4e4ea86 100644 --- a/ACE/ace/SOCK_IO.h +++ b/ACE/ace/SOCK_IO.h @@ -29,7 +29,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @class ACE_SOCK_IO * * @brief Defines the methods for the ACE socket wrapper I/O routines - * (e.g., send/recv). + * described below. * * If @a timeout == 0, then the call behaves as a normal * send/recv call, i.e., for blocking sockets, the call will diff --git a/ACE/ace/SOCK_Netlink.cpp b/ACE/ace/SOCK_Netlink.cpp index 3e6566767be..a5d5a639da7 100644 --- a/ACE/ace/SOCK_Netlink.cpp +++ b/ACE/ace/SOCK_Netlink.cpp @@ -4,7 +4,7 @@ #ifdef ACE_HAS_NETLINK -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" @@ -51,7 +51,7 @@ ACE_SOCK_Netlink::ACE_SOCK_Netlink (ACE_Netlink_Addr &local, if (this->open (local, protocol_family, protocol) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_Netlink"))); } diff --git a/ACE/ace/SOCK_SEQPACK_Acceptor.cpp b/ACE/ace/SOCK_SEQPACK_Acceptor.cpp index e767d269701..cd2448917ba 100644 --- a/ACE/ace/SOCK_SEQPACK_Acceptor.cpp +++ b/ACE/ace/SOCK_SEQPACK_Acceptor.cpp @@ -3,7 +3,7 @@ #include "ace/SOCK_SEQPACK_Acceptor.h" #include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_Memory.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_sys_socket.h" @@ -470,7 +470,7 @@ ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Addr &local_sap, protocol_family, backlog, protocol) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_SEQPACK_Acceptor"))); } @@ -563,7 +563,7 @@ ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Addr &local_sap, protocol_family, backlog, protocol) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_SEQPACK_Acceptor"))); } @@ -582,7 +582,7 @@ ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Multihomed_INET_ protocol_family, backlog, protocol) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_SEQPACK_Acceptor"))); } diff --git a/ACE/ace/SOCK_SEQPACK_Association.cpp b/ACE/ace/SOCK_SEQPACK_Association.cpp index 2b92eae6b05..8da794df0f4 100644 --- a/ACE/ace/SOCK_SEQPACK_Association.cpp +++ b/ACE/ace/SOCK_SEQPACK_Association.cpp @@ -3,7 +3,7 @@ #include "ace/SOCK_SEQPACK_Association.h" #include "ace/Auto_Ptr.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_Memory.h" #include "ace/OS_NS_string.h" diff --git a/ACE/ace/SOCK_SEQPACK_Connector.cpp b/ACE/ace/SOCK_SEQPACK_Connector.cpp index f98494ea41d..48d3e468612 100644 --- a/ACE/ace/SOCK_SEQPACK_Connector.cpp +++ b/ACE/ace/SOCK_SEQPACK_Connector.cpp @@ -3,7 +3,7 @@ #include "ace/SOCK_SEQPACK_Connector.h" #include "ace/INET_Addr.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Time_Value.h" #include "ace/OS_Memory.h" #include "ace/OS_NS_string.h" @@ -407,7 +407,7 @@ ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (ACE_SOCK_SEQPACK_Associa protocol) == -1 && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT)) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"))); } @@ -434,7 +434,7 @@ ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (ACE_SOCK_SEQPACK_Associa protocol) == -1 && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT)) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"))); } diff --git a/ACE/ace/SPIPE_Acceptor.cpp b/ACE/ace/SPIPE_Acceptor.cpp index 865037fec3b..e8acb40671e 100644 --- a/ACE/ace/SPIPE_Acceptor.cpp +++ b/ACE/ace/SPIPE_Acceptor.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/SPIPE_Acceptor.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_sys_stat.h" #include "ace/OS_NS_sys_time.h" @@ -237,7 +237,7 @@ ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (const ACE_SPIPE_Addr &local_sap, ACE_TRACE ("ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor"); if (this->open (local_sap, reuse_addr, perms, sa, pipe_mode) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SPIPE_Acceptor"))); } diff --git a/ACE/ace/SPIPE_Connector.cpp b/ACE/ace/SPIPE_Connector.cpp index 248cb42fa1e..eb2947e52fc 100644 --- a/ACE/ace/SPIPE_Connector.cpp +++ b/ACE/ace/SPIPE_Connector.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/SPIPE_Connector.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" @@ -32,7 +32,7 @@ ACE_SPIPE_Connector::ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io, if (this->connect (new_io, remote_sap, timeout, local_sap, reuse_addr, flags, perms, sa, pipe_mode) == -1 && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("address %s, %p\n"), + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("address %s, %p\n"), remote_sap.get_path_name (), ACE_TEXT ("ACE_SPIPE_Connector"))); } diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.cpp b/ACE/ace/SSL/SSL_Asynch_Stream.cpp index 3612e1cfbce..18bc9929b2d 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.cpp +++ b/ACE/ace/SSL/SSL_Asynch_Stream.cpp @@ -121,7 +121,7 @@ ACE_SSL_Asynch_Stream::ACE_SSL_Asynch_Stream ( this->ssl_ = ::SSL_new (ctx->context ()); if (this->ssl_ == 0) - ACE_ERROR + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), ACE_TEXT ("- cannot allocate new SSL structure") @@ -139,7 +139,7 @@ ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream (void) // done. if (this->flags_ & SF_STREAM_OPEN) // open if ((this->flags_ & SF_DELETE_ENABLE) == 0) // but .. - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("ACE_SSL_Asynch_Stream::DTOR-") ACE_TEXT("possible access violation ") ACE_TEXT("if proactor still handles events\n"))); @@ -237,21 +237,21 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler, ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1)); if (this->flags_ & SF_STREAM_OPEN) - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), ACE_TEXT ("- already opened")), -1); if (this->ssl_ == 0) - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), ACE_TEXT ("- SSL structure is absent")), -1); if (handle == ACE_INVALID_HANDLE) - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), ACE_TEXT ("- invalid handle")), @@ -280,7 +280,7 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler, this->bio_ = ACE_SSL_make_BIO (this); if (this->bio_ == 0) - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), ACE_TEXT ("- cannot allocate new BIO structure")), @@ -299,7 +299,7 @@ ACE_SSL_Asynch_Stream::open (ACE_Handler & handler, break; default: - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream::open() %p\n"), ACE_TEXT ("- invalid stream type")), @@ -521,7 +521,7 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void) break; default: - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), ACE_TEXT ("- invalid stream type")), @@ -786,7 +786,7 @@ void ACE_SSL_Asynch_Stream::print_error (int err_ssl, const ACE_TCHAR * pText) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT("SSL-error:%d %s\n"), err_ssl, pText)); @@ -800,7 +800,7 @@ ACE_SSL_Asynch_Stream::print_error (int err_ssl, { ERR_error_string_n (lerr, buf, sizeof buf); - ACE_DEBUG ((LM_DEBUG, "%C\n", buf)); + ACELIB_DEBUG ((LM_DEBUG, "%C\n", buf)); } #endif /* OPENSSL_VERSION_NUMBER */ } @@ -859,7 +859,7 @@ ACE_SSL_Asynch_Stream::ssl_bio_read (char * buf, if (this->bio_inp_msg_.size (len) != 0) { - ACE_ERROR + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), ACE_TEXT ("error in ACE_Message_Block::size() ") @@ -882,7 +882,7 @@ ACE_SSL_Asynch_Stream::ssl_bio_read (char * buf, ACE_SIGRTMIN // default signal ) == -1) { - ACE_ERROR + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%N:%l (%P|%t) ACE_SSL_Asynch_Stream %p\n"), ACE_TEXT ("attempt read failed") @@ -923,7 +923,7 @@ ACE_SSL_Asynch_Stream::ssl_bio_write (const char * buf, if (this->bio_out_msg_.size (len) != 0) { - ACE_ERROR + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), ACE_TEXT ("error in ACE_Message_Block::size() ") @@ -940,7 +940,7 @@ ACE_SSL_Asynch_Stream::ssl_bio_write (const char * buf, if (this->bio_out_msg_.copy (buf, len) == -1) { - ACE_ERROR + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), ACE_TEXT ("error in ACE_Message_Block::copy() ") @@ -959,7 +959,7 @@ ACE_SSL_Asynch_Stream::ssl_bio_write (const char * buf, ACE_SIGRTMIN // default signal ) == -1) { - ACE_ERROR + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%N:%l ((%P|%t) ACE_SSL_Asynch_Stream %p\n"), ACE_TEXT ("attempt write failed") @@ -1010,7 +1010,7 @@ ACE_SSL_Asynch_Stream::handle_write_stream ( return; } - ACE_ERROR + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), ACE_TEXT ("attempt write failed") diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index 21d0f8df078..ba25611aa74 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -9,7 +9,7 @@ #include "ace/Guard_T.h" #include "ace/Object_Manager.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Singleton.h" #include "ace/Synch_Traits.h" #include "ace/Truncate.h" @@ -603,7 +603,7 @@ ACE_SSL_Context::report_error (unsigned long error_code) (void) ::ERR_error_string (error_code, error_string); #endif /* OPENSSL_VERSION_NUMBER >= 0x0090601fL */ - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_SSL (%P|%t) error code: %u - %C\n"), error_code, error_string)); diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp index 279fd5290ca..3cc1e04f9ac 100644 --- a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp @@ -8,7 +8,7 @@ #include "ace/Handle_Set.h" #include "ace/OS_Errno.h" #include "ace/OS_NS_errno.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Time_Value.h" #include "ace/Countdown_Time.h" #include "ace/Truncate.h" diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.cpp b/ACE/ace/SSL/SSL_SOCK_Connector.cpp index 5460e1c8a6b..67e8f3d15e2 100644 --- a/ACE/ace/SSL/SSL_SOCK_Connector.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Connector.cpp @@ -7,7 +7,7 @@ #include "ace/OS_NS_errno.h" #include "ace/Handle_Set.h" #include "ace/INET_Addr.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Countdown_Time.h" #include "ace/Truncate.h" diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.cpp b/ACE/ace/SSL/SSL_SOCK_Stream.cpp index 4bccbb833a5..4d40749ef81 100644 --- a/ACE/ace/SSL/SSL_SOCK_Stream.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Stream.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Handle_Set.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Countdown_Time.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_sys_select.h" @@ -32,7 +32,7 @@ ACE_SSL_SOCK_Stream::ACE_SSL_SOCK_Stream (ACE_SSL_Context *context) if (this->ssl_ == 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, "(%P|%t) ACE_SSL_SOCK_Stream " "- cannot allocate new SSL structure %p\n", ACE_TEXT (""))); diff --git a/ACE/ace/SUN_Proactor.cpp b/ACE/ace/SUN_Proactor.cpp index c3b85ad3093..05d31874555 100644 --- a/ACE/ace/SUN_Proactor.cpp +++ b/ACE/ace/SUN_Proactor.cpp @@ -5,7 +5,7 @@ #if defined (ACE_HAS_AIO_CALLS) && defined (sun) #include "ace/Task_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Object_Manager.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -105,7 +105,7 @@ ACE_SUN_Proactor::handle_events_i (ACE_Time_Value *delta) break; // we should process "post_completed" queue default: // EFAULT - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%N:%l:(%P | %t)::%p \nNumAIO=%d\n"), ACE_TEXT("ACE_SUN_Proactor::handle_events: aiowait failed"), num_started_aio_), @@ -195,7 +195,7 @@ ACE_SUN_Proactor::find_completed_aio (aio_result_t *result, error_status, transfer_count) == 0) { // should never be - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT("%N:%l:(%P | %t)::%p\n"), ACE_TEXT("ACE_SUN_Proactor::find_completed_aio:") ACE_TEXT("should never be !!!\n"))); @@ -277,7 +277,7 @@ ACE_SUN_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) if (errno == EAGAIN || errno == ENOMEM) // Defer - retry this later. ret_val = 1; else - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%N:%l:(%P | %t)::start_aio: aio%s %p\n"), ptype, ACE_TEXT ("queueing failed\n"))); diff --git a/ACE/ace/SV_Message_Queue.cpp b/ACE/ace/SV_Message_Queue.cpp index 6118fce8c40..ae1a5ca5930 100644 --- a/ACE/ace/SV_Message_Queue.cpp +++ b/ACE/ace/SV_Message_Queue.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/SV_Message_Queue.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) #include "ace/SV_Message_Queue.inl" @@ -38,7 +38,7 @@ ACE_SV_Message_Queue::ACE_SV_Message_Queue (key_t external_id, { ACE_TRACE ("ACE_SV_Message_Queue::ACE_SV_Message_Queue"); if (this->open (external_id, create, perms) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SV_Message_Queue::ACE_SV_Message_Queue"))); } diff --git a/ACE/ace/SV_Semaphore_Complex.cpp b/ACE/ace/SV_Semaphore_Complex.cpp index 14f35f68373..4ba05de5912 100644 --- a/ACE/ace/SV_Semaphore_Complex.cpp +++ b/ACE/ace/SV_Semaphore_Complex.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/SV_Semaphore_Complex.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_Thread.h" #if !defined (__ACE_INLINE__) @@ -218,7 +218,7 @@ ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (key_t k, { ACE_TRACE ("ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex"); if (this->open (k, flags, initial_value, nsems, perms) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SV_Semaphore_Complex"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SV_Semaphore_Complex"))); } ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (const char *name, @@ -237,7 +237,7 @@ ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (const char *name, key = this->name_2_key (name); if (this->open (key, flags, initial_value, nsems, perms) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SV_Semaphore_Complex"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SV_Semaphore_Complex"))); } ACE_SV_Semaphore_Complex::~ACE_SV_Semaphore_Complex (void) diff --git a/ACE/ace/SV_Semaphore_Simple.cpp b/ACE/ace/SV_Semaphore_Simple.cpp index 2b340649ed1..c65904510d0 100644 --- a/ACE/ace/SV_Semaphore_Simple.cpp +++ b/ACE/ace/SV_Semaphore_Simple.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/SV_Semaphore_Simple.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/ACE.h" #include "ace/os_include/sys/os_sem.h" @@ -112,7 +112,7 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (key_t k, { ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"); if (this->open (k, flags, initial_value, n, perms) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SV_Semaphore::ACE_SV_Semaphore"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SV_Semaphore::ACE_SV_Semaphore"))); } // Convert name to key. This function is used internally to create keys @@ -181,7 +181,7 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name, initial_value, n, perms) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"))); } @@ -199,7 +199,7 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const wchar_t *name, initial_value, nsems, perms) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"))); } diff --git a/ACE/ace/SV_Shared_Memory.cpp b/ACE/ace/SV_Shared_Memory.cpp index 9e5206b54bb..4e088e5bdf9 100644 --- a/ACE/ace/SV_Shared_Memory.cpp +++ b/ACE/ace/SV_Shared_Memory.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/SV_Shared_Memory.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) #include "ace/SV_Shared_Memory.inl" @@ -53,7 +53,7 @@ ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (key_t external_id, ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"); if (this->open_and_attach (external_id, sz, create, perms, virtual_addr, flags) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"))); } @@ -81,7 +81,7 @@ ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (ACE_HANDLE int_id, { ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"); if (this->attach (0, flags) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"))); } diff --git a/ACE/ace/Sample_History.cpp b/ACE/ace/Sample_History.cpp index 0f20b604012..4da45594e5f 100644 --- a/ACE/ace/Sample_History.cpp +++ b/ACE/ace/Sample_History.cpp @@ -7,7 +7,7 @@ #endif /* __ACE_INLINE__ */ #include "ace/Basic_Stats.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_Memory.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -33,7 +33,7 @@ ACE_Sample_History::dump_samples ( for (size_t i = 0; i != this->sample_count_; ++i) { ACE_UINT64 const val = this->samples_[i] / scale_factor; - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%s: ") ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("\t%Q\n"), diff --git a/ACE/ace/Sbrk_Memory_Pool.cpp b/ACE/ace/Sbrk_Memory_Pool.cpp index 717ec52c5ae..cc7548364c8 100644 --- a/ACE/ace/Sbrk_Memory_Pool.cpp +++ b/ACE/ace/Sbrk_Memory_Pool.cpp @@ -2,7 +2,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/Sbrk_Memory_Pool.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" @@ -20,16 +20,16 @@ ACE_Sbrk_Memory_Pool::acquire (size_t nbytes, { ACE_TRACE ("ACE_Sbrk_Memory_Pool::acquire"); rounded_bytes = this->round_up (nbytes); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); void *cp = ACE_OS::sbrk (rounded_bytes); if (cp == MAP_FAILED) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "(%P|%t) cp = %u\n", cp), 0); else - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d, new break = %u\n"), nbytes, rounded_bytes, cp)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d, new break = %u\n"), nbytes, rounded_bytes, cp)); return cp; } diff --git a/ACE/ace/Select_Reactor_Base.cpp b/ACE/ace/Select_Reactor_Base.cpp index deb5cdf7b19..72f21215fe1 100644 --- a/ACE/ace/Select_Reactor_Base.cpp +++ b/ACE/ace/Select_Reactor_Base.cpp @@ -6,7 +6,7 @@ #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" #include "ace/Timer_Queue.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Signal.h" #include "ace/OS_NS_fcntl.h" @@ -475,15 +475,15 @@ ACE_Select_Reactor_Handler_Repository_Iterator::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Select_Reactor_Handler_Repository_Iterator::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("rep_ = %u"), this->rep_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("rep_ = %u"), this->rep_)); # ifdef ACE_WIN32 - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("current_ = "))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("current_ = "))); this->current_.dump (); # else - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("current_ = %@"), this->current_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("current_ = %@"), this->current_)); # endif /* ACE_WIN32 */ - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -501,20 +501,20 @@ ACE_Select_Reactor_Handler_Repository::dump (void) const # define ACE_MAX_HANDLEP1_FORMAT_SPECIFIER ACE_TEXT("%d") # endif /* ACE_WIN32 */ - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("max_handlep1_ = ") ACE_MAX_HANDLEP1_FORMAT_SPECIFIER ACE_TEXT ("\n"), this->max_handlep1 ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("["))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("["))); ACE_Event_Handler *event_handler = 0; for (ACE_Select_Reactor_Handler_Repository_Iterator iter (this); iter.next (event_handler) != 0; iter.advance ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (event_handler = %@,") ACE_TEXT (" event_handler->handle_ = ") ACE_HANDLE_FORMAT_SPECIFIER @@ -522,8 +522,8 @@ ACE_Select_Reactor_Handler_Repository::dump (void) const event_handler, event_handler->get_handle ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" ]\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" ]\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -584,10 +584,10 @@ ACE_Select_Reactor_Notify::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Select_Reactor_Notify::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("select_reactor_ = %x"), this->select_reactor_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("select_reactor_ = %x"), this->select_reactor_)); this->notification_pipe_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -844,7 +844,7 @@ ACE_Select_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer) break; default: // Should we bail out if we get an invalid mask? - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("invalid mask = %d\n"), buffer.mask_)); } diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp index 78e342303a1..325d9b7784c 100644 --- a/ACE/ace/Select_Reactor_T.cpp +++ b/ACE/ace/Select_Reactor_T.cpp @@ -11,7 +11,7 @@ #include "ace/ACE.h" #include "ace/Guard_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Signal.h" #include "ace/Sig_Handler.h" #include "ace/Thread.h" @@ -425,7 +425,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::open 0, disable_notify_pipe) == -1) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("notification pipe open failed"))); result = -1; @@ -518,7 +518,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T tq, disable_notify_pipe, notify) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Select_Reactor_T::open ") ACE_TEXT ("failed inside ") @@ -552,7 +552,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T tq, disable_notify_pipe, notify) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Select_Reactor_T::open ") ACE_TEXT ("failed inside ACE_Select_Reactor_T::CTOR"))); @@ -1254,7 +1254,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch_io_handlers return -1; } - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Select_Reactor_T::dispatch - EXCEPT\n"))); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Select_Reactor_T::dispatch - EXCEPT\n"))); if (this->dispatch_io_set (number_of_active_handles, number_of_handlers_dispatched, ACE_Event_Handler::EXCEPT_MASK, @@ -1266,7 +1266,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch_io_handlers return -1; } - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Select_Reactor_T::dispatch - READ\n"))); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Select_Reactor_T::dispatch - READ\n"))); if (this->dispatch_io_set (number_of_active_handles, number_of_handlers_dispatched, ACE_Event_Handler::READ_MASK, @@ -1553,12 +1553,12 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Select_Reactor_T::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->timer_queue_->dump (); this->handler_rep_.dump (); this->signal_handler_->dump (); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_signal_handler_ = %d\n"), this->delete_signal_handler_)); @@ -1566,51 +1566,51 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dump (void) const for (ACE_Handle_Set_Iterator handle_iter_wr (this->wait_set_.wr_mask_); (h = handle_iter_wr ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_handle = %d\n"), h)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("write_handle = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_rd (this->wait_set_.rd_mask_); (h = handle_iter_rd ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("read_handle = %d\n"), h)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("read_handle = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_ex (this->wait_set_.ex_mask_); (h = handle_iter_ex ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("except_handle = %d\n"), h)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("except_handle = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_wr_ready (this->ready_set_.wr_mask_); (h = handle_iter_wr_ready ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_handle_ready = %d\n"), h)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("write_handle_ready = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_rd_ready (this->ready_set_.rd_mask_); (h = handle_iter_rd_ready ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("read_handle_ready = %d\n"), h)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("read_handle_ready = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_ex_ready (this->ready_set_.ex_mask_); (h = handle_iter_ex_ready ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("except_handle_ready = %d\n"), h)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("except_handle_ready = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_su_ready (this->suspend_set_.wr_mask_); (h = handle_iter_su_ready ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_handle_suspend = %d\n"), h)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("write_handle_suspend = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_su_ready (this->suspend_set_.rd_mask_); (h = handle_iter_su_ready ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("read_handle_suspend = %d\n"), h)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("read_handle_suspend = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_su_ready (this->suspend_set_.ex_mask_); (h = handle_iter_su_ready ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("except_handle_suspend = %d\n"), h)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("except_handle_suspend = %d\n"), h)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("restart_ = %d\n"), this->restart_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("requeue_position_ = %d\n"), this->requeue_position_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("initialized_ = %d\n"), this->initialized_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_ = %d\n"), this->owner_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("restart_ = %d\n"), this->restart_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("requeue_position_ = %d\n"), this->requeue_position_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("initialized_ = %d\n"), this->initialized_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_ = %d\n"), this->owner_)); #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) this->notify_handler_->dump (); this->token_.dump (); #endif /* ACE_MT_SAFE */ - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Semaphore.cpp b/ACE/ace/Semaphore.cpp index d1af727cf68..d2c3de17b50 100644 --- a/ACE/ace/Semaphore.cpp +++ b/ACE/ace/Semaphore.cpp @@ -6,7 +6,7 @@ #include "ace/Semaphore.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/ACE.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -19,9 +19,9 @@ ACE_Semaphore::dump (void) const #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Semaphore::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -45,7 +45,7 @@ ACE_Semaphore::ACE_Semaphore (unsigned int count, if (ACE_OS::sema_init (&this->semaphore_, count, type, name, arg, max) != 0) #endif - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Semaphore::ACE_Semaphore"))); } diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp index 32a009e4136..1f8166738c7 100644 --- a/ACE/ace/Service_Config.cpp +++ b/ACE/ace/Service_Config.cpp @@ -21,7 +21,7 @@ #include "ace/Thread.h" #include "ace/Get_Opt.h" #include "ace/ARGV.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/ACE.h" @@ -42,7 +42,7 @@ ACE_Threading_Helper<ACE_Thread_Mutex>::ACE_Threading_Helper (void) if (ACE_Thread::keycreate (&key_, 0) == -1) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Failed to create thread key: %p\n"), ACE_TEXT (""))); } @@ -52,7 +52,7 @@ void ACE_Threading_Helper<ACE_Thread_Mutex>::set (void* p) { if (ACE_Thread::setspecific (key_, p) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Service Config failed to set thread key value: %p\n"), ACE_TEXT(""))); } @@ -62,7 +62,7 @@ ACE_Threading_Helper<ACE_Thread_Mutex>::get (void) { void* temp = 0; if (ACE_Thread::getspecific (key_, &temp) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) Service Config failed to get thread key value: %p\n"), ACE_TEXT("")), 0); @@ -106,7 +106,7 @@ ACE_Service_Config_Guard::ACE_Service_Config_Guard (ACE_Service_Gestalt * psg) : saved_ (ACE_Service_Config::current ()) { if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) - SCG:<ctor=%@>") ACE_TEXT (" - config=%@ repo=%@ superceded by repo=%@\n"), this, @@ -126,7 +126,7 @@ ACE_Service_Config_Guard::~ACE_Service_Config_Guard (void) ACE_Service_Config::current (s); if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SCG:<dtor=%@>") ACE_TEXT (" - new repo=%@\n"), this, @@ -202,7 +202,7 @@ ACE_Service_Config::parse_args_i (int argc, ACE_TCHAR *argv[]) if (ACE_Reactor::instance ()->register_handler (ACE_Service_Config::signum_, ACE_Service_Config::signal_handler_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("cannot obtain signal handler\n")), -1); #endif /* ACE_LACKS_UNIX_SIGNALS */ @@ -229,7 +229,7 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[], ACE_Log_Msg *log_msg = ACE_LOG_MSG; if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SC::open_i - this=%@, opened=%d\n"), this, this->is_opened_)); @@ -287,7 +287,7 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[], return -1; if (ACE::debug ()) - ACE_DEBUG ((LM_STARTUP, + ACELIB_DEBUG ((LM_STARTUP, ACE_TEXT ("starting up daemon %n\n"))); // Initialize the Service Repository (this will still work if @@ -310,7 +310,7 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[], if ((ACE_Reactor::instance () != 0) && (ACE_Reactor::instance ()->register_handler (ss, ACE_Service_Config::signal_handler_) == -1)) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("can't register signal handler\n"))); } #endif /* ACE_LACKS_UNIX_SIGNALS */ @@ -407,7 +407,7 @@ ACE_Service_Config::ACE_Service_Config (const ACE_TCHAR program_name[], { // Only print out an error if it wasn't the svc.conf file that was // missing. - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) SC failed to open: %p\n"), program_name)); } @@ -497,7 +497,7 @@ ACE_Service_Config::create_service_type_impl (const ACE_TCHAR *name, 0); break; default: - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("unknown case\n"))); break; } @@ -535,12 +535,12 @@ ACE_Service_Config::reconfigure (void) time_t t = ACE_OS::time (0); #endif /* ! ACE_NLOGGING */ if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("beginning reconfiguration at %s"), ACE_OS::ctime (&t))); } if (ACE_Service_Config::process_directives () == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("process_directives"))); } diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp index bd80fefc177..a7b9cea1c01 100644 --- a/ACE/ace/Service_Gestalt.cpp +++ b/ACE/ace/Service_Gestalt.cpp @@ -58,7 +58,7 @@ ACE_Service_Type_Dynamic_Guard::ACE_Service_Type_Dynamic_Guard #endif { if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) STDG::<ctor>, repo=%@") ACE_TEXT(", name=%s - begining at [%d]\n"), &this->repo_, @@ -84,7 +84,7 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void) if ((ret < 0 && ret != -2) || tmp == 0) { if (ACE::debug ()) - ACE_ERROR ((LM_WARNING, + ACELIB_ERROR ((LM_WARNING, ACE_TEXT ("ACE (%P|%t) STDG::<dtor> - Failed (%d) to find %s -> %@\n"), ret, this->name_, tmp)); return; @@ -96,7 +96,7 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void) // the same name as our dummy. if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) STDG::<dtor>, repo=%@ [%d], ") ACE_TEXT ("name=%s - updating dependents [%d - %d)\n"), &this->repo_, @@ -112,7 +112,7 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void) this->repo_.relocate_i (this->repo_begin_, this->repo_.current_size (), tmp->dll()); if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) STDG::<dtor>, repo=%@ [%d], ") ACE_TEXT ("name=%s - loaded (type=%@, impl=%@, object=%@, active=%d)\n"), &this->repo_, @@ -179,7 +179,7 @@ ACE_Service_Gestalt::~ACE_Service_Gestalt (void) // Delete the dynamically allocated static_svcs instance. #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::~SG - this=%@, pss = %@\n"), this, this->processed_static_svcs_)); #endif @@ -225,7 +225,7 @@ ACE_Service_Gestalt::ACE_Service_Gestalt (size_t size, #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::ctor - this = %@, pss = %@\n"), this, this->processed_static_svcs_)); #endif @@ -381,7 +381,7 @@ ACE_Service_Gestalt::add_processed_static_svc this->processed_static_svcs_->insert(tmp); if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::add_processed_static_svc, ") ACE_TEXT ("repo=%@ - %s\n"), this->repo_, @@ -427,7 +427,7 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name, #ifndef ACE_NLOGGING if (ACE::debug ()) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::initialize - () repo=%@, ") ACE_TEXT ("looking up static ") ACE_TEXT ("service \'%s\' to initialize\n"), @@ -448,7 +448,7 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name, } else { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) ERROR: SG::initialize - service \'%s\'") ACE_TEXT (" was not located.\n"), svc_name), @@ -456,7 +456,7 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name, } } if (srp == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) ERROR: SG::initialize - service \'%s\'") ACE_TEXT (" was not located.\n"), svc_name), @@ -467,7 +467,7 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name, args.argv ()) == -1) { // ... report and remove this entry. - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) ERROR: SG::initialize - static init of \'%s\'") ACE_TEXT (" failed (%p)\n"), svc_name, ACE_TEXT ("error"))); @@ -490,7 +490,7 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf, #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@, name=%s") ACE_TEXT (" - looking up in the repo\n"), this->repo_, @@ -507,7 +507,7 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf, { #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_WARNING, + ACELIB_DEBUG ((LM_WARNING, ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@,") ACE_TEXT (" name=%s - removing a pre-existing namesake.\n"), this->repo_, @@ -527,7 +527,7 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf, // DLL_Manager was re-entrant we would have entered an infinite // recursion here. if (retv == -2 && srp->type () == 0) - ACE_ERROR_RETURN ((LM_WARNING, + ACELIB_ERROR_RETURN ((LM_WARNING, ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@,") ACE_TEXT (" name=%s - forward-declared; ") ACE_TEXT (" recursive initialization requests are") @@ -583,7 +583,7 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type *sr, ACE_TRACE ("ACE_Service_Gestalt::initialize"); if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@, name=%s") ACE_TEXT (" - looking up in the repo\n"), this->repo_, @@ -594,7 +594,7 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type *sr, (const ACE_Service_Type **) &srp) >= 0) { #ifndef ACE_NLOGGING - ACE_DEBUG ((LM_WARNING, + ACELIB_DEBUG ((LM_WARNING, ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@, name=%s") ACE_TEXT (" - removing a pre-existing namesake.\n"), this->repo_, @@ -625,7 +625,7 @@ ACE_Service_Gestalt::initialize_i (const ACE_Service_Type *sr, #ifndef ACE_NLOGGING // Not using LM_ERROR here to avoid confusing the test harness if (ACE::debug ()) - ACE_ERROR_RETURN ((LM_WARNING, + ACELIB_ERROR_RETURN ((LM_WARNING, ACE_TEXT ("ACE (%P|%t) SG::initialize_i -") ACE_TEXT (" repo=%@, name=%s - remove failed: %m\n"), this->repo_, @@ -640,7 +640,7 @@ ACE_Service_Gestalt::initialize_i (const ACE_Service_Type *sr, #ifndef ACE_NLOGGING // Not using LM_ERROR here to avoid confusing the test harness if (ACE::debug ()) - ACE_ERROR_RETURN ((LM_WARNING, + ACELIB_ERROR_RETURN ((LM_WARNING, ACE_TEXT ("ACE (%P|%t) SG::initialize_i -") ACE_TEXT (" repo=%@, name=%s - insert failed: %m\n"), this->repo_, @@ -753,7 +753,7 @@ ACE_Service_Gestalt::process_directive_i (const ACE_Static_Svc_Descriptor &ssd, #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::process_directive_i, ") ACE_TEXT ("repo=%@ - %s, dll=%s, force=%d\n"), this->repo_, @@ -772,7 +772,7 @@ ACE_Service_Gestalt::process_directives_i (ACE_Svc_Conf_Param *param) { #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::process_directives_i, ") ACE_TEXT ("repo=%@ - %s\n"), this->repo_, @@ -818,7 +818,7 @@ ACE_XML_Svc_Conf * ACE_Service_Gestalt::get_xml_svc_conf (ACE_DLL &xmldll) { if (xmldll.open (ACE_TEXT ("ACEXML_XML_Svc_Conf_Parser")) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) Failure to open ACEXML_XML_Svc_Conf_Parser: %p\n"), ACE_TEXT("ACE_Service_Config::get_xml_svc_conf")), 0); @@ -835,7 +835,7 @@ ACE_Service_Gestalt::get_xml_svc_conf (ACE_DLL &xmldll) ACE_XML_Svc_Conf::Factory factory = reinterpret_cast<ACE_XML_Svc_Conf::Factory> (temp_p); if (factory == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) Unable to resolve factory: %p\n"), xmldll.error ()), 0); @@ -856,7 +856,7 @@ ACE_Service_Gestalt::process_file (const ACE_TCHAR file[]) // service with a matching name. if (this->repo_->find (file, 0, 0) >=0) { - ACE_DEBUG ((LM_WARNING, + ACELIB_DEBUG ((LM_WARNING, ACE_TEXT ("ACE (%P|%t) Configuration file %s is currently") ACE_TEXT (" being processed. Ignoring recursive process_file().\n"), file)); @@ -882,7 +882,7 @@ ACE_Service_Gestalt::process_file (const ACE_TCHAR file[]) // Invalid svc.conf file. We'll report it here and break out of // the method. if (ACE::debug ()) - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("ACE (%P|%t): %p\n"), file)); @@ -926,7 +926,7 @@ ACE_Service_Gestalt::process_directive (const ACE_TCHAR directive[]) #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::process_directive, repo=%@ - %s\n"), this->repo_, directive)); @@ -975,7 +975,7 @@ ACE_Service_Gestalt::init_svc_conf_file_queue (void) #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::init_svc_conf_file_queue ") ACE_TEXT ("- this=%@, repo=%@\n"), this, this->repo_)); @@ -1008,7 +1008,7 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[], #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::open_i - this=%@, ") ACE_TEXT ("opened=%d, loadstatics=%d\n"), this, this->is_opened_, this->no_static_svcs_)); @@ -1095,7 +1095,7 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[], (ACE_TString (ACE_DEFAULT_SVC_CONF)) == -1) { errno = ENOENT; - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("enqueuing ") ACE_DEFAULT_SVC_CONF @@ -1157,7 +1157,7 @@ ACE_Service_Gestalt::process_commandline_directives (void) // Process just a single directive. if (this->process_directive ((sptr->fast_rep ())) != 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) %p\n"), ACE_TEXT ("process_directive"))); result = -1; @@ -1203,7 +1203,7 @@ ACE_Service_Gestalt::parse_args_i (int argc, break; case 'f': if (this->svc_conf_file_queue_->enqueue_tail (ACE_TString (get_opt.opt_arg ())) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("enqueue_tail")), -1); @@ -1231,14 +1231,14 @@ ACE_Service_Gestalt::parse_args_i (int argc, } if (this->svc_queue_->enqueue_tail (ACE_TString (get_opt.opt_arg ())) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("enqueue_tail")), -1); break; default: if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) %c is not a ACE_Service_Config option\n"), c)); } @@ -1307,7 +1307,7 @@ ACE_Service_Gestalt::close (void) #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SG::close - complete this=%@, repo=%@, owned=%d\n"), this, this->repo_, this->svc_repo_is_owned_)); #endif diff --git a/ACE/ace/Service_Manager.cpp b/ACE/ace/Service_Manager.cpp index a64bace009e..29359a2fb02 100644 --- a/ACE/ace/Service_Manager.cpp +++ b/ACE/ace/Service_Manager.cpp @@ -3,7 +3,7 @@ #include "ace/Service_Manager.h" #include "ace/Get_Opt.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Service_Repository.h" #include "ace/Service_Config.h" #include "ace/Service_Types.h" @@ -127,7 +127,7 @@ ACE_Service_Manager::init (int argc, ACE_TCHAR *argv[]) if (this->get_handle () == ACE_INVALID_HANDLE && this->open (local_addr) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open")), -1); } @@ -135,7 +135,7 @@ ACE_Service_Manager::init (int argc, ACE_TCHAR *argv[]) (this, ACE_Event_Handler::ACCEPT_MASK) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("registering service with ACE_Reactor\n")), -1); } @@ -213,7 +213,7 @@ ACE_Service_Manager::list_services (void) if (this->debug_) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("len = %d, info = %s%s"), len, buf, @@ -226,7 +226,7 @@ ACE_Service_Manager::list_services (void) if (n <= 0 && errno != EPIPE) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("send_n"))); } @@ -326,7 +326,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) if (this->debug_) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("client_stream fd = %d\n"), this->client_stream_.get_handle ())); ACE_INET_Addr sa; @@ -336,7 +336,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) return -1; } - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("accepted from host %C at port %d\n"), sa.get_host_name (), sa.get_port_number ())); @@ -372,7 +372,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) { if ((remaining -= result) <= 0) { - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("Request buffer overflow.\n"))); result = 0; break; @@ -395,7 +395,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) case -1: if (this->debug_) { - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("recv"))); } @@ -422,7 +422,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) if (this->client_stream_.close () == -1 && this->debug_) { - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("close"))); } diff --git a/ACE/ace/Service_Object.cpp b/ACE/ace/Service_Object.cpp index 5fd22ca720a..ceabe4b5799 100644 --- a/ACE/ace/Service_Object.cpp +++ b/ACE/ace/Service_Object.cpp @@ -12,7 +12,7 @@ #include "ace/Service_Types.h" #include "ace/DLL.h" #include "ace/ACE.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if defined (ACE_OPENVMS) # include "ace/Lib_Find.h" #endif @@ -84,7 +84,7 @@ int ACE_Service_Type::fini (void) { if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) ST::fini - destroying name=%s, dll=%s\n"), this->name_, this->dll_.dll_name_)); diff --git a/ACE/ace/Service_Repository.cpp b/ACE/ace/Service_Repository.cpp index 67fbc18e538..a3f618c2a4b 100644 --- a/ACE/ace/Service_Repository.cpp +++ b/ACE/ace/Service_Repository.cpp @@ -8,7 +8,7 @@ #include "ace/Service_Types.h" #include "ace/Object_Manager.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/ACE.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_errno.h" @@ -132,7 +132,7 @@ ACE_Service_Repository::fini (void) ACE_Service_Type *s = const_cast<ACE_Service_Type *> (this->service_array_[i]); if (s == 0) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SR::fini, repo=%@ [%d] -> 0\n"), this, i)); @@ -155,7 +155,7 @@ ACE_Service_Repository::fini (void) #ifndef ACE_NLOGGING if (ACE::debug ()) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SR::fini, repo=%@ [%d], ") ACE_TEXT ("name=%s, type=%@, object=%@, active=%d\n"), this, @@ -187,7 +187,7 @@ ACE_Service_Repository::fini (void) #ifndef ACE_NLOGGING if (ACE::debug ()) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SR::fini, repo=%@ [%d], ") ACE_TEXT ("name=%s, type=%@, object=%@, active=%d\n"), this, @@ -215,7 +215,7 @@ ACE_Service_Repository::close (void) #ifndef ACE_NLOGGING if(ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SR::close - repo=%@, size=%d\n"), this, this->service_array_.size())); @@ -233,12 +233,12 @@ ACE_Service_Repository::close (void) if(ACE::debug ()) { if (s == 0) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SR::close - repo=%@ [%d] -> 0\n"), this, i)); else - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SR::close - repo=%@ [%d], name=%s, object=%@\n"), this, i, @@ -259,7 +259,7 @@ ACE_Service_Repository::~ACE_Service_Repository (void) ACE_TRACE ("ACE_Service_Repository::~ACE_Service_Repository"); #ifndef ACE_NLOGGING if(ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, "ACE (%P|%t) SR::<dtor>, this=%@\n", this)); + ACELIB_DEBUG ((LM_DEBUG, "ACE (%P|%t) SR::<dtor>, this=%@\n", this)); #endif this->close (); } @@ -341,13 +341,13 @@ ACE_Service_Repository::relocate_i (size_t begin, if (ACE::debug ()) { if (type == 0) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SR::relocate_i - repo=%@ [%d]") ACE_TEXT (": skipping empty slot\n"), this, i)); else - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SR::relocate_i - repo=%@ [%d]") ACE_TEXT (": trying name=%s, handle: %d -> %d\n"), this, @@ -364,7 +364,7 @@ ACE_Service_Repository::relocate_i (size_t begin, { #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SR::relocate_i - repo=%@ [%d]") ACE_TEXT (": relocating name=%s, handle: %d -> %d\n"), this, @@ -437,7 +437,7 @@ ACE_Service_Repository::insert (const ACE_Service_Type *sr) } #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SR::insert - repo=%@ [%d],") ACE_TEXT (" name=%s (%C) (type=%@, object=%@, active=%d)\n"), this, @@ -545,7 +545,7 @@ ACE_Service_Repository::remove_i (const ACE_TCHAR name[], ACE_Service_Type **ps) #ifndef ACE_NLOGGING if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE (%P|%t) SR::remove_i - repo=%@ [%d],") ACE_TEXT (" name=%s (removed) (type=%@, active=%d)\n"), this, diff --git a/ACE/ace/Shared_Memory_Pool.cpp b/ACE/ace/Shared_Memory_Pool.cpp index 01bb2001637..cb55c6dd202 100644 --- a/ACE/ace/Shared_Memory_Pool.cpp +++ b/ACE/ace/Shared_Memory_Pool.cpp @@ -3,7 +3,7 @@ // Shared_Memory_Pool.cpp #include "ace/Shared_Memory_Pool.h" #include "ace/OS_NS_sys_shm.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" @@ -49,12 +49,12 @@ ACE_Shared_Memory_Pool::in_use (ACE_OFF_T &offset, counter++) { if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("shmctl")), -1); offset += buf.shm_segsz; - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); } return 0; @@ -75,7 +75,7 @@ ACE_Shared_Memory_Pool::find_seg (const void* const searchPtr, counter++) { if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("shmctl")), -1); @@ -90,7 +90,7 @@ ACE_Shared_Memory_Pool::find_seg (const void* const searchPtr, offset -= buf.shm_segsz; return 0; } - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); } return 0; @@ -109,7 +109,7 @@ ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, return -1; if (counter == this->max_segments_) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "exceeded max number of segments = %d, base = %u, offset = %u\n", counter, this->base_addr_, @@ -121,7 +121,7 @@ ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, rounded_bytes, this->file_perms_ | IPC_CREAT | IPC_EXCL); if (shmid == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("shmget")), -1); @@ -134,7 +134,7 @@ ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, 0); if (shmem != address) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("(%P|%t) %p, shmem = %u, address = %u\n"), ACE_TEXT("shmat"), shmem, @@ -150,7 +150,7 @@ int ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) { ACE_TRACE ("ACE_Shared_Memory_Pool::handle_signal"); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("signal %S occurred\n"), signum)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("signal %S occurred\n"), signum)); // While FreeBSD 5.X has a siginfo_t struct with a si_addr field, // it does not define SEGV_MAPERR. @@ -162,16 +162,16 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) if (siginfo != 0) { - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); size_t counter; if (this->in_use (offset, counter) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("in_use"))); else if (!(siginfo->si_code == SEGV_MAPERR && siginfo->si_addr < (((char *) this->base_addr_) + offset) && siginfo->si_addr >= ((char *) this->base_addr_))) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "(%P|%t) address %u out of range\n", siginfo->si_addr), -1); @@ -185,7 +185,7 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) size_t counter; // ret value to get shmid from the st table. if (this->find_seg (siginfo->si_addr, offset, counter) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("in_use")), -1); @@ -196,7 +196,7 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) void *shmem = ACE_OS::shmat (st[counter].shmid_, (char *) address, 0); if (shmem != address) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("(%P|%t) %p, shmem = %u, address = %u\n"), ACE_TEXT("shmat"), shmem, @@ -260,7 +260,7 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool ( this->base_shm_key_ = ACE_DEFAULT_SHM_KEY; if (this->signal_handler_.register_handler (SIGSEGV, this) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Sig_Handler::register_handler"))); } @@ -279,14 +279,14 @@ ACE_Shared_Memory_Pool::acquire (size_t nbytes, rounded_bytes = this->round_up (nbytes); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); ACE_OFF_T offset; if (this->commit_backing_store_name (rounded_bytes, offset) == -1) return 0; - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); return ((char *) this->base_addr_) + offset; } @@ -313,7 +313,7 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes, if (shmid == -1) { if (errno != EEXIST) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("shmget")), 0); @@ -322,7 +322,7 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes, shmid = ACE_OS::shmget (this->base_shm_key_, 0, 0); if (shmid == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("shmget")), 0); @@ -334,7 +334,7 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes, reinterpret_cast<char *> (this->base_addr_), 0); if (this->base_addr_ == reinterpret_cast<void *> (-1)) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("(%P|%t) %p, base_addr = %u\n"), ACE_TEXT("shmat"), this->base_addr_), @@ -351,7 +351,7 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes, reinterpret_cast<char *> (this->base_addr_), 0); if (this->base_addr_ == reinterpret_cast<char *> (-1)) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT("(%P|%t) %p, base_addr = %u\n"), ACE_TEXT("shmat"), this->base_addr_), 0); diff --git a/ACE/ace/Signal.cpp b/ACE/ace/Signal.cpp index aa9d142b80e..90c232e734d 100644 --- a/ACE/ace/Signal.cpp +++ b/ACE/ace/Signal.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/Signal.h" -// #include "ace/Log_Msg.h" +// #include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) #include "ace/Signal.inl" diff --git a/ACE/ace/Singleton.cpp b/ACE/ace/Singleton.cpp index da1f12bbce2..4a8b4997f7a 100644 --- a/ACE/ace/Singleton.cpp +++ b/ACE/ace/Singleton.cpp @@ -14,7 +14,7 @@ #endif /* __ACE_INLINE__ */ #include "ace/Object_Manager.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Framework_Component.h" #include "ace/Guard_T.h" #include "ace/os_include/os_typeinfo.h" @@ -28,9 +28,9 @@ ACE_Singleton<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("ACE_Singleton<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), ACE_Singleton<TYPE, ACE_LOCK>::instance_i ())); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ #endif /* ACE_HAS_DUMP */ } @@ -138,9 +138,9 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i ())); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ #endif /* ACE_HAS_DUMP */ } @@ -228,9 +228,9 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ())); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ #endif /* ACE_HAS_DUMP */ } @@ -316,9 +316,9 @@ ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ())); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ #endif /* ACE_HAS_DUMP */ } @@ -422,9 +422,9 @@ ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance_i ())); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index 6813e1d0256..52e71b3ac33 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -2,7 +2,7 @@ #include "ace/Sock_Connect.h" #include "ace/INET_Addr.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Handle_Set.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" @@ -182,7 +182,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, s = ACE_OS::socket (AF_INET, SOCK_STREAM, 0); if (s == ACE_INVALID_HANDLE) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_OS::socket")), -1); @@ -196,7 +196,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, // Get interface structure and initialize the addresses using UNIX // techniques if (ACE_OS::ioctl (s, SIOCGIFCONF_CMD, (char *) &ifc) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE::get_bcast_addr:") ACE_TEXT ("ioctl (get interface configuration)")), @@ -253,7 +253,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, if (ifr->ifr_addr.sa_family != AF_INET) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE::get_bcast_addr:") ACE_TEXT ("Not AF_INET"))); @@ -265,7 +265,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, if (ACE_OS::ioctl (s, SIOCGIFFLAGS, (char *) &flags) == -1) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE::get_bcast_addr:") ACE_TEXT (" ioctl (get interface flags)"))); @@ -274,7 +274,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, if (ACE_BIT_DISABLED (flags.ifr_flags, IFF_UP)) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE::get_bcast_addr:") ACE_TEXT ("Network interface is not up"))); @@ -289,7 +289,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, if (ACE_OS::ioctl (s, SIOCGIFBRDADDR, (char *) &if_req) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE::get_bcast_addr:") ACE_TEXT ("ioctl (get broadaddr)"))); @@ -311,7 +311,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, } } else - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE::get_bcast_addr:") ACE_TEXT ("Broadcast is not enable for this interface."))); @@ -376,7 +376,7 @@ ACE::get_fqdn (ACE_INET_Addr const & addr, return -1; if (ACE::debug()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - ACE::get_fqdn, ") ACE_TEXT ("canonical host name is %C\n"), hp->h_name)); @@ -409,7 +409,7 @@ ACE::get_fqdn (ACE_INET_Addr const & addr, continue; if (ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - ACE::get_fqdn, ") ACE_TEXT ("found fqdn within alias as %C\n"), *q)); @@ -833,7 +833,7 @@ get_ip_interfaces_hpux (size_t &count, ACE_HANDLE handle_ipv6 = ACE_INVALID_HANDLE; if (handle == ACE_INVALID_HANDLE) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE::get_ip_interfaces:open")), -1); @@ -897,7 +897,7 @@ get_ip_interfaces_hpux (size_t &count, (char *) &ifcfg) == -1) { ACE_OS::close (handle); - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE::get_ip_interfaces:") ACE_TEXT ("ioctl - SIOCGIFCONF failed")), @@ -962,7 +962,7 @@ get_ip_interfaces_hpux (size_t &count, (char *) &lifcfg) == -1) { ACE_OS::close (handle); - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE::get_ip_interfaces:") ACE_TEXT ("ioctl - SIOCGLIFCONF failed")), @@ -1001,7 +1001,7 @@ get_ip_interfaces_aix (size_t &count, struct ifconf ifc; if (handle == ACE_INVALID_HANDLE) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE::get_ip_interfaces_aix:")), -1); @@ -1011,7 +1011,7 @@ get_ip_interfaces_aix (size_t &count, (caddr_t)&ifc.ifc_len) == -1) { ACE_OS::close (handle); - ACE_ERROR_RETURN((LM_ERROR, + ACELIB_ERROR_RETURN((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("get ifconf size")), -1); @@ -1025,7 +1025,7 @@ get_ip_interfaces_aix (size_t &count, if (ACE_OS::ioctl(handle, SIOCGIFCONF, (caddr_t)&ifc) == -1) { ACE_OS::close (handle); - ACE_ERROR_RETURN((LM_ERROR, + ACELIB_ERROR_RETURN((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("get ifconf")), -1); @@ -1101,7 +1101,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) ACE_HANDLE handle = ACE::get_handle(); if (handle == ACE_INVALID_HANDLE) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE::get_ip_interfaces:open")), -1); @@ -1149,7 +1149,7 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) (caddr_t) &ifcfg) == -1) { ACE_OS::close (handle); - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE::get_ip_interfaces:") ACE_TEXT ("ioctl - SIOCGIFCONF failed")), @@ -1293,7 +1293,7 @@ ACE::count_interfaces (ACE_HANDLE handle, size_t &how_many) int if_num = 0; # endif /* SIOCGLIFNUM */ if (ACE_OS::ioctl (handle, cmd, (caddr_t)&if_num) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE::count_interfaces:") ACE_TEXT ("ioctl - SIOCGLIFNUM failed")), @@ -1338,7 +1338,7 @@ return 0; (caddr_t) &ifcfg) == -1) { ACE_OS::free (ifcfg.ifc_req); - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE::count_interfaces:") ACE_TEXT ("ioctl - SIOCGIFCONF failed")), diff --git a/ACE/ace/Stack_Trace.h b/ACE/ace/Stack_Trace.h index b59ab98bba0..96d24c183c4 100644 --- a/ACE/ace/Stack_Trace.h +++ b/ACE/ace/Stack_Trace.h @@ -40,10 +40,10 @@ * it in an ACE logging message. The following are functionally equivalent: * * \code - * ACE_DEBUG((LM_DEBUG, "%?")); + * ACELIB_DEBUG((LM_DEBUG, "%?")); * * ACE_Stack_Trace st; - * ACE_DEBUG ((LM_DEBUG, "%s", st.c_str() )); + * ACELIB_DEBUG ((LM_DEBUG, "%s", st.c_str() )); * \endcode * * These usage examples were shown in $ACE_ROOT/tests/Stack_Trace_Test.cpp. diff --git a/ACE/ace/Stats.h b/ACE/ace/Stats.h index 35cdde1a3d3..e02c1bb5dd0 100644 --- a/ACE/ace/Stats.h +++ b/ACE/ace/Stats.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Unbounded_Queue.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Basic_Stats.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Stats.inl b/ACE/ace/Stats.inl index 621dd16841e..d6c9d1a1715 100644 --- a/ACE/ace/Stats.inl +++ b/ACE/ace/Stats.inl @@ -59,7 +59,7 @@ void ACE_Stats_Value::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("precision: %u digits; whole: %u, fractional: %u\n"), precision_, whole_, fractional_)); #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/Strategies_T.cpp b/ACE/ace/Strategies_T.cpp index f62f8ae2195..f1dc2f8584b 100644 --- a/ACE/ace/Strategies_T.cpp +++ b/ACE/ace/Strategies_T.cpp @@ -276,7 +276,7 @@ ACE_Thread_Strategy<SVC_HANDLER>::open (ACE_Thread_Manager *thr_mgr, // Must have a thread manager! if (this->thr_mgr_ == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("error: must have a non-NULL thread manager\n")), -1); else @@ -330,7 +330,7 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy"); if (this->open (local_addr, reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open"))); } @@ -443,7 +443,7 @@ ACE_Process_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *svc_handle ACE_Errno_Guard error (errno); svc_handler->close (); } - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("fork")), -1); @@ -501,7 +501,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::ACE_Cache if (this->open (cre_s, con_s, rec_s) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Cached_Connect_Strategy::ACE_Cached_Connect_Strategy"))); } @@ -1382,8 +1382,8 @@ ACE_Scheduling_Strategy<SVC_HANDLER>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Scheduling_Strategy<SVC_HANDLER>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Strategies_T.inl b/ACE/ace/Strategies_T.inl index 30c784200a5..4529f8b0d0c 100644 --- a/ACE/ace/Strategies_T.inl +++ b/ACE/ace/Strategies_T.inl @@ -12,7 +12,7 @@ ACE_Singleton_Strategy<SVC_HANDLER>::ACE_Singleton_Strategy (SVC_HANDLER *sh, { ACE_TRACE ("ACE_Singleton_Strategy<SVC_HANDLER>::ACE_Singleton_Strategy"); if (this->open (sh, tm) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Singleton_Strategy"))); } @@ -33,7 +33,7 @@ ACE_Creation_Strategy<SVC_HANDLER>::ACE_Creation_Strategy (ACE_Thread_Manager *t { ACE_TRACE ("ACE_Creation_Strategy<SVC_HANDLER>::ACE_Creation_Strategy"); if (this->open (thr_mgr, reactor) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Creation_Strategy"))); } @@ -51,7 +51,7 @@ ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (const ACE_TCHAR dll_name[], svc_name, svc_rep, thr_mgr) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("open"))); } @@ -79,7 +79,7 @@ ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy (ACE_Reactor *reactor, if (this->open (reactor, mask, flags) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy"))); } @@ -105,7 +105,7 @@ ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy (ACE_Thread_Manager *thr_m thr_flags, n_threads, flags) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy"))); } @@ -144,7 +144,7 @@ ACE_Process_Strategy<SVC_HANDLER>::ACE_Process_Strategy (size_t n_processes, acceptor, reactor, avoid_zombies) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Process_Strategy"))); } diff --git a/ACE/ace/Stream.cpp b/ACE/ace/Stream.cpp index baea01f1fac..2c3f48e29c5 100644 --- a/ACE/ace/Stream.cpp +++ b/ACE/ace/Stream.cpp @@ -30,18 +30,18 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("-------- module links --------\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("-------- module links --------\n"))); for (ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *mp = this->stream_head_; ; mp = mp->next ()) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("module name = %s\n"), mp->name ())); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("module name = %s\n"), mp->name ())); if (mp == this->stream_tail_) break; } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("-------- writer links --------\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("-------- writer links --------\n"))); ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *tp; @@ -49,21 +49,21 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const ; tp = tp->next ()) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("writer queue name = %s\n"), tp->name ())); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("writer queue name = %s\n"), tp->name ())); tp->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("-------\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("-------\n"))); if (tp == this->stream_tail_->writer () || (this->linked_us_ && tp == this->linked_us_->stream_head_->reader ())) break; } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("-------- reader links --------\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("-------- reader links --------\n"))); for (tp = this->stream_tail_->reader (); ; tp = tp->next ()) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("reader queue name = %s\n"), tp->name ())); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("reader queue name = %s\n"), tp->name ())); tp->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("-------\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("-------\n"))); if (tp == this->stream_head_->reader () || (this->linked_us_ && tp == this->linked_us_->stream_head_->writer ())) @@ -246,7 +246,7 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::remove (const ACE_TCHAR *name, #ifndef ACE_NLOGGING if (ACE::debug ()) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Stream::remove - comparing existing module :%s: with :%s:\n"), mod->name (), name)); @@ -276,7 +276,7 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::remove (const ACE_TCHAR *name, prev = mod; } - ACE_DEBUG ((LM_WARNING, ACE_TEXT ("ACE_Stream::remove failed to find module with name %s to remove\n"),name)); + ACELIB_DEBUG ((LM_WARNING, ACE_TEXT ("ACE_Stream::remove failed to find module with name %s to remove\n"),name)); return -1; } @@ -612,7 +612,7 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream (void * a, { ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream"); if (this->open (a, head, tail) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::open (%s, %s)\n"), head->name (), tail->name ())); } diff --git a/ACE/ace/Svc_Conf_y.cpp b/ACE/ace/Svc_Conf_y.cpp index 077d0c8ebf4..951f70e6d47 100644 --- a/ACE/ace/Svc_Conf_y.cpp +++ b/ACE/ace/Svc_Conf_y.cpp @@ -1573,7 +1573,7 @@ ace_yyreduce: if (((ACE_Stream_Type *) sn->record (ACE_SVC_CONF_PARAM->config)->type ())->push (mt) == -1) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Problem with static\n"))); ACE_SVC_CONF_PARAM->yyerrno++; } @@ -1617,7 +1617,7 @@ ace_yyreduce: dynamic_cast<ACE_Stream_Type *> (const_cast<ACE_Service_Type_Impl *> (stream->record (ACE_SVC_CONF_PARAM->config)->type ())); if (!st || (mt != 0 && st->remove (mt) == -1)) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"), module->name (), stream->name ())); @@ -1934,7 +1934,7 @@ ace_yyerror (int ace_yyerrno, int ace_yylineno, ACE_TCHAR const * s) ACE_UNUSED_ARG (s); #endif /* ACE_NLOGGING */ - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) [error %d] on line %d: %C\n"), ace_yyerrno, ace_yylineno, @@ -1963,7 +1963,7 @@ ace_get_module (ACE_Service_Type const * sr, if (sr == 0 || st == 0 || mt == 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("cannot locate Module_Type %s ") ACE_TEXT ("in STREAM_Type %s\n"), svc_name, diff --git a/ACE/ace/Svc_Handler.cpp b/ACE/ace/Svc_Handler.cpp index 8a9076e070b..3621a8e0b07 100644 --- a/ACE/ace/Svc_Handler.cpp +++ b/ACE/ace/Svc_Handler.cpp @@ -15,31 +15,28 @@ #include "ace/Dynamic.h" -#define PR_ST_1 ACE_PEER_STREAM_1 -#define PR_ST_2 ACE_PEER_STREAM_2 - ACE_BEGIN_VERSIONED_NAMESPACE_DECL -template <PR_ST_1, ACE_SYNCH_DECL> void * -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new (size_t, void *p) +template <typename PEER_STREAM, typename SYNCH_TRAITS> void * +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator new (size_t, void *p) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new (NOOP, 2 parameters)"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator new (NOOP, 2 parameters)"); return p; } #if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) -template <PR_ST_1, ACE_SYNCH_DECL> void -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *, void *) +template <typename PEER_STREAM, typename SYNCH_TRAITS> void +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete (void *, void *) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (NOOP, 2 parameters)"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete (NOOP, 2 parameters)"); return; } #endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ -template <PR_ST_1, ACE_SYNCH_DECL> void * -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new (size_t n) +template <typename PEER_STREAM, typename SYNCH_TRAITS> void * +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator new (size_t n) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator new"); ACE_Dynamic *const dynamic_instance = ACE_Dynamic::instance (); @@ -63,11 +60,11 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new (size_t n) } #if defined (ACE_HAS_NEW_NOTHROW) -template <PR_ST_1, ACE_SYNCH_DECL> void * -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new (size_t n, - const ACE_nothrow_t&) throw() +template <typename PEER_STREAM, typename SYNCH_TRAITS> void * +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator new (size_t n, + const ACE_nothrow_t&) throw() { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new(nothrow)"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator new(nothrow)"); ACE_Dynamic *const dynamic_instance = ACE_Dynamic::instance (); @@ -91,21 +88,21 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator new (size_t n, } #if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE) -template <PR_ST_1, ACE_SYNCH_DECL> void -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *p, +template <typename PEER_STREAM, typename SYNCH_TRAITS> void +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete (void *p, const ACE_nothrow_t&) throw() { - ACE_TRACE("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete(nothrow)"); + ACE_TRACE("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete(nothrow)"); ::delete [] static_cast <char *> (p); } #endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ #endif /* ACE_HAS_NEW_NOTHROW */ -template <PR_ST_1, ACE_SYNCH_DECL> void -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::destroy (void) +template <typename PEER_STREAM, typename SYNCH_TRAITS> void +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::destroy (void) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::destroy"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::destroy"); // Only delete ourselves if we're not owned by a module and have // been allocated dynamically. @@ -117,10 +114,10 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::destroy (void) delete this; } -template <PR_ST_1, ACE_SYNCH_DECL> void -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *obj) +template <typename PEER_STREAM, typename SYNCH_TRAITS> void +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete (void *obj) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete"); // You cannot delete a 'void*' (X3J16/95-0087 5.3.5.3), but we know // the pointer was created using new char[] (see operator new code), // so we use a cast: @@ -129,16 +126,16 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *obj) // Default constructor. -template <PR_ST_1, ACE_SYNCH_DECL> -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::ACE_Svc_Handler (ACE_Thread_Manager *tm, - ACE_Message_Queue<ACE_SYNCH_USE> *mq, +template <typename PEER_STREAM, typename SYNCH_TRAITS> +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::ACE_Svc_Handler (ACE_Thread_Manager *tm, + ACE_Message_Queue<SYNCH_TRAITS> *mq, ACE_Reactor *reactor) - : ACE_Task<ACE_SYNCH_USE> (tm, mq), + : ACE_Task<SYNCH_TRAITS> (tm, mq), closing_ (false), recycler_ (0), recycling_act_ (0) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::ACE_Svc_Handler"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::ACE_Svc_Handler"); this->reactor (reactor); @@ -159,34 +156,34 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::ACE_Svc_Handler (ACE_Thread_Manager *tm // Default behavior for a ACE_Svc_Handler object is to be registered // with the ACE_Reactor (thereby ensuring single threading). -template <PR_ST_1, ACE_SYNCH_DECL> int -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::open (void *) +template <typename PEER_STREAM, typename SYNCH_TRAITS> int +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::open (void *) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::open"); -#if defined (ACE_DEBUGGING) + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::open"); +#if defined (ACELIB_DEBUGGING) ACE_TCHAR buf[BUFSIZ]; ACE_PEER_STREAM_ADDR client_addr; if (this->peer_.get_remote_addr (client_addr) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("get_remote_addr")), -1); else if (client_addr.addr_to_string (buf, sizeof buf) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("can't obtain peer's address")), -1); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("connected to %s on fd %d\n"), buf, this->peer_.get_handle ())); -#endif /* ACE_DEBUGGING */ +#endif /* ACELIB_DEBUGGING */ if (this->reactor () && this->reactor ()->register_handler (this, ACE_Event_Handler::READ_MASK) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("unable to register client handler")), -1); @@ -195,10 +192,10 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::open (void *) // Perform termination activities. -template <PR_ST_1, ACE_SYNCH_DECL> void -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::shutdown (void) +template <typename PEER_STREAM, typename SYNCH_TRAITS> void +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::shutdown (void) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::shutdown"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::shutdown"); // Deregister this handler with the ACE_Reactor. if (this->reactor ()) @@ -221,10 +218,10 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::shutdown (void) this->peer ().close (); } -template <PR_ST_1, ACE_SYNCH_DECL> void -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::cleanup_hint (void **act_holder) +template <typename PEER_STREAM, typename SYNCH_TRAITS> void +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::cleanup_hint (void **act_holder) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::cleanup_hint"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::cleanup_hint"); // Remove as hint. if (this->recycler ()) @@ -232,57 +229,57 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::cleanup_hint (void **act_holder) act_holder); } -template <PR_ST_1, ACE_SYNCH_DECL> void -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump (void) const +template <typename PEER_STREAM, typename SYNCH_TRAITS> void +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump"); this->peer_.dump (); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "dynamic_ = %d\n", this->dynamic_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "closing_ = %d\n", this->closing_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "recycler_ = %d\n", this->recycler_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "recycling_act_ = %d\n", this->recycling_act_)); #endif /* ACE_HAS_DUMP */ } -template <PR_ST_1, ACE_SYNCH_DECL> ACE_PEER_STREAM & -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::peer (void) const +template <typename PEER_STREAM, typename SYNCH_TRAITS> PEER_STREAM & +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::peer (void) const { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::peer"); - return (ACE_PEER_STREAM &) this->peer_; + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::peer"); + return (PEER_STREAM &) this->peer_; } // Extract the underlying I/O descriptor. -template <PR_ST_1, ACE_SYNCH_DECL> ACE_HANDLE -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::get_handle (void) const +template <typename PEER_STREAM, typename SYNCH_TRAITS> ACE_HANDLE +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::get_handle (void) const { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::get_handle"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::get_handle"); return this->peer_.get_handle (); } // Set the underlying I/O descriptor. -template <PR_ST_1, ACE_SYNCH_DECL> void -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::set_handle (ACE_HANDLE h) +template <typename PEER_STREAM, typename SYNCH_TRAITS> void +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::set_handle (ACE_HANDLE h) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::set_handle"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::set_handle"); this->peer_.set_handle (h); } -template <PR_ST_1, ACE_SYNCH_DECL> -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::~ACE_Svc_Handler (void) +template <typename PEER_STREAM, typename SYNCH_TRAITS> +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::~ACE_Svc_Handler (void) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::~ACE_Svc_Handler"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::~ACE_Svc_Handler"); if (this->closing_ == false) { @@ -295,11 +292,11 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::~ACE_Svc_Handler (void) } } -template <PR_ST_1, ACE_SYNCH_DECL> int -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_close (ACE_HANDLE, +template <typename PEER_STREAM, typename SYNCH_TRAITS> int +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::handle_close (ACE_HANDLE, ACE_Reactor_Mask) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_close"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::handle_close"); if (this->reference_counting_policy ().value () == ACE_Event_Handler::Reference_Counting_Policy::DISABLED) @@ -310,45 +307,45 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_close (ACE_HANDLE, return 0; } -template <PR_ST_1, ACE_SYNCH_DECL> int -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_timeout (const ACE_Time_Value &, +template <typename PEER_STREAM, typename SYNCH_TRAITS> int +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::handle_timeout (const ACE_Time_Value &, const void *) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_timeout"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::handle_timeout"); return this->handle_close (); } -template <PR_ST_1, ACE_SYNCH_DECL> int -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::close (u_long) +template <typename PEER_STREAM, typename SYNCH_TRAITS> int +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::close (u_long) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::close"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::close"); return this->handle_close (); } -template <PR_ST_1, ACE_SYNCH_DECL> int -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::init (int /* argc */, +template <typename PEER_STREAM, typename SYNCH_TRAITS> int +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::init (int /* argc */, ACE_TCHAR * /* argv */[]) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::init"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::init"); return -1; } -template <PR_ST_1, ACE_SYNCH_DECL> int -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::fini (void) +template <typename PEER_STREAM, typename SYNCH_TRAITS> int +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::fini (void) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::fini"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::fini"); return -1; } -template <PR_ST_1, ACE_SYNCH_DECL> int -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::info (ACE_TCHAR **, size_t) const +template <typename PEER_STREAM, typename SYNCH_TRAITS> int +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::info (ACE_TCHAR **, size_t) const { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::info"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::info"); return -1; } -template <PR_ST_1, ACE_SYNCH_DECL> int -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::idle (u_long flags) +template <typename PEER_STREAM, typename SYNCH_TRAITS> int +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::idle (u_long flags) { if (this->recycler ()) return this->recycler ()->cache (this->recycling_act_); @@ -356,8 +353,8 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::idle (u_long flags) return this->close (flags); } -template <PR_ST_1, ACE_SYNCH_DECL> int -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycle_state (ACE_Recyclable_State new_state) +template <typename PEER_STREAM, typename SYNCH_TRAITS> int +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycle_state (ACE_Recyclable_State new_state) { if (this->recycler ()) return this->recycler ()->recycle_state (this->recycling_act_, @@ -366,8 +363,8 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycle_state (ACE_Recyclable_State new return 0; } -template <PR_ST_1, ACE_SYNCH_DECL> ACE_Recyclable_State -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycle_state (void) const +template <typename PEER_STREAM, typename SYNCH_TRAITS> ACE_Recyclable_State +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycle_state (void) const { if (this->recycler ()) return this->recycler ()->recycle_state (this->recycling_act_); @@ -375,55 +372,55 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycle_state (void) const return ACE_RECYCLABLE_UNKNOWN; } -template <PR_ST_1, ACE_SYNCH_DECL> void -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycler (ACE_Connection_Recycling_Strategy *recycler, +template <typename PEER_STREAM, typename SYNCH_TRAITS> void +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycler (ACE_Connection_Recycling_Strategy *recycler, const void *recycling_act) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycler"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycler"); this->recycler_ = recycler; this->recycling_act_ = recycling_act; } -template <PR_ST_1, ACE_SYNCH_DECL> ACE_Connection_Recycling_Strategy * -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycler (void) const +template <typename PEER_STREAM, typename SYNCH_TRAITS> ACE_Connection_Recycling_Strategy * +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycler (void) const { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycler"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycler"); return this->recycler_; } -template <PR_ST_1, ACE_SYNCH_DECL> const void * -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycling_act (void) const +template <typename PEER_STREAM, typename SYNCH_TRAITS> const void * +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycling_act (void) const { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycling_act"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycling_act"); return this->recycling_act_; } -template <PR_ST_1, ACE_SYNCH_DECL> int -ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycle (void *) +template <typename PEER_STREAM, typename SYNCH_TRAITS> int +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycle (void *) { - ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycle"); + ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycle"); // By default, the object is ready and willing to be recycled. return 0; } -template <PR_ST_1, ACE_SYNCH_DECL> -ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::~ACE_Buffered_Svc_Handler (void) +template <typename PEER_STREAM, typename SYNCH_TRAITS> +ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::~ACE_Buffered_Svc_Handler (void) { this->flush (); } -template <PR_ST_1, ACE_SYNCH_DECL> -ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::ACE_Buffered_Svc_Handler (ACE_Thread_Manager *tm, - ACE_Message_Queue<ACE_SYNCH_USE> *mq, +template <typename PEER_STREAM, typename SYNCH_TRAITS> +ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::ACE_Buffered_Svc_Handler (ACE_Thread_Manager *tm, + ACE_Message_Queue<SYNCH_TRAITS> *mq, ACE_Reactor *reactor, size_t maximum_buffer_size, ACE_Time_Value *timeout) - : ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE> (tm, mq, reactor), + : ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS> (tm, mq, reactor), maximum_buffer_size_ (maximum_buffer_size), current_buffer_size_ (0), timeoutp_ (timeout) { - ACE_TRACE ("ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::ACE_Buffered_Svc_Handler"); + ACE_TRACE ("ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::ACE_Buffered_Svc_Handler"); if (this->timeoutp_ != 0) { @@ -432,11 +429,11 @@ ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::ACE_Buffered_Svc_Handler (ACE_ } } -template <PR_ST_1, ACE_SYNCH_DECL> int -ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::put (ACE_Message_Block *mb, - ACE_Time_Value *tv) +template <typename PEER_STREAM, typename SYNCH_TRAITS> int +ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::put (ACE_Message_Block *mb, + ACE_Time_Value *tv) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->msg_queue ()->lock (), -1); + ACE_GUARD_RETURN (typename SYNCH_TRAITS::MUTEX, m, this->msg_queue ()->lock (), -1); // Enqueue <mb> onto the message queue. if (this->putq (mb, tv) == -1) @@ -459,18 +456,18 @@ ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::put (ACE_Message_Block *mb, // Flush the buffer. -template <PR_ST_1, ACE_SYNCH_DECL> int -ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::flush (void) +template <typename PEER_STREAM, typename SYNCH_TRAITS> int +ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::flush (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->msg_queue ()->lock (), -1); + ACE_GUARD_RETURN (typename SYNCH_TRAITS::MUTEX, m, this->msg_queue ()->lock (), -1); return this->flush_i (); } -template <PR_ST_1, ACE_SYNCH_DECL> int -ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::flush_i (void) +template <typename PEER_STREAM, typename SYNCH_TRAITS> int +ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::flush_i (void) { - ACE_Message_Queue_Iterator<ACE_SYNCH_USE> iterator (*this->msg_queue ()); + ACE_Message_Queue_Iterator<SYNCH_TRAITS> iterator (*this->msg_queue ()); ACE_Message_Block *mblk = 0; ssize_t result = 0; @@ -492,37 +489,35 @@ ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::flush_i (void) return result; } -template <PR_ST_1, ACE_SYNCH_DECL> void -ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump (void) const +template <typename PEER_STREAM, typename SYNCH_TRAITS> void +ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_TRACE ("ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump"); + ACE_TRACE ("ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump"); - ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump (); - ACE_DEBUG ((LM_DEBUG, + ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump (); + ACELIB_DEBUG ((LM_DEBUG, "maximum_buffer_size_ = %d\n", this->maximum_buffer_size_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "current_buffer_size_ = %d\n", this->current_buffer_size_)); if (this->timeoutp_ != 0) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "next_timeout_.sec = %d, next_timeout_.usec = %d\n", this->next_timeout_.sec (), this->next_timeout_.usec ())); #endif /* ACE_HAS_DUMP */ } -template <PR_ST_1, ACE_SYNCH_DECL> int -ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_timeout (const ACE_Time_Value &, - const void *) +template <typename PEER_STREAM, typename SYNCH_TRAITS> int +ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::handle_timeout (const ACE_Time_Value &, + const void *) { - ACE_TRACE ("ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_timeout"); + ACE_TRACE ("ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::handle_timeout"); return 0; } ACE_END_VERSIONED_NAMESPACE_DECL -#undef PR_ST_1 -#undef PR_ST_2 #endif /* ACE_SVC_HANDLER_CPP */ diff --git a/ACE/ace/Svc_Handler.h b/ACE/ace/Svc_Handler.h index 741e6102e95..79ba77ed11c 100644 --- a/ACE/ace/Svc_Handler.h +++ b/ACE/ace/Svc_Handler.h @@ -43,24 +43,38 @@ enum ACE_Svc_Handler_Close { NORMAL_CLOSE_OPERATION = 0x00, * @brief Defines the interface for a service that exchanges data with * its connected peer. * - * This class provides a well-defined interface that the - * Acceptor and Connector pattern factories use as their target. - * Typically, client applications will subclass ACE_Svc_Handler - * and do all the interesting work in the subclass. One thing - * that the ACE_Svc_Handler does contain is a PEER_STREAM - * endpoint that is initialized by an ACE_Acceptor or - * ACE_Connector when a connection is established successfully. - * This endpoint is used to exchange data between a - * ACE_Svc_Handler and the peer it is connected with. + * This class provides a well-defined interface that the ACE_Acceptor + * and ACE_Connector factories use as their target. Typically, client + * applications will subclass ACE_Svc_Handler and do all the + * interesting work in the subclass. An ACE_Svc_Handler is + * parameterized by concrete types that conform to the interfaces of + * PEER_ACCEPTOR and SYNCH_TRAITS described below. + * + * @tparam PEER_STREAM The name of the class that implements the + * PEER_STREAM endpoint (e.g., ACE_SOCK_Stream) that is + * contained in an ACE_Svc_Handler and initialized by an + * ACE_Acceptor or ACE_Connector when a connection is + * established successfully. A PEER_STREAM implementation + * must provide a PEER_ADDR trait (e.g., ACE_INET_Addr to + * identify the type of address used by the endpoint. This + * endpoint is used to exchange data between a ACE_Svc_Handler + * and the peer it is connected with. + * + * @tparam SYNCH_TRAITS The name of the synchronization traits class + * that will be used by the ACE_Svc_Handler (e.g., + * ACE_NULL_SYNCH or ACE_MT_SYNCH). The synchronization traits + * class provides typedefs for the mutex, condition, and + * semaphore implementations the ACE_Svc_Handler will + * use. @see Synch_Traits.h. */ -template <ACE_PEER_STREAM_1, ACE_SYNCH_DECL> -class ACE_Svc_Handler : public ACE_Task<ACE_SYNCH_USE> +template <typename PEER_STREAM, typename SYNCH_TRAITS> +class ACE_Svc_Handler : public ACE_Task<SYNCH_TRAITS> { public: // Useful STL-style traits. - typedef ACE_PEER_STREAM_ADDR addr_type; - typedef ACE_PEER_STREAM stream_type; + typedef typename PEER_STREAM::PEER_ADDR addr_type; + typedef PEER_STREAM stream_type; /** * Constructor initializes the @a thr_mgr and @a mq by passing them @@ -68,15 +82,17 @@ public: * the ACE_Event_Handler. */ ACE_Svc_Handler (ACE_Thread_Manager *thr_mgr = 0, - ACE_Message_Queue<ACE_SYNCH_USE> *mq = 0, + ACE_Message_Queue<SYNCH_TRAITS> *mq = 0, ACE_Reactor *reactor = ACE_Reactor::instance ()); /// Destructor. virtual ~ACE_Svc_Handler (void); /// Activate the client handler. This is typically called by the - /// ACE_Acceptor or ACE_Connector. - virtual int open (void * = 0); + /// ACE_Acceptor or ACE_Connector, which passes "this" in as the + /// parameter to open. If this method returns -1 the Svc_Handler's + /// close() method is automatically called. + virtual int open (void *acceptor_or_connector = 0); /** * Object termination hook -- application-specific cleanup code goes @@ -148,8 +164,8 @@ public: virtual void set_handle (ACE_HANDLE); /// Returns the underlying PEER_STREAM. Used by - /// <ACE_Acceptor::accept> and <ACE_Connector::connect> factories - ACE_PEER_STREAM &peer (void) const; + /// <ACE_Acceptor::accept> and <ACE_Connector::connect> factories. + PEER_STREAM &peer (void) const; /// Overloaded new operator. This method unobtrusively records if a /// <Svc_Handler> is allocated dynamically, which allows it to clean @@ -234,7 +250,7 @@ public: protected: /// Maintain connection with client. - ACE_PEER_STREAM peer_; + PEER_STREAM peer_; /// Have we been dynamically created? bool dynamic_; @@ -262,8 +278,8 @@ protected: * queue is "full" or (2) a period of time elapses, at which * point the queue is "flushed" via <sendv_n> to the peer. */ -template <ACE_PEER_STREAM_1, ACE_SYNCH_DECL> -class ACE_Buffered_Svc_Handler : public ACE_Svc_Handler<ACE_PEER_STREAM_2, ACE_SYNCH_USE> +template <typename PEER_STREAM, typename SYNCH_TRAITS> +class ACE_Buffered_Svc_Handler : public ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS> { public: // = Initialization and termination methods. @@ -277,7 +293,7 @@ public: * relative to the current time returned by <ACE_OS::gettimeofday>. */ ACE_Buffered_Svc_Handler (ACE_Thread_Manager *thr_mgr = 0, - ACE_Message_Queue<ACE_SYNCH_USE> *mq = 0, + ACE_Message_Queue<SYNCH_TRAITS> *mq = 0, ACE_Reactor *reactor = ACE_Reactor::instance (), size_t max_buffer_size = 0, ACE_Time_Value *relative_timeout = 0); diff --git a/ACE/ace/System_Time.cpp b/ACE/ace/System_Time.cpp index 0425df884b5..47efd1e7b36 100644 --- a/ACE/ace/System_Time.cpp +++ b/ACE/ace/System_Time.cpp @@ -31,7 +31,7 @@ ACE_System_Time::ACE_System_Time (const ACE_TCHAR *poolname) MAXPATHLEN - 17) == -1) // -17 for ace-malloc-XXXXXX { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Temporary path too long, ") ACE_TEXT ("defaulting to current directory\n"))); this->poolname_[0] = 0; diff --git a/ACE/ace/TLI.cpp b/ACE/ace/TLI.cpp index d9f047a5d5e..8409b462351 100644 --- a/ACE/ace/TLI.cpp +++ b/ACE/ace/TLI.cpp @@ -4,7 +4,7 @@ // abstraction. #include "ace/TLI.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_Memory.h" #include "ace/OS_TLI.h" #include "ace/OS_NS_string.h" @@ -85,7 +85,7 @@ ACE_TLI::ACE_TLI (const char device[], int oflag, struct t_info *info) { ACE_TRACE ("ACE_TLI::ACE_TLI"); if (this->open (device, oflag, info) == ACE_INVALID_HANDLE) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_TLI::ACE_TLI"))); } diff --git a/ACE/ace/TLI_Acceptor.cpp b/ACE/ace/TLI_Acceptor.cpp index 45be6f50cfd..3900a21bdb6 100644 --- a/ACE/ace/TLI_Acceptor.cpp +++ b/ACE/ace/TLI_Acceptor.cpp @@ -1,7 +1,7 @@ // $Id$ #include "ace/TLI_Acceptor.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" #include "ace/OS_Memory.h" @@ -400,7 +400,7 @@ ACE_TLI_Acceptor::ACE_TLI_Acceptor (const ACE_Addr &remote_sap, info, back, dev) == ACE_INVALID_HANDLE) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_TLI_Acceptor::ACE_TLI_Acceptor"))); } diff --git a/ACE/ace/TLI_Connector.h b/ACE/ace/TLI_Connector.h index 9dc42123101..2873b9278f4 100644 --- a/ACE/ace/TLI_Connector.h +++ b/ACE/ace/TLI_Connector.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "ace/TLI_Stream.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ACE/ace/TLI_Connector.inl b/ACE/ace/TLI_Connector.inl index bce426abc13..c6273ab38aa 100644 --- a/ACE/ace/TLI_Connector.inl +++ b/ACE/ace/TLI_Connector.inl @@ -32,7 +32,7 @@ ACE_TLI_Connector::ACE_TLI_Connector (ACE_TLI_Stream &new_stream, udata, opt) == -1 && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream"))); } diff --git a/ACE/ace/TP_Reactor.cpp b/ACE/ace/TP_Reactor.cpp index 2c7c4d0b13e..1740742e3c4 100644 --- a/ACE/ace/TP_Reactor.cpp +++ b/ACE/ace/TP_Reactor.cpp @@ -4,7 +4,7 @@ #include "ace/Thread.h" #include "ace/Timer_Queue.h" #include "ace/Sig_Handler.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Functor_T.h" #include "ace/OS_NS_sys_time.h" @@ -625,7 +625,7 @@ ACE_TP_Reactor::notify_handle (ACE_HANDLE, ACE_Event_Handler *eh, ACE_EH_PTMF) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_TP_Reactor::notify_handle: ") ACE_TEXT ("Wrong version of notify_handle() got called\n"))); diff --git a/ACE/ace/TSS_T.cpp b/ACE/ace/TSS_T.cpp index 316a4b257a0..da4b0e88f09 100644 --- a/ACE/ace/TSS_T.cpp +++ b/ACE/ace/TSS_T.cpp @@ -14,7 +14,7 @@ #endif /* __ACE_INLINE__ */ #include "ace/Thread.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Guard_T.h" #include "ace/OS_NS_stdio.h" @@ -84,11 +84,11 @@ ACE_TSS<TYPE>::dump (void) const { #if defined (ACE_HAS_DUMP) #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->keylock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %d\n"), this->key_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nonce_ = %d\n"), this->once_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %d\n"), this->key_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nonce_ = %d\n"), this->once_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */ #endif /* ACE_HAS_DUMP */ } @@ -338,9 +338,9 @@ template <class ACE_LOCK> void ACE_TSS_Guard<ACE_LOCK>::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %d\n"), this->key_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %d\n"), this->key_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/TSS_T.inl b/ACE/ace/TSS_T.inl index a566320dde8..0775b72c01b 100644 --- a/ACE/ace/TSS_T.inl +++ b/ACE/ace/TSS_T.inl @@ -3,7 +3,7 @@ // $Id$ #include "ace/Thread.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -74,7 +74,7 @@ ACE_TSS<TYPE>::ts_value (ACE_TSS_Adapter *new_tss_adapter) const if (ACE_Thread::setspecific (this->key_, (void *) new_tss_adapter) != 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("Error: ACE_Thread::setspecific() failed!"))); return -1; @@ -88,7 +88,7 @@ ACE_TSS<TYPE>::ts_value (TYPE *new_ts_obj) const { if (ACE_Thread::setspecific (this->key_, (void *) new_ts_obj) != 0) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("Error: ACE_Thread::setspecific() failed!"))); return -1; diff --git a/ACE/ace/Task_Ex_T.cpp b/ACE/ace/Task_Ex_T.cpp index b688c1ba994..aa6f137a241 100644 --- a/ACE/ace/Task_Ex_T.cpp +++ b/ACE/ace/Task_Ex_T.cpp @@ -24,20 +24,20 @@ ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE, TIME_POLICY>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_)); this->msg_queue_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_msg_queue_ = %d\n"), this->delete_msg_queue_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags = %x"), this->flags_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmod_ = %x"), this->mod_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %x"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_count_ = %d"), this->thr_count_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_msg_queue_ = %d\n"), this->delete_msg_queue_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags = %x"), this->flags_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmod_ = %x"), this->mod_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %x"), this->next_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_count_ = %d"), this->thr_count_)); #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) this->lock_.dump (); #endif /* ACE_MT_SAFE */ - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Task_T.cpp b/ACE/ace/Task_T.cpp index 9ec0def8a34..4c66630bb42 100644 --- a/ACE/ace/Task_T.cpp +++ b/ACE/ace/Task_T.cpp @@ -23,20 +23,20 @@ ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_)); this->msg_queue_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_msg_queue_ = %d\n"), this->delete_msg_queue_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags = %x"), this->flags_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmod_ = %x"), this->mod_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %x"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_count_ = %d"), this->thr_count_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_msg_queue_ = %d\n"), this->delete_msg_queue_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags = %x"), this->flags_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmod_ = %x"), this->mod_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %x"), this->next_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_count_ = %d"), this->thr_count_)); #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) this->lock_.dump (); #endif /* ACE_MT_SAFE */ - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp index c3cc9d01d32..c40210cd7f2 100644 --- a/ACE/ace/Thread_Manager.cpp +++ b/ACE/ace/Thread_Manager.cpp @@ -66,10 +66,10 @@ ACE_Thread_Manager::dump (void) ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon, ((ACE_Thread_Manager *) this)->lock_)); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_count_ = %d"), this->thr_list_.size ())); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_count_ = %d"), this->thr_list_.size ())); for (ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter (this->thr_list_); !iter.done (); @@ -78,7 +78,7 @@ ACE_Thread_Manager::dump (void) iter.next ()->dump (); } - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -246,15 +246,15 @@ ACE_Thread_Descriptor::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Thread_Descriptor::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_id_ = %d"), this->thr_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_handle_ = %d"), this->thr_handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_state_ = %d"), this->thr_state_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = %x\n"), this->flags_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_id_ = %d"), this->thr_id_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_handle_ = %d"), this->thr_handle_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_state_ = %d"), this->thr_state_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = %x\n"), this->flags_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Thread_Manager.h b/ACE/ace/Thread_Manager.h index 7d2fb6f197e..6d7b81068ae 100644 --- a/ACE/ace/Thread_Manager.h +++ b/ACE/ace/Thread_Manager.h @@ -27,7 +27,7 @@ #include "ace/Containers.h" #include "ace/Free_List.h" #include "ace/Singleton.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Synch_Traits.h" #include "ace/Basic_Types.h" diff --git a/ACE/ace/Thread_Mutex.cpp b/ACE/ace/Thread_Mutex.cpp index e9904f14aa7..674800b22d9 100644 --- a/ACE/ace/Thread_Mutex.cpp +++ b/ACE/ace/Thread_Mutex.cpp @@ -16,7 +16,7 @@ #include "ace/Thread_Mutex.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Malloc_T.h" @@ -31,9 +31,9 @@ ACE_Thread_Mutex::dump (void) const #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Thread_Mutex::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -52,7 +52,7 @@ ACE_Thread_Mutex::ACE_Thread_Mutex (const ACE_TCHAR *name, ACE_mutexattr_t *arg) 0, name, arg) != 0) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Thread_Mutex::ACE_Thread_Mutex"))); } diff --git a/ACE/ace/Throughput_Stats.cpp b/ACE/ace/Throughput_Stats.cpp index a021fe2a705..2f4b571c664 100644 --- a/ACE/ace/Throughput_Stats.cpp +++ b/ACE/ace/Throughput_Stats.cpp @@ -5,7 +5,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" #include "ace/High_Res_Timer.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" @@ -53,7 +53,7 @@ ACE_Throughput_Stats::dump_results (const ACE_TCHAR* msg, { if (this->samples_count () == 0u) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%s : no data collected\n"), msg)); return; } @@ -78,7 +78,7 @@ ACE_Throughput_Stats::dump_throughput (const ACE_TCHAR *msg, const double t_avg = samples_count / seconds; - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%s throughput: %.2f (events/second)\n"), msg, t_avg)); #else diff --git a/ACE/ace/Timeprobe_T.cpp b/ACE/ace/Timeprobe_T.cpp index 87372211bf1..6fe4c1d6f32 100644 --- a/ACE/ace/Timeprobe_T.cpp +++ b/ACE/ace/Timeprobe_T.cpp @@ -68,7 +68,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::ACE_Timeprobe_Ex (const ACE_Timeprobe_Ex< // Stupid MSVC is forcing me to define this; please don't use it. // - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_NOTSUP: %N, line %l\n"))); errno = ENOTSUP; } @@ -237,14 +237,14 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_times (void) u_long size = this->report_buffer_full_ ? this->max_size_ : this->current_size_; - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "\nACE_Timeprobe_Ex; %u timestamps were recorded:\n", size)); if (size == 0) return; - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "\n%-50.50s %8.8s %13.13s\n\n", "Event", "thread", @@ -257,7 +257,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_times (void) // First element i = this->report_buffer_full_ ? this->current_size_ : 0; - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "%-50.50s %8.8x %13.13s\n", this->find_description_i (i), this->timeprobes_[i].thread_, @@ -290,7 +290,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_times (void) // Convert to microseconds. time_difference /= gsf; - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "%-50.50s %8.8x %14.3f\n", this->find_description_i (i), this->timeprobes_[i].thread_, @@ -305,7 +305,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_times (void) if (!inversion_warning_printed && has_timestamp_inversion) { inversion_warning_printed = true; - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "\nWARNING: The timestamps recorded by gethrtime() on" " this platform are\n" "not monotonic across different threads.\n")); @@ -323,14 +323,14 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_absolute_times (void) u_long size = this->report_buffer_full_ ? this->max_size_ : this->current_size_; - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "\nACE_Timeprobe_Ex; %u timestamps were recorded:\n", size)); if (size == 0) return; - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "\n%-50.50s %8.8s %13.13s\n\n", "Event", "thread", @@ -343,7 +343,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_absolute_times (void) { ACE_High_Res_Timer::hrtime_to_tv (tv, this->timeprobes_ [i].time_); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "%-50.50s %8.8x %12.12u\n", this->find_description_i (i), this->timeprobes_ [i].thread_, diff --git a/ACE/ace/Timer_Hash_T.cpp b/ACE/ace/Timer_Hash_T.cpp index 24af2c5fabd..e5d08e199cb 100644 --- a/ACE/ace/Timer_Hash_T.cpp +++ b/ACE/ace/Timer_Hash_T.cpp @@ -11,7 +11,7 @@ #include "ace/OS_NS_sys_time.h" #include "ace/Guard_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -409,16 +409,16 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET, TIME_POLICY>::dump (void) cons { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Timer_Hash_T::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntable_size_ = %d"), this->table_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nearliest_position_ = %d"), this->earliest_position_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntable_size_ = %d"), this->table_size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nearliest_position_ = %d"), this->earliest_position_)); for (size_t i = 0; i < this->table_size_; ++i) if (!this->table_[i]->is_empty ()) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nBucket %d contains nodes"), i)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nBucket %d contains nodes"), i)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Timer_Heap_T.cpp b/ACE/ace/Timer_Heap_T.cpp index fed58e64505..9fd66d176aa 100644 --- a/ACE/ace/Timer_Heap_T.cpp +++ b/ACE/ace/Timer_Heap_T.cpp @@ -4,7 +4,7 @@ #define ACE_TIMER_HEAP_T_CPP #include "ace/Timer_Heap_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Guard_T.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_string.h" @@ -356,35 +356,35 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Timer_Heap_T::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmax_size_ = %d"), this->max_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_limbo_= %d"), this->cur_limbo_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nids_curr_ = %d"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmax_size_ = %d"), this->max_size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_limbo_= %d"), this->cur_limbo_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nids_curr_ = %d"), this->timer_ids_curr_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmin_free_ = %d"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmin_free_ = %d"), this->timer_ids_min_free_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nheap_ =\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nheap_ =\n"))); for (size_t i = 0; i < this->cur_size_; ++i) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%d\n"), i)); this->heap_[i]->dump (); } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_ids_ =\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_ids_ =\n"))); for (size_t j = 0; j < this->max_size_; ++j) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%d\t%d\n"), j, this->timer_ids_[j])); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Timer_List_T.cpp b/ACE/ace/Timer_List_T.cpp index 5508c1b6a58..2ba9b9adac6 100644 --- a/ACE/ace/Timer_List_T.cpp +++ b/ACE/ace/Timer_List_T.cpp @@ -5,7 +5,7 @@ #include "ace/Timer_List_T.h" #include "ace/Guard_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -170,7 +170,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Timer_List_T::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); int count = 0; @@ -181,8 +181,8 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const } } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d"), count)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d"), count)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Timer_Queue_Adapters.cpp b/ACE/ace/Timer_Queue_Adapters.cpp index 1697072e238..dd3f7f61edb 100644 --- a/ACE/ace/Timer_Queue_Adapters.cpp +++ b/ACE/ace/Timer_Queue_Adapters.cpp @@ -86,7 +86,7 @@ ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::schedule (TYPE eh, long tid = this->timer_queue_.schedule (eh, act, future_time); if (tid == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("schedule_timer")), -1); @@ -112,7 +112,7 @@ ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::ACE_Async_Timer_Queue_Adapter (ACE_Sig_ SA_RESTART); if (this->sig_handler_.register_handler (SIGALRM, this, &sa) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("register_handler"))); } @@ -147,7 +147,7 @@ ACE_Async_Timer_Queue_Adapter<TQ, TYPE>::handle_signal (int signum, /* NOTREACHED */ } default: - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, "unexpected signal %S\n", signum), -1); @@ -280,7 +280,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::svc (void) // use ACE_OS::gettimeofday() to convert the tv to the // absolute time. ACE_Time_Value const tv = ACE_OS::gettimeofday () + (tv_earl - tv_curr); - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("waiting until %u.%3.3u secs\n"), + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("waiting until %u.%3.3u secs\n"), // tv.sec(), tv.msec())); this->condition_.wait (&tv); } diff --git a/ACE/ace/Timer_Queue_Iterator.cpp b/ACE/ace/Timer_Queue_Iterator.cpp index 83d8d16f9b3..b50e7452ba5 100644 --- a/ACE/ace/Timer_Queue_Iterator.cpp +++ b/ACE/ace/Timer_Queue_Iterator.cpp @@ -20,14 +20,14 @@ ACE_Timer_Node_T<TYPE>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Timer_Node_T::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nact_ = %x"), this->act_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nact_ = %x"), this->act_)); this->timer_value_.dump (); this->interval_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nprev_ = %x"), this->prev_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %x"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_id_ = %d\n"), this->timer_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nprev_ = %x"), this->prev_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %x"), this->next_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_id_ = %d\n"), this->timer_id_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Timer_Queue_T.cpp b/ACE/ace/Timer_Queue_T.cpp index 0aa4f2904b5..0b9b1dc7e3b 100644 --- a/ACE/ace/Timer_Queue_T.cpp +++ b/ACE/ace/Timer_Queue_T.cpp @@ -17,7 +17,7 @@ #include "ace/Timer_Queue_T.h" #include "ace/Guard_T.h" #include "ace/Reverse_Lock_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Null_Mutex.h" #include "ace/OS_NS_sys_time.h" #include "ace/Functor.h" @@ -169,10 +169,10 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Timer_Queue_T::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->timeout_.dump (); this->timer_skew_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Timer_Wheel_T.cpp b/ACE/ace/Timer_Wheel_T.cpp index cf0f957edd5..efe3b1317f2 100644 --- a/ACE/ace/Timer_Wheel_T.cpp +++ b/ACE/ace/Timer_Wheel_T.cpp @@ -10,7 +10,7 @@ #include "ace/OS_NS_sys_time.h" #include "ace/Guard_T.h" #include "ace/Timer_Wheel_T.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Truncate.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -241,7 +241,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::find_node (long timer_i if (n != 0) return n; - //ACE_ERROR((LM_ERROR, "Node not found in original spoke.\n")); + //ACELIB_ERROR((LM_ERROR, "Node not found in original spoke.\n")); // Search the rest of the spokes for (u_int i = 0; i < this->spoke_count_; ++i) @@ -254,7 +254,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::find_node (long timer_i } } - //ACE_ERROR((LM_ERROR, "Node not found.\n")); + //ACELIB_ERROR((LM_ERROR, "Node not found.\n")); return 0; } @@ -349,7 +349,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::generate_timer_id (u_in return (cnt << this->spoke_bits_) | spoke; } - //ACE_ERROR((LM_ERROR, "Timer id overflow. We have to search now.\n")); + //ACELIB_ERROR((LM_ERROR, "Timer id overflow. We have to search now.\n")); // We've run out of consecutive id numbers so now we have to search // for a unique id. @@ -416,7 +416,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::schedule_i (const TYPE& u_int spoke = calculate_spoke (future_time); long id = generate_timer_id (spoke); - //ACE_ERROR((LM_ERROR, "Scheduling %x spoke:%d id:%d\n", (long) n, spoke, id)); + //ACELIB_ERROR((LM_ERROR, "Scheduling %x spoke:%d id:%d\n", (long) n, spoke, id)); if (id != -1) { @@ -699,7 +699,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::recalc_earliest } this->earliest_spoke_ = es; - //ACE_ERROR((LM_ERROR, "We had to search the whole wheel.\n")); + //ACELIB_ERROR((LM_ERROR, "We had to search the whole wheel.\n")); } /** @@ -711,18 +711,18 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Timer_Wheel_T::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nspoke_count_ = %d"), this->spoke_count_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nresolution_ = %d"), 1 << this->res_bits_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nwheel_ =\n"))); for (u_int i = 0; i < this->spoke_count_; ++i) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%d\n"), i)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%d\n"), i)); ACE_Timer_Node_T<TYPE>* root = this->spokes_[i]; for (ACE_Timer_Node_T<TYPE>* n = root->get_next (); n != root; @@ -732,7 +732,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::dump (void) const } } - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -842,7 +842,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::expire (const ACE_Time_ { ++expcount; - //ACE_ERROR((LM_ERROR, "Expiring %x\n", (long) n)); + //ACELIB_ERROR((LM_ERROR, "Expiring %x\n", (long) n)); ACE_Timer_Node_Dispatch_Info_T<TYPE> info; diff --git a/ACE/ace/Token.cpp b/ACE/ace/Token.cpp index 02c7b0a7d47..b488d32393e 100644 --- a/ACE/ace/Token.cpp +++ b/ACE/ace/Token.cpp @@ -11,7 +11,7 @@ #if defined (ACE_HAS_THREADS) #include "ace/Thread.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if defined (ACE_TOKEN_DEBUGGING) // FUZZ: disable check_for_streams_include @@ -28,16 +28,16 @@ ACE_Token::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthread = %d"), ACE_Thread::self ())); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthread = %d"), ACE_Thread::self ())); // @@ Is there a portable way to do this? - // ACE_DEBUG ((LM_DEBUG, "\nowner_ = %d", (long) this->owner_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nowner_ addr = %x"), &this->owner_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nwaiters_ = %d"), this->waiters_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nin_use_ = %d"), this->in_use_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnesting level = %d"), this->nesting_level_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + // ACELIB_DEBUG ((LM_DEBUG, "\nowner_ = %d", (long) this->owner_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nowner_ addr = %x"), &this->owner_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nwaiters_ = %d"), this->waiters_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nin_use_ = %d"), this->in_use_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnesting level = %d"), this->nesting_level_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -293,7 +293,7 @@ ACE_Token::shared_acquire (void (*sleep_hook_func)(void *), queue->remove_entry (&my_entry); #if defined (ACE_TOKEN_DEBUGGING) - ACE_DEBUG ((LM_DEBUG, "(%t) ACE_Token::shared_acquire (UNBLOCKED)\n")); + ACELIB_DEBUG ((LM_DEBUG, "(%t) ACE_Token::shared_acquire (UNBLOCKED)\n")); #endif /* ACE_TOKEN_DEBUGGING */ // If timeout occured @@ -439,7 +439,7 @@ ACE_Token::renew (int requeue_position, this_threads_queue->remove_entry (&my_entry); #if defined (ACE_TOKEN_DEBUGGING) - ACE_DEBUG ((LM_DEBUG, "(%t) ACE_Token::renew (UNBLOCKED)\n")); + ACELIB_DEBUG ((LM_DEBUG, "(%t) ACE_Token::renew (UNBLOCKED)\n")); #endif /* ACE_TOKEN_DEBUGGING */ // If timeout occured diff --git a/ACE/ace/Token_Collection.cpp b/ACE/ace/Token_Collection.cpp index 7133d009230..a8bf86d3305 100644 --- a/ACE/ace/Token_Collection.cpp +++ b/ACE/ace/Token_Collection.cpp @@ -40,7 +40,7 @@ ACE_Token_Collection::insert (ACE_Token_Proxy &new_token) ACE_Token_Proxy *temp = new_token.clone (); if (collection_.bind (name, temp) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("bind failed\n")), -1); + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("bind failed\n")), -1); return 0; } @@ -84,7 +84,7 @@ ACE_Token_Collection::acquire (int notify, iterator.advance ()) { if (debug_) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("collection acquiring %s\n"), temp->int_id_->name ())); if (temp->int_id_->acquire (notify, @@ -149,7 +149,7 @@ ACE_Token_Collection::tryacquire (void (*sleep_hook)(void *)) iterator.advance ()) { if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection acquiring %s\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("collection acquiring %s\n"), temp->int_id_->name ())); // We will fail if _any_ token is not free. if (temp->int_id_->tryacquire (sleep_hook) == -1) @@ -172,7 +172,7 @@ ACE_Token_Collection::renew (int requeue_position, iterator.advance ()) { if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection renewing %s\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("collection renewing %s\n"), temp->int_id_->name ())); if (temp->int_id_->renew (requeue_position, options) == -1) return -1; @@ -195,7 +195,7 @@ ACE_Token_Collection::renew (const ACE_TCHAR *token_name, // Did we find it? if (result == -1) - ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("%p %s\n"), + ACELIB_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("%p %s\n"), ACE_TEXT ("not in collection "), token_name), -1); // perform the operation @@ -214,7 +214,7 @@ ACE_Token_Collection::release (ACE_Synch_Options &) iterator.advance ()) { if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection releasing %s\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("collection releasing %s\n"), temp->int_id_->name ())); temp->int_id_->release (); } @@ -275,14 +275,14 @@ ACE_Token_Collection::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Collection::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Collection::dump:\n") + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Collection::dump:\n") ACE_TEXT (" debug_ = %d\n"), debug_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection_\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("collection_\n"))); collection_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_Token_Proxy::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Token_Invariants.cpp b/ACE/ace/Token_Invariants.cpp index bbf55dc69cc..b03bc012c06 100644 --- a/ACE/ace/Token_Invariants.cpp +++ b/ACE/ace/Token_Invariants.cpp @@ -140,12 +140,12 @@ ACE_Token_Invariant_Manager::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Invariant_Manager::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_collection_:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_collection_:\n"))); mutex_collection_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("rwlock_collection_:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("rwlock_collection_:\n"))); rwlock_collection_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -267,9 +267,9 @@ ACE_Mutex_Invariants::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Mutex_Invariants::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owners_ = %d\n"), owners_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("owners_ = %d\n"), owners_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -342,10 +342,10 @@ ACE_RWLock_Invariants::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_RWLock_Invariants::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("writers_ = %d readers_ = %d\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("writers_ = %d readers_ = %d\n"), writers_, readers_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Token_Manager.cpp b/ACE/ace/Token_Manager.cpp index 0487ac8f67f..8a8ef449399 100644 --- a/ACE/ace/Token_Manager.cpp +++ b/ACE/ace/Token_Manager.cpp @@ -153,8 +153,8 @@ ACE_Token_Manager::check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy) // The caller is an owner, so we have a deadlock situation. if (debug_) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Deadlock detected.\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s owns %s and is waiting for %s.\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Deadlock detected.\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%s owns %s and is waiting for %s.\n"), proxy->client_id (), token->name (), proxy->token_->name ())); @@ -175,7 +175,7 @@ ACE_Token_Manager::check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy) { if (debug_) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("%s owns %s and is waiting for %s.\n"), e->client_id (), token->name (), @@ -231,7 +231,7 @@ ACE_Token_Manager::release_token (ACE_Tokens *&token) // we did not find one in the collection { errno = ENOENT; - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Token Manager could not release %s:%d\n"), + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Token Manager could not release %s:%d\n"), token->name (), token->type ())); // @@ bad } @@ -257,13 +257,13 @@ ACE_Token_Manager::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Manager::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Manager::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("lock_\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Manager::dump:\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("lock_\n"))); lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection_\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("collection_\n"))); collection_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Token_Request_Reply.cpp b/ACE/ace/Token_Request_Reply.cpp index 5fc3653038e..32ab4d647fd 100644 --- a/ACE/ace/Token_Request_Reply.cpp +++ b/ACE/ace/Token_Request_Reply.cpp @@ -94,46 +94,46 @@ void ACE_Token_Request::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("*******\nlength = %d\ntoken name = %s\nclient id = %s\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("*******\nlength = %d\ntoken name = %s\nclient id = %s\n"), this->length (), this->token_name (), this->client_id ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("type = "))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("type = "))); if (this->token_type () == ACE_Tokens::MUTEX) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("MUTEX\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("MUTEX\n"))); else // == ACE_Tokens::RWLOCK { if (this->proxy_type () == ACE_RW_Token::READER) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RLOCK\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("RLOCK\n"))); else // == WRITER - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("WLOCK\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("WLOCK\n"))); } - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("operation = "))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("operation = "))); switch (this->operation_type ()) { case ACE_Token_Request::ACQUIRE: - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACQUIRE\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ACQUIRE\n"))); break; case ACE_Token_Request::RELEASE: - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RELEASE\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("RELEASE\n"))); break; case ACE_Token_Request::RENEW: - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RENEW\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("RENEW\n"))); break; default: - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<unknown operation type> = %d\n"), this->operation_type ())); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("<unknown operation type> = %d\n"), this->operation_type ())); break; } if (this->options ()[ACE_Synch_Options::USE_TIMEOUT] == 0) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("blocking forever\n"))); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("blocking forever\n"))); else { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("waiting for %d secs and %d usecs\n"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("waiting for %d secs and %d usecs\n"), this->options ().timeout ().sec (), this->options ().timeout ().usec ())); } - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -175,9 +175,9 @@ void ACE_Token_Reply::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("*******\nlength = %d\nerrnum = %d"), + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("*******\nlength = %d\nerrnum = %d"), this->length (), this->errnum ())); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("arg = %d"), this->arg ())); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("arg = %d"), this->arg ())); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Trace.cpp b/ACE/ace/Trace.cpp index c9f266375b3..035c4cef847 100644 --- a/ACE/ace/Trace.cpp +++ b/ACE/ace/Trace.cpp @@ -8,7 +8,7 @@ #endif /* ACE_NTRACE */ #define ACE_NTRACE 1 -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Object_Manager_Base.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -93,7 +93,7 @@ ACE_Trace::ACE_Trace (const ACE_TCHAR *n, && lm->trace_active () == 0) { lm->trace_active (1); - ACE_DEBUG ((LM_TRACE, + ACELIB_DEBUG ((LM_TRACE, ACE_TEXT ("%*s(%t) calling %s in file `%s' on line %d\n"), ACE_Trace::nesting_indent_ * lm->inc (), ACE_TEXT (""), @@ -119,7 +119,7 @@ ACE_Trace::~ACE_Trace (void) && lm->trace_active () == 0) { lm->trace_active (1); - ACE_DEBUG ((LM_TRACE, + ACELIB_DEBUG ((LM_TRACE, ACE_TEXT ("%*s(%t) leaving %s\n"), ACE_Trace::nesting_indent_ * lm->dec (), ACE_TEXT (""), diff --git a/ACE/ace/Typed_SV_Message_Queue.cpp b/ACE/ace/Typed_SV_Message_Queue.cpp index 7fc2b0fd38d..4153658fd05 100644 --- a/ACE/ace/Typed_SV_Message_Queue.cpp +++ b/ACE/ace/Typed_SV_Message_Queue.cpp @@ -10,7 +10,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Typed_SV_Message_Queue.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (__ACE_INLINE__) #include "ace/Typed_SV_Message_Queue.inl" @@ -41,7 +41,7 @@ ACE_Typed_SV_Message_Queue<T>::ACE_Typed_SV_Message_Queue (key_t external_id, { ACE_TRACE ("ACE_Typed_SV_Message_Queue<T>::ACE_Typed_SV_Message_Queue"); if (this->open (external_id, create, perms) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, "ACE_Typed_SV_Message_Queue::ACE_Typed_SV_Message_Queue")); } diff --git a/ACE/ace/UNIX_Addr.h b/ACE/ace/UNIX_Addr.h index 6e684e4e583..859691ca258 100644 --- a/ACE/ace/UNIX_Addr.h +++ b/ACE/ace/UNIX_Addr.h @@ -25,7 +25,7 @@ #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) #include "ace/Addr.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/ACE.h" #include "ace/os_include/sys/os_un.h" diff --git a/ACE/ace/UPIPE_Acceptor.cpp b/ACE/ace/UPIPE_Acceptor.cpp index ff98bfb87ea..dea16d9d4bc 100644 --- a/ACE/ace/UPIPE_Acceptor.cpp +++ b/ACE/ace/UPIPE_Acceptor.cpp @@ -63,7 +63,7 @@ ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_addr, ACE_TRACE ("ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor"); if (this->open (local_addr, reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_UPIPE_Acceptor"))); } @@ -103,16 +103,16 @@ ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream, if (ACE_OS::read (new_stream.get_handle (), (char *) &remote_stream, sizeof remote_stream) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_UPIPE_Acceptor: %p\n"), ACE_TEXT ("read stream address failed"))); else if (new_stream.stream_.link (remote_stream->stream_) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_UPIPE_Acceptor: %p\n"), ACE_TEXT ("link streams failed"))); // Send a message over the new streampipe to confirm acceptance. else if (new_stream.send (&mb_, 0) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_UPIPE_Acceptor: %p\n"), ACE_TEXT ("linked stream.put failed"))); diff --git a/ACE/ace/UPIPE_Connector.cpp b/ACE/ace/UPIPE_Connector.cpp index 8119b545a4a..7f1d814e1d7 100644 --- a/ACE/ace/UPIPE_Connector.cpp +++ b/ACE/ace/UPIPE_Connector.cpp @@ -70,7 +70,7 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream, (const char *) &ustream, sizeof ustream); if (result == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_UPIPE_Connector %p\n"), ACE_TEXT ("write to pipe failed"))); @@ -83,7 +83,7 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream, // Do *not* coalesce the following two checks for result == -1. // They perform different checks and cannot be merged. if (result == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_UPIPE_Connector %p\n"), ACE_TEXT ("no confirmation from server"))); else diff --git a/ACE/ace/UPIPE_Connector.inl b/ACE/ace/UPIPE_Connector.inl index 5b3d2513b20..f298000d2a0 100644 --- a/ACE/ace/UPIPE_Connector.inl +++ b/ACE/ace/UPIPE_Connector.inl @@ -18,7 +18,7 @@ ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream, if (this->connect (new_stream, addr, timeout, local_sap, reuse_addr, flags, perms) == -1 && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("address %s, %p\n"), addr.get_path_name (), ACE_TEXT ("ACE_UPIPE_Connector"))); diff --git a/ACE/ace/UUID.cpp b/ACE/ace/UUID.cpp index b8b5f86f0c0..0bd94ff037b 100644 --- a/ACE/ace/UUID.cpp +++ b/ACE/ace/UUID.cpp @@ -7,7 +7,7 @@ #include "ace/UUID.inl" #endif /* __ACE_INLINE__ */ -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_sys_time.h" @@ -131,7 +131,7 @@ namespace ACE_Utils { if (uuid_string.length () < NIL_UUID.to_string ()->length ()) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, "%N ACE_UUID::from_string_i - " "IllegalArgument (incorrect string length)\n")); return; @@ -182,7 +182,7 @@ namespace ACE_Utils if (nScanned != 11) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "UUID::from_string_i - " "IllegalArgument (invalid string representation)\n")); return; @@ -228,7 +228,7 @@ namespace ACE_Utils if (nScanned != 12) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "ACE_UUID::from_string_i - " "IllegalArgument (invalid string representation)\n")); return; @@ -248,7 +248,7 @@ namespace ACE_Utils if ((this->uuid_.clock_seq_hi_and_reserved_ & 0xc0) != 0x80 && (this->uuid_.clock_seq_hi_and_reserved_ & 0xc0) != 0xc0) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "ACE_UUID::from_string_i - " "IllegalArgument (unsupported variant)\n")); return; @@ -261,7 +261,7 @@ namespace ACE_Utils (V1 & 0xF000) != 0x3000 && (V1 & 0xF000) != 0x4000) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "ACE_UUID::from_string_i - " "IllegalArgument (unsupported version)\n")); return; @@ -271,7 +271,7 @@ namespace ACE_Utils { if (uuid_string.length () == NIL_UUID.to_string ()->length ()) { - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "ACE_UUID::from_string_i - " "IllegalArgument (Missing Thread and Process Id)\n")); return; @@ -279,7 +279,7 @@ namespace ACE_Utils ACE_CString thr_pid_str (thr_pid_buf); ssize_t pos = static_cast<ssize_t> (thr_pid_str.find ('-')); if (pos == -1) - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, "ACE_UUID::from_string_i - " "IllegalArgument (Thread and Process Id format incorrect)\n")); diff --git a/ACE/ace/Unbounded_Queue.cpp b/ACE/ace/Unbounded_Queue.cpp index 8db9ceaff53..3d8b598f883 100644 --- a/ACE/ace/Unbounded_Queue.cpp +++ b/ACE/ace/Unbounded_Queue.cpp @@ -14,7 +14,7 @@ #endif /* __ACE_INLINE__ */ #include "ace/Malloc_Base.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/os_include/os_errno.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -89,10 +89,10 @@ ACE_Unbounded_Queue<T>::dump (void) const #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Unbounded_Queue<T>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_ = %u"), this->head_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_ = %u"), this->head_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); T *item = 0; #if !defined (ACE_NLOGGING) @@ -102,9 +102,9 @@ ACE_Unbounded_Queue<T>::dump (void) const for (ACE_Unbounded_Queue_Iterator<T> iter (*(ACE_Unbounded_Queue<T> *) this); iter.next (item) != 0; iter.advance ()) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("count = %d\n"), count++)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("count = %d\n"), count++)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Unbounded_Set.cpp b/ACE/ace/Unbounded_Set.cpp index 2d70cc5f900..c9927890450 100644 --- a/ACE/ace/Unbounded_Set.cpp +++ b/ACE/ace/Unbounded_Set.cpp @@ -5,7 +5,7 @@ #include "ace/Unbounded_Set.h" #include "ace/Malloc_Base.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ACE/ace/Unbounded_Set_Ex.cpp b/ACE/ace/Unbounded_Set_Ex.cpp index f890c243fb2..07951466b8f 100644 --- a/ACE/ace/Unbounded_Set_Ex.cpp +++ b/ACE/ace/Unbounded_Set_Ex.cpp @@ -5,7 +5,7 @@ #include "ace/Unbounded_Set.h" #include "ace/Malloc_Base.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -64,10 +64,10 @@ ACE_Unbounded_Set_Ex<T, C>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Unbounded_Set_Ex<T, C>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_ = %u"), this->head_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_ = %u"), this->head_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); T *item = 0; #if !defined (ACE_NLOGGING) @@ -78,9 +78,9 @@ ACE_Unbounded_Set_Ex<T, C>::dump (void) const for (const_iterator i (this->begin ()); i != the_end; ++i) - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("count = %u\n"), count++)); + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("count = %u\n"), count++)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp index c906e041f89..5b66e7aa304 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -29,7 +29,7 @@ int ACE_WFMO_Reactor_Handler_Repository::open (size_t size) { if (size > MAXIMUM_WAIT_OBJECTS) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%d exceeds MAXIMUM_WAIT_OBJECTS (%d)\n"), size, MAXIMUM_WAIT_OBJECTS), @@ -991,59 +991,59 @@ ACE_WFMO_Reactor_Handler_Repository::dump (void) const ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Max size = %d\n"), this->max_size_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Current info table\n\n"))); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\tSize = %d\n"), this->max_handlep1_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\tHandles to be suspended = %d\n"), this->handles_to_be_suspended_)); for (i = 0; i < this->max_handlep1_; ++i) this->current_info_[i].dump (this->current_handles_[i]); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("To-be-added info table\n\n"))); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\tSize = %d\n"), this->handles_to_be_added_)); for (i = 0; i < this->handles_to_be_added_; ++i) this->to_be_added_info_[i].dump (); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Suspended info table\n\n"))); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\tSize = %d\n"), this->suspended_handles_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\tHandles to be resumed = %d\n"), this->handles_to_be_resumed_)); for (i = 0; i < this->suspended_handles_; ++i) this->current_suspended_info_[i].dump (); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Total handles to be deleted = %d\n"), this->handles_to_be_deleted_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -1086,7 +1086,7 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (ACE_Sig_Handler *sh, deactivated_ (0) { if (this->open (ACE_WFMO_Reactor::DEFAULT_SIZE, 0, sh, tq, 0, notify) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("WFMO_Reactor"))); } @@ -1121,7 +1121,7 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (size_t size, ACE_UNUSED_ARG (unused); if (this->open (size, 0, sh, tq, 0, notify) == -1) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("WFMO_Reactor"))); } @@ -1208,7 +1208,7 @@ ACE_WFMO_Reactor::open (size_t size, // Open the handle repository. Two additional handles for internal // purposes if (this->handler_rep_.open (size + 2) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("opening handler repository")), -1); else @@ -1236,7 +1236,7 @@ ACE_WFMO_Reactor::open (size_t size, // Open the notification handler if (this->notify_handler_->open (this, this->timer_queue_) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("opening notify handler ")), -1); @@ -1244,7 +1244,7 @@ ACE_WFMO_Reactor::open (size_t size, // Register for <wakeup_all_threads> event if (this->register_handler (&this->wakeup_all_threads_handler_, this->wakeup_all_threads_.handle ()) == -1) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("registering thread wakeup handler")), -1); @@ -2343,13 +2343,13 @@ ACE_WFMO_Reactor::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_WFMO_Reactor::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Count of currently active threads = %d\n"), this->active_threads_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("ID of owner thread = %d\n"), this->owner_)); @@ -2357,7 +2357,7 @@ ACE_WFMO_Reactor::dump (void) const this->signal_handler_->dump (); this->timer_queue_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -2438,7 +2438,7 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum, // This will get called when <WFMO_Reactor->wakeup_one_thread_> event // is signaled. - // ACE_DEBUG ((LM_DEBUG, + // ACELIB_DEBUG ((LM_DEBUG, // ACE_TEXT ("(%t) waking up to handle internal notifications\n"))); for (int i = 1; ; ++i) @@ -2494,7 +2494,7 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum, result = event_handler->handle_group_qos (ACE_INVALID_HANDLE); break; default: - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("invalid mask = %d\n"), buffer->mask_)); break; @@ -2693,12 +2693,12 @@ ACE_WFMO_Reactor_Notify::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_WFMO_Reactor_Notify::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->timer_queue_->dump (); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Max. iteration: %d\n"), this->max_notify_iterations_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/WFMO_Reactor.inl b/ACE/ace/WFMO_Reactor.inl index 2e302b8c6c2..d2e8d56bdba 100644 --- a/ACE/ace/WFMO_Reactor.inl +++ b/ACE/ace/WFMO_Reactor.inl @@ -19,7 +19,7 @@ ACE_Wakeup_All_Threads_Handler::handle_signal (int /* signum */, { // This will get called when <WFMO_Reactor->wakeup_all_threads_> event // is signaled. There is nothing to be done here. - // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) waking up to get updated handle set info\n"))); + // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) waking up to get updated handle set info\n"))); return 0; } @@ -81,37 +81,37 @@ ACE_WFMO_Reactor_Handler_Repository::Common_Info::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::Common_Info::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("I/O Entry = %d\n"), this->io_entry_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Event Handler = %d\n"), this->event_handler_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("I/O Handle = %d\n"), this->io_handle_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Network Events = %d\n"), this->network_events_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Delete Event = %d\n"), this->delete_event_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Delete Entry = %d\n"), this->delete_entry_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Close Masks = %d\n"), this->close_masks_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -164,19 +164,19 @@ ACE_WFMO_Reactor_Handler_Repository::Current_Info::dump (ACE_HANDLE event_handle #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::Current_Info::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); Common_Info::dump (); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Event Handle = %d\n"), event_handle)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Suspend Entry = %d\n"), this->suspend_entry_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #else /* !ACE_HAS_DUMP */ ACE_UNUSED_ARG (event_handle); #endif /* ACE_HAS_DUMP */ @@ -237,19 +237,19 @@ ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); Common_Info::dump (); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Event Handle = %d\n"), this->event_handle_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Suspend Entry = %d\n"), this->suspend_entry_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -308,19 +308,19 @@ ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); + ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); Common_Info::dump (); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Event Handle = %d\n"), this->event_handle_)); - ACE_DEBUG ((LM_DEBUG, + ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("Resume Entry = %d\n"), this->resume_entry_)); - ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); + ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/WIN32_Asynch_IO.cpp b/ACE/ace/WIN32_Asynch_IO.cpp index 9d925b784b7..4a6c2641845 100644 --- a/ACE/ace/WIN32_Asynch_IO.cpp +++ b/ACE/ace/WIN32_Asynch_IO.cpp @@ -84,7 +84,7 @@ ACE_WIN32_Asynch_Result::post_completion (ACE_Proactor_Impl *proactor) ACE_WIN32_Proactor *win32_proactor = dynamic_cast<ACE_WIN32_Proactor *> (proactor); if (win32_proactor == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Dynamic cast to WIN32 Proactor failed\n")), -1); @@ -443,7 +443,7 @@ ACE_WIN32_Asynch_Read_Stream::readv (ACE_Message_Block &message_block, // OS should correctly process zero length buffers // if ( msg_space == 0 ) - // ACE_ERROR_RETURN ((LM_ERROR, + // ACELIB_ERROR_RETURN ((LM_ERROR, // ACE_TEXT ("ACE_WIN32_Asynch_Read_Stream::readv:") // ACE_TEXT ("No space in the message block\n")), // -1); @@ -486,7 +486,7 @@ ACE_WIN32_Asynch_Read_Stream::readv (ACE_Message_Block &message_block, bytes_to_read += iov[i].iov_len; if (bytes_to_read == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_WIN32_Asynch_Read_Stream::readv:") ACE_TEXT ("Attempt to read 0 bytes\n")), -1); @@ -542,7 +542,7 @@ ACE_WIN32_Asynch_Read_Stream::readv (ACE_Message_Block &message_block, if (ACE::debug ()) { - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("WSARecv"))); } @@ -608,7 +608,7 @@ ACE_WIN32_Asynch_Read_Stream::shared_read (ACE_WIN32_Asynch_Read_Stream_Result * if (ACE::debug ()) { - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ReadFile"))); } @@ -824,7 +824,7 @@ ACE_WIN32_Asynch_Write_Stream::write (ACE_Message_Block &message_block, bytes_to_write = len ; if (bytes_to_write == 0) - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_WIN32_Asynch_Write_Stream::write:") ACE_TEXT ("Attempt to write 0 bytes\n")), @@ -916,7 +916,7 @@ ACE_WIN32_Asynch_Write_Stream::writev (ACE_Message_Block &message_block, bytes_to_write += iov[i].iov_len; if ( bytes_to_write == 0 ) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_WIN32_Asynch_Write_Stream::writev:") ACE_TEXT ("Attempt to write 0 bytes\n")), -1); @@ -969,7 +969,7 @@ ACE_WIN32_Asynch_Write_Stream::writev (ACE_Message_Block &message_block, if (ACE::debug ()) { - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("WSASend"))); } @@ -1051,7 +1051,7 @@ ACE_WIN32_Asynch_Write_Stream::shared_write (ACE_WIN32_Asynch_Write_Stream_Resul // queued. if (ACE::debug ()) - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("Initiating write"))); return -1; @@ -1282,7 +1282,7 @@ ACE_WIN32_Asynch_Read_File::read (ACE_Message_Block &message_block, bytes_to_read = space; if ( bytes_to_read == 0 ) - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_WIN32_Asynch_Read_File::read:") ACE_TEXT ("Attempt to read 0 bytes or no space in the message block\n")), @@ -1343,7 +1343,7 @@ ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block, size_t msg_space = msg->space (); if (msg_space < page_size) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_WIN32_Asynch_Read_File::readv:") ACE_TEXT ("Invalid message block size\n")), -1); @@ -1411,7 +1411,7 @@ ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block, if (ACE::debug ()) { - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ReadFileScatter"))); } @@ -1683,7 +1683,7 @@ ACE_WIN32_Asynch_Write_File::write (ACE_Message_Block &message_block, bytes_to_write = len; if ( bytes_to_write == 0 ) - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_WIN32_Asynch_Write_File::write:") ACE_TEXT ("Attempt to read 0 bytes\n")), @@ -1749,7 +1749,7 @@ ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block, if (msg_len < page_size && (msg->size () - (msg->rd_ptr () - msg->base ()) < page_size || // message block too small bytes_to_write - total_len > page_size ))// NOT last chunk - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_WIN32_Asynch_Write_File::writev:") ACE_TEXT ("Invalid message block length\n")), -1); @@ -1816,7 +1816,7 @@ ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block, if (ACE::debug ()) { - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("WriteFileGather"))); } @@ -2077,7 +2077,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, size_t available_space = message_block.space (); size_t space_needed = bytes_to_read + 2 * address_size; if (available_space < space_needed) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Buffer too small\n")), -1); + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Buffer too small\n")), -1); // WIN Specific. @@ -2100,7 +2100,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, { if (ACE::debug ()) { - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_OS::socket"))); } @@ -2162,7 +2162,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, if (ACE::debug ()) { - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("AcceptEx"))); } @@ -2383,7 +2383,7 @@ ACE_WIN32_Asynch_Connect::open (const ACE_Handler::Proxy_Ptr &handler_proxy, // if we are already opened, // we could not create a new handler without closing the previous if (this->flg_open_) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::open:") ACE_TEXT ("connector already open\n")), -1); @@ -2415,7 +2415,7 @@ ACE_WIN32_Asynch_Connect::connect (ACE_HANDLE connect_handle, ACE_TRACE ("ACE_WIN32_Asynch_Connect::connect"); if (!this->flg_open_) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::connect") ACE_TEXT ("connector was not opened before\n")), -1); @@ -2449,7 +2449,7 @@ ACE_WIN32_Asynch_Connect::connect (ACE_HANDLE connect_handle, if (this->result_map_.bind (connect_handle, result) == -1) { - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("ACE_WIN32_Asynch_Connect::connect: %p\n"), ACE_TEXT ("bind"))); result->set_error (EFAULT); @@ -2492,7 +2492,7 @@ int ACE_WIN32_Asynch_Connect::post_result (ACE_WIN32_Asynch_Connect_Result * res if (this->win32_proactor_ ->post_completion (result) == 0) return 0; - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("Error:(%P | %t):%p\n"), ACE_TEXT ("ACE_WIN32_Asynch_Connect::post_result: ") ACE_TEXT (" <post_completion> failed"))); @@ -2536,7 +2536,7 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result, if (handle == ACE_INVALID_HANDLE) { result->set_error (errno); - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_WIN32_Asynch_Connect::connect_i: %p\n"), ACE_TEXT ("socket")), @@ -2554,7 +2554,7 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result, sizeof one) == -1) { result->set_error (errno); - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_WIN32_Asynch_Connect::connect_i: %p\n"), ACE_TEXT ("setsockopt")), @@ -2569,7 +2569,7 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result, if (ACE_OS::bind (handle, laddr, size) == -1) { result->set_error (errno); - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_WIN32_Asynch_Connect::connect_i: %p\n"), ACE_TEXT ("bind")), @@ -2581,7 +2581,7 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result, if (ACE::set_flags (handle, ACE_NONBLOCK) != 0) { result->set_error (errno); - ACE_ERROR_RETURN + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_WIN32_Asynch_Connect::connect_i: %p\n"), ACE_TEXT ("set_flags")), @@ -3041,7 +3041,7 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, if (ACE::debug ()) { - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("TransmitFile"))); } @@ -3311,7 +3311,7 @@ ACE_WIN32_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block, // OS should correctly process zero length buffers // if ( msg_space == 0 ) - // ACE_ERROR_RETURN ((LM_ERROR, + // ACELIB_ERROR_RETURN ((LM_ERROR, // ACE_TEXT ("ACE_WIN32_Asynch_Read_Dgram::recv:") // ACE_TEXT ("No space in the message block\n")), // -1); @@ -3346,7 +3346,7 @@ ACE_WIN32_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block, } if (bytes_to_read == 0) - ACE_ERROR_RETURN ((LM_ERROR, + ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE_WIN32_Asynch_Read_Dgram::recv:") ACE_TEXT ("Attempt to read 0 bytes\n")), -1); @@ -3398,7 +3398,7 @@ ACE_WIN32_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block, if (ACE::debug ()) { - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("WSARecvFrom"))); } @@ -3723,7 +3723,7 @@ ACE_WIN32_Asynch_Write_Dgram::send (ACE_Message_Block *message_block, if (ACE::debug ()) { - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("WSASendTo"))); } diff --git a/ACE/ace/WIN32_Proactor.cpp b/ACE/ace/WIN32_Proactor.cpp index bbbf6835319..0f0fbe97a98 100644 --- a/ACE/ace/WIN32_Proactor.cpp +++ b/ACE/ace/WIN32_Proactor.cpp @@ -7,7 +7,7 @@ #if defined (ACE_WIN32) && defined (ACE_HAS_WIN32_OVERLAPPED_IO) // WIN implemenatation of the Proactor. -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Object_Manager.h" #include "ace/OS_NS_errno.h" #include "ace/OS_NS_unistd.h" @@ -55,7 +55,7 @@ ACE_WIN32_Proactor::ACE_WIN32_Proactor (size_t number_of_threads, 0, this->number_of_threads_); if (this->completion_port_ == 0) - ACE_ERROR ((LM_ERROR, + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("CreateIoCompletionPort"))); @@ -134,7 +134,7 @@ ACE_WIN32_Proactor::register_handle (ACE_HANDLE handle, { if (ACE::debug ()) { - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("CreateIoCompletionPort"))); } @@ -588,7 +588,7 @@ ACE_WIN32_Proactor::handle_events (unsigned long milli_seconds) default: if (ACE::debug ()) - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("GetQueuedCompletionStatus"))); return -1; @@ -689,7 +689,7 @@ ACE_WIN32_Proactor::post_completion (ACE_WIN32_Asynch_Result *result) if (ACE::debug ()) { - ACE_DEBUG ((LM_ERROR, + ACELIB_DEBUG ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("PostQueuedCompletionStatus failed"))); } diff --git a/ACE/ace/XML_Utils/XML_Error_Handler.cpp b/ACE/ace/XML_Utils/XML_Error_Handler.cpp index 1e34881f458..6375b6c6059 100644 --- a/ACE/ace/XML_Utils/XML_Error_Handler.cpp +++ b/ACE/ace/XML_Utils/XML_Error_Handler.cpp @@ -1,7 +1,7 @@ // $Id$ #include "XML_Error_Handler.h" -#include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "ace/Auto_Ptr.h" #include "ace/ACE.h" #include <xercesc/util/XMLString.hpp> diff --git a/ACE/ace/XML_Utils/XML_Helper.tpp b/ACE/ace/XML_Utils/XML_Helper.tpp index b1177ddcb56..e65785968f1 100644 --- a/ACE/ace/XML_Utils/XML_Helper.tpp +++ b/ACE/ace/XML_Utils/XML_Helper.tpp @@ -2,6 +2,7 @@ #include "XML_Helper.h" #include "ace/Auto_Ptr.h" #include "ace/Log_Msg.h" +#include "ace/Log_Category.h" #include "xercesc/util/XMLUniDefs.hpp" #include "xercesc/dom/DOM.hpp" #include "XML_Error_Handler.h" @@ -96,10 +97,7 @@ namespace XML } catch (...) { - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Some other exception," - " returning\n")); - + ACELIB_DEBUG ((LM_DEBUG, "(%P|%t) Some other exception, returning\n")); return; } @@ -223,8 +221,7 @@ namespace XML } catch (...) { - ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Caught an unknown exception \n")); + ACELIB_DEBUG ((LM_DEBUG, "(%P|%t) Caught an unknown exception\n")); throw; } @@ -334,7 +331,7 @@ namespace XML char* name = XMLString::transcode (e.getType()); ACE_Auto_Basic_Array_Ptr<char> cleanup_name (name); - ACE_ERROR ((LM_ERROR, "Caught exception while serializing DOM to file.\n" + ACELIB_ERROR ((LM_ERROR, "Caught exception while serializing DOM to file.\n" "Name: %C\n" "Message: %C\n" "SrcFile: %C\n" diff --git a/ACE/ace/XTI_ATM_Mcast.inl b/ACE/ace/XTI_ATM_Mcast.inl index 7cdfbbf6160..1c7a6d4ed09 100644 --- a/ACE/ace/XTI_ATM_Mcast.inl +++ b/ACE/ace/XTI_ATM_Mcast.inl @@ -24,7 +24,7 @@ ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (ACE_TLI_Stream &new_stream, info, rw_flag, udata, opt) == ACE_INVALID_HANDLE && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream"))); + ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream"))); } // Connect the <new_stream> to the <remote_sap>, waiting up to diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc index 7dddd64d40d..affa87a3034 100644 --- a/ACE/ace/ace.mpc +++ b/ACE/ace/ace.mpc @@ -92,6 +92,7 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, Lib_Find.cpp Local_Memory_Pool.cpp Lock.cpp + Log_Category.cpp Log_Msg.cpp Log_Msg_Backend.cpp Log_Msg_Callback.cpp diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc index 1ddad6ddd26..f3c002c9b38 100644 --- a/ACE/ace/ace_for_tao.mpc +++ b/ACE/ace/ace_for_tao.mpc @@ -70,6 +70,7 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, Lib_Find.cpp Local_Memory_Pool.cpp Lock.cpp + Log_Category.cpp Log_Msg.cpp Log_Msg_Backend.cpp Log_Msg_Callback.cpp diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl index 17caee09361..916b020b0f0 100755 --- a/ACE/bin/fuzz.pl +++ b/ACE/bin/fuzz.pl @@ -253,7 +253,7 @@ sub check_for_id_string () print "Running \$Id\$ string check\n"; foreach $file (@files_cpp, @files_inl, @files_h, @files_mpc, @files_bor, @files_gnu, @files_html, @files_idl, @files_pl, - @makefile_files, @files_cdp, @files_py, @files_conf, @files_generic) { + @files_cdp, @files_py, @files_conf, @files_generic) { my $found = 0; if (open (FILE, $file)) { print "Looking at file $file\n" if $opt_d; @@ -1218,9 +1218,9 @@ sub check_for_empty_files () if (open (FILE, $file)) { print "Looking at file $file\n" if $opt_d; while (<FILE>) { - next if /^[:blank:]*$/; # skip empty lines - next if /^[:blank:]*\/\//; # skip C++ comments - next if /^[:blank:]*\/\*/; # skip C++ comments + next if /^[[:blank:]]*$/; # skip empty lines + next if /^[[:blank:]]*\/\//; # skip C++ comments + next if /^[[:blank:]]*\/\*/; # skip C++ comments $found_non_empty_line = 1; last; } @@ -2284,7 +2284,6 @@ sub check_for_include_OS_h () } elsif ($disable == 0 and /^\s*#\s*include\s*<[(ace)|(TAO)|(CIAO)]\/.*>/) { print_error ("$file:$.: include <ace\/..> used"); - ++$bad_occurance; } else { if ($disable == 0 and /^\s*#\s*include\s*"ace\/OS.h"/) { @@ -2300,6 +2299,62 @@ sub check_for_include_OS_h () } } +sub check_for_ace_log_categories () +{ + return if is_suppressed (); + + print "Running the ACE log categories check\n"; + + my @macros = qw/HEX_DUMP ERROR ERROR_RETURN ERROR_BREAK DEBUG/; + my $macros = join ('|', @macros); + + for my $f (@files_h, @files_cpp, @files_inl) { + my $cat = 'ACE'; + if ($f =~ /\/ace\/(\w+)/) { + next if $1 eq 'Log_Msg' || $` =~ /\/protocols$/; + $cat = 'ACELIB'; + } + elsif ($f =~ /\/tao\//) { + $cat = 'TAOLIB'; + } + elsif ($f =~ /\/orbsvcs\// && $f !~ /tests|examples/i) { + $cat = 'ORBSVCS'; + } + elsif ($f =~ /CIAO\// || $f =~ /DAnCE\//) { + next; + } + elsif ($f =~ /\/tests\/Log_Msg_Test\.cpp/) { + next; + } + + if (open (IN, $f)) { + print "Looking at file $f for category $cat\n" if $opt_d; + my $disable = 0; + while (<IN>) { + if (/FUZZ: disable check_for_ace_log_categories/) { + $disable = 1; + next; + } + elsif (/FUZZ: enable check_for_ace_log_categories/) { + $disable = 0; + next; + } + elsif ($disable == 0 + && /\b(ACE|ACELIB|TAOLIB|ORBSVCS)_($macros)\b/g + && $1 ne $cat) { + print_error ("$f:$.: found log macro $1_$2, " + . "expecting ${cat}_$2"); + } + } + close IN; + } + else { + print STDERR "Error: Could not open $f\n"; + } + } +} + + ############################################################################## use vars qw/$opt_c $opt_d $opt_h $opt_l $opt_t $opt_s $opt_m/; @@ -2318,7 +2373,8 @@ if (!getopts ('cdhl:t:s:mv') || $opt_h) { print " -m only check locally modified files (uses svn)\n"; print "======================================================\n"; print "list of the tests that could be run or suppressed:\n"; - print "\t check_for_noncvs_files + print <<EOT; + check_for_noncvs_files check_for_generated_headers check_for_synch_include check_for_streams_include @@ -2355,7 +2411,12 @@ if (!getopts ('cdhl:t:s:mv') || $opt_h) { check_for_TAO_Local_RefCounted_Object check_for_ORB_init check_for_trailing_whitespace - check_for_include_OS_h\n"; + check_for_include_OS_h + check_for_numeric_log + check_for_ORB_init + check_for_old_documentation_style + check_for_ace_log_categories +EOT exit (1); } @@ -2439,6 +2500,7 @@ check_for_include_OS_h () if ($opt_l >= 1); check_for_numeric_log () if ($opt_l >= 3); check_for_ORB_init () if ($opt_l >= 1); check_for_old_documentation_style () if ($opt_l >= 6); +check_for_ace_log_categories () if ($opt_l >= 5); print "\nfuzz.pl - $errors error(s), $warnings warning(s)\n"; diff --git a/ACE/contrib/minizip/unzip.c b/ACE/contrib/minizip/unzip.c index 14f5621f824..85fd149f9b3 100644 --- a/ACE/contrib/minizip/unzip.c +++ b/ACE/contrib/minizip/unzip.c @@ -1126,7 +1126,7 @@ extern MINIZIP_EXPORT int unzOpenCurrentFile3 (unzFile file,int* method,int* lev if (password != 0) { int i; - s->pcrc_32_tab = get_crc_table(); + s->pcrc_32_tab = (unsigned long*)get_crc_table(); init_keys(password,s->keys,s->pcrc_32_tab); if (ZSEEK(s->z_filefunc, s->filestream, s->pfile_in_zip_read->pos_in_zipfile + diff --git a/ACE/contrib/minizip/zip.c b/ACE/contrib/minizip/zip.c index a57fcfc61ef..3572e523b13 100644 --- a/ACE/contrib/minizip/zip.c +++ b/ACE/contrib/minizip/zip.c @@ -846,7 +846,7 @@ extern MINIZIP_EXPORT int zipOpenNewFileInZip3 (zipFile file,const char* filenam unsigned char bufHead[RAND_HEAD_LEN]; unsigned int sizeHead; zi->ci.encrypt = 1; - zi->ci.pcrc_32_tab = get_crc_table(); + zi->ci.pcrc_32_tab = (unsigned long*)get_crc_table(); /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/ sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting); diff --git a/ACE/etc/ace.doxygen b/ACE/etc/ace.doxygen index 246a8d9dc20..5ec9984d34d 100644 --- a/ACE/etc/ace.doxygen +++ b/ACE/etc/ace.doxygen @@ -1798,7 +1798,7 @@ DOT_GRAPH_MAX_NODES = 50 # code bases. Also note that the size of a graph can be further restricted by # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. -MAX_DOT_GRAPH_DEPTH = 3 +MAX_DOT_GRAPH_DEPTH = 5 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent # background. This is disabled by default, because dot on Windows does not diff --git a/ACE/examples/C++NPv2/TPC_Logging_Server.cpp b/ACE/examples/C++NPv2/TPC_Logging_Server.cpp index b6ce76e1d40..9f4a607f7f3 100644 --- a/ACE/examples/C++NPv2/TPC_Logging_Server.cpp +++ b/ACE/examples/C++NPv2/TPC_Logging_Server.cpp @@ -98,7 +98,6 @@ int TPC_Logging_Acceptor::accept_svc_handler return 0; } - typedef Reactor_Logging_Server_Adapter<TPC_Logging_Acceptor> TPC_Logging_Server; diff --git a/ACE/examples/Connection/misc/Connection_Handler.cpp b/ACE/examples/Connection/misc/Connection_Handler.cpp index efe96f514c0..0d540b08775 100644 --- a/ACE/examples/Connection/misc/Connection_Handler.cpp +++ b/ACE/examples/Connection/misc/Connection_Handler.cpp @@ -5,17 +5,16 @@ * * $Id$ * - * This test illustrates how to use the Acceptor pattern to - * create multiple threads, each running its own Reactor. You - * can connect to this via telnet and keep typing until you enter - * '^D'. + * This test illustrates how to use the Acceptor role of the + * Acceptor-Connector pattern to create multiple threads, each + * running its own Reactor. You can connect to this via telnet and + * keep typing until you enter '^D'. * * * @author Doug Schmidt */ //============================================================================= - #include "ace/Acceptor.h" #include "ace/SOCK_Acceptor.h" #include "ace/Service_Config.h" @@ -24,8 +23,6 @@ #include "Connection_Handler.h" - - int Connection_Handler::open (void *) { diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp index dc77a267b17..04c792092c5 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp @@ -20,8 +20,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_main.h" - - Options::Options (void) : host_ (ACE_DEFAULT_SERVER_HOST), port_ (ACE_DEFAULT_SERVER_PORT), @@ -409,7 +407,7 @@ run_client (void) else ACE_Thread_Manager::instance ()->wait (); #else - *(OPTIONS::instance ()->thr_func) (); + (void) *(OPTIONS::instance ()->thr_func) (); #endif /* ACE_HAS_THREADS */ return 0; } diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp index f05804781b0..2196e3e71df 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp @@ -19,8 +19,6 @@ #include "SSL-client.h" - - Options::Options (void) : host_ (ACE_DEFAULT_SERVER_HOST), port_ (ACE_DEFAULT_SERVER_PORT), @@ -400,7 +398,7 @@ run_client (void) else ACE_Thread_Manager::instance ()->wait (); #else - *(OPTIONS::instance ()->thr_func) (); + (void) *(OPTIONS::instance ()->thr_func) (); #endif /* ACE_HAS_THREADS */ return 0; } diff --git a/ACE/tests/Future_Test.cpp b/ACE/tests/Future_Test.cpp index 5a418583147..deabf651171 100644 --- a/ACE/tests/Future_Test.cpp +++ b/ACE/tests/Future_Test.cpp @@ -6,12 +6,11 @@ * $Id$ * * This example tests the ACE Future and illustrates an - * implementation of the Active Object pattern, which is described - * in the POSA2 book <www.cs.wustl.edu/~schmidt/POSA/> and in a - * paper at <www.cs.wustl.edu/~schmidt/PDF/Act-Obj.pdf>. The - * Active Object example here is very simple -- it determines if numbers - * are prime. - * + * implementation of the Active Object pattern, which is described in + * the POSA2 book <www.dre.vanderbilt.edu/~schmidt/POSA/> and in a + * paper at <www.dre.vanderbilt.edu/~schmidt/PDF/Act-Obj.pdf>. The + * Active Object example here is very simple -- it determines if + * numbers are prime. * * @author Andres Kruse <Andres.Kruse@cern.ch> * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> @@ -19,7 +18,6 @@ */ //============================================================================= - #include "test_config.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_sys_time.h" @@ -32,9 +30,6 @@ #include "ace/Auto_Ptr.h" #include "ace/Atomic_Op.h" - - - #if defined (ACE_HAS_THREADS) typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> ATOMIC_INT; diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp index 9601961af85..6048d6bd1e8 100644 --- a/ACE/tests/Log_Msg_Test.cpp +++ b/ACE/tests/Log_Msg_Test.cpp @@ -243,6 +243,8 @@ test_log_msg_features (const ACE_TCHAR *program) big[ACE_Log_Record::MAXLOGMSGLEN] = ACE_TEXT ('\0'); ACE_DEBUG ((LM_INFO, ACE_TEXT ("This is too big: %s\n"), big)); + ACE_HEX_DUMP((LM_INFO, (const char*)big, ACE_Log_Record::MAXLOGMSGLEN )); + // Exercise many different combinations of OSTREAM. double f = 3.1416 * counter++; @@ -349,6 +351,108 @@ test_log_msg_features (const ACE_TCHAR *program) ACE_TEXT ("This LM_DEBUG message should not print!\n"))); } +// For testing how many log records has been output +class Log_Count : public ACE_Log_Msg_Callback +{ + int count_; +public: + /// logging! + Log_Count () : count_(0) + { + } + + /// Logging callback + void log (ACE_Log_Record &) + { + ++count_; + } + + int count() const + { + return count_; + } +}; + +static int +test_acelib_category() +{ + int failed = 0; + + Log_Count counter; + + ACE_LOG_MSG->msg_callback (&counter); + + // Disable the LM_DEBUG and LM_INFO messages. + u_long priority_mask = + ACE_LOG_MSG->priority_mask (ACE_Log_Msg::PROCESS); + ACE_CLR_BITS (priority_mask, + LM_DEBUG | LM_INFO); + ACE_Log_Category::ace_lib().priority_mask (priority_mask); + + ACELIB_DEBUG ((LM_INFO, + ACE_TEXT ("This LM_INFO message should not print!\n"))); + ACELIB_DEBUG ((LM_DEBUG, + ACE_TEXT ("This LM_DEBUG message should not print!\n"))); + + if (counter.count() != 0) + { + ++failed; + } + + ACE_DEBUG ((LM_INFO, + ACE_TEXT ("This LM_INFO message should print!\n"))); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("This LM_DEBUG message should print!\n"))); + + if (counter.count() != 2) + { + ++failed; + } + + ACE_SET_BITS (priority_mask, + LM_INFO); + ACE_Log_Category::ace_lib().priority_mask (priority_mask); + + ACELIB_DEBUG ((LM_INFO, + ACE_TEXT ("This LM_INFO message should print!\n"))); + + if (counter.count() != 3) + { + ++failed; + } + + ACELIB_DEBUG ((LM_DEBUG, + ACE_TEXT ("This LM_DEBUG message should not print!\n"))); + + if (counter.count() != 3) + { + ++failed; + } + + ACE_CLR_BITS (priority_mask, LM_INFO); + ACE_Log_Category::ace_lib().priority_mask (priority_mask); + + ACELIB_DEBUG ((LM_INFO, + ACE_TEXT ("This LM_INFO message should not print!\n"))); + ACELIB_DEBUG ((LM_DEBUG, + ACE_TEXT ("This LM_DEBUG message should not print!\n"))); + + if (counter.count() != 3) + { + ++failed; + } + + + if (failed == 0) { + ACE_DEBUG((LM_DEBUG, "All ace lib category log passed\n")); + } + else { + ACE_ERROR((LM_ERROR, "Some ace lib category log failed\n")); + } + ACE_LOG_MSG->msg_callback (0); + return failed; +} + static int test_ostream (void) { @@ -723,6 +827,8 @@ run_main (int argc, ACE_TCHAR *argv[]) status = 1; } + status += test_acelib_category(); + ACE_END_TEST; return status; } diff --git a/ACE/tests/TP_Reactor_Test.cpp b/ACE/tests/TP_Reactor_Test.cpp index 1dcb7f5612e..0bbcce24219 100644 --- a/ACE/tests/TP_Reactor_Test.cpp +++ b/ACE/tests/TP_Reactor_Test.cpp @@ -65,8 +65,6 @@ #include "ace/Synch_Traits.h" #include "ace/Thread_Semaphore.h" - - // Some debug helper functions static int disable_signal (int sigmin, int sigmax); diff --git a/ACE/tests/Thread_Manager_Test.cpp b/ACE/tests/Thread_Manager_Test.cpp index 038add75f0a..68adabbc3d8 100644 --- a/ACE/tests/Thread_Manager_Test.cpp +++ b/ACE/tests/Thread_Manager_Test.cpp @@ -128,9 +128,13 @@ worker (int iterations) #else if (thr_mgr->testcancel (ACE_Thread::self ()) != 0) { + char thr_id[BUFSIZ]; + // Test out the ACE_OS::thr_id() method. + ssize_t len = ACE_OS::thr_id (thr_id, sizeof thr_id); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) has been cancelled ") + ACE_TEXT ("(%s) has been cancelled ") ACE_TEXT ("before iteration %d!\n"), + thr_id, i)); break; } |