From owner-svn-src-all@FreeBSD.ORG Mon Jun 11 20:27:53 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 87BB11065675; Mon, 11 Jun 2012 20:27:53 +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 72CA18FC12; Mon, 11 Jun 2012 20:27:53 +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 q5BKRrpw008211; Mon, 11 Jun 2012 20:27:53 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5BKRrP6008209; Mon, 11 Jun 2012 20:27:53 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201206112027.q5BKRrP6008209@svn.freebsd.org> From: Hans Petter Selasky Date: Mon, 11 Jun 2012 20:27:53 +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: r236919 - 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jun 2012 20:27:53 -0000 Author: hselasky Date: Mon Jun 11 20:27:52 2012 New Revision: 236919 URL: http://svn.freebsd.org/changeset/base/236919 Log: Revert: r236909 Pointyhat: me Modified: head/sbin/hastd/synch.h Modified: head/sbin/hastd/synch.h ============================================================================== --- head/sbin/hastd/synch.h Mon Jun 11 20:19:24 2012 (r236918) +++ head/sbin/hastd/synch.h Mon Jun 11 20:27:52 2012 (r236919) @@ -168,7 +168,7 @@ cv_timedwait(pthread_cond_t *cv, pthread return (false); } - error = clock_gettime(CLOCK_REALTIME, &ts); + error = clock_gettime(CLOCK_MONOTONIC, &ts); PJDLOG_ASSERT(error == 0); ts.tv_sec += timeout; error = pthread_cond_timedwait(cv, lock, &ts);