mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-31 03:04:11 +03:00
More cleanup.
- Removed all references to kzt and replaced with splat - Moved portions of include files which do not need to be available to all source files in to local.h files in proper source subdirs. git-svn-id: https://outreach.scidac.gov/svn/spl/trunk@14 7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c
This commit is contained in:
+107
-107
@@ -1,32 +1,32 @@
|
||||
#include <splat-ctl.h>
|
||||
#include "splat-internal.h"
|
||||
|
||||
#define KZT_SUBSYSTEM_CONDVAR 0x0500
|
||||
#define KZT_CONDVAR_NAME "condvar"
|
||||
#define KZT_CONDVAR_DESC "Kernel Condition Variable Tests"
|
||||
#define SPLAT_SUBSYSTEM_CONDVAR 0x0500
|
||||
#define SPLAT_CONDVAR_NAME "condvar"
|
||||
#define SPLAT_CONDVAR_DESC "Kernel Condition Variable Tests"
|
||||
|
||||
#define KZT_CONDVAR_TEST1_ID 0x0501
|
||||
#define KZT_CONDVAR_TEST1_NAME "signal1"
|
||||
#define KZT_CONDVAR_TEST1_DESC "Wake a single thread, cv_wait()/cv_signal()"
|
||||
#define SPLAT_CONDVAR_TEST1_ID 0x0501
|
||||
#define SPLAT_CONDVAR_TEST1_NAME "signal1"
|
||||
#define SPLAT_CONDVAR_TEST1_DESC "Wake a single thread, cv_wait()/cv_signal()"
|
||||
|
||||
#define KZT_CONDVAR_TEST2_ID 0x0502
|
||||
#define KZT_CONDVAR_TEST2_NAME "broadcast1"
|
||||
#define KZT_CONDVAR_TEST2_DESC "Wake all threads, cv_wait()/cv_broadcast()"
|
||||
#define SPLAT_CONDVAR_TEST2_ID 0x0502
|
||||
#define SPLAT_CONDVAR_TEST2_NAME "broadcast1"
|
||||
#define SPLAT_CONDVAR_TEST2_DESC "Wake all threads, cv_wait()/cv_broadcast()"
|
||||
|
||||
#define KZT_CONDVAR_TEST3_ID 0x0503
|
||||
#define KZT_CONDVAR_TEST3_NAME "signal2"
|
||||
#define KZT_CONDVAR_TEST3_DESC "Wake a single thread, cv_wait_timeout()/cv_signal()"
|
||||
#define SPLAT_CONDVAR_TEST3_ID 0x0503
|
||||
#define SPLAT_CONDVAR_TEST3_NAME "signal2"
|
||||
#define SPLAT_CONDVAR_TEST3_DESC "Wake a single thread, cv_wait_timeout()/cv_signal()"
|
||||
|
||||
#define KZT_CONDVAR_TEST4_ID 0x0504
|
||||
#define KZT_CONDVAR_TEST4_NAME "broadcast2"
|
||||
#define KZT_CONDVAR_TEST4_DESC "Wake all threads, cv_wait_timeout()/cv_broadcast()"
|
||||
#define SPLAT_CONDVAR_TEST4_ID 0x0504
|
||||
#define SPLAT_CONDVAR_TEST4_NAME "broadcast2"
|
||||
#define SPLAT_CONDVAR_TEST4_DESC "Wake all threads, cv_wait_timeout()/cv_broadcast()"
|
||||
|
||||
#define KZT_CONDVAR_TEST5_ID 0x0505
|
||||
#define KZT_CONDVAR_TEST5_NAME "timeout"
|
||||
#define KZT_CONDVAR_TEST5_DESC "Timeout thread, cv_wait_timeout()"
|
||||
#define SPLAT_CONDVAR_TEST5_ID 0x0505
|
||||
#define SPLAT_CONDVAR_TEST5_NAME "timeout"
|
||||
#define SPLAT_CONDVAR_TEST5_DESC "Timeout thread, cv_wait_timeout()"
|
||||
|
||||
#define KZT_CONDVAR_TEST_MAGIC 0x115599DDUL
|
||||
#define KZT_CONDVAR_TEST_NAME "condvar_test"
|
||||
#define KZT_CONDVAR_TEST_COUNT 8
|
||||
#define SPLAT_CONDVAR_TEST_MAGIC 0x115599DDUL
|
||||
#define SPLAT_CONDVAR_TEST_NAME "condvar_test"
|
||||
#define SPLAT_CONDVAR_TEST_COUNT 8
|
||||
|
||||
typedef struct condvar_priv {
|
||||
unsigned long cv_magic;
|
||||
@@ -43,22 +43,22 @@ typedef struct condvar_thr {
|
||||
} condvar_thr_t;
|
||||
|
||||
int
|
||||
kzt_condvar_test12_thread(void *arg)
|
||||
splat_condvar_test12_thread(void *arg)
|
||||
{
|
||||
condvar_thr_t *ct = (condvar_thr_t *)arg;
|
||||
condvar_priv_t *cv = ct->ct_cvp;
|
||||
char name[16];
|
||||
|
||||
ASSERT(cv->cv_magic == KZT_CONDVAR_TEST_MAGIC);
|
||||
snprintf(name, sizeof(name), "%s%d", KZT_CONDVAR_TEST_NAME, ct->ct_id);
|
||||
ASSERT(cv->cv_magic == SPLAT_CONDVAR_TEST_MAGIC);
|
||||
snprintf(name, sizeof(name),"%s%d",SPLAT_CONDVAR_TEST_NAME,ct->ct_id);
|
||||
daemonize(name);
|
||||
|
||||
mutex_enter(&cv->cv_mtx);
|
||||
kzt_vprint(cv->cv_file, ct->ct_name,
|
||||
splat_vprint(cv->cv_file, ct->ct_name,
|
||||
"%s thread sleeping with %d waiters\n",
|
||||
name, atomic_read(&cv->cv_condvar.cv_waiters));
|
||||
cv_wait(&cv->cv_condvar, &cv->cv_mtx);
|
||||
kzt_vprint(cv->cv_file, ct->ct_name,
|
||||
splat_vprint(cv->cv_file, ct->ct_name,
|
||||
"%s thread woken %d waiters remain\n",
|
||||
name, atomic_read(&cv->cv_condvar.cv_waiters));
|
||||
mutex_exit(&cv->cv_mtx);
|
||||
@@ -67,27 +67,27 @@ kzt_condvar_test12_thread(void *arg)
|
||||
}
|
||||
|
||||
static int
|
||||
kzt_condvar_test1(struct file *file, void *arg)
|
||||
splat_condvar_test1(struct file *file, void *arg)
|
||||
{
|
||||
int i, count = 0, rc = 0;
|
||||
long pids[KZT_CONDVAR_TEST_COUNT];
|
||||
condvar_thr_t ct[KZT_CONDVAR_TEST_COUNT];
|
||||
long pids[SPLAT_CONDVAR_TEST_COUNT];
|
||||
condvar_thr_t ct[SPLAT_CONDVAR_TEST_COUNT];
|
||||
condvar_priv_t cv;
|
||||
|
||||
cv.cv_magic = KZT_CONDVAR_TEST_MAGIC;
|
||||
cv.cv_magic = SPLAT_CONDVAR_TEST_MAGIC;
|
||||
cv.cv_file = file;
|
||||
mutex_init(&cv.cv_mtx, KZT_CONDVAR_TEST_NAME, MUTEX_DEFAULT, NULL);
|
||||
cv_init(&cv.cv_condvar, KZT_CONDVAR_TEST_NAME, CV_DEFAULT, NULL);
|
||||
mutex_init(&cv.cv_mtx, SPLAT_CONDVAR_TEST_NAME, MUTEX_DEFAULT, NULL);
|
||||
cv_init(&cv.cv_condvar, SPLAT_CONDVAR_TEST_NAME, CV_DEFAULT, NULL);
|
||||
|
||||
/* 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_CONDVAR_TEST_COUNT; i++) {
|
||||
for (i = 0; i < SPLAT_CONDVAR_TEST_COUNT; i++) {
|
||||
ct[i].ct_cvp = &cv;
|
||||
ct[i].ct_id = i;
|
||||
ct[i].ct_name = KZT_CONDVAR_TEST1_NAME;
|
||||
ct[i].ct_name = SPLAT_CONDVAR_TEST1_NAME;
|
||||
ct[i].ct_rc = 0;
|
||||
|
||||
pids[i] = kernel_thread(kzt_condvar_test12_thread, &ct[i], 0);
|
||||
pids[i] = kernel_thread(splat_condvar_test12_thread, &ct[i], 0);
|
||||
if (pids[i] >= 0)
|
||||
count++;
|
||||
}
|
||||
@@ -107,7 +107,7 @@ kzt_condvar_test1(struct file *file, void *arg)
|
||||
if (atomic_read(&cv.cv_condvar.cv_waiters) == (count - i))
|
||||
continue;
|
||||
|
||||
kzt_vprint(file, KZT_CONDVAR_TEST1_NAME, "Attempted to "
|
||||
splat_vprint(file, SPLAT_CONDVAR_TEST1_NAME, "Attempted to "
|
||||
"wake %d thread but work %d threads woke\n",
|
||||
1, count - atomic_read(&cv.cv_condvar.cv_waiters));
|
||||
rc = -EINVAL;
|
||||
@@ -115,7 +115,7 @@ kzt_condvar_test1(struct file *file, void *arg)
|
||||
}
|
||||
|
||||
if (!rc)
|
||||
kzt_vprint(file, KZT_CONDVAR_TEST1_NAME, "Correctly woke "
|
||||
splat_vprint(file, SPLAT_CONDVAR_TEST1_NAME, "Correctly woke "
|
||||
"%d sleeping threads %d at a time\n", count, 1);
|
||||
|
||||
/* Wait until that last nutex is dropped */
|
||||
@@ -131,27 +131,27 @@ kzt_condvar_test1(struct file *file, void *arg)
|
||||
}
|
||||
|
||||
static int
|
||||
kzt_condvar_test2(struct file *file, void *arg)
|
||||
splat_condvar_test2(struct file *file, void *arg)
|
||||
{
|
||||
int i, count = 0, rc = 0;
|
||||
long pids[KZT_CONDVAR_TEST_COUNT];
|
||||
condvar_thr_t ct[KZT_CONDVAR_TEST_COUNT];
|
||||
long pids[SPLAT_CONDVAR_TEST_COUNT];
|
||||
condvar_thr_t ct[SPLAT_CONDVAR_TEST_COUNT];
|
||||
condvar_priv_t cv;
|
||||
|
||||
cv.cv_magic = KZT_CONDVAR_TEST_MAGIC;
|
||||
cv.cv_magic = SPLAT_CONDVAR_TEST_MAGIC;
|
||||
cv.cv_file = file;
|
||||
mutex_init(&cv.cv_mtx, KZT_CONDVAR_TEST_NAME, MUTEX_DEFAULT, NULL);
|
||||
cv_init(&cv.cv_condvar, KZT_CONDVAR_TEST_NAME, CV_DEFAULT, NULL);
|
||||
mutex_init(&cv.cv_mtx, SPLAT_CONDVAR_TEST_NAME, MUTEX_DEFAULT, NULL);
|
||||
cv_init(&cv.cv_condvar, SPLAT_CONDVAR_TEST_NAME, CV_DEFAULT, NULL);
|
||||
|
||||
/* 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_CONDVAR_TEST_COUNT; i++) {
|
||||
for (i = 0; i < SPLAT_CONDVAR_TEST_COUNT; i++) {
|
||||
ct[i].ct_cvp = &cv;
|
||||
ct[i].ct_id = i;
|
||||
ct[i].ct_name = KZT_CONDVAR_TEST2_NAME;
|
||||
ct[i].ct_name = SPLAT_CONDVAR_TEST2_NAME;
|
||||
ct[i].ct_rc = 0;
|
||||
|
||||
pids[i] = kernel_thread(kzt_condvar_test12_thread, &ct[i], 0);
|
||||
pids[i] = kernel_thread(splat_condvar_test12_thread, &ct[i], 0);
|
||||
if (pids[i] > 0)
|
||||
count++;
|
||||
}
|
||||
@@ -167,7 +167,7 @@ kzt_condvar_test2(struct file *file, void *arg)
|
||||
while ((atomic_read(&cv.cv_condvar.cv_waiters) > 0) || mutex_owner(&cv.cv_mtx))
|
||||
schedule();
|
||||
|
||||
kzt_vprint(file, KZT_CONDVAR_TEST2_NAME, "Correctly woke all "
|
||||
splat_vprint(file, SPLAT_CONDVAR_TEST2_NAME, "Correctly woke all "
|
||||
"%d sleeping threads at once\n", count);
|
||||
|
||||
/* Wake everything for the failure case */
|
||||
@@ -178,19 +178,19 @@ kzt_condvar_test2(struct file *file, void *arg)
|
||||
}
|
||||
|
||||
int
|
||||
kzt_condvar_test34_thread(void *arg)
|
||||
splat_condvar_test34_thread(void *arg)
|
||||
{
|
||||
condvar_thr_t *ct = (condvar_thr_t *)arg;
|
||||
condvar_priv_t *cv = ct->ct_cvp;
|
||||
char name[16];
|
||||
clock_t rc;
|
||||
|
||||
ASSERT(cv->cv_magic == KZT_CONDVAR_TEST_MAGIC);
|
||||
snprintf(name, sizeof(name), "%s%d", KZT_CONDVAR_TEST_NAME, ct->ct_id);
|
||||
ASSERT(cv->cv_magic == SPLAT_CONDVAR_TEST_MAGIC);
|
||||
snprintf(name, sizeof(name), "%s%d", SPLAT_CONDVAR_TEST_NAME, ct->ct_id);
|
||||
daemonize(name);
|
||||
|
||||
mutex_enter(&cv->cv_mtx);
|
||||
kzt_vprint(cv->cv_file, ct->ct_name,
|
||||
splat_vprint(cv->cv_file, ct->ct_name,
|
||||
"%s thread sleeping with %d waiters\n",
|
||||
name, atomic_read(&cv->cv_condvar.cv_waiters));
|
||||
|
||||
@@ -199,10 +199,10 @@ kzt_condvar_test34_thread(void *arg)
|
||||
rc = cv_timedwait(&cv->cv_condvar, &cv->cv_mtx, lbolt + HZ * 3);
|
||||
if (rc == -1) {
|
||||
ct->ct_rc = -ETIMEDOUT;
|
||||
kzt_vprint(cv->cv_file, ct->ct_name, "%s thread timed out, "
|
||||
splat_vprint(cv->cv_file, ct->ct_name, "%s thread timed out, "
|
||||
"should have been woken\n", name);
|
||||
} else {
|
||||
kzt_vprint(cv->cv_file, ct->ct_name,
|
||||
splat_vprint(cv->cv_file, ct->ct_name,
|
||||
"%s thread woken %d waiters remain\n",
|
||||
name, atomic_read(&cv->cv_condvar.cv_waiters));
|
||||
}
|
||||
@@ -213,27 +213,27 @@ kzt_condvar_test34_thread(void *arg)
|
||||
}
|
||||
|
||||
static int
|
||||
kzt_condvar_test3(struct file *file, void *arg)
|
||||
splat_condvar_test3(struct file *file, void *arg)
|
||||
{
|
||||
int i, count = 0, rc = 0;
|
||||
long pids[KZT_CONDVAR_TEST_COUNT];
|
||||
condvar_thr_t ct[KZT_CONDVAR_TEST_COUNT];
|
||||
long pids[SPLAT_CONDVAR_TEST_COUNT];
|
||||
condvar_thr_t ct[SPLAT_CONDVAR_TEST_COUNT];
|
||||
condvar_priv_t cv;
|
||||
|
||||
cv.cv_magic = KZT_CONDVAR_TEST_MAGIC;
|
||||
cv.cv_magic = SPLAT_CONDVAR_TEST_MAGIC;
|
||||
cv.cv_file = file;
|
||||
mutex_init(&cv.cv_mtx, KZT_CONDVAR_TEST_NAME, MUTEX_DEFAULT, NULL);
|
||||
cv_init(&cv.cv_condvar, KZT_CONDVAR_TEST_NAME, CV_DEFAULT, NULL);
|
||||
mutex_init(&cv.cv_mtx, SPLAT_CONDVAR_TEST_NAME, MUTEX_DEFAULT, NULL);
|
||||
cv_init(&cv.cv_condvar, SPLAT_CONDVAR_TEST_NAME, CV_DEFAULT, NULL);
|
||||
|
||||
/* 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_CONDVAR_TEST_COUNT; i++) {
|
||||
for (i = 0; i < SPLAT_CONDVAR_TEST_COUNT; i++) {
|
||||
ct[i].ct_cvp = &cv;
|
||||
ct[i].ct_id = i;
|
||||
ct[i].ct_name = KZT_CONDVAR_TEST3_NAME;
|
||||
ct[i].ct_name = SPLAT_CONDVAR_TEST3_NAME;
|
||||
ct[i].ct_rc = 0;
|
||||
|
||||
pids[i] = kernel_thread(kzt_condvar_test34_thread, &ct[i], 0);
|
||||
pids[i] = kernel_thread(splat_condvar_test34_thread, &ct[i], 0);
|
||||
if (pids[i] >= 0)
|
||||
count++;
|
||||
}
|
||||
@@ -253,7 +253,7 @@ kzt_condvar_test3(struct file *file, void *arg)
|
||||
if (atomic_read(&cv.cv_condvar.cv_waiters) == (count - i))
|
||||
continue;
|
||||
|
||||
kzt_vprint(file, KZT_CONDVAR_TEST3_NAME, "Attempted to "
|
||||
splat_vprint(file, SPLAT_CONDVAR_TEST3_NAME, "Attempted to "
|
||||
"wake %d thread but work %d threads woke\n",
|
||||
1, count - atomic_read(&cv.cv_condvar.cv_waiters));
|
||||
rc = -EINVAL;
|
||||
@@ -266,7 +266,7 @@ kzt_condvar_test3(struct file *file, void *arg)
|
||||
rc = ct[i].ct_rc;
|
||||
|
||||
if (!rc)
|
||||
kzt_vprint(file, KZT_CONDVAR_TEST3_NAME, "Correctly woke "
|
||||
splat_vprint(file, SPLAT_CONDVAR_TEST3_NAME, "Correctly woke "
|
||||
"%d sleeping threads %d at a time\n", count, 1);
|
||||
|
||||
/* Wait until that last nutex is dropped */
|
||||
@@ -282,27 +282,27 @@ kzt_condvar_test3(struct file *file, void *arg)
|
||||
}
|
||||
|
||||
static int
|
||||
kzt_condvar_test4(struct file *file, void *arg)
|
||||
splat_condvar_test4(struct file *file, void *arg)
|
||||
{
|
||||
int i, count = 0, rc = 0;
|
||||
long pids[KZT_CONDVAR_TEST_COUNT];
|
||||
condvar_thr_t ct[KZT_CONDVAR_TEST_COUNT];
|
||||
long pids[SPLAT_CONDVAR_TEST_COUNT];
|
||||
condvar_thr_t ct[SPLAT_CONDVAR_TEST_COUNT];
|
||||
condvar_priv_t cv;
|
||||
|
||||
cv.cv_magic = KZT_CONDVAR_TEST_MAGIC;
|
||||
cv.cv_magic = SPLAT_CONDVAR_TEST_MAGIC;
|
||||
cv.cv_file = file;
|
||||
mutex_init(&cv.cv_mtx, KZT_CONDVAR_TEST_NAME, MUTEX_DEFAULT, NULL);
|
||||
cv_init(&cv.cv_condvar, KZT_CONDVAR_TEST_NAME, CV_DEFAULT, NULL);
|
||||
mutex_init(&cv.cv_mtx, SPLAT_CONDVAR_TEST_NAME, MUTEX_DEFAULT, NULL);
|
||||
cv_init(&cv.cv_condvar, SPLAT_CONDVAR_TEST_NAME, CV_DEFAULT, NULL);
|
||||
|
||||
/* 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_CONDVAR_TEST_COUNT; i++) {
|
||||
for (i = 0; i < SPLAT_CONDVAR_TEST_COUNT; i++) {
|
||||
ct[i].ct_cvp = &cv;
|
||||
ct[i].ct_id = i;
|
||||
ct[i].ct_name = KZT_CONDVAR_TEST3_NAME;
|
||||
ct[i].ct_name = SPLAT_CONDVAR_TEST3_NAME;
|
||||
ct[i].ct_rc = 0;
|
||||
|
||||
pids[i] = kernel_thread(kzt_condvar_test34_thread, &ct[i], 0);
|
||||
pids[i] = kernel_thread(splat_condvar_test34_thread, &ct[i], 0);
|
||||
if (pids[i] >= 0)
|
||||
count++;
|
||||
}
|
||||
@@ -322,7 +322,7 @@ kzt_condvar_test4(struct file *file, void *arg)
|
||||
if (atomic_read(&cv.cv_condvar.cv_waiters) == (count - i))
|
||||
continue;
|
||||
|
||||
kzt_vprint(file, KZT_CONDVAR_TEST3_NAME, "Attempted to "
|
||||
splat_vprint(file, SPLAT_CONDVAR_TEST3_NAME, "Attempted to "
|
||||
"wake %d thread but work %d threads woke\n",
|
||||
1, count - atomic_read(&cv.cv_condvar.cv_waiters));
|
||||
rc = -EINVAL;
|
||||
@@ -335,7 +335,7 @@ kzt_condvar_test4(struct file *file, void *arg)
|
||||
rc = ct[i].ct_rc;
|
||||
|
||||
if (!rc)
|
||||
kzt_vprint(file, KZT_CONDVAR_TEST3_NAME, "Correctly woke "
|
||||
splat_vprint(file, SPLAT_CONDVAR_TEST3_NAME, "Correctly woke "
|
||||
"%d sleeping threads %d at a time\n", count, 1);
|
||||
|
||||
/* Wait until that last nutex is dropped */
|
||||
@@ -351,7 +351,7 @@ kzt_condvar_test4(struct file *file, void *arg)
|
||||
}
|
||||
|
||||
static int
|
||||
kzt_condvar_test5(struct file *file, void *arg)
|
||||
splat_condvar_test5(struct file *file, void *arg)
|
||||
{
|
||||
kcondvar_t condvar;
|
||||
kmutex_t mtx;
|
||||
@@ -360,10 +360,10 @@ kzt_condvar_test5(struct file *file, void *arg)
|
||||
int32_t remain_delta;
|
||||
int rc = 0;
|
||||
|
||||
mutex_init(&mtx, KZT_CONDVAR_TEST_NAME, MUTEX_DEFAULT, NULL);
|
||||
cv_init(&condvar, KZT_CONDVAR_TEST_NAME, CV_DEFAULT, NULL);
|
||||
mutex_init(&mtx, SPLAT_CONDVAR_TEST_NAME, MUTEX_DEFAULT, NULL);
|
||||
cv_init(&condvar, SPLAT_CONDVAR_TEST_NAME, CV_DEFAULT, NULL);
|
||||
|
||||
kzt_vprint(file, KZT_CONDVAR_TEST5_NAME, "Thread going to sleep for "
|
||||
splat_vprint(file, SPLAT_CONDVAR_TEST5_NAME, "Thread going to sleep for "
|
||||
"%d second and expecting to be woken by timeout\n", 1);
|
||||
|
||||
/* Allow a 1 second timeout, plenty long to validate correctness. */
|
||||
@@ -378,19 +378,19 @@ kzt_condvar_test5(struct file *file, void *arg)
|
||||
|
||||
if (time_left == -1) {
|
||||
if (time_delta >= HZ) {
|
||||
kzt_vprint(file, KZT_CONDVAR_TEST5_NAME,
|
||||
splat_vprint(file, SPLAT_CONDVAR_TEST5_NAME,
|
||||
"Thread correctly timed out and was asleep "
|
||||
"for %d.%d seconds (%d second min)\n",
|
||||
(int)whole_delta, remain_delta, 1);
|
||||
} else {
|
||||
kzt_vprint(file, KZT_CONDVAR_TEST5_NAME,
|
||||
splat_vprint(file, SPLAT_CONDVAR_TEST5_NAME,
|
||||
"Thread correctly timed out but was only "
|
||||
"asleep for %d.%d seconds (%d second "
|
||||
"min)\n", (int)whole_delta, remain_delta, 1);
|
||||
rc = -ETIMEDOUT;
|
||||
}
|
||||
} else {
|
||||
kzt_vprint(file, KZT_CONDVAR_TEST5_NAME,
|
||||
splat_vprint(file, SPLAT_CONDVAR_TEST5_NAME,
|
||||
"Thread exited after only %d.%d seconds, it "
|
||||
"did not hit the %d second timeout\n",
|
||||
(int)whole_delta, remain_delta, 1);
|
||||
@@ -403,51 +403,51 @@ kzt_condvar_test5(struct file *file, void *arg)
|
||||
return rc;
|
||||
}
|
||||
|
||||
kzt_subsystem_t *
|
||||
kzt_condvar_init(void)
|
||||
splat_subsystem_t *
|
||||
splat_condvar_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_CONDVAR_NAME, KZT_NAME_SIZE);
|
||||
strncpy(sub->desc.desc, KZT_CONDVAR_DESC, KZT_DESC_SIZE);
|
||||
strncpy(sub->desc.name, SPLAT_CONDVAR_NAME, SPLAT_NAME_SIZE);
|
||||
strncpy(sub->desc.desc, SPLAT_CONDVAR_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_CONDVAR;
|
||||
sub->desc.id = SPLAT_SUBSYSTEM_CONDVAR;
|
||||
|
||||
KZT_TEST_INIT(sub, KZT_CONDVAR_TEST1_NAME, KZT_CONDVAR_TEST1_DESC,
|
||||
KZT_CONDVAR_TEST1_ID, kzt_condvar_test1);
|
||||
KZT_TEST_INIT(sub, KZT_CONDVAR_TEST2_NAME, KZT_CONDVAR_TEST2_DESC,
|
||||
KZT_CONDVAR_TEST2_ID, kzt_condvar_test2);
|
||||
KZT_TEST_INIT(sub, KZT_CONDVAR_TEST3_NAME, KZT_CONDVAR_TEST3_DESC,
|
||||
KZT_CONDVAR_TEST3_ID, kzt_condvar_test3);
|
||||
KZT_TEST_INIT(sub, KZT_CONDVAR_TEST4_NAME, KZT_CONDVAR_TEST4_DESC,
|
||||
KZT_CONDVAR_TEST4_ID, kzt_condvar_test4);
|
||||
KZT_TEST_INIT(sub, KZT_CONDVAR_TEST5_NAME, KZT_CONDVAR_TEST5_DESC,
|
||||
KZT_CONDVAR_TEST5_ID, kzt_condvar_test5);
|
||||
SPLAT_TEST_INIT(sub, SPLAT_CONDVAR_TEST1_NAME, SPLAT_CONDVAR_TEST1_DESC,
|
||||
SPLAT_CONDVAR_TEST1_ID, splat_condvar_test1);
|
||||
SPLAT_TEST_INIT(sub, SPLAT_CONDVAR_TEST2_NAME, SPLAT_CONDVAR_TEST2_DESC,
|
||||
SPLAT_CONDVAR_TEST2_ID, splat_condvar_test2);
|
||||
SPLAT_TEST_INIT(sub, SPLAT_CONDVAR_TEST3_NAME, SPLAT_CONDVAR_TEST3_DESC,
|
||||
SPLAT_CONDVAR_TEST3_ID, splat_condvar_test3);
|
||||
SPLAT_TEST_INIT(sub, SPLAT_CONDVAR_TEST4_NAME, SPLAT_CONDVAR_TEST4_DESC,
|
||||
SPLAT_CONDVAR_TEST4_ID, splat_condvar_test4);
|
||||
SPLAT_TEST_INIT(sub, SPLAT_CONDVAR_TEST5_NAME, SPLAT_CONDVAR_TEST5_DESC,
|
||||
SPLAT_CONDVAR_TEST5_ID, splat_condvar_test5);
|
||||
|
||||
return sub;
|
||||
}
|
||||
|
||||
void
|
||||
kzt_condvar_fini(kzt_subsystem_t *sub)
|
||||
splat_condvar_fini(splat_subsystem_t *sub)
|
||||
{
|
||||
ASSERT(sub);
|
||||
KZT_TEST_FINI(sub, KZT_CONDVAR_TEST5_ID);
|
||||
KZT_TEST_FINI(sub, KZT_CONDVAR_TEST4_ID);
|
||||
KZT_TEST_FINI(sub, KZT_CONDVAR_TEST3_ID);
|
||||
KZT_TEST_FINI(sub, KZT_CONDVAR_TEST2_ID);
|
||||
KZT_TEST_FINI(sub, KZT_CONDVAR_TEST1_ID);
|
||||
SPLAT_TEST_FINI(sub, SPLAT_CONDVAR_TEST5_ID);
|
||||
SPLAT_TEST_FINI(sub, SPLAT_CONDVAR_TEST4_ID);
|
||||
SPLAT_TEST_FINI(sub, SPLAT_CONDVAR_TEST3_ID);
|
||||
SPLAT_TEST_FINI(sub, SPLAT_CONDVAR_TEST2_ID);
|
||||
SPLAT_TEST_FINI(sub, SPLAT_CONDVAR_TEST1_ID);
|
||||
|
||||
kfree(sub);
|
||||
}
|
||||
|
||||
int
|
||||
kzt_condvar_id(void) {
|
||||
return KZT_SUBSYSTEM_CONDVAR;
|
||||
splat_condvar_id(void) {
|
||||
return SPLAT_SUBSYSTEM_CONDVAR;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user