[prev in list] [next in list] [prev in thread] [next in thread] 

List:       sanlock-devel
Subject:    src/main.c
From:       teigland () fedoraproject ! org (David Teigland)
Date:       2011-04-19 16:49:32
Message-ID: 20110419164932.1EA46120332 () lists ! fedorahosted ! org
[Download RAW message or body]

 src/main.c |   38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

New commits:
commit a4d42ec6cd865f1cad1122b6ea67906de8e2a8cb
Author: David Teigland <teigland at redhat.com>
Date:   Tue Apr 19 11:47:39 2011 -0500

    sanlock: interval between renewal checks
    
    A lot of client activity would create a lot of repeated
    lockspace checks back to back.  Enforce the desired intervals
    between the checks.

diff --git a/src/main.c b/src/main.c
index 14c2a66..a5d251b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -516,16 +516,30 @@ static int all_pids_dead(struct space *sp)
 	return 1;
 }
 
-#define MAIN_POLL_MS 2000
+static unsigned int time_diff(struct timeval *begin, struct timeval *end)
+{
+	struct timeval result;
+	timersub(end, begin, &result);
+	return (result.tv_sec * 1000) + (result.tv_usec / 1000);
+}
+
+#define STANDARD_CHECK_INTERVAL 1000 /* milliseconds */
+#define RECOVERY_CHECK_INTERVAL  200 /* milliseconds */
 
 static int main_loop(void)
 {
 	void (*workfn) (int ci);
 	void (*deadfn) (int ci);
 	struct space *sp, *safe;
-	int poll_timeout = MAIN_POLL_MS;
+	struct timeval now, last_check;
+	int poll_timeout, check_interval;
+	unsigned int ms;
 	int i, rv, empty;
 
+	gettimeofday(&last_check, NULL);
+	poll_timeout = STANDARD_CHECK_INTERVAL;
+	check_interval = STANDARD_CHECK_INTERVAL;
+
 	while (1) {
 		rv = poll(pollfd, client_maxi + 1, poll_timeout);
 		if (rv == -1 && errno == EINTR)
@@ -548,6 +562,15 @@ static int main_loop(void)
 			}
 		}
 
+
+		gettimeofday(&now, NULL);
+		ms = time_diff(&last_check, &now);
+		if (ms < check_interval) {
+			poll_timeout = check_interval - ms;
+			continue;
+		}
+		last_check = now;
+
 		pthread_mutex_lock(&spaces_mutex);
 		list_for_each_entry_safe(sp, safe, &spaces, list) {
 			if (sp->killing_pids) {
@@ -562,12 +585,16 @@ static int main_loop(void)
 				} else {
 					kill_pids(sp);
 				}
+				check_interval = RECOVERY_CHECK_INTERVAL;
 			} else {
 				if (external_shutdown || sp->external_remove ||
 				    !host_id_renewed(sp)) {
 					log_space(sp, "set killing_pids");
 					sp->killing_pids = 1;
 					kill_pids(sp);
+					check_interval = RECOVERY_CHECK_INTERVAL;
+				} else {
+					check_interval = STANDARD_CHECK_INTERVAL;
 				}
 			}
 		}
@@ -578,6 +605,13 @@ static int main_loop(void)
 			break;
 
 		clear_spaces(0);
+
+		gettimeofday(&now, NULL);
+		ms = time_diff(&last_check, &now);
+		if (ms < check_interval)
+			poll_timeout = check_interval - ms;
+		else
+			poll_timeout = 1;
 	}
 
 	clear_spaces(1);



[prev in list] [next in list] [prev in thread] [next in thread]