axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From whitl...@apache.org
Subject cvs commit: ws-axis/c/tools/org/apache/axis/tools/trace tracetool.conf
Date Mon, 17 Jan 2005 15:10:57 GMT
whitlock    2005/01/17 07:10:57

  Modified:    c/build  buildXMLParser.xml
               c/src/engine XMLParserFactory.cpp
               c/src/transport/axis3/HTTPChannel Makefile.am
               c/src/transport/axis3/HTTPSSLChannel Makefile.am
               c/src/transport/axis3 Makefile.am
               c/src/xml Makefile.am
               c/src/xml/xerces Makefile.am ParserLoader.cpp
               c/tools/org/apache/axis/tools/trace tracetool.conf
  Log:
  Add in entry/exit trace to the XML parser library. Also define AXISTRACE_LIBRARY in the
Axis3Transport Makefile.am's.
  
  Revision  Changes    Path
  1.4       +10 -0     ws-axis/c/build/buildXMLParser.xml
  
  Index: buildXMLParser.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build/buildXMLParser.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- buildXMLParser.xml	10 Jan 2005 21:00:31 -0000	1.3
  +++ buildXMLParser.xml	17 Jan 2005 15:10:56 -0000	1.4
  @@ -27,6 +27,11 @@
   						</defineset>
   					</compiler>
                                 <compiler refid="OS400icc"/>
  +			            <defineset>
  +			                  <define name="ENABLE_AXISTRACE" if="trace"/>
  +			                  <define name="AXISTRACE_LIBRARY"/>
  +			            </defineset>
  +
   					<!-- Additional include directory for XML Parser -->
   					<includepath path="${dir.xmlParser}/include"/>
   					<includepath path="${dir.xmlParser}/lib"/>
  @@ -55,6 +60,11 @@
   				 exceptions="true" multithreaded="true">
   				 	<!-- Compilers -->
   					<compiler refid="AIXxlc"/>
  +			            <defineset>
  +			                  <define name="ENABLE_AXISTRACE" if="trace"/>
  +			                  <define name="AXISTRACE_LIBRARY"/>
  +			            </defineset>
  +
   					<!-- Additional include directory for XML Parser -->
   					<includepath path="${dir.xmlParser}/include"/>
   					<includepath path="${dir.xmlParser}/lib"/>
  
  
  
  1.21      +14 -1     ws-axis/c/src/engine/XMLParserFactory.cpp
  
  Index: XMLParserFactory.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/XMLParserFactory.cpp,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- XMLParserFactory.cpp	19 Nov 2004 16:22:07 -0000	1.20
  +++ XMLParserFactory.cpp	17 Jan 2005 15:10:56 -0000	1.21
  @@ -64,7 +64,20 @@
               char *s = new char[strlen(m_pcLibraryPath)+1];
               strcpy(s,m_pcLibraryPath);
               throw AxisEngineException(SERVER_ENGINE_LOADING_PARSER_FAILED, s);
  -        }
  +        } 
  +	  else
  +	  {
  +#ifdef ENABLE_AXISTRACE
  +            // Load function to do lib level inits
  +            void (*initializeLibrary) (AxisTraceEntrypoints&);
  +            initializeLibrary = (void (*)(AxisTraceEntrypoints&))PLATFORM_GETPROCADDR(m_LibHandler,
"initializeLibrary");
  +
  +            AxisTraceEntrypoints ep;
  +            AxisTrace::getTraceEntrypoints(ep);
  +            if (initializeLibrary)
  +                 (*initializeLibrary)(ep);
  +#endif
  +	  }
   	}
   	else
   	{
  
  
  
  1.2       +1 -1      ws-axis/c/src/transport/axis3/HTTPChannel/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/HTTPChannel/Makefile.am,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.am	12 Jan 2005 11:57:22 -0000	1.1
  +++ Makefile.am	17 Jan 2005 15:10:56 -0000	1.2
  @@ -1,6 +1,6 @@
   lib_LTLIBRARIES = libaxis3_transport_channel.la
   SUBDIRS = 
  -AM_CPPFLAGS = $(CPPFLAGS)
  +AM_CPPFLAGS = $(CPPFLAGS) -DAXISTRACE_LIBRARY
   libaxis3_transport_channel_la_SOURCES = HTTPChannel.cpp \
   				        HTTPChannelInstantiator.cpp
   libaxis3_transport_channel_la_LIBADD = -lstdc++
  
  
  
  1.3       +1 -1      ws-axis/c/src/transport/axis3/HTTPSSLChannel/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/HTTPSSLChannel/Makefile.am,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.am	17 Jan 2005 11:40:47 -0000	1.2
  +++ Makefile.am	17 Jan 2005 15:10:56 -0000	1.3
  @@ -1,6 +1,6 @@
   lib_LTLIBRARIES = libaxis3_transport_ssl_channel.la
   SUBDIRS = 
  -AM_CPPFLAGS = $(CPPFLAGS)
  +AM_CPPFLAGS = $(CPPFLAGS) -DAXISTRACE_LIBRARY
   libaxis3_transport_ssl_channel_la_SOURCES = HTTPSSLChannel.cpp \
   				        HTTPSSLChannelInstantiator.cpp
   libaxis3_transport_ssl_channel_la_LIBADD = @SSLLIB@ -lstdc++
  
  
  
  1.3       +1 -1      ws-axis/c/src/transport/axis3/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/Makefile.am,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.am	13 Jan 2005 12:29:37 -0000	1.2
  +++ Makefile.am	17 Jan 2005 15:10:56 -0000	1.3
  @@ -1,6 +1,6 @@
   lib_LTLIBRARIES = libaxis3_transport.la
   SUBDIRS = HTTPChannel HTTPSSLChannel
  -AM_CPPFLAGS = $(CPPFLAGS)
  +AM_CPPFLAGS = $(CPPFLAGS) -DAXISTRACE_LIBRARY
   libaxis3_transport_la_SOURCES = ChannelFactory.cpp \
   				 HTTPTransport.cpp \
   				 HTTPTransportException.cpp \
  
  
  
  1.17      +1 -1      ws-axis/c/src/xml/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/Makefile.am,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Makefile.am	7 Dec 2004 10:49:56 -0000	1.16
  +++ Makefile.am	17 Jan 2005 15:10:56 -0000	1.17
  @@ -1,7 +1,7 @@
   noinst_LTLIBRARIES = libxml.la
   SUBDIRS = @XERCESCBUILD@ @TSPPBUILD@ 
   
  -AM_CPPFLAGS = $(CPPFLAGS)
  +AM_CPPFLAGS = $(CPPFLAGS) -DAXISTRACE_LIBRARY
   libxml_la_SOURCES = QName.cpp Element.cpp Event.cpp StartElement.cpp SimpleAttribute.cpp
   
   INCLUDES = -I../../include
  
  
  
  1.8       +1 -1      ws-axis/c/src/xml/xerces/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/xerces/Makefile.am,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.am	27 Jul 2004 03:31:17 -0000	1.7
  +++ Makefile.am	17 Jan 2005 15:10:56 -0000	1.8
  @@ -1,5 +1,5 @@
   lib_LTLIBRARIES = libaxis_xercesc.la
  -AM_CPPFLAGS = $(CPPFLAGS)
  +AM_CPPFLAGS = $(CPPFLAGS) -DAXISTRACE_LIBRARY
   libaxis_xercesc_la_SOURCES = SoapBinInputStream.cpp \
                              SoapInputSource.cpp \
                              XMLParserXerces.cpp \
  
  
  
  1.4       +18 -0     ws-axis/c/src/xml/xerces/ParserLoader.cpp
  
  Index: ParserLoader.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/xerces/ParserLoader.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ParserLoader.cpp	23 Sep 2004 15:12:58 -0000	1.3
  +++ ParserLoader.cpp	17 Jan 2005 15:10:56 -0000	1.4
  @@ -19,6 +19,9 @@
    *
    */
   
  +#define AXISTRACE_LIBRARY_MAINENTRYPOINT
  +#include "../../common/AxisTrace.h"
  +
   #include "XMLParserXerces.h"
   #include <xercesc/util/PlatformUtils.hpp>
   
  @@ -49,4 +52,19 @@
   	}
   	return AXIS_FAIL;
   }
  +
  +STORAGE_CLASS_INFO void initializeLibrary (AxisTraceEntrypoints& ep)
  +{
  +      // Do init actions
  +#ifdef ENABLE_AXISTRACE
  +      AxisTrace::setTraceEntrypoints(ep);
  +#endif
  +}
  +
  +//  uninitializeLibrary() Is a C interface.
  +STORAGE_CLASS_INFO void uninitializeLibrary (void)
  +{
  +      // Do uninit actions
  +}
  +
   }
  
  
  
  1.8       +1 -0      ws-axis/c/tools/org/apache/axis/tools/trace/tracetool.conf
  
  Index: tracetool.conf
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tools/org/apache/axis/tools/trace/tracetool.conf,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- tracetool.conf	14 Jan 2005 17:29:52 -0000	1.7
  +++ tracetool.conf	17 Jan 2005 15:10:57 -0000	1.8
  @@ -50,6 +50,7 @@
   excludefile=HTTPTransportInstantiator.cpp
   excludefile=HTTPChannelInstantiator.cpp
   excludefile=HTTPSSLChannelInstantiator.cpp
  +excludefile=ParserLoader.cpp
   #
   define=AXIS_CPP_NAMESPACE_START
   define=AXIS_CPP_NAMESPACE_END
  
  
  

Mime
View raw message