summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-01-30 09:24:50 +1030
committerRusty Russell <rusty@rustcorp.com.au>2012-01-30 09:24:50 +1030
commitefbf52b4fe62eeed085961d7e2689b869bae63dc (patch)
tree2b9c45dca6168947ca3c25443268a71043b43b12
parent205e198471a481b849d05b5756261f1739c0c8b2 (diff)
downloadsamba-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)
-rw-r--r--lib/tdb2/free.c55
-rw-r--r--lib/tdb2/private.h3
-rw-r--r--lib/tdb2/transaction.c9
3 files changed, 40 insertions, 27 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);
diff --git a/lib/tdb2/private.h b/lib/tdb2/private.h
index 9b044610ae..91d3ca0933 100644
--- a/lib/tdb2/private.h
+++ b/lib/tdb2/private.h
@@ -437,6 +437,9 @@ tdb_off_t bucket_off(tdb_off_t ftable_off, unsigned bucket);
/* Used by tdb_summary */
tdb_off_t dead_space(struct tdb_context *tdb, tdb_off_t off);
+/* Adjust expansion, used by create_recovery_area */
+tdb_off_t tdb_expand_adjust(tdb_off_t map_size, tdb_off_t size);
+
/* io.c: */
/* Initialize tdb->methods. */
void tdb_io_init(struct tdb_context *tdb);
diff --git a/lib/tdb2/transaction.c b/lib/tdb2/transaction.c
index 70e664fc2d..dd94510c02 100644
--- a/lib/tdb2/transaction.c
+++ b/lib/tdb2/transaction.c
@@ -836,10 +836,13 @@ static tdb_off_t create_recovery_area(struct tdb_context *tdb,
/* round up to a multiple of page size. Overallocate, since each
* such allocation forces us to expand the file. */
- rec->max_len
- = (((sizeof(*rec) + rec_length + rec_length / 2)
- + PAGESIZE-1) & ~(PAGESIZE-1))
+ rec->max_len = tdb_expand_adjust(tdb->file->map_size, rec_length);
+
+ /* Round up to a page. */
+ rec->max_len = ((sizeof(*rec) + rec->max_len + PAGESIZE-1)
+ & ~(PAGESIZE-1))
- sizeof(*rec);
+
off = tdb->file->map_size;
/* Restore ->map_size before calling underlying expand_file.