Menu
▾
▴
Re: [LTP] [PATCH 1/2] Remove references of jvmsim from the tests
|
From: Subrata M. <su...@li...> - 2008-11-28 10:42:44
|
On Wed, 2008-11-26 at 10:37 +0530, Chirag Jog wrote:
> Most of the testcases, have an option (-j) which runs
> the jvmsim as a background load so as to simulate the
> behavior of the JVM.
> This patch removes the references of jvmsim from all
> the testcases.
>
>
> Signed-Off-By: Chirag <ch...@li...>
> Acked-by: Sripathi Kodi <sri...@in...>
Thanks.
Regards--
Subrata
>
>
>
> func/async_handler/async_handler.c | 15 +--------------
> func/async_handler/async_handler_jk.c | 15 +--------------
> func/async_handler/async_handler_tsc.c | 16 +---------------
> func/gtod_latency/gtod_infinite.c | 16 +---------------
> func/gtod_latency/gtod_latency.c | 1 -
> func/hrtimer-prio/hrtimer-prio.c | 14 --------------
> func/matrix_mult/matrix_mult.c | 16 +---------------
> func/measurement/preempt_timing.c | 16 +---------------
> func/periodic_cpu_load/periodic_cpu_load.c | 15 +--------------
> func/periodic_cpu_load/periodic_cpu_load_single.c | 16 +---------------
> func/pi-tests/sbrk_mutex.c | 16 +---------------
> func/pi-tests/test-skeleton.c | 16 +---------------
> func/pi-tests/testpi-0.c | 1 -
> func/pi-tests/testpi-1.c | 16 +---------------
> func/pi-tests/testpi-2.c | 16 +---------------
> func/pi-tests/testpi-4.c | 16 +---------------
> func/pi-tests/testpi-5.c | 1 -
> func/pi-tests/testpi-6.c | 1 -
> func/pi-tests/testpi-7.c | 16 +---------------
> func/prio-preempt/prio-preempt.c | 8 +-------
> func/prio-wake/prio-wake.c | 16 +---------------
> func/pthread_kill_latency/pthread_kill_latency.c | 15 +--------------
> func/sched_football/sched_football.c | 16 +---------------
> func/sched_jitter/sched_jitter.c | 16 +---------------
> func/sched_latency/sched_latency.c | 16 +---------------
> func/thread_clock/tc-2.c | 16 +---------------
> perf/latency/pthread_cond_latency.c | 16 +---------------
> stress/pi-tests/lookup_pi_state.c | 18 +-----------------
> stress/pi-tests/testpi-3.c | 17 +----------------
> 29 files changed, 24 insertions(+), 369 deletions(-)
>
> Index: ltp/testcases/realtime/func/async_handler/async_handler.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/async_handler/async_handler.c
> +++ ltp/testcases/realtime/func/async_handler/async_handler.c
> @@ -26,7 +26,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * Darren Hart <dv...@us...>
> @@ -40,7 +39,6 @@
> #include <stdlib.h>
> #include <math.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
> #include <libstats.h>
> #include <getopt.h>
>
> @@ -53,7 +51,6 @@
> static nsec_t start;
> static nsec_t end;
> static int iterations = 0;
> -static int run_jvmsim = 0;
>
> #define CHILD_START 0
> #define CHILD_WAIT 1
> @@ -70,7 +67,6 @@ void usage(void)
> {
> rt_help();
> printf("async_handler specific options:\n");
> - printf(" -j enable jvmsim\n");
> printf(" -iITERATIONS number of iterations to calculate the average over\n");
> }
>
> @@ -79,9 +75,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -181,18 +174,12 @@ int main(int argc, char *argv[])
> printf("-----------------------------------\n\n");
>
> pass_criteria = PASS_US;
> - rt_init("ji:h", parse_args, argc, argv);
> + rt_init("i:h", parse_args, argc, argv);
>
> init_pi_mutex(&mutex);
>
> atomic_set(CHILD_START, &step);
>
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> if (iterations == 0)
> iterations = DEFAULT_ITERATIONS;
> printf("Running %d iterations\n", iterations);
> Index: ltp/testcases/realtime/func/async_handler/async_handler_jk.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/async_handler/async_handler_jk.c
> +++ ltp/testcases/realtime/func/async_handler/async_handler_jk.c
> @@ -29,7 +29,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * John Kacur <jk...@ca...>
> @@ -43,7 +42,6 @@
> #include <stdlib.h>
> #include <math.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
> #include <libstats.h>
>
> // This is the normal priority for an event handler if not specified.
> @@ -52,7 +50,6 @@
> #define PASS_US 100
>
> long start, end;
> -static int run_jvmsim = 0;
>
> /* Function Prototypes */
> void *async_event_server(void *arg);
> @@ -62,7 +59,6 @@ void usage(void)
> {
> rt_help();
> printf("async_handler_jk specific options:\n");
> - printf(" -j enable jvmsim\n");
> }
>
> int parse_args(int c, char *v)
> @@ -70,9 +66,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -149,13 +142,7 @@ int main(int argc, char* argv[])
> setup();
>
> pass_criteria = PASS_US;
> - rt_init("jh", parse_args, argc, argv);
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> + rt_init("h", parse_args, argc, argv);
>
> aes_id = create_fifo_thread(async_event_server, (void*)0, 83);
> server = get_thread(aes_id);
> Index: ltp/testcases/realtime/func/async_handler/async_handler_tsc.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/async_handler/async_handler_tsc.c
> +++ ltp/testcases/realtime/func/async_handler/async_handler_tsc.c
> @@ -29,7 +29,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * Darren Hart <dv...@us...>
> @@ -45,7 +44,6 @@
> #include <stdint.h>
> #include <pthread.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
> #include <libstats.h>
>
> #define HANDLER_PRIO 98
> @@ -71,13 +69,11 @@ pthread_cond_t cond = PTHREAD_COND_INITI
> pthread_mutex_t mutex;
>
>
> -static int run_jvmsim=0;
>
> void usage(void)
> {
> rt_help();
> printf("async_handler_tsc specific options:\n");
> - printf(" -j enable jvmsim\n");
> }
>
> int parse_args(int c, char *v)
> @@ -85,9 +81,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -199,7 +192,7 @@ int main(int argc, char *argv[])
> int signal_id, handler_id;
> setup();
>
> - rt_init("jh", parse_args, argc, argv);
> + rt_init("h", parse_args, argc, argv);
>
> printf("-------------------------------\n");
> printf("Asynchronous Event Handling Latency\n");
> @@ -213,13 +206,6 @@ int main(int argc, char *argv[])
> init_pi_mutex(&mutex);
>
> atomic_set(CHILD_START, &step);
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> -
> handler_id = create_fifo_thread(handler_thread, (void*)0, HANDLER_PRIO);
> signal_id = create_fifo_thread(signal_thread, (void*)0, SIGNAL_PRIO);
>
> Index: ltp/testcases/realtime/func/gtod_latency/gtod_infinite.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/gtod_latency/gtod_infinite.c
> +++ ltp/testcases/realtime/func/gtod_latency/gtod_infinite.c
> @@ -37,7 +37,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * Darren Hart <dv...@us...>
> @@ -52,7 +51,6 @@
> #include <time.h>
> #include <sched.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
> #include <sys/mman.h>
>
> /* #define CLOCK_TO_USE CLOCK_MONOTONIC */
> @@ -61,14 +59,12 @@
> #define START_MAX 3000
> #define REPORT_MIN 1000000
>
> -static int run_jvmsim = 0;
> static unsigned int max_window = 0; /* infinite, don't use a window */
>
> void usage(void)
> {
> rt_help();
> printf("gtod_infinite specific options:\n");
> - printf(" -j enable jvmsim\n");
> printf(" -wWINDOW iterations in max value window (default inf)\n");
> }
>
> @@ -76,9 +72,6 @@ int parse_args(int c, char *v)
> {
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -113,14 +106,7 @@ int main(int argc, char *argv[])
> exit(1);
> }
> */
> - rt_init("jhw:", parse_args, argc, argv);
> -
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init();
> - } else {
> - printf("jvmsim disabled\n");
> - }
> + rt_init("hw:", parse_args, argc, argv);
>
> mlockall(MCL_CURRENT|MCL_FUTURE);
>
> Index: ltp/testcases/realtime/func/gtod_latency/gtod_latency.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/gtod_latency/gtod_latency.c
> +++ ltp/testcases/realtime/func/gtod_latency/gtod_latency.c
> @@ -30,7 +30,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * Darren Hart <dv...@us...>
> Index: ltp/testcases/realtime/func/hrtimer-prio/hrtimer-prio.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/hrtimer-prio/hrtimer-prio.c
> +++ ltp/testcases/realtime/func/hrtimer-prio/hrtimer-prio.c
> @@ -29,7 +29,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * Darren Hart <dv...@us...>
> @@ -43,7 +42,6 @@
> #include <stdlib.h>
> #include <math.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
> #include <libstats.h>
>
> #define DEF_MED_PRIO 60 // (softirqd-hrtimer,98)
> @@ -53,7 +51,6 @@
> #define DEF_SLEEP_TIME 10000 // Duration of nanosleep in nanoseconds
> #define DEF_CRITERIA 10 // maximum timer latency in microseconds
>
> -static int run_jvmsim = 0;
> static int med_prio = DEF_MED_PRIO;
> static int high_prio;
> static int busy_time = DEF_BUSY_TIME;
> @@ -69,7 +66,6 @@ void usage(void)
> {
> rt_help();
> printf("hrtimer-prio specific options:\n");
> - printf(" -j enable jvmsim\n");
> printf(" -t# #:busy work time in ms, defaults to %d ms\n", DEF_BUSY_TIME);
> printf(" -i# #:number of iterations, defaults to %d\n", DEF_ITERATIONS);
> printf(" -n# #:number of busy threads, defaults to NR_CPUS*2\n");
> @@ -82,9 +78,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -175,13 +168,6 @@ int main(int argc, char *argv[])
> printf("Busy thread priority: %d\n", med_prio);
> printf("Timer thread priority: %d\n", high_prio);
>
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> -
> stats_container_t hist;
> stats_quantiles_t quantiles;
> if (stats_container_init(&dat, iterations)) {
> Index: ltp/testcases/realtime/func/matrix_mult/matrix_mult.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/matrix_mult/matrix_mult.c
> +++ ltp/testcases/realtime/func/matrix_mult/matrix_mult.c
> @@ -26,7 +26,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * Darren Hart <dv...@us...>
> @@ -41,7 +40,6 @@
> #include <stdlib.h>
> #include <math.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
> #include <libstats.h>
>
> #define MAX_CPUS 8192
> @@ -60,7 +58,6 @@
>
> #define THREAD_SLEEP 1 * NS_PER_US
>
> -static int run_jvmsim = 0;
> static int ops = DEF_OPS;
> static int numcpus;
> static float criteria;
> @@ -79,7 +76,6 @@ void usage(void)
> {
> rt_help();
> printf("matrix_mult specific options:\n");
> - printf(" -j enable jvmsim\n");
> printf(" -l# #: number of multiplications per iteration (load)\n");
> printf(" -i# #: number of iterations\n");
> }
> @@ -88,9 +84,6 @@ int parse_args(int c, char *v)
> {
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'i':
> iterations = atoi(v);
> break;
> @@ -317,7 +310,7 @@ int main(int argc, char *argv[])
> {
> setup();
> pass_criteria = PASS_CRITERIA;
> - rt_init("jl:i:h", parse_args, argc, argv);
> + rt_init("l:i:h", parse_args, argc, argv);
> numcpus = sysconf(_SC_NPROCESSORS_ONLN);
> /* the minimum avg concurrent multiplier to pass */
> criteria = pass_criteria * numcpus;
> @@ -348,13 +341,6 @@ int main(int argc, char *argv[])
> printf("Calculations per iteration: %d\n", ops);
> printf("Number of CPUs: %u\n", numcpus);
>
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); /* Start the JVM simulation */
> - } else {
> - printf("jvmsim disabled\n");
> - }
> -
> set_priority(PRIO);
> main_thread();
>
> Index: ltp/testcases/realtime/func/measurement/preempt_timing.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/measurement/preempt_timing.c
> +++ ltp/testcases/realtime/func/measurement/preempt_timing.c
> @@ -32,7 +32,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> *
> @@ -53,19 +52,16 @@
> #include <sys/mman.h>
> #include <stdint.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
>
>
> #define ITERATIONS 1000000ULL
> #define INTERVALS 10
>
> -static int run_jvmsim=0;
>
> void usage(void)
> {
> rt_help();
> printf("preempt_timing specific options:\n");
> - printf(" -j enable jvmsim\n");
> }
>
> int parse_args(int c, char *v)
> @@ -73,9 +69,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -97,14 +90,7 @@ int main(int argc, char *argv[])
> min = -1;
> setup();
>
> - rt_init("jh",parse_args,argc,argv);
> -
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> + rt_init("h",parse_args,argc,argv);
>
> /* switch to SCHED_FIFO 99 */
> param.sched_priority = sched_get_priority_max(SCHED_FIFO);
> Index: ltp/testcases/realtime/func/periodic_cpu_load/periodic_cpu_load.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/periodic_cpu_load/periodic_cpu_load.c
> +++ ltp/testcases/realtime/func/periodic_cpu_load/periodic_cpu_load.c
> @@ -25,7 +25,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * Darren Hart <dv...@us...>
> @@ -40,7 +39,6 @@
> #include <math.h>
> #include <librttest.h>
> #include <libstats.h>
> -#include <libjvmsim.h>
>
> #define PRIO_A 63
> #define PRIO_B 53
> @@ -68,7 +66,6 @@ stats_container_t dat[THREADS_PER_GROUP
> stats_quantiles_t quantiles[THREADS_PER_GROUP * NUM_GROUPS];
> static const char groupname[NUM_GROUPS] = "ABC";
>
> -static int run_jvmsim = 0;
> static int iterations = ITERATIONS;
> static int ret = 0;
>
> @@ -77,15 +74,12 @@ void usage(void)
> rt_help();
> printf("periodic_cpu_load specific options:\n");
> printf(" -iITERATIONS number of iterations to calculate the average over\n");
> - printf(" -j enable jvmsim\n");
> }
>
> int parse_args(int c, char *v)
> {
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> break;
> case 'i':
> iterations = atoi(v);
> @@ -170,7 +164,7 @@ int main(int argc, char *argv[])
> int i;
> setup();
>
> - rt_init("jhi:", parse_args, argc, argv);
> + rt_init("hi:", parse_args, argc, argv);
>
> if (iterations < 100) {
> fprintf(stderr, "Number of iteration cannot be less than 100.\n");
> @@ -195,13 +189,6 @@ int main(int argc, char *argv[])
> printf(" period: %d ms\n", PERIOD_C/NS_PER_MS);
> printf("\n");
>
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> -
> for (i=0; i<(THREADS_PER_GROUP * NUM_GROUPS); i++) {
> stats_container_init(&dat[i], iterations);
> stats_quantiles_init(&quantiles[i], (int)log10(iterations));
> Index: ltp/testcases/realtime/func/periodic_cpu_load/periodic_cpu_load_single.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/periodic_cpu_load/periodic_cpu_load_single.c
> +++ ltp/testcases/realtime/func/periodic_cpu_load/periodic_cpu_load_single.c
> @@ -25,7 +25,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * Darren Hart <dv...@us...>
> @@ -40,7 +39,6 @@
> #include <math.h>
> #include <librttest.h>
> #include <libstats.h>
> -#include <libjvmsim.h>
>
> #define HIST_BUCKETS 100
>
> @@ -55,7 +53,6 @@
> static int prio;
> static int period;
> static int calc_loops;
> -static int run_jvmsim = 0;
> static int ret = 0;
> static char *filename_prefix = DEFAULT_FILENAME_PREFIX;
> static int iterations = DEFAULT_ITERATIONS;
> @@ -67,7 +64,6 @@ void usage(void)
> printf(" -lCALC_LOOPS loops per iteration\n");
> printf(" -fFILENAME_PREFIX filename prefix for plot output\n");
> printf(" -iITERATIONS number of iterations to calculate the average over\n");
> - printf(" -j enable jvmsim\n");
> printf(" -r[0-99] real-time priority\n");
> printf(" -tPERIOD period in ms\n");
> }
> @@ -175,9 +171,6 @@ int parse_args(int c, char *v)
> case 'i':
> iterations = atoi(v);
> break;
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'r':
> prio = atoi(v);
> break;
> @@ -198,7 +191,7 @@ int main(int argc, char *argv[])
> calc_loops = DEFAULT_CALC_LOOPS;
> setup();
>
> - rt_init("f:jhi:r:t:l:", parse_args, argc, argv);
> + rt_init("f:hi:r:t:l:", parse_args, argc, argv);
>
> if (iterations < 100) {
> printf("Number of iterations cannot be less than 100\n");
> @@ -221,13 +214,6 @@ int main(int argc, char *argv[])
> printf(" loops: %d\n", calc_loops);
> printf(" logs: %s*\n", filename_prefix);
>
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> -
> ret = periodic_thread(period, iterations, calc_loops);
>
> return ret;
> Index: ltp/testcases/realtime/func/pi-tests/testpi-0.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/pi-tests/testpi-0.c
> +++ ltp/testcases/realtime/func/pi-tests/testpi-0.c
> @@ -25,7 +25,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> *
> Index: ltp/testcases/realtime/func/pi-tests/testpi-1.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/pi-tests/testpi-1.c
> +++ ltp/testcases/realtime/func/pi-tests/testpi-1.c
> @@ -25,7 +25,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> *
> @@ -44,16 +43,13 @@
> #include <sys/syscall.h>
> #include <unistd.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
>
> -static int run_jvmsim=0;
> pthread_barrier_t barrier;
>
> void usage(void)
> {
> rt_help();
> printf("testpi-1 specific options:\n");
> - printf(" -j enable jvmsim\n");
> }
>
> int parse_args(int c, char *v)
> @@ -61,9 +57,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -204,20 +197,13 @@ int main(int argc, char* argv[]) {
> CPU_SET(0, &mask);
> setup();
>
> - rt_init("jh",parse_args,argc,argv);
> + rt_init("h",parse_args,argc,argv);
>
> if ((retc = pthread_barrier_init(&barrier, NULL, 5))) {
> printf("pthread_barrier_init failed: %s\n", strerror(retc));
> exit(retc);
> }
>
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> -
> retc = sched_setaffinity(0, sizeof(mask), &mask);
> if (retc < 0) {
> printf("Main Thread: Can't set affinity: %d %s\n", retc, strerror(retc));
> Index: ltp/testcases/realtime/func/pi-tests/testpi-2.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/pi-tests/testpi-2.c
> +++ ltp/testcases/realtime/func/pi-tests/testpi-2.c
> @@ -25,7 +25,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> *
> @@ -44,16 +43,13 @@
> #include <sys/syscall.h>
> #include <unistd.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
>
> -static int run_jvmsim=0;
> pthread_barrier_t barrier;
>
> void usage(void)
> {
> rt_help();
> printf("testpi-2 specific options:\n");
> - printf(" -j enable jvmsim\n");
> }
>
> int parse_args(int c, char *v)
> @@ -61,9 +57,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -203,20 +196,13 @@ int main(int argc, char* argv[]) {
> CPU_ZERO(&mask);
> CPU_SET(0, &mask);
> setup();
> - rt_init("jh",parse_args,argc,argv);
> + rt_init("h",parse_args,argc,argv);
>
> if ((retc = pthread_barrier_init(&barrier, NULL, 5))) {
> printf("pthread_barrier_init failed: %s\n", strerror(retc));
> exit(retc);
> }
>
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> -
> retc = sched_setaffinity(0, sizeof(mask), &mask);
> if (retc < 0) {
> printf("Main Thread: Can't set affinity: %d %s\n", retc, strerror(retc));
> Index: ltp/testcases/realtime/func/pi-tests/testpi-4.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/pi-tests/testpi-4.c
> +++ ltp/testcases/realtime/func/pi-tests/testpi-4.c
> @@ -25,7 +25,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> *
> @@ -45,16 +44,13 @@
> #include <sys/syscall.h>
> #include <unistd.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
>
> -static int run_jvmsim=0;
> pthread_barrier_t barrier;
>
> void usage(void)
> {
> rt_help();
> printf("testpi-4 specific options:\n");
> - printf(" -j enable jvmsim\n");
> }
>
> int parse_args(int c, char *v)
> @@ -62,9 +58,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -204,20 +197,13 @@ int main(int argc, char* argv[]) {
> CPU_SET(0, &mask);
> setup();
>
> - rt_init("jh",parse_args,argc,argv);
> + rt_init("h",parse_args,argc,argv);
>
> if ((retc = pthread_barrier_init(&barrier, NULL, 5))) {
> printf("pthread_barrier_init failed: %s\n", strerror(retc));
> exit(retc);
> }
>
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> -
> retc = sched_setaffinity(0, sizeof(mask), &mask);
> if (retc < 0) {
> printf("Main Thread: Can't set affinity: %d %s\n", retc, strerror(retc));
> Index: ltp/testcases/realtime/func/pi-tests/testpi-5.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/pi-tests/testpi-5.c
> +++ ltp/testcases/realtime/func/pi-tests/testpi-5.c
> @@ -25,7 +25,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> *
> Index: ltp/testcases/realtime/func/pi-tests/testpi-6.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/pi-tests/testpi-6.c
> +++ ltp/testcases/realtime/func/pi-tests/testpi-6.c
> @@ -25,7 +25,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> *
> Index: ltp/testcases/realtime/func/pi-tests/testpi-7.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/pi-tests/testpi-7.c
> +++ ltp/testcases/realtime/func/pi-tests/testpi-7.c
> @@ -25,7 +25,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * Darren Hart <dv...@us...>
> @@ -42,7 +41,6 @@
> #include <stdlib.h>
> #include <math.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
>
> #define HIGH_PRIO 15
> #define MED_PRIO 10
> @@ -74,14 +72,12 @@ static volatile phase_t phase_flag = END
> static pthread_mutex_t flag_mutex;
>
> int med_threads = 0;
> -static int run_jvmsim=0;
> long iterations = ITERATIONS;
>
> void usage(void)
> {
> rt_help();
> printf("testpi-7 specific options:\n");
> - printf(" -j enable jvmsim\n");
> printf(" -i# #: number of iterations\n");
> printf(" -f #: Use flag mutex\n");
> printf(" -m# #:number of mid priority threads\n");
> @@ -91,9 +87,6 @@ int parse_args(int c, char *v)
> {
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim=1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -253,14 +246,7 @@ int main(int argc, char *argv[])
> int i,numcpus;
> setup();
>
> - rt_init("jhfi:m:", parse_args, argc, argv);
> -
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> + rt_init("hfi:m:", parse_args, argc, argv);
>
> if (!med_threads) {
> printf("This test requires that at least NRCPUS medium priority threads run\n");
> Index: ltp/testcases/realtime/func/pi-tests/sbrk_mutex.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/pi-tests/sbrk_mutex.c
> +++ ltp/testcases/realtime/func/pi-tests/sbrk_mutex.c
> @@ -25,7 +25,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * Darren Hart <dv...@us...>
> @@ -45,7 +44,6 @@
> #include <errno.h>
> #include <unistd.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
>
> #define NUM_MUTEXES 5000
> #define NUM_THREADS 50
> @@ -54,13 +52,11 @@
>
> static pthread_mutex_t *mutexes[NUM_MUTEXES];
>
> -static int run_jvmsim=0;
>
> void usage(void)
> {
> rt_help();
> printf("sbrk_mutex specific options:\n");
> - printf(" -j enable jvmsim\n");
> }
>
> int parse_args(int c, char *v)
> @@ -68,9 +64,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -110,14 +103,7 @@ int main(int argc, char* argv[])
> pthread_mutexattr_t mutexattr;
> setup();
>
> - rt_init("jh",parse_args,argc,argv);
> -
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> + rt_init("h",parse_args,argc,argv);
>
> if (pthread_mutexattr_init(&mutexattr) != 0) {
> printf("Failed to init mutexattr\n");
> Index: ltp/testcases/realtime/func/pi-tests/test-skeleton.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/pi-tests/test-skeleton.c
> +++ ltp/testcases/realtime/func/pi-tests/test-skeleton.c
> @@ -25,7 +25,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> *
> @@ -43,15 +42,12 @@
> #include <sys/wait.h>
> #include <time.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
>
> -static int run_jvmsim=0;
>
> void usage(void)
> {
> rt_help();
> printf("testpi-5 and 6 specific options:\n");
> - printf(" -j enable jvmsim\n");
> }
>
> int parse_args(int c, char *v)
> @@ -59,9 +55,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -106,15 +99,8 @@ int main(int argc, char **argv)
> int status;
> setup();
>
> - rt_init("jh",parse_args,argc,argv);
> + rt_init("h",parse_args,argc,argv);
>
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> -
> pid = fork();
> if ( 0 == pid) {
> //This is the child
> Index: ltp/testcases/realtime/func/prio-preempt/prio-preempt.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/prio-preempt/prio-preempt.c
> +++ ltp/testcases/realtime/func/prio-preempt/prio-preempt.c
> @@ -49,7 +49,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * Dinakar Guniguntala <di...@us...>
> @@ -85,7 +84,6 @@ static pthread_cond_t cond[NUM_WORKERS+1
> static int t_after_wait[NUM_WORKERS];
>
> static int ret = 0;
> -static int run_jvmsim=0;
>
> pthread_barrier_t barrier;
>
> @@ -93,7 +91,6 @@ void usage(void)
> {
> rt_help();
> printf("prio-preempt specific options:\n");
> - printf(" -j # :enable jvmsim\n");
> printf(" -i #: enable interrupter threads\n");
> printf(" -n# #: number of busy threads\n");
> }
> @@ -103,9 +100,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -294,7 +288,7 @@ int main(int argc, char* argv[])
> setup();
>
> pass_criteria = CHECK_LIMIT;
> - rt_init("jhin:", parse_args, argc, argv);
> + rt_init("hin:", parse_args, argc, argv);
>
> numcpus = sysconf(_SC_NPROCESSORS_ONLN);
>
> Index: ltp/testcases/realtime/func/prio-wake/prio-wake.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/prio-wake/prio-wake.c
> +++ ltp/testcases/realtime/func/prio-wake/prio-wake.c
> @@ -54,8 +54,6 @@
> #include <errno.h>
> #include <sys/syscall.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
> -
> volatile int running_threads = 0;
> static int rt_threads = 0;
> static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
> @@ -63,13 +61,11 @@ static pthread_mutex_t mutex;
> static volatile nsec_t beginrun;
>
> static int ret = 0;
> -static int run_jvmsim=0;
>
> void usage(void)
> {
> rt_help();
> printf("prio-wake specific options:\n");
> - printf(" -j #: enable jvmsim\n");
> printf(" -n# #: number of worker threads\n");
> }
>
> @@ -78,9 +74,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -168,14 +161,7 @@ int main(int argc, char* argv[])
> int i;
> setup();
>
> - rt_init("jhn:", parse_args, argc, argv);
> -
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> + rt_init("hn:", parse_args, argc, argv);
>
> if (rt_threads == 0) {
> numcpus = sysconf(_SC_NPROCESSORS_ONLN);
> Index: ltp/testcases/realtime/func/pthread_kill_latency/pthread_kill_latency.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/pthread_kill_latency/pthread_kill_latency.c
> +++ ltp/testcases/realtime/func/pthread_kill_latency/pthread_kill_latency.c
> @@ -51,7 +51,6 @@
> #include <signal.h>
> #include <errno.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
> #include <libstats.h>
>
> #define PRIO 89
> @@ -69,13 +68,11 @@ int fail;
>
> atomic_t flag;
>
> -static int run_jvmsim=0;
>
> void usage(void)
> {
> rt_help();
> printf("pthread_kill_latency specific options:\n");
> - printf(" -j enable jvmsim\n");
> printf(" -l threshold trace latency with given threshold in us\n");
> }
>
> @@ -84,9 +81,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'l':
> latency_threshold = strtoull(v, NULL, 0);
> break;
> @@ -281,7 +275,7 @@ int main(int argc, char *argv[])
> setup();
>
> pass_criteria = THRESHOLD;
> - rt_init("jl:h", parse_args, argc, argv); /* we need the buffered print system */
> + rt_init("l:h", parse_args, argc, argv); /* we need the buffered print system */
>
> printf("-------------------------------\n");
> printf("pthread_kill Latency\n");
> @@ -289,13 +283,6 @@ int main(int argc, char *argv[])
>
> printf("Iterations: %d\n", ITERATIONS);
>
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> -
> debug(DBG_DEBUG, "Main creating threads\n");
> fflush(stdout);
>
> Index: ltp/testcases/realtime/func/sched_football/sched_football.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/sched_football/sched_football.c
> +++ ltp/testcases/realtime/func/sched_football/sched_football.c
> @@ -41,7 +41,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * John Stultz <johnstul@xxxxxxxxx >
> @@ -66,7 +65,6 @@
> #include <unistd.h>
> #include <sys/time.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
>
> #define DEF_GAME_LENGTH 5
>
> @@ -76,7 +74,6 @@ volatile int the_ball;
> /* pthread_barrier for synchronization */
> pthread_barrier_t barrier;
>
> -static int run_jvmsim=0;
> static int players_per_team = 0;
> static int game_length = DEF_GAME_LENGTH;
>
> @@ -84,7 +81,6 @@ void usage(void)
> {
> rt_help();
> printf("sched_football specific options:\n");
> - printf(" -j enable jvmsim\n");
> printf(" -nPLAYERS players per team (defaults to num_cpus)\n");
> printf(" -lGAME_LENGTH game length in seconds (defaults to %d s)\n",
> DEF_GAME_LENGTH);
> @@ -95,9 +91,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -171,18 +164,11 @@ int main(int argc, char* argv[])
> int i;
> setup();
>
> - rt_init("n:l:jh",parse_args,argc,argv);
> + rt_init("n:l:h",parse_args,argc,argv);
>
> if (players_per_team == 0)
> players_per_team = sysconf(_SC_NPROCESSORS_ONLN);
>
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> -
> if ((i = pthread_barrier_init(&barrier, NULL, players_per_team*2 + 1))) {
> printf("pthread_barrier_init failed: %s\n", strerror(i));
> exit(i);
> Index: ltp/testcases/realtime/func/sched_jitter/sched_jitter.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/sched_jitter/sched_jitter.c
> +++ ltp/testcases/realtime/func/sched_jitter/sched_jitter.c
> @@ -31,7 +31,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * John Stultz <joh...@us...>
> @@ -49,7 +48,6 @@
> #include <unistd.h>
> #include <libstats.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
>
> #define NUMRUNS 1000
> #define NUMLOOPS 1000000
> @@ -61,13 +59,11 @@ int array[WORKLEN];
>
> volatile int flag; /*let interrupter know we're done */
>
> -static int run_jvmsim=0;
>
> void usage(void)
> {
> rt_help();
> printf("sched_jitter specific options:\n");
> - printf(" -j enable jvmsim\n");
> }
>
> int parse_args(int c, char *v)
> @@ -75,9 +71,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -176,14 +169,7 @@ int main(int argc, char *argv[])
>
> setup();
>
> - rt_init("jh",parse_args,argc,argv);
> -
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> + rt_init("h",parse_args,argc,argv);
>
> interrupter = create_fifo_thread(thread_interrupter, NULL, 80);
> sleep(1);
> Index: ltp/testcases/realtime/func/sched_latency/sched_latency.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/sched_latency/sched_latency.c
> +++ ltp/testcases/realtime/func/sched_latency/sched_latency.c
> @@ -34,7 +34,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * Darren Hart <dv...@us...>
> @@ -51,7 +50,6 @@
> #include <math.h>
> #include <librttest.h>
> #include <libstats.h>
> -#include <libjvmsim.h>
>
> #define PRIO 89
> //#define PERIOD 17*NS_PER_MS
> @@ -66,7 +64,6 @@
>
> nsec_t start;
> nsec_t end;
> -static int run_jvmsim = 0;
> static int ret = 0;
> static int iterations = 0;
> static unsigned long long latency_threshold = 0;
> @@ -81,7 +78,6 @@ void usage(void)
> {
> rt_help();
> printf("sched_latency specific options:\n");
> - printf(" -j enable jvmsim\n");
> printf(" -dLOAD periodic load in ms (default 1)\n");
> printf(" -lTHRESHOLD trace latency, with given threshold in us\n");
> printf(" -tPERIOD period in ms (default 5)\n");
> @@ -94,9 +90,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -235,7 +228,7 @@ int main(int argc, char *argv[])
> setup();
>
> pass_criteria = PASS_US;
> - rt_init("d:jl:ht:i:", parse_args, argc, argv);
> + rt_init("d:l:ht:i:", parse_args, argc, argv);
>
> printf("-------------------------------\n");
> printf("Scheduling Latency\n");
> @@ -260,13 +253,6 @@ int main(int argc, char *argv[])
> printf("Expected running time: %d s\n",
> (int)(iterations*((float)period / NS_PER_SEC)));
>
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> -
> if (stats_container_init(&dat, iterations))
> exit(1);
>
> Index: ltp/testcases/realtime/func/thread_clock/tc-2.c
> ===================================================================
> --- ltp.orig/testcases/realtime/func/thread_clock/tc-2.c
> +++ ltp/testcases/realtime/func/thread_clock/tc-2.c
> @@ -31,7 +31,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * Sripathi Kodi <sri...@in...>
> @@ -48,7 +47,6 @@
> #include <stdlib.h>
> #include <unistd.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
>
> #define NS_PER_SEC 1000000000
> #define THRESHOLD 0.5 /* 500 milliseconds */
> @@ -57,22 +55,17 @@
>
> struct timespec sleepts[NUMSLEEP];
> struct timespec workts[NUMWORK];
> -static int run_jvmsim=0;
>
> void usage(void)
> {
> rt_help();
> printf("thread_clock specific options:\n");
> - printf(" -j enable jvmsim\n");
> }
>
> int parse_args(int c, char *v)
> {
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -184,14 +177,7 @@ int main(int argc,char* argv[])
> setup();
>
> pass_criteria = THRESHOLD;
> - rt_init("jht:",parse_args,argc,argv);
> -
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> + rt_init("ht:",parse_args,argc,argv);
>
> /* Start sleeper threads */
> for (i=0; i<NUMSLEEP; i++) {
> Index: ltp/testcases/realtime/perf/latency/pthread_cond_latency.c
> ===================================================================
> --- ltp.orig/testcases/realtime/perf/latency/pthread_cond_latency.c
> +++ ltp/testcases/realtime/perf/latency/pthread_cond_latency.c
> @@ -24,7 +24,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * Paul E. McKenney <pa...@us...>
> @@ -43,19 +42,16 @@
> #include <unistd.h>
> #include <stdlib.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
>
> pthread_mutex_t child_mutex = PTHREAD_MUTEX_INITIALIZER;
> volatile int child_waiting = 0;
> double endtime;
>
> -static int run_jvmsim=0;
>
> void usage(void)
> {
> rt_help();
> printf("testpi-1 specific options:\n");
> - printf(" -j enable jvmsim\n");
> }
>
> int parse_args(int c, char *v)
> @@ -63,9 +59,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -206,14 +199,7 @@ main(int argc, char *argv[])
> long iter;
> setup();
>
> - rt_init("jh", parse_args, argc, argv);
> -
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> + rt_init("h", parse_args, argc, argv);
>
> sp.sched_priority = sched_get_priority_max(SCHED_FIFO);
> if (sp.sched_priority == -1) {
> Index: ltp/testcases/realtime/stress/pi-tests/lookup_pi_state.c
> ===================================================================
> --- ltp.orig/testcases/realtime/stress/pi-tests/lookup_pi_state.c
> +++ ltp/testcases/realtime/stress/pi-tests/lookup_pi_state.c
> @@ -24,7 +24,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> * Darren Hart <dv...@us...>
> @@ -36,12 +35,10 @@
>
> #include <stdio.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
>
> #define NUM_SLAVES 20
> #define SLAVE_PRIO 89
>
> -int enable_jvmsim = 0;
>
> pthread_mutex_t MM;
> pthread_mutex_t MS;
> @@ -54,13 +51,11 @@ atomic_t slave_order_a = {0};
> atomic_t slave_order_b = {0};
> atomic_t slave_order_c = {0};
>
> -static int run_jvmsim=0;
>
> void usage(void)
> {
> rt_help();
> printf("lookup_pi_state specific options:\n");
> - printf(" -j enable jvmsim\n");
> }
>
> int parse_args(int c, char *v)
> @@ -68,9 +63,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -180,15 +172,7 @@ int main(int argc, char *argv[])
> pthread_cond_init(&CS, NULL);
> pthread_cond_init(&CT, NULL);
>
> - rt_init("jh", parse_args, argc, argv);
> -
> - // -j to enable jvmsim
> - if (run_jvmsim) {
> - printf("jvmsim Enabled\n");
> - jvmsim_init();
> - } else {
> - printf("jvmsim disabled \n");
> - }
> + rt_init("h", parse_args, argc, argv);
>
> create_other_thread(master_thread, (void *)0);
>
> Index: ltp/testcases/realtime/stress/pi-tests/testpi-3.c
> ===================================================================
> --- ltp.orig/testcases/realtime/stress/pi-tests/testpi-3.c
> +++ ltp/testcases/realtime/stress/pi-tests/testpi-3.c
> @@ -24,7 +24,6 @@
> *
> * USAGE:
> * Use run_auto.sh script in current directory to build and run test.
> - * Use "-j" to enable jvm simulator.
> *
> * AUTHOR
> *
> @@ -43,15 +42,11 @@
> #include <sys/syscall.h>
> #include <unistd.h>
> #include <librttest.h>
> -#include <libjvmsim.h>
> -
> -static int run_jvmsim=0;
>
> void usage(void)
> {
> rt_help();
> printf("testpi-3 specific options:\n");
> - printf(" -j enable jvmsim\n");
> }
>
> int parse_args(int c, char *v)
> @@ -59,9 +54,6 @@ int parse_args(int c, char *v)
>
> int handled = 1;
> switch (c) {
> - case 'j':
> - run_jvmsim = 1;
> - break;
> case 'h':
> usage();
> exit(0);
> @@ -322,14 +314,7 @@ int main(int argc, char* argv[]) {
> CPU_SET(0, &mask);
> setup();
>
> - rt_init("jh",parse_args,argc,argv);
> -
> - if (run_jvmsim) {
> - printf("jvmsim enabled\n");
> - jvmsim_init(); // Start the JVM simulation
> - } else {
> - printf("jvmsim disabled\n");
> - }
> + rt_init("h",parse_args,argc,argv);
>
> retc = sched_setaffinity(0, sizeof(mask), &mask);
> if (retc < 0) {
>
|
