]> git.proxmox.com Git - mirror_spl-debian.git/blobdiff - modules/splat/splat-rwlock.c
Go through and add a header with the proper UCRL number.
[mirror_spl-debian.git] / modules / splat / splat-rwlock.c
index df4585ea384c7f506bc3206a09f0731a1d49a1db..b1db12ea8d1e4cc281fef312e427d903bf7b134d 100644 (file)
@@ -1,40 +1,66 @@
-#include <splat-ctl.h>
-
-#define KZT_SUBSYSTEM_RWLOCK           0x0700
-#define KZT_RWLOCK_NAME                        "rwlock"
-#define KZT_RWLOCK_DESC                        "Kernel RW Lock Tests"
-
-#define KZT_RWLOCK_TEST1_ID            0x0701
-#define KZT_RWLOCK_TEST1_NAME          "rwtest1"
-#define KZT_RWLOCK_TEST1_DESC          "Multiple Readers One Writer"
-
-#define KZT_RWLOCK_TEST2_ID            0x0702
-#define KZT_RWLOCK_TEST2_NAME          "rwtest2"
-#define KZT_RWLOCK_TEST2_DESC          "Multiple Writers"
-
-#define KZT_RWLOCK_TEST3_ID            0x0703
-#define KZT_RWLOCK_TEST3_NAME          "rwtest3"
-#define KZT_RWLOCK_TEST3_DESC          "Owner Verification"
-
-#define KZT_RWLOCK_TEST4_ID            0x0704
-#define KZT_RWLOCK_TEST4_NAME          "rwtest4"
-#define KZT_RWLOCK_TEST4_DESC          "Trylock Test"
-
-#define KZT_RWLOCK_TEST5_ID            0x0705
-#define KZT_RWLOCK_TEST5_NAME          "rwtest5"
-#define KZT_RWLOCK_TEST5_DESC          "Write Downgrade Test"
-
-#define KZT_RWLOCK_TEST6_ID            0x0706
-#define KZT_RWLOCK_TEST6_NAME          "rwtest6"
-#define KZT_RWLOCK_TEST6_DESC          "Read Upgrade Test"
-
-#define KZT_RWLOCK_TEST_MAGIC          0x115599DDUL
-#define KZT_RWLOCK_TEST_NAME           "rwlock_test"
-#define KZT_RWLOCK_TEST_COUNT          8
-
-#define KZT_RWLOCK_RELEASE_INIT                0
-#define KZT_RWLOCK_RELEASE_WRITERS     1
-#define KZT_RWLOCK_RELEASE_READERS     2
+/*
+ *  This file is part of the SPL: Solaris Porting Layer.
+ *
+ *  Copyright (c) 2008 Lawrence Livermore National Security, LLC.
+ *  Produced at Lawrence Livermore National Laboratory
+ *  Written by:
+ *          Brian Behlendorf <behlendorf1@llnl.gov>,
+ *          Herb Wartens <wartens2@llnl.gov>,
+ *          Jim Garlick <garlick@llnl.gov>
+ *  UCRL-CODE-235197
+ *
+ *  This is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ */
+
+#include "splat-internal.h"
+
+#define SPLAT_SUBSYSTEM_RWLOCK         0x0700
+#define SPLAT_RWLOCK_NAME              "rwlock"
+#define SPLAT_RWLOCK_DESC              "Kernel RW Lock Tests"
+
+#define SPLAT_RWLOCK_TEST1_ID          0x0701
+#define SPLAT_RWLOCK_TEST1_NAME                "rwtest1"
+#define SPLAT_RWLOCK_TEST1_DESC                "Multiple Readers One Writer"
+
+#define SPLAT_RWLOCK_TEST2_ID          0x0702
+#define SPLAT_RWLOCK_TEST2_NAME                "rwtest2"
+#define SPLAT_RWLOCK_TEST2_DESC                "Multiple Writers"
+
+#define SPLAT_RWLOCK_TEST3_ID          0x0703
+#define SPLAT_RWLOCK_TEST3_NAME                "rwtest3"
+#define SPLAT_RWLOCK_TEST3_DESC                "Owner Verification"
+
+#define SPLAT_RWLOCK_TEST4_ID          0x0704
+#define SPLAT_RWLOCK_TEST4_NAME                "rwtest4"
+#define SPLAT_RWLOCK_TEST4_DESC                "Trylock Test"
+
+#define SPLAT_RWLOCK_TEST5_ID          0x0705
+#define SPLAT_RWLOCK_TEST5_NAME                "rwtest5"
+#define SPLAT_RWLOCK_TEST5_DESC                "Write Downgrade Test"
+
+#define SPLAT_RWLOCK_TEST6_ID          0x0706
+#define SPLAT_RWLOCK_TEST6_NAME                "rwtest6"
+#define SPLAT_RWLOCK_TEST6_DESC                "Read Upgrade Test"
+
+#define SPLAT_RWLOCK_TEST_MAGIC                0x115599DDUL
+#define SPLAT_RWLOCK_TEST_NAME         "rwlock_test"
+#define SPLAT_RWLOCK_TEST_COUNT                8
+
+#define SPLAT_RWLOCK_RELEASE_INIT      0
+#define SPLAT_RWLOCK_RELEASE_WRITERS   1
+#define SPLAT_RWLOCK_RELEASE_READERS   2
 
 typedef struct rw_priv {
         unsigned long rw_magic;
@@ -56,13 +82,13 @@ typedef struct rw_thr {
 } rw_thr_t;
 
 static inline void
-kzt_rwlock_sleep(signed long delay)
+splat_rwlock_sleep(signed long delay)
 {
        set_current_state(TASK_INTERRUPTIBLE);
        schedule_timeout(delay);
 }
 
-#define kzt_rwlock_lock_and_test(lock,test)    \
+#define splat_rwlock_lock_and_test(lock,test)  \
 ({                                             \
        int ret = 0;                            \
                                                \
@@ -72,38 +98,38 @@ kzt_rwlock_sleep(signed long delay)
        ret;                                    \
 })
 
-void kzt_init_rw_priv(rw_priv_t *rwv, struct file *file)
+void splat_init_rw_priv(rw_priv_t *rwv, struct file *file)
 {
-       rwv->rw_magic = KZT_RWLOCK_TEST_MAGIC;
+       rwv->rw_magic = SPLAT_RWLOCK_TEST_MAGIC;
        rwv->rw_file = file;
        spin_lock_init(&rwv->rw_priv_lock);
        init_waitqueue_head(&rwv->rw_waitq);
        atomic_set(&rwv->rw_completed, 0);
        atomic_set(&rwv->rw_acquired, 0);
        atomic_set(&rwv->rw_waiters, 0);
-       atomic_set(&rwv->rw_release, KZT_RWLOCK_RELEASE_INIT);
-       
+       atomic_set(&rwv->rw_release, SPLAT_RWLOCK_RELEASE_INIT);
+
        /* Initialize the read/write lock */
-       rw_init(&rwv->rwl, KZT_RWLOCK_TEST_NAME, RW_DEFAULT, NULL);
+       rw_init(&rwv->rwl, SPLAT_RWLOCK_TEST_NAME, RW_DEFAULT, NULL);
 }
 
 int
-kzt_rwlock_test1_writer_thread(void *arg)
+splat_rwlock_test1_writer_thread(void *arg)
 {
        rw_thr_t *rwt = (rw_thr_t *)arg;
        rw_priv_t *rwv = rwt->rwt_rwp;
        uint8_t rnd = 0;
        char name[16];
 
-       ASSERT(rwv->rw_magic == KZT_RWLOCK_TEST_MAGIC);
-        snprintf(name, sizeof(name), "%s%d", 
-                KZT_RWLOCK_TEST_NAME, rwt->rwt_id);
+       ASSERT(rwv->rw_magic == SPLAT_RWLOCK_TEST_MAGIC);
+        snprintf(name, sizeof(name), "%s%d",
+                SPLAT_RWLOCK_TEST_NAME, rwt->rwt_id);
        daemonize(name);
        get_random_bytes((void *)&rnd, 1);
-       kzt_rwlock_sleep(rnd * HZ / 1000);
+       splat_rwlock_sleep(rnd * HZ / 1000);
 
        spin_lock(&rwv->rw_priv_lock);
-       kzt_vprint(rwv->rw_file, rwt->rwt_name,
+       splat_vprint(rwv->rw_file, rwt->rwt_name,
                   "%s writer thread trying to acquire rwlock with "
                   "%d holding lock and %d waiting\n",
                   name, atomic_read(&rwv->rw_acquired),
@@ -111,14 +137,14 @@ kzt_rwlock_test1_writer_thread(void *arg)
        atomic_inc(&rwv->rw_waiters);
        spin_unlock(&rwv->rw_priv_lock);
 
-       /* Take the semaphore for writing 
+       /* Take the semaphore for writing
         * release it when we are told to */
        rw_enter(&rwv->rwl, RW_WRITER);
 
        spin_lock(&rwv->rw_priv_lock);
        atomic_dec(&rwv->rw_waiters);
        atomic_inc(&rwv->rw_acquired);
-       kzt_vprint(rwv->rw_file, rwt->rwt_name,
+       splat_vprint(rwv->rw_file, rwt->rwt_name,
                   "%s writer thread acquired rwlock with "
                   "%d holding lock and %d waiting\n",
                   name, atomic_read(&rwv->rw_acquired),
@@ -128,13 +154,13 @@ kzt_rwlock_test1_writer_thread(void *arg)
        /* Wait here until the control thread
         * says we can release the write lock */
        wait_event_interruptible(rwv->rw_waitq,
-                                kzt_rwlock_lock_and_test(&rwv->rw_priv_lock,
+                                splat_rwlock_lock_and_test(&rwv->rw_priv_lock,
                                         atomic_read(&rwv->rw_release) ==
-                                        KZT_RWLOCK_RELEASE_WRITERS));
+                                        SPLAT_RWLOCK_RELEASE_WRITERS));
        spin_lock(&rwv->rw_priv_lock);
        atomic_inc(&rwv->rw_completed);
        atomic_dec(&rwv->rw_acquired);
-       kzt_vprint(rwv->rw_file, rwt->rwt_name,
+       splat_vprint(rwv->rw_file, rwt->rwt_name,
                   "%s writer thread dropped rwlock with "
                   "%d holding lock and %d waiting\n",
                   name, atomic_read(&rwv->rw_acquired),
@@ -147,28 +173,28 @@ kzt_rwlock_test1_writer_thread(void *arg)
 }
 
 int
-kzt_rwlock_test1_reader_thread(void *arg)
+splat_rwlock_test1_reader_thread(void *arg)
 {
        rw_thr_t *rwt = (rw_thr_t *)arg;
        rw_priv_t *rwv = rwt->rwt_rwp;
        uint8_t rnd = 0;
        char name[16];
 
-       ASSERT(rwv->rw_magic == KZT_RWLOCK_TEST_MAGIC);
+       ASSERT(rwv->rw_magic == SPLAT_RWLOCK_TEST_MAGIC);
         snprintf(name, sizeof(name), "%s%d",
-                KZT_RWLOCK_TEST_NAME, rwt->rwt_id);
+                SPLAT_RWLOCK_TEST_NAME, rwt->rwt_id);
        daemonize(name);
        get_random_bytes((void *)&rnd, 1);
-        kzt_rwlock_sleep(rnd * HZ / 1000);
+        splat_rwlock_sleep(rnd * HZ / 1000);
 
        /* Don't try and and take the semaphore until
         * someone else has already acquired it */
         wait_event_interruptible(rwv->rw_waitq,
-                                kzt_rwlock_lock_and_test(&rwv->rw_priv_lock,
+                                splat_rwlock_lock_and_test(&rwv->rw_priv_lock,
                                         atomic_read(&rwv->rw_acquired) > 0));
 
        spin_lock(&rwv->rw_priv_lock);
-       kzt_vprint(rwv->rw_file, rwt->rwt_name,
+       splat_vprint(rwv->rw_file, rwt->rwt_name,
                   "%s reader thread trying to acquire rwlock with "
                   "%d holding lock and %d waiting\n",
                   name, atomic_read(&rwv->rw_acquired),
@@ -183,7 +209,7 @@ kzt_rwlock_test1_reader_thread(void *arg)
        spin_lock(&rwv->rw_priv_lock);
        atomic_dec(&rwv->rw_waiters);
        atomic_inc(&rwv->rw_acquired);
-       kzt_vprint(rwv->rw_file, rwt->rwt_name,
+       splat_vprint(rwv->rw_file, rwt->rwt_name,
                   "%s reader thread acquired rwlock with "
                   "%d holding lock and %d waiting\n",
                   name, atomic_read(&rwv->rw_acquired),
@@ -193,14 +219,14 @@ kzt_rwlock_test1_reader_thread(void *arg)
        /* Wait here until the control thread
          * says we can release the read lock */
        wait_event_interruptible(rwv->rw_waitq,
-                                kzt_rwlock_lock_and_test(&rwv->rw_priv_lock,
+                                splat_rwlock_lock_and_test(&rwv->rw_priv_lock,
                                 atomic_read(&rwv->rw_release) ==
-                                KZT_RWLOCK_RELEASE_READERS));
+                                SPLAT_RWLOCK_RELEASE_READERS));
 
        spin_lock(&rwv->rw_priv_lock);
        atomic_inc(&rwv->rw_completed);
        atomic_dec(&rwv->rw_acquired);
-       kzt_vprint(rwv->rw_file, rwt->rwt_name,
+       splat_vprint(rwv->rw_file, rwt->rwt_name,
                   "%s reader thread dropped rwlock with "
                   "%d holding lock and %d waiting\n",
                   name, atomic_read(&rwv->rw_acquired),
@@ -213,75 +239,74 @@ kzt_rwlock_test1_reader_thread(void *arg)
 }
 
 static int
-kzt_rwlock_test1(struct file *file, void *arg)
+splat_rwlock_test1(struct file *file, void *arg)
 {
        int i, count = 0, rc = 0;
-       long pids[KZT_RWLOCK_TEST_COUNT];
-       rw_thr_t rwt[KZT_RWLOCK_TEST_COUNT];
+       long pids[SPLAT_RWLOCK_TEST_COUNT];
+       rw_thr_t rwt[SPLAT_RWLOCK_TEST_COUNT];
        rw_priv_t rwv;
 
-       /* Initialize private data 
-        * including the rwlock */
-       kzt_init_rw_priv(&rwv, file);
+       /* Initialize private data including the rwlock */
+       splat_init_rw_priv(&rwv, file);
 
        /* Create some threads, the exact number isn't important just as
         * long as we know how many we managed to create and should expect. */
-       for (i = 0; i < KZT_RWLOCK_TEST_COUNT; i++) {
+       for (i = 0; i < SPLAT_RWLOCK_TEST_COUNT; i++) {
                rwt[i].rwt_rwp = &rwv;
                rwt[i].rwt_id = i;
-               rwt[i].rwt_name = KZT_RWLOCK_TEST1_NAME;
+               rwt[i].rwt_name = SPLAT_RWLOCK_TEST1_NAME;
                rwt[i].rwt_rc = 0;
 
                /* The first thread will be a writer */
                if (i == 0) {
-                       pids[i] = kernel_thread(kzt_rwlock_test1_writer_thread,
+                       pids[i] = kernel_thread(splat_rwlock_test1_writer_thread,
                                                &rwt[i], 0);
                } else {
-                       pids[i] = kernel_thread(kzt_rwlock_test1_reader_thread,
+                       pids[i] = kernel_thread(splat_rwlock_test1_reader_thread,
                                                &rwt[i], 0);
                }
-               
+
                if (pids[i] >= 0) {
                        count++;
                }
        }
 
        /* Once the writer has the lock, release the readers */
-       while (kzt_rwlock_lock_and_test(&rwv.rw_priv_lock, atomic_read(&rwv.rw_acquired) <= 0)) {
-               kzt_rwlock_sleep(1 * HZ);
+       while (splat_rwlock_lock_and_test(&rwv.rw_priv_lock, atomic_read(&rwv.rw_acquired) <= 0)) {
+               splat_rwlock_sleep(1 * HZ);
        }
        wake_up_interruptible(&rwv.rw_waitq);
 
        /* Ensure that there is only 1 writer and all readers are waiting */
-       while (kzt_rwlock_lock_and_test(&rwv.rw_priv_lock, 
+       while (splat_rwlock_lock_and_test(&rwv.rw_priv_lock,
                                        atomic_read(&rwv.rw_acquired) != 1 ||
                                        atomic_read(&rwv.rw_waiters) !=
-                                       KZT_RWLOCK_TEST_COUNT - 1)) {
+                                       SPLAT_RWLOCK_TEST_COUNT - 1)) {
 
-               kzt_rwlock_sleep(1 * HZ);
+               splat_rwlock_sleep(1 * HZ);
        }
        /* Relase the writer */
        spin_lock(&rwv.rw_priv_lock);
-       atomic_set(&rwv.rw_release, KZT_RWLOCK_RELEASE_WRITERS);
+       atomic_set(&rwv.rw_release, SPLAT_RWLOCK_RELEASE_WRITERS);
        spin_unlock(&rwv.rw_priv_lock);
        wake_up_interruptible(&rwv.rw_waitq);
 
        /* Now ensure that there are multiple reader threads holding the lock */
-       while (kzt_rwlock_lock_and_test(&rwv.rw_priv_lock,
+       while (splat_rwlock_lock_and_test(&rwv.rw_priv_lock,
               atomic_read(&rwv.rw_acquired) <= 1)) {
-               kzt_rwlock_sleep(1 * HZ);
+               splat_rwlock_sleep(1 * HZ);
        }
        /* Release the readers */
        spin_lock(&rwv.rw_priv_lock);
-       atomic_set(&rwv.rw_release, KZT_RWLOCK_RELEASE_READERS);
+       atomic_set(&rwv.rw_release, SPLAT_RWLOCK_RELEASE_READERS);
        spin_unlock(&rwv.rw_priv_lock);
        wake_up_interruptible(&rwv.rw_waitq);
 
        /* Wait for the test to complete */
-       while (kzt_rwlock_lock_and_test(&rwv.rw_priv_lock,
+       while (splat_rwlock_lock_and_test(&rwv.rw_priv_lock,
               atomic_read(&rwv.rw_acquired) != 0 ||
               atomic_read(&rwv.rw_waiters) != 0)) {
-               kzt_rwlock_sleep(1 * HZ);
+               splat_rwlock_sleep(1 * HZ);
 
        }
 
@@ -290,26 +315,26 @@ kzt_rwlock_test1(struct file *file, void *arg)
 }
 
 int
-kzt_rwlock_test2_writer_thread(void *arg)
+splat_rwlock_test2_writer_thread(void *arg)
 {
        rw_thr_t *rwt = (rw_thr_t *)arg;
        rw_priv_t *rwv = rwt->rwt_rwp;
        uint8_t rnd = 0;
        char name[16];
-       
-       ASSERT(rwv->rw_magic == KZT_RWLOCK_TEST_MAGIC);
+
+       ASSERT(rwv->rw_magic == SPLAT_RWLOCK_TEST_MAGIC);
        snprintf(name, sizeof(name), "%s%d",
-                KZT_RWLOCK_TEST_NAME, rwt->rwt_id);
+                SPLAT_RWLOCK_TEST_NAME, rwt->rwt_id);
        daemonize(name);
        get_random_bytes((void *)&rnd, 1);
-       kzt_rwlock_sleep(rnd * HZ / 1000);
+       splat_rwlock_sleep(rnd * HZ / 1000);
 
        /* Here just increment the waiters count even if we are not
         * exactly about to call rw_enter().  Not really a big deal
         * since more than likely will be true when we simulate work
         * later on */
        spin_lock(&rwv->rw_priv_lock);
-       kzt_vprint(rwv->rw_file, rwt->rwt_name,
+       splat_vprint(rwv->rw_file, rwt->rwt_name,
                   "%s writer thread trying to acquire rwlock with "
                   "%d holding lock and %d waiting\n",
                   name, atomic_read(&rwv->rw_acquired),
@@ -320,17 +345,17 @@ kzt_rwlock_test2_writer_thread(void *arg)
        /* Wait here until the control thread
         * says we can acquire the write lock */
        wait_event_interruptible(rwv->rw_waitq,
-                                kzt_rwlock_lock_and_test(&rwv->rw_priv_lock,
+                                splat_rwlock_lock_and_test(&rwv->rw_priv_lock,
                                 atomic_read(&rwv->rw_release) ==
-                                KZT_RWLOCK_RELEASE_WRITERS));
-       
+                                SPLAT_RWLOCK_RELEASE_WRITERS));
+
        /* Take the semaphore for writing */
        rw_enter(&rwv->rwl, RW_WRITER);
 
        spin_lock(&rwv->rw_priv_lock);
        atomic_dec(&rwv->rw_waiters);
        atomic_inc(&rwv->rw_acquired);
-       kzt_vprint(rwv->rw_file, rwt->rwt_name,
+       splat_vprint(rwv->rw_file, rwt->rwt_name,
                   "%s writer thread acquired rwlock with "
                   "%d holding lock and %d waiting\n",
                   name, atomic_read(&rwv->rw_acquired),
@@ -339,7 +364,7 @@ kzt_rwlock_test2_writer_thread(void *arg)
 
        /* Give up the processor for a bit to simulate
         * doing some work while taking the write lock */
-       kzt_rwlock_sleep(rnd * HZ / 1000);
+       splat_rwlock_sleep(rnd * HZ / 1000);
 
        /* Ensure that we are the only one writing */
        if (atomic_read(&rwv->rw_acquired) > 1) {
@@ -351,7 +376,7 @@ kzt_rwlock_test2_writer_thread(void *arg)
        spin_lock(&rwv->rw_priv_lock);
        atomic_inc(&rwv->rw_completed);
        atomic_dec(&rwv->rw_acquired);
-       kzt_vprint(rwv->rw_file, rwt->rwt_name,
+       splat_vprint(rwv->rw_file, rwt->rwt_name,
                   "%s writer thread dropped rwlock with "
                   "%d holding lock and %d waiting\n",
                   name, atomic_read(&rwv->rw_acquired),
@@ -359,33 +384,31 @@ kzt_rwlock_test2_writer_thread(void *arg)
        spin_unlock(&rwv->rw_priv_lock);
 
        rw_exit(&rwv->rwl);
-       
 
        return 0;
 }
 
 static int
-kzt_rwlock_test2(struct file *file, void *arg)
+splat_rwlock_test2(struct file *file, void *arg)
 {
        int i, count = 0, rc = 0;
-       long pids[KZT_RWLOCK_TEST_COUNT];
-       rw_thr_t rwt[KZT_RWLOCK_TEST_COUNT];
+       long pids[SPLAT_RWLOCK_TEST_COUNT];
+       rw_thr_t rwt[SPLAT_RWLOCK_TEST_COUNT];
        rw_priv_t rwv;
 
-       /* Initialize private data 
-        * including the rwlock */
-       kzt_init_rw_priv(&rwv, file);
+       /* Initialize private data including the rwlock */
+       splat_init_rw_priv(&rwv, file);
 
        /* Create some threads, the exact number isn't important just as
         * long as we know how many we managed to create and should expect. */
-       for (i = 0; i < KZT_RWLOCK_TEST_COUNT; i++) {
+       for (i = 0; i < SPLAT_RWLOCK_TEST_COUNT; i++) {
                rwt[i].rwt_rwp = &rwv;
                rwt[i].rwt_id = i;
-               rwt[i].rwt_name = KZT_RWLOCK_TEST2_NAME;
+               rwt[i].rwt_name = SPLAT_RWLOCK_TEST2_NAME;
                rwt[i].rwt_rc = 0;
 
                /* The first thread will be a writer */
-               pids[i] = kernel_thread(kzt_rwlock_test2_writer_thread,
+               pids[i] = kernel_thread(splat_rwlock_test2_writer_thread,
                                        &rwt[i], 0);
 
                if (pids[i] >= 0) {
@@ -394,27 +417,27 @@ kzt_rwlock_test2(struct file *file, void *arg)
        }
 
        /* Wait for writers to get queued up */
-       while (kzt_rwlock_lock_and_test(&rwv.rw_priv_lock,
-              atomic_read(&rwv.rw_waiters) < KZT_RWLOCK_TEST_COUNT)) {
-               kzt_rwlock_sleep(1 * HZ);
+       while (splat_rwlock_lock_and_test(&rwv.rw_priv_lock,
+              atomic_read(&rwv.rw_waiters) < SPLAT_RWLOCK_TEST_COUNT)) {
+               splat_rwlock_sleep(1 * HZ);
        }
        /* Relase the writers */
        spin_lock(&rwv.rw_priv_lock);
-       atomic_set(&rwv.rw_release, KZT_RWLOCK_RELEASE_WRITERS);
+       atomic_set(&rwv.rw_release, SPLAT_RWLOCK_RELEASE_WRITERS);
        spin_unlock(&rwv.rw_priv_lock);
        wake_up_interruptible(&rwv.rw_waitq);
 
        /* Wait for the test to complete */
-       while (kzt_rwlock_lock_and_test(&rwv.rw_priv_lock,
+       while (splat_rwlock_lock_and_test(&rwv.rw_priv_lock,
               atomic_read(&rwv.rw_acquired) != 0 ||
               atomic_read(&rwv.rw_waiters) != 0)) {
-               kzt_rwlock_sleep(1 * HZ);
+               splat_rwlock_sleep(1 * HZ);
        }
 
        /* If any of the write threads ever acquired the lock
         * while another thread had it, make sure we return
         * an error */
-       for (i = 0; i < KZT_RWLOCK_TEST_COUNT; i++) {
+       for (i = 0; i < SPLAT_RWLOCK_TEST_COUNT; i++) {
                if (rwt[i].rwt_rc) {
                        rc++;
                }
@@ -425,7 +448,7 @@ kzt_rwlock_test2(struct file *file, void *arg)
 }
 
 static int
-kzt_rwlock_test3(struct file *file, void *arg)
+splat_rwlock_test3(struct file *file, void *arg)
 {
        kthread_t *owner;
        rw_priv_t rwv;
@@ -433,13 +456,13 @@ kzt_rwlock_test3(struct file *file, void *arg)
 
        /* Initialize private data 
         * including the rwlock */
-       kzt_init_rw_priv(&rwv, file);
+       splat_init_rw_priv(&rwv, file);
 
        /* Take the rwlock for writing */
        rw_enter(&rwv.rwl, RW_WRITER);
        owner = rw_owner(&rwv.rwl);
        if (current != owner) {
-               kzt_vprint(file, KZT_RWLOCK_TEST3_NAME, "rwlock should "
+               splat_vprint(file, SPLAT_RWLOCK_TEST3_NAME, "rwlock should "
                           "be owned by pid %d but is owned by pid %d\n",
                           current->pid, owner ? owner->pid : -1);
                rc = -EINVAL;
@@ -450,7 +473,7 @@ kzt_rwlock_test3(struct file *file, void *arg)
        rw_exit(&rwv.rwl);
        owner = rw_owner(&rwv.rwl);
        if (owner) {
-               kzt_vprint(file, KZT_RWLOCK_TEST3_NAME, "rwlock should not "
+               splat_vprint(file, SPLAT_RWLOCK_TEST3_NAME, "rwlock should not "
                           "be owned but is owned by pid %d\n", owner->pid);
                rc = -EINVAL;
                goto out;
@@ -461,7 +484,7 @@ kzt_rwlock_test3(struct file *file, void *arg)
        rw_enter(&rwv.rwl, RW_READER);
        owner = rw_owner(&rwv.rwl);
        if (owner) {
-               kzt_vprint(file, KZT_RWLOCK_TEST3_NAME, "rwlock should not "
+               splat_vprint(file, SPLAT_RWLOCK_TEST3_NAME, "rwlock should not "
                           "be owned but is owned by pid %d\n", owner->pid);
                /* Release the rwlock */
                rw_exit(&rwv.rwl);
@@ -478,28 +501,28 @@ out:
 }
 
 int
-kzt_rwlock_test4_reader_thread(void *arg)
+splat_rwlock_test4_reader_thread(void *arg)
 {
        rw_thr_t *rwt = (rw_thr_t *)arg;
        rw_priv_t *rwv = rwt->rwt_rwp;
        uint8_t rnd = 0;
        char name[16];
 
-       ASSERT(rwv->rw_magic == KZT_RWLOCK_TEST_MAGIC);
+       ASSERT(rwv->rw_magic == SPLAT_RWLOCK_TEST_MAGIC);
         snprintf(name, sizeof(name), "%s%d",
-                KZT_RWLOCK_TEST_NAME, rwt->rwt_id);
+                SPLAT_RWLOCK_TEST_NAME, rwt->rwt_id);
        daemonize(name);
        get_random_bytes((void *)&rnd, 1);
-        kzt_rwlock_sleep(rnd * HZ / 1000);
+        splat_rwlock_sleep(rnd * HZ / 1000);
 
        /* Don't try and and take the semaphore until
         * someone else has already acquired it */
         wait_event_interruptible(rwv->rw_waitq,
-                                kzt_rwlock_lock_and_test(&rwv->rw_priv_lock,
+                                splat_rwlock_lock_and_test(&rwv->rw_priv_lock,
                                 atomic_read(&rwv->rw_acquired) > 0));
 
        spin_lock(&rwv->rw_priv_lock);
-       kzt_vprint(rwv->rw_file, rwt->rwt_name,
+       splat_vprint(rwv->rw_file, rwt->rwt_name,
                   "%s reader thread trying to acquire rwlock with "
                   "%d holding lock and %d waiting\n",
                   name, atomic_read(&rwv->rw_acquired),
@@ -516,22 +539,22 @@ kzt_rwlock_test4_reader_thread(void *arg)
        if (rwt->rwt_rc == 1) {
                spin_lock(&rwv->rw_priv_lock);
                atomic_inc(&rwv->rw_acquired);
-               kzt_vprint(rwv->rw_file, rwt->rwt_name,
+               splat_vprint(rwv->rw_file, rwt->rwt_name,
                           "%s reader thread acquired rwlock with "
                           "%d holding lock and %d waiting\n",
                           name, atomic_read(&rwv->rw_acquired),
                           atomic_read(&rwv->rw_waiters));
                spin_unlock(&rwv->rw_priv_lock);
-               
+
                spin_lock(&rwv->rw_priv_lock);
                atomic_dec(&rwv->rw_acquired);
-               kzt_vprint(rwv->rw_file, rwt->rwt_name,
+               splat_vprint(rwv->rw_file, rwt->rwt_name,
                           "%s reader thread dropped rwlock with "
                           "%d holding lock and %d waiting\n",
                           name, atomic_read(&rwv->rw_acquired),
                           atomic_read(&rwv->rw_waiters));
                spin_unlock(&rwv->rw_priv_lock);
-               
+
                /* Release the semaphore */
                rw_exit(&rwv->rwl);
        }
@@ -540,7 +563,7 @@ kzt_rwlock_test4_reader_thread(void *arg)
        else {
                spin_lock(&rwv->rw_priv_lock);
                atomic_inc(&rwv->rw_completed);
-               kzt_vprint(rwv->rw_file, rwt->rwt_name,
+               splat_vprint(rwv->rw_file, rwt->rwt_name,
                           "%s reader thread could not acquire rwlock with "
                           "%d holding lock and %d waiting\n",
                           name, atomic_read(&rwv->rw_acquired),
@@ -552,32 +575,32 @@ kzt_rwlock_test4_reader_thread(void *arg)
 }
 
 static int
-kzt_rwlock_test4(struct file *file, void *arg)
+splat_rwlock_test4(struct file *file, void *arg)
 {
        int i, count = 0, rc = 0;
-       long pids[KZT_RWLOCK_TEST_COUNT];
-       rw_thr_t rwt[KZT_RWLOCK_TEST_COUNT];
+       long pids[SPLAT_RWLOCK_TEST_COUNT];
+       rw_thr_t rwt[SPLAT_RWLOCK_TEST_COUNT];
        rw_priv_t rwv;
 
        /* Initialize private data 
         * including the rwlock */
-       kzt_init_rw_priv(&rwv, file);
+       splat_init_rw_priv(&rwv, file);
 
        /* Create some threads, the exact number isn't important just as
         * long as we know how many we managed to create and should expect. */
-       for (i = 0; i < KZT_RWLOCK_TEST_COUNT; i++) {
+       for (i = 0; i < SPLAT_RWLOCK_TEST_COUNT; i++) {
                rwt[i].rwt_rwp = &rwv;
                rwt[i].rwt_id = i;
-               rwt[i].rwt_name = KZT_RWLOCK_TEST4_NAME;
+               rwt[i].rwt_name = SPLAT_RWLOCK_TEST4_NAME;
                rwt[i].rwt_rc = 0;
 
                /* The first thread will be a writer */
                if (i == 0) {
                        /* We can reuse the test1 writer thread here */
-                       pids[i] = kernel_thread(kzt_rwlock_test1_writer_thread,
+                       pids[i] = kernel_thread(splat_rwlock_test1_writer_thread,
                                                &rwt[i], 0);
                } else {
-                        pids[i] = kernel_thread(kzt_rwlock_test4_reader_thread,
+                        pids[i] = kernel_thread(splat_rwlock_test4_reader_thread,
                                                &rwt[i], 0);
                }
 
@@ -587,34 +610,34 @@ kzt_rwlock_test4(struct file *file, void *arg)
        }
 
        /* Once the writer has the lock, release the readers */
-       while (kzt_rwlock_lock_and_test(&rwv.rw_priv_lock,
+       while (splat_rwlock_lock_and_test(&rwv.rw_priv_lock,
               atomic_read(&rwv.rw_acquired) <= 0)) {
-               kzt_rwlock_sleep(1 * HZ);
+               splat_rwlock_sleep(1 * HZ);
        }
        wake_up_interruptible(&rwv.rw_waitq);
 
        /* Make sure that the reader threads complete */
-       while (kzt_rwlock_lock_and_test(&rwv.rw_priv_lock,
-              atomic_read(&rwv.rw_completed) != KZT_RWLOCK_TEST_COUNT - 1)) {
-               kzt_rwlock_sleep(1 * HZ);
+       while (splat_rwlock_lock_and_test(&rwv.rw_priv_lock,
+              atomic_read(&rwv.rw_completed) != SPLAT_RWLOCK_TEST_COUNT - 1)) {
+               splat_rwlock_sleep(1 * HZ);
        }
        /* Release the writer */
        spin_lock(&rwv.rw_priv_lock);
-       atomic_set(&rwv.rw_release, KZT_RWLOCK_RELEASE_WRITERS);
+       atomic_set(&rwv.rw_release, SPLAT_RWLOCK_RELEASE_WRITERS);
        spin_unlock(&rwv.rw_priv_lock);
        wake_up_interruptible(&rwv.rw_waitq);
 
        /* Wait for the test to complete */
-       while (kzt_rwlock_lock_and_test(&rwv.rw_priv_lock,
+       while (splat_rwlock_lock_and_test(&rwv.rw_priv_lock,
               atomic_read(&rwv.rw_acquired) != 0 ||
               atomic_read(&rwv.rw_waiters) != 0)) {
-               kzt_rwlock_sleep(1 * HZ);
+               splat_rwlock_sleep(1 * HZ);
        }
 
        /* If any of the reader threads ever acquired the lock
         * while another thread had it, make sure we return
         * an error since the rw_tryenter() should have failed */
-       for (i = 0; i < KZT_RWLOCK_TEST_COUNT; i++) {
+       for (i = 0; i < SPLAT_RWLOCK_TEST_COUNT; i++) {
                if (rwt[i].rwt_rc) {
                        rc++;
                }
@@ -625,7 +648,7 @@ kzt_rwlock_test4(struct file *file, void *arg)
 }
 
 static int
-kzt_rwlock_test5(struct file *file, void *arg)
+splat_rwlock_test5(struct file *file, void *arg)
 {
        kthread_t *owner;
        rw_priv_t rwv;
@@ -633,13 +656,13 @@ kzt_rwlock_test5(struct file *file, void *arg)
 
        /* Initialize private data 
         * including the rwlock */
-       kzt_init_rw_priv(&rwv, file);
+       splat_init_rw_priv(&rwv, file);
 
        /* Take the rwlock for writing */
        rw_enter(&rwv.rwl, RW_WRITER);
        owner = rw_owner(&rwv.rwl);
        if (current != owner) {
-               kzt_vprint(file, KZT_RWLOCK_TEST5_NAME, "rwlock should "
+               splat_vprint(file, SPLAT_RWLOCK_TEST5_NAME, "rwlock should "
                           "be owned by pid %d but is owned by pid %d\n",
                           current->pid, owner ? owner->pid : -1);
                rc = -EINVAL;
@@ -652,7 +675,7 @@ kzt_rwlock_test5(struct file *file, void *arg)
 
        owner = rw_owner(&rwv.rwl);
        if (owner) {
-               kzt_vprint(file, KZT_RWLOCK_TEST5_NAME, "rwlock should not "
+               splat_vprint(file, SPLAT_RWLOCK_TEST5_NAME, "rwlock should not "
                           "be owned but is owned by pid %d\n", owner->pid);
                /* Release the rwlock */
                rw_exit(&rwv.rwl);
@@ -669,7 +692,7 @@ out:
 }
 
 static int
-kzt_rwlock_test6(struct file *file, void *arg)
+splat_rwlock_test6(struct file *file, void *arg)
 {
        kthread_t *owner;
        rw_priv_t rwv;
@@ -677,13 +700,13 @@ kzt_rwlock_test6(struct file *file, void *arg)
 
        /* Initialize private data 
         * including the rwlock */
-       kzt_init_rw_priv(&rwv, file);
+       splat_init_rw_priv(&rwv, file);
 
        /* Take the rwlock for reading */
        rw_enter(&rwv.rwl, RW_READER);
        owner = rw_owner(&rwv.rwl);
        if (owner) {
-               kzt_vprint(file, KZT_RWLOCK_TEST6_NAME, "rwlock should not "
+               splat_vprint(file, SPLAT_RWLOCK_TEST6_NAME, "rwlock should not "
                           "be owned but is owned by pid %d\n", owner->pid);
                rc = -EINVAL;
                goto out;
@@ -695,7 +718,7 @@ kzt_rwlock_test6(struct file *file, void *arg)
 
        owner = rw_owner(&rwv.rwl);
        if (rc || current != owner) {
-               kzt_vprint(file, KZT_RWLOCK_TEST6_NAME, "rwlock should "
+               splat_vprint(file, SPLAT_RWLOCK_TEST6_NAME, "rwlock should "
                           "be owned by pid %d but is owned by pid %d "
                           "trylock rc %d\n",
                           current->pid, owner ? owner->pid : -1, rc);
@@ -711,53 +734,53 @@ out:
        return rc;
 }
 
-kzt_subsystem_t *
-kzt_rwlock_init(void)
+splat_subsystem_t *
+splat_rwlock_init(void)
 {
-        kzt_subsystem_t *sub;
+        splat_subsystem_t *sub;
 
         sub = kmalloc(sizeof(*sub), GFP_KERNEL);
         if (sub == NULL)
                 return NULL;
 
         memset(sub, 0, sizeof(*sub));
-        strncpy(sub->desc.name, KZT_RWLOCK_NAME, KZT_NAME_SIZE);
-        strncpy(sub->desc.desc, KZT_RWLOCK_DESC, KZT_DESC_SIZE);
+        strncpy(sub->desc.name, SPLAT_RWLOCK_NAME, SPLAT_NAME_SIZE);
+        strncpy(sub->desc.desc, SPLAT_RWLOCK_DESC, SPLAT_DESC_SIZE);
         INIT_LIST_HEAD(&sub->subsystem_list);
         INIT_LIST_HEAD(&sub->test_list);
         spin_lock_init(&sub->test_lock);
-        sub->desc.id = KZT_SUBSYSTEM_RWLOCK;
-
-        KZT_TEST_INIT(sub, KZT_RWLOCK_TEST1_NAME, KZT_RWLOCK_TEST1_DESC,
-                      KZT_RWLOCK_TEST1_ID, kzt_rwlock_test1);
-        KZT_TEST_INIT(sub, KZT_RWLOCK_TEST2_NAME, KZT_RWLOCK_TEST2_DESC,
-                      KZT_RWLOCK_TEST2_ID, kzt_rwlock_test2);
-        KZT_TEST_INIT(sub, KZT_RWLOCK_TEST3_NAME, KZT_RWLOCK_TEST3_DESC,
-                      KZT_RWLOCK_TEST3_ID, kzt_rwlock_test3);
-        KZT_TEST_INIT(sub, KZT_RWLOCK_TEST4_NAME, KZT_RWLOCK_TEST4_DESC,
-                      KZT_RWLOCK_TEST4_ID, kzt_rwlock_test4);
-        KZT_TEST_INIT(sub, KZT_RWLOCK_TEST5_NAME, KZT_RWLOCK_TEST5_DESC,
-                      KZT_RWLOCK_TEST5_ID, kzt_rwlock_test5);
-        KZT_TEST_INIT(sub, KZT_RWLOCK_TEST6_NAME, KZT_RWLOCK_TEST6_DESC,
-                      KZT_RWLOCK_TEST6_ID, kzt_rwlock_test6);
+        sub->desc.id = SPLAT_SUBSYSTEM_RWLOCK;
+
+        SPLAT_TEST_INIT(sub, SPLAT_RWLOCK_TEST1_NAME, SPLAT_RWLOCK_TEST1_DESC,
+                      SPLAT_RWLOCK_TEST1_ID, splat_rwlock_test1);
+        SPLAT_TEST_INIT(sub, SPLAT_RWLOCK_TEST2_NAME, SPLAT_RWLOCK_TEST2_DESC,
+                      SPLAT_RWLOCK_TEST2_ID, splat_rwlock_test2);
+        SPLAT_TEST_INIT(sub, SPLAT_RWLOCK_TEST3_NAME, SPLAT_RWLOCK_TEST3_DESC,
+                      SPLAT_RWLOCK_TEST3_ID, splat_rwlock_test3);
+        SPLAT_TEST_INIT(sub, SPLAT_RWLOCK_TEST4_NAME, SPLAT_RWLOCK_TEST4_DESC,
+                      SPLAT_RWLOCK_TEST4_ID, splat_rwlock_test4);
+        SPLAT_TEST_INIT(sub, SPLAT_RWLOCK_TEST5_NAME, SPLAT_RWLOCK_TEST5_DESC,
+                      SPLAT_RWLOCK_TEST5_ID, splat_rwlock_test5);
+        SPLAT_TEST_INIT(sub, SPLAT_RWLOCK_TEST6_NAME, SPLAT_RWLOCK_TEST6_DESC,
+                      SPLAT_RWLOCK_TEST6_ID, splat_rwlock_test6);
 
         return sub;
 }
 
 void
-kzt_rwlock_fini(kzt_subsystem_t *sub)
+splat_rwlock_fini(splat_subsystem_t *sub)
 {
         ASSERT(sub);
-        KZT_TEST_FINI(sub, KZT_RWLOCK_TEST6_ID);
-        KZT_TEST_FINI(sub, KZT_RWLOCK_TEST5_ID);
-        KZT_TEST_FINI(sub, KZT_RWLOCK_TEST4_ID);
-        KZT_TEST_FINI(sub, KZT_RWLOCK_TEST3_ID);
-        KZT_TEST_FINI(sub, KZT_RWLOCK_TEST2_ID);
-        KZT_TEST_FINI(sub, KZT_RWLOCK_TEST1_ID);
+        SPLAT_TEST_FINI(sub, SPLAT_RWLOCK_TEST6_ID);
+        SPLAT_TEST_FINI(sub, SPLAT_RWLOCK_TEST5_ID);
+        SPLAT_TEST_FINI(sub, SPLAT_RWLOCK_TEST4_ID);
+        SPLAT_TEST_FINI(sub, SPLAT_RWLOCK_TEST3_ID);
+        SPLAT_TEST_FINI(sub, SPLAT_RWLOCK_TEST2_ID);
+        SPLAT_TEST_FINI(sub, SPLAT_RWLOCK_TEST1_ID);
         kfree(sub);
 }
 
 int
-kzt_rwlock_id(void) {
-        return KZT_SUBSYSTEM_RWLOCK;
+splat_rwlock_id(void) {
+        return SPLAT_SUBSYSTEM_RWLOCK;
 }