On Mon, Mar 21, 2011 at 11:38:20AM +0300, Gleb Smirnoff wrote: > On Sun, Mar 20, 2011 at 08:35:00AM +0000, Dmitry Chagin wrote: > D> Author: dchagin > D> Date: Sun Mar 20 08:35:00 2011 > D> New Revision: 219791 > D> URL: http://svn.freebsd.org/changeset/base/219791 > D> > D> Log: > D> Remove dead code. > > This wasn't a code, but defines. Removing them saves nothing, but > primitives deleted may be useful. >
Disagee here, trylock() is not a useful/common primitive, at least here.
Others persisted from r183017 to r186119, most likely have been commited
under the unknown drugs :)
> D> MFC after: 1 Week
> D>
> D> Modified:
> D> head/sys/net/route.h
> D>
> D> Modified: head/sys/net/route.h
> D>
> ==============================================================================
> D> --- head/sys/net/route.h Sun Mar 20 08:27:06 2011 (r219790)
> D> +++ head/sys/net/route.h Sun Mar 20 08:35:00 2011 (r219791)
> D> @@ -325,7 +325,6 @@ struct rt_addrinfo {
> D> #define RT_LOCK_INIT(_rt) \
> D> mtx_init(&(_rt)->rt_mtx, "rtentry", NULL, MTX_DEF | MTX_DUPOK)
> D> #define RT_LOCK(_rt) mtx_lock(&(_rt)->rt_mtx)
> D> -#define RT_TRYLOCK(_rt) mtx_trylock(&(_rt)->rt_mtx)
> D> #define RT_UNLOCK(_rt) mtx_unlock(&(_rt)->rt_mtx)
> D> #define RT_LOCK_DESTROY(_rt) mtx_destroy(&(_rt)->rt_mtx)
> D> #define RT_LOCK_ASSERT(_rt) mtx_assert(&(_rt)->rt_mtx, MA_OWNED)
> D> @@ -360,22 +359,6 @@ struct rt_addrinfo {
> D> RTFREE_LOCKED(_rt); \
> D> } while (0)
> D>
> D> -#define RT_TEMP_UNLOCK(_rt) do { \
> D> - RT_ADDREF(_rt); \
> D> - RT_UNLOCK(_rt); \
> D> -} while (0)
> D> -
> D> -#define RT_RELOCK(_rt) do { \
> D> - RT_LOCK(_rt); \
> D> - if ((_rt)->rt_refcnt <= 1) { \
> D> - rtfree(_rt); \
> D> - _rt = 0; /* signal that it went away */ \
> D> - } else { \
> D> - RT_REMREF(_rt); \
> D> - /* note that _rt is still valid */ \
> D> - } \
> D> -} while (0)
> D> -
> D> struct radix_node_head *rt_tables_get_rnh(int, int);
> D>
> D> struct ifmultiaddr;
>
> --
> Totus tuus, Glebius.
--
Have fun!
chd
pgpBgzphCNaSD.pgp
Description: PGP signature
