You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2001/11/11 19:14:43 UTC

cvs commit: embperl/test/html nooutput.htm

richter     01/11/11 10:14:43

  Modified:    .        Tag: Embperl2c MANIFEST epdom.c test.pl
  Added:       test/cmp Tag: Embperl2c nooutput.htm
               test/html Tag: Embperl2c nooutput.htm
  Log:
  Embperl - free addtional node data
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.50.4.33 +2 -0      embperl/MANIFEST
  
  Index: MANIFEST
  ===================================================================
  RCS file: /home/cvs/embperl/MANIFEST,v
  retrieving revision 1.50.4.32
  retrieving revision 1.50.4.33
  diff -u -r1.50.4.32 -r1.50.4.33
  --- MANIFEST	2001/11/02 11:34:25	1.50.4.32
  +++ MANIFEST	2001/11/11 18:14:42	1.50.4.33
  @@ -169,6 +169,7 @@
   epapinit.c
   test.pl
   test/html/ascii
  +test/html/nooutput.htm
   test/html/binary.htm
   test/html/pure.htm
   test/html/plain.htm
  @@ -305,6 +306,7 @@
   test/html/inctext.htm
   test/html/SSIEP/ssiep.htm
   test/cmp/ascii
  +test/cmp/nooutput.htm
   test/cmp/binary.htm
   test/cmp/pure.htm
   test/cmp/plain.htm
  
  
  
  1.4.2.67  +51 -23    embperl/Attic/epdom.c
  
  Index: epdom.c
  ===================================================================
  RCS file: /home/cvs/embperl/Attic/epdom.c,v
  retrieving revision 1.4.2.66
  retrieving revision 1.4.2.67
  diff -u -r1.4.2.66 -r1.4.2.67
  --- epdom.c	2001/11/07 21:11:25	1.4.2.66
  +++ epdom.c	2001/11/11 18:14:42	1.4.2.67
  @@ -9,7 +9,7 @@
   #   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   #   WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   #
  -#   $Id: epdom.c,v 1.4.2.66 2001/11/07 21:11:25 richter Exp $
  +#   $Id: epdom.c,v 1.4.2.67 2001/11/11 18:14:42 richter Exp $
   #
   ###################################################################################*/
   
  @@ -27,6 +27,8 @@
   
   static int nMemUsage = 0 ;
   static int numNodes  = 0 ;
  +static int numLevelLookup  = 0 ;
  +static int numLevelLookupItem  = 0 ;
   static int numAttr   = 0 ;
   static int numStr    = 0 ;
   static int numPads   = 0 ;
  @@ -73,7 +75,7 @@
   /* ------------------------------------------------------------------------ */
   
   
  -tNodeData * dom_malloc (size_t  nSize)
  +tNodeData * dom_malloc (size_t  nSize, int * pCounter)
       {
       int	    nFree = (nSize+7)>>3 ;
       void *  pNew ;
  @@ -84,6 +86,7 @@
       if (pNew = MemFree[nFree])
   	{ /* --- take one entry off the free list --- */
   	MemFree[nFree] = *((tUInt8 * *)pNew) ;
  +	(*pCounter)++ ;
   	return pNew ;
   	}
       
  @@ -92,6 +95,7 @@
   	{ /* --- take space at the end of the pad --- */
   	pNew = pMemLast ;
   	pMemLast += nSize ;
  +	(*pCounter)++ ;
   	return pNew ;
   	}
       
  @@ -104,11 +108,12 @@
       pMemEnd = pMemLast + sizeof (tPad) ;
       pNew = pMemLast ;
       pMemLast += nSize ;
  +    (*pCounter)++ ;
       return pNew ;
       }
   
   
  -void dom_free (tNodeData * pNode)
  +void dom_free (tNodeData * pNode, int * pCounter)
       {
       int	    nSize = sizeof (tNodeData) + pNode -> numAttr * sizeof (tAttrData) ;
       int	    nFree = (nSize+15)>>3 ;
  @@ -121,11 +126,12 @@
       pFree = MemFree[nFree] ;
       MemFree[nFree] = (tUInt8 *)pNode ;
       *((tUInt8 * *)pNode) = pFree ;
  +    (*pCounter)-- ;
       return ;
       }
   
   
  -void dom_free_size (void * pNode, int nSize)
  +void dom_free_size (void * pNode, int nSize, int * pCounter)
       {
       int	    nFree = (nSize+15)>>3 ;
       void *  pFree ;
  @@ -137,6 +143,7 @@
       pFree = MemFree[nFree] ;
       MemFree[nFree] = (tUInt8 *)pNode ;
       *((tUInt8 * *)pNode) = pFree ;
  +    (*pCounter)-- ;
       return ;
       }
   
  @@ -146,6 +153,7 @@
       {
       int	    nOldSize = sizeof (tNodeData) + pNode -> numAttr * sizeof (tAttrData) ;
       tNodeData * pNew ;
  +    int n ;
       
       if (((tUInt8 *)pNode) + nOldSize == pMemLast)
   	{ /* --- expand --- */
  @@ -156,9 +164,9 @@
   	    }
   	}
       
  -    pNew = dom_malloc (nSize) ;
  +    pNew = dom_malloc (nSize, &n) ;
       memcpy (pNew, pNode, nOldSize) ;
  -    dom_free (pNode) ;
  +    dom_free (pNode, &n) ;
       return pNew ;
       }
   
  @@ -824,7 +832,7 @@
   void DomStats (void)
   
       {
  -    lprintf (pCurrReq, "[%d]PERF: DOMSTAT: MemUsage = %d Bytes  numNodes = %d  numStr = %d  numReplace = %d  \n", pCurrReq -> nPid, nMemUsage, numNodes,  numStr, numReplace) ;
  +    lprintf (pCurrReq, "[%d]PERF: DOMSTAT: MemUsage = %d Bytes  numNodes = %d  numLevelLookup = %d  numLevelLookupItem = %d  numStr = %d  numReplace = %d  \n", pCurrReq -> nPid, nMemUsage, numNodes, numLevelLookup, numLevelLookupItem, numStr, numReplace) ;
       }
   
   /* ------------------------------------------------------------------------ */
  @@ -917,6 +925,12 @@
       int        numLookup  ;
       tIndex     xDomTree  = pDomTree -> xNdx ;
       tIndex     xNdx ;
  +    tRepeatLevelLookup * pLookupLevelNode  ;
  +    tRepeatLevelLookupItem * pLookupLevelNodeLevel  ;
  +    tRepeatLevelLookupItem * pItem  ;
  +    tRepeatLevelLookupItem * pNext  ;
  +    int n ;
  +
   
       if (pCurrReq -> bDebug & dbgDOM)
   	lprintf (pCurrReq, "[%d]Delete: DomTree = %d SVs=%d\n", pCurrReq -> nPid, pDomTree -> xNdx, sv_count) ; 
  @@ -960,8 +974,28 @@
   	    if (pNode -> nText)
   		NdxStringFree (pNode -> nText) ;
   	    
  -	    dom_free (pNode) ;
  -	    numNodes-- ;
  +	    dom_free (pNode, &numNodes) ;
  +
  +	    if (pLookupLevelNode = pLookup ->  pLookupLevel)
  +		{
  +		pLookupLevelNodeLevel = pLookupLevelNode -> items ;
  +		n = pLookupLevelNode -> numItems ;
  +		while (n-- > 0)
  +		    {
  +		    pNext = pLookupLevelNodeLevel -> pNext ;
  +		    while (pNext)
  +			{
  +			pItem = pNext ;
  +			pNext = pLookupLevelNodeLevel -> pNext ;
  +			dom_free_size (pItem, sizeof (tRepeatLevelLookupItem), &numLevelLookupItem) ;
  +			}
  +		    pLookupLevelNodeLevel++ ;
  +		    }
  +
  +		
  +		dom_free_size (pLookupLevelNode, sizeof (tRepeatLevelLookup), &numLevelLookup) ;
  +		}
  +
   	    }
   
   	pLookup-- ;
  @@ -1667,11 +1701,9 @@
       tNode       xNewNode ;
       tNodeData * pNew ;
   
  -    if ((pNew = dom_malloc (len)) == NULL)
  +    if ((pNew = dom_malloc (len, &numNodes)) == NULL)
   	return NULL ;
   
  -    numNodes++ ;
  -    
       memcpy (pNew, pNode, len) ;
       xNewNode		= ArrayAdd (&pDomTree -> pLookup, 1) ;
       pDomTree -> pLookup[xNewNode].pLookup	= pNew ;
  @@ -1825,11 +1857,9 @@
           len	    = sizeof (tNodeData) + pNode -> numAttr * sizeof (tAttrData) ; 
           xNdx    = pNode -> xNdx ;
   
  -        if ((pLookup[xNdx].pLookup = pNew = dom_malloc (len)) == NULL)
  +        if ((pLookup[xNdx].pLookup = pNew = dom_malloc (len, &numNodes)) == NULL)
   	    return NULL ;
   
  -        numNodes++ ;
  -    
           memcpy (pNew, pNode, len) ;
   
           pNew -> xDomTree    = pDomTree -> xNdx ;
  @@ -1862,7 +1892,7 @@
       if (!pLookupLevelNode)
           {
           if ((pLookupLevelNode = pLookup[pNode -> xNdx].pLookupLevel = 
  -		  (tRepeatLevelLookup *)dom_malloc (sizeof (tRepeatLevelLookup) + sizeof (tRepeatLevelLookupItem) * 7)) == NULL)
  +		  (tRepeatLevelLookup *)dom_malloc (sizeof (tRepeatLevelLookup) + sizeof (tRepeatLevelLookupItem) * 7, &numLevelLookup)) == NULL)
   	    return NULL ;
           pLookupLevelNode -> nMask = 7 ;
           pLookupLevelNode -> numItems = 8 ;
  @@ -1873,7 +1903,7 @@
       pLookupLevelNodeLevel= &pLookupLevelNode -> items[nRepeatLevel & pLookupLevelNode -> nMask] ;
       if (pLookupLevelNodeLevel -> pNode)
           {
  -        tRepeatLevelLookupItem * pNewItem = (tRepeatLevelLookupItem *)dom_malloc (sizeof (tRepeatLevelLookupItem)) ;
  +        tRepeatLevelLookupItem * pNewItem = (tRepeatLevelLookupItem *)dom_malloc (sizeof (tRepeatLevelLookupItem), &numLevelLookupItem) ;
           if (!pNewItem)
   	    return NULL ;
   
  @@ -1954,7 +1984,7 @@
       if (nSize == 0)
           nSize = sizeof (tNodeData) ;
   
  -    if ((pDomTree -> pLookup[xNdx].pLookup = pNewChild = dom_malloc (nSize)) == NULL)
  +    if ((pDomTree -> pLookup[xNdx].pLookup = pNewChild = dom_malloc (nSize, &numNodes)) == NULL)
   	return NULL ;
       pDomTree -> pLookup[xNdx].pLookupLevel = NULL ;
   
  @@ -1987,8 +2017,6 @@
               *pxChilds = xNdx ;
           }
   
  -    numNodes++ ;
  -    
       return pNewChild ;
       }
   
  @@ -2334,14 +2362,14 @@
   		if (pLast)
   		    {
   		    pLast -> pNext = pLookupLevelNodeLevel -> pNext ;
  -		    dom_free_size (pLookupLevelNodeLevel, sizeof (tRepeatLevelLookupItem)) ;
  +		    dom_free_size (pLookupLevelNodeLevel, sizeof (tRepeatLevelLookupItem), &numLevelLookupItem) ;
   		    }
   		else if (pLookupLevelNodeLevel -> pNext)
   		    {
   		    pLast = pLookupLevelNodeLevel -> pNext ;
   		    pLookupLevelNodeLevel -> pNode = pLast -> pNode ;
   		    pLookupLevelNodeLevel -> pNext = pLast -> pNext ;
  -		    dom_free_size (pLast, sizeof (tRepeatLevelLookupItem)) ;
  +		    dom_free_size (pLast, sizeof (tRepeatLevelLookupItem), &numLevelLookupItem) ;
   		    }
   		else
   		    {
  @@ -2351,7 +2379,7 @@
   	    }    
   	}
   
  -    dom_free (pChild) ;
  +    dom_free (pChild, &numNodes) ;
       numNodes-- ;
   
       return NULL ;
  
  
  
  1.70.4.90 +4 -1      embperl/test.pl
  
  Index: test.pl
  ===================================================================
  RCS file: /home/cvs/embperl/test.pl,v
  retrieving revision 1.70.4.89
  retrieving revision 1.70.4.90
  diff -u -r1.70.4.89 -r1.70.4.90
  --- test.pl	2001/11/08 16:42:24	1.70.4.89
  +++ test.pl	2001/11/11 18:14:42	1.70.4.90
  @@ -11,7 +11,7 @@
   #   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   #   WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   #
  -#   $Id: test.pl,v 1.70.4.89 2001/11/08 16:42:24 richter Exp $
  +#   $Id: test.pl,v 1.70.4.90 2001/11/11 18:14:42 richter Exp $
   #
   ###################################################################################
   
  @@ -45,6 +45,9 @@
       'pure.htm' => {
   #        'noloop'     => 1,
        },
  +    'nooutput.htm' => {
  +        repeat => 2,
  +        },
       'plain.htm' => {
           repeat => 3,
           },
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +11 -0     embperl/test/cmp/Attic/nooutput.htm
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +16 -0     embperl/test/html/Attic/nooutput.htm
  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org