Signed-Off-By: Subrata Modak<subr...@linux.vnet.ibm.com>,
--
diff -uprN
ltp-intermediate-20090121.orig/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c
ltp-intermediate-20090121/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c
---
ltp-intermediate-20090121.orig/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c
2009-01-23 12:00:06.000000000 +0530
+++
ltp-intermediate-20090121/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c
2009-01-23 12:01:37.000000000 +0530
@@ -61,10 +61,12 @@
#include "ipcshm.h"
#include <sys/types.h>
#include <sys/wait.h>
+#include "system_specific_hugepages_info.h"
char *TCID = "hugeshmctl03";
int TST_TOTAL = 3;
extern int Tst_count;
+unsigned long huge_pages_shm_to_be_allocated;
int exp_enos[] = {EACCES, EPERM, 0}; /* 0 terminated list of */
/* expected errnos */
@@ -102,6 +104,11 @@ int main(int ac, char **av)
tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
}
+ if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
+ tst_brkm(TBROK, cleanup, "Test cannot be continued owning
to sufficient availability of Hugepages on the system");
+ else
+ huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() *
hugepages_size() * 1024) / 2 ;
+
setup(); /* global setup */
if ((pid = fork()) == -1) {
@@ -204,7 +211,7 @@ setup(void)
shmkey = getipckey();
/* create a shared memory segment with read and write permissions */
- if ((shm_id_1 = shmget(shmkey, HUGE_SHM_SIZE, SHM_HUGETLB | IPC_CREAT
| IPC_EXCL |
+ if ((shm_id_1 = shmget(shmkey, huge_pages_shm_to_be_allocated,
SHM_HUGETLB | IPC_CREAT | IPC_EXCL |
SHM_RW)) == -1) {
tst_brkm(TBROK, cleanup, "couldn't create shared memory "
"segment in setup()");
Binary files
ltp-intermediate-20090121.orig/testcases/kernel/mem/hugetlb/hugeshmdt/.hugeshmdt01.c.swp
and
ltp-intermediate-20090121/testcases/kernel/mem/hugetlb/hugeshmdt/.hugeshmdt01.c.swp
differ
Regards--
Subrata
diff -uprN ltp-intermediate-20090121.orig/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c ltp-intermediate-20090121/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c
--- ltp-intermediate-20090121.orig/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c 2009-01-23 12:00:06.000000000 +0530
+++ ltp-intermediate-20090121/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c 2009-01-23 12:01:37.000000000 +0530
@@ -61,10 +61,12 @@
#include "ipcshm.h"
#include <sys/types.h>
#include <sys/wait.h>
+#include "system_specific_hugepages_info.h"
char *TCID = "hugeshmctl03";
int TST_TOTAL = 3;
extern int Tst_count;
+unsigned long huge_pages_shm_to_be_allocated;
int exp_enos[] = {EACCES, EPERM, 0}; /* 0 terminated list of */
/* expected errnos */
@@ -102,6 +104,11 @@ int main(int ac, char **av)
tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
}
+ if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 )
+ tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system");
+ else
+ huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ;
+
setup(); /* global setup */
if ((pid = fork()) == -1) {
@@ -204,7 +211,7 @@ setup(void)
shmkey = getipckey();
/* create a shared memory segment with read and write permissions */
- if ((shm_id_1 = shmget(shmkey, HUGE_SHM_SIZE, SHM_HUGETLB | IPC_CREAT | IPC_EXCL |
+ if ((shm_id_1 = shmget(shmkey, huge_pages_shm_to_be_allocated, SHM_HUGETLB | IPC_CREAT | IPC_EXCL |
SHM_RW)) == -1) {
tst_brkm(TBROK, cleanup, "couldn't create shared memory "
"segment in setup()");
Binary files ltp-intermediate-20090121.orig/testcases/kernel/mem/hugetlb/hugeshmdt/.hugeshmdt01.c.swp and ltp-intermediate-20090121/testcases/kernel/mem/hugetlb/hugeshmdt/.hugeshmdt01.c.swp differ
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
