pike.git/ src/ stralloc.c

2008-05-02

2008-05-02 00:40:21 by Martin Stjernholm <mast@lysator.liu.se>

• 3c08607ab3bef64f89de1df337990b9494db8f24 (31 lines) (+25/-6) ^{[ Show | Annotate ]}
  Branch: 7.9

Fixed bug that caused overallocation by a few bytes per nonshort
string.

Rev: src/stralloc.c:1.215

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: stralloc.c,v 1.214 2008/05/01 21:44:33 mast Exp $ + || $Id: stralloc.c,v 1.215 2008/05/02 00:40:21 mast Exp $   */      #include "global.h"
543:      /* Allocation of strings */    + /* Without the str at the end, to get the size of the header. */ + struct pike_string_hdr { +  PIKE_STRING_CONTENTS; + }; +    /* Allocate some fixed string sizes with BLOCK_ALLOC. */      /* Use the BLOCK_ALLOC() stuff for short strings */
615:    if (len <= SHORT_STRING_THRESHOLD) {    t=(struct pike_string *)alloc_short_pike_string0();    } else { -  t=(struct pike_string *)xalloc(len + sizeof(struct pike_string)); +  t=(struct pike_string *)xalloc(len + 1 + sizeof(struct pike_string_hdr));    t->flags = STRING_NOT_HASHED | STRING_NOT_SHARED;    }    t->refs = 1;
731:    t = (struct pike_string *)alloc_short_pike_string2();    }    } else { -  t=(struct pike_string *)xalloc((len<<shift) + sizeof(struct pike_string)); +  t=(struct pike_string *)xalloc(((len + 1)<<shift) + +  sizeof(struct pike_string_hdr));    t->flags = STRING_NOT_HASHED|STRING_NOT_SHARED;    }    t->refs = 1;
1101:    }    UNLOCK_BUCKET(e);    } -  overhead_bytes=(sizeof(struct pike_string)-1)*num_distinct_strings; +  overhead_bytes=sizeof(struct pike_string_hdr)*num_distinct_strings;    my_strcat("\nShared string hash table:\n");    my_strcat("-------------------------\t Strings Bytes\n");   
1574:    }    } else if (size > SHORT_STRING_THRESHOLD) {    r=(struct pike_string *)realloc((char *)a, -  sizeof(struct pike_string)+ +  sizeof(struct pike_string_hdr)+    ((size+1)<<a->size_shift));    }   
2075:   #endif /* DO_PIKE_CLEANUP */   }    + static INLINE size_t memory_in_string (struct pike_string *s) + { +  if (s->len <= SHORT_STRING_THRESHOLD) +  switch (s->size_shift) { +  case 0: return sizeof (struct short_pike_string0); +  case 1: return sizeof (struct short_pike_string1); +  default: return sizeof (struct short_pike_string2); +  } +  else +  return sizeof (struct pike_string_hdr) + ((s->len + 1) << s->size_shift); + } +    void count_memory_in_strings(size_t *num, size_t *size)   {    unsigned INT32 e;
2092:    for(p=base_table[e];p;p=p->next)    {    num_++; -  size_+=sizeof(struct pike_string)+(p->len<<p->size_shift); +  size_ += memory_in_string (p);    }    UNLOCK_BUCKET(e);    }