pull structs and macros that are only used in hfsc.c out of the header

and into the .c file.

ok henning@

2 files changed, 150 insertions, 149 deletions

diff --git a/sys/net/hfsc.c b/sys/net/hfsc.c
index 00dafb83f49..860a8389e38 100644
--- a/sys/net/hfsc.c
+++ b/sys/net/hfsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hfsc.c,v 1.17 2015/04/11 13:00:12 dlg Exp $	*/
+/*	$OpenBSD: hfsc.c,v 1.18 2015/04/12 09:58:46 dlg Exp $	*/
 
 /*
  * Copyright (c) 2012-2013 Henning Brauer <henning@openbsd.org>
@@ -51,6 +51,7 @@
 #include <sys/errno.h>
 #include <sys/queue.h>
 #include <sys/kernel.h>
+#include <sys/timeout.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
@@ -63,6 +64,146 @@
 #include "pf.h"
 #if NPF > 0
 /*
+ * kernel internal service curve representation
+ *	coordinates are given by 64 bit unsigned integers.
+ *	x-axis: unit is clock count.  for the intel x86 architecture,
+ *		the raw Pentium TSC (Timestamp Counter) value is used.
+ *		virtual time is also calculated in this time scale.
+ *	y-axis: unit is byte.
+ *
+ *	the service curve parameters are converted to the internal
+ *	representation.
+ *	the slope values are scaled to avoid overflow.
+ *	the inverse slope values as well as the y-projection of the 1st
+ *	segment are kept in order to to avoid 64-bit divide operations
+ *	that are expensive on 32-bit architectures.
+ *
+ *  note: Intel Pentium TSC never wraps around in several thousands of years.
+ *	x-axis doesn't wrap around for 1089 years with 1GHz clock.
+ *      y-axis doesn't wrap around for 4358 years with 1Gbps bandwidth.
+ */
+
+/* kernel internal representation of a service curve */
+struct hfsc_internal_sc {
+	u_int64_t	sm1;	/* scaled slope of the 1st segment */
+	u_int64_t	ism1;	/* scaled inverse-slope of the 1st segment */
+	u_int64_t	dx;	/* the x-projection of the 1st segment */
+	u_int64_t	dy;	/* the y-projection of the 1st segment */
+	u_int64_t	sm2;	/* scaled slope of the 2nd segment */
+	u_int64_t	ism2;	/* scaled inverse-slope of the 2nd segment */
+};
+
+/* runtime service curve */
+struct hfsc_runtime_sc {
+	u_int64_t	x;	/* current starting position on x-axis */
+	u_int64_t	y;	/* current starting position on x-axis */
+	u_int64_t	sm1;	/* scaled slope of the 1st segment */
+	u_int64_t	ism1;	/* scaled inverse-slope of the 1st segment */
+	u_int64_t	dx;	/* the x-projection of the 1st segment */
+	u_int64_t	dy;	/* the y-projection of the 1st segment */
+	u_int64_t	sm2;	/* scaled slope of the 2nd segment */
+	u_int64_t	ism2;	/* scaled inverse-slope of the 2nd segment */
+};
+
+struct hfsc_classq {
+	struct mbuf	*tail;	 /* Tail of packet queue */
+	int		 qlen;	 /* Queue length (in number of packets) */
+	int		 qlimit; /* Queue limit (in number of packets*) */
+	int		 qtype;	 /* Queue type */
+};
+
+/* for TAILQ based ellist and actlist implementation */
+struct hfsc_class;
+typedef TAILQ_HEAD(hfsc_eligible, hfsc_class) hfsc_ellist_t;
+typedef TAILQ_ENTRY(hfsc_class) hfsc_elentry_t;
+typedef TAILQ_HEAD(hfsc_active, hfsc_class) hfsc_actlist_t;
+typedef TAILQ_ENTRY(hfsc_class) hfsc_actentry_t;
+#define	hfsc_ellist_first(s)		TAILQ_FIRST(s)
+#define	hfsc_actlist_first(s)		TAILQ_FIRST(s)
+#define	hfsc_actlist_last(s)		TAILQ_LAST(s, hfsc_active)
+
+struct hfsc_class {
+	u_int		cl_id;		/* class id (just for debug) */
+	u_int32_t	cl_handle;	/* class handle */
+	struct hfsc_if	*cl_hif;	/* back pointer to struct hfsc_if */
+	int		cl_flags;	/* misc flags */
+
+	struct hfsc_class *cl_parent;	/* parent class */
+	struct hfsc_class *cl_siblings;	/* sibling classes */
+	struct hfsc_class *cl_children;	/* child classes */
+
+	struct hfsc_classq *cl_q;	/* class queue structure */
+/*	struct red	*cl_red;*/	/* RED state */
+	struct altq_pktattr *cl_pktattr; /* saved header used by ECN */
+
+	u_int64_t	cl_total;	/* total work in bytes */
+	u_int64_t	cl_cumul;	/* cumulative work in bytes
+					   done by real-time criteria */
+	u_int64_t	cl_d;		/* deadline */
+	u_int64_t	cl_e;		/* eligible time */
+	u_int64_t	cl_vt;		/* virtual time */
+	u_int64_t	cl_f;		/* time when this class will fit for
+					   link-sharing, max(myf, cfmin) */
+	u_int64_t	cl_myf;		/* my fit-time (as calculated from this
+					   class's own upperlimit curve) */
+	u_int64_t	cl_myfadj;	/* my fit-time adjustment
+					   (to cancel history dependence) */
+	u_int64_t	cl_cfmin;	/* earliest children's fit-time (used
+					   with cl_myf to obtain cl_f) */
+	u_int64_t	cl_cvtmin;	/* minimal virtual time among the
+					   children fit for link-sharing
+					   (monotonic within a period) */
+	u_int64_t	cl_vtadj;	/* intra-period cumulative vt
+					   adjustment */
+	u_int64_t	cl_vtoff;	/* inter-period cumulative vt offset */
+	u_int64_t	cl_cvtmax;	/* max child's vt in the last period */
+
+	u_int64_t	cl_initvt;	/* init virtual time (for debugging) */
+
+	struct hfsc_internal_sc *cl_rsc; /* internal real-time service curve */
+	struct hfsc_internal_sc *cl_fsc; /* internal fair service curve */
+	struct hfsc_internal_sc *cl_usc; /* internal upperlimit service curve */
+	struct hfsc_runtime_sc   cl_deadline; /* deadline curve */
+	struct hfsc_runtime_sc   cl_eligible; /* eligible curve */
+	struct hfsc_runtime_sc   cl_virtual;  /* virtual curve */
+	struct hfsc_runtime_sc   cl_ulimit;   /* upperlimit curve */
+
+	u_int		cl_vtperiod;	/* vt period sequence no */
+	u_int		cl_parentperiod;  /* parent's vt period seqno */
+	int		cl_nactive;	/* number of active children */
+	hfsc_actlist_t	*cl_actc;	/* active children list */
+
+	hfsc_actentry_t	cl_actlist;	/* active children list entry */
+	hfsc_elentry_t	cl_ellist;	/* eligible list entry */
+
+	struct {
+		struct hfsc_pktcntr xmit_cnt;
+		struct hfsc_pktcntr drop_cnt;
+		u_int period;
+	} cl_stats;
+};
+
+/*
+ * hfsc interface state
+ */
+struct hfsc_if {
+	struct hfsc_if		*hif_next;	/* interface state list */
+	struct ifqueue		*hif_ifq;	/* backpointer to ifq */
+	struct hfsc_class	*hif_rootclass;		/* root class */
+	struct hfsc_class	*hif_defaultclass;	/* default class */
+	struct hfsc_class	**hif_class_tbl;
+	struct hfsc_class	*hif_pollcache;	/* cache for poll operation */
+
+	u_int	hif_allocated;			/* # of slots in hif_class_tbl */
+	u_int	hif_classes;			/* # of classes in the tree */
+	u_int	hif_packets;			/* # of packets in the tree */
+	u_int	hif_classid;			/* class id sequence number */
+
+	hfsc_ellist_t *hif_eligible;			/* eligible list */
+	struct timeout hif_defer;	/* for queues that weren't ready */
+};
+
+/*
  * function prototypes
  */
 struct hfsc_class	*hfsc_class_create(struct hfsc_if *,
@@ -119,6 +260,9 @@ void		hfsc_rtsc_min(struct hfsc_runtime_sc *,
 void		hfsc_getclstats(struct hfsc_class_stats *, struct hfsc_class *);
 struct hfsc_class	*hfsc_clh2cph(struct hfsc_if *, u_int32_t);
 
+#define	HFSC_CLK_SHIFT		8
+#define	HFSC_FREQ		(1000000 << HFSC_CLK_SHIFT)
+#define	HFSC_CLK_PER_TICK	(HFSC_FREQ / hz)
 #define	HFSC_HT_INFINITY	0xffffffffffffffffLL /* infinite time value */
 
 struct pool	hfsc_class_pl, hfsc_classq_pl, hfsc_internal_sc_pl;
diff --git a/sys/net/hfsc.h b/sys/net/hfsc.h
index 722c93d01d7..4a09b80d7a0 100644
--- a/sys/net/hfsc.h
+++ b/sys/net/hfsc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hfsc.h,v 1.7 2015/04/11 13:00:12 dlg Exp $	*/
+/*	$OpenBSD: hfsc.h,v 1.8 2015/04/12 09:58:46 dlg Exp $	*/
 
 /*
  * Copyright (c) 2012-2013 Henning Brauer <henning@openbsd.org>
@@ -33,8 +33,6 @@
 #ifndef _HFSC_H_
 #define	_HFSC_H_
 
-#include <sys/timeout.h>
-
 /* hfsc class flags */
 #define	HFSC_RED		0x0001	/* use RED */
 #define	HFSC_ECN		0x0002  /* use RED/ECN */
@@ -109,155 +107,14 @@ struct hfsc_class_stats {
 };
 
 #ifdef _KERNEL
-/*
- * kernel internal service curve representation
- *	coordinates are given by 64 bit unsigned integers.
- *	x-axis: unit is clock count.  for the intel x86 architecture,
- *		the raw Pentium TSC (Timestamp Counter) value is used.
- *		virtual time is also calculated in this time scale.
- *	y-axis: unit is byte.
- *
- *	the service curve parameters are converted to the internal
- *	representation.
- *	the slope values are scaled to avoid overflow.
- *	the inverse slope values as well as the y-projection of the 1st
- *	segment are kept in order to to avoid 64-bit divide operations
- *	that are expensive on 32-bit architectures.
- *
- *  note: Intel Pentium TSC never wraps around in several thousands of years.
- *	x-axis doesn't wrap around for 1089 years with 1GHz clock.
- *      y-axis doesn't wrap around for 4358 years with 1Gbps bandwidth.
- */
-
-/* kernel internal representation of a service curve */
-struct hfsc_internal_sc {
-	u_int64_t	sm1;	/* scaled slope of the 1st segment */
-	u_int64_t	ism1;	/* scaled inverse-slope of the 1st segment */
-	u_int64_t	dx;	/* the x-projection of the 1st segment */
-	u_int64_t	dy;	/* the y-projection of the 1st segment */
-	u_int64_t	sm2;	/* scaled slope of the 2nd segment */
-	u_int64_t	ism2;	/* scaled inverse-slope of the 2nd segment */
-};
-
-/* runtime service curve */
-struct hfsc_runtime_sc {
-	u_int64_t	x;	/* current starting position on x-axis */
-	u_int64_t	y;	/* current starting position on x-axis */
-	u_int64_t	sm1;	/* scaled slope of the 1st segment */
-	u_int64_t	ism1;	/* scaled inverse-slope of the 1st segment */
-	u_int64_t	dx;	/* the x-projection of the 1st segment */
-	u_int64_t	dy;	/* the y-projection of the 1st segment */
-	u_int64_t	sm2;	/* scaled slope of the 2nd segment */
-	u_int64_t	ism2;	/* scaled inverse-slope of the 2nd segment */
-};
-
-struct hfsc_classq {
-	struct mbuf	*tail;	 /* Tail of packet queue */
-	int		 qlen;	 /* Queue length (in number of packets) */
-	int		 qlimit; /* Queue limit (in number of packets*) */
-	int		 qtype;	 /* Queue type */
-};
-
-/* for TAILQ based ellist and actlist implementation */
-struct hfsc_class;
-typedef TAILQ_HEAD(hfsc_eligible, hfsc_class) hfsc_ellist_t;
-typedef TAILQ_ENTRY(hfsc_class) hfsc_elentry_t;
-typedef TAILQ_HEAD(hfsc_active, hfsc_class) hfsc_actlist_t;
-typedef TAILQ_ENTRY(hfsc_class) hfsc_actentry_t;
-#define	hfsc_ellist_first(s)		TAILQ_FIRST(s)
-#define	hfsc_actlist_first(s)		TAILQ_FIRST(s)
-#define	hfsc_actlist_last(s)		TAILQ_LAST(s, hfsc_active)
-
-struct hfsc_class {
-	u_int		cl_id;		/* class id (just for debug) */
-	u_int32_t	cl_handle;	/* class handle */
-	struct hfsc_if	*cl_hif;	/* back pointer to struct hfsc_if */
-	int		cl_flags;	/* misc flags */
-
-	struct hfsc_class *cl_parent;	/* parent class */
-	struct hfsc_class *cl_siblings;	/* sibling classes */
-	struct hfsc_class *cl_children;	/* child classes */
-
-	struct hfsc_classq *cl_q;	/* class queue structure */
-/*	struct red	*cl_red;*/	/* RED state */
-	struct altq_pktattr *cl_pktattr; /* saved header used by ECN */
-
-	u_int64_t	cl_total;	/* total work in bytes */
-	u_int64_t	cl_cumul;	/* cumulative work in bytes
-					   done by real-time criteria */
-	u_int64_t	cl_d;		/* deadline */
-	u_int64_t	cl_e;		/* eligible time */
-	u_int64_t	cl_vt;		/* virtual time */
-	u_int64_t	cl_f;		/* time when this class will fit for
-					   link-sharing, max(myf, cfmin) */
-	u_int64_t	cl_myf;		/* my fit-time (as calculated from this
-					   class's own upperlimit curve) */
-	u_int64_t	cl_myfadj;	/* my fit-time adjustment
-					   (to cancel history dependence) */
-	u_int64_t	cl_cfmin;	/* earliest children's fit-time (used
-					   with cl_myf to obtain cl_f) */
-	u_int64_t	cl_cvtmin;	/* minimal virtual time among the
-					   children fit for link-sharing
-					   (monotonic within a period) */
-	u_int64_t	cl_vtadj;	/* intra-period cumulative vt
-					   adjustment */
-	u_int64_t	cl_vtoff;	/* inter-period cumulative vt offset */
-	u_int64_t	cl_cvtmax;	/* max child's vt in the last period */
-
-	u_int64_t	cl_initvt;	/* init virtual time (for debugging) */
-
-	struct hfsc_internal_sc *cl_rsc; /* internal real-time service curve */
-	struct hfsc_internal_sc *cl_fsc; /* internal fair service curve */
-	struct hfsc_internal_sc *cl_usc; /* internal upperlimit service curve */
-	struct hfsc_runtime_sc   cl_deadline; /* deadline curve */
-	struct hfsc_runtime_sc   cl_eligible; /* eligible curve */
-	struct hfsc_runtime_sc   cl_virtual;  /* virtual curve */
-	struct hfsc_runtime_sc   cl_ulimit;   /* upperlimit curve */
-
-	u_int		cl_vtperiod;	/* vt period sequence no */
-	u_int		cl_parentperiod;  /* parent's vt period seqno */
-	int		cl_nactive;	/* number of active children */
-	hfsc_actlist_t	*cl_actc;	/* active children list */
-
-	hfsc_actentry_t	cl_actlist;	/* active children list entry */
-	hfsc_elentry_t	cl_ellist;	/* eligible list entry */
-
-	struct {
-		struct hfsc_pktcntr xmit_cnt;
-		struct hfsc_pktcntr drop_cnt;
-		u_int period;
-	} cl_stats;
-};
-
-/*
- * hfsc interface state
- */
-struct hfsc_if {
-	struct hfsc_if		*hif_next;	/* interface state list */
-	struct ifqueue		*hif_ifq;	/* backpointer to ifq */
-	struct hfsc_class	*hif_rootclass;		/* root class */
-	struct hfsc_class	*hif_defaultclass;	/* default class */
-	struct hfsc_class	**hif_class_tbl;
-	struct hfsc_class	*hif_pollcache;	/* cache for poll operation */
-
-	u_int	hif_allocated;			/* # of slots in hif_class_tbl */
-	u_int	hif_classes;			/* # of classes in the tree */
-	u_int	hif_packets;			/* # of packets in the tree */
-	u_int	hif_classid;			/* class id sequence number */
-
-	hfsc_ellist_t *hif_eligible;			/* eligible list */
-	struct timeout hif_defer;	/* for queues that weren't ready */
-};
-
-#define HFSC_CLK_SHIFT		8
-#define HFSC_FREQ		(1000000 << HFSC_CLK_SHIFT)
-#define HFSC_CLK_PER_TICK	(HFSC_FREQ / hz)
+struct ifnet;
+struct ifqueue;
+struct pf_queuespec;
+struct hfsc_if;
 
 #define	HFSC_ENABLED(ifq)	((ifq)->ifq_hfsc != NULL)
 #define	HFSC_DEFAULT_QLIMIT	50
 
-struct ifnet; struct ifqueue; struct pf_queuespec;
-
 void		 hfsc_initialize(void);
 int		 hfsc_attach(struct ifnet *);
 int		 hfsc_detach(struct ifnet *);