From owner-svn-ports-head@freebsd.org Mon Oct 31 09:12:48 2016 Return-Path: Delivered-To: svn-ports-head@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 8D4E8C27532; Mon, 31 Oct 2016 09:12:48 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5C7EA1DB1; Mon, 31 Oct 2016 09:12:48 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9V9ClVG008216; Mon, 31 Oct 2016 09:12:47 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9V9ClI1008214; Mon, 31 Oct 2016 09:12:47 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201610310912.u9V9ClI1008214@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Mon, 31 Oct 2016 09:12:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424989 - in head/games/xmris: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Oct 2016 09:12:48 -0000 Author: jhale Date: Mon Oct 31 09:12:47 2016 New Revision: 424989 URL: https://svnweb.freebsd.org/changeset/ports/424989 Log: Fix 100% CPU utilization (runtime tested on FreeBSD 11.0, i386) Bump PORTREVISION PR: 211791 Submitted by: MFH: 2016Q4 Modified: head/games/xmris/Makefile head/games/xmris/files/patch-timer.c Modified: head/games/xmris/Makefile ============================================================================== --- head/games/xmris/Makefile Mon Oct 31 09:08:29 2016 (r424988) +++ head/games/xmris/Makefile Mon Oct 31 09:12:47 2016 (r424989) @@ -3,7 +3,7 @@ PORTNAME= xmris PORTVERSION= 4.04 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= XCONTRIB/games DISTNAME= ${PORTNAME}.${PORTVERSION} Modified: head/games/xmris/files/patch-timer.c ============================================================================== --- head/games/xmris/files/patch-timer.c Mon Oct 31 09:08:29 2016 (r424988) +++ head/games/xmris/files/patch-timer.c Mon Oct 31 09:12:47 2016 (r424989) @@ -9,3 +9,14 @@ #else # ifdef __hpux /* hpux is a weird mixture of BSD & SYSV */ /* don't know if this is right */ +@@ -572,7 +572,10 @@ extern VOIDFUNC timer_wait FUNCARGVOID + else + { + while(!tickafter(now, timer.timeout)) ++ { ++ usleep(tickdelta(timer.timeout, now) * TICKTIME); + gettick(&now); ++ } + timer.timeout = tickadd(timer.timeout, timer.delay); + point = -1; + }