Mercurial > dovecot > core-2.2

changeset 3294:4600e247da86 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Raised initial pool sizes.
author Timo Sirainen <tss@iki.fi>
date Sat, 16 Apr 2005 22:44:09 +0300
parents f8472ced34c0
children 98923db29e39
files src/auth/auth.c src/lib-index/mail-index.c src/lib-sql/driver-mysql.c src/lib-storage/index/index-mail.c src/lib-storage/index/maildir/maildir-storage.c src/lib-storage/index/mbox/mbox-storage.c src/lib/env-util.c src/master/master-settings.c
diffstat 8 files changed, 16 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/auth.c	Sat Apr 16 22:42:37 2005 +0300
+++ b/src/auth/auth.c	Sat Apr 16 22:44:09 2005 +0300
@@ -21,7 +21,7 @@
 	pool_t pool;
 	unsigned int i;
 
-	pool = pool_alloconly_create("auth", 1024);
+	pool = pool_alloconly_create("auth", 2048);
 	auth = p_new(pool, struct auth, 1);
 	auth->pool = pool;
 
--- a/src/lib-index/mail-index.c	Sat Apr 16 22:42:37 2005 +0300
+++ b/src/lib-index/mail-index.c	Sat Apr 16 22:44:09 2005 +0300
@@ -29,7 +29,7 @@
 	index->prefix = i_strdup(prefix);
 	index->fd = -1;
 
-	index->extension_pool = pool_alloconly_create("extension", 256);
+	index->extension_pool = pool_alloconly_create("extension", 512);
 	ARRAY_CREATE(&index->extensions, index->extension_pool,
 		     struct mail_index_ext, 5);
 
@@ -182,12 +182,14 @@
 static void mail_index_map_init_extbufs(struct mail_index_map *map,
 					unsigned int initial_count)
 {
+#define EXTENSION_NAME_APPROX_LEN 20
 	size_t size;
 
 	if (map->extension_pool == NULL) {
-		size = initial_count * sizeof(struct mail_index_ext) +
-                        initial_count * sizeof(uint32_t) +
-			(initial_count * 20); /* for names */
+		size = (sizeof(array_t) + BUFFER_APPROX_SIZE) * 2 +
+			initial_count * (EXTENSION_NAME_APPROX_LEN +
+					 sizeof(struct mail_index_ext) +
+					 sizeof(uint32_t));
 		map->extension_pool =
 			pool_alloconly_create("extensions",
 					      nearest_power(size));
--- a/src/lib-sql/driver-mysql.c	Sat Apr 16 22:42:37 2005 +0300
+++ b/src/lib-sql/driver-mysql.c	Sat Apr 16 22:44:09 2005 +0300
@@ -216,7 +216,7 @@
 	struct mysql_db *db;
 	pool_t pool;
 
-	pool = pool_alloconly_create("mysql driver", 256);
+	pool = pool_alloconly_create("mysql driver", 512);
 
 	db = p_new(pool, struct mysql_db, 1);
 	db->pool = pool;
--- a/src/lib-storage/index/index-mail.c	Sat Apr 16 22:42:37 2005 +0300
+++ b/src/lib-storage/index/index-mail.c	Sat Apr 16 22:44:09 2005 +0300
@@ -648,7 +648,7 @@
 	const struct mail_index_header *hdr;
 	pool_t pool;
 
-	pool = pool_alloconly_create("mail", 256);
+	pool = pool_alloconly_create("mail", 512);
 	mail = p_new(pool, struct index_mail, 1);
 	mail->mail.pool = pool;
 	ARRAY_CREATE(&mail->mail.module_contexts, pool, void *, 5);
--- a/src/lib-storage/index/maildir/maildir-storage.c	Sat Apr 16 22:42:37 2005 +0300
+++ b/src/lib-storage/index/maildir/maildir-storage.c	Sat Apr 16 22:44:09 2005 +0300
@@ -118,7 +118,7 @@
 		       inbox_dir == NULL ? "" : inbox_dir);
 	}
 
-	pool = pool_alloconly_create("storage", 256);
+	pool = pool_alloconly_create("storage", 512);
 	storage = p_new(pool, struct maildir_storage, 1);
 	storage->control_dir = p_strdup(pool, home_expand(control_dir));
 
@@ -424,7 +424,7 @@
 	if (shared)
 		mail_index_set_permissions(index, st.st_mode & 0666, st.st_gid);
 
-	pool = pool_alloconly_create("mailbox", 256);
+	pool = pool_alloconly_create("mailbox", 1024);
 	mbox = p_new(pool, struct maildir_mailbox, 1);
 	mbox->ibox.box = maildir_mailbox;
 	mbox->ibox.box.pool = pool;
--- a/src/lib-storage/index/mbox/mbox-storage.c	Sat Apr 16 22:42:37 2005 +0300
+++ b/src/lib-storage/index/mbox/mbox-storage.c	Sat Apr 16 22:44:09 2005 +0300
@@ -330,7 +330,7 @@
 		       inbox_file == NULL ? "" : inbox_file);
 	}
 
-	pool = pool_alloconly_create("storage", 256);
+	pool = pool_alloconly_create("storage", 512);
 	storage = p_new(pool, struct mbox_storage, 1);
 	istorage = INDEX_STORAGE(storage);
 	istorage->storage = mbox_storage;
@@ -489,7 +489,7 @@
 	struct mbox_mailbox *mbox;
 	pool_t pool;
 
-	pool = pool_alloconly_create("mailbox", 256);
+	pool = pool_alloconly_create("mailbox", 1024);
 	mbox = p_new(pool, struct mbox_mailbox, 1);
 	mbox->ibox.box = mbox_mailbox;
 	mbox->ibox.box.pool = pool;
--- a/src/lib/env-util.c	Sat Apr 16 22:42:37 2005 +0300
+++ b/src/lib/env-util.c	Sat Apr 16 22:44:09 2005 +0300
@@ -10,7 +10,7 @@
 void env_put(const char *env)
 {
 	if (pool == NULL)
-		pool = pool_alloconly_create("Environment", 1024);
+		pool = pool_alloconly_create("Environment", 2048);
 
 	if (putenv(p_strdup(pool, env)) != 0)
 		i_fatal("Environment full, can't add: %s", env);
--- a/src/master/master-settings.c	Sat Apr 16 22:42:37 2005 +0300
+++ b/src/master/master-settings.c	Sat Apr 16 22:44:09 2005 +0300
@@ -1111,8 +1111,8 @@
 
 void master_settings_init(void)
 {
-	settings_pool = pool_alloconly_create("settings", 2048);
-	settings2_pool = pool_alloconly_create("settings2", 2048);
+	settings_pool = pool_alloconly_create("settings", 4096);
+	settings2_pool = pool_alloconly_create("settings2", 4096);
 }
 
 void master_settings_deinit(void)