svn commit: r203980 - in projects/tcp_cc_head/sys: net netinet vm

[Lawrence Stewart]

Author: lstewart
Date: Wed Feb 17 01:14:28 2010
New Revision: 203980
URL: http://svn.freebsd.org/changeset/base/203980

Log:
  Revert changes that ended up not being required.

Modified:
  projects/tcp_cc_head/sys/net/pfil.h
  projects/tcp_cc_head/sys/netinet/tcp_input.c
  projects/tcp_cc_head/sys/netinet/tcp_subr.c
  projects/tcp_cc_head/sys/netinet/tcp_var.h
  projects/tcp_cc_head/sys/vm/uma.h
  projects/tcp_cc_head/sys/vm/uma_core.c

Modified: projects/tcp_cc_head/sys/net/pfil.h
==============================================================================
--- projects/tcp_cc_head/sys/net/pfil.h	Tue Feb 16 23:59:48 2010	(r203979)
+++ projects/tcp_cc_head/sys/net/pfil.h	Wed Feb 17 01:14:28 2010	(r203980)
@@ -63,7 +63,6 @@ typedef	TAILQ_HEAD(pfil_list, packet_fil
 
 #define	PFIL_TYPE_AF		1	/* key is AF_* type */
 #define	PFIL_TYPE_IFNET		2	/* key is ifnet pointer */
-#define	PFIL_TYPE_TCP		3	/* see PFIL_TCP_* in netinet/tcp.h */
 
 struct pfil_head {
 	pfil_list_t	ph_in;

Modified: projects/tcp_cc_head/sys/netinet/tcp_input.c
==============================================================================
--- projects/tcp_cc_head/sys/netinet/tcp_input.c	Tue Feb 16 23:59:48 2010	(r203979)
+++ projects/tcp_cc_head/sys/netinet/tcp_input.c	Wed Feb 17 01:14:28 2010	(r203980)
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 
 #include <net/if.h>
-#include <net/pfil.h>
 #include <net/route.h>
 #include <net/vnet.h>
 

Modified: projects/tcp_cc_head/sys/netinet/tcp_subr.c
==============================================================================
--- projects/tcp_cc_head/sys/netinet/tcp_subr.c	Tue Feb 16 23:59:48 2010	(r203979)
+++ projects/tcp_cc_head/sys/netinet/tcp_subr.c	Wed Feb 17 01:14:28 2010	(r203980)
@@ -49,8 +49,6 @@ __FBSDID("$FreeBSD$");
 #ifdef INET6
 #include <sys/domain.h>
 #endif
-#include <sys/lock.h>
-#include <sys/rwlock.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/socket.h>

Modified: projects/tcp_cc_head/sys/netinet/tcp_var.h
==============================================================================
--- projects/tcp_cc_head/sys/netinet/tcp_var.h	Tue Feb 16 23:59:48 2010	(r203979)
+++ projects/tcp_cc_head/sys/netinet/tcp_var.h	Wed Feb 17 01:14:28 2010	(r203980)
@@ -44,11 +44,9 @@
 VNET_DECLARE(int, tcp_do_rfc1323);
 VNET_DECLARE(int, tcp_reass_qsize);
 VNET_DECLARE(struct uma_zone *, tcp_reass_zone);
-VNET_DECLARE(struct hhook_head, tcpest_hhook);
 #define	V_tcp_do_rfc1323	VNET(tcp_do_rfc1323)
 #define	V_tcp_reass_qsize	VNET(tcp_reass_qsize)
 #define	V_tcp_reass_zone	VNET(tcp_reass_zone)
-#define	V_tcpest_hhook		VNET(tcpest_hhook)
 
 #endif /* _KERNEL */
 

Modified: projects/tcp_cc_head/sys/vm/uma.h
==============================================================================
--- projects/tcp_cc_head/sys/vm/uma.h	Tue Feb 16 23:59:48 2010	(r203979)
+++ projects/tcp_cc_head/sys/vm/uma.h	Wed Feb 17 01:14:28 2010	(r203980)
@@ -306,14 +306,6 @@ uma_zalloc(uma_zone_t zone, int flags)
 }
 
 /*
- * Frees all items currently allocated back into the specified zone.
- *
- * Arguments:
- *    zone  The zone free all currently allocated items from.
- */
-void uma_zfree_all(uma_zone_t zone);
-
-/*
  * Frees an item back into the specified zone.
  *
  * Arguments:

Modified: projects/tcp_cc_head/sys/vm/uma_core.c
==============================================================================
--- projects/tcp_cc_head/sys/vm/uma_core.c	Tue Feb 16 23:59:48 2010	(r203979)
+++ projects/tcp_cc_head/sys/vm/uma_core.c	Wed Feb 17 01:14:28 2010	(r203980)
@@ -2315,9 +2315,6 @@ slab_alloc_item(uma_zone_t zone, uma_sla
 	}
 	item = slab->us_data + (keg->uk_rsize * freei);
 
-	//printf("slab_alloc_item() slab %p us_freecount: %d\n", slab,
-	//slab->us_freecount);
-
 	slab->us_freecount--;
 	keg->uk_free--;
 #ifdef INVARIANTS
@@ -2679,36 +2676,6 @@ zfree_internal:
 	return;
 }
 
-void
-uma_zfree_all(uma_zone_t zone)
-{
-	uma_klink_t kl;
-	uma_slab_t slab;
-
-	printf("zone->uz_count: %d\n", zone->uz_count);
-
-	ZONE_LOCK(zone);
-	LIST_FOREACH(kl, &zone->uz_kegs, kl_link) {
-		printf("keg %s (%p) uk_free: %d\n", kl->kl_keg->uk_name,
-		kl->kl_keg, kl->kl_keg->uk_free);
-
-		LIST_FOREACH(slab, &kl->kl_keg->uk_part_slab, us_link) {
-			printf("partially full slab %p us_freecount: %d, firstfree: %d\n",
-			    slab, slab->us_freecount, slab->us_firstfree);
-
-		}
-		LIST_FOREACH(slab, &kl->kl_keg->uk_full_slab, us_link) {
-			printf("full slab %p us_freecount: %d\n",
-			    slab, slab->us_freecount);
-		}
-		LIST_FOREACH(slab, &kl->kl_keg->uk_free_slab, us_link) {
-			printf("free slab %p us_freecount: %d\n",
-			    slab, slab->us_freecount);
-		}
-	}
-	ZONE_UNLOCK(zone);
-}
-
 /*
  * Frees an item to an INTERNAL zone or allocates a free bucket
  *