aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debug.c1
-rw-r--r--elflink.c9
-rw-r--r--hugetlbd.c2
-rw-r--r--hugeutils.c8
-rw-r--r--morecore.c4
-rw-r--r--tests/alloc-instantiate-race.c3
-rw-r--r--tests/chunk-overcommit.c1
-rw-r--r--tests/dummy.c1
-rw-r--r--tests/empty_mounts.c1
-rw-r--r--tests/find_path.c1
-rw-r--r--tests/gethugepagesize.c1
-rw-r--r--tests/huge_at_4GB_normal_below.c3
-rw-r--r--tests/huge_below_4GB_normal_above.c3
-rw-r--r--tests/icache-hygeine.c3
-rw-r--r--tests/malloc.c5
-rw-r--r--tests/malloc_manysmall.c1
-rw-r--r--tests/meminfo_nohuge.c1
-rw-r--r--tests/mlock.c2
-rw-r--r--tests/mmap-cow.c2
-rw-r--r--tests/mmap-gettest.c1
-rw-r--r--tests/mprotect.c4
-rw-r--r--tests/private.c1
-rw-r--r--tests/ptrace-write-hugepage.c4
-rw-r--r--tests/readback.c1
-rw-r--r--tests/shared.c1
-rw-r--r--tests/shm-fork.c9
-rw-r--r--tests/shm-gettest.c1
-rw-r--r--tests/slbpacaflush.c1
-rw-r--r--tests/straddle_4GB.c7
-rw-r--r--tests/test_root.c1
-rw-r--r--tests/testutils.c4
-rw-r--r--tests/truncate.c1
-rw-r--r--tests/unlinked_fd.c1
-rw-r--r--tests/zero_filesize_segment.ld1
34 files changed, 31 insertions, 59 deletions
diff --git a/debug.c b/debug.c
index 2d176f7..90fa5dc 100644
--- a/debug.c
+++ b/debug.c
@@ -47,4 +47,3 @@ static void __attribute__ ((constructor)) setup_debug(void)
{
__hugetlbfs_init_debug();
}
-
diff --git a/elflink.c b/elflink.c
index 0a19375..44d9444 100644
--- a/elflink.c
+++ b/elflink.c
@@ -148,7 +148,7 @@ static int prepare_segment(struct seg_info *seg)
strerror(errno));
return -1;
}
-
+
DEBUG("Mapped hugeseg at %p. Copying %ld bytes from %p...\n",
p, copysize, seg->vaddr);
memcpy(p, seg->vaddr, copysize);
@@ -317,13 +317,13 @@ int maybe_prepare(int fd_state, struct seg_info *seg)
case 3:
DEBUG("Got unshared fd as expected -- Preparing\n");
break;
-
+
default:
ERROR("Unexpected fd state: %d in maybe_prepare\n",
fd_state);
return -1;
}
-
+
ret = prepare_segment(seg);
if (ret < 0) {
/* notify daemon of failed prepare */
@@ -360,7 +360,7 @@ static void __attribute__ ((constructor)) setup_elflink(void)
"not attempting to remap segments\n");
return;
}
-
+
env = getenv("HUGETLB_MINIMAL_COPY");
if (env && (strcasecmp(env, "no") == 0)) {
DEBUG("HUGETLB_MINIMAL_COPY=%s, disabling filesz copy "
@@ -396,4 +396,3 @@ static void __attribute__ ((constructor)) setup_elflink(void)
/* Step 3. Unmap the old segments, map in the new ones */
remap_segments(htlb_seg_table, htlb_num_segs);
}
-
diff --git a/hugetlbd.c b/hugetlbd.c
index 166d4b3..62652ec 100644
--- a/hugetlbd.c
+++ b/hugetlbd.c
@@ -387,7 +387,7 @@ static void daemonize()
exit(0);
umask(0);
-
+
sid = setsid();
if (sid < 0) {
ERROR("daemonize: Failed to set session ID\n");
diff --git a/hugeutils.c b/hugeutils.c
index 7fa1956..36391d4 100644
--- a/hugeutils.c
+++ b/hugeutils.c
@@ -617,7 +617,7 @@ int set_sysctl(char *file, int val)
char buf[BUF_SZ];
snprintf(buf, BUF_SZ*sizeof(char), "%i", val);
- return set_sysctl_str(file, buf);
+ return set_sysctl_str(file, buf);
}
int mount_hugetlbfs(char *mountpoint, size_t strsz)
@@ -636,8 +636,8 @@ int mount_hugetlbfs(char *mountpoint, size_t strsz)
// snprintf(mountpoint, strsz, "/tmp/hugetlbfs");
mkdir(mountpoint, 0777);
-
- snprintf(cmd, cmdsz, "mount -t hugetlbfs hugetlbfs %s", mountpoint);
+
+ snprintf(cmd, cmdsz, "mount -t hugetlbfs hugetlbfs %s", mountpoint);
return (system(cmd));
}
@@ -686,7 +686,7 @@ int shmem_setup(int nr_hugepages)
char buf[BUF_SZ];
int hpage_size = get_hugepage_size();
unsigned long bytes = nr_hugepages * hpage_size * 1024;
-
+
snprintf(buf, sizeof(char)*BUF_SZ, "%lu", bytes);
if (get_sysctl("/proc/sys/kernel/shmall") < bytes)
diff --git a/morecore.c b/morecore.c
index 1222da1..9f13316 100644
--- a/morecore.c
+++ b/morecore.c
@@ -125,7 +125,7 @@ static void __attribute__((constructor)) setup_morecore(void)
ERROR("Hugepages unavailable\n");
return;
}
-
+
heap_fd = hugetlbfs_unlinked_fd();
if (heap_fd < 0) {
ERROR("Couldn't open hugetlbfs file for morecore\n");
@@ -146,7 +146,7 @@ static void __attribute__((constructor)) setup_morecore(void)
}
DEBUG("setup_morecore(): heapaddr = 0x%lx\n", heapaddr);
-
+
heaptop = heapbase = (void *)heapaddr;
__morecore = &hugetlbfs_morecore;
diff --git a/tests/alloc-instantiate-race.c b/tests/alloc-instantiate-race.c
index 724a67d..50f8b63 100644
--- a/tests/alloc-instantiate-race.c
+++ b/tests/alloc-instantiate-race.c
@@ -108,7 +108,7 @@ void run_race(void *syncarea)
if (p == MAP_FAILED)
FAIL("mmap(): %s", strerror(errno));
verbose_printf("%p\n", p);
-
+
child1 = fork();
if (child1 < 0)
FAIL("fork(): %s", strerror(errno));
@@ -193,4 +193,3 @@ int main(int argc, char *argv[])
PASS();
}
-
diff --git a/tests/chunk-overcommit.c b/tests/chunk-overcommit.c
index c60ef82..f46c2f2 100644
--- a/tests/chunk-overcommit.c
+++ b/tests/chunk-overcommit.c
@@ -118,4 +118,3 @@ int main(int argc, char *argv[])
PASS();
}
-
diff --git a/tests/dummy.c b/tests/dummy.c
index 6f83c6e..0c02ff1 100644
--- a/tests/dummy.c
+++ b/tests/dummy.c
@@ -29,4 +29,3 @@ int main(int argc, char *argv[])
/* If we're even able to load, that's enough */
PASS();
}
-
diff --git a/tests/empty_mounts.c b/tests/empty_mounts.c
index 15fb012..12d7241 100644
--- a/tests/empty_mounts.c
+++ b/tests/empty_mounts.c
@@ -72,4 +72,3 @@ int main(int argc, char *argv[])
FAIL("Mysteriously found a mount");
}
-
diff --git a/tests/find_path.c b/tests/find_path.c
index 8f1e290..86019da 100644
--- a/tests/find_path.c
+++ b/tests/find_path.c
@@ -42,4 +42,3 @@ int main(int argc, char *argv[])
FAIL("");
}
-
diff --git a/tests/gethugepagesize.c b/tests/gethugepagesize.c
index 11b45f3..6d47fb2 100644
--- a/tests/gethugepagesize.c
+++ b/tests/gethugepagesize.c
@@ -42,4 +42,3 @@ int main(int argc, char *argv[])
FAIL("");
}
-
diff --git a/tests/huge_at_4GB_normal_below.c b/tests/huge_at_4GB_normal_below.c
index bf3040e..ceed0ff 100644
--- a/tests/huge_at_4GB_normal_below.c
+++ b/tests/huge_at_4GB_normal_below.c
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
verbose_printf("Mapped hugetlb at %p\n", p);
memset(p, 0, hpage_size);
-
+
err = test_addr_huge(p);
if (err != 1)
FAIL("Mapped address is not hugepage");
@@ -82,4 +82,3 @@ int main(int argc, char *argv[])
PASS();
}
-
diff --git a/tests/huge_below_4GB_normal_above.c b/tests/huge_below_4GB_normal_above.c
index a926c52..d57047f 100644
--- a/tests/huge_below_4GB_normal_above.c
+++ b/tests/huge_below_4GB_normal_above.c
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
verbose_printf("done\n");
memset(p, 0, hpage_size);
-
+
err = test_addr_huge(p);
if (err != 1)
FAIL("Mapped address is not hugepage");
@@ -105,4 +105,3 @@ int main(int argc, char *argv[])
PASS();
}
-
diff --git a/tests/icache-hygeine.c b/tests/icache-hygeine.c
index b186533..838945a 100644
--- a/tests/icache-hygeine.c
+++ b/tests/icache-hygeine.c
@@ -21,7 +21,7 @@
*
* Older ppc64 kernels don't properly flush dcache to icache before
* giving a cleared page to userspace. With some exceedingly hairy
- * code, this attempts to test for this bug.
+ * code, this attempts to test for this bug.
*
* This test will never trigger (obviously) on machines with coherent
* icache and dcache (including x86 and POWER5). On any given run,
@@ -168,4 +168,3 @@ int main(int argc, char *argv[])
PASS();
}
-
diff --git a/tests/malloc.c b/tests/malloc.c
index c467d23..6a8a680 100644
--- a/tests/malloc.c
+++ b/tests/malloc.c
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
char *p;
test_init(argc, argv);
-
+
env = getenv("HUGETLB_MORECORE");
verbose_printf("HUGETLB_MORECORE=%s\n", env);
if (env)
@@ -60,10 +60,9 @@ int main(int argc, char *argv[])
FAIL("Address is not hugepage");
if (!expect_hugepage && (test_addr_huge(p) == 1))
FAIL("Address is unexpectedly huge");
-
+
free(p);
}
PASS();
}
-
diff --git a/tests/malloc_manysmall.c b/tests/malloc_manysmall.c
index 6dca0c2..ae10b80 100644
--- a/tests/malloc_manysmall.c
+++ b/tests/malloc_manysmall.c
@@ -64,4 +64,3 @@ int main(int argc, char *argv[])
PASS();
}
-
diff --git a/tests/meminfo_nohuge.c b/tests/meminfo_nohuge.c
index a478574..2791414 100644
--- a/tests/meminfo_nohuge.c
+++ b/tests/meminfo_nohuge.c
@@ -70,4 +70,3 @@ int main(int argc, char *argv[])
FAIL("Mysteriously found a hugepage size of %d\n", hpage_size);
}
-
diff --git a/tests/mlock.c b/tests/mlock.c
index f9dfde2..01e460e 100644
--- a/tests/mlock.c
+++ b/tests/mlock.c
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
tot_pages = atoi(argv[1]);
size = tot_pages * gethugepagesize();
-
+
test_simple_mlock(size, MAP_PRIVATE);
test_simple_mlock(size, MAP_SHARED);
test_simple_mlock(size, MAP_PRIVATE|MAP_LOCKED);
diff --git a/tests/mmap-cow.c b/tests/mmap-cow.c
index 8d82eff..d32c656 100644
--- a/tests/mmap-cow.c
+++ b/tests/mmap-cow.c
@@ -164,7 +164,7 @@ int main(int argc, char ** argv)
FAIL("waitpid(): %s", strerror(errno));
if (WEXITSTATUS(status) != 0)
FAIL("Thread %d (pid=%d) failed", i, wait_list[i]);
-
+
if (WIFSIGNALED(status))
FAIL("Thread %d (pid=%d) received unhandled signal", i,
wait_list[i]);
diff --git a/tests/mmap-gettest.c b/tests/mmap-gettest.c
index 2e6dfb3..31c600e 100644
--- a/tests/mmap-gettest.c
+++ b/tests/mmap-gettest.c
@@ -125,4 +125,3 @@ int main(int argc, char ** argv)
PASS();
}
-
diff --git a/tests/mprotect.c b/tests/mprotect.c
index b2c1a5f..83c149e 100644
--- a/tests/mprotect.c
+++ b/tests/mprotect.c
@@ -42,7 +42,6 @@ static inline void barrier(void)
: : :"memory");
}
-
static void sig_handler(int signum, siginfo_t *si, void *uc)
{
if (signum == SIGSEGV) {
@@ -173,7 +172,7 @@ static void test_mprotect(int fd, char *testname,
if (len2 < len1)
test_prot(p + len2, prot1);
-
+
munmap(p, len1);
}
@@ -224,4 +223,3 @@ int main(int argc, char *argv[])
PASS();
}
-
diff --git a/tests/private.c b/tests/private.c
index ceaaece..046b110 100644
--- a/tests/private.c
+++ b/tests/private.c
@@ -92,4 +92,3 @@ int main(int argc, char *argv[])
PASS();
}
-
diff --git a/tests/ptrace-write-hugepage.c b/tests/ptrace-write-hugepage.c
index 58f2405..d9f03b1 100644
--- a/tests/ptrace-write-hugepage.c
+++ b/tests/ptrace-write-hugepage.c
@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
err = sigaction(SIGCHLD, &sa, &old_sa);
if (err)
FAIL("Can't install SIGCHLD handler");
-
+
err = pipe(pipefd);
if (err)
FAIL("pipe()");
@@ -155,6 +155,6 @@ int main(int argc, char *argv[])
FAIL("Clearing SIGCHLD handler");
ptrace(PTRACE_KILL, cpid, NULL, NULL);
-
+
PASS();
}
diff --git a/tests/readback.c b/tests/readback.c
index d59dc20..f631187 100644
--- a/tests/readback.c
+++ b/tests/readback.c
@@ -63,4 +63,3 @@ int main(int argc, char *argv[])
PASS();
}
-
diff --git a/tests/shared.c b/tests/shared.c
index 65f23c3..06e2a6c 100644
--- a/tests/shared.c
+++ b/tests/shared.c
@@ -71,4 +71,3 @@ int main(int argc, char *argv[])
PASS();
}
-
diff --git a/tests/shm-fork.c b/tests/shm-fork.c
index 51eda5e..5efb124 100644
--- a/tests/shm-fork.c
+++ b/tests/shm-fork.c
@@ -68,7 +68,7 @@ void do_child(int thread, unsigned long size)
if (shmaddr == MAP_FAILED)
CHILD_FAIL(thread, "shmat() failed: %s",
strerror(errno));
-
+
for (k=0;k<size;k++)
shmaddr[k] = (char) (k);
for (k=0;k<size;k++)
@@ -81,7 +81,7 @@ void do_child(int thread, unsigned long size)
}
exit(0);
}
-
+
int main(int argc, char ** argv)
{
unsigned long size;
@@ -100,7 +100,7 @@ int main(int argc, char ** argv)
if (numprocs > MAX_PROCS)
CONFIG("Cannot spawn more than %d processes", MAX_PROCS);
-
+
hpage_size = gethugepagesize();
size = hpage_size * nr_hugepages;
verbose_printf("Requesting %lu bytes\n", size);
@@ -108,7 +108,7 @@ int main(int argc, char ** argv)
FAIL("shmget(): %s", strerror(errno));
verbose_printf("shmid: %d\n", shmid);
-
+
verbose_printf("Spawning children:\n");
for (i=0; i<numprocs; i++) {
if ((pid = fork()) < 0)
@@ -132,4 +132,3 @@ int main(int argc, char ** argv)
PASS();
}
-
diff --git a/tests/shm-gettest.c b/tests/shm-gettest.c
index d7556bc..14431a2 100644
--- a/tests/shm-gettest.c
+++ b/tests/shm-gettest.c
@@ -106,4 +106,3 @@ int main(int argc, char ** argv)
PASS();
}
-
diff --git a/tests/slbpacaflush.c b/tests/slbpacaflush.c
index be08f7f..bf95dfe 100644
--- a/tests/slbpacaflush.c
+++ b/tests/slbpacaflush.c
@@ -96,4 +96,3 @@ int main(int argc, char *argv[])
PASS_INCONCLUSIVE();
}
-
diff --git a/tests/straddle_4GB.c b/tests/straddle_4GB.c
index 3a80b28..9428486 100644
--- a/tests/straddle_4GB.c
+++ b/tests/straddle_4GB.c
@@ -60,14 +60,14 @@ int main(int argc, char *argv[])
if (test_addr_huge(p) != 1)
FAIL("Mapped address is not hugepage");
-
+
if (test_addr_huge(p + hpage_size) != 1)
FAIL("Mapped address is not hugepage");
verbose_printf("Clearing below 4GB...");
memset(p, 0, hpage_size);
verbose_printf("done\n");
-
+
verbose_printf("Clearing above 4GB...");
memset(p + hpage_size, 0, hpage_size);
verbose_printf("done\n");
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
verbose_printf("Clearing below 4GB...");
memset(p, 0, hpage_size);
verbose_printf("done\n");
-
+
verbose_printf("Clearing above 4GB...");
memset(p + hpage_size, 0, hpage_size);
verbose_printf("done\n");
@@ -105,4 +105,3 @@ int main(int argc, char *argv[])
PASS();
}
-
diff --git a/tests/test_root.c b/tests/test_root.c
index 10d5ebd..a6c842c 100644
--- a/tests/test_root.c
+++ b/tests/test_root.c
@@ -37,4 +37,3 @@ int main(int argc, char *argv[])
PASS();
}
-
diff --git a/tests/testutils.c b/tests/testutils.c
index 67cdb39..11f7502 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -92,11 +92,11 @@ static int read_maps(unsigned long addr, char *buf)
while (1) {
unsigned long start, end, off, ino;
int ret;
-
+
tmp = fgets(line, MAPS_BUF_SZ, f);
if (!tmp)
break;
-
+
ret = sscanf(line, "%lx-%lx %*s %lx %*s %ld %255s",
&start, &end, &off, &ino,
buf);
diff --git a/tests/truncate.c b/tests/truncate.c
index 1cf0577..dc73d95 100644
--- a/tests/truncate.c
+++ b/tests/truncate.c
@@ -79,4 +79,3 @@ int main(int argc, char *argv[])
/* Should have SIGBUSed above */
FAIL("Didn't SIGBUS");
}
-
diff --git a/tests/unlinked_fd.c b/tests/unlinked_fd.c
index 60d926f..bfae464 100644
--- a/tests/unlinked_fd.c
+++ b/tests/unlinked_fd.c
@@ -60,4 +60,3 @@ int main(int argc, char *argv[])
PASS();
}
-
diff --git a/tests/zero_filesize_segment.ld b/tests/zero_filesize_segment.ld
index 77ba5c4..4058467 100644
--- a/tests/zero_filesize_segment.ld
+++ b/tests/zero_filesize_segment.ld
@@ -22,4 +22,3 @@ SECTIONS
INPUT( dummy.o );
INPUT( testutils.o );
INPUT( -lc );
-