r14939@tombo: nickm | 2007-11-25 11:59:26 -0500

 New function event_set_mem_functions to replace internal calls to malloc, free, etc with a user-supplied functions.


svn:r541

1 files changed, 10 insertions, 10 deletions

diff --git a/poll.c b/poll.c
index 9dfbd277..c2b1b157 100644
--- a/poll.c
+++ b/poll.c
@@ -91,7 +91,7 @@ poll_init(struct event_base *base)
 	if (getenv("EVENT_NOPOLL"))
 		return (NULL);
 
-	if (!(pollop = calloc(1, sizeof(struct pollop))))
+	if (!(pollop = event_calloc(1, sizeof(struct pollop))))
 		return (NULL);
 
 	evsignal_init(base);
@@ -237,7 +237,7 @@ poll_add(void *arg, struct event *ev)
 			tmp_event_count = pop->event_count * 2;
 
 		/* We need more file descriptors */
-		tmp_event_set = realloc(pop->event_set,
+		tmp_event_set = event_realloc(pop->event_set,
 				 tmp_event_count * sizeof(struct pollfd));
 		if (tmp_event_set == NULL) {
 			event_warn("realloc");
@@ -245,7 +245,7 @@ poll_add(void *arg, struct event *ev)
 		}
 		pop->event_set = tmp_event_set;
 
-		tmp_event_r_back = realloc(pop->event_r_back,
+		tmp_event_r_back = event_realloc(pop->event_r_back,
 			    tmp_event_count * sizeof(struct event *));
 		if (tmp_event_r_back == NULL) {
 			/* event_set overallocated; that's okay. */
@@ -254,7 +254,7 @@ poll_add(void *arg, struct event *ev)
 		}
 		pop->event_r_back = tmp_event_r_back;
 
-		tmp_event_w_back = realloc(pop->event_w_back,
+		tmp_event_w_back = event_realloc(pop->event_w_back,
 			    tmp_event_count * sizeof(struct event *));
 		if (tmp_event_w_back == NULL) {
 			/* event_set and event_r_back overallocated; that's
@@ -276,7 +276,7 @@ poll_add(void *arg, struct event *ev)
 		while (new_count <= ev->ev_fd)
 			new_count *= 2;
 		tmp_idxplus1_by_fd =
-			realloc(pop->idxplus1_by_fd, new_count * sizeof(int));
+		  event_realloc(pop->idxplus1_by_fd, new_count * sizeof(int));
 		if (tmp_idxplus1_by_fd == NULL) {
 			event_warn("realloc");
 			return (-1);
@@ -377,14 +377,14 @@ poll_dealloc(struct event_base *base, void *arg)
 
 	evsignal_dealloc(base);
 	if (pop->event_set)
-		free(pop->event_set);
+		event_free(pop->event_set);
 	if (pop->event_r_back)
-		free(pop->event_r_back);
+		event_free(pop->event_r_back);
 	if (pop->event_w_back)
-		free(pop->event_w_back);
+		event_free(pop->event_w_back);
 	if (pop->idxplus1_by_fd)
-		free(pop->idxplus1_by_fd);
+		event_free(pop->idxplus1_by_fd);
 
 	memset(pop, 0, sizeof(struct pollop));
-	free(pop);
+	event_free(pop);
 }