Re: [gtk-list] Memchunks again
- From: Tim Janik <timj gtk org>
- To: gtk-devel-list redhat com
- Subject: Re: [gtk-list] Memchunks again
- Date: Thu, 19 Aug 1999 22:38:34 +0200 (CEST)
On 19 Aug 1999, Soeren Sandmann wrote:
> Tim Janik <timj@gtk.org> writes:
>
> > > I think it is a bug in GLib because GMemChunk->area_size in certain
> > > cases can be smaller than the atom_size. I think the following patch
> > > fixes it:
> > >
> > > RCS file: /cvs/gnome/glib/gmem.c,v
> > > [patch cut]
> >
> > hum, is it really neccessary to double the specified area size in that case?
> > what about simply enssuring that the area size is always a multitude of the
> > atom size:
> >
> > --- gmem.c Tue Aug 17 12:28:06 1999
> > +++ gmem-fixed.c Tue Aug 17 12:29:31 1999
> > @@ -468,9 +468,16 @@
> > {
> > GRealMemChunk *mem_chunk;
> > gulong rarea_size;
> > -
> > +
> > + g_return_val_if_fail (atom_size > 0, NULL);
> > + g_return_val_if_fail (atom_size < MAX_MEM_AREA / 4, NULL);
> > + g_return_val_if_fail (area_size >= atom_size, NULL);
> > +
> > ENTER_MEM_CHUNK_ROUTINE();
> >
> > + area_size = (area_size + atom_size - 1) / atom_size;
> > + area_size *= atom_size;
> > +
> > mem_chunk = g_new (struct _GRealMemChunk, 1);
> > mem_chunk->name = name;
> > mem_chunk->type = type;
>
> The old version did go to some length to always make the allocated
> area a power of two.
which is still the case because the computational code to achive this comes
*after* my patched portion.
> I think it did this because most mallocs are buddy allocators, which
> means that they will allocate some power of two anyway. Also, making
> the area a power of two is more likely to produce a multitude of the
> operating system's page size.
>
> If it doesn't have to be a power of two, the whole buisness of
> rarea_size is unnecessary. We could then do as you suggest and remove
> a lot of code.
take a closer look at my patch, the only thing it does is to assure that
the area_size is multitude of the atom_size upon function *entry*.
i did not remove any code at all.
> Another thing: Do we need to artificially limit the size of area_size,
> i.e., why do we need a MAX_MEM_AREA?
i agree on this part though, i kinda tend to think that this is a
pretty artifical limit. if the programmer specifies a size bigger
than MAX_MEM_AREA (65536 bytes), he probably knows what he's doing.
>
> What about this patch:
>
> Index: gmem.c
> ===================================================================
> RCS file: /cvs/gnome/glib/gmem.c,v
> retrieving revision 1.15
> diff -u -r1.15 gmem.c
> --- gmem.c 1999/07/24 18:50:55 1.15
> +++ gmem.c 1999/08/19 19:35:34
> @@ -71,7 +71,6 @@
> #endif
>
>
> -#define MAX_MEM_AREA 65536L
> #define MEM_AREA_SIZE 4L
>
> #if SIZEOF_VOID_P > SIZEOF_LONG
> @@ -469,9 +468,12 @@
> GRealMemChunk *mem_chunk;
> gulong rarea_size;
>
> + g_return_val_if_fail (atom_size > 0, NULL);
> + g_return_val_if_fail (area_size >= atom_size, NULL);
> +
> ENTER_MEM_CHUNK_ROUTINE();
>
> - mem_chunk = g_new (struct _GRealMemChunk, 1);
> + mem_chunk = g_new (GRealMemChunk, 1);
> mem_chunk->name = name;
> mem_chunk->type = type;
> mem_chunk->num_mem_areas = 0;
> @@ -490,27 +492,11 @@
> mem_chunk->atom_size += MEM_ALIGN - (mem_chunk->atom_size % MEM_ALIGN);
>
> mem_chunk->area_size = area_size;
> - if (mem_chunk->area_size > MAX_MEM_AREA)
> - mem_chunk->area_size = MAX_MEM_AREA;
> - while (mem_chunk->area_size < mem_chunk->atom_size)
> - mem_chunk->area_size *= 2;
>
> rarea_size = mem_chunk->area_size + sizeof (GMemArea) - MEM_AREA_SIZE;
> rarea_size = g_mem_chunk_compute_size (rarea_size);
> mem_chunk->area_size = rarea_size - (sizeof (GMemArea) - MEM_AREA_SIZE);
>
> - /*
> - mem_chunk->area_size -= (sizeof (GMemArea) - MEM_AREA_SIZE);
> - if (mem_chunk->area_size < mem_chunk->atom_size)
> - {
> - mem_chunk->area_size = (mem_chunk->area_size + sizeof (GMemArea) - MEM_AREA_SIZE) * 2;
> - mem_chunk->area_size -= (sizeof (GMemArea) - MEM_AREA_SIZE);
> - }
> -
> - if (mem_chunk->area_size % mem_chunk->atom_size)
> - mem_chunk->area_size += mem_chunk->atom_size - (mem_chunk->area_size % mem_chunk->atom_size);
> - */
> -
> g_mutex_lock (mem_chunks_lock);
> mem_chunk->next = mem_chunks;
> mem_chunk->prev = NULL;
> @@ -923,18 +909,12 @@
> g_mem_chunk_compute_size (gulong size)
> {
> gulong power_of_2;
> - gulong lower, upper;
>
> power_of_2 = 16;
> while (power_of_2 < size)
> power_of_2 <<= 1;
> -
> - lower = power_of_2 >> 1;
> - upper = power_of_2;
> -
> - if ((size - lower) < (upper - size))
> - return lower;
> - return upper;
> +
> + return power_of_2;
> }
the goal the code tryies to achive here is to compute the power of two
that is closest to the specified area_size, i don't think this should be
changed. if at all, we should just add an extra sanity check for lower
not being smaller than atom_size.
---
ciaoTJ
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]