Signed-off-by: CAI Qian <[email protected]>
---
testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c | 68 ++++++++++----------
1 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c
b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c
index bce9fe6..85fee4d 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c
@@ -51,18 +51,18 @@
#include "usctest.h"
#define PROTECTION (PROT_READ | PROT_WRITE)
-#define _PATH_MEMINFO "/proc/meminfo"
-#define _PATH_SYS_HUGE "/sys/kernel/mm/hugepages"
-#define _PATH_SYS_2M _PATH_SYS_HUGE "/hugepages-2048kB/"
-#define _PATH_SYS_2M_OVER _PATH_SYS_2M "nr_overcommit_hugepages"
-#define _PATH_SYS_2M_FREE _PATH_SYS_2M "free_hugepages"
-#define _PATH_SYS_2M_RESV _PATH_SYS_2M "resv_hugepages"
-#define _PATH_SYS_2M_SURP _PATH_SYS_2M "surplus_hugepages"
-#define _PATH_SYS_2M_HUGE _PATH_SYS_2M "nr_hugepages"
-#define _PATH_PROC_VM "/proc/sys/vm/"
-#define _PATH_PROC_OVER _PATH_PROC_VM "nr_overcommit_hugepages"
-#define _PATH_PROC_HUGE _PATH_PROC_VM "nr_hugepages"
-#define _PATH_SHMMAX "/proc/sys/kernel/shmmax"
+#define PATH_MEMINFO "/proc/meminfo"
+#define PATH_SYS_HUGE "/sys/kernel/mm/hugepages"
+#define PATH_SYS_2M PATH_SYS_HUGE "/hugepages-2048kB/"
+#define PATH_SYS_2M_OVER PATH_SYS_2M "nr_overcommit_hugepages"
+#define PATH_SYS_2M_FREE PATH_SYS_2M "free_hugepages"
+#define PATH_SYS_2M_RESV PATH_SYS_2M "resv_hugepages"
+#define PATH_SYS_2M_SURP PATH_SYS_2M "surplus_hugepages"
+#define PATH_SYS_2M_HUGE PATH_SYS_2M "nr_hugepages"
+#define PATH_PROC_VM "/proc/sys/vm/"
+#define PATH_PROC_OVER PATH_PROC_VM "nr_overcommit_hugepages"
+#define PATH_PROC_HUGE PATH_PROC_VM "nr_hugepages"
+#define PATH_SHMMAX "/proc/sys/kernel/shmmax"
#define MB (1024 * 1024)
/* Only ia64 requires this */
@@ -116,15 +116,15 @@ int main(int argc, char *argv[])
if (msg != NULL)
tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
if (opt_sysfs) {
- strncpy(path, _PATH_SYS_2M_HUGE,
- strlen(_PATH_SYS_2M_HUGE) + 1);
- strncpy(pathover, _PATH_SYS_2M_OVER,
- strlen(_PATH_SYS_2M_OVER) + 1);
+ strncpy(path, PATH_SYS_2M_HUGE,
+ strlen(PATH_SYS_2M_HUGE) + 1);
+ strncpy(pathover, PATH_SYS_2M_OVER,
+ strlen(PATH_SYS_2M_OVER) + 1);
} else {
- strncpy(path, _PATH_PROC_HUGE,
- strlen(_PATH_PROC_HUGE) + 1);
- strncpy(pathover, _PATH_PROC_OVER,
- strlen(_PATH_PROC_OVER) + 1);
+ strncpy(path, PATH_PROC_HUGE,
+ strlen(PATH_PROC_HUGE) + 1);
+ strncpy(pathover, PATH_PROC_OVER,
+ strlen(PATH_PROC_OVER) + 1);
}
if (opt_alloc) {
size = atoi(opt_allocstr);
@@ -147,7 +147,7 @@ static void overcommit(void)
if (shmid != -1) {
/* Use /proc/meminfo to generate an IPC key. */
- key = ftok(_PATH_MEMINFO, strlen(_PATH_MEMINFO));
+ key = ftok(PATH_MEMINFO, strlen(PATH_MEMINFO));
if (key == -1)
tst_brkm(TBROK|TERRNO, cleanup, "ftok");
shmid = shmget(key, (long)(length * MB),
@@ -167,22 +167,22 @@ static void overcommit(void)
if (opt_sysfs) {
tst_resm(TINFO, "check sysfs before allocation.");
- if (checksys(_PATH_SYS_2M_HUGE, "HugePages_Total",
+ if (checksys(PATH_SYS_2M_HUGE, "HugePages_Total",
length / 2) != 0)
return;
- if (checksys(_PATH_SYS_2M_FREE, "HugePages_Free",
+ if (checksys(PATH_SYS_2M_FREE, "HugePages_Free",
length / 2) != 0)
return;
- if (checksys(_PATH_SYS_2M_SURP, "HugePages_Surp",
+ if (checksys(PATH_SYS_2M_SURP, "HugePages_Surp",
length / 2 - size) != 0)
return;
- if (checksys(_PATH_SYS_2M_RESV, "HugePages_Rsvd",
+ if (checksys(PATH_SYS_2M_RESV, "HugePages_Rsvd",
length / 2) != 0)
return;
} else {
tst_resm(TINFO,
"check /proc/meminfo before allocation.");
- fp = fopen(_PATH_MEMINFO, "r");
+ fp = fopen(PATH_MEMINFO, "r");
if (fp == NULL)
tst_brkm(TBROK|TERRNO, cleanup, "fopen");
if (checkproc(fp, "HugePages_Total", length / 2) != 0)
@@ -209,21 +209,21 @@ static void overcommit(void)
}
if (opt_sysfs) {
tst_resm(TINFO, "check sysfs.");
- if (checksys(_PATH_SYS_2M_HUGE, "HugePages_Total",
+ if (checksys(PATH_SYS_2M_HUGE, "HugePages_Total",
length / 2) != 0)
return;
- if (checksys(_PATH_SYS_2M_FREE, "HugePages_Free", 0)
+ if (checksys(PATH_SYS_2M_FREE, "HugePages_Free", 0)
!= 0)
return;
- if (checksys(_PATH_SYS_2M_SURP, "HugePages_Surp",
+ if (checksys(PATH_SYS_2M_SURP, "HugePages_Surp",
length / 2 - size) != 0)
return;
- if (checksys(_PATH_SYS_2M_RESV, "HugePages_Rsvd", 0)
+ if (checksys(PATH_SYS_2M_RESV, "HugePages_Rsvd", 0)
!= 0)
return;
} else {
tst_resm(TINFO, "check /proc/meminfo.");
- fp = fopen(_PATH_MEMINFO, "r");
+ fp = fopen(PATH_MEMINFO, "r");
if (fp == NULL)
tst_brkm(TBROK|TERRNO, cleanup, "fopen");
if (checkproc(fp, "HugePages_Total", length / 2) != 0)
@@ -253,7 +253,7 @@ static void cleanup(void)
TEST_CLEANUP;
if (restore_shmmax) {
- fd = open(_PATH_SHMMAX, O_WRONLY);
+ fd = open(PATH_SHMMAX, O_WRONLY);
if (fd == -1)
tst_resm(TWARN|TERRNO, "open");
if (write(fd, shmmax, strlen(shmmax)) != strlen(shmmax))
@@ -297,7 +297,7 @@ static void setup(void)
tst_sig(FORK, DEF_HANDLER, cleanup);
TEST_PAUSE;
if (shmid != -1) {
- fp = fopen(_PATH_SHMMAX, "r");
+ fp = fopen(PATH_SHMMAX, "r");
if (fp == NULL)
tst_brkm(TBROK|TERRNO, cleanup, "fopen");
if (fgets(shmmax, BUFSIZ, fp) == NULL)
@@ -306,7 +306,7 @@ static void setup(void)
if (atol(shmmax) < (long)(length * MB)) {
restore_shmmax = 1;
- fd = open(_PATH_SHMMAX, O_RDWR);
+ fd = open(PATH_SHMMAX, O_RDWR);
if (fd == -1)
tst_brkm(TBROK|TERRNO, cleanup, "open");
snprintf(buf, BUFSIZ, "%ld", (long)(length * MB));
--
1.7.3.2From 8b90ab3e3fa7e68dc1dc255886e8859c49ae9e05 Mon Sep 17 00:00:00 2001
From: CAI Qian <[email protected]>
Date: Fri, 31 Dec 2010 09:08:30 +0800
Subject: [PATCH] hugemmap05: fix pathname to remove underscore
Signed-off-by: CAI Qian <[email protected]>
---
testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c | 68 ++++++++++----------
1 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c
index bce9fe6..85fee4d 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c
@@ -51,18 +51,18 @@
#include "usctest.h"
#define PROTECTION (PROT_READ | PROT_WRITE)
-#define _PATH_MEMINFO "/proc/meminfo"
-#define _PATH_SYS_HUGE "/sys/kernel/mm/hugepages"
-#define _PATH_SYS_2M _PATH_SYS_HUGE "/hugepages-2048kB/"
-#define _PATH_SYS_2M_OVER _PATH_SYS_2M "nr_overcommit_hugepages"
-#define _PATH_SYS_2M_FREE _PATH_SYS_2M "free_hugepages"
-#define _PATH_SYS_2M_RESV _PATH_SYS_2M "resv_hugepages"
-#define _PATH_SYS_2M_SURP _PATH_SYS_2M "surplus_hugepages"
-#define _PATH_SYS_2M_HUGE _PATH_SYS_2M "nr_hugepages"
-#define _PATH_PROC_VM "/proc/sys/vm/"
-#define _PATH_PROC_OVER _PATH_PROC_VM "nr_overcommit_hugepages"
-#define _PATH_PROC_HUGE _PATH_PROC_VM "nr_hugepages"
-#define _PATH_SHMMAX "/proc/sys/kernel/shmmax"
+#define PATH_MEMINFO "/proc/meminfo"
+#define PATH_SYS_HUGE "/sys/kernel/mm/hugepages"
+#define PATH_SYS_2M PATH_SYS_HUGE "/hugepages-2048kB/"
+#define PATH_SYS_2M_OVER PATH_SYS_2M "nr_overcommit_hugepages"
+#define PATH_SYS_2M_FREE PATH_SYS_2M "free_hugepages"
+#define PATH_SYS_2M_RESV PATH_SYS_2M "resv_hugepages"
+#define PATH_SYS_2M_SURP PATH_SYS_2M "surplus_hugepages"
+#define PATH_SYS_2M_HUGE PATH_SYS_2M "nr_hugepages"
+#define PATH_PROC_VM "/proc/sys/vm/"
+#define PATH_PROC_OVER PATH_PROC_VM "nr_overcommit_hugepages"
+#define PATH_PROC_HUGE PATH_PROC_VM "nr_hugepages"
+#define PATH_SHMMAX "/proc/sys/kernel/shmmax"
#define MB (1024 * 1024)
/* Only ia64 requires this */
@@ -116,15 +116,15 @@ int main(int argc, char *argv[])
if (msg != NULL)
tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
if (opt_sysfs) {
- strncpy(path, _PATH_SYS_2M_HUGE,
- strlen(_PATH_SYS_2M_HUGE) + 1);
- strncpy(pathover, _PATH_SYS_2M_OVER,
- strlen(_PATH_SYS_2M_OVER) + 1);
+ strncpy(path, PATH_SYS_2M_HUGE,
+ strlen(PATH_SYS_2M_HUGE) + 1);
+ strncpy(pathover, PATH_SYS_2M_OVER,
+ strlen(PATH_SYS_2M_OVER) + 1);
} else {
- strncpy(path, _PATH_PROC_HUGE,
- strlen(_PATH_PROC_HUGE) + 1);
- strncpy(pathover, _PATH_PROC_OVER,
- strlen(_PATH_PROC_OVER) + 1);
+ strncpy(path, PATH_PROC_HUGE,
+ strlen(PATH_PROC_HUGE) + 1);
+ strncpy(pathover, PATH_PROC_OVER,
+ strlen(PATH_PROC_OVER) + 1);
}
if (opt_alloc) {
size = atoi(opt_allocstr);
@@ -147,7 +147,7 @@ static void overcommit(void)
if (shmid != -1) {
/* Use /proc/meminfo to generate an IPC key. */
- key = ftok(_PATH_MEMINFO, strlen(_PATH_MEMINFO));
+ key = ftok(PATH_MEMINFO, strlen(PATH_MEMINFO));
if (key == -1)
tst_brkm(TBROK|TERRNO, cleanup, "ftok");
shmid = shmget(key, (long)(length * MB),
@@ -167,22 +167,22 @@ static void overcommit(void)
if (opt_sysfs) {
tst_resm(TINFO, "check sysfs before allocation.");
- if (checksys(_PATH_SYS_2M_HUGE, "HugePages_Total",
+ if (checksys(PATH_SYS_2M_HUGE, "HugePages_Total",
length / 2) != 0)
return;
- if (checksys(_PATH_SYS_2M_FREE, "HugePages_Free",
+ if (checksys(PATH_SYS_2M_FREE, "HugePages_Free",
length / 2) != 0)
return;
- if (checksys(_PATH_SYS_2M_SURP, "HugePages_Surp",
+ if (checksys(PATH_SYS_2M_SURP, "HugePages_Surp",
length / 2 - size) != 0)
return;
- if (checksys(_PATH_SYS_2M_RESV, "HugePages_Rsvd",
+ if (checksys(PATH_SYS_2M_RESV, "HugePages_Rsvd",
length / 2) != 0)
return;
} else {
tst_resm(TINFO,
"check /proc/meminfo before allocation.");
- fp = fopen(_PATH_MEMINFO, "r");
+ fp = fopen(PATH_MEMINFO, "r");
if (fp == NULL)
tst_brkm(TBROK|TERRNO, cleanup, "fopen");
if (checkproc(fp, "HugePages_Total", length / 2) != 0)
@@ -209,21 +209,21 @@ static void overcommit(void)
}
if (opt_sysfs) {
tst_resm(TINFO, "check sysfs.");
- if (checksys(_PATH_SYS_2M_HUGE, "HugePages_Total",
+ if (checksys(PATH_SYS_2M_HUGE, "HugePages_Total",
length / 2) != 0)
return;
- if (checksys(_PATH_SYS_2M_FREE, "HugePages_Free", 0)
+ if (checksys(PATH_SYS_2M_FREE, "HugePages_Free", 0)
!= 0)
return;
- if (checksys(_PATH_SYS_2M_SURP, "HugePages_Surp",
+ if (checksys(PATH_SYS_2M_SURP, "HugePages_Surp",
length / 2 - size) != 0)
return;
- if (checksys(_PATH_SYS_2M_RESV, "HugePages_Rsvd", 0)
+ if (checksys(PATH_SYS_2M_RESV, "HugePages_Rsvd", 0)
!= 0)
return;
} else {
tst_resm(TINFO, "check /proc/meminfo.");
- fp = fopen(_PATH_MEMINFO, "r");
+ fp = fopen(PATH_MEMINFO, "r");
if (fp == NULL)
tst_brkm(TBROK|TERRNO, cleanup, "fopen");
if (checkproc(fp, "HugePages_Total", length / 2) != 0)
@@ -253,7 +253,7 @@ static void cleanup(void)
TEST_CLEANUP;
if (restore_shmmax) {
- fd = open(_PATH_SHMMAX, O_WRONLY);
+ fd = open(PATH_SHMMAX, O_WRONLY);
if (fd == -1)
tst_resm(TWARN|TERRNO, "open");
if (write(fd, shmmax, strlen(shmmax)) != strlen(shmmax))
@@ -297,7 +297,7 @@ static void setup(void)
tst_sig(FORK, DEF_HANDLER, cleanup);
TEST_PAUSE;
if (shmid != -1) {
- fp = fopen(_PATH_SHMMAX, "r");
+ fp = fopen(PATH_SHMMAX, "r");
if (fp == NULL)
tst_brkm(TBROK|TERRNO, cleanup, "fopen");
if (fgets(shmmax, BUFSIZ, fp) == NULL)
@@ -306,7 +306,7 @@ static void setup(void)
if (atol(shmmax) < (long)(length * MB)) {
restore_shmmax = 1;
- fd = open(_PATH_SHMMAX, O_RDWR);
+ fd = open(PATH_SHMMAX, O_RDWR);
if (fd == -1)
tst_brkm(TBROK|TERRNO, cleanup, "open");
snprintf(buf, BUFSIZ, "%ld", (long)(length * MB));
--
1.7.3.2
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
