pike.git/ src/ block_allocator.c

2012-02-09

2012-02-09 13:29:46 by Arne Goedeke <el@laramies.com>

• de2d07a6cc483a3172b405c4f98fb7207d971b27 (36 lines) (+23/-13) ^{[ Show | Annotate ]}
  Branch: arne/block_alloc

fixed linked list fuckup

2:   #include <string.h>   #include <stdint.h>    - #include "post_modules/Critbit/bitvector.h" + #include "post_modules/CritBit/bitvector.h"   #define __PIKE__   #ifdef __PIKE__   # include "pike_error.h"
360:       if (unlikely(p->blocks_used == a->blocks)) {    a->first = p->next; +  BA_PAGE(a, a->first)->prev = 0;    if (!a->first) {    a->last = 0;    }
537:    free(p->data);    p->data = NULL;    -  if (a->num_pages != n) { -  tmp = BA_PAGE(a, a->num_pages); -  ba_htable_replace(a, BA_LASTBLOCK(a, tmp), a->num_pages, n); -  /* -  fprintf(stderr, "replacing with page %u\t(%p .. %p) -> %X (%X)\n", -  a->num_pages, -  tmp->data, BA_LASTBLOCK(a, tmp), hash1(a, BA_LASTBLOCK(a,tmp)), -  hash1(a, BA_LASTBLOCK(a,tmp)) & BA_HASH_MASK(a) -  ); -  */ -  *p = *tmp; -  } +        if (a->last_free == n)    a->last_free = 0;
569:    a->last = p->prev;    }    +  if (a->num_pages != n) { +  tmp = BA_PAGE(a, a->num_pages); +  ba_htable_replace(a, BA_LASTBLOCK(a, tmp), a->num_pages, n); +  /* +  fprintf(stderr, "replacing with page %u\t(%p .. %p) -> %X (%X)\n", +  a->num_pages, +  tmp->data, BA_LASTBLOCK(a, tmp), hash1(a, BA_LASTBLOCK(a,tmp)), +  hash1(a, BA_LASTBLOCK(a,tmp)) & BA_HASH_MASK(a) +  ); +  */ +  *p = *tmp; +  if (p->next) BA_PAGE(a, p->next)->prev = n; +  if (p->prev) BA_PAGE(a, p->prev)->next = n; +  if (a->num_pages == a->first) { +  a->first = n; +  } +  } +  +  memset(BA_PAGE(a, a->num_pages), 0, sizeof(struct ba_page)); +     a->num_pages--;   }