Re: svn commit: r219791 - head/sys/net

2011-03-21 Thread Gleb Smirnoff 
On Sun, Mar 20, 2011 at 08:35:00AM +, 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.

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.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org

Re: svn commit: r219791 - head/sys/net

2011-03-21 Thread Chagin Dmitry 
On Mon, Mar 21, 2011 at 11:38:20AM +0300, Gleb Smirnoff wrote:
 On Sun, Mar 20, 2011 at 08:35:00AM +, 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) \
 Dmtx_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 {
 DRTFREE_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

svn commit: r219791 - head/sys/net

2011-03-20 Thread Dmitry Chagin 
Author: dchagin
Date: Sun Mar 20 08:35:00 2011
New Revision: 219791
URL: http://svn.freebsd.org/changeset/base/219791

Log:
  Remove dead code.
  
  MFC after:1 Week

Modified:
  head/sys/net/route.h

Modified: head/sys/net/route.h
==
--- head/sys/net/route.hSun Mar 20 08:27:06 2011(r219790)
+++ head/sys/net/route.hSun Mar 20 08:35:00 2011(r219791)
@@ -325,7 +325,6 @@ struct rt_addrinfo {
 #defineRT_LOCK_INIT(_rt) \
mtx_init((_rt)-rt_mtx, rtentry, NULL, MTX_DEF | MTX_DUPOK)
 #defineRT_LOCK(_rt)mtx_lock((_rt)-rt_mtx)
-#defineRT_TRYLOCK(_rt) mtx_trylock((_rt)-rt_mtx)
 #defineRT_UNLOCK(_rt)  mtx_unlock((_rt)-rt_mtx)
 #defineRT_LOCK_DESTROY(_rt)mtx_destroy((_rt)-rt_mtx)
 #defineRT_LOCK_ASSERT(_rt) mtx_assert((_rt)-rt_mtx, MA_OWNED)
@@ -360,22 +359,6 @@ struct rt_addrinfo {
RTFREE_LOCKED(_rt); \
 } while (0)
 
-#define RT_TEMP_UNLOCK(_rt) do {   \
-   RT_ADDREF(_rt); \
-   RT_UNLOCK(_rt); \
-} while (0)
-
-#define RT_RELOCK(_rt) do {\
-   RT_LOCK(_rt);   \
-   if ((_rt)-rt_refcnt = 1) {\
-   rtfree(_rt);\
-   _rt = 0; /*  signal that it went away */\
-   } else {\
-   RT_REMREF(_rt); \
-   /* note that _rt is still valid */  \
-   }   \
-} while (0)
-
 struct radix_node_head *rt_tables_get_rnh(int, int);
 
 struct ifmultiaddr;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org