From: Subrata <sub...@us...> - 2008-10-30 03:51:13
|
Update of /cvsroot/ltp/ltp/testcases/kernel/mem/mtest06 In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16482/ltp/testcases/kernel/mem/mtest06 Modified Files: mmap2.c mmap3.c Log Message: The following patch Integrates the remaining MTEST06 into runltp. Signed-Off-By: Subrata Modak <su...@li...>. Index: mmap3.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/mem/mtest06/mmap3.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mmap3.c 16 Jul 2007 04:38:20 -0000 1.9 --- mmap3.c 30 Oct 2008 03:51:06 -0000 1.10 *************** *** 184,188 **** /******************************************************************************/ static void ! set_timer(int run_time) /* period for which test is intended to run */{ struct itimerval timer; /* timer structure, tv_sec is set to run_time */ memset(&timer, 0, sizeof(struct itimerval)); --- 184,188 ---- /******************************************************************************/ static void ! set_timer(float run_time) /* period for which test is intended to run */{ struct itimerval timer; /* timer structure, tv_sec is set to run_time */ memset(&timer, 0, sizeof(struct itimerval)); *************** *** 309,313 **** int num_thrd; /* number of threads to create */ int thrd_ndx; /* index into the array of threads. */ ! int exec_time; /* period for which the test is executed */ int status; /* exit status for light weight process */ int sig_ndx; /* index into signal handler structure. */ --- 309,313 ---- int num_thrd; /* number of threads to create */ int thrd_ndx; /* index into the array of threads. */ ! float exec_time; /* period for which the test is executed */ int status; /* exit status for light weight process */ int sig_ndx; /* index into signal handler structure. */ *************** *** 359,363 **** break; case 'x': ! if ((exec_time = atoi(optarg)) == 0) exec_time = 24; break; --- 359,363 ---- break; case 'x': ! if ((exec_time = atof(optarg)) == 0) exec_time = 24; break; *************** *** 389,393 **** fprintf(stdout, "\n\n\nTest is set to run with the following parameters:\n" ! "\tDuration of test: [%d]hrs\n" "\tNumber of threads created: [%d]\n" "\tnumber of map-write-unmaps: [%d]\n" --- 389,393 ---- fprintf(stdout, "\n\n\nTest is set to run with the following parameters:\n" ! "\tDuration of test: [%f]hrs\n" "\tNumber of threads created: [%d]\n" "\tnumber of map-write-unmaps: [%d]\n" Index: mmap2.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/mem/mtest06/mmap2.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mmap2.c 16 Jul 2007 04:38:20 -0000 1.7 --- mmap2.c 30 Oct 2008 03:51:06 -0000 1.8 *************** *** 186,190 **** /******************************************************************************/ static void ! set_timer(int run_time) /* period for which test is intended to run */{ struct itimerval timer; /* timer structure, tv_sec is set to run_time */ memset(&timer, 0, sizeof(struct itimerval)); --- 186,190 ---- /******************************************************************************/ static void ! set_timer(float run_time) /* period for which test is intended to run */{ struct itimerval timer; /* timer structure, tv_sec is set to run_time */ memset(&timer, 0, sizeof(struct itimerval)); *************** *** 241,254 **** char **argv) /* pointer to the command line arguments. */ { ! int fd; /* descriptor of temp file. */ ! int fsize = 1; /* size of the temp file created. default 1GB */ ! int exec_time = 24; /* period of execution, default 24 hours. */ ! int c; /* command line options */ ! int sig_ndx; /* index into signal handler structure. */ ! int map_flags = /* type of mapping, defaut is MAP_SHARED . */ MAP_SHARED; ! int map_anon = FALSE; /* do not map anonymous memory,map file by default*/ ! int run_once = TRUE; /* run the test once. (dont repeat) */ ! char *memptr; /* address of the mapped file. */ extern char *optarg; /* arguments passed to each option */ struct sigaction sigptr;/* set up signal, for interval timer */ --- 241,254 ---- char **argv) /* pointer to the command line arguments. */ { ! int fd; /* descriptor of temp file. */ ! int fsize = 1; /* size of the temp file created. default 1GB */ ! float exec_time = 24; /* period of execution, default 24 hours. */ ! int c; /* command line options */ ! int sig_ndx; /* index into signal handler structure. */ ! int map_flags = /* type of mapping, defaut is MAP_SHARED . */ MAP_SHARED; ! int map_anon = FALSE; /* do not map anonymous memory,map file by default*/ ! int run_once = TRUE; /* run the test once. (dont repeat) */ ! char *memptr; /* address of the mapped file. */ extern char *optarg; /* arguments passed to each option */ struct sigaction sigptr;/* set up signal, for interval timer */ *************** *** 288,297 **** case 's': if ((fsize = atoi(optarg)) == 0) ! fprintf(stderr, "Using default fsize %dGB\n", fsize = 1); break; case 'x': ! if ((exec_time = atoi(optarg)) == 0) ! fprintf(stderr, "Using default exec time %d hrs", ! exec_time = 24); run_once = FALSE; break; --- 288,297 ---- case 's': if ((fsize = atoi(optarg)) == 0) ! fprintf(stderr, "Using default fsize %d GB\n", fsize = 1); break; case 'x': ! if ((exec_time = atof(optarg)) == 0) ! fprintf(stderr, "Using default exec time %f hrs", ! exec_time = (float)24); run_once = FALSE; break; *************** *** 303,307 **** fprintf(stdout, "MM Stress test, map/write/unmap large file\n" ! "\tTest scheduled to run for: %d\n" "\tSize of temp file in GB: %d\n", exec_time, fsize); --- 303,307 ---- fprintf(stdout, "MM Stress test, map/write/unmap large file\n" ! "\tTest scheduled to run for: %f\n" "\tSize of temp file in GB: %d\n", exec_time, fsize); |