[Ltp-cvs] ltp/testcases/kernel/mem/mtest05 Makefile, 1.6, 1.7 mmstress.c, 1.24, 1.25

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/ltp/ltp/testcases/kernel/mem/mtest05
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6167

Modified Files:
	Makefile mmstress.c 
Log Message:
Randy Dunlap writes: Convert mmstress to use the standard results format

Index: Makefile
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/mem/mtest05/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile	14 Apr 2003 18:29:13 -0000	1.6
--- Makefile	21 Jul 2007 20:53:44 -0000	1.7
***************
*** 1,4 ****
! CFLAGS += -Wall -O -g
! LDLIBS := -lpthread

  SRCS=$(wildcard *.c)
--- 1,5 ----
! CFLAGS += -Wall
! CPPFLAGS += -I../../../../include
! LDLIBS += -lpthread -L../../../../lib -lltp

  SRCS=$(wildcard *.c)

Index: mmstress.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/mem/mtest05/mmstress.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** mmstress.c	22 Jun 2007 11:58:01 -0000	1.24
--- mmstress.c	21 Jul 2007 20:53:44 -0000	1.25
***************
*** 99,102 ****
--- 99,105 ----
  #include <string.h>   /* declaration for memset                               */
  #include <sched.h>    /* declaration of sched_yield()                         */
+ #include <stdint.h>
+ 
+ #include "test.h"

  /* GLOBAL DEFINES                                                             */
***************
*** 143,146 ****
--- 146,151 ----
  static   int  verbose_print = FALSE; /* print more test information           */

+ char *TCID = "mmstress";
+ int TST_TOTAL = 6;

  /******************************************************************************/
***************
*** 170,174 ****
      }
      else
!         fprintf(stdout, "Test ended, success\n");
      exit(0);
  }
--- 175,179 ----
      }
      else
! 	tst_resm(TPASS, "Test ended, success");
      exit(0);
  }
***************
*** 193,198 ****
      fprintf(stderr, "usage:%s -h -n test -t time -v [-V]\n", progname);
      fprintf(stderr, "\t-h displays all options\n");
!     fprintf(stderr, "\t-n the test number, if no test number\n"
!             "\t   is specified all the tests will be run\n");
      fprintf(stderr, "\t-t specify the time in hours\n");
      fprintf(stderr, "\t-v verbose output\n");
--- 198,203 ----
      fprintf(stderr, "usage:%s -h -n test -t time -v [-V]\n", progname);
      fprintf(stderr, "\t-h displays all options\n");
!     fprintf(stderr, "\t-n test number, if no test number\n"
!             "\t   is specified, all the tests will be run\n");
      fprintf(stderr, "\t-t specify the time in hours\n");
      fprintf(stderr, "\t-v verbose output\n");
***************
*** 265,269 ****
      char    read_from_addr = 0;  /* address to which read from page is done   */
      char    write_to_addr[] = {'a'}; /* character to be writen to the page    */
!     volatile int exit_val = 0;   /* exit value of the pthread. 0 - success    */

      /*************************************************************/
--- 270,274 ----
      char    read_from_addr = 0;  /* address to which read from page is done   */
      char    write_to_addr[] = {'a'}; /* character to be writen to the page    */
!     uintptr_t exit_val = 0;   /* exit value of the pthread. 0 - success    */

      /*************************************************************/
***************
*** 288,293 ****
          start_addr += local_args[PAGESIZ]; 
          if (verbose_print)
!             fprintf(stdout, "thread_fault(): generating fault type %ld" 
!                             " @page adress %p\n", local_args[3], start_addr);
          fflush(NULL);
      }
--- 293,298 ----
          start_addr += local_args[PAGESIZ]; 
          if (verbose_print)
! 	    tst_resm(TINFO, "thread_fault(): generating fault type %ld"
!                             " @page address %p", local_args[3], start_addr);
          fflush(NULL);
      }
***************
*** 329,333 ****
      {
          if (verbose_print)
!             fprintf(stdout, "file %s removed\n", filename);

      }      
--- 334,338 ----
      {
          if (verbose_print)
!             tst_resm(TINFO, "file %s removed", filename);

      }      
***************
*** 431,436 ****
              retinfo->mapaddr = map_addr;
              if (verbose_print)
!                 fprintf(stdout, 
!                 "map_and_thread(): mmap success, address = %p\n", map_addr);
              fflush(NULL);
          }
--- 436,441 ----
              retinfo->mapaddr = map_addr;
              if (verbose_print)
!                 tst_resm(TINFO,
!                   "map_and_thread(): mmap success, address = %p", map_addr);
              fflush(NULL);
          }
***************
*** 485,489 ****

      if (verbose_print)
!         fprintf(stdout, "map_and_thread(): pthread_create() success\n");
      wait_thread = FALSE; 
      th_status = malloc(sizeof(int *));
--- 490,494 ----

      if (verbose_print)
!         tst_resm(TINFO, "map_and_thread(): pthread_create() success");
      wait_thread = FALSE; 
      th_status = malloc(sizeof(int *));
***************
*** 508,513 ****
              if ((int)*th_status == 1)
              {
!                 fprintf(stderr,
!                         "thread [%ld] - process exited with errors\n",
                  (long)pthread_ids[thrd_ndx]);
                  free(empty_buf);                          
--- 513,518 ----
              if ((int)*th_status == 1)
              {
!                 tst_resm(TINFO,
!                         "thread [%ld] - process exited with errors",
                  (long)pthread_ids[thrd_ndx]);
                  free(empty_buf);                          
***************
*** 564,569 ****
      RETINFO_t retval;    /* contains info relating to test status          */

!     printf("\ttest1: Test case tests the race condition between\n"
!            "\t\tsimultaneous read faults in the same address space.\n");
      map_and_thread("./tmp.file.1", thread_fault, READ_FAULT, NUMTHREAD, 
                     &retval);
--- 569,574 ----
      RETINFO_t retval;    /* contains info relating to test status          */

!     tst_resm(TINFO, "test1: Test case tests the race condition between "
!            "simultaneous read faults in the same address space.");
      map_and_thread("./tmp.file.1", thread_fault, READ_FAULT, NUMTHREAD, 
                     &retval);
***************
*** 593,598 ****
      RETINFO_t retval;    /* contains test stats information               */

!     printf("\ttest2: Test case tests the race condition between\n"
!        "\t\tsimultaneous write faults in the same address space.\n");
      map_and_thread("./tmp.file.2", thread_fault, WRITE_FAULT, NUMTHREAD, 
                     &retval);
--- 598,603 ----
      RETINFO_t retval;    /* contains test stats information               */

!     tst_resm(TINFO, "test2: Test case tests the race condition between "
!        "simultaneous write faults in the same address space.");
      map_and_thread("./tmp.file.2", thread_fault, WRITE_FAULT, NUMTHREAD, 
                     &retval);
***************
*** 622,627 ****
      RETINFO_t retval;    /* contains test stats information                   */

!     printf("\ttest3: Test case tests the race condition between\n"
!            "\t\tsimultaneous COW faults in the same address space.\n");
      map_and_thread("./tmp.file.3", thread_fault, COW_FAULT, NUMTHREAD, &retval);
      return (retval.status);
--- 627,632 ----
      RETINFO_t retval;    /* contains test stats information                   */

!     tst_resm(TINFO, "test3: Test case tests the race condition between "
!            "simultaneous COW faults in the same address space.");
      map_and_thread("./tmp.file.3", thread_fault, COW_FAULT, NUMTHREAD, &retval);
      return (retval.status);
***************
*** 650,656 ****
      RETINFO_t retval;     /* contains test status information                 */

!     printf("\ttest4: Test case tests the race condition between\n"
!            "\t\tsimultaneous READ faults in the same address space.\n"
!            "\t\tThe file mapped is /dev/zero\n");
      map_and_thread("/dev/zero", thread_fault, COW_FAULT, NUMTHREAD, &retval);
      return (retval.status);
--- 655,661 ----
      RETINFO_t retval;     /* contains test status information                 */

!     tst_resm(TINFO, "test4: Test case tests the race condition between "
!            "simultaneous READ faults in the same address space. "
!            "The file mapped is /dev/zero");
      map_and_thread("/dev/zero", thread_fault, COW_FAULT, NUMTHREAD, &retval);
      return (retval.status);
***************
*** 680,685 ****
      int    wait_status = 0; /* if status is not NULL store status information */

!     printf("\ttest5: Test case tests the race condition between\n"
!            "\t\tsimultaneous fork - exit faults in the same address space.\n");

      /* increment the  program's  data  space  by 200*1024 (BRKSZ) bytes       */
--- 685,690 ----
      int    wait_status = 0; /* if status is not NULL store status information */

!     tst_resm(TINFO, "test5: Test case tests the race condition between "
!            "simultaneous fork - exit faults in the same address space.");

      /* increment the  program's  data  space  by 200*1024 (BRKSZ) bytes       */
***************
*** 709,713 ****
      if (sbrk(-BRKSZ) == (caddr_t)-1)
      {
!         fprintf(stderr, "test5(): rollback sbrk failed\n");
          fflush(NULL);
          perror("test5(): sbrk()");
--- 714,718 ----
      if (sbrk(-BRKSZ) == (caddr_t)-1)
      {
!         tst_resm(TINFO, "test5(): rollback sbrk failed");
          fflush(NULL);
          perror("test5(): sbrk()");
***************
*** 745,751 ****
                            {"arg1", NULL};

!     printf("\ttest6: Test case tests the race condition between\n"
!            "\t\tsimultaneous fork -exec - exit faults in the same\n"
!            "\t\taddress space.\n");

      /* increment the  program's  data  space  by 200*1024 (BRKSZ) bytes       */
--- 750,755 ----
                            {"arg1", NULL};

!     tst_resm(TINFO, "test6: Test case tests the race condition between "
!            "simultaneous fork -exec - exit faults in the same address space.");

      /* increment the  program's  data  space  by 200*1024 (BRKSZ) bytes       */
***************
*** 798,802 ****
      if (sbrk(-BRKSZ) == (caddr_t)-1)
      {
!         fprintf(stderr, "test6(): rollback sbrk failed\n");
          fflush(NULL);
          perror("test6(): sbrk()");
--- 802,806 ----
      if (sbrk(-BRKSZ) == (caddr_t)-1)
      {
!         tst_resm(TINFO, "test6(): rollback sbrk failed");
          fflush(NULL);
          perror("test6(): sbrk()");
***************
*** 879,883 ****

      if (argc < 2)
!     fprintf(stderr, "\nINFO: run %s -h for all options\n\n", argv[0]);

      while ((ch = getopt(argc, argv, "hn:t:vV")) != -1)
--- 883,887 ----

      if (argc < 2)
!     tst_resm(TINFO, "run %s -h for all options", argv[0]);

      while ((ch = getopt(argc, argv, "hn:t:vV")) != -1)
***************
*** 894,899 ****
              case 't': if (optarg)
                        {
!                           printf("Test is scheduled to run for %d hours\n",
!                           test_time = atoi(optarg));
                            run_once = FALSE;
                        }
--- 898,903 ----
              case 't': if (optarg)
                        {
!                           tst_resm(TINFO, "Test is scheduled to run for %d hours",
! 				test_time = atoi(optarg));
                            run_once = FALSE;
                        }
***************
*** 906,911 ****
                        {
                            version_flag = TRUE;
!                           fprintf(stderr, "%s: %s\n", prog_name,
!                           version_info);
                        }
                        break;
--- 910,914 ----
                        {
                            version_flag = TRUE;
!                           tst_resm(TINFO, "%s: %s", prog_name, version_info);
                        }
                        break;
***************
*** 960,966 ****
                  rc = test_ptr[test_ndx]();
                  if (rc == SUCCESS) {
!                    printf("                TEST %d Passed\n", test_ndx);
                  } else {
!                    printf("                TEST %d Failed\n", test_ndx);
                     global_rc = rc;
                  }
--- 963,969 ----
                  rc = test_ptr[test_ndx]();
                  if (rc == SUCCESS) {
!                    tst_resm(TPASS, "TEST %d Passed", test_ndx);
                  } else {
!                    tst_resm(TFAIL, "TEST %d Failed", test_ndx);
                     global_rc = rc;
                  }
***************
*** 977,981 ****

          if (global_rc != SUCCESS) {
!             printf("mmstress:  Test Failed\n");
              exit(global_rc);
          }
--- 980,984 ----

          if (global_rc != SUCCESS) {
!             tst_resm(TFAIL, "Test Failed");
              exit(global_rc);
          }
***************
*** 984,990 ****

      if (global_rc != SUCCESS) {
!         printf("mmstress:  Test Failed\n");
      } else {
!         printf("mmstress:  Test Passed\n");
      }
      exit(global_rc);
--- 987,993 ----

      if (global_rc != SUCCESS) {
!         tst_resm(TFAIL, "Test Failed");
      } else {
!         tst_resm(TPASS, "Test Passed");
      }
      exit(global_rc);

[Ltp-cvs] ltp/testcases/kernel/mem/mtest05 Makefile, 1.6, 1.7 mmstress.c, 1.24, 1.25

Testsuite to validate the reliability, robustness, stability of Linux.

[Ltp-cvs] ltp/testcases/kernel/mem/mtest05 Makefile, 1.6, 1.7 mmstress.c, 1.24, 1.25