From: Perl 5 Porters <perl5-porters@africa.nicoh.com>
Date: Mon, 30 Sep 1996 05:13:28 +0000 (-0400)
Subject: perl 5.003_06: hv.c
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=72940dca186befa0716f5b6a09c9bdd527de5c66;p=p5sagit%2Fp5-mst-13.2.git

perl 5.003_06: hv.c

Date: Fri, 20 Sep 1996 15:38:57 -0400
From: Gurusamy Sarathy <gsar@engin.umich.edu>
Subject: Re: "Attempt to free non-existent shared string"? (with patch)

I found a subtle problem with the lazydelete mechanism (which is used
to postpone the delete of a entry that may be getting iterated over).
I was using the HeKLEN slot to hold the hint, but the real HeKLEN is
needed later to call unsharepvn().  This means that only magical
hash entries can use the HeKLEN slot to hold flags.

Here's a tested patch against 5.00305 that fixes the problem.
The patch simply moves the LAZYDEL hint to become a SV-level private
flag.

Date: Mon, 30 Sep 1996 01:13:28 -0400
From: Spider Boardman <spider@Orb.Nashua.NH.US>
Subject: Re: pre extending hash? - need speed

The patch below (which is relative to perl5.001l) implements
"keys %hash = 50_000;" (or other integer-evaluable sizes) for
pre-sizing hashes.  I've only moved the patch forward from
when I first did it.  I'm sure the code in hv_ksplit could be
improved.
---

diff --git a/hv.c b/hv.c
index 6dfa9b1..9547f2c 100644
--- a/hv.c
+++ b/hv.c
@@ -394,7 +394,7 @@ I32 flags;
 	else
 	    sv = sv_mortalcopy(HeVAL(entry));
 	if (entry == xhv->xhv_eiter)
-	    HeKLEN(entry) = HEf_LAZYDEL;
+	    HvLAZYDEL_on(hv);
 	else
 	    he_free(entry, HvSHAREKEYS(hv));
 	--xhv->xhv_keys;
@@ -456,7 +456,7 @@ U32 hash;
 	else
 	    sv = sv_mortalcopy(HeVAL(entry));
 	if (entry == xhv->xhv_eiter)
-	    HeKLEN(entry) = HEf_LAZYDEL;
+	    HvLAZYDEL_on(hv);
 	else
 	    he_free(entry, HvSHAREKEYS(hv));
 	--xhv->xhv_keys;
@@ -619,6 +619,84 @@ HV *hv;
     }
 }
 
+void
+hv_ksplit(hv, newmax)
+HV *hv;
+IV newmax;
+{
+    register XPVHV* xhv = (XPVHV*)SvANY(hv);
+    I32 oldsize = (I32) xhv->xhv_max + 1; /* sic(k) */
+    register I32 newsize;
+    register I32 i;
+    register I32 j;
+    register HE **a;
+    register HE *entry;
+    register HE **oentry;
+
+    newsize = (I32) newmax;			/* possible truncation here */
+    if (newsize != newmax || newmax <= oldsize)
+	return;
+    while ((newsize & (1 + ~newsize)) != newsize) {
+	newsize &= ~(newsize & (1 + ~newsize));	/* get proper power of 2 */
+    }
+    if (newsize < newmax)
+	newsize *= 2;
+    if (newsize < newmax)
+	return;					/* overflow detection */
+
+    a = (HE**)xhv->xhv_array;
+    if (a) {
+	nomemok = TRUE;
+#ifdef STRANGE_MALLOC
+	Renew(a, newsize, HE*);
+#else
+	i = newsize * sizeof(HE*);
+	j = MALLOC_OVERHEAD;
+	while (j - MALLOC_OVERHEAD < i)
+	    j += j;
+	j -= MALLOC_OVERHEAD;
+	j /= sizeof(HE*);
+	assert(j >= newsize);
+	New(2, a, j, HE*);
+	Copy(xhv->xhv_array, a, oldsize, HE*);
+	if (oldsize >= 64 && !nice_chunk) {
+	    nice_chunk = (char*)xhv->xhv_array;
+	    nice_chunk_size = oldsize * sizeof(HE*) * 2 - MALLOC_OVERHEAD;
+	}
+	else
+	    Safefree(xhv->xhv_array);
+#endif
+	nomemok = FALSE;
+	Zero(&a[oldsize], newsize-oldsize, HE*); /* zero 2nd half*/
+    }
+    else {
+	Newz(0, a, newsize, HE*);
+    }
+    xhv->xhv_max = --newsize;
+    xhv->xhv_array = (char*)a;
+    if (!xhv->xhv_fill)				/* skip rest if no entries */
+	return;
+
+    for (i=0; i<oldsize; i++,a++) {
+	if (!*a)				/* non-existent */
+	    continue;
+	for (oentry = a, entry = *a; entry; entry = *oentry) {
+	    if ((j = (HeHASH(entry) & newsize)) != i) {
+		j -= i;
+		*oentry = HeNEXT(entry);
+		if (!(HeNEXT(entry) = a[j]))
+		    xhv->xhv_fill++;
+		a[j] = entry;
+		continue;
+	    }
+	    else
+		oentry = &HeNEXT(entry);
+	}
+	if (!*a)				/* everything moved */
+	    xhv->xhv_fill--;
+    }
+}
+
 HV *
 newHV()
 {
@@ -760,8 +838,10 @@ HV *hv;
 #ifdef DYNAMIC_ENV_FETCH  /* set up %ENV for iteration */
     if (HvNAME(hv) && strEQ(HvNAME(hv),ENV_HV_NAME)) prime_env_iter();
 #endif
-    if (entry && HeKLEN(entry) == HEf_LAZYDEL)	/* was deleted earlier? */
+    if (entry && HvLAZYDEL(hv)) {	/* was deleted earlier? */
+	HvLAZYDEL_off(hv);
 	he_free(entry, HvSHAREKEYS(hv));
+    }
     xhv->xhv_riter = -1;
     xhv->xhv_eiter = Null(HE*);
     return xhv->xhv_fill;
@@ -818,8 +898,10 @@ HV *hv;
 	entry = ((HE**)xhv->xhv_array)[xhv->xhv_riter];
     }
 
-    if (oldentry && HeKLEN(oldentry) == HEf_LAZYDEL)	/* was deleted earlier? */
+    if (oldentry && HvLAZYDEL(hv)) {		/* was deleted earlier? */
+	HvLAZYDEL_off(hv);
 	he_free(oldentry, HvSHAREKEYS(hv));
+    }
 
     xhv->xhv_eiter = entry;
     return entry;