Libc-583.tar.gz

[apple/libc.git] / db / mpool / FreeBSD / mpool.c.patch

diff --git a/db/mpool/FreeBSD/mpool.c.patch b/db/mpool/FreeBSD/mpool.c.patch
index 285ef070e35bccee0036266c83528c53898ddeea..c824f5da8b37cfa7780f11340bc45fa4355d8391 100644 (file)
--- a/db/mpool/FreeBSD/mpool.c.patch
+++ b/db/mpool/FreeBSD/mpool.c.patch
@@ -1,6 +1,33 @@
---- mpool.c.orig       2006-12-13 22:19:43.000000000 -0800
-+++ mpool.c    2006-12-13 22:27:26.000000000 -0800
-@@ -294,10 +294,16 @@
+--- mpool.c.orig       2008-09-07 11:37:54.000000000 -0700
++++ mpool.c    2008-09-07 12:46:41.000000000 -0700
+@@ -128,7 +128,7 @@ mpool_new(mp, pgnoaddr)
+ 
+       if (mp->npages == MAX_PAGE_NUMBER) {
+               (void)fprintf(stderr, "mpool_new: page allocation overflow.\n");
+-              abort();
++              LIBC_ABORT("page allocation overflow");
+       }
+ #ifdef STATISTICS
+       ++mp->pagenew;
+@@ -180,7 +180,7 @@ mpool_get(mp, pgno, flags)
+               if (bp->flags & MPOOL_PINNED) {
+                       (void)fprintf(stderr,
+                           "mpool_get: page %d already pinned\n", bp->pgno);
+-                      abort();
++                      LIBC_ABORT("page %d already pinned", bp->pgno);
+               }
+ #endif
+               /*
+@@ -253,7 +253,7 @@ mpool_put(mp, page, flags)
+       if (!(bp->flags & MPOOL_PINNED)) {
+               (void)fprintf(stderr,
+                   "mpool_put: page %d not pinned\n", bp->pgno);
+-              abort();
++              LIBC_ABORT("page %d not pinned", bp->pgno);
+       }
+ #endif
+       bp->flags &= ~MPOOL_PINNED;
+@@ -294,10 +294,16 @@ mpool_sync(mp)

        BKT *bp;
  
        /* Walk the lru chain, flushing any dirty pages to disk. */
        BKT *bp;
  
        /* Walk the lru chain, flushing any dirty pages to disk. */


@@ -13,7 +40,7 @@
 +                      if (mpool_write(mp, bp) == RET_ERROR) {
 +                              return (RET_ERROR);
 +                      } else {
 +                      if (mpool_write(mp, bp) == RET_ERROR) {
 +                              return (RET_ERROR);
 +                      } else {

-+                              /* 5126974: Re-run through the user's pgin filter. */
++                              /* 4874757: Re-run through the user's pgin filter. */

 +                              if (mp->pgin != NULL)
 +                                      (mp->pgin)(mp->pgcookie, bp->pgno, bp->page);
 +                      }
 +                              if (mp->pgin != NULL)
 +                                      (mp->pgin)(mp->pgcookie, bp->pgno, bp->page);
 +                      }