Mercurial > dovecot > original-hg > dovecot-1.2

changeset 7087:a281705a2360 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Converted some buffers to arrays.
author Timo Sirainen <tss@iki.fi>
date Tue, 01 Jan 2008 23:34:32 +0200
parents 7ed926ed7aa4
children 958500009336
files src/auth/auth-request-handler.c src/auth/auth-worker-server.c
diffstat 2 files changed, 50 insertions(+), 71 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/auth-request-handler.c	Tue Jan 01 22:05:21 2008 +0200
+++ b/src/auth/auth-request-handler.c	Tue Jan 01 23:34:32 2008 +0200
@@ -2,7 +2,7 @@
 
 #include "common.h"
 #include "ioloop.h"
-#include "buffer.h"
+#include "array.h"
 #include "base64.h"
 #include "hash.h"
 #include "str.h"
@@ -27,7 +27,7 @@
 	auth_request_callback_t *master_callback;
 };
 
-static buffer_t *auth_failures_buf;
+static ARRAY_DEFINE(auth_failures, struct auth_request *);
 static struct timeout *to_auth_failures;
 
 #undef auth_request_handler_create
@@ -214,8 +214,7 @@
 			   a) timing attacks, b) flooding */
 			request->delayed_failure = TRUE;
 			handler->refcount++;
-			buffer_append(auth_failures_buf,
-				      &request, sizeof(request));
+			array_append(&auth_failures, &request, 1);
 		}
 		break;
 	}
@@ -481,18 +480,17 @@
 void auth_request_handler_flush_failures(void)
 {
 	struct auth_request **auth_request;
-	size_t i, size;
+	unsigned int i, count;
 
-	auth_request = buffer_get_modifiable_data(auth_failures_buf, &size);
-	size /= sizeof(*auth_request);
+	auth_request = array_get_modifiable(&auth_failures, &count);
 
-	for (i = 0; i < size; i++) {
+	for (i = 0; i < count; i++) {
 		i_assert(auth_request[i]->state == AUTH_REQUEST_STATE_FINISHED);
 		auth_request[i]->callback(auth_request[i],
 					  AUTH_CLIENT_RESULT_FAILURE, NULL, 0);
 		auth_request_unref(&auth_request[i]);
 	}
-	buffer_set_used_size(auth_failures_buf, 0);
+	array_clear(&auth_failures);
 }
 
 static void auth_failure_timeout(void *context ATTR_UNUSED)
@@ -502,13 +500,13 @@
 
 void auth_request_handler_init(void)
 {
-	auth_failures_buf = buffer_create_dynamic(default_pool, 1024);
+	i_array_init(&auth_failures, 128);
         to_auth_failures = timeout_add(2000, auth_failure_timeout, NULL);
 }
 
 void auth_request_handler_deinit(void)
 {
 	auth_request_handler_flush_failures();
-	buffer_free(&auth_failures_buf);
+	array_free(&auth_failures);
 	timeout_remove(&to_auth_failures);
 }
--- a/src/auth/auth-worker-server.c	Tue Jan 01 22:05:21 2008 +0200
+++ b/src/auth/auth-worker-server.c	Tue Jan 01 23:34:32 2008 +0200
@@ -1,7 +1,7 @@
 /* Copyright (c) 2005-2008 Dovecot authors, see the included COPYING file */
 
 #include "common.h"
-#include "buffer.h"
+#include "array.h"
 #include "ioloop.h"
 #include "network.h"
 #include "istream.h"
@@ -30,14 +30,14 @@
 	struct ostream *output;
 
 	unsigned int id_counter;
-        buffer_t *requests; /* struct auth_worker_request[] */
+        ARRAY_DEFINE(requests, struct auth_worker_request);
 
 	time_t last_used;
 	unsigned int request_count;
 	unsigned int requests_left;
 };
 
-static buffer_t *connections = NULL;
+static ARRAY_DEFINE(connections, struct auth_worker_connection *) = ARRAY_INIT;
 static unsigned int idle_count;
 static unsigned int auth_workers_max;
 static unsigned int auth_workers_max_request_count;
@@ -52,7 +52,7 @@
 	struct auth_worker_connection *conn;
 	int fd, try;
 
-	if (connections->used / sizeof(conn) >= auth_workers_max)
+	if (array_count(&connections) >= auth_workers_max)
 		return NULL;
 
 	for (try = 0;; try++) {
@@ -85,29 +85,26 @@
 					 FALSE);
 	conn->output = o_stream_create_fd(fd, (size_t)-1, FALSE);
 	conn->io = io_add(fd, IO_READ, worker_input, conn);
-	conn->requests = buffer_create_dynamic(default_pool, 128);
+	i_array_init(&conn->requests, 16);
 	conn->requests_left = auth_workers_max_request_count;
 
 	idle_count++;
 
-	buffer_append(connections, &conn, sizeof(conn));
+	array_append(&connections, &conn, 1);
 	return conn;
 }
 
 static void auth_worker_destroy(struct auth_worker_connection *conn)
 {
 	struct auth_worker_connection **connp;
-	struct auth_worker_request *request;
-	size_t i, size;
+	struct auth_worker_request *requests;
+	unsigned int i, count;
 	const char *reply;
 
-	connp = buffer_get_modifiable_data(connections, &size);
-	size /= sizeof(*connp);
-
-	for (i = 0; i < size; i++) {
+	connp = array_get_modifiable(&connections, &count);
+	for (i = 0; i < count; i++) {
 		if (connp[i] == conn) {
-			buffer_delete(connections, i * sizeof(*connp),
-				      sizeof(*connp));
+			array_delete(&connections, i, 1);
 			break;
 		}
 	}
@@ -116,22 +113,21 @@
 		idle_count--;
 
 	/* abort all pending requests */
-	request = buffer_get_modifiable_data(conn->requests, &size);
-	size /= sizeof(*request);
+	reply = t_strdup_printf("FAIL\t%d", PASSDB_RESULT_INTERNAL_FAILURE);
 
-	reply = t_strdup_printf("FAIL\t%d", PASSDB_RESULT_INTERNAL_FAILURE);
-	for (i = 0; i < size; i++) {
-		if (request[i].id != 0) {
+	requests = array_get_modifiable(&conn->requests, &count);
+	for (i = 0; i < count; i++) {
+		if (requests[i].id != 0) {
 			T_FRAME(
-				request[i].callback(request[i].auth_request,
-						    reply);
+				requests[i].callback(requests[i].auth_request,
+						     reply);
 			);
-			auth_request_unref(&request[i].auth_request);
+			auth_request_unref(&requests[i].auth_request);
 		}
 	}
 
 
-	buffer_free(&conn->requests);
+	array_free(&conn->requests);
 	io_remove(&conn->io);
 	i_stream_destroy(&conn->input);
 	o_stream_destroy(&conn->output);
@@ -145,31 +141,27 @@
 auth_worker_request_lookup(struct auth_worker_connection *conn,
 			   unsigned int id)
 {
-	struct auth_worker_request *request;
-	size_t i, size;
-
-	request = buffer_get_modifiable_data(conn->requests, &size);
-	size /= sizeof(*request);
+	struct auth_worker_request *requests;
+	unsigned int i, count;
 
-	for (i = 0; i < size; i++) {
-		if (request[i].id == id)
-			return &request[i];
+	requests = array_get_modifiable(&conn->requests, &count);
+	for (i = 0; i < count; i++) {
+		if (requests[i].id == id)
+			return &requests[i];
 	}
-
 	return NULL;
 }
 
 static struct auth_worker_connection *auth_worker_find_free(void)
 {
 	struct auth_worker_connection **conn, *best;
-	size_t i, size, outbuf_size, best_size;
+	unsigned int i, count;
+	size_t outbuf_size, best_size;
 
-	conn = buffer_get_modifiable_data(connections, &size);
-	size /= sizeof(*conn);
-
+	conn = array_get_modifiable(&connections, &count);
 	if (idle_count > 0) {
 		/* there exists at least one idle connection, use it */
-		for (i = 0; i < size; i++) {
+		for (i = 0; i < count; i++) {
 			if (conn[i]->request_count == 0)
 				return conn[i];
 		}
@@ -179,7 +171,7 @@
 	/* first the connection with least data in output buffer */
 	best = NULL;
 	best_size = (size_t)-1;
-	for (i = 0; i < size; i++) {
+	for (i = 0; i < count; i++) {
 		outbuf_size = o_stream_get_buffer_used_size(conn[i]->output);
 		if (outbuf_size < best_size && conn[i]->requests_left > 0) {
 			best = conn[i];
@@ -254,17 +246,9 @@
 auth_worker_request_get(struct auth_worker_connection *conn)
 {
         struct auth_worker_request *request;
-	size_t i, size;
 
-	request = buffer_get_modifiable_data(conn->requests, &size);
-	size /= sizeof(*request);
-
-	for (i = 0; i < size; i++) {
-		if (request[i].id == 0)
-			return &request[i];
-	}
-
-	return buffer_append_space_unsafe(conn->requests, sizeof(*request));
+	request = auth_worker_request_lookup(conn, 0);
+	return request != NULL ? request : array_append_space(&conn->requests);
 }
 
 void auth_worker_call(struct auth_request *auth_request, const char *data,
@@ -332,10 +316,7 @@
 static void auth_worker_timeout(void *context ATTR_UNUSED)
 {
 	struct auth_worker_connection **conn;
-	size_t i, size;
-
-	conn = buffer_get_modifiable_data(connections, &size);
-	size /= sizeof(*conn);
+	unsigned int i, count;
 
 	if (idle_count <= 1)
 		return;
@@ -343,7 +324,8 @@
 	/* remove connections which we haven't used for a long time.
 	   this works because auth_worker_find_free() always returns the
 	   first free connection. */
-	for (i = 0; i < size; i++) {
+	conn = array_get_modifiable(&connections, &count);
+	for (i = 0; i < count; i++) {
 		if (conn[i]->last_used +
 		    AUTH_WORKER_MAX_IDLE_TIME < ioloop_time) {
 			/* remove just one. easier.. */
@@ -357,7 +339,7 @@
 {
 	const char *env;
 
-	if (connections != NULL) {
+	if (array_is_created(&connections)) {
 		/* already initialized */
 		return;
 	}
@@ -379,8 +361,7 @@
 	if (auth_workers_max_request_count == 0)
 		auth_workers_max_request_count = (unsigned int)-1;
 
-	connections = buffer_create_dynamic(default_pool,
-		sizeof(struct auth_worker_connection) * 16);
+	i_array_init(&connections, 16);
 	to = timeout_add(1000 * 60, auth_worker_timeout, NULL);
 
 	auth_worker_create();
@@ -390,14 +371,14 @@
 {
 	struct auth_worker_connection **connp;
 
-	if (connections == NULL)
+	if (!array_is_created(&connections))
 		return;
 
-	while (connections->used > 0) {
-		connp = buffer_get_modifiable_data(connections, NULL);
+	while (array_count(&connections) > 0) {
+		connp = array_idx_modifiable(&connections, 0);
 		auth_worker_destroy(*connp);
 	}
-	buffer_free(&connections);
+	array_free(&connections);
 
 	timeout_remove(&to);
 	i_free(worker_socket_path);