From owner-svn-src-projects@FreeBSD.ORG Tue Nov 6 17:11:28 2012 Return-Path: <owner-svn-src-projects@FreeBSD.ORG> Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C4FBE550; Tue, 6 Nov 2012 17:11:28 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 926E38FC08; Tue, 6 Nov 2012 17:11:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA6HBSvM009768; Tue, 6 Nov 2012 17:11:28 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA6HBSMq009765; Tue, 6 Nov 2012 17:11:28 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201211061711.qA6HBSMq009765@svn.freebsd.org> From: Alexander Motin <mav@FreeBSD.org> Date: Tue, 6 Nov 2012 17:11:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r242663 - in projects/calloutng/sys: kern sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 06 Nov 2012 17:11:28 -0000 Author: mav Date: Tue Nov 6 17:11:28 2012 New Revision: 242663 URL: http://svnweb.freebsd.org/changeset/base/242663 Log: Change cv_timedwait_bt_sig() to cv_timedwait_sig_bt() to make it more unified with cv_timedwait_sig_flags(). Modified: projects/calloutng/sys/kern/sys_generic.c projects/calloutng/sys/sys/condvar.h Modified: projects/calloutng/sys/kern/sys_generic.c ============================================================================== --- projects/calloutng/sys/kern/sys_generic.c Tue Nov 6 16:51:41 2012 (r242662) +++ projects/calloutng/sys/kern/sys_generic.c Tue Nov 6 17:11:28 2012 (r242663) @@ -1666,7 +1666,7 @@ seltdwait(struct thread *td, struct bint if (bt == NULL && timo > 0) error = cv_timedwait_sig(&stp->st_wait, &stp->st_mtx, timo); else if (bt != NULL) - error = cv_timedwait_bt_sig(&stp->st_wait, &stp->st_mtx, + error = cv_timedwait_sig_bt(&stp->st_wait, &stp->st_mtx, bt, 0); else error = cv_wait_sig(&stp->st_wait, &stp->st_mtx); Modified: projects/calloutng/sys/sys/condvar.h ============================================================================== --- projects/calloutng/sys/sys/condvar.h Tue Nov 6 16:51:41 2012 (r242662) +++ projects/calloutng/sys/sys/condvar.h Tue Nov 6 17:11:28 2012 (r242663) @@ -73,7 +73,7 @@ void cv_broadcastpri(struct cv *cvp, int _cv_timedwait((cvp), &(lock)->lock_object, NULL, (timo), 0) #define cv_timedwait_bt(cvp, lock, bt, flags) \ _cv_timedwait_sig((cvp), &(lock)->lock_object, (bt), 0, 0) -#define cv_timedwait_bt_sig(cvp, lock, bt, flags) \ +#define cv_timedwait_sig_bt(cvp, lock, bt, flags) \ _cv_timedwait_sig((cvp), &(lock)->lock_object, (bt), 0, \ (flags)) #define cv_timedwait_flags(cvp, lock, timo, flags) \