kfifo: add kfifo_skip() testcase
in [Kernel]
|
Prev: [PATCH 2/3] perf ui browser: Add routines to compactly specify exit keys
Next: [PATCH 3/3] perf ui browser: Abstract some more slang operations
From: Stefani Seibold on 12 Aug 2010 16:50 Add a testcase for kfifo_skip() to the byte stream fifo example. Signed-off-by: Andrea Righi <arighi(a)develer.com> Acked-by: Stefani Seibold <stefani(a)seibold.net> --- samples/kfifo/bytestream-example.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/samples/kfifo/bytestream-example.c b/samples/kfifo/bytestream-example.c index 642eef3..2e3a7a8 100644 --- a/samples/kfifo/bytestream-example.c +++ b/samples/kfifo/bytestream-example.c @@ -73,6 +73,10 @@ static int __init testfunc(void) ret = kfifo_in(&test, buf, ret); printk(KERN_INFO "ret: %d\n", ret); + /* skip first element of the fifo */ + printk(KERN_INFO "skip 1st element\n"); + kfifo_skip(&test); + /* put values into the fifo until is full */ for (i = 20; kfifo_put(&test, &i); i++) ; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Andrew Morton on 12 Aug 2010 17:30 On Thu, 12 Aug 2010 17:32:38 +0200 Andrea Righi <arighi(a)develer.com> wrote: > Add a testcase for kfifo_skip() to the byte stream fifo example. > > Signed-off-by: Andrea Righi <arighi(a)develer.com> > --- > samples/kfifo/bytestream-example.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/samples/kfifo/bytestream-example.c b/samples/kfifo/bytestream-example.c > index 642eef3..2e3a7a8 100644 > --- a/samples/kfifo/bytestream-example.c > +++ b/samples/kfifo/bytestream-example.c > @@ -73,6 +73,10 @@ static int __init testfunc(void) > ret = kfifo_in(&test, buf, ret); > printk(KERN_INFO "ret: %d\n", ret); > > + /* skip first element of the fifo */ > + printk(KERN_INFO "skip 1st element\n"); > + kfifo_skip(&test); > + > /* put values into the fifo until is full */ > for (i = 20; kfifo_put(&test, &i); i++) > ; hm, that's not a very good test harness. A better one would check that the resulting kfifo actually contains the expected items in the expected order. AFACIT this will "pass" even if kfifo_skip() is a no-op, or execs nethack or something. Oh well, it's more than we usually get. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Andrea Righi on 12 Aug 2010 18:30
On Thu, Aug 12, 2010 at 02:22:11PM -0700, Andrew Morton wrote: > On Thu, 12 Aug 2010 17:32:38 +0200 > Andrea Righi <arighi(a)develer.com> wrote: > > > Add a testcase for kfifo_skip() to the byte stream fifo example. > > > > Signed-off-by: Andrea Righi <arighi(a)develer.com> > > --- > > samples/kfifo/bytestream-example.c | 4 ++++ > > 1 files changed, 4 insertions(+), 0 deletions(-) > > > > diff --git a/samples/kfifo/bytestream-example.c b/samples/kfifo/bytestream-example.c > > index 642eef3..2e3a7a8 100644 > > --- a/samples/kfifo/bytestream-example.c > > +++ b/samples/kfifo/bytestream-example.c > > @@ -73,6 +73,10 @@ static int __init testfunc(void) > > ret = kfifo_in(&test, buf, ret); > > printk(KERN_INFO "ret: %d\n", ret); > > > > + /* skip first element of the fifo */ > > + printk(KERN_INFO "skip 1st element\n"); > > + kfifo_skip(&test); > > + > > /* put values into the fifo until is full */ > > for (i = 20; kfifo_put(&test, &i); i++) > > ; > > hm, that's not a very good test harness. A better one would check that > the resulting kfifo actually contains the expected items in the > expected order. AFACIT this will "pass" even if kfifo_skip() is a > no-op, or execs nethack or something. > > Oh well, it's more than we usually get. Agreed. Something like this is probably more meaningful. --- kfifo: add explicit error checking in byte stream example Provide a static array of expected items that kfifo should contain at the end of the test to validate it. Signed-off-by: Andrea Righi <arighi(a)develer.com> --- samples/kfifo/bytestream-example.c | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 insertions(+), 6 deletions(-) diff --git a/samples/kfifo/bytestream-example.c b/samples/kfifo/bytestream-example.c index 2e3a7a8..a94e694 100644 --- a/samples/kfifo/bytestream-example.c +++ b/samples/kfifo/bytestream-example.c @@ -44,10 +44,17 @@ static struct kfifo test; static DECLARE_KFIFO(test, unsigned char, FIFO_SIZE); #endif +static unsigned char expected_result[FIFO_SIZE] = { + 3, 4, 5, 6, 7, 8, 9, 0, + 1, 20, 21, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, +}; + static int __init testfunc(void) { unsigned char buf[6]; - unsigned char i; + unsigned char i, j; unsigned int ret; printk(KERN_INFO "byte stream fifo test start\n"); @@ -83,10 +90,19 @@ static int __init testfunc(void) printk(KERN_INFO "queue len: %u\n", kfifo_len(&test)); - /* print out all values in the fifo */ - while (kfifo_get(&test, &i)) - printk("%d ", i); - printk("\n"); + /* check the correctness of all values in the fifo */ + j = 0; + while (kfifo_get(&test, &i)) { + if (i != expected_result[j++]) { + printk(KERN_WARNING "value mismatch: test failed\n"); + return -EIO; + } + } + if (j != ARRAY_SIZE(expected_result)) { + printk(KERN_WARNING "size mismatch: test failed\n"); + return -EIO; + } + printk(KERN_INFO "test passed\n"); return 0; } @@ -142,7 +158,12 @@ static int __init example_init(void) #else INIT_KFIFO(test); #endif - testfunc(); + if (testfunc() < 0) { +#ifdef DYNAMIC + kfifo_free(&test); +#endif + return -EIO; + } if (proc_create(PROC_FIFO, 0, NULL, &fifo_fops) == NULL) { #ifdef DYNAMIC -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |