Index: kernel/test/synch/rwlock1.c =================================================================== --- kernel/test/synch/rwlock1.c (revision 9528be02598411a76342ce8a1f19b330ac1c11dc) +++ (revision ) @@ -1,75 +1,0 @@ -/* - * Copyright (c) 2001-2004 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include - -#include -#include - -#define READERS 50 -#define WRITERS 50 - -static rwlock_t rwlock; - -const char *test_rwlock1(void) -{ - rwlock_initialize(&rwlock); - - rwlock_write_lock(&rwlock); - rwlock_write_unlock(&rwlock); - - rwlock_read_lock(&rwlock); - rwlock_read_lock(&rwlock); - rwlock_read_lock(&rwlock); - rwlock_read_lock(&rwlock); - rwlock_read_lock(&rwlock); - - rwlock_read_unlock(&rwlock); - rwlock_read_unlock(&rwlock); - rwlock_read_unlock(&rwlock); - rwlock_read_unlock(&rwlock); - rwlock_read_unlock(&rwlock); - - rwlock_write_lock(&rwlock); - rwlock_write_unlock(&rwlock); - - rwlock_read_lock(&rwlock); - rwlock_read_unlock(&rwlock); - - rwlock_write_lock(&rwlock); - rwlock_write_unlock(&rwlock); - - rwlock_read_lock(&rwlock); - rwlock_read_unlock(&rwlock); - - return NULL; -} Index: kernel/test/synch/rwlock1.def =================================================================== --- kernel/test/synch/rwlock1.def (revision 9528be02598411a76342ce8a1f19b330ac1c11dc) +++ (revision ) @@ -1,6 +1,0 @@ -{ - "rwlock1", - "RW-lock test 1", - &test_rwlock1, - true -}, Index: kernel/test/synch/rwlock2.c =================================================================== --- kernel/test/synch/rwlock2.c (revision 9528be02598411a76342ce8a1f19b330ac1c11dc) +++ (revision ) @@ -1,83 +1,0 @@ -/* - * Copyright (c) 2001-2004 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include - -#include - -#define READERS 50 -#define WRITERS 50 - -static rwlock_t rwlock; - -static void writer(void *arg) -{ - TPRINTF("Trying to lock rwlock for writing....\n"); - - rwlock_write_lock(&rwlock); - rwlock_write_unlock(&rwlock); - - TPRINTF("Trying to lock rwlock for reading....\n"); - - rwlock_read_lock(&rwlock); - rwlock_read_unlock(&rwlock); -} - -const char *test_rwlock2(void) -{ - thread_t *thrd; - - rwlock_initialize(&rwlock); - - rwlock_read_lock(&rwlock); - rwlock_read_lock(&rwlock); - rwlock_read_lock(&rwlock); - rwlock_read_lock(&rwlock); - - thrd = thread_create(writer, NULL, TASK, 0, "writer", false); - if (thrd) - thread_ready(thrd); - else - return "Could not create thread"; - - thread_sleep(1); - - rwlock_read_unlock(&rwlock); - rwlock_read_unlock(&rwlock); - rwlock_read_unlock(&rwlock); - rwlock_read_unlock(&rwlock); - - thread_join(thrd); - thread_detach(thrd); - - return NULL; -} Index: kernel/test/synch/rwlock2.def =================================================================== --- kernel/test/synch/rwlock2.def (revision 9528be02598411a76342ce8a1f19b330ac1c11dc) +++ (revision ) @@ -1,6 +1,0 @@ -{ - "rwlock2", - "RW-lock test 2", - &test_rwlock2, - true -}, Index: kernel/test/synch/rwlock3.c =================================================================== --- kernel/test/synch/rwlock3.c (revision 9528be02598411a76342ce8a1f19b330ac1c11dc) +++ (revision ) @@ -1,89 +1,0 @@ -/* - * Copyright (c) 2001-2004 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include - -#include - -#define THREADS 4 - -static atomic_t thread_count; -static rwlock_t rwlock; - -static void reader(void *arg) -{ - thread_detach(THREAD); - - TPRINTF("cpu%u, tid %" PRIu64 ": trying to lock rwlock for reading....\n", CPU->id, THREAD->tid); - - rwlock_read_lock(&rwlock); - rwlock_read_unlock(&rwlock); - - TPRINTF("cpu%u, tid %" PRIu64 ": success\n", CPU->id, THREAD->tid); - TPRINTF("cpu%u, tid %" PRIu64 ": trying to lock rwlock for writing....\n", CPU->id, THREAD->tid); - - rwlock_write_lock(&rwlock); - rwlock_write_unlock(&rwlock); - - TPRINTF("cpu%u, tid %" PRIu64 ": success\n", CPU->id, THREAD->tid); - - atomic_dec(&thread_count); -} - -const char *test_rwlock3(void) -{ - int i; - thread_t *thrd; - - atomic_set(&thread_count, THREADS); - - rwlock_initialize(&rwlock); - rwlock_write_lock(&rwlock); - - for (i = 0; i < THREADS; i++) { - thrd = thread_create(reader, NULL, TASK, 0, "reader", false); - if (thrd) - thread_ready(thrd); - else - TPRINTF("Could not create reader %d\n", i); - } - - thread_sleep(1); - rwlock_write_unlock(&rwlock); - - while (atomic_get(&thread_count) > 0) { - TPRINTF("Threads left: %ld\n", atomic_get(&thread_count)); - thread_sleep(1); - } - - return NULL; -} Index: kernel/test/synch/rwlock3.def =================================================================== --- kernel/test/synch/rwlock3.def (revision 9528be02598411a76342ce8a1f19b330ac1c11dc) +++ (revision ) @@ -1,6 +1,0 @@ -{ - "rwlock3", - "RW-lock test 3", - &test_rwlock3, - true -}, Index: kernel/test/synch/rwlock4.c =================================================================== --- kernel/test/synch/rwlock4.c (revision 9528be02598411a76342ce8a1f19b330ac1c11dc) +++ (revision ) @@ -1,184 +1,0 @@ -/* - * Copyright (c) 2001-2004 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#define READERS 50 -#define WRITERS 50 - -static atomic_t thread_count; -static rwlock_t rwlock; -static atomic_t threads_fault; - -SPINLOCK_INITIALIZE(rw_lock); - -static waitq_t can_start; - -static uint32_t seed = 0xdeadbeef; - -static uint32_t random(uint32_t max) -{ - uint32_t rc; - - spinlock_lock(&rw_lock); - rc = seed % max; - seed = (((seed << 2) ^ (seed >> 2)) * 487) + rc; - spinlock_unlock(&rw_lock); - return rc; -} - -static void writer(void *arg) -{ - int rc, to; - thread_detach(THREAD); - waitq_sleep(&can_start); - - to = random(40000); - - TPRINTF("cpu%u, tid %" PRIu64 " w+ (%d)\n", CPU->id, THREAD->tid, to); - - rc = rwlock_write_lock_timeout(&rwlock, to); - if (SYNCH_FAILED(rc)) { - TPRINTF("cpu%u, tid %" PRIu64 " w!\n", CPU->id, THREAD->tid); - atomic_dec(&thread_count); - return; - } - - TPRINTF("cpu%u, tid %" PRIu64 " w=\n", CPU->id, THREAD->tid); - - if (rwlock.readers_in) { - TPRINTF("Oops.\n"); - atomic_inc(&threads_fault); - atomic_dec(&thread_count); - return; - } - - thread_usleep(random(1000000)); - - if (rwlock.readers_in) { - TPRINTF("Oops.\n"); - atomic_inc(&threads_fault); - atomic_dec(&thread_count); - return; - } - - rwlock_write_unlock(&rwlock); - - TPRINTF("cpu%u, tid %" PRIu64 " w-\n", CPU->id, THREAD->tid); - atomic_dec(&thread_count); -} - -static void reader(void *arg) -{ - int rc, to; - thread_detach(THREAD); - waitq_sleep(&can_start); - - to = random(2000); - - TPRINTF("cpu%u, tid %" PRIu64 " r+ (%d)\n", CPU->id, THREAD->tid, to); - - rc = rwlock_read_lock_timeout(&rwlock, to); - if (SYNCH_FAILED(rc)) { - TPRINTF("cpu%u, tid %" PRIu64 " r!\n", CPU->id, THREAD->tid); - atomic_dec(&thread_count); - return; - } - - TPRINTF("cpu%u, tid %" PRIu64 " r=\n", CPU->id, THREAD->tid); - - thread_usleep(30000); - rwlock_read_unlock(&rwlock); - - TPRINTF("cpu%u, tid %" PRIu64 " r-\n", CPU->id, THREAD->tid); - atomic_dec(&thread_count); -} - -const char *test_rwlock4(void) -{ - context_t ctx; - uint32_t i; - - waitq_initialize(&can_start); - rwlock_initialize(&rwlock); - atomic_set(&threads_fault, 0); - - uint32_t rd = random(7) + 1; - uint32_t wr = random(5) + 1; - - atomic_set(&thread_count, rd + wr); - - thread_t *thrd; - - context_save(&ctx); - TPRINTF("sp=%#x, readers_in=%" PRIs "\n", ctx.sp, rwlock.readers_in); - TPRINTF("Creating %" PRIu32 " readers\n", rd); - - for (i = 0; i < rd; i++) { - thrd = thread_create(reader, NULL, TASK, 0, "reader", false); - if (thrd) - thread_ready(thrd); - else - TPRINTF("Could not create reader %" PRIu32 "\n", i); - } - - TPRINTF("Creating %" PRIu32 " writers\n", wr); - - for (i = 0; i < wr; i++) { - thrd = thread_create(writer, NULL, TASK, 0, "writer", false); - if (thrd) - thread_ready(thrd); - else - TPRINTF("Could not create writer %" PRIu32 "\n", i); - } - - thread_usleep(20000); - waitq_wakeup(&can_start, WAKEUP_ALL); - - while (atomic_get(&thread_count) > 0) { - TPRINTF("Threads left: %ld\n", atomic_get(&thread_count)); - thread_sleep(1); - } - - if (atomic_get(&threads_fault) == 0) - return NULL; - - return "Test failed"; -} Index: kernel/test/synch/rwlock4.def =================================================================== --- kernel/test/synch/rwlock4.def (revision 9528be02598411a76342ce8a1f19b330ac1c11dc) +++ (revision ) @@ -1,6 +1,0 @@ -{ - "rwlock4", - "RW-lock test 4", - &test_rwlock4, - true -}, Index: kernel/test/synch/rwlock5.c =================================================================== --- kernel/test/synch/rwlock5.c (revision 9528be02598411a76342ce8a1f19b330ac1c11dc) +++ (revision ) @@ -1,118 +1,0 @@ -/* - * Copyright (c) 2001-2004 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include - -#include -#include - -#define READERS 50 -#define WRITERS 50 - -static rwlock_t rwlock; - -static waitq_t can_start; -static atomic_t items_read; -static atomic_t items_written; - -static void writer(void *arg) -{ - thread_detach(THREAD); - - waitq_sleep(&can_start); - - rwlock_write_lock(&rwlock); - atomic_inc(&items_written); - rwlock_write_unlock(&rwlock); -} - -static void reader(void *arg) -{ - thread_detach(THREAD); - - waitq_sleep(&can_start); - - rwlock_read_lock(&rwlock); - atomic_inc(&items_read); - rwlock_read_unlock(&rwlock); -} - -const char *test_rwlock5(void) -{ - int i, j, k; - atomic_count_t readers; - atomic_count_t writers; - - waitq_initialize(&can_start); - rwlock_initialize(&rwlock); - - for (i = 1; i <= 3; i++) { - thread_t *thrd; - - atomic_set(&items_read, 0); - atomic_set(&items_written, 0); - - readers = i * READERS; - writers = (4 - i) * WRITERS; - - TPRINTF("Creating %ld readers and %ld writers...", readers, writers); - - for (j = 0; j < (READERS + WRITERS) / 2; j++) { - for (k = 0; k < i; k++) { - thrd = thread_create(reader, NULL, TASK, 0, "reader", false); - if (thrd) - thread_ready(thrd); - else - TPRINTF("Could not create reader %d\n", k); - } - for (k = 0; k < (4 - i); k++) { - thrd = thread_create(writer, NULL, TASK, 0, "writer", false); - if (thrd) - thread_ready(thrd); - else - TPRINTF("Could not create writer %d\n", k); - } - } - - TPRINTF("ok\n"); - - thread_sleep(1); - waitq_wakeup(&can_start, WAKEUP_ALL); - - while ((items_read.count != readers) || (items_written.count != writers)) { - TPRINTF("%d readers remaining, %d writers remaining, readers_in=%d\n", readers - items_read.count, writers - items_written.count, rwlock.readers_in); - thread_usleep(100000); - } - } - - return NULL; -} Index: kernel/test/synch/rwlock5.def =================================================================== --- kernel/test/synch/rwlock5.def (revision 9528be02598411a76342ce8a1f19b330ac1c11dc) +++ (revision ) @@ -1,6 +1,0 @@ -{ - "rwlock5", - "RW-lock test 5", - &test_rwlock5, - true -}, Index: kernel/test/test.c =================================================================== --- kernel/test/test.c (revision 9528be02598411a76342ce8a1f19b330ac1c11dc) +++ kernel/test/test.c (revision e821e497bdb3d07036342b84204a38ccc7f2bc09) @@ -51,9 +51,4 @@ #include #include -#include -#include -#include -#include -#include #include #include Index: kernel/test/test.h =================================================================== --- kernel/test/test.h (revision 9528be02598411a76342ce8a1f19b330ac1c11dc) +++ kernel/test/test.h (revision e821e497bdb3d07036342b84204a38ccc7f2bc09) @@ -70,9 +70,4 @@ extern const char *test_slab1(void); extern const char *test_slab2(void); -extern const char *test_rwlock1(void); -extern const char *test_rwlock2(void); -extern const char *test_rwlock3(void); -extern const char *test_rwlock4(void); -extern const char *test_rwlock5(void); extern const char *test_semaphore1(void); extern const char *test_semaphore2(void);