network pool names

2014-11-04 Thread Martin Pieuchot 

Remove pl suffix, ok?

Index: net/pipex.c
===
RCS file: /home/ncvs/src/sys/net/pipex.c,v
retrieving revision 1.61
diff -u -p -r1.61 pipex.c
--- net/pipex.c 28 Oct 2014 09:45:37 -  1.61
+++ net/pipex.c 4 Nov 2014 12:16:06 -
@@ -136,9 +136,9 @@ pipex_init(void)
return;

pool_init(pipex_session_pool, sizeof(struct pipex_session), 0, 0, 0,
-   ppxsspl, NULL);
-	pool_init(mppe_key_pool, PIPEX_MPPE_KEYLEN * PIPEX_MPPE_NOLDKEY, 0, 
0, 0,

-   mppekeypl, NULL);
+   ppxss, NULL);
+	pool_init(mppe_key_pool, PIPEX_MPPE_KEYLEN * PIPEX_MPPE_NOLDKEY, 0, 
0,

+   0, mppekey, NULL);

LIST_INIT(pipex_session_list);
LIST_INIT(pipex_close_wait_list);
Index: net/route.c
===
RCS file: /home/ncvs/src/sys/net/route.c,v
retrieving revision 1.188
diff -u -p -r1.188 route.c
--- net/route.c 1 Nov 2014 21:40:38 -   1.188
+++ net/route.c 4 Nov 2014 12:16:06 -
@@ -215,7 +215,7 @@ route_init(void)
 {
struct domain*dom;

-   pool_init(rtentry_pool, sizeof(struct rtentry), 0, 0, 0, rtentpl,
+   pool_init(rtentry_pool, sizeof(struct rtentry), 0, 0, 0, rtent,
NULL);
rn_init();  /* initialize all zeroes, all ones, mask table */

@@ -1309,7 +1309,7 @@ rt_timer_init()
if (rt_init_done)
panic(rt_timer_init: already initialized);

-   pool_init(rttimer_pool, sizeof(struct rttimer), 0, 0, 0, rttmrpl,
+   pool_init(rttimer_pool, sizeof(struct rttimer), 0, 0, 0, rttmr,
NULL);

LIST_INIT(rttimer_queue_head);
Index: netinet/ip_input.c
===
RCS file: /home/ncvs/src/sys/netinet/ip_input.c,v
retrieving revision 1.239
diff -u -p -r1.239 ip_input.c
--- netinet/ip_input.c  1 Nov 2014 21:40:38 -   1.239
+++ netinet/ip_input.c  4 Nov 2014 12:16:06 -
@@ -155,10 +155,8 @@ ip_init(void)
const u_int16_t defbaddynamicports_tcp[] = DEFBADDYNAMICPORTS_TCP;
const u_int16_t defbaddynamicports_udp[] = DEFBADDYNAMICPORTS_UDP;

-   pool_init(ipqent_pool, sizeof(struct ipqent), 0, 0, 0, ipqepl,
-   NULL);
-   pool_init(ipq_pool, sizeof(struct ipq), 0, 0, 0, ipqpl,
-   NULL);
+	pool_init(ipqent_pool, sizeof(struct ipqent), 0, 0, 0, ipqe,  
NULL);

+   pool_init(ipq_pool, sizeof(struct ipq), 0, 0, 0, ipq, NULL);

pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW);
if (pr == 0)
Index: netinet/tcp_input.c
===
RCS file: /home/ncvs/src/sys/netinet/tcp_input.c,v
retrieving revision 1.281
diff -u -p -r1.281 tcp_input.c
--- netinet/tcp_input.c 24 Oct 2014 17:58:47 -  1.281
+++ netinet/tcp_input.c 4 Nov 2014 12:16:06 -
@@ -3408,8 +3408,8 @@ syn_cache_init()
TAILQ_INIT(tcp_syn_cache[i].sch_bucket);

/* Initialize the syn cache pool. */
-   pool_init(syn_cache_pool, sizeof(struct syn_cache), 0, 0, 0,
-   synpl, NULL);
+   pool_init(syn_cache_pool, sizeof(struct syn_cache), 0, 0, 0, syn,
+   NULL);
 }

 void
Index: netinet/tcp_subr.c
===
RCS file: /home/ncvs/src/sys/netinet/tcp_subr.c,v
retrieving revision 1.133
diff -u -p -r1.133 tcp_subr.c
--- netinet/tcp_subr.c  20 Oct 2014 03:43:40 -  1.133
+++ netinet/tcp_subr.c  4 Nov 2014 12:16:06 -
@@ -151,13 +151,11 @@ void
 tcp_init()
 {
tcp_iss = 1;/* wrong */
-   pool_init(tcpcb_pool, sizeof(struct tcpcb), 0, 0, 0, tcpcbpl,
-   NULL);
-   pool_init(tcpqe_pool, sizeof(struct tcpqent), 0, 0, 0, tcpqepl,
-   NULL);
+   pool_init(tcpcb_pool, sizeof(struct tcpcb), 0, 0, 0, tcpcb, NULL);
+	pool_init(tcpqe_pool, sizeof(struct tcpqent), 0, 0, 0, tcpqe, 
NULL);

pool_sethardlimit(tcpqe_pool, tcp_reass_limit, NULL, 0);
 #ifdef TCP_SACK
-   pool_init(sackhl_pool, sizeof(struct sackhole), 0, 0, 0, sackhlpl,
+   pool_init(sackhl_pool, sizeof(struct sackhole), 0, 0, 0, sackhl,
NULL);
pool_sethardlimit(sackhl_pool, tcp_sackhole_limit, NULL, 0);
 #endif /* TCP_SACK */

Re: network pool names

2014-11-04 Thread David Gwynne 

 On 4 Nov 2014, at 10:23 pm, Martin Pieuchot mpieuc...@nolizard.org wrote:
 
 Remove pl suffix, ok?

ok

 
 Index: net/pipex.c
 ===
 RCS file: /home/ncvs/src/sys/net/pipex.c,v
 retrieving revision 1.61
 diff -u -p -r1.61 pipex.c
 --- net/pipex.c   28 Oct 2014 09:45:37 -  1.61
 +++ net/pipex.c   4 Nov 2014 12:16:06 -
 @@ -136,9 +136,9 @@ pipex_init(void)
   return;
 
   pool_init(pipex_session_pool, sizeof(struct pipex_session), 0, 0, 0,
 - ppxsspl, NULL);
 - pool_init(mppe_key_pool, PIPEX_MPPE_KEYLEN * PIPEX_MPPE_NOLDKEY, 0, 0, 
 0,
 - mppekeypl, NULL);
 + ppxss, NULL);
 + pool_init(mppe_key_pool, PIPEX_MPPE_KEYLEN * PIPEX_MPPE_NOLDKEY, 0, 0,
 + 0, mppekey, NULL);
 
   LIST_INIT(pipex_session_list);
   LIST_INIT(pipex_close_wait_list);
 Index: net/route.c
 ===
 RCS file: /home/ncvs/src/sys/net/route.c,v
 retrieving revision 1.188
 diff -u -p -r1.188 route.c
 --- net/route.c   1 Nov 2014 21:40:38 -   1.188
 +++ net/route.c   4 Nov 2014 12:16:06 -
 @@ -215,7 +215,7 @@ route_init(void)
 {
   struct domain*dom;
 
 - pool_init(rtentry_pool, sizeof(struct rtentry), 0, 0, 0, rtentpl,
 + pool_init(rtentry_pool, sizeof(struct rtentry), 0, 0, 0, rtent,
   NULL);
   rn_init();  /* initialize all zeroes, all ones, mask table */
 
 @@ -1309,7 +1309,7 @@ rt_timer_init()
   if (rt_init_done)
   panic(rt_timer_init: already initialized);
 
 - pool_init(rttimer_pool, sizeof(struct rttimer), 0, 0, 0, rttmrpl,
 + pool_init(rttimer_pool, sizeof(struct rttimer), 0, 0, 0, rttmr,
   NULL);
 
   LIST_INIT(rttimer_queue_head);
 Index: netinet/ip_input.c
 ===
 RCS file: /home/ncvs/src/sys/netinet/ip_input.c,v
 retrieving revision 1.239
 diff -u -p -r1.239 ip_input.c
 --- netinet/ip_input.c1 Nov 2014 21:40:38 -   1.239
 +++ netinet/ip_input.c4 Nov 2014 12:16:06 -
 @@ -155,10 +155,8 @@ ip_init(void)
   const u_int16_t defbaddynamicports_tcp[] = DEFBADDYNAMICPORTS_TCP;
   const u_int16_t defbaddynamicports_udp[] = DEFBADDYNAMICPORTS_UDP;
 
 - pool_init(ipqent_pool, sizeof(struct ipqent), 0, 0, 0, ipqepl,
 - NULL);
 - pool_init(ipq_pool, sizeof(struct ipq), 0, 0, 0, ipqpl,
 - NULL);
 + pool_init(ipqent_pool, sizeof(struct ipqent), 0, 0, 0, ipqe,  NULL);
 + pool_init(ipq_pool, sizeof(struct ipq), 0, 0, 0, ipq, NULL);
 
   pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW);
   if (pr == 0)
 Index: netinet/tcp_input.c
 ===
 RCS file: /home/ncvs/src/sys/netinet/tcp_input.c,v
 retrieving revision 1.281
 diff -u -p -r1.281 tcp_input.c
 --- netinet/tcp_input.c   24 Oct 2014 17:58:47 -  1.281
 +++ netinet/tcp_input.c   4 Nov 2014 12:16:06 -
 @@ -3408,8 +3408,8 @@ syn_cache_init()
   TAILQ_INIT(tcp_syn_cache[i].sch_bucket);
 
   /* Initialize the syn cache pool. */
 - pool_init(syn_cache_pool, sizeof(struct syn_cache), 0, 0, 0,
 - synpl, NULL);
 + pool_init(syn_cache_pool, sizeof(struct syn_cache), 0, 0, 0, syn,
 + NULL);
 }
 
 void
 Index: netinet/tcp_subr.c
 ===
 RCS file: /home/ncvs/src/sys/netinet/tcp_subr.c,v
 retrieving revision 1.133
 diff -u -p -r1.133 tcp_subr.c
 --- netinet/tcp_subr.c20 Oct 2014 03:43:40 -  1.133
 +++ netinet/tcp_subr.c4 Nov 2014 12:16:06 -
 @@ -151,13 +151,11 @@ void
 tcp_init()
 {
   tcp_iss = 1;/* wrong */
 - pool_init(tcpcb_pool, sizeof(struct tcpcb), 0, 0, 0, tcpcbpl,
 - NULL);
 - pool_init(tcpqe_pool, sizeof(struct tcpqent), 0, 0, 0, tcpqepl,
 - NULL);
 + pool_init(tcpcb_pool, sizeof(struct tcpcb), 0, 0, 0, tcpcb, NULL);
 + pool_init(tcpqe_pool, sizeof(struct tcpqent), 0, 0, 0, tcpqe, NULL);
   pool_sethardlimit(tcpqe_pool, tcp_reass_limit, NULL, 0);
 #ifdef TCP_SACK
 - pool_init(sackhl_pool, sizeof(struct sackhole), 0, 0, 0, sackhlpl,
 + pool_init(sackhl_pool, sizeof(struct sackhole), 0, 0, 0, sackhl,
   NULL);
   pool_sethardlimit(sackhl_pool, tcp_sackhole_limit, NULL, 0);
 #endif /* TCP_SACK */

Re: network pool names

2014-11-04 Thread Mike Belopuhov 
On 4 November 2014 13:23, Martin Pieuchot mpieuc...@nolizard.org wrote:
 Remove pl suffix, ok?


ok with a syncache instead of syn