X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=trunk%2Ftests%2Fkernel%2Ftest-wbias-rwlock.c;h=3b16f5feb0c934ab161d6efb0d449aaa2227fd97;hb=27828bc1b0010ee87c2f68e31fb77fd4ae39fa6b;hp=c29bf0d6dcb51906f705084b261b77714703c942;hpb=02f09388d539418c195f2adfff1f4f4229bd8016;p=lttv.git diff --git a/trunk/tests/kernel/test-wbias-rwlock.c b/trunk/tests/kernel/test-wbias-rwlock.c index c29bf0d6..3b16f5fe 100644 --- a/trunk/tests/kernel/test-wbias-rwlock.c +++ b/trunk/tests/kernel/test-wbias-rwlock.c @@ -79,6 +79,12 @@ #define THREAD_READER_DELAY 0 /* busy loop */ #define INTERRUPT_READER_DELAY 100 +#ifdef CONFIG_PREEMPT +#define yield_in_non_preempt() +#else +#define yield_in_non_preempt() yield() +#endif + static int var[NR_VARS]; static struct task_struct *preader_threads[NR_PREADERS]; static struct task_struct *npreader_threads[NR_NPREADERS]; @@ -98,11 +104,9 @@ static DEFINE_RWLOCK(std_rw_lock); #define wrap_read_lock_inatomic() read_lock(&std_rw_lock) #define wrap_read_trylock_inatomic() read_trylock(&std_rw_lock) -#define wrap_read_unlock_inatomic() read_unlock(&std_rw_lock) #define wrap_read_lock_irq() read_lock(&std_rw_lock) #define wrap_read_trylock_irq() read_trylock(&std_rw_lock) -#define wrap_read_unlock_irq() read_unlock(&std_rw_lock) #if (TEST_INTERRUPTS) #define wrap_write_lock() write_lock_irq(&std_rw_lock) @@ -112,48 +116,54 @@ static DEFINE_RWLOCK(std_rw_lock); #define wrap_write_unlock() write_unlock(&std_rw_lock) #endif +#define wrap_write_trylock() write_trylock(&std_rw_lock) + #else -static DEFINE_WBIAS_RWLOCK(wbiasrwlock); +#if (TEST_INTERRUPTS) +#if (TEST_PREEMPT) +#define WBIASRWLOCKWCTX WB_PRIO_P +#define WBIASRWLOCKRCTX (WB_RIRQ | WB_RNPTHREAD | WB_RPTHREAD) +#else +#define WBIASRWLOCKWCTX WB_PRIO_NP +#define WBIASRWLOCKRCTX (WB_RIRQ | WB_RNPTHREAD) +#endif +#else +#if (TEST_PREEMPT) +#define WBIASRWLOCKWCTX WB_PRIO_P +#define WBIASRWLOCKRCTX (WB_RNPTHREAD | WB_RPTHREAD) +#else +#define WBIASRWLOCKWCTX WB_PRIO_NP +#define WBIASRWLOCKRCTX (WB_RNPTHREAD) +#endif +#endif +static DEFINE_WBIAS_RWLOCK(wbiasrwlock, WBIASRWLOCKWCTX, WBIASRWLOCKRCTX); +CHECK_WBIAS_RWLOCK_MAP(wbiasrwlock, WBIASRWLOCKWCTX, WBIASRWLOCKRCTX); + + +#if (TEST_PREEMPT) #define wrap_read_lock() wbias_read_lock(&wbiasrwlock) #define wrap_read_trylock() wbias_read_trylock(&wbiasrwlock) +#else +#define wrap_read_lock() wbias_read_lock_inatomic(&wbiasrwlock) +#define wrap_read_trylock() wbias_read_trylock_inatomic(&wbiasrwlock) +#endif #define wrap_read_unlock() wbias_read_unlock(&wbiasrwlock) #define wrap_read_lock_inatomic() wbias_read_lock_inatomic(&wbiasrwlock) -#define wrap_read_trylock_inatomic() \ +#define wrap_read_trylock_inatomic() \ wbias_read_trylock_inatomic(&wbiasrwlock) -#define wrap_read_unlock_inatomic() \ - wbias_read_unlock_inatomic(&wbiasrwlock) #define wrap_read_lock_irq() wbias_read_lock_irq(&wbiasrwlock) #define wrap_read_trylock_irq() wbias_read_trylock_irq(&wbiasrwlock) -#define wrap_read_unlock_irq() wbias_read_unlock_irq(&wbiasrwlock) -#if (TEST_INTERRUPTS) -#define wrap_write_lock() wbias_write_lock_irq(&wbiasrwlock) -#define wrap_write_unlock() wbias_write_unlock_irq(&wbiasrwlock) -#define wrap_write_trylock_else_subscribe() \ - wbias_write_trylock_irq_else_subscribe(&wbiasrwlock) -#define wrap_write_trylock_subscribed() \ - wbias_write_trylock_irq_subscribed(&wbiasrwlock) -#else -#if (TEST_PREEMPT) -#define wrap_write_lock() wbias_write_lock(&wbiasrwlock) -#define wrap_write_unlock() wbias_write_unlock(&wbiasrwlock) -#define wrap_write_trylock_else_subscribe() \ - wbias_write_trylock_else_subscribe(&wbiasrwlock) -#define wrap_write_trylock_subscribed() \ - wbias_write_trylock_subscribed(&wbiasrwlock) -#else -#define wrap_write_lock() wbias_write_lock_atomic(&wbiasrwlock) -#define wrap_write_unlock() wbias_write_unlock_atomic(&wbiasrwlock) -#define wrap_write_trylock_else_subscribe() \ - wbias_write_trylock_atomic_else_subscribe(&wbiasrwlock) -#define wrap_write_trylock_subscribed() \ - wbias_write_trylock_atomic_subscribed(&wbiasrwlock) -#endif -#endif +#define wrap_write_lock() \ + wbias_write_lock(&wbiasrwlock, WBIASRWLOCKWCTX, WBIASRWLOCKRCTX) +#define wrap_write_unlock() \ + wbias_write_unlock(&wbiasrwlock, WBIASRWLOCKWCTX, WBIASRWLOCKRCTX) +#define wrap_write_trylock() \ + wbias_write_trylock(&wbiasrwlock, WBIASRWLOCKWCTX, WBIASRWLOCKRCTX) #endif @@ -174,8 +184,9 @@ static int p_or_np_reader_thread(const char *typename, int i; int prev, cur; unsigned long iter = 0; - cycles_t time1, time2, delay, delaymax = 0, delaymin = ULLONG_MAX, - delayavg = 0; + cycles_t time1, time2, delay; + cycles_t ldelaymax = 0, ldelaymin = ULLONG_MAX, ldelayavg = 0; + cycles_t udelaymax = 0, udelaymin = ULLONG_MAX, udelayavg = 0; printk("%s/%lu runnning\n", typename, (unsigned long)data); do { @@ -195,39 +206,61 @@ static int p_or_np_reader_thread(const char *typename, time2 = get_cycles(); rdtsc_barrier(); delay = time2 - time1; - delaymax = max(delaymax, delay); - delaymin = min(delaymin, delay); - delayavg += delay; + ldelaymax = max(ldelaymax, delay); + ldelaymin = min(ldelaymin, delay); + ldelayavg += delay; prev = var[0]; for (i = 1; i < NR_VARS; i++) { cur = var[i]; - if (cur != prev) + if (cur != prev) { printk(KERN_ALERT "Unequal cur %d/prev %d at i %d, iter %lu " - "in thread\n", cur, prev, i, iter); + "in reader thread\n", + cur, prev, i, iter); + } } - if (!preemptable) - wrap_read_unlock_inatomic(); - else - wrap_read_unlock(); + rdtsc_barrier(); + time1 = get_cycles(); + rdtsc_barrier(); + + wrap_read_unlock(); + + rdtsc_barrier(); + time2 = get_cycles(); + rdtsc_barrier(); + delay = time2 - time1; + udelaymax = max(udelaymax, delay); + udelaymin = min(udelaymin, delay); + udelayavg += delay; + if (!preemptable) preempt_enable(); + if (THREAD_READER_DELAY) msleep(THREAD_READER_DELAY); + yield_in_non_preempt(); } while (!kthread_should_stop()); if (!iter) { printk("%s/%lu iterations : %lu", typename, (unsigned long)data, iter); } else { - delayavg /= iter; + ldelayavg /= iter; + udelayavg /= iter; printk("%s/%lu iterations : %lu, " "lock delay [min,avg,max] %llu,%llu,%llu cycles\n", typename, (unsigned long)data, iter, - calibrate_cycles(delaymin), - calibrate_cycles(delayavg), - calibrate_cycles(delaymax)); + calibrate_cycles(ldelaymin), + calibrate_cycles(ldelayavg), + calibrate_cycles(ldelaymax)); + printk("%s/%lu iterations : %lu, " + "unlock delay [min,avg,max] %llu,%llu,%llu cycles\n", + typename, + (unsigned long)data, iter, + calibrate_cycles(udelaymin), + calibrate_cycles(udelayavg), + calibrate_cycles(udelaymax)); } return 0; } @@ -250,30 +283,44 @@ static int trylock_reader_thread(void *data) printk("trylock_reader_thread/%lu runnning\n", (unsigned long)data); do { - while (!wrap_read_trylock()) +#if (!TEST_PREEMPT) + preempt_disable(); +#endif + while (!wrap_read_trylock()) { + cpu_relax(); iter++; + } success_iter++; prev = var[0]; for (i = 1; i < NR_VARS; i++) { cur = var[i]; - if (cur != prev) + if (cur != prev) { printk(KERN_ALERT "Unequal cur %d/prev %d at i %d, iter %lu " - "in thread\n", cur, prev, i, iter); + "in trylock reader thread\n", + cur, prev, i, iter); + } } wrap_read_unlock(); +#if (!TEST_PREEMPT) + preempt_enable(); +#endif if (THREAD_READER_DELAY) msleep(THREAD_READER_DELAY); + yield_in_non_preempt(); } while (!kthread_should_stop()); printk("trylock_reader_thread/%lu iterations : %lu, " "successful iterations : %lu\n", - (unsigned long)data, iter, success_iter); + (unsigned long)data, iter + success_iter, success_iter); return 0; } -DEFINE_PER_CPU(cycles_t, int_delaymin); -DEFINE_PER_CPU(cycles_t, int_delayavg); -DEFINE_PER_CPU(cycles_t, int_delaymax); +DEFINE_PER_CPU(cycles_t, int_ldelaymin); +DEFINE_PER_CPU(cycles_t, int_ldelayavg); +DEFINE_PER_CPU(cycles_t, int_ldelaymax); +DEFINE_PER_CPU(cycles_t, int_udelaymin); +DEFINE_PER_CPU(cycles_t, int_udelayavg); +DEFINE_PER_CPU(cycles_t, int_udelaymax); DEFINE_PER_CPU(cycles_t, int_ipi_nr); static void interrupt_reader_ipi(void *data) @@ -281,7 +328,8 @@ static void interrupt_reader_ipi(void *data) int i; int prev, cur; cycles_t time1, time2; - cycles_t *delaymax, *delaymin, *delayavg, *ipi_nr, delay; + cycles_t *ldelaymax, *ldelaymin, *ldelayavg, *ipi_nr, delay; + cycles_t *udelaymax, *udelaymin, *udelayavg; /* * Skip the ipi caller, not in irq context. @@ -289,9 +337,12 @@ static void interrupt_reader_ipi(void *data) if (!in_irq()) return; - delaymax = &per_cpu(int_delaymax, smp_processor_id()); - delaymin = &per_cpu(int_delaymin, smp_processor_id()); - delayavg = &per_cpu(int_delayavg, smp_processor_id()); + ldelaymax = &per_cpu(int_ldelaymax, smp_processor_id()); + ldelaymin = &per_cpu(int_ldelaymin, smp_processor_id()); + ldelayavg = &per_cpu(int_ldelayavg, smp_processor_id()); + udelaymax = &per_cpu(int_udelaymax, smp_processor_id()); + udelaymin = &per_cpu(int_udelaymin, smp_processor_id()); + udelayavg = &per_cpu(int_udelayavg, smp_processor_id()); ipi_nr = &per_cpu(int_ipi_nr, smp_processor_id()); rdtsc_barrier(); @@ -304,9 +355,9 @@ static void interrupt_reader_ipi(void *data) time2 = get_cycles(); rdtsc_barrier(); delay = time2 - time1; - *delaymax = max(*delaymax, delay); - *delaymin = min(*delaymin, delay); - *delayavg += delay; + *ldelaymax = max(*ldelaymax, delay); + *ldelaymin = min(*ldelaymin, delay); + *ldelayavg += delay; (*ipi_nr)++; prev = var[0]; for (i = 1; i < NR_VARS; i++) { @@ -316,7 +367,16 @@ static void interrupt_reader_ipi(void *data) "Unequal cur %d/prev %d at i %d in interrupt\n", cur, prev, i); } - wrap_read_unlock_irq(); + rdtsc_barrier(); + time1 = get_cycles(); + rdtsc_barrier(); + wrap_read_unlock(); + time2 = get_cycles(); + rdtsc_barrier(); + delay = time2 - time1; + *udelaymax = max(*udelaymax, delay); + *udelaymin = min(*udelaymin, delay); + *udelayavg += delay; } DEFINE_PER_CPU(unsigned long, trylock_int_iter); @@ -345,7 +405,7 @@ static void trylock_interrupt_reader_ipi(void *data) "Unequal cur %d/prev %d at i %d in interrupt\n", cur, prev, i); } - wrap_read_unlock_irq(); + wrap_read_unlock(); } @@ -355,9 +415,12 @@ static int interrupt_reader_thread(void *data) int i; for_each_online_cpu(i) { - per_cpu(int_delaymax, i) = 0; - per_cpu(int_delaymin, i) = ULLONG_MAX; - per_cpu(int_delayavg, i) = 0; + per_cpu(int_ldelaymax, i) = 0; + per_cpu(int_ldelaymin, i) = ULLONG_MAX; + per_cpu(int_ldelayavg, i) = 0; + per_cpu(int_udelaymax, i) = 0; + per_cpu(int_udelaymin, i) = ULLONG_MAX; + per_cpu(int_udelayavg, i) = 0; per_cpu(int_ipi_nr, i) = 0; } do { @@ -365,19 +428,27 @@ static int interrupt_reader_thread(void *data) on_each_cpu(interrupt_reader_ipi, NULL, 0); if (INTERRUPT_READER_DELAY) msleep(INTERRUPT_READER_DELAY); + yield_in_non_preempt(); } while (!kthread_should_stop()); printk("interrupt_reader_thread/%lu iterations : %lu\n", (unsigned long)data, iter); for_each_online_cpu(i) { if (!per_cpu(int_ipi_nr, i)) continue; - per_cpu(int_delayavg, i) /= per_cpu(int_ipi_nr, i); + per_cpu(int_ldelayavg, i) /= per_cpu(int_ipi_nr, i); + per_cpu(int_udelayavg, i) /= per_cpu(int_ipi_nr, i); printk("interrupt readers on CPU %i, " "lock delay [min,avg,max] %llu,%llu,%llu cycles\n", i, - calibrate_cycles(per_cpu(int_delaymin, i)), - calibrate_cycles(per_cpu(int_delayavg, i)), - calibrate_cycles(per_cpu(int_delaymax, i))); + calibrate_cycles(per_cpu(int_ldelaymin, i)), + calibrate_cycles(per_cpu(int_ldelayavg, i)), + calibrate_cycles(per_cpu(int_ldelaymax, i))); + printk("interrupt readers on CPU %i, " + "unlock delay [min,avg,max] %llu,%llu,%llu cycles\n", + i, + calibrate_cycles(per_cpu(int_udelaymin, i)), + calibrate_cycles(per_cpu(int_udelayavg, i)), + calibrate_cycles(per_cpu(int_udelaymax, i))); } return 0; } @@ -392,6 +463,7 @@ static int trylock_interrupt_reader_thread(void *data) on_each_cpu(trylock_interrupt_reader_ipi, NULL, 0); if (INTERRUPT_READER_DELAY) msleep(INTERRUPT_READER_DELAY); + yield_in_non_preempt(); } while (!kthread_should_stop()); printk("trylock_interrupt_reader_thread/%lu iterations : %lu\n", (unsigned long)data, iter); @@ -410,15 +482,18 @@ static int trylock_interrupt_reader_thread(void *data) static int writer_thread(void *data) { int i; - int new; + int new, prev, cur; unsigned long iter = 0; - cycles_t time1, time2, delay, delaymax = 0, delaymin = ULLONG_MAX, - delayavg = 0; + cycles_t time1, time2, delay; + cycles_t ldelaymax = 0, ldelaymin = ULLONG_MAX, ldelayavg = 0; + cycles_t udelaymax = 0, udelaymin = ULLONG_MAX, udelayavg = 0; printk("writer_thread/%lu runnning\n", (unsigned long)data); do { iter++; - //preempt_disable(); /* for get_cycles accuracy */ +#if (!TEST_PREEMPT) + preempt_disable(); +#endif rdtsc_barrier(); time1 = get_cycles(); rdtsc_barrier(); @@ -429,31 +504,69 @@ static int writer_thread(void *data) time2 = get_cycles(); rdtsc_barrier(); delay = time2 - time1; - delaymax = max(delaymax, delay); - delaymin = min(delaymin, delay); - delayavg += delay; + ldelaymax = max(ldelaymax, delay); + ldelaymin = min(ldelaymin, delay); + ldelayavg += delay; + /* + * Read the previous values, check that they are coherent. + */ + prev = var[0]; + for (i = 1; i < NR_VARS; i++) { + cur = var[i]; + if (cur != prev) + printk(KERN_ALERT + "Unequal cur %d/prev %d at i %d, iter %lu " + "in writer thread\n", + cur, prev, i, iter); + } new = (int)get_cycles(); for (i = 0; i < NR_VARS; i++) { var[i] = new; } + rdtsc_barrier(); + time1 = get_cycles(); + rdtsc_barrier(); + wrap_write_unlock(); - //preempt_enable(); /* for get_cycles accuracy */ + rdtsc_barrier(); + time2 = get_cycles(); + rdtsc_barrier(); + delay = time2 - time1; + udelaymax = max(udelaymax, delay); + udelaymin = min(udelaymin, delay); + udelayavg += delay; + +#if (!TEST_PREEMPT) + preempt_enable(); +#endif if (WRITER_DELAY > 0) udelay(WRITER_DELAY); + cpu_relax(); /* + * make sure we don't busy-loop faster than + * the lock busy-loop, it would cause reader and + * writer starvation. + */ + yield_in_non_preempt(); } while (!kthread_should_stop()); - delayavg /= iter; + ldelayavg /= iter; + udelayavg /= iter; printk("writer_thread/%lu iterations : %lu, " "lock delay [min,avg,max] %llu,%llu,%llu cycles\n", (unsigned long)data, iter, - calibrate_cycles(delaymin), - calibrate_cycles(delayavg), - calibrate_cycles(delaymax)); + calibrate_cycles(ldelaymin), + calibrate_cycles(ldelayavg), + calibrate_cycles(ldelaymax)); + printk("writer_thread/%lu iterations : %lu, " + "unlock delay [min,avg,max] %llu,%llu,%llu cycles\n", + (unsigned long)data, iter, + calibrate_cycles(udelaymin), + calibrate_cycles(udelayavg), + calibrate_cycles(udelaymax)); return 0; } -#if (TEST_STD_RWLOCK) static int trylock_writer_thread(void *data) { int i; @@ -462,7 +575,11 @@ static int trylock_writer_thread(void *data) printk("trylock_writer_thread/%lu runnning\n", (unsigned long)data); do { -#if (TEST_INTERRUPTS) +#if ((!TEST_PREEMPT) && (!TEST_STD_RWLOCK)) + preempt_disable(); +#endif + +#if (TEST_STD_RWLOCK && TEST_INTERRUPTS) /* std write trylock cannot disable interrupts. */ local_irq_disable(); #endif @@ -470,73 +587,27 @@ static int trylock_writer_thread(void *data) #if (TRYLOCK_WRITERS_FAIL_ITER == -1) for (;;) { iter++; - if (write_trylock(&std_rw_lock)) + if (wrap_write_trylock()) goto locked; + cpu_relax(); } #else for (i = 0; i < TRYLOCK_WRITERS_FAIL_ITER; i++) { iter++; - if (write_trylock(&std_rw_lock)) + if (wrap_write_trylock()) goto locked; + cpu_relax(); } #endif fail++; -#if (TEST_INTERRUPTS) + +#if (TEST_STD_RWLOCK && TEST_INTERRUPTS) local_irq_enable(); #endif - goto loop; -locked: - success++; - new = (int)get_cycles(); - for (i = 0; i < NR_VARS; i++) { - var[i] = new; - } -#if (TEST_INTERRUPTS) - write_unlock_irq(&std_rw_lock); -#else - write_unlock(&std_rw_lock); -#endif -loop: - if (TRYLOCK_WRITER_DELAY > 0) - udelay(TRYLOCK_WRITER_DELAY); - } while (!kthread_should_stop()); - printk("trylock_writer_thread/%lu iterations : " - "[try,success,fail after %d try], " - "%lu,%lu,%lu\n", - (unsigned long)data, TRYLOCK_WRITERS_FAIL_ITER, - iter, success, fail); - return 0; -} - -#else /* !TEST_STD_RWLOCK */ - -static int trylock_writer_thread(void *data) -{ - int i; - int new; - unsigned long iter = 0, success = 0, fail = 0; - printk("trylock_writer_thread/%lu runnning\n", (unsigned long)data); - do { - iter++; - if (wrap_write_trylock_else_subscribe()) - goto locked; - -#if (TRYLOCK_WRITERS_FAIL_ITER == -1) - for (;;) { - iter++; - if (wrap_write_trylock_subscribed()) - goto locked; - } -#else - for (i = 0; i < TRYLOCK_WRITERS_FAIL_ITER - 1; i++) { - iter++; - if (wrap_write_trylock_subscribed()) - goto locked; - } +#if ((!TEST_PREEMPT) && (!TEST_STD_RWLOCK)) + preempt_enable(); #endif - fail++; - wbias_write_unsubscribe(&wbiasrwlock); goto loop; locked: success++; @@ -545,9 +616,18 @@ locked: var[i] = new; } wrap_write_unlock(); +#if ((!TEST_PREEMPT) && (!TEST_STD_RWLOCK)) + preempt_enable(); +#endif loop: if (TRYLOCK_WRITER_DELAY > 0) udelay(TRYLOCK_WRITER_DELAY); + cpu_relax(); /* + * make sure we don't busy-loop faster than + * the lock busy-loop, it would cause reader and + * writer starvation. + */ + yield_in_non_preempt(); } while (!kthread_should_stop()); printk("trylock_writer_thread/%lu iterations : " "[try,success,fail after %d try], " @@ -557,8 +637,6 @@ loop: return 0; } -#endif /* TEST_STD_RWLOCK */ - static void wbias_rwlock_create(void) { unsigned long i; @@ -669,6 +747,7 @@ static int my_open(struct inode *inode, struct file *file) cycles_calibration_max); printk("\n"); +#if (NR_WRITERS) printk("** Single writer test, no contention **\n"); wbias_rwlock_profile_latency_reset(); writer_threads[0] = kthread_run(writer_thread, (void *)0, @@ -679,7 +758,9 @@ static int my_open(struct inode *inode, struct file *file) printk("\n"); wbias_rwlock_profile_latency_print(); +#endif +#if (NR_TRYLOCK_WRITERS) printk("** Single trylock writer test, no contention **\n"); wbias_rwlock_profile_latency_reset(); trylock_writer_threads[0] = kthread_run(trylock_writer_thread, @@ -691,7 +772,9 @@ static int my_open(struct inode *inode, struct file *file) printk("\n"); wbias_rwlock_profile_latency_print(); +#endif +#if (TEST_PREEMPT) printk("** Single preemptable reader test, no contention **\n"); wbias_rwlock_profile_latency_reset(); preader_threads[0] = kthread_run(preader_thread, (void *)0, @@ -702,6 +785,7 @@ static int my_open(struct inode *inode, struct file *file) printk("\n"); wbias_rwlock_profile_latency_print(); +#endif printk("** Single non-preemptable reader test, no contention **\n"); wbias_rwlock_profile_latency_reset(); @@ -716,12 +800,14 @@ static int my_open(struct inode *inode, struct file *file) printk("** Multiple p/non-p readers test, no contention **\n"); wbias_rwlock_profile_latency_reset(); +#if (TEST_PREEMPT) for (i = 0; i < NR_PREADERS; i++) { printk("starting preader thread %lu\n", i); preader_threads[i] = kthread_run(preader_thread, (void *)i, "wbiasrwlock_preader"); BUG_ON(!preader_threads[i]); } +#endif for (i = 0; i < NR_NPREADERS; i++) { printk("starting npreader thread %lu\n", i); npreader_threads[i] = kthread_run(npreader_thread, (void *)i, @@ -731,8 +817,10 @@ static int my_open(struct inode *inode, struct file *file) ssleep(SINGLE_READER_TEST_DURATION); for (i = 0; i < NR_NPREADERS; i++) kthread_stop(npreader_threads[i]); +#if (TEST_PREEMPT) for (i = 0; i < NR_PREADERS; i++) kthread_stop(preader_threads[i]); +#endif printk("\n"); wbias_rwlock_profile_latency_print(); @@ -759,21 +847,20 @@ int init_module(void) if (pentry) pentry->proc_fops = &my_operations; - printk("PTHREAD_ROFFSET : %016lX\n", PTHREAD_ROFFSET); - printk("PTHREAD_RMASK : %016lX\n", PTHREAD_RMASK); - printk("NPTHREAD_ROFFSET : %016lX\n", NPTHREAD_ROFFSET); - printk("NPTHREAD_RMASK : %016lX\n", NPTHREAD_RMASK); - printk("SOFTIRQ_ROFFSET : %016lX\n", SOFTIRQ_ROFFSET); - printk("SOFTIRQ_RMASK : %016lX\n", SOFTIRQ_RMASK); - printk("HARDIRQ_ROFFSET : %016lX\n", HARDIRQ_ROFFSET); - printk("HARDIRQ_RMASK : %016lX\n", HARDIRQ_RMASK); - printk("PTHREAD_WOFFSET : %016lX\n", PTHREAD_WOFFSET); - printk("PTHREAD_WMASK : %016lX\n", PTHREAD_WMASK); - printk("NPTHREAD_WOFFSET : %016lX\n", NPTHREAD_WOFFSET); - printk("NPTHREAD_WMASK : %016lX\n", NPTHREAD_WMASK); - printk("WRITER_MUTEX : %016lX\n", WRITER_MUTEX); - printk("SOFTIRQ_WMASK : %016lX\n", SOFTIRQ_WMASK); - printk("HARDIRQ_WMASK : %016lX\n", HARDIRQ_WMASK); + printk("UC_READER_MASK : %08X\n", UC_READER_MASK); + printk("UC_HARDIRQ_R_MASK: %08X\n", UC_HARDIRQ_READER_MASK); + printk("UC_SOFTIRQ_R_MASK: %08X\n", UC_SOFTIRQ_READER_MASK); + printk("UC_NPTHREA_R_MASK: %08X\n", UC_NPTHREAD_READER_MASK); + printk("UC_PTHREAD_R_MASK: %08X\n", UC_PTHREAD_READER_MASK); + printk("UC_WRITER : %08X\n", UC_WRITER); + printk("UC_SLOW_WRITER : %08X\n", UC_SLOW_WRITER); + printk("UC_WQ_ACTIVE : %08X\n", UC_WQ_ACTIVE); + printk("WS_MASK : %08X\n", WS_MASK); + printk("WS_WQ_MUTEX : %08X\n", WS_WQ_MUTEX); + printk("WS_COUNT_MUTEX : %08X\n", WS_COUNT_MUTEX); + printk("WS_LOCK_MUTEX : %08X\n", WS_LOCK_MUTEX); + printk("CTX_RMASK : %016lX\n", CTX_RMASK); + printk("CTX_WMASK : %016lX\n", CTX_WMASK); return 0; }