[BACK]Return to subr_pool.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / kern

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/kern/subr_pool.c between version 1.91 and 1.92

version 1.91, 2004/01/16 12:47:37 version 1.92, 2004/02/22 00:19:48
Line 367  pool_init(struct pool *pp, size_t size, 
Line 367  pool_init(struct pool *pp, size_t size, 
     const char *wchan, struct pool_allocator *palloc)      const char *wchan, struct pool_allocator *palloc)
 {  {
         int off, slack;          int off, slack;
           size_t trysize, phsize;
   
 #ifdef POOL_DIAGNOSTIC  #ifdef POOL_DIAGNOSTIC
         /*          /*
Line 458  pool_init(struct pool *pp, size_t size, 
Line 459  pool_init(struct pool *pp, size_t size, 
   
         /*          /*
          * Decide whether to put the page header off page to avoid           * Decide whether to put the page header off page to avoid
          * wasting too large a part of the page. Off-page page headers           * wasting too large a part of the page or too big item.
          * go on a hash table, so we can match a returned item           * Off-page page headers go on a hash table, so we can match
          * with its header based on the page address.           * a returned item with its header based on the page address.
          * We use 1/16 of the page size as the threshold (XXX: tune)           * We use 1/16 of the page size and about 8 times of the item
            * size as the threshold (XXX: tune)
            *
            * However, we'll put the header into the page if we can put
            * it without wasting any items.
            *
            * Silently enforce `0 <= ioff < align'.
          */           */
         if (pp->pr_size < palloc->pa_pagesz/16) {          pp->pr_itemoffset = ioff %= align;
           /* See the comment below about reserved bytes. */
           trysize = palloc->pa_pagesz - ((align - ioff) % align);
           phsize = ALIGN(sizeof(struct pool_item_header));
           if (pp->pr_size < MIN(palloc->pa_pagesz / 16, phsize << 3) ||
               trysize / pp->pr_size == (trysize - phsize) / pp->pr_size) {
                 /* Use the end of the page for the page header */                  /* Use the end of the page for the page header */
                 pp->pr_roflags |= PR_PHINPAGE;                  pp->pr_roflags |= PR_PHINPAGE;
                 pp->pr_phoffset = off = palloc->pa_pagesz -                  pp->pr_phoffset = off = palloc->pa_pagesz - phsize;
                     ALIGN(sizeof(struct pool_item_header));  
         } else {          } else {
                 /* The page header will be taken from our page header pool */                  /* The page header will be taken from our page header pool */
                 pp->pr_phoffset = 0;                  pp->pr_phoffset = 0;
Line 479  pool_init(struct pool *pp, size_t size, 
Line 490  pool_init(struct pool *pp, size_t size, 
          * Alignment is to take place at `ioff' within the item. This means           * Alignment is to take place at `ioff' within the item. This means
          * we must reserve up to `align - 1' bytes on the page to allow           * we must reserve up to `align - 1' bytes on the page to allow
          * appropriate positioning of each item.           * appropriate positioning of each item.
          *  
          * Silently enforce `0 <= ioff < align'.  
          */           */
         pp->pr_itemoffset = ioff = ioff % align;  
         pp->pr_itemsperpage = (off - ((align - ioff) % align)) / pp->pr_size;          pp->pr_itemsperpage = (off - ((align - ioff) % align)) / pp->pr_size;
         KASSERT(pp->pr_itemsperpage != 0);          KASSERT(pp->pr_itemsperpage != 0);
   
Legend:
Removed from v.1.91  
changed lines
  Added in v.1.92
CVSweb <webmaster@jp.NetBSD.org>