From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7043 invoked by alias); 6 Mar 2009 15:15:04 -0000 Received: (qmail 7025 invoked by alias); 6 Mar 2009 15:15:03 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - rgmanager: Remove sleep in startup of event thread To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: f1d8657897d4c70f75fbc15a2b7ca34b0f7a27ca X-Git-Newrev: b4939e9e1ded08594c3b86237b24318f3d23414f From: Lon Hohberger Message-Id: <20090306151438.815941201C1@lists.fedorahosted.org> Date: Fri, 06 Mar 2009 15:15:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00713.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b4939e9e1ded08594c3b86237b24318f3d23414f Commit: b4939e9e1ded08594c3b86237b24318f3d23414f Parent: f1d8657897d4c70f75fbc15a2b7ca34b0f7a27ca Author: Lon Hohberger AuthorDate: Thu Mar 5 16:23:33 2009 -0500 Committer: Lon Hohberger CommitterDate: Fri Mar 6 10:13:47 2009 -0500 rgmanager: Remove sleep in startup of event thread There's no reason to sleep here, and it delays processing of potentially important events. Signed-off-by: Lon Hohberger --- rgmanager/src/daemons/rg_event.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/rgmanager/src/daemons/rg_event.c b/rgmanager/src/daemons/rg_event.c index 7321e25..1c1f195 100644 --- a/rgmanager/src/daemons/rg_event.c +++ b/rgmanager/src/daemons/rg_event.c @@ -46,8 +46,8 @@ event_table_t *master_event_table = NULL; void set_transition_throttling(int nsecs) { - if (nsecs < 0) - nsecs = 0; + if (nsecs < 1) + nsecs = 1; transition_throttling = nsecs; } @@ -358,19 +358,12 @@ _event_thread_f(void __attribute__ ((unused)) *arg) 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 && !central_events) { gettimeofday(&now, NULL); - expire.tv_sec = now.tv_sec + 5; + expire.tv_sec = now.tv_sec + transition_throttling; expire.tv_nsec = now.tv_usec * 1000; pthread_cond_timedwait(&event_queue_cond, &event_queue_mutex,