From owner-freebsd-doc@FreeBSD.ORG Wed May 13 10:07:07 2009 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75CCB1065670; Wed, 13 May 2009 10:07:07 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-bw0-f213.google.com (mail-bw0-f213.google.com [209.85.218.213]) by mx1.freebsd.org (Postfix) with ESMTP id C95C48FC0A; Wed, 13 May 2009 10:07:06 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: by bwz9 with SMTP id 9so529889bwz.43 for ; Wed, 13 May 2009 03:07:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type:content-transfer-encoding; bh=SYCkXY32jtHSRNLMiP9rhyg7PgvHHl8zn2r4LQKlP84=; b=FBcI4B0HyB9fgmsooZAArhRsVU9MRqeZbHJxvKSAtlJoFQlRfSg6JQz3t/GsosNOrO tRC0wt1jFninR7PwZSHD0xIpXr2qVN8furQX0oxTTXKW990SeimhRH1msFtv9HdQfpia Oggr7kEU6Rl50D18XEJ9Vq/5JneHj3oY0IDQM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type :content-transfer-encoding; b=gu5rdmAuNUeY6WEzTPY704xb2Rw6vORxkZYBBGy0j9t7rz80WqHM5GNmTM+M+ATLdK etn92E88qumCVCBsOW/O1qa+A+y7AjQkS5Dm5jbAXI0oLqJgDlZNSAMmLo1crW69CRBl al3zUIh0dkKNInQFMgTUY9XHrY+vEAvSAz90U= MIME-Version: 1.0 Received: by 10.103.214.13 with SMTP id r13mr546134muq.37.1242209225724; Wed, 13 May 2009 03:07:05 -0700 (PDT) Date: Wed, 13 May 2009 14:07:05 +0400 Message-ID: From: pluknet To: freebsd-doc@freebsd.org, Jeff Roberson Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Subject: sleepq(9) manpage is out of sync X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 May 2009 10:07:07 -0000 Hi. The sleepq(9) man page became out of sync since 6.1-R. Exactly, sleepq_calc_signal_retval() was removed before 6.1, and many of sleep_*() functions now have an additional priority arg since not very far -current. Below is a draft of updated sleepq(9). It lacks a description of the newly added "int pri" arg. I hope, Jeff could add the missing peaces. Also, removal of sleepq_calc_signal_retval() should be merged back into 7 and 6. --- share/man/man9/sleepqueue.9.orig Wed May 13 13:37:51 2009 +++ share/man/man9/sleepqueue.9 Wed May 13 13:55:03 2009 @@ -32,7 +32,6 @@ .Nm sleepq_add , .Nm sleepq_alloc , .Nm sleepq_broadcast , -.Nm sleepq_calc_signal_retval , .Nm sleepq_catch_signals , .Nm sleepq_free , .Nm sleepq_lock , @@ -52,7 +51,7 @@ .Ft void .Fn init_sleepqueues "void" .Ft int -.Fn sleepq_abort "struct thread *td" +.Fn sleepq_abort "struct thread *td" "int intrval" .Ft void .Fn sleepq_add "void *wchan" "struct lock_object *lock" "const char *wmesg" "in t flags" "int queue" .Ft struct sleepqueue * @@ -60,9 +59,7 @@ .Ft int .Fn sleepq_broadcast "void *wchan" "int flags" "int pri" "int queue" .Ft int -.Fn sleepq_calc_signal_retval "int sig" -.Ft int -.Fn sleepq_catch_signals "void *wchan" +.Fn sleepq_catch_signals "void *wchan" "int pri" .Ft void .Fn sleepq_free "struct sleepqueue *sq" .Ft struct sleepqueue * @@ -78,13 +75,13 @@ .Ft void .Fn sleepq_set_timeout "void *wchan" "int timo" .Ft int -.Fn sleepq_timedwait "void *wchan" +.Fn sleepq_timedwait "void *wchan" "int pri" .Ft int -.Fn sleepq_timedwait_sig "void *wchan" "int signal_caught" +.Fn sleepq_timedwait_sig "void *wchan" "int pri" .Ft void -.Fn sleepq_wait "void *wchan" +.Fn sleepq_wait "void *wchan" "int pri" .Ft int -.Fn sleepq_wait_sig "void *wchan" +.Fn sleepq_wait_sig "void *wchan" "int pri" .Sh DESCRIPTION Sleep queues provide a mechanism for suspending execution of a thread until some condition is met. @@ -270,20 +267,6 @@ is returned. If the sleep was interrupted by something other than a signal, then some other return value will be returned. -If zero is returned after resuming from an interruptible sleep, -then -.Fn sleepq_calc_signal_retval -should be called to determine if the sleep was interrupted by a signal. -If so, -.Fn sleepq_calc_signal_retval -returns -.Er ERESTART -if the interrupting signal is restartable and -.Er EINTR -otherwise. -If the sleep was not interrupted by a signal, -.Fn sleepq_calc_signal_retval -will return 0. .Pp A sleeping thread is normally resumed by the .Fn sleepq_broadcast -- wbr, pluknet