Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Merge/group man pages:



details:   https://anonhg.NetBSD.org/src/rev/265755107c43
branches:  trunk
changeset: 756202:265755107c43
user:      rmind <rmind%NetBSD.org@localhost>
date:      Thu Jul 08 19:20:16 2010 +0000

description:
Merge/group man pages:
- pthread_barrier_{init,destroy,wait} into pthread_barrier(3).
- pthread_cond_* into pthread_cond(3).
- pthread_mutex_* into pthread_mutex(3).
- pthread_rwlock_* into pthread_rwlock(3).
- pthread_spin_* into pthread_spin(3).
Cross-link amongst groups.
OK jruoho@

diffstat:

 distrib/sets/lists/comp/mi               |   17 +-
 lib/libpthread/Makefile                  |   69 ++++-
 lib/libpthread/pthread_barrier.3         |  161 ++++++++++++++
 lib/libpthread/pthread_barrier_destroy.3 |   71 ------
 lib/libpthread/pthread_barrier_init.3    |   89 --------
 lib/libpthread/pthread_barrier_wait.3    |   79 -------
 lib/libpthread/pthread_cond.3            |  339 ++++++++++++++++++++++++++++++
 lib/libpthread/pthread_cond_broadcast.3  |  132 -----------
 lib/libpthread/pthread_cond_destroy.3    |   98 --------
 lib/libpthread/pthread_cond_init.3       |  131 -----------
 lib/libpthread/pthread_cond_wait.3       |  205 ------------------
 lib/libpthread/pthread_mutex.3           |  224 ++++++++++++++++++++
 lib/libpthread/pthread_mutex_destroy.3   |   96 --------
 lib/libpthread/pthread_mutex_init.3      |  120 ----------
 lib/libpthread/pthread_mutex_lock.3      |  129 -----------
 lib/libpthread/pthread_mutex_unlock.3    |   98 --------
 lib/libpthread/pthread_rwlock.3          |  343 +++++++++++++++++++++++++++++++
 lib/libpthread/pthread_rwlock_destroy.3  |   95 --------
 lib/libpthread/pthread_rwlock_init.3     |  130 -----------
 lib/libpthread/pthread_rwlock_rdlock.3   |  161 --------------
 lib/libpthread/pthread_rwlock_unlock.3   |  101 ---------
 lib/libpthread/pthread_rwlock_wrlock.3   |  142 ------------
 lib/libpthread/pthread_spin.3            |  226 ++++++++++++++++++++
 lib/libpthread/pthread_spin_destroy.3    |   78 -------
 lib/libpthread/pthread_spin_init.3       |   95 --------
 lib/libpthread/pthread_spin_lock.3       |  112 ----------
 lib/libpthread/pthread_spin_unlock.3     |   80 -------
 27 files changed, 1356 insertions(+), 2265 deletions(-)

diffs (truncated from 3873 to 300 lines):

diff -r 4d1c08fe4cfb -r 265755107c43 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Thu Jul 08 18:56:17 2010 +0000
+++ b/distrib/sets/lists/comp/mi        Thu Jul 08 19:20:16 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.1480 2010/07/07 11:04:52 jruoho Exp $
+#      $NetBSD: mi,v 1.1481 2010/07/08 19:20:27 rmind Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -7588,6 +7588,7 @@
 ./usr/share/man/cat3/pthread_attr_setstacksize.0       comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_barierattr_destroy.0      comp-obsolete           obsolete
 ./usr/share/man/cat3/pthread_barierattr_init.0 comp-obsolete           obsolete
+./usr/share/man/cat3/pthread_barrier.0         comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_barrier_destroy.0 comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_barrier_init.0    comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_barrier_wait.0    comp-c-catman           .cat
@@ -7597,6 +7598,7 @@
 ./usr/share/man/cat3/pthread_cancel.0          comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_cleanup_pop.0     comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_cleanup_push.0    comp-c-catman           .cat
+./usr/share/man/cat3/pthread_cond.0            comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_cond_broadcast.0  comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_cond_destroy.0    comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_cond_init.0       comp-c-catman           .cat
@@ -7618,6 +7620,7 @@
 ./usr/share/man/cat3/pthread_key_create.0      comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_key_delete.0      comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_kill.0            comp-c-catman           .cat
+./usr/share/man/cat3/pthread_mutex.0           comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_mutex_destroy.0   comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_mutex_init.0      comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_mutex_lock.0      comp-c-catman           .cat
@@ -7630,6 +7633,7 @@
 ./usr/share/man/cat3/pthread_mutexattr_settype.0       comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_once.0            comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_resume_np.0       comp-c-catman           .cat
+./usr/share/man/cat3/pthread_rwlock.0          comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_rwlock_destroy.0  comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_rwlock_init.0     comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_rwlock_rdlock.0   comp-c-catman           .cat
@@ -7651,6 +7655,7 @@
 ./usr/share/man/cat3/pthread_setschedparam.0   comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_setspecific.0     comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_sigmask.0         comp-c-catman           .cat
+./usr/share/man/cat3/pthread_spin.0            comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_spin_destroy.0    comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_spin_init.0       comp-c-catman           .cat
 ./usr/share/man/cat3/pthread_spin_lock.0       comp-c-catman           .cat
@@ -13426,6 +13431,7 @@
 ./usr/share/man/html3/pthread_attr_setstack.html       comp-c-htmlman          html
 ./usr/share/man/html3/pthread_attr_setstackaddr.html   comp-c-htmlman          html
 ./usr/share/man/html3/pthread_attr_setstacksize.html   comp-c-htmlman          html
+./usr/share/man/html3/pthread_barrier.html             comp-c-htmlman          html
 ./usr/share/man/html3/pthread_barrier_destroy.html     comp-c-htmlman          html
 ./usr/share/man/html3/pthread_barrier_init.html        comp-c-htmlman          html
 ./usr/share/man/html3/pthread_barrier_wait.html        comp-c-htmlman          html
@@ -13435,6 +13441,7 @@
 ./usr/share/man/html3/pthread_cancel.html      comp-c-htmlman          html
 ./usr/share/man/html3/pthread_cleanup_pop.html comp-c-htmlman          html
 ./usr/share/man/html3/pthread_cleanup_push.html        comp-c-htmlman          html
+./usr/share/man/html3/pthread_cond.html                comp-c-htmlman          html
 ./usr/share/man/html3/pthread_cond_broadcast.html      comp-c-htmlman          html
 ./usr/share/man/html3/pthread_cond_destroy.html        comp-c-htmlman          html
 ./usr/share/man/html3/pthread_cond_init.html   comp-c-htmlman          html
@@ -13456,6 +13463,7 @@
 ./usr/share/man/html3/pthread_key_create.html  comp-c-htmlman          html
 ./usr/share/man/html3/pthread_key_delete.html  comp-c-htmlman          html
 ./usr/share/man/html3/pthread_kill.html                comp-c-htmlman          html
+./usr/share/man/html3/pthread_mutex.html       comp-c-htmlman          html
 ./usr/share/man/html3/pthread_mutex_destroy.html       comp-c-htmlman          html
 ./usr/share/man/html3/pthread_mutex_init.html  comp-c-htmlman          html
 ./usr/share/man/html3/pthread_mutex_lock.html  comp-c-htmlman          html
@@ -13468,6 +13476,7 @@
 ./usr/share/man/html3/pthread_mutexattr_settype.html   comp-c-htmlman          html
 ./usr/share/man/html3/pthread_once.html                comp-c-htmlman          html
 ./usr/share/man/html3/pthread_resume_np.html   comp-c-htmlman          html
+./usr/share/man/html3/pthread_rwlock.html      comp-c-htmlman          html
 ./usr/share/man/html3/pthread_rwlock_destroy.html      comp-c-htmlman          html
 ./usr/share/man/html3/pthread_rwlock_init.html comp-c-htmlman          html
 ./usr/share/man/html3/pthread_rwlock_rdlock.html       comp-c-htmlman          html
@@ -13489,6 +13498,7 @@
 ./usr/share/man/html3/pthread_setschedparam.html       comp-c-htmlman          html
 ./usr/share/man/html3/pthread_setspecific.html comp-c-htmlman          html
 ./usr/share/man/html3/pthread_sigmask.html     comp-c-htmlman          html
+./usr/share/man/html3/pthread_spin.html                comp-c-htmlman          html
 ./usr/share/man/html3/pthread_spin_destroy.html        comp-c-htmlman          html
 ./usr/share/man/html3/pthread_spin_init.html   comp-c-htmlman          html
 ./usr/share/man/html3/pthread_spin_lock.html   comp-c-htmlman          html
@@ -19262,6 +19272,7 @@
 ./usr/share/man/man3/pthread_attr_setstacksize.3       comp-c-man              .man
 ./usr/share/man/man3/pthread_barierattr_destroy.3      comp-obsolete           obsolete
 ./usr/share/man/man3/pthread_barierattr_init.3 comp-obsolete           obsolete
+./usr/share/man/man3/pthread_barrier.3         comp-c-man              .man
 ./usr/share/man/man3/pthread_barrier_destroy.3 comp-c-man              .man
 ./usr/share/man/man3/pthread_barrier_init.3    comp-c-man              .man
 ./usr/share/man/man3/pthread_barrier_wait.3    comp-c-man              .man
@@ -19271,6 +19282,7 @@
 ./usr/share/man/man3/pthread_cancel.3          comp-c-man              .man
 ./usr/share/man/man3/pthread_cleanup_pop.3     comp-c-man              .man
 ./usr/share/man/man3/pthread_cleanup_push.3    comp-c-man              .man
+./usr/share/man/man3/pthread_cond.3            comp-c-man              .man
 ./usr/share/man/man3/pthread_cond_broadcast.3  comp-c-man              .man
 ./usr/share/man/man3/pthread_cond_destroy.3    comp-c-man              .man
 ./usr/share/man/man3/pthread_cond_init.3       comp-c-man              .man
@@ -19292,6 +19304,7 @@
 ./usr/share/man/man3/pthread_key_create.3      comp-c-man              .man
 ./usr/share/man/man3/pthread_key_delete.3      comp-c-man              .man
 ./usr/share/man/man3/pthread_kill.3            comp-c-man              .man
+./usr/share/man/man3/pthread_mutex.3           comp-c-man              .man
 ./usr/share/man/man3/pthread_mutex_destroy.3   comp-c-man              .man
 ./usr/share/man/man3/pthread_mutex_init.3      comp-c-man              .man
 ./usr/share/man/man3/pthread_mutex_lock.3      comp-c-man              .man
@@ -19304,6 +19317,7 @@
 ./usr/share/man/man3/pthread_mutexattr_settype.3       comp-c-man              .man
 ./usr/share/man/man3/pthread_once.3            comp-c-man              .man
 ./usr/share/man/man3/pthread_resume_np.3       comp-c-man              .man
+./usr/share/man/man3/pthread_rwlock.3          comp-c-man              .man
 ./usr/share/man/man3/pthread_rwlock_destroy.3  comp-c-man              .man
 ./usr/share/man/man3/pthread_rwlock_init.3     comp-c-man              .man
 ./usr/share/man/man3/pthread_rwlock_rdlock.3   comp-c-man              .man
@@ -19325,6 +19339,7 @@
 ./usr/share/man/man3/pthread_setschedparam.3   comp-c-man              .man
 ./usr/share/man/man3/pthread_setspecific.3     comp-c-man              .man
 ./usr/share/man/man3/pthread_sigmask.3         comp-c-man              .man
+./usr/share/man/man3/pthread_spin.3            comp-c-man              .man
 ./usr/share/man/man3/pthread_spin_destroy.3    comp-c-man              .man
 ./usr/share/man/man3/pthread_spin_init.3       comp-c-man              .man
 ./usr/share/man/man3/pthread_spin_lock.3       comp-c-man              .man
diff -r 4d1c08fe4cfb -r 265755107c43 lib/libpthread/Makefile
--- a/lib/libpthread/Makefile   Thu Jul 08 18:56:17 2010 +0000
+++ b/lib/libpthread/Makefile   Thu Jul 08 19:20:16 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.65 2010/07/07 16:22:30 jruoho Exp $
+#      $NetBSD: Makefile,v 1.66 2010/07/08 19:20:16 rmind Exp $
 #
 
 WARNS= 4
@@ -100,25 +100,19 @@
        pthread_attr_getstack.3 \
        pthread_attr_setcreatesuspend_np.3 \
        pthread_attr_setname_np.3 \
-       pthread_barrier_destroy.3 pthread_barrier_init.3 \
-       pthread_barrier_wait.3 pthread_barrierattr.3 \
+       pthread_barrier.3 pthread_barrierattr.3 \
        pthread_cancel.3 pthread_cleanup_push.3 \
-       pthread_cond_broadcast.3 pthread_cond_destroy.3 pthread_cond_init.3 \
-       pthread_cond_wait.3 \
-       pthread_condattr.3 pthread_create.3 pthread_detach.3 pthread_equal.3 \
+       pthread_cond.3 pthread_condattr.3 \
+       pthread_create.3 pthread_detach.3 pthread_equal.3 \
        pthread_exit.3 \
        pthread_getname_np.3 \
        pthread_getspecific.3 pthread_join.3 \
        pthread_key_create.3 pthread_key_delete.3 pthread_kill.3 \
-       pthread_mutex_destroy.3 pthread_mutex_init.3 pthread_mutex_lock.3 \
-       pthread_mutex_unlock.3 pthread_mutexattr.3 \
-       pthread_once.3 pthread_rwlock_destroy.3 pthread_rwlock_init.3 \
-       pthread_rwlock_rdlock.3 pthread_rwlock_unlock.3 \
-       pthread_rwlock_wrlock.3 pthread_rwlockattr.3 \
+       pthread_mutex.3 pthread_mutexattr.3 \
+       pthread_once.3 pthread_rwlock.3 pthread_rwlockattr.3 \
        pthread_schedparam.3 pthread_self.3 \
        pthread_setname_np.3 \
-       pthread_setspecific.3 pthread_sigmask.3 pthread_spin_destroy.3 \
-       pthread_spin_init.3 pthread_spin_lock.3 pthread_spin_unlock.3 \
+       pthread_setspecific.3 pthread_sigmask.3 pthread_spin.3 \
        pthread_suspend_np.3 pthread_testcancel.3
 
 MLINKS+=       affinity.3 pthread_setaffinity_np.3
@@ -139,27 +133,58 @@
                pthread_attr_getstack.3 pthread_attr_getstackaddr.3 \
                pthread_attr_getstack.3 pthread_attr_setstackaddr.3
 
+MLINKS+=       pthread_cleanup_push.3 pthread_cleanup_pop.3
+
+MLINKS+=       pthread_barrier.3 pthread_barrier_init.3
+MLINKS+=       pthread_barrier.3 pthread_barrier_destroy.3
+MLINKS+=       pthread_barrier.3 pthread_barrier_wait.3
+
 MLINKS+=       pthread_barrierattr.3 pthread_barrierattr_init.3
 MLINKS+=       pthread_barrierattr.3 pthread_barrierattr_destroy.3
-MLINKS+=       pthread_cleanup_push.3 pthread_cleanup_pop.3
-MLINKS+=       pthread_cond_broadcast.3 pthread_cond_signal.3
-MLINKS+=       pthread_cond_wait.3 pthread_cond_timedwait.3
+
+MLINKS+=       pthread_cond.3 pthread_cond_init.3
+MLINKS+=       pthread_cond.3 pthread_cond_destroy.3
+MLINKS+=       pthread_cond.3 pthread_cond_broadcast.3
+MLINKS+=       pthread_cond.3 pthread_cond_wait.3
+MLINKS+=       pthread_cond.3 pthread_cond_signal.3
+MLINKS+=       pthread_cond.3 pthread_cond_timedwait.3
+
 MLINKS+=       pthread_condattr.3 pthread_condattr_init.3
 MLINKS+=       pthread_condattr.3 pthread_condattr_destroy.3
-MLINKS+=       pthread_mutex_lock.3 pthread_mutex_trylock.3
+
+MLINKS+=       pthread_mutex.3 pthread_mutex_init.3
+MLINKS+=       pthread_mutex.3 pthread_mutex_destroy.3
+MLINKS+=       pthread_mutex.3 pthread_mutex_lock.3
+MLINKS+=       pthread_mutex.3 pthread_mutex_trylock.3
+MLINKS+=       pthread_mutex.3 pthread_mutex_unlock.3
+
 MLINKS+=       pthread_mutexattr.3 pthread_mutexattr_init.3
 MLINKS+=       pthread_mutexattr.3 pthread_mutexattr_destroy.3
 MLINKS+=       pthread_mutexattr.3 pthread_mutexattr_settype.3
 MLINKS+=       pthread_mutexattr.3 pthread_mutexattr_gettype.3
-MLINKS+=       pthread_rwlock_rdlock.3 pthread_rwlock_timedrdlock.3
-MLINKS+=       pthread_rwlock_rdlock.3 pthread_rwlock_tryrdlock.3
-MLINKS+=       pthread_rwlock_wrlock.3 pthread_rwlock_timedwrlock.3
-MLINKS+=       pthread_rwlock_wrlock.3 pthread_rwlock_trywrlock.3
+
+MLINKS+=       pthread_rwlock.3 pthread_rwlock_init.3
+MLINKS+=       pthread_rwlock.3 pthread_rwlock_destroy.3
+MLINKS+=       pthread_rwlock.3 pthread_rwlock_rdlock.3
+MLINKS+=       pthread_rwlock.3 pthread_rwlock_wrlock.3
+MLINKS+=       pthread_rwlock.3 pthread_rwlock_unlock.3
+
+MLINKS+=       pthread_rwlock.3 pthread_rwlock_timedrdlock.3
+MLINKS+=       pthread_rwlock.3 pthread_rwlock_timedwrlock.3
+MLINKS+=       pthread_rwlock.3 pthread_rwlock_tryrdlock.3
+MLINKS+=       pthread_rwlock.3 pthread_rwlock_trywrlock.3
+
 MLINKS+=       pthread_rwlockattr.3 pthread_rwlockattr_init.3
 MLINKS+=       pthread_rwlockattr.3 pthread_rwlockattr_destroy.3
+
+MLINKS+=       pthread_spin.3 pthread_spin_init.3
+MLINKS+=       pthread_spin.3 pthread_spin_destroy.3
+MLINKS+=       pthread_spin.3 pthread_spin_lock.3
+MLINKS+=       pthread_spin.3 pthread_spin_trylock.3
+MLINKS+=       pthread_spin.3 pthread_spin_unlock.3
+
 MLINKS+=       pthread_schedparam.3 pthread_setschedparam.3
 MLINKS+=       pthread_schedparam.3 pthread_getschedparam.3
-MLINKS+=       pthread_spin_lock.3 pthread_spin_trylock.3
 MLINKS+=       pthread_suspend_np.3 pthread_resume_np.3
 MLINKS+=       pthread_testcancel.3 pthread_setcancelstate.3
 MLINKS+=       pthread_testcancel.3 pthread_setcanceltype.3
diff -r 4d1c08fe4cfb -r 265755107c43 lib/libpthread/pthread_barrier.3
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/libpthread/pthread_barrier.3  Thu Jul 08 19:20:16 2010 +0000
@@ -0,0 +1,161 @@
+.\" $NetBSD: pthread_barrier.3,v 1.1 2010/07/08 19:20:16 rmind Exp $
+.\"
+.\" Copyright (c) 2002, 2010 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" ----------------------------------------------------------------------------
+.Dd July 8, 2010
+.Dt PTHREAD_BARRIER 3
+.Os
+.Sh NAME
+.Nm pthread_barrier
+.Nd barrier interface
+.Sh LIBRARY
+.Lb libpthread
+.Sh SYNOPSIS
+.In pthread.h
+.Ft int
+.Fn pthread_barrier_init "pthread_barrier_t * restrict barrier" \
+"const pthread_barrierattr_t * restrict attr" "unsigned int count"
+.Ft int
+.Fn pthread_barrier_destroy "pthread_barrier_t *barrier"
+.Ft int
+.Fn pthread_barrier_wait "pthread_barrier_t *barrier"
+.\" ----------------------------------------------------------------------------
+.Sh DESCRIPTION
+The
+.Fn pthread_barrier_init
+function creates a new barrier, with attributes specified with
+.Fa attr
+and
+.Fa count .
+The
+.Fa count
+parameter indicates the number of threads which will participate in the barrier.
+If
+.Fa attr
+is NULL the default attributes are used.



Home | Main Index | Thread Index | Old Index