From owner-svn-src-all@freebsd.org Fri Feb 10 16:33:29 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AF93BCD904A; Fri, 10 Feb 2017 16:33:29 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citapm.icyb.net.ua (citapm.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 0A9C01C5C; Fri, 10 Feb 2017 16:33:27 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citapm.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id SAA19145; Fri, 10 Feb 2017 18:33:20 +0200 (EET) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1ccE8O-0007L1-4v; Fri, 10 Feb 2017 18:33:20 +0200 Subject: Re: svn commit: r313533 - stable/10/usr.sbin/watchdogd To: Ian Lepore , Xin LI , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-stable@FreeBSD.org, svn-src-stable-10@FreeBSD.org References: <201702100653.v1A6rmL9009347@repo.freebsd.org> <1486743003.10020.242.camel@freebsd.org> From: Andriy Gapon Message-ID: <6930dc08-d5b3-5383-eb30-54d92767d43e@FreeBSD.org> Date: Fri, 10 Feb 2017 18:32:18 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <1486743003.10020.242.camel@freebsd.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Fri, 10 Feb 2017 16:33:29 -0000 On 10/02/2017 18:10, Ian Lepore wrote: > On Fri, 2017-02-10 at 06:53 +0000, Xin LI wrote: >> Author: delphij >> Date: Fri Feb 10 06:53:48 2017 >> New Revision: 313533 >> URL: https://svnweb.freebsd.org/changeset/base/313533 >> >> Log: >> MFC r274583: Default to use 10 seconds as nap interval instead of >> 1. >> >> Modified: >> stable/10/usr.sbin/watchdogd/watchdogd.8 >> stable/10/usr.sbin/watchdogd/watchdogd.c >> > > I didn't see this change when it happened on -current, but my burning > question now is: how will this work when the timeout is set to values > less than 10 seconds, which is the only option on some hardware? Please see r308040 and r308479. I don't recall right now if I MFC-ed them to stable/10. > >> Modified: stable/10/usr.sbin/watchdogd/watchdogd.8 >> ===================================================================== >> ========= >> --- stable/10/usr.sbin/watchdogd/watchdogd.8 Fri Feb 10 >> 06:34:52 2017 (r313532) >> +++ stable/10/usr.sbin/watchdogd/watchdogd.8 Fri Feb 10 >> 06:53:48 2017 (r313533) >> @@ -80,7 +80,7 @@ reboot if there are problems with the sc >> The >> .Fl s Ar sleep >> argument can be used to control the sleep period between each >> execution >> -of the check and defaults to one second. >> +of the check and defaults to 10 seconds. >> .Pp >> The >> .Fl t Ar timeout >> >> Modified: stable/10/usr.sbin/watchdogd/watchdogd.c >> ===================================================================== >> ========= >> --- stable/10/usr.sbin/watchdogd/watchdogd.c Fri Feb 10 >> 06:34:52 2017 (r313532) >> +++ stable/10/usr.sbin/watchdogd/watchdogd.c Fri Feb 10 >> 06:53:48 2017 (r313533) >> @@ -80,7 +80,7 @@ static u_int timeout = WD_TO_128SEC; >> static u_int exit_timeout = WD_TO_NEVER; >> static u_int pretimeout = 0; >> static u_int timeout_sec; >> -static u_int nap = 1; >> +static u_int nap = 10; >> static int passive = 0; >> static int is_daemon = 0; >> static int is_dry_run = 0; /* do not arm the watchdog, only >> > -- Andriy Gapon