Date: Mon, 17 Dec 2012 22:06:11 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r244368 - projects/calloutng/sys/kern Message-ID: <201212172206.qBHM6BDl084786@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Mon Dec 17 22:06:10 2012 New Revision: 244368 URL: http://svnweb.freebsd.org/changeset/base/244368 Log: Remove unused timo argument from the seltdwait() function. Both of its consumers migrated to bintime and won't get back. Modified: projects/calloutng/sys/kern/sys_generic.c Modified: projects/calloutng/sys/kern/sys_generic.c ============================================================================== --- projects/calloutng/sys/kern/sys_generic.c Mon Dec 17 21:23:02 2012 (r244367) +++ projects/calloutng/sys/kern/sys_generic.c Mon Dec 17 22:06:10 2012 (r244368) @@ -102,8 +102,7 @@ static int dofilewrite(struct thread *, off_t, int); static void doselwakeup(struct selinfo *, int); static void seltdinit(struct thread *); -static int seltdwait(struct thread *, struct bintime *, struct bintime *, - int); +static int seltdwait(struct thread *, struct bintime *, struct bintime *); static void seltdclear(struct thread *); /* @@ -1024,10 +1023,10 @@ kern_select(struct thread *td, int nd, f TIMESEL(&rbt, &abt); if (bintime_cmp(&rbt, &abt, >=)) break; - error = seltdwait(td, &abt, &precision, 0); + error = seltdwait(td, &abt, &precision); } else { - error = seltdwait(td, NULL, NULL, 0); + error = seltdwait(td, NULL, NULL); } if (error) break; @@ -1306,9 +1305,9 @@ sys_poll(td, uap) TIMESEL(&rbt, &abt); if (bintime_cmp(&rbt, &abt, >=)) break; - error = seltdwait(td, &abt, &precision, 0); + error = seltdwait(td, &abt, &precision); } else { - error = seltdwait(td, NULL, NULL, 0); + error = seltdwait(td, NULL, NULL); } if (error) break; @@ -1651,8 +1650,7 @@ out: } static int -seltdwait(struct thread *td, struct bintime *bt, struct bintime *precision, - int timo) +seltdwait(struct thread *td, struct bintime *bt, struct bintime *precision) { struct seltd *stp; int error; @@ -1671,9 +1669,7 @@ seltdwait(struct thread *td, struct bint mtx_unlock(&stp->st_mtx); return (0); } - if (bt == NULL && timo > 0) - error = cv_timedwait_sig(&stp->st_wait, &stp->st_mtx, timo); - else if (bt != NULL) + if (bt != NULL) error = cv_timedwait_sig_bt(&stp->st_wait, &stp->st_mtx, bt, precision); else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212172206.qBHM6BDl084786>