You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@xerces.apache.org by ro...@us.ibm.com on 2000/01/05 00:39:34 UTC
Re: [PATCH] Make DOMString data be non-opaque in order to support
debugging, Take 2
It should use XML_DEBUG, not _DEBUG, which is VC++ specific. Each compiler
gets to look at its own debug on/off setting and is supposed to turn on
XML_DEBUG if the compiler specific one is on. This lets us have debug only
code that is not dependent upon any particular compiler scheme. But,
otherwise, yes this would be the safest way to do this.
----------------------------------------
Dean Roddey
Software Weenie
IBM Center for Java Technology - Silicon Valley
roddey@us.ibm.com
Robert_Weir@lotus.com on 01/04/2000 01:28:47 PM
Please respond to xerces-dev@xml.apache.org
To: xerces-dev@xml.apache.org
cc:
Subject: [PATCH] Make DOMString data be non-opaque in order to support
debugging, Take 2
Here it is, conditionalized, so release builds stay as they were, but debug
builds have can see the DOMString innards. It uses a new file,
DOMStringImpl.hpp that is included in DOMString.hpp only in debug builds,
and in DOMString.cpp for release builds.
We might also want to also put the magic settings for autoexp.dat in a
readme file someplace.
-Rob
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/DOMString.cpp,v
retrieving revision 1.5
diff -r1.5 DOMString.cpp
93a94,97
> #ifndef _DEBUG
> #include "DOMStringImpl.hpp"
> #endif
>
97d100
<
105,115d107
< class DOMStringData
< {
< public:
< int fBufferLength;
< int fRefCount;
< XMLCh fData[1];
<
< static DOMStringData *allocateBuffer(int length);
< inline void addRef();
< inline void removeRef();
< };
159,178d150
< class DOMStringHandle
< {
< public:
< int fLength;
< int fRefCount;
< DOMStringData *fDSData;
<
< void *operator new( size_t sizeToAlloc);
< void operator delete( void *pvMem );
< private:
< static void *freeListPtr;
< public:
< static DOMStringHandle *createNewStringHandle(int bufLength);
< DOMStringHandle *cloneStringHandle();
< inline void addRef();
< inline void removeRef();
< ~DOMStringHandle() {};
< private:
< inline DOMStringHandle() {};
< };
Index: src/dom/DOMString.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/DOMString.hpp,v
retrieving revision 1.3
diff -r1.3 DOMString.hpp
83a84,86
> #ifdef _DEBUG
> #include "DOMStringImpl.hpp"
> #else
84a88,89
> #endif
>
===================================================================
RCS file:
/home/cvs/xml-xerces/c/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp,v
retrieving revision 1.4
diff -r1.4 XercesLib.dsp
956a957,960
> SOURCE=..\..\..\..\..\src\dom\DOMStringImpl.hpp
> # End Source File
> # Begin Source File
>
And add this new file, dom\DOMStringImpl.hpp
#ifndef DOMStringImpl_HEADER_GUARD_
#define DOMStringImpl_HEADER_GUARD_
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact apache\@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
/**
* $Log: $
*
*/
//
// This file is part of the internal implementation of the C++ XML DOM.
// It should NOT be included or used directly by application programs.
//
#include <util/XML4CDefs.hpp>
class DOMStringData
{
public:
int fBufferLength;
int fRefCount;
XMLCh fData[1];
static DOMStringData *allocateBuffer(int length);
inline void addRef();
inline void removeRef();
};
class DOMStringHandle
{
public:
int fLength;
int fRefCount;
DOMStringData *fDSData;
void *operator new( size_t sizeToAlloc);
void operator delete( void *pvMem );
private:
static void *freeListPtr;
public:
static DOMStringHandle *createNewStringHandle(int bufLength);
DOMStringHandle *cloneStringHandle();
inline void addRef();
inline void removeRef();
~DOMStringHandle() {};
private:
inline DOMStringHandle() {};
};
#endif