r288 - trunk/varnish-cache/contrib/libevent

[phk at projects.linpro.no]

Author: phk
Date: 2006-07-03 21:35:05 +0200 (Mon, 03 Jul 2006)
New Revision: 288

Modified:
   trunk/varnish-cache/contrib/libevent/event.c
Log:
I have grumbled about the evilness of "current_base" before, and this just
proves the point:  If two threads call event_init() at the same time,
they will both stomp on the same memory via current_base, and in all
likelyhood, neither of them will manage to get the job done properly.

Instead work on a local variable and don't assign to current_base
until the setup is complete.

This should be submitted to Niels Provos



Modified: trunk/varnish-cache/contrib/libevent/event.c
===================================================================
--- trunk/varnish-cache/contrib/libevent/event.c	2006-07-03 18:35:39 UTC (rev 287)
+++ trunk/varnish-cache/contrib/libevent/event.c	2006-07-03 19:35:05 UTC (rev 288)
@@ -164,36 +164,38 @@
 event_init(void)
 {
 	int i;
+	struct event_base *mybase;
 
-	if ((current_base = calloc(1, sizeof(struct event_base))) == NULL)
+	if ((mybase = calloc(1, sizeof(struct event_base))) == NULL)
 		event_err(1, "%s: calloc");
 
 	event_sigcb = NULL;
 	event_gotsig = 0;
-	gettime(&current_base->event_tv);
+	gettime(&mybase->event_tv);
 	
-	RB_INIT(&current_base->timetree);
-	TAILQ_INIT(&current_base->eventqueue);
+	RB_INIT(&mybase->timetree);
+	TAILQ_INIT(&mybase->eventqueue);
 	TAILQ_INIT(&signalqueue);
 	
-	current_base->evbase = NULL;
-	for (i = 0; eventops[i] && !current_base->evbase; i++) {
-		current_base->evsel = eventops[i];
+	mybase->evbase = NULL;
+	for (i = 0; eventops[i] && NULL == mybase->evbase; i++) {
+		mybase->evsel = eventops[i];
 
-		current_base->evbase = current_base->evsel->init();
+		mybase->evbase = mybase->evsel->init();
 	}
 
-	if (current_base->evbase == NULL)
+	if (mybase->evbase == NULL)
 		event_errx(1, "%s: no event mechanism available", __func__);
 
 	if (getenv("EVENT_SHOW_METHOD")) 
 		event_msgx("libevent using: %s\n",
-			   current_base->evsel->name);
+			   mybase->evsel->name);
 
 	/* allocate a single active event queue */
-	event_base_priority_init(current_base, 1);
+	event_base_priority_init(mybase, 1);
 
-	return (current_base);
+	current_base = mybase;
+	return (mybase);
 }
 
 void