From: Wanlong G. <gao...@cn...> - 2012-01-27 05:31:37
|
cleanup the coding style Signed-off-by: Wanlong Gao <gao...@cn...> --- testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c | 132 +++++++++---------- 1 files changed, 63 insertions(+), 69 deletions(-) diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c index 45cddf7..393e32c 100644 --- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c +++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c @@ -20,32 +20,23 @@ /* * Test Name: hugemmap02 * - * Test Description: There is both a low hugepage region (at 2-3G for use by 32-bit - * processes) and a high hugepage region (at 1-1.5T). The high region is always - * exclusively for hugepages, but the low region has to be activated before it can - * be used for hugepages. When the kernel attempts to do a hugepage mapping in a - * 32-bit process it will automatically attempt to open the low region. However, - * that will fail if there are any normal (non-hugepage) mappings in the region - * already. - * When run as a 64-bit process the kernel will still do a non-hugepage mapping + * Test Description: There is both a low hugepage region (at 2-3G for use by + * 32-bit processes) and a high hugepage region (at 1-1.5T). The high region + * is always exclusively for hugepages, but the low region has to be activated + * before it can be used for hugepages. When the kernel attempts to do a + * hugepage mapping in a 32-bit process it will automatically attempt to open + * the low region. However, that will fail if there are any normal + * (non-hugepage) mappings in the region already. + * + * When run as a 64-bit process the kernel will still do a non-hugepage mapping * in the low region, but the following hugepage mapping will succeed. This is - * because it comes from the high region, which is available to the 64-bit process. - * This test case is checking this behavior. + * because it comes from the high region, which is available to the 64-bit + * process. * - * Usage: <for command-line> - * hugemmap02 [-c n] [-f] [-i n] [-I x] [-P x] [-t] - * where, -c n : Run n copies concurrently. - * -f : Turn off functionality Testing. - * -i n : Execute test n times. - * -I x : Execute test for x seconds. - * -P x : Pause for x seconds between iterations. - * -t : Turn on syscall timing. + * This test case is checking this behavior. * * HISTORY - * 04/2004 Written by Robbie Williamson - * - * RESTRICTIONS: - * None. + * 04/2004 Written by Robbie Williamson */ #include <stdio.h> @@ -79,12 +70,12 @@ int fildes; /* file descriptor for tempfile */ int nfildes; /* file descriptor for /dev/zero */ char *Hopt; /* location of hugetlbfs */ -void setup(); /* Main setup function of test */ -void cleanup(); /* cleanup function for the test */ +static void setup(); +static void cleanup(); void help() { - printf(" -H /.. Location of hugetlbfs, i.e. -H /var/hugetlbfs \n"); + printf(" -H /.. Location of hugetlbfs, i.e. -H /var/hugetlbfs\n"); } int @@ -92,21 +83,24 @@ main(int ac, char **av) { int lc; char *msg; - int Hflag = 0; + int Hflag = 0; int page_sz, map_sz; - option_t options[] = { - { "H:", &Hflag, &Hopt }, /* Required for location of hugetlbfs */ - { NULL, NULL, NULL } /* NULL required to end array */ - }; + option_t options[] = { + /* Required for location of hugetlbfs */ + { "H:", &Hflag, &Hopt }, + /* NULL required to end array */ + { NULL, NULL, NULL } + }; - /* Parse standard options given to run the test. */ - if ((msg = parse_opts(ac, av, options, &help)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s, use -help", msg); + msg = parse_opts(ac, av, options, &help); + if (msg != NULL) + tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s," + " use -help", msg); if (Hflag == 0) { - tst_brkm(TBROK, NULL, - "-H option is REQUIRED for this test, use -h for options help"); + tst_brkm(TBROK, NULL, "-H option is REQUIRED for this test," + " use -h for options help"); } page_sz = getpagesize(); @@ -115,14 +109,15 @@ main(int ac, char **av) setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { - - /* Creat a temporary file used for huge mapping */ - if ((fildes = open(TEMPFILE, O_RDWR|O_CREAT, 0666)) < 0) { + /* Creat a temporary file used for huge mapping */ + fildes = open(TEMPFILE, O_RDWR|O_CREAT, 0666); + if (fildes < 0) { tst_brkm(TBROK|TERRNO, cleanup, "opening %s failed", TEMPFILE); } - /* Creat a file used for normal mapping */ - if ((nfildes = open("/dev/zero", O_RDONLY, 0666)) < 0) { + /* Creat a file used for normal mapping */ + nfildes = open("/dev/zero", O_RDONLY, 0666); + if (nfildes < 0) { tst_brkm(TBROK|TERRNO, cleanup, "opening /dev/zero failed"); } @@ -132,18 +127,18 @@ main(int ac, char **av) /* * Call mmap on /dev/zero 5 times */ - for (i = 0; i < 5; i++) { - addr = mmap(0, 256*1024*1024, PROT_READ, - MAP_SHARED, nfildes, 0); - addrlist[i] = addr; - } + for (i = 0; i < 5; i++) { + addr = mmap(0, 256*1024*1024, PROT_READ, + MAP_SHARED, nfildes, 0); + addrlist[i] = addr; + } /* mmap using normal pages and a low memory address */ errno = 0; addr = mmap(LOW_ADDR, page_sz, PROT_READ, MAP_SHARED | MAP_FIXED, nfildes, 0); if (addr == MAP_FAILED) - tst_brkm(TBROK, cleanup,"mmap failed on nfildes"); + tst_brkm(TBROK, cleanup, "mmap failed on nfildes"); /* Attempt to mmap a huge page into a low memory address */ errno = 0; @@ -161,31 +156,29 @@ main(int ac, char **av) } #else /* 32-bit process */ if (addr2 == MAP_FAILED) - tst_resm(TFAIL|TERRNO, - "huge mmap failed unexpectedly with %s (32-bit)", - TEMPFILE); + tst_resm(TFAIL|TERRNO, "huge mmap failed unexpectedly" + " with %s (32-bit)", TEMPFILE); else if (addr2 > 0) { - tst_resm(TCONF, "huge mmap failed to test the scenario"); - continue; - } else if (addr == 0) - tst_resm(TPASS, "huge mmap succeeded (32-bit)"); + tst_resm(TCONF, + "huge mmap failed to test the scenario"); + continue; + } else if (addr == 0) + tst_resm(TPASS, "huge mmap succeeded (32-bit)"); #endif /* Clean up things in case we are looping */ for (i = 0; i < 5; i++) { - if (munmap(addrlist[i], 256*1024*1024) == -1) - tst_resm(TBROK|TERRNO, - "munmap of addrlist[%d] failed", i); - } + if (munmap(addrlist[i], 256*1024*1024) == -1) + tst_resm(TBROK|TERRNO, + "munmap of addrlist[%d] failed", i); + } #if __WORDSIZE == 64 - if (munmap(addr2, map_sz) == -1) { + if (munmap(addr2, map_sz) == -1) tst_brkm(TFAIL|TERRNO, NULL, "huge munmap failed"); - } #endif - if (munmap(addr, page_sz) == -1) { + if (munmap(addr, page_sz) == -1) tst_brkm(TFAIL|TERRNO, NULL, "munmap failed"); - } close(fildes); } @@ -198,12 +191,13 @@ main(int ac, char **av) /* * setup() - performs all ONE TIME setup for this test. * - * Get system page size, allocate and initialize the string dummy. - * Initialize addr such that it is more than one page below the break - * address of the process, and initialize one page region from addr - * with char 'A'. - * Creat a temporary directory and a file under it. - * Write some known data into file and get the size of the file. + * Get system page size, allocate and initialize the string dummy. + * Initialize addr such that it is more than one page below the break + * address of the process, and initialize one page region from addr + * with char 'A'. + * + * Creat a temporary directory and a file under it. + * Write some known data into file and get the size of the file. */ void setup() @@ -219,8 +213,8 @@ setup() /* * cleanup() - performs all ONE TIME cleanup for this test at - * completion or premature exit. - * Remove the temporary directory created. + * completion or premature exit. + * Remove the temporary directory created. */ void cleanup() -- 1.7.9.rc2 |