Index: head/share/man/man3/Makefile =================================================================== --- head/share/man/man3/Makefile (revision 352838) +++ head/share/man/man3/Makefile (revision 352839) @@ -1,482 +1,483 @@ # @(#)Makefile 8.2 (Berkeley) 12/13/93 # $FreeBSD$ .include MAN= arb.3 \ assert.3 \ ATOMIC_VAR_INIT.3 \ bitstring.3 \ CMSG_DATA.3 \ end.3 \ fpgetround.3 \ intro.3 \ makedev.3 \ offsetof.3 \ ${PTHREAD_MAN} \ Q_FRAWMASK.3 \ Q_IFRAWMASK.3 \ Q_INI.3 \ Q_IRAWMASK.3 \ Q_QABS.3 \ Q_QADDI.3 \ Q_QADDQ.3 \ Q_SIGNED.3 \ Q_SIGNSHFT.3 \ qmath.3 \ queue.3 \ sigevent.3 \ siginfo.3 \ stdarg.3 \ sysexits.3 \ tgmath.3 \ timeradd.3 \ tree.3 MLINKS= arb.3 ARB8_ENTRY.3 \ arb.3 ARB8_HEAD.3 \ arb.3 ARB16_ENTRY.3 \ arb.3 ARB16_HEAD.3 \ arb.3 ARB32_ENTRY.3 \ arb.3 ARB32_HEAD.3 \ arb.3 ARB_ALLOCSIZE.3 \ arb.3 ARB_CURNODES.3 \ arb.3 ARB_EMPTY.3 \ arb.3 ARB_FIND.3 \ arb.3 ARB_FOREACH.3 \ arb.3 ARB_FOREACH_FROM.3 \ arb.3 ARB_FOREACH_REVERSE.3 \ arb.3 ARB_FOREACH_REVERSE_FROM.3 \ arb.3 ARB_FOREACH_REVERSE_SAFE.3 \ arb.3 ARB_FOREACH_SAFE.3 \ arb.3 ARB_FREEIDX.3 \ arb.3 ARB_FULL.3 \ arb.3 ARB_GETFREE.3 \ arb.3 ARB_INIT.3 \ arb.3 ARB_INITIALIZER.3 \ arb.3 ARB_INSERT.3 \ arb.3 ARB_LEFT.3 \ arb.3 ARB_LEFTIDX.3 \ arb.3 ARB_MAX.3 \ arb.3 ARB_MAXNODES.3 \ arb.3 ARB_MIN.3 \ arb.3 ARB_NEXT.3 \ arb.3 ARB_NFIND.3 \ arb.3 ARB_PARENT.3 \ arb.3 ARB_PARENTIDX.3 \ arb.3 ARB_PREV.3 \ + arb.3 ARB_REINSERT.3 \ arb.3 ARB_REMOVE.3 \ arb.3 ARB_RIGHT.3 \ arb.3 ARB_RIGHTIDX.3 \ arb.3 ARB_ROOT.3 MLINKS+= ATOMIC_VAR_INIT.3 atomic_compare_exchange_strong.3 \ ATOMIC_VAR_INIT.3 atomic_compare_exchange_strong_explicit.3 \ ATOMIC_VAR_INIT.3 atomic_compare_exchange_weak.3 \ ATOMIC_VAR_INIT.3 atomic_compare_exchange_weak_explicit.3 \ ATOMIC_VAR_INIT.3 atomic_exchange.3 \ ATOMIC_VAR_INIT.3 atomic_exchange_explicit.3 \ ATOMIC_VAR_INIT.3 atomic_fetch_add.3 \ ATOMIC_VAR_INIT.3 atomic_fetch_add_explicit.3 \ ATOMIC_VAR_INIT.3 atomic_fetch_and.3 \ ATOMIC_VAR_INIT.3 atomic_fetch_and_explicit.3 \ ATOMIC_VAR_INIT.3 atomic_fetch_or.3 \ ATOMIC_VAR_INIT.3 atomic_fetch_or_explicit.3 \ ATOMIC_VAR_INIT.3 atomic_fetch_sub.3 \ ATOMIC_VAR_INIT.3 atomic_fetch_sub_explicit.3 \ ATOMIC_VAR_INIT.3 atomic_fetch_xor.3 \ ATOMIC_VAR_INIT.3 atomic_fetch_xor_explicit.3 \ ATOMIC_VAR_INIT.3 atomic_init.3 \ ATOMIC_VAR_INIT.3 atomic_is_lock_free.3 \ ATOMIC_VAR_INIT.3 atomic_load.3 \ ATOMIC_VAR_INIT.3 atomic_load_explicit.3 \ ATOMIC_VAR_INIT.3 atomic_store.3 \ ATOMIC_VAR_INIT.3 atomic_store_explicit.3 MLINKS+= bitstring.3 bit_alloc.3 \ bitstring.3 bit_clear.3 \ bitstring.3 bit_decl.3 \ bitstring.3 bit_ffc.3 \ bitstring.3 bit_ffc_at.3 \ bitstring.3 bit_ffs.3 \ bitstring.3 bit_ffs_at.3 \ bitstring.3 bit_nclear.3 \ bitstring.3 bit_nset.3 \ bitstring.3 bit_set.3 \ bitstring.3 bitstr_size.3 \ bitstring.3 bit_test.3 MLINKS+= CMSG_DATA.3 CMSG_FIRSTHDR.3 \ CMSG_DATA.3 CMSG_LEN.3 \ CMSG_DATA.3 CMSG_NEXTHDR.3 \ CMSG_DATA.3 CMSG_SPACE.3 MLINKS+= end.3 edata.3 \ end.3 etext.3 MLINKS+= fpgetround.3 fpgetmask.3 \ fpgetround.3 fpgetprec.3 \ fpgetround.3 fpgetsticky.3 \ fpgetround.3 fpresetsticky.3 \ fpgetround.3 fpsetmask.3 \ fpgetround.3 fpsetprec.3 \ fpgetround.3 fpsetround.3 MLINKS+= makedev.3 major.3 \ makedev.3 minor.3 MLINKS+= ${PTHREAD_MLINKS} MLINKS+= Q_FRAWMASK.3 Q_GFRAW.3 \ Q_FRAWMASK.3 Q_GFABSVAL.3 \ Q_FRAWMASK.3 Q_GFVAL.3 \ Q_FRAWMASK.3 Q_SFVAL.3 MLINKS+= Q_IFRAWMASK.3 Q_IFVALIMASK.3 \ Q_IFRAWMASK.3 Q_IFVALFMASK.3 \ Q_IFRAWMASK.3 Q_GIFRAW.3 \ Q_IFRAWMASK.3 Q_GIFABSVAL.3 \ Q_IFRAWMASK.3 Q_GIFVAL.3 \ Q_IFRAWMASK.3 Q_SIFVAL.3 \ Q_IFRAWMASK.3 Q_SIFVALS.3 MLINKS+= Q_INI.3 Q_NCBITS.3 \ Q_INI.3 Q_BT.3 \ Q_INI.3 Q_TC.3 \ Q_INI.3 Q_NTBITS.3 \ Q_INI.3 Q_NFCBITS.3 \ Q_INI.3 Q_MAXNFBITS.3 \ Q_INI.3 Q_NFBITS.3 \ Q_INI.3 Q_NIBITS.3 \ Q_INI.3 Q_RPSHFT.3 \ Q_INI.3 Q_ABS.3 \ Q_INI.3 Q_MAXSTRLEN.3 \ Q_INI.3 Q_TOSTR.3 \ Q_INI.3 Q_SHL.3 \ Q_INI.3 Q_SHR.3 \ Q_INI.3 Q_DEBUG.3 \ Q_INI.3 Q_DFV2BFV.3 MLINKS+= Q_IRAWMASK.3 Q_GIRAW.3 \ Q_IRAWMASK.3 Q_GIABSVAL.3 \ Q_IRAWMASK.3 Q_GIVAL.3 \ Q_IRAWMASK.3 Q_SIVAL.3 MLINKS+= Q_QABS.3 Q_Q2D.3 \ Q_QABS.3 Q_Q2F.3 MLINKS+= Q_QADDI.3 Q_QDIVI.3 \ Q_QADDI.3 Q_QMULI.3 \ Q_QADDI.3 Q_QSUBI.3 \ Q_QADDI.3 Q_QFRACI.3 \ Q_QADDI.3 Q_QCPYVALI.3 MLINKS+= Q_QADDQ.3 Q_QDIVQ.3 \ Q_QADDQ.3 Q_QMULQ.3 \ Q_QADDQ.3 Q_QSUBQ.3 \ Q_QADDQ.3 Q_NORMPREC.3 \ Q_QADDQ.3 Q_QMAXQ.3 \ Q_QADDQ.3 Q_QMINQ.3 \ Q_QADDQ.3 Q_QCLONEQ.3 \ Q_QADDQ.3 Q_QCPYVALQ.3 MLINKS+= Q_SIGNED.3 Q_LTZ.3 \ Q_SIGNED.3 Q_PRECEQ.3 \ Q_SIGNED.3 Q_QLTQ.3 \ Q_SIGNED.3 Q_QLEQ.3 \ Q_SIGNED.3 Q_QGTQ.3 \ Q_SIGNED.3 Q_QGEQ.3 \ Q_SIGNED.3 Q_QEQ.3 \ Q_SIGNED.3 Q_QNEQ.3 \ Q_SIGNED.3 Q_OFLOW.3 \ Q_SIGNED.3 Q_RELPREC.3 MLINKS+= Q_SIGNSHFT.3 Q_SSIGN.3 \ Q_SIGNSHFT.3 Q_CRAWMASK.3 \ Q_SIGNSHFT.3 Q_SRAWMASK.3 \ Q_SIGNSHFT.3 Q_GCRAW.3 \ Q_SIGNSHFT.3 Q_GCVAL.3 \ Q_SIGNSHFT.3 Q_SCVAL.3 MLINKS+= queue.3 LIST_CLASS_ENTRY.3 \ queue.3 LIST_CLASS_HEAD.3 \ queue.3 LIST_EMPTY.3 \ queue.3 LIST_ENTRY.3 \ queue.3 LIST_FIRST.3 \ queue.3 LIST_FOREACH.3 \ queue.3 LIST_FOREACH_FROM.3 \ queue.3 LIST_FOREACH_FROM_SAFE.3 \ queue.3 LIST_FOREACH_SAFE.3 \ queue.3 LIST_HEAD.3 \ queue.3 LIST_HEAD_INITIALIZER.3 \ queue.3 LIST_INIT.3 \ queue.3 LIST_INSERT_AFTER.3 \ queue.3 LIST_INSERT_BEFORE.3 \ queue.3 LIST_INSERT_HEAD.3 \ queue.3 LIST_NEXT.3 \ queue.3 LIST_PREV.3 \ queue.3 LIST_REMOVE.3 \ queue.3 LIST_SWAP.3 \ queue.3 SLIST_CLASS_ENTRY.3 \ queue.3 SLIST_CLASS_HEAD.3 \ queue.3 SLIST_EMPTY.3 \ queue.3 SLIST_ENTRY.3 \ queue.3 SLIST_FIRST.3 \ queue.3 SLIST_FOREACH.3 \ queue.3 SLIST_FOREACH_FROM.3 \ queue.3 SLIST_FOREACH_FROM_SAFE.3 \ queue.3 SLIST_FOREACH_SAFE.3 \ queue.3 SLIST_HEAD.3 \ queue.3 SLIST_HEAD_INITIALIZER.3 \ queue.3 SLIST_INIT.3 \ queue.3 SLIST_INSERT_AFTER.3 \ queue.3 SLIST_INSERT_HEAD.3 \ queue.3 SLIST_NEXT.3 \ queue.3 SLIST_REMOVE.3 \ queue.3 SLIST_REMOVE_AFTER.3 \ queue.3 SLIST_REMOVE_HEAD.3 \ queue.3 SLIST_REMOVE_PREVPTR.3 \ queue.3 SLIST_SWAP.3 \ queue.3 STAILQ_CLASS_ENTRY.3 \ queue.3 STAILQ_CLASS_HEAD.3 \ queue.3 STAILQ_CONCAT.3 \ queue.3 STAILQ_EMPTY.3 \ queue.3 STAILQ_ENTRY.3 \ queue.3 STAILQ_FIRST.3 \ queue.3 STAILQ_FOREACH.3 \ queue.3 STAILQ_FOREACH_FROM.3 \ queue.3 STAILQ_FOREACH_FROM_SAFE.3 \ queue.3 STAILQ_FOREACH_SAFE.3 \ queue.3 STAILQ_HEAD.3 \ queue.3 STAILQ_HEAD_INITIALIZER.3 \ queue.3 STAILQ_INIT.3 \ queue.3 STAILQ_INSERT_AFTER.3 \ queue.3 STAILQ_INSERT_HEAD.3 \ queue.3 STAILQ_INSERT_TAIL.3 \ queue.3 STAILQ_LAST.3 \ queue.3 STAILQ_NEXT.3 \ queue.3 STAILQ_REMOVE.3 \ queue.3 STAILQ_REMOVE_AFTER.3 \ queue.3 STAILQ_REMOVE_HEAD.3 \ queue.3 STAILQ_SWAP.3 \ queue.3 TAILQ_CLASS_ENTRY.3 \ queue.3 TAILQ_CLASS_HEAD.3 \ queue.3 TAILQ_CONCAT.3 \ queue.3 TAILQ_EMPTY.3 \ queue.3 TAILQ_ENTRY.3 \ queue.3 TAILQ_FIRST.3 \ queue.3 TAILQ_FOREACH.3 \ queue.3 TAILQ_FOREACH_FROM.3 \ queue.3 TAILQ_FOREACH_FROM_SAFE.3 \ queue.3 TAILQ_FOREACH_REVERSE.3 \ queue.3 TAILQ_FOREACH_REVERSE_FROM.3 \ queue.3 TAILQ_FOREACH_REVERSE_FROM_SAFE.3 \ queue.3 TAILQ_FOREACH_REVERSE_SAFE.3 \ queue.3 TAILQ_FOREACH_SAFE.3 \ queue.3 TAILQ_HEAD.3 \ queue.3 TAILQ_HEAD_INITIALIZER.3 \ queue.3 TAILQ_INIT.3 \ queue.3 TAILQ_INSERT_AFTER.3 \ queue.3 TAILQ_INSERT_BEFORE.3 \ queue.3 TAILQ_INSERT_HEAD.3 \ queue.3 TAILQ_INSERT_TAIL.3 \ queue.3 TAILQ_LAST.3 \ queue.3 TAILQ_NEXT.3 \ queue.3 TAILQ_PREV.3 \ queue.3 TAILQ_REMOVE.3 \ queue.3 TAILQ_SWAP.3 MLINKS+= stdarg.3 va_arg.3 \ stdarg.3 va_copy.3 \ stdarg.3 va_end.3 \ stdarg.3 varargs.3 \ stdarg.3 va_start.3 MLINKS+= timeradd.3 timerclear.3 \ timeradd.3 timercmp.3 \ timeradd.3 timerisset.3 \ timeradd.3 timersub.3 \ timeradd.3 timespecadd.3 \ timeradd.3 timespecsub.3 \ timeradd.3 timespecclear.3 \ timeradd.3 timespecisset.3 \ timeradd.3 timespeccmp.3 MLINKS+= tree.3 RB_EMPTY.3 \ tree.3 RB_ENTRY.3 \ tree.3 RB_FIND.3 \ tree.3 RB_FOREACH.3 \ tree.3 RB_FOREACH_FROM.3 \ tree.3 RB_FOREACH_REVERSE.3 \ tree.3 RB_FOREACH_REVERSE_FROM.3 \ tree.3 RB_FOREACH_REVERSE_SAFE.3 \ tree.3 RB_FOREACH_SAFE.3 \ tree.3 RB_GENERATE.3 \ tree.3 RB_GENERATE_FIND.3 \ tree.3 RB_GENERATE_INSERT.3 \ tree.3 RB_GENERATE_INSERT_COLOR.3 \ tree.3 RB_GENERATE_MINMAX.3 \ tree.3 RB_GENERATE_NEXT.3 \ tree.3 RB_GENERATE_NFIND.3 \ tree.3 RB_GENERATE_PREV.3 \ tree.3 RB_GENERATE_REMOVE.3 \ tree.3 RB_GENERATE_REMOVE_COLOR.3 \ tree.3 RB_GENERATE_STATIC.3 \ tree.3 RB_HEAD.3 \ tree.3 RB_INIT.3 \ tree.3 RB_INITIALIZER.3 \ tree.3 RB_INSERT.3 \ tree.3 RB_LEFT.3 \ tree.3 RB_MAX.3 \ tree.3 RB_MIN.3 \ tree.3 RB_NEXT.3 \ tree.3 RB_NFIND.3 \ tree.3 RB_PARENT.3 \ tree.3 RB_PREV.3 \ tree.3 RB_PROTOTYPE.3 \ tree.3 RB_PROTOTYPE_FIND.3 \ tree.3 RB_PROTOTYPE_INSERT.3 \ tree.3 RB_PROTOTYPE_INSERT_COLOR.3 \ tree.3 RB_PROTOTYPE_MINMAX.3 \ tree.3 RB_PROTOTYPE_NEXT.3 \ tree.3 RB_PROTOTYPE_NFIND.3 \ tree.3 RB_PROTOTYPE_PREV.3 \ tree.3 RB_PROTOTYPE_REMOVE.3 \ tree.3 RB_PROTOTYPE_REMOVE_COLOR.3 \ tree.3 RB_PROTOTYPE_STATIC.3 \ tree.3 RB_REINSERT.3 \ tree.3 RB_REMOVE.3 \ tree.3 RB_RIGHT.3 \ tree.3 RB_ROOT.3 \ tree.3 SPLAY_EMPTY.3 \ tree.3 SPLAY_ENTRY.3 \ tree.3 SPLAY_FIND.3 \ tree.3 SPLAY_FOREACH.3 \ tree.3 SPLAY_GENERATE.3 \ tree.3 SPLAY_HEAD.3 \ tree.3 SPLAY_INIT.3 \ tree.3 SPLAY_INITIALIZER.3 \ tree.3 SPLAY_INSERT.3 \ tree.3 SPLAY_LEFT.3 \ tree.3 SPLAY_MAX.3 \ tree.3 SPLAY_MIN.3 \ tree.3 SPLAY_NEXT.3 \ tree.3 SPLAY_PROTOTYPE.3 \ tree.3 SPLAY_REMOVE.3 \ tree.3 SPLAY_RIGHT.3 \ tree.3 SPLAY_ROOT.3 .if ${MK_LIBTHR} != "no" PTHREAD_MAN= pthread.3 \ pthread_affinity_np.3 \ pthread_atfork.3 \ pthread_attr.3 \ pthread_attr_affinity_np.3 \ pthread_attr_get_np.3 \ pthread_attr_setcreatesuspend_np.3 \ pthread_barrierattr.3 \ pthread_barrier_destroy.3 \ pthread_cancel.3 \ pthread_cleanup_pop.3 \ pthread_cleanup_push.3 \ pthread_condattr.3 \ pthread_cond_broadcast.3 \ pthread_cond_destroy.3 \ pthread_cond_init.3 \ pthread_cond_signal.3 \ pthread_cond_timedwait.3 \ pthread_cond_wait.3 \ pthread_create.3 \ pthread_detach.3 \ pthread_equal.3 \ pthread_exit.3 \ pthread_getconcurrency.3 \ pthread_getcpuclockid.3 \ pthread_getspecific.3 \ pthread_getthreadid_np.3 \ pthread_join.3 \ pthread_key_create.3 \ pthread_key_delete.3 \ pthread_kill.3 \ pthread_main_np.3 \ pthread_multi_np.3 \ pthread_mutexattr.3 \ pthread_mutexattr_getkind_np.3 \ pthread_mutex_consistent.3 \ pthread_mutex_destroy.3 \ pthread_mutex_init.3 \ pthread_mutex_lock.3 \ pthread_mutex_timedlock.3 \ pthread_mutex_trylock.3 \ pthread_mutex_unlock.3 \ pthread_once.3 \ pthread_resume_all_np.3 \ pthread_resume_np.3 \ pthread_rwlockattr_destroy.3 \ pthread_rwlockattr_getpshared.3 \ pthread_rwlockattr_init.3 \ pthread_rwlockattr_setpshared.3 \ pthread_rwlock_destroy.3 \ pthread_rwlock_init.3 \ pthread_rwlock_rdlock.3 \ pthread_rwlock_timedrdlock.3 \ pthread_rwlock_timedwrlock.3 \ pthread_rwlock_unlock.3 \ pthread_rwlock_wrlock.3 \ pthread_schedparam.3 \ pthread_self.3 \ pthread_set_name_np.3 \ pthread_setspecific.3 \ pthread_sigmask.3 \ pthread_spin_init.3 \ pthread_spin_lock.3 \ pthread_suspend_all_np.3 \ pthread_suspend_np.3 \ pthread_switch_add_np.3 \ pthread_testcancel.3 \ pthread_yield.3 PTHREAD_MLINKS= pthread_affinity_np.3 pthread_getaffinity_np.3 \ pthread_affinity_np.3 pthread_setaffinity_np.3 PTHREAD_MLINKS+=pthread_attr.3 pthread_attr_destroy.3 \ pthread_attr.3 pthread_attr_getdetachstate.3 \ pthread_attr.3 pthread_attr_getguardsize.3 \ pthread_attr.3 pthread_attr_getinheritsched.3 \ pthread_attr.3 pthread_attr_getschedparam.3 \ pthread_attr.3 pthread_attr_getschedpolicy.3 \ pthread_attr.3 pthread_attr_getscope.3 \ pthread_attr.3 pthread_attr_getstack.3 \ pthread_attr.3 pthread_attr_getstackaddr.3 \ pthread_attr.3 pthread_attr_getstacksize.3 \ pthread_attr.3 pthread_attr_init.3 \ pthread_attr.3 pthread_attr_setdetachstate.3 \ pthread_attr.3 pthread_attr_setguardsize.3 \ pthread_attr.3 pthread_attr_setinheritsched.3 \ pthread_attr.3 pthread_attr_setschedparam.3 \ pthread_attr.3 pthread_attr_setschedpolicy.3 \ pthread_attr.3 pthread_attr_setscope.3 \ pthread_attr.3 pthread_attr_setstack.3 \ pthread_attr.3 pthread_attr_setstackaddr.3 \ pthread_attr.3 pthread_attr_setstacksize.3 PTHREAD_MLINKS+=pthread_attr_affinity_np.3 pthread_attr_getaffinity_np.3 \ pthread_attr_affinity_np.3 pthread_attr_setaffinity_np.3 PTHREAD_MLINKS+=pthread_barrierattr.3 pthread_barrierattr_destroy.3 \ pthread_barrierattr.3 pthread_barrierattr_getpshared.3 \ pthread_barrierattr.3 pthread_barrierattr_init.3 \ pthread_barrierattr.3 pthread_barrierattr_setpshared.3 PTHREAD_MLINKS+=pthread_barrier_destroy.3 pthread_barrier_init.3 \ pthread_barrier_destroy.3 pthread_barrier_wait.3 PTHREAD_MLINKS+=pthread_condattr.3 pthread_condattr_destroy.3 \ pthread_condattr.3 pthread_condattr_init.3 \ pthread_condattr.3 pthread_condattr_getclock.3 \ pthread_condattr.3 pthread_condattr_setclock.3 \ pthread_condattr.3 pthread_condattr_getpshared.3 \ pthread_condattr.3 pthread_condattr_setpshared.3 PTHREAD_MLINKS+=pthread_getconcurrency.3 pthread_setconcurrency.3 PTHREAD_MLINKS+=pthread_multi_np.3 pthread_single_np.3 PTHREAD_MLINKS+=pthread_mutexattr.3 pthread_mutexattr_destroy.3 \ pthread_mutexattr.3 pthread_mutexattr_getprioceiling.3 \ pthread_mutexattr.3 pthread_mutexattr_getprotocol.3 \ pthread_mutexattr.3 pthread_mutexattr_getrobust.3 \ pthread_mutexattr.3 pthread_mutexattr_gettype.3 \ pthread_mutexattr.3 pthread_mutexattr_init.3 \ pthread_mutexattr.3 pthread_mutexattr_setprioceiling.3 \ pthread_mutexattr.3 pthread_mutexattr_setprotocol.3 \ pthread_mutexattr.3 pthread_mutexattr_setrobust.3 \ pthread_mutexattr.3 pthread_mutexattr_settype.3 PTHREAD_MLINKS+=pthread_mutexattr_getkind_np.3 pthread_mutexattr_setkind_np.3 PTHREAD_MLINKS+=pthread_rwlock_rdlock.3 pthread_rwlock_tryrdlock.3 PTHREAD_MLINKS+=pthread_rwlock_wrlock.3 pthread_rwlock_trywrlock.3 PTHREAD_MLINKS+=pthread_schedparam.3 pthread_getschedparam.3 \ pthread_schedparam.3 pthread_setschedparam.3 PTHREAD_MLINKS+=pthread_set_name_np.3 pthread_get_name_np.3 PTHREAD_MLINKS+=pthread_spin_init.3 pthread_spin_destroy.3 \ pthread_spin_lock.3 pthread_spin_trylock.3 \ pthread_spin_lock.3 pthread_spin_unlock.3 PTHREAD_MLINKS+=pthread_switch_add_np.3 pthread_switch_delete_np.3 PTHREAD_MLINKS+=pthread_testcancel.3 pthread_setcancelstate.3 \ pthread_testcancel.3 pthread_setcanceltype.3 PTHREAD_MLINKS+=pthread_join.3 pthread_timedjoin_np.3 .endif .include Index: head/share/man/man3/arb.3 =================================================================== --- head/share/man/man3/arb.3 (revision 352838) +++ head/share/man/man3/arb.3 (revision 352839) @@ -1,483 +1,504 @@ .\" $OpenBSD: tree.3,v 1.7 2002/06/12 01:09:20 provos Exp $ .\" .\" Copyright 2002 Niels Provos .\" 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. .\" 3. All advertising materials mentioning features or use of this software .\" must display the following acknowledgement: .\" This product includes software developed by Niels Provos. .\" 4. The name of the author may not be used to endorse or promote products .\" derived from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. .\" .\" $FreeBSD$ .\" -.Dd May 8, 2019 +.Dd September 28, 2019 .Dt ARB 3 .Os .Sh NAME .Nm ARB_PROTOTYPE , .Nm ARB_PROTOTYPE_STATIC , .Nm ARB_PROTOTYPE_INSERT , .Nm ARB_PROTOTYPE_INSERT_COLOR , .Nm ARB_PROTOTYPE_REMOVE , .Nm ARB_PROTOTYPE_REMOVE_COLOR , .Nm ARB_PROTOTYPE_FIND , .Nm ARB_PROTOTYPE_NFIND , .Nm ARB_PROTOTYPE_NEXT , .Nm ARB_PROTOTYPE_PREV , .Nm ARB_PROTOTYPE_MINMAX , +.Nm ARB_PROTOTYPE_REINSERT , .Nm ARB_GENERATE , .Nm ARB_GENERATE_STATIC , .Nm ARB_GENERATE_INSERT , .Nm ARB_GENERATE_INSERT_COLOR , .Nm ARB_GENERATE_REMOVE , .Nm ARB_GENERATE_REMOVE_COLOR , .Nm ARB_GENERATE_FIND , .Nm ARB_GENERATE_NFIND , .Nm ARB_GENERATE_NEXT , .Nm ARB_GENERATE_PREV , .Nm ARB_GENERATE_MINMAX , +.Nm ARB_GENERATE_REINSERT , .Nm ARB8_ENTRY , .Nm ARB16_ENTRY , .Nm ARB32_ENTRY , .Nm ARB8_HEAD , .Nm ARB16_HEAD , .Nm ARB32_HEAD , .Nm ARB_ALLOCSIZE , .Nm ARB_INITIALIZER , .Nm ARB_ROOT , .Nm ARB_EMPTY , .Nm ARB_FULL , .Nm ARB_CURNODES , .Nm ARB_MAXNODES , .Nm ARB_NEXT , .Nm ARB_PREV , .Nm ARB_MIN , .Nm ARB_MAX , .Nm ARB_FIND , .Nm ARB_NFIND , .Nm ARB_LEFT , .Nm ARB_LEFTIDX , .Nm ARB_RIGHT , .Nm ARB_RIGHTIDX , .Nm ARB_PARENT , .Nm ARB_PARENTIDX , .Nm ARB_GETFREE , .Nm ARB_FREEIDX , .Nm ARB_FOREACH , .Nm ARB_FOREACH_FROM , .Nm ARB_FOREACH_SAFE , .Nm ARB_FOREACH_REVERSE , .Nm ARB_FOREACH_REVERSE_FROM , .Nm ARB_FOREACH_REVERSE_SAFE , .Nm ARB_INIT , .Nm ARB_INSERT , -.Nm ARB_REMOVE +.Nm ARB_REMOVE , +.Nm ARB_REINSERT .Nd "array-based red-black trees" .Sh SYNOPSIS .In sys/arb.h .Fn ARB_PROTOTYPE NAME TYPE FIELD CMP .Fn ARB_PROTOTYPE_STATIC NAME TYPE FIELD CMP .Fn ARB_PROTOTYPE_INSERT NAME TYPE ATTR .Fn ARB_PROTOTYPE_INSERT_COLOR NAME TYPE ATTR .Fn ARB_PROTOTYPE_REMOVE NAME TYPE ATTR .Fn ARB_PROTOTYPE_REMOVE_COLOR NAME TYPE ATTR .Fn ARB_PROTOTYPE_FIND NAME TYPE ATTR .Fn ARB_PROTOTYPE_NFIND NAME TYPE ATTR .Fn ARB_PROTOTYPE_NEXT NAME TYPE ATTR .Fn ARB_PROTOTYPE_PREV NAME TYPE ATTR .Fn ARB_PROTOTYPE_MINMAX NAME TYPE ATTR +.Fn ARB_PROTOTYPE_REINSERT NAME TYPE ATTR .Fn ARB_GENERATE NAME TYPE FIELD CMP .Fn ARB_GENERATE_STATIC NAME TYPE FIELD CMP .Fn ARB_GENERATE_INSERT NAME TYPE FIELD CMP ATTR .Fn ARB_GENERATE_INSERT_COLOR NAME TYPE FIELD ATTR .Fn ARB_GENERATE_REMOVE NAME TYPE FIELD ATTR .Fn ARB_GENERATE_REMOVE_COLOR NAME TYPE FIELD ATTR .Fn ARB_GENERATE_FIND NAME TYPE FIELD CMP ATTR .Fn ARB_GENERATE_NFIND NAME TYPE FIELD CMP ATTR .Fn ARB_GENERATE_NEXT NAME TYPE FIELD ATTR .Fn ARB_GENERATE_PREV NAME TYPE FIELD ATTR .Fn ARB_GENERATE_MINMAX NAME TYPE FIELD ATTR +.Fn ARB_GENERATE_REINSERT NAME TYPE FIELD CMP ATTR .Fn ARB<8|16|32>_ENTRY .Fn ARB<8|16|32>_HEAD HEADNAME TYPE .Ft "size_t" .Fn ARB_ALLOCSIZE "ARB_HEAD *head" "int<8|16|32>_t maxnodes" "struct TYPE *elm" .Fn ARB_INITIALIZER "ARB_HEAD *head" "int<8|16|32>_t maxnodes" .Ft "struct TYPE *" .Fn ARB_ROOT "ARB_HEAD *head" .Ft "bool" .Fn ARB_EMPTY "ARB_HEAD *head" .Ft "bool" .Fn ARB_FULL "ARB_HEAD *head" .Ft "int<8|16|32>_t" .Fn ARB_CURNODES "ARB_HEAD *head" .Ft "int<8|16|32>_t" .Fn ARB_MAXNODES "ARB_HEAD *head" .Ft "struct TYPE *" .Fn ARB_NEXT NAME "ARB_HEAD *head" "struct TYPE *elm" .Ft "struct TYPE *" .Fn ARB_PREV NAME "ARB_HEAD *head" "struct TYPE *elm" .Ft "struct TYPE *" .Fn ARB_MIN NAME "ARB_HEAD *head" .Ft "struct TYPE *" .Fn ARB_MAX NAME "ARB_HEAD *head" .Ft "struct TYPE *" .Fn ARB_FIND NAME "ARB_HEAD *head" "struct TYPE *elm" .Ft "struct TYPE *" .Fn ARB_NFIND NAME "ARB_HEAD *head" "struct TYPE *elm" .Ft "struct TYPE *" .Fn ARB_LEFT "struct TYPE *elm" "ARB_ENTRY NAME" .Ft "int<8|16|32>_t" .Fn ARB_LEFTIDX "struct TYPE *elm" "ARB_ENTRY NAME" .Ft "struct TYPE *" .Fn ARB_RIGHT "struct TYPE *elm" "ARB_ENTRY NAME" .Ft "int<8|16|32>_t" .Fn ARB_RIGHTIDX "struct TYPE *elm" "ARB_ENTRY NAME" .Ft "struct TYPE *" .Fn ARB_PARENT "struct TYPE *elm" "ARB_ENTRY NAME" .Ft "int<8|16|32>_t" .Fn ARB_PARENTIDX "struct TYPE *elm" "ARB_ENTRY NAME" .Ft "struct TYPE *" .Fn ARB_GETFREE "ARB_HEAD *head" "FIELD" .Ft "int<8|16|32>_t" .Fn ARB_FREEIDX "ARB_HEAD *head" .Fn ARB_FOREACH VARNAME NAME "ARB_HEAD *head" .Fn ARB_FOREACH_FROM "VARNAME" "NAME" "POS_VARNAME" .Fn ARB_FOREACH_SAFE "VARNAME" "NAME" "ARB_HEAD *head" "TEMP_VARNAME" .Fn ARB_FOREACH_REVERSE VARNAME NAME "ARB_HEAD *head" .Fn ARB_FOREACH_REVERSE_FROM "VARNAME" "NAME" "POS_VARNAME" .Fn ARB_FOREACH_REVERSE_SAFE "VARNAME" "NAME" "ARB_HEAD *head" "TEMP_VARNAME" .Ft void .Fn ARB_INIT "struct TYPE *elm" "FIELD" "ARB_HEAD *head" "int<8|16|32>_t maxnodes" .Ft "struct TYPE *" .Fn ARB_INSERT NAME "ARB_HEAD *head" "struct TYPE *elm" .Ft "struct TYPE *" .Fn ARB_REMOVE NAME "ARB_HEAD *head" "struct TYPE *elm" +.Ft "struct TYPE *" +.Fn ARB_REINSERT NAME "ARB_HEAD *head" "struct TYPE *elm" .Sh DESCRIPTION These macros define data structures for and array-based red-black trees. They use a single, continuous chunk of memory, and are useful e.g., when the tree needs to be transferred between userspace and kernel. .Pp In the macro definitions, .Fa TYPE is the name tag of a user defined structure that must contain a field of type .Vt ARB_ENTRY , named .Fa ENTRYNAME . The argument .Fa HEADNAME is the name tag of a user defined structure that must be declared using the .Fn ARB_HEAD macro. The argument .Fa NAME has to be a unique name prefix for every tree that is defined. .Pp The function prototypes are declared with .Fn ARB_PROTOTYPE , or .Fn ARB_PROTOTYPE_STATIC . The function bodies are generated with .Fn ARB_GENERATE , or .Fn ARB_GENERATE_STATIC . See the examples below for further explanation of how these macros are used. .Pp A red-black tree is a binary search tree with the node color as an extra attribute. It fulfills a set of conditions: .Bl -enum -offset indent .It Every search path from the root to a leaf consists of the same number of black nodes. .It Each red node (except for the root) has a black parent. .It Each leaf node is black. .El .Pp Every operation on a red-black tree is bounded as .Fn O "lg n" . The maximum height of a red-black tree is .Fn 2lg "n + 1" . .Pp .Fn ARB_* trees require entries to be allocated as an array, and uses array indices to link entries together. The maximum number of .Fn ARB_* tree entries is therefore constrained by the minimum of array size and choice of signed integer data type used to store array indices. Use .Fn ARB_ALLOCSIZE to compute the size of memory chunk to allocate. .Pp A red-black tree is headed by a structure defined by the .Fn ARB_HEAD macro. A structure is declared with either of the following: .Bd -ragged -offset indent .Fn ARB<8|16|32>_HEAD HEADNAME TYPE .Va head ; .Ed .Pp where .Fa HEADNAME is the name of the structure to be defined, and struct .Fa TYPE is the type of the elements to be inserted into the tree. .Pp The .Fn ARB_HEAD variant includes a suffix denoting the signed integer data type size .Pq in bits used to store array indices. For example, .Fn ARB_HEAD8 creates a red-black tree head strucutre with 8-bit signed array indices capable of indexing up to 128 entries. .Pp The .Fn ARB_ENTRY macro declares a structure that allows elements to be connected in the tree. Similarly to the .Fn ARB<8|16|32>_HEAD macro, the .Fn ARB_ENTRY variant includes a suffix denoting the signed integer data type size .Pq in bits used to store array indices. Entries should use the same number of bits as the tree head structure they will be linked into. .Pp In order to use the functions that manipulate the tree structure, their prototypes need to be declared with the .Fn ARB_PROTOTYPE or .Fn ARB_PROTOTYPE_STATIC macro, where .Fa NAME is a unique identifier for this particular tree. The .Fa TYPE argument is the type of the structure that is being managed by the tree. The .Fa FIELD argument is the name of the element defined by .Fn ARB_ENTRY . Individual prototypes can be declared with .Fn ARB_PROTOTYPE_INSERT , .Fn ARB_PROTOTYPE_INSERT_COLOR , .Fn ARB_PROTOTYPE_REMOVE , .Fn ARB_PROTOTYPE_REMOVE_COLOR , .Fn ARB_PROTOTYPE_FIND , .Fn ARB_PROTOTYPE_NFIND , .Fn ARB_PROTOTYPE_NEXT , .Fn ARB_PROTOTYPE_PREV , +.Fn ARB_PROTOTYPE_MINMAX , and -.Fn ARB_PROTOTYPE_MINMAX +.Fn ARB_PROTOTYPE_REINSERT in case not all functions are required. The individual prototype macros expect .Fa NAME , .Fa TYPE , and .Fa ATTR arguments. The .Fa ATTR argument must be empty for global functions or .Fa static for static functions. .Pp The function bodies are generated with the .Fn ARB_GENERATE or .Fn ARB_GENERATE_STATIC macro. These macros take the same arguments as the .Fn ARB_PROTOTYPE and .Fn ARB_PROTOTYPE_STATIC macros, but should be used only once. As an alternative individual function bodies are generated with the .Fn ARB_GENERATE_INSERT , .Fn ARB_GENERATE_INSERT_COLOR , .Fn ARB_GENERATE_REMOVE , .Fn ARB_GENERATE_REMOVE_COLOR , .Fn ARB_GENERATE_FIND , .Fn ARB_GENERATE_NFIND , .Fn ARB_GENERATE_NEXT , .Fn ARB_GENERATE_PREV , +.Fn ARB_GENERATE_MINMAX , and -.Fn ARB_GENERATE_MINMAX +.Fn ARB_GENERATE_REINSERT macros. .Pp Finally, the .Fa CMP argument is the name of a function used to compare tree nodes with each other. The function takes two arguments of type .Vt "struct TYPE *" . If the first argument is smaller than the second, the function returns a value smaller than zero. If they are equal, the function returns zero. Otherwise, it should return a value greater than zero. The compare function defines the order of the tree elements. .Pp The .Fn ARB_INIT macro initializes the tree referenced by .Fa head , with the array length of .Fa maxnodes . .Pp The red-black tree can also be initialized statically by using the .Fn ARB_INITIALIZER macro: .Bd -ragged -offset indent .Fn ARB<8|16|32>_HEAD HEADNAME TYPE .Va head = .Fn ARB_INITIALIZER &head maxnodes ; .Ed .Pp The .Fn ARB_INSERT macro inserts the new element .Fa elm into the tree. .Pp The .Fn ARB_REMOVE macro removes the element .Fa elm from the tree pointed by .Fa head . .Pp The .Fn ARB_FIND and .Fn ARB_NFIND macros can be used to find a particular element in the tree. .Bd -literal -offset indent struct TYPE find, *res; find.key = 30; res = RB_FIND(NAME, head, &find); .Ed .Pp The .Fn ARB_ROOT , .Fn ARB_MIN , .Fn ARB_MAX , .Fn ARB_NEXT , and .Fn ARB_PREV macros can be used to traverse the tree: .Pp .Dl "for (np = RB_MIN(NAME, &head); np != NULL; np = RB_NEXT(NAME, &head, np))" .Pp Or, for simplicity, one can use the .Fn ARB_FOREACH or .Fn ARB_FOREACH_REVERSE macro: .Bd -ragged -offset indent .Fn RB_FOREACH np NAME head .Ed .Pp The macros .Fn ARB_FOREACH_SAFE and .Fn ARB_FOREACH_REVERSE_SAFE traverse the tree referenced by head in a forward or reverse direction respectively, assigning each element in turn to np. However, unlike their unsafe counterparts, they permit both the removal of np as well as freeing it from within the loop safely without interfering with the traversal. .Pp Both .Fn ARB_FOREACH_FROM and .Fn ARB_FOREACH_REVERSE_FROM may be used to continue an interrupted traversal in a forward or reverse direction respectively. The head pointer is not required. The pointer to the node from where to resume the traversal should be passed as their last argument, and will be overwritten to provide safe traversal. .Pp The .Fn ARB_EMPTY macro should be used to check whether a red-black tree is empty. .Pp Given that ARB trees have an intrinsic upper bound on the number of entries, some ARB-specific additional macros are defined. The .Fn ARB_FULL macro returns a boolean indicating whether the current number of tree entries equals the tree's maximum. The .Fn ARB_CURNODES and .Fn ARB_MAXNODES macros return the current and maximum number of entries respectively. The .Fn ARB_GETFREE macro returns a pointer to the next free entry in the array of entries, ready to be linked into the tree. The .Fn ARB_INSERT returns .Dv NULL if the element was inserted in the tree successfully, otherwise they return a pointer to the element with the colliding key. .Pp Accordingly, .Fn ARB_REMOVE returns the pointer to the removed element otherwise they return .Dv NULL to indicate an error. +.Pp +The +.Fn RB_REINSERT +macro updates the position of the element +.Fa elm +in the tree. +This must be called if a member of a +.Nm tree +is modified in a way that affects comparison, such as by modifying +a node's key. +This is a lower overhead alternative to removing the element +and reinserting it again. .Sh SEE ALSO .Xr queue 3 , .Xr tree 3 .Sh HISTORY The .Nm ARB macros first appeared in .Fx 13.0 . .Sh AUTHORS The .Nm ARB macros were implemented by .An Lawrence Stewart Aq Mt lstewart@FreeBSD.org , based on .Xr tree 3 macros written by .An Niels Provos . Index: head/sys/sys/arb.h =================================================================== --- head/sys/sys/arb.h (revision 352838) +++ head/sys/sys/arb.h (revision 352839) @@ -1,779 +1,779 @@ /* $NetBSD: tree.h,v 1.8 2004/03/28 19:38:30 provos Exp $ */ /* $OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $ */ /* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright 2002 Niels Provos * 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 AUTHOR ``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 AUTHOR 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. */ #ifndef _SYS_ARB_H_ #define _SYS_ARB_H_ #include /* Array-based red-black trees. */ #define ARB_NULLIDX -1 #define ARB_NULLCOL -1 #define ARB_BLACK 0 #define ARB_RED 1 #define ARB_NEGINF -1 #define ARB_INF 1 #define ARB_HEAD(name, type, idxbits) \ struct name { \ int##idxbits##_t arb_curnodes; \ int##idxbits##_t arb_maxnodes; \ int##idxbits##_t arb_root_idx; \ int##idxbits##_t arb_free_idx; \ int##idxbits##_t arb_min_idx; \ int##idxbits##_t arb_max_idx; \ struct type arb_nodes[]; \ } #define ARB8_HEAD(name, type) ARB_HEAD(name, type, 8) #define ARB16_HEAD(name, type) ARB_HEAD(name, type, 16) #define ARB32_HEAD(name, type) ARB_HEAD(name, type, 32) #define ARB_ALLOCSIZE(head, maxn, x) \ (sizeof(*head) + (maxn) * sizeof(*x)) #define ARB_INITIALIZER(name, maxn) \ ((struct name){ 0, maxn, ARB_NULLIDX, ARB_NULLIDX, \ ARB_NULLIDX, ARB_NULLIDX }) #define ARB_INIT(x, field, head, maxn) \ (head)->arb_curnodes = 0; \ (head)->arb_maxnodes = (maxn); \ (head)->arb_root_idx = (head)->arb_free_idx = \ (head)->arb_min_idx = (head)->arb_max_idx = ARB_NULLIDX; \ /* The ARB_RETURNFREE() puts all entries on the free list. */ \ ARB_ARRFOREACH_REVWCOND(x, field, head, \ ARB_RETURNFREE(head, x, field)) #define ARB_ENTRY(idxbits) \ struct { \ int##idxbits##_t arbe_parent_idx; \ int##idxbits##_t arbe_left_idx; \ int##idxbits##_t arbe_right_idx; \ int8_t arbe_color; \ } #define ARB8_ENTRY() ARB_ENTRY(8) #define ARB16_ENTRY() ARB_ENTRY(16) #define ARB32_ENTRY() ARB_ENTRY(32) #define ARB_ENTRYINIT(elm, field) do { \ (elm)->field.arbe_parent_idx = \ (elm)->field.arbe_left_idx = \ (elm)->field.arbe_right_idx = ARB_NULLIDX; \ (elm)->field.arbe_color = ARB_NULLCOL; \ } while (/*CONSTCOND*/ 0) #define ARB_ELMTYPE(head) __typeof(&(head)->arb_nodes[0]) #define ARB_NODES(head) (head)->arb_nodes #define ARB_MAXNODES(head) (head)->arb_maxnodes #define ARB_CURNODES(head) (head)->arb_curnodes #define ARB_EMPTY(head) ((head)->arb_curnodes == 0) #define ARB_FULL(head) ((head)->arb_curnodes >= (head)->arb_maxnodes) #define ARB_CNODE(head, idx) \ ((((intptr_t)(idx) <= ARB_NULLIDX) || ((idx) >= ARB_MAXNODES(head))) ? \ NULL : ((const ARB_ELMTYPE(head))(ARB_NODES(head) + (idx)))) #define ARB_NODE(head, idx) \ (__DECONST(ARB_ELMTYPE(head), ARB_CNODE(head, idx))) #define ARB_ROOT(head) ARB_NODE(head, ARB_ROOTIDX(head)) #define ARB_LEFT(head, elm, field) ARB_NODE(head, ARB_LEFTIDX(elm, field)) #define ARB_RIGHT(head, elm, field) ARB_NODE(head, ARB_RIGHTIDX(elm, field)) #define ARB_PARENT(head, elm, field) ARB_NODE(head, ARB_PARENTIDX(elm, field)) #define ARB_FREEIDX(head) (head)->arb_free_idx #define ARB_ROOTIDX(head) (head)->arb_root_idx #define ARB_MINIDX(head) (head)->arb_min_idx #define ARB_MAXIDX(head) (head)->arb_max_idx #define ARB_SELFIDX(head, elm) \ ((elm) ? ((intptr_t)((((const uint8_t *)(elm)) - \ ((const uint8_t *)ARB_NODES(head))) / sizeof(*(elm)))) : \ (intptr_t)ARB_NULLIDX) #define ARB_LEFTIDX(elm, field) (elm)->field.arbe_left_idx #define ARB_RIGHTIDX(elm, field) (elm)->field.arbe_right_idx #define ARB_PARENTIDX(elm, field) (elm)->field.arbe_parent_idx #define ARB_COLOR(elm, field) (elm)->field.arbe_color #define ARB_PREVFREE(head, elm, field) \ ARB_NODE(head, ARB_PREVFREEIDX(elm, field)) #define ARB_PREVFREEIDX(elm, field) ARB_LEFTIDX(elm, field) #define ARB_NEXTFREE(head, elm, field) \ ARB_NODE(head, ARB_NEXTFREEIDX(elm, field)) #define ARB_NEXTFREEIDX(elm, field) ARB_RIGHTIDX(elm, field) #define ARB_ISFREE(elm, field) (ARB_COLOR(elm, field) == ARB_NULLCOL) #define ARB_SET(head, elm, parent, field) do { \ ARB_PARENTIDX(elm, field) = \ parent ? ARB_SELFIDX(head, parent) : ARB_NULLIDX; \ ARB_LEFTIDX(elm, field) = ARB_RIGHTIDX(elm, field) = ARB_NULLIDX; \ ARB_COLOR(elm, field) = ARB_RED; \ } while (/*CONSTCOND*/ 0) #define ARB_SET_BLACKRED(black, red, field) do { \ ARB_COLOR(black, field) = ARB_BLACK; \ ARB_COLOR(red, field) = ARB_RED; \ } while (/*CONSTCOND*/ 0) #ifndef ARB_AUGMENT #define ARB_AUGMENT(x) do {} while (0) #endif #define ARB_ROTATE_LEFT(head, elm, tmp, field) do { \ __typeof(ARB_RIGHTIDX(elm, field)) _tmpidx; \ (tmp) = ARB_RIGHT(head, elm, field); \ _tmpidx = ARB_RIGHTIDX(elm, field); \ ARB_RIGHTIDX(elm, field) = ARB_LEFTIDX(tmp, field); \ if (ARB_RIGHTIDX(elm, field) != ARB_NULLIDX) { \ ARB_PARENTIDX(ARB_LEFT(head, tmp, field), field) = \ ARB_SELFIDX(head, elm); \ } \ ARB_AUGMENT(elm); \ ARB_PARENTIDX(tmp, field) = ARB_PARENTIDX(elm, field); \ if (ARB_PARENTIDX(tmp, field) != ARB_NULLIDX) { \ if (ARB_SELFIDX(head, elm) == \ ARB_LEFTIDX(ARB_PARENT(head, elm, field), field)) \ ARB_LEFTIDX(ARB_PARENT(head, elm, field), \ field) = _tmpidx; \ else \ ARB_RIGHTIDX(ARB_PARENT(head, elm, field), \ field) = _tmpidx; \ } else \ ARB_ROOTIDX(head) = _tmpidx; \ ARB_LEFTIDX(tmp, field) = ARB_SELFIDX(head, elm); \ ARB_PARENTIDX(elm, field) = _tmpidx; \ ARB_AUGMENT(tmp); \ if (ARB_PARENTIDX(tmp, field) != ARB_NULLIDX) \ ARB_AUGMENT(ARB_PARENT(head, tmp, field)); \ } while (/*CONSTCOND*/ 0) #define ARB_ROTATE_RIGHT(head, elm, tmp, field) do { \ __typeof(ARB_LEFTIDX(elm, field)) _tmpidx; \ (tmp) = ARB_LEFT(head, elm, field); \ _tmpidx = ARB_LEFTIDX(elm, field); \ ARB_LEFTIDX(elm, field) = ARB_RIGHTIDX(tmp, field); \ if (ARB_LEFTIDX(elm, field) != ARB_NULLIDX) { \ ARB_PARENTIDX(ARB_RIGHT(head, tmp, field), field) = \ ARB_SELFIDX(head, elm); \ } \ ARB_AUGMENT(elm); \ ARB_PARENTIDX(tmp, field) = ARB_PARENTIDX(elm, field); \ if (ARB_PARENTIDX(tmp, field) != ARB_NULLIDX) { \ if (ARB_SELFIDX(head, elm) == \ ARB_LEFTIDX(ARB_PARENT(head, elm, field), field)) \ ARB_LEFTIDX(ARB_PARENT(head, elm, field), \ field) = _tmpidx; \ else \ ARB_RIGHTIDX(ARB_PARENT(head, elm, field), \ field) = _tmpidx; \ } else \ ARB_ROOTIDX(head) = _tmpidx; \ ARB_RIGHTIDX(tmp, field) = ARB_SELFIDX(head, elm); \ ARB_PARENTIDX(elm, field) = _tmpidx; \ ARB_AUGMENT(tmp); \ if (ARB_PARENTIDX(tmp, field) != ARB_NULLIDX) \ ARB_AUGMENT(ARB_PARENT(head, tmp, field)); \ } while (/*CONSTCOND*/ 0) #define ARB_RETURNFREE(head, elm, field) \ ({ \ ARB_COLOR(elm, field) = ARB_NULLCOL; \ ARB_NEXTFREEIDX(elm, field) = ARB_FREEIDX(head); \ ARB_FREEIDX(head) = ARB_SELFIDX(head, elm); \ elm; \ }) #define ARB_GETFREEAT(head, field, fidx) \ ({ \ __typeof(ARB_NODE(head, 0)) _elm, _prevelm; \ int _idx = fidx; \ if (ARB_FREEIDX(head) == ARB_NULLIDX && !ARB_FULL(head)) { \ /* Populate the free list. */ \ ARB_ARRFOREACH_REVERSE(_elm, field, head) { \ if (ARB_ISFREE(_elm, field)) \ ARB_RETURNFREE(head, _elm, field); \ } \ } \ _elm = _prevelm = ARB_NODE(head, ARB_FREEIDX(head)); \ for (; _idx > 0 && _elm != NULL; _idx--, _prevelm = _elm) \ _elm = ARB_NODE(head, ARB_NEXTFREEIDX(_elm, field)); \ if (_elm) { \ if (fidx == 0) \ ARB_FREEIDX(head) = \ ARB_NEXTFREEIDX(_elm, field); \ else \ ARB_NEXTFREEIDX(_prevelm, field) = \ ARB_NEXTFREEIDX(_elm, field); \ } \ _elm; \ }) #define ARB_GETFREE(head, field) ARB_GETFREEAT(head, field, 0) /* Generates prototypes and inline functions */ #define ARB_PROTOTYPE(name, type, field, cmp) \ ARB_PROTOTYPE_INTERNAL(name, type, field, cmp,) #define ARB_PROTOTYPE_STATIC(name, type, field, cmp) \ ARB_PROTOTYPE_INTERNAL(name, type, field, cmp, __unused static) #define ARB_PROTOTYPE_INTERNAL(name, type, field, cmp, attr) \ ARB_PROTOTYPE_INSERT_COLOR(name, type, attr); \ ARB_PROTOTYPE_REMOVE_COLOR(name, type, attr); \ ARB_PROTOTYPE_INSERT(name, type, attr); \ ARB_PROTOTYPE_REMOVE(name, type, attr); \ ARB_PROTOTYPE_CFIND(name, type, attr); \ ARB_PROTOTYPE_FIND(name, type, attr); \ ARB_PROTOTYPE_NFIND(name, type, attr); \ ARB_PROTOTYPE_CNEXT(name, type, attr); \ ARB_PROTOTYPE_NEXT(name, type, attr); \ ARB_PROTOTYPE_CPREV(name, type, attr); \ ARB_PROTOTYPE_PREV(name, type, attr); \ ARB_PROTOTYPE_CMINMAX(name, type, attr); \ ARB_PROTOTYPE_MINMAX(name, type, attr); \ - ARB_PROTOTYPE_REBALANCE(name, type, attr); + ARB_PROTOTYPE_REINSERT(name, type, attr); #define ARB_PROTOTYPE_INSERT_COLOR(name, type, attr) \ attr void name##_ARB_INSERT_COLOR(struct name *, struct type *) #define ARB_PROTOTYPE_REMOVE_COLOR(name, type, attr) \ attr void name##_ARB_REMOVE_COLOR(struct name *, struct type *, struct type *) #define ARB_PROTOTYPE_REMOVE(name, type, attr) \ attr struct type *name##_ARB_REMOVE(struct name *, struct type *) #define ARB_PROTOTYPE_INSERT(name, type, attr) \ attr struct type *name##_ARB_INSERT(struct name *, struct type *) #define ARB_PROTOTYPE_CFIND(name, type, attr) \ attr const struct type *name##_ARB_CFIND(const struct name *, \ const struct type *) #define ARB_PROTOTYPE_FIND(name, type, attr) \ attr struct type *name##_ARB_FIND(const struct name *, \ const struct type *) #define ARB_PROTOTYPE_NFIND(name, type, attr) \ attr struct type *name##_ARB_NFIND(struct name *, struct type *) #define ARB_PROTOTYPE_CNFIND(name, type, attr) \ attr const struct type *name##_ARB_CNFIND(const struct name *, \ const struct type *) #define ARB_PROTOTYPE_CNEXT(name, type, attr) \ attr const struct type *name##_ARB_CNEXT(const struct name *head,\ const struct type *) #define ARB_PROTOTYPE_NEXT(name, type, attr) \ attr struct type *name##_ARB_NEXT(const struct name *, \ const struct type *) #define ARB_PROTOTYPE_CPREV(name, type, attr) \ attr const struct type *name##_ARB_CPREV(const struct name *, \ const struct type *) #define ARB_PROTOTYPE_PREV(name, type, attr) \ attr struct type *name##_ARB_PREV(const struct name *, \ const struct type *) #define ARB_PROTOTYPE_CMINMAX(name, type, attr) \ attr const struct type *name##_ARB_CMINMAX(const struct name *, int) #define ARB_PROTOTYPE_MINMAX(name, type, attr) \ attr struct type *name##_ARB_MINMAX(const struct name *, int) -#define ARB_PROTOTYPE_REBALANCE(name, type, attr) \ - attr struct type *name##_ARB_REBALANCE(struct name *, struct type *) +#define ARB_PROTOTYPE_REINSERT(name, type, attr) \ + attr struct type *name##_ARB_REINSERT(struct name *, struct type *) #define ARB_GENERATE(name, type, field, cmp) \ ARB_GENERATE_INTERNAL(name, type, field, cmp,) #define ARB_GENERATE_STATIC(name, type, field, cmp) \ ARB_GENERATE_INTERNAL(name, type, field, cmp, __unused static) #define ARB_GENERATE_INTERNAL(name, type, field, cmp, attr) \ ARB_GENERATE_INSERT_COLOR(name, type, field, attr) \ ARB_GENERATE_REMOVE_COLOR(name, type, field, attr) \ ARB_GENERATE_INSERT(name, type, field, cmp, attr) \ ARB_GENERATE_REMOVE(name, type, field, attr) \ ARB_GENERATE_CFIND(name, type, field, cmp, attr) \ ARB_GENERATE_FIND(name, type, field, cmp, attr) \ ARB_GENERATE_CNEXT(name, type, field, attr) \ ARB_GENERATE_NEXT(name, type, field, attr) \ ARB_GENERATE_CPREV(name, type, field, attr) \ ARB_GENERATE_PREV(name, type, field, attr) \ ARB_GENERATE_CMINMAX(name, type, field, attr) \ ARB_GENERATE_MINMAX(name, type, field, attr) \ - ARB_GENERATE_REBALANCE(name, type, field, cmp, attr) + ARB_GENERATE_REINSERT(name, type, field, cmp, attr) #define ARB_GENERATE_INSERT_COLOR(name, type, field, attr) \ attr void \ name##_ARB_INSERT_COLOR(struct name *head, struct type *elm) \ { \ struct type *parent, *gparent, *tmp; \ while ((parent = ARB_PARENT(head, elm, field)) != NULL && \ ARB_COLOR(parent, field) == ARB_RED) { \ gparent = ARB_PARENT(head, parent, field); \ if (parent == ARB_LEFT(head, gparent, field)) { \ tmp = ARB_RIGHT(head, gparent, field); \ if (tmp && ARB_COLOR(tmp, field) == ARB_RED) { \ ARB_COLOR(tmp, field) = ARB_BLACK; \ ARB_SET_BLACKRED(parent, gparent, field); \ elm = gparent; \ continue; \ } \ if (ARB_RIGHT(head, parent, field) == elm) { \ ARB_ROTATE_LEFT(head, parent, tmp, field); \ tmp = parent; \ parent = elm; \ elm = tmp; \ } \ ARB_SET_BLACKRED(parent, gparent, field); \ ARB_ROTATE_RIGHT(head, gparent, tmp, field); \ } else { \ tmp = ARB_LEFT(head, gparent, field); \ if (tmp && ARB_COLOR(tmp, field) == ARB_RED) { \ ARB_COLOR(tmp, field) = ARB_BLACK; \ ARB_SET_BLACKRED(parent, gparent, field); \ elm = gparent; \ continue; \ } \ if (ARB_LEFT(head, parent, field) == elm) { \ ARB_ROTATE_RIGHT(head, parent, tmp, field); \ tmp = parent; \ parent = elm; \ elm = tmp; \ } \ ARB_SET_BLACKRED(parent, gparent, field); \ ARB_ROTATE_LEFT(head, gparent, tmp, field); \ } \ } \ ARB_COLOR(ARB_ROOT(head), field) = ARB_BLACK; \ } #define ARB_GENERATE_REMOVE_COLOR(name, type, field, attr) \ attr void \ name##_ARB_REMOVE_COLOR(struct name *head, struct type *parent, struct type *elm) \ { \ struct type *tmp; \ while ((elm == NULL || ARB_COLOR(elm, field) == ARB_BLACK) && \ elm != ARB_ROOT(head)) { \ if (ARB_LEFT(head, parent, field) == elm) { \ tmp = ARB_RIGHT(head, parent, field); \ if (ARB_COLOR(tmp, field) == ARB_RED) { \ ARB_SET_BLACKRED(tmp, parent, field); \ ARB_ROTATE_LEFT(head, parent, tmp, field); \ tmp = ARB_RIGHT(head, parent, field); \ } \ if ((ARB_LEFT(head, tmp, field) == NULL || \ ARB_COLOR(ARB_LEFT(head, tmp, field), field) == ARB_BLACK) && \ (ARB_RIGHT(head, tmp, field) == NULL || \ ARB_COLOR(ARB_RIGHT(head, tmp, field), field) == ARB_BLACK)) { \ ARB_COLOR(tmp, field) = ARB_RED; \ elm = parent; \ parent = ARB_PARENT(head, elm, field); \ } else { \ if (ARB_RIGHT(head, tmp, field) == NULL || \ ARB_COLOR(ARB_RIGHT(head, tmp, field), field) == ARB_BLACK) { \ struct type *oleft; \ if ((oleft = ARB_LEFT(head, tmp, field)) \ != NULL) \ ARB_COLOR(oleft, field) = ARB_BLACK; \ ARB_COLOR(tmp, field) = ARB_RED; \ ARB_ROTATE_RIGHT(head, tmp, oleft, field); \ tmp = ARB_RIGHT(head, parent, field); \ } \ ARB_COLOR(tmp, field) = ARB_COLOR(parent, field); \ ARB_COLOR(parent, field) = ARB_BLACK; \ if (ARB_RIGHT(head, tmp, field)) \ ARB_COLOR(ARB_RIGHT(head, tmp, field), field) = ARB_BLACK; \ ARB_ROTATE_LEFT(head, parent, tmp, field); \ elm = ARB_ROOT(head); \ break; \ } \ } else { \ tmp = ARB_LEFT(head, parent, field); \ if (ARB_COLOR(tmp, field) == ARB_RED) { \ ARB_SET_BLACKRED(tmp, parent, field); \ ARB_ROTATE_RIGHT(head, parent, tmp, field); \ tmp = ARB_LEFT(head, parent, field); \ } \ if ((ARB_LEFT(head, tmp, field) == NULL || \ ARB_COLOR(ARB_LEFT(head, tmp, field), field) == ARB_BLACK) && \ (ARB_RIGHT(head, tmp, field) == NULL || \ ARB_COLOR(ARB_RIGHT(head, tmp, field), field) == ARB_BLACK)) { \ ARB_COLOR(tmp, field) = ARB_RED; \ elm = parent; \ parent = ARB_PARENT(head, elm, field); \ } else { \ if (ARB_LEFT(head, tmp, field) == NULL || \ ARB_COLOR(ARB_LEFT(head, tmp, field), field) == ARB_BLACK) { \ struct type *oright; \ if ((oright = ARB_RIGHT(head, tmp, field)) \ != NULL) \ ARB_COLOR(oright, field) = ARB_BLACK; \ ARB_COLOR(tmp, field) = ARB_RED; \ ARB_ROTATE_LEFT(head, tmp, oright, field); \ tmp = ARB_LEFT(head, parent, field); \ } \ ARB_COLOR(tmp, field) = ARB_COLOR(parent, field); \ ARB_COLOR(parent, field) = ARB_BLACK; \ if (ARB_LEFT(head, tmp, field)) \ ARB_COLOR(ARB_LEFT(head, tmp, field), field) = ARB_BLACK; \ ARB_ROTATE_RIGHT(head, parent, tmp, field); \ elm = ARB_ROOT(head); \ break; \ } \ } \ } \ if (elm) \ ARB_COLOR(elm, field) = ARB_BLACK; \ } #define ARB_GENERATE_REMOVE(name, type, field, attr) \ attr struct type * \ name##_ARB_REMOVE(struct name *head, struct type *elm) \ { \ struct type *child, *parent, *old = elm; \ int color; \ if (ARB_LEFT(head, elm, field) == NULL) \ child = ARB_RIGHT(head, elm, field); \ else if (ARB_RIGHT(head, elm, field) == NULL) \ child = ARB_LEFT(head, elm, field); \ else { \ struct type *left; \ elm = ARB_RIGHT(head, elm, field); \ while ((left = ARB_LEFT(head, elm, field)) != NULL) \ elm = left; \ child = ARB_RIGHT(head, elm, field); \ parent = ARB_PARENT(head, elm, field); \ color = ARB_COLOR(elm, field); \ if (child) \ ARB_PARENTIDX(child, field) = \ ARB_SELFIDX(head, parent); \ if (parent) { \ if (ARB_LEFT(head, parent, field) == elm) \ ARB_LEFTIDX(parent, field) = \ ARB_SELFIDX(head, child); \ else \ ARB_RIGHTIDX(parent, field) = \ ARB_SELFIDX(head, child); \ ARB_AUGMENT(parent); \ } else \ ARB_ROOTIDX(head) = ARB_SELFIDX(head, child); \ if (ARB_PARENT(head, elm, field) == old) \ parent = elm; \ (elm)->field = (old)->field; \ if (ARB_PARENT(head, old, field)) { \ if (ARB_LEFT(head, ARB_PARENT(head, old, field), \ field) == old) \ ARB_LEFTIDX(ARB_PARENT(head, old, field), \ field) = ARB_SELFIDX(head, elm); \ else \ ARB_RIGHTIDX(ARB_PARENT(head, old, field),\ field) = ARB_SELFIDX(head, elm); \ ARB_AUGMENT(ARB_PARENT(head, old, field)); \ } else \ ARB_ROOTIDX(head) = ARB_SELFIDX(head, elm); \ ARB_PARENTIDX(ARB_LEFT(head, old, field), field) = \ ARB_SELFIDX(head, elm); \ if (ARB_RIGHT(head, old, field)) \ ARB_PARENTIDX(ARB_RIGHT(head, old, field), \ field) = ARB_SELFIDX(head, elm); \ if (parent) { \ left = parent; \ do { \ ARB_AUGMENT(left); \ } while ((left = ARB_PARENT(head, left, field)) \ != NULL); \ } \ goto color; \ } \ parent = ARB_PARENT(head, elm, field); \ color = ARB_COLOR(elm, field); \ if (child) \ ARB_PARENTIDX(child, field) = ARB_SELFIDX(head, parent);\ if (parent) { \ if (ARB_LEFT(head, parent, field) == elm) \ ARB_LEFTIDX(parent, field) = \ ARB_SELFIDX(head, child); \ else \ ARB_RIGHTIDX(parent, field) = \ ARB_SELFIDX(head, child); \ ARB_AUGMENT(parent); \ } else \ ARB_ROOTIDX(head) = ARB_SELFIDX(head, child); \ color: \ if (color == ARB_BLACK) \ name##_ARB_REMOVE_COLOR(head, parent, child); \ ARB_CURNODES(head) -= 1; \ if (ARB_MINIDX(head) == ARB_SELFIDX(head, old)) \ ARB_MINIDX(head) = ARB_PARENTIDX(old, field); \ if (ARB_MAXIDX(head) == ARB_SELFIDX(head, old)) \ ARB_MAXIDX(head) = ARB_PARENTIDX(old, field); \ ARB_RETURNFREE(head, old, field); \ return (old); \ } \ #define ARB_GENERATE_INSERT(name, type, field, cmp, attr) \ /* Inserts a node into the RB tree */ \ attr struct type * \ name##_ARB_INSERT(struct name *head, struct type *elm) \ { \ struct type *tmp; \ struct type *parent = NULL; \ int comp = 0; \ tmp = ARB_ROOT(head); \ while (tmp) { \ parent = tmp; \ comp = (cmp)(elm, parent); \ if (comp < 0) \ tmp = ARB_LEFT(head, tmp, field); \ else if (comp > 0) \ tmp = ARB_RIGHT(head, tmp, field); \ else \ return (tmp); \ } \ ARB_SET(head, elm, parent, field); \ if (parent != NULL) { \ if (comp < 0) \ ARB_LEFTIDX(parent, field) = \ ARB_SELFIDX(head, elm); \ else \ ARB_RIGHTIDX(parent, field) = \ ARB_SELFIDX(head, elm); \ ARB_AUGMENT(parent); \ } else \ ARB_ROOTIDX(head) = ARB_SELFIDX(head, elm); \ name##_ARB_INSERT_COLOR(head, elm); \ ARB_CURNODES(head) += 1; \ if (ARB_MINIDX(head) == ARB_NULLIDX || \ (ARB_PARENTIDX(elm, field) == ARB_MINIDX(head) && \ ARB_LEFTIDX(parent, field) == ARB_SELFIDX(head, elm))) \ ARB_MINIDX(head) = ARB_SELFIDX(head, elm); \ if (ARB_MAXIDX(head) == ARB_NULLIDX || \ (ARB_PARENTIDX(elm, field) == ARB_MAXIDX(head) && \ ARB_RIGHTIDX(parent, field) == ARB_SELFIDX(head, elm))) \ ARB_MAXIDX(head) = ARB_SELFIDX(head, elm); \ return (NULL); \ } #define ARB_GENERATE_CFIND(name, type, field, cmp, attr) \ /* Finds the node with the same key as elm */ \ attr const struct type * \ name##_ARB_CFIND(const struct name *head, const struct type *elm) \ { \ const struct type *tmp = ARB_ROOT(head); \ int comp; \ while (tmp) { \ comp = cmp(elm, tmp); \ if (comp < 0) \ tmp = ARB_LEFT(head, tmp, field); \ else if (comp > 0) \ tmp = ARB_RIGHT(head, tmp, field); \ else \ return (tmp); \ } \ return (NULL); \ } #define ARB_GENERATE_FIND(name, type, field, cmp, attr) \ attr struct type * \ name##_ARB_FIND(const struct name *head, const struct type *elm) \ { return (__DECONST(struct type *, name##_ARB_CFIND(head, elm))); } #define ARB_GENERATE_CNFIND(name, type, field, cmp, attr) \ /* Finds the first node greater than or equal to the search key */ \ attr const struct type * \ name##_ARB_CNFIND(const struct name *head, const struct type *elm) \ { \ const struct type *tmp = ARB_ROOT(head); \ const struct type *res = NULL; \ int comp; \ while (tmp) { \ comp = cmp(elm, tmp); \ if (comp < 0) { \ res = tmp; \ tmp = ARB_LEFT(head, tmp, field); \ } \ else if (comp > 0) \ tmp = ARB_RIGHT(head, tmp, field); \ else \ return (tmp); \ } \ return (res); \ } #define ARB_GENERATE_NFIND(name, type, field, cmp, attr) \ attr struct type * \ name##_ARB_NFIND(const struct name *head, const struct type *elm) \ { return (__DECONST(struct type *, name##_ARB_CNFIND(head, elm))); } #define ARB_GENERATE_CNEXT(name, type, field, attr) \ /* ARGSUSED */ \ attr const struct type * \ name##_ARB_CNEXT(const struct name *head, const struct type *elm) \ { \ if (ARB_RIGHT(head, elm, field)) { \ elm = ARB_RIGHT(head, elm, field); \ while (ARB_LEFT(head, elm, field)) \ elm = ARB_LEFT(head, elm, field); \ } else { \ if (ARB_PARENT(head, elm, field) && \ (elm == ARB_LEFT(head, ARB_PARENT(head, elm, field),\ field))) \ elm = ARB_PARENT(head, elm, field); \ else { \ while (ARB_PARENT(head, elm, field) && \ (elm == ARB_RIGHT(head, ARB_PARENT(head, \ elm, field), field))) \ elm = ARB_PARENT(head, elm, field); \ elm = ARB_PARENT(head, elm, field); \ } \ } \ return (elm); \ } #define ARB_GENERATE_NEXT(name, type, field, attr) \ attr struct type * \ name##_ARB_NEXT(const struct name *head, const struct type *elm) \ { return (__DECONST(struct type *, name##_ARB_CNEXT(head, elm))); } #define ARB_GENERATE_CPREV(name, type, field, attr) \ /* ARGSUSED */ \ attr const struct type * \ name##_ARB_CPREV(const struct name *head, const struct type *elm) \ { \ if (ARB_LEFT(head, elm, field)) { \ elm = ARB_LEFT(head, elm, field); \ while (ARB_RIGHT(head, elm, field)) \ elm = ARB_RIGHT(head, elm, field); \ } else { \ if (ARB_PARENT(head, elm, field) && \ (elm == ARB_RIGHT(head, ARB_PARENT(head, elm, \ field), field))) \ elm = ARB_PARENT(head, elm, field); \ else { \ while (ARB_PARENT(head, elm, field) && \ (elm == ARB_LEFT(head, ARB_PARENT(head, elm,\ field), field))) \ elm = ARB_PARENT(head, elm, field); \ elm = ARB_PARENT(head, elm, field); \ } \ } \ return (elm); \ } #define ARB_GENERATE_PREV(name, type, field, attr) \ attr struct type * \ name##_ARB_PREV(const struct name *head, const struct type *elm) \ { return (__DECONST(struct type *, name##_ARB_CPREV(head, elm))); } #define ARB_GENERATE_CMINMAX(name, type, field, attr) \ attr const struct type * \ name##_ARB_CMINMAX(const struct name *head, int val) \ { \ const struct type *tmp = ARB_EMPTY(head) ? NULL : ARB_ROOT(head);\ const struct type *parent = NULL; \ while (tmp) { \ parent = tmp; \ if (val < 0) \ tmp = ARB_LEFT(head, tmp, field); \ else \ tmp = ARB_RIGHT(head, tmp, field); \ } \ return (__DECONST(struct type *, parent)); \ } #define ARB_GENERATE_MINMAX(name, type, field, attr) \ attr struct type * \ name##_ARB_MINMAX(const struct name *head, int val) \ { return (__DECONST(struct type *, name##_ARB_CMINMAX(head, val))); } -#define ARB_GENERATE_REBALANCE(name, type, field, cmp, attr) \ +#define ARB_GENERATE_REINSERT(name, type, field, cmp, attr) \ attr struct type * \ -name##_ARB_REBALANCE(struct name *head, struct type *elm) \ +name##_ARB_REINSERT(struct name *head, struct type *elm) \ { \ struct type *cmpelm; \ if (((cmpelm = ARB_PREV(name, head, elm)) != NULL && \ (cmp)(cmpelm, elm) >= 0) || \ ((cmpelm = ARB_NEXT(name, head, elm)) != NULL && \ (cmp)(elm, cmpelm) >= 0)) { \ /* XXXLAS: Remove/insert is heavy handed. */ \ ARB_REMOVE(name, head, elm); \ /* Remove puts elm on the free list. */ \ elm = ARB_GETFREE(head, field); \ return (ARB_INSERT(name, head, elm)); \ } \ return (NULL); \ } \ #define ARB_INSERT(name, x, y) name##_ARB_INSERT(x, y) #define ARB_REMOVE(name, x, y) name##_ARB_REMOVE(x, y) #define ARB_CFIND(name, x, y) name##_ARB_CFIND(x, y) #define ARB_FIND(name, x, y) name##_ARB_FIND(x, y) #define ARB_CNFIND(name, x, y) name##_ARB_CNFIND(x, y) #define ARB_NFIND(name, x, y) name##_ARB_NFIND(x, y) #define ARB_CNEXT(name, x, y) name##_ARB_CNEXT(x, y) #define ARB_NEXT(name, x, y) name##_ARB_NEXT(x, y) #define ARB_CPREV(name, x, y) name##_ARB_CPREV(x, y) #define ARB_PREV(name, x, y) name##_ARB_PREV(x, y) #define ARB_CMIN(name, x) (ARB_MINIDX(x) == ARB_NULLIDX ? \ name##_ARB_CMINMAX(x, ARB_NEGINF) : ARB_CNODE(x, ARB_MINIDX(x))) #define ARB_MIN(name, x) (ARB_MINIDX(x) == ARB_NULLIDX ? \ name##_ARB_MINMAX(x, ARB_NEGINF) : ARB_NODE(x, ARB_MINIDX(x))) #define ARB_CMAX(name, x) (ARB_MAXIDX(x) == ARB_NULLIDX ? \ name##_ARB_CMINMAX(x, ARB_INF) : ARB_CNODE(x, ARB_MAXIDX(x))) #define ARB_MAX(name, x) (ARB_MAXIDX(x) == ARB_NULLIDX ? \ name##_ARB_MINMAX(x, ARB_INF) : ARB_NODE(x, ARB_MAXIDX(x))) -#define ARB_REBALANCE(name, x, y) name##_ARB_REBALANCE(x, y) +#define ARB_REINSERT(name, x, y) name##_ARB_REINSERT(x, y) #define ARB_FOREACH(x, name, head) \ for ((x) = ARB_MIN(name, head); \ (x) != NULL; \ (x) = name##_ARB_NEXT(head, x)) #define ARB_FOREACH_FROM(x, name, y) \ for ((x) = (y); \ ((x) != NULL) && ((y) = name##_ARB_NEXT(x), (x) != NULL); \ (x) = (y)) #define ARB_FOREACH_SAFE(x, name, head, y) \ for ((x) = ARB_MIN(name, head); \ ((x) != NULL) && ((y) = name##_ARB_NEXT(x), (x) != NULL); \ (x) = (y)) #define ARB_FOREACH_REVERSE(x, name, head) \ for ((x) = ARB_MAX(name, head); \ (x) != NULL; \ (x) = name##_ARB_PREV(x)) #define ARB_FOREACH_REVERSE_FROM(x, name, y) \ for ((x) = (y); \ ((x) != NULL) && ((y) = name##_ARB_PREV(x), (x) != NULL); \ (x) = (y)) #define ARB_FOREACH_REVERSE_SAFE(x, name, head, y) \ for ((x) = ARB_MAX(name, head); \ ((x) != NULL) && ((y) = name##_ARB_PREV(x), (x) != NULL); \ (x) = (y)) #define ARB_ARRFOREACH(x, field, head) \ for ((x) = ARB_NODES(head); \ ARB_SELFIDX(head, x) < ARB_MAXNODES(head); \ (x)++) #define ARB_ARRFOREACH_REVWCOND(x, field, head, extracond) \ for ((x) = ARB_NODES(head) + (ARB_MAXNODES(head) - 1); \ (x) >= ARB_NODES(head) && (extracond); \ (x)--) #define ARB_ARRFOREACH_REVERSE(x, field, head) \ ARB_ARRFOREACH_REVWCOND(x, field, head, 1) #endif /* _SYS_ARB_H_ */