Module Name: src
Committed By: rmind
Date: Mon Jun 9 12:44:07 UTC 2014
Modified Files:
src/sys/kern: subr_pcq.c
src/sys/sys: pcq.h
Log Message:
Add PCQ_MAXLEN constant.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/kern/subr_pcq.c
cvs rdiff -u -r1.1 -r1.2 src/sys/sys/pcq.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_pcq.c
diff -u src/sys/kern/subr_pcq.c:1.7 src/sys/kern/subr_pcq.c:1.8
--- src/sys/kern/subr_pcq.c:1.7 Thu Feb 6 03:47:16 2014
+++ src/sys/kern/subr_pcq.c Mon Jun 9 12:44:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pcq.c,v 1.7 2014/02/06 03:47:16 riastradh Exp $ */
+/* $NetBSD: subr_pcq.c,v 1.8 2014/06/09 12:44:06 rmind Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pcq.c,v 1.7 2014/02/06 03:47:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pcq.c,v 1.8 2014/06/09 12:44:06 rmind Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -60,6 +60,7 @@ struct pcq {
* Consumer (c) - in the higher 16 bits.
*
* We have a limitation of 16 bits i.e. 0xffff items in the queue.
+ * The PCQ_MAXLEN constant is set accordingly.
*/
static inline void
@@ -197,7 +198,7 @@ pcq_create(size_t nitems, km_flag_t kmfl
{
pcq_t *pcq;
- KASSERT(nitems > 0 || nitems <= 0xffff);
+ KASSERT(nitems > 0 || nitems <= PCQ_MAXLEN);
pcq = kmem_zalloc(offsetof(pcq_t, pcq_items[nitems]), kmflags);
if (pcq == NULL) {
Index: src/sys/sys/pcq.h
diff -u src/sys/sys/pcq.h:1.1 src/sys/sys/pcq.h:1.2
--- src/sys/sys/pcq.h:1.1 Tue Nov 11 20:17:27 2008
+++ src/sys/sys/pcq.h Mon Jun 9 12:44:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pcq.h,v 1.1 2008/11/11 20:17:27 matt Exp $ */
+/* $NetBSD: pcq.h,v 1.2 2014/06/09 12:44:06 rmind Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -37,12 +37,16 @@
typedef struct pcq pcq_t;
#ifdef _KERNEL
+
+#define PCQ_MAXLEN (0xffffU)
+
bool pcq_put(pcq_t *, void *);
void * pcq_peek(pcq_t *);
void * pcq_get(pcq_t *);
size_t pcq_maxitems(pcq_t *);
pcq_t * pcq_create(size_t, km_flag_t);
void pcq_destroy(pcq_t *);
+
#endif /* _KERNEL */
#endif /* _SYS_PCQ_H_ */
