Attachment 316456 Details for Bug 461954 – Fixes file descriptor leak.

[patch] Fixes file descriptor leak.

rgmanager-rhel4-fd-leak-perf.patch (text/plain), 2.13 KB, created by Lon Hohberger on 2008-09-11 16:45:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lon Hohberger

Created: 2008-09-11 16:45:05 UTC

Size: 2.13 KB

patch

obsolete

>diff --git a/rgmanager/src/daemons/rg_event.c b/rgmanager/src/daemons/rg_event.c
>index 48d0fca..335d6d2 100644
>--- a/rgmanager/src/daemons/rg_event.c
>+++ b/rgmanager/src/daemons/rg_event.c
>@@ -27,6 +27,7 @@
> #include <magma.h>
> #include <magmamsg.h>
> #include <vf.h>
>+#include <time.h>
> 
> 
> /**
>@@ -40,6 +41,7 @@ static pthread_mutex_t mi_mutex = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP;
> static pthread_mutex_t event_queue_mutex = PTHREAD_MUTEX_INITIALIZER;
> static pthread_mutex_t mi_mutex = PTHREAD_MUTEX_INITIALIZER;
> #endif
>+static pthread_cond_t event_queue_cond = PTHREAD_COND_INITIALIZER;
> static pthread_t event_thread = 0;
> static int transition_throttling = 5;
> static int central_events = 0;
>@@ -321,23 +323,35 @@ void *
> _event_thread_f(void *arg)
> {
> 	event_t *ev;
>+	struct timeval now;
>+	struct timespec expire;
> 	int count = 0;
> 
>+	/* Event thread usually doesn't hang around.  When it's
>+   	   spawned, sleep for this many seconds in order to let
>+   	   some events queue up */
>+	if (transition_throttling && !central_events) {
>+		sleep(transition_throttling);
>+	}
>+
> 	while (1) {
> 		pthread_mutex_lock(&event_queue_mutex);
> 		ev = event_queue;
>-		if (ev)
>-			list_remove(&event_queue, ev);
>-		else
>+		if (!ev && !central_events) {
>+			gettimeofday(&now, NULL);
>+			expire.tv_sec = now.tv_sec + 5;
>+			expire.tv_nsec = now.tv_usec * 1000;
>+			pthread_cond_timedwait(&event_queue_cond,
>+						&event_queue_mutex,
>+						&expire);
>+			ev = event_queue;
>+		}
>+		if (!ev)
> 			break; /* We're outta here */
> 
>-		++count;
>-		/* Event thread usually doesn't hang around.  When it's
>-	   	   spawned, sleep for this many seconds in order to let
>-	   	   some events queue up */
>-		if ((count==1) && transition_throttling && !central_events)
>-			sleep(transition_throttling);
>+		list_remove(&event_queue, ev);
> 
>+		++count;
> 		pthread_mutex_unlock(&event_queue_mutex);
> 
> 		if (ev->ev_type == EVENT_CONFIG) {
>@@ -417,6 +431,8 @@ insert_event(event_t *ev)
> 
> 		pthread_create(&event_thread, &attrs, _event_thread_f, NULL);
>         	pthread_attr_destroy(&attrs);
>+	} else {
>+		pthread_cond_broadcast(&event_queue_cond);
> 	}
> 	pthread_mutex_unlock (&event_queue_mutex);
> }

Actions: View | Diff

Attachments on bug 461954: 316456 | 316458