From 2e479b88a8046c3d2bc7711f731ff14ce16354b6 Mon Sep 17 00:00:00 2001
From: goldsimon <goldsimon>
Date: Wed, 16 May 2007 13:49:44 +0000
Subject: [PATCH] Updated stats.h/.c to reflect the integration of pbuf pool
 into memp

---
 src/core/stats.c         | 16 ++--------------
 src/include/lwip/stats.h | 10 ----------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/src/core/stats.c b/src/core/stats.c
index 2f236638..1dcbaa05 100644
--- a/src/core/stats.c
+++ b/src/core/stats.c
@@ -68,16 +68,6 @@ stats_display_proto(struct stats_proto *proto, char *name)
   LWIP_PLATFORM_DIAG(("cachehit: %"STAT_COUNTER_F"\n", proto->cachehit)); 
 }
 
-void
-stats_display_pbuf(struct stats_pbuf *pbuf)
-{
-  LWIP_PLATFORM_DIAG(("\nPBUF\n\t"));
-  LWIP_PLATFORM_DIAG(("avail: %"STAT_COUNTER_F"\n\t", pbuf->avail)); 
-  LWIP_PLATFORM_DIAG(("used: %"STAT_COUNTER_F"\n\t", pbuf->used)); 
-  LWIP_PLATFORM_DIAG(("max: %"STAT_COUNTER_F"\n\t", pbuf->max)); 
-  LWIP_PLATFORM_DIAG(("err: %"STAT_COUNTER_F"\n\t", pbuf->err)); 
-}
-
 void
 stats_display_mem(struct stats_mem *mem, char *name)
 {
@@ -95,7 +85,7 @@ stats_display(void)
 #if MEMP_STATS
   s16_t i;
   char * memp_names[] = {
-    "PBUF",
+    "PBUF_REF/ROM",
     "RAW_PCB",
     "UDP_PCB",
     "TCP_PCB",
@@ -107,6 +97,7 @@ stats_display(void)
     #if ARP_QUEUEING
     "ARP_QUEUE",
     #endif
+    "PBUF_POOL",
     "SYS_TIMEOUT"
   };
 #endif
@@ -128,9 +119,6 @@ stats_display(void)
 #if TCP_STATS
   stats_display_proto(&lwip_stats.tcp, "TCP");
 #endif
-#if PBUF_STATS
-  stats_display_pbuf(&lwip_stats.pbuf);
-#endif
 #if MEM_STATS
   stats_display_mem(&lwip_stats.mem, "HEAP");
 #endif
diff --git a/src/include/lwip/stats.h b/src/include/lwip/stats.h
index 1a955706..072391a8 100644
--- a/src/include/lwip/stats.h
+++ b/src/include/lwip/stats.h
@@ -79,13 +79,6 @@ struct stats_mem {
   mem_size_t err;
 };
 
-struct stats_pbuf {
-  STAT_COUNTER avail;
-  STAT_COUNTER used;
-  STAT_COUNTER max;  
-  STAT_COUNTER err;
-};
-
 struct stats_syselem {
   STAT_COUNTER used;
   STAT_COUNTER max;
@@ -116,9 +109,6 @@ struct stats_ {
 #if TCP_STATS
   struct stats_proto tcp;
 #endif
-#if PBUF_STATS
-  struct stats_pbuf pbuf;
-#endif
 #if MEM_STATS
   struct stats_mem mem;
 #endif