diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2012-01-30 09:24:50 +1030 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-01-30 09:24:50 +1030 |
commit | efbf52b4fe62eeed085961d7e2689b869bae63dc (patch) | |
tree | 2b9c45dca6168947ca3c25443268a71043b43b12 /lib/tdb2/free.c | |
parent | 205e198471a481b849d05b5756261f1739c0c8b2 (diff) | |
download | samba-efbf52b4fe62eeed085961d7e2689b869bae63dc.tar.gz samba-efbf52b4fe62eeed085961d7e2689b869bae63dc.tar.bz2 samba-efbf52b4fe62eeed085961d7e2689b869bae63dc.zip |
tdb2: copy tdb1's changed expansion logic.
TDB2 uses the same expansion logic as TDB1, which got factored out
recently. So update TDB2 to match.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit c438ec17d7b2efe76e56e5fc5ab88bd4a02735e8)
Diffstat (limited to 'lib/tdb2/free.c')
-rw-r--r-- | lib/tdb2/free.c | 55 |
1 files changed, 31 insertions, 24 deletions
diff --git a/lib/tdb2/free.c b/lib/tdb2/free.c index f8934d1d60..a6d4c7a4c7 100644 --- a/lib/tdb2/free.c +++ b/lib/tdb2/free.c @@ -876,10 +876,38 @@ enum TDB_ERROR set_header(struct tdb_context *tdb, return TDB_SUCCESS; } +/* You need 'size', this tells you how much you should expand by. */ +tdb_off_t tdb_expand_adjust(tdb_off_t map_size, tdb_off_t size) +{ + tdb_off_t new_size, top_size; + + /* limit size in order to avoid using up huge amounts of memory for + * in memory tdbs if an oddball huge record creeps in */ + if (size > 100 * 1024) { + top_size = map_size + size * 2; + } else { + top_size = map_size + size * 100; + } + + /* always make room for at least top_size more records, and at + least 25% more space. if the DB is smaller than 100MiB, + otherwise grow it by 10% only. */ + if (map_size > 100 * 1024 * 1024) { + new_size = map_size * 1.10; + } else { + new_size = map_size * 1.25; + } + + /* Round the database up to a multiple of the page size */ + if (new_size < top_size) + new_size = top_size; + return new_size - map_size; +} + /* Expand the database. */ static enum TDB_ERROR tdb_expand(struct tdb_context *tdb, tdb_len_t size) { - uint64_t old_size, rec_size, map_size; + uint64_t old_size; tdb_len_t wanted; enum TDB_ERROR ecode; @@ -904,29 +932,8 @@ static enum TDB_ERROR tdb_expand(struct tdb_context *tdb, tdb_len_t size) return TDB_SUCCESS; } - /* limit size in order to avoid using up huge amounts of memory for - * in memory tdbs if an oddball huge record creeps in */ - if (size > 100 * 1024) { - rec_size = size * 2; - } else { - rec_size = size * 100; - } - - /* always make room for at least rec_size more records, and at - least 25% more space. if the DB is smaller than 100MiB, - otherwise grow it by 10% only. */ - if (old_size > 100 * 1024 * 1024) { - map_size = old_size / 10; - } else { - map_size = old_size / 4; - } - - if (map_size > rec_size) { - wanted = map_size; - } else { - wanted = rec_size; - } - + /* Overallocate. */ + wanted = tdb_expand_adjust(old_size, size); /* We need room for the record header too. */ wanted = adjust_size(0, sizeof(struct tdb_used_record) + wanted); |