svn commit: r202846 - user/luigi/ipfw3-head/sys/netinet/ipfw

Luigi Rizzo luigi at FreeBSD.org
Fri Jan 22 23:40:48 UTC 2010


Author: luigi
Date: Fri Jan 22 23:40:47 2010
New Revision: 202846
URL: http://svn.freebsd.org/changeset/base/202846

Log:
  some tweaks to ease testing in user space

Modified:
  user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h
  user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dn_private.h
  user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_heap.c
  user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_sched.c

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h	Fri Jan 22 23:35:06 2010	(r202845)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/dn_test.h	Fri Jan 22 23:40:47 2010	(r202846)
@@ -6,6 +6,7 @@
 #define _DN_TEST_H
 #include <stdio.h>
 #include <stdlib.h>
+#include <strings.h>	/* bzero */
 #include <inttypes.h>
 #include <sys/queue.h>
 #include <sys/time.h>

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dn_private.h
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dn_private.h	Fri Jan 22 23:35:06 2010	(r202845)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dn_private.h	Fri Jan 22 23:40:47 2010	(r202846)
@@ -125,6 +125,7 @@ struct dn_parms {
 	int	busy;
 	struct	mq	pending;
 
+#ifdef _KERNEL
 	/* uh_mtx arbitrates between system calls and also
 	 * protects fshash, schedhash and fsunlinked.
 	 * These structures are readonly for the lower half.
@@ -134,6 +135,7 @@ struct dn_parms {
 	 * modified upon packet arrivals
 	 */
 	struct mtx bh_mtx;
+#endif /* _KERNEL */
 };
 
 /*

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_heap.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_heap.c	Fri Jan 22 23:35:06 2010	(r202845)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_heap.c	Fri Jan 22 23:40:47 2010	(r202846)
@@ -46,7 +46,7 @@ struct x {
 	char buf[0];
 };
 
-int hf(uintptr_t key, int flags, void *arg)
+uint32_t hf(uintptr_t key, int flags, void *arg)
 {
 	return (flags & DNHT_KEY_IS_OBJ) ?
 		((struct x *)key)->buf[0] : *(char *)key;

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_sched.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_sched.c	Fri Jan 22 23:35:06 2010	(r202845)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/test_dn_sched.c	Fri Jan 22 23:40:47 2010	(r202846)
@@ -98,10 +98,11 @@ drop:
         FREE_PKT(m);
         return 1;
 }
-
+#ifndef NO_MAIN
 int
 main(int argc, char *argv[])
 {
 	printf("test code for the schedulers\n");
 	return 0;
 }
+#endif


More information about the svn-src-user mailing list