From owner-svn-src-all@FreeBSD.ORG  Mon Jun 11 19:21:00 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 522C91065672;
	Mon, 11 Jun 2012 19:21:00 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 383B48FC22;
	Mon, 11 Jun 2012 19:21:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5BJL02t005129;
	Mon, 11 Jun 2012 19:21:00 GMT
	(envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5BJL0jP005127;
	Mon, 11 Jun 2012 19:21:00 GMT
	(envelope-from hselasky@svn.freebsd.org)
Message-Id: <201206111921.q5BJL0jP005127@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Mon, 11 Jun 2012 19:21:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236909 - head/sbin/hastd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jun 2012 19:21:00 -0000

Author: hselasky
Date: Mon Jun 11 19:20:59 2012
New Revision: 236909
URL: http://svn.freebsd.org/changeset/base/236909

Log:
  Use the correct clock source when computing timeouts.
  
  MFC after:	1 week

Modified:
  head/sbin/hastd/synch.h

Modified: head/sbin/hastd/synch.h
==============================================================================
--- head/sbin/hastd/synch.h	Mon Jun 11 19:09:55 2012	(r236908)
+++ head/sbin/hastd/synch.h	Mon Jun 11 19:20:59 2012	(r236909)
@@ -168,7 +168,7 @@ cv_timedwait(pthread_cond_t *cv, pthread
 		return (false);
 	}
 
-        error = clock_gettime(CLOCK_MONOTONIC, &ts);
+	error = clock_gettime(CLOCK_REALTIME, &ts);
 	PJDLOG_ASSERT(error == 0);
 	ts.tv_sec += timeout;
 	error = pthread_cond_timedwait(cv, lock, &ts);