hugemmap01.c

#include "test.h"
#include "usctest.h"
#include "system_specific_hugepages_info.h"

(quoted diff) +6 -13

+#include "libmnt.h"
 
 #define BUFFER_SIZE  256
 
-char* TEMPFILE="mmapfile";
+char TEMPFILE[MAXPATHLEN];
 
 char *TCID="hugemmap01";	/* Test program identifier.    */
 int TST_TOTAL=1;		/* Total number of test cases. */
 long *addr;			/* addr of memory mapped region */
 int fildes;			/* file descriptor for tempfile */
-char *Hopt;                     /* location of hugetlbfs */
+int hugepagesmapped=0;		/* Amount of huge pages mapped after testing */
 int beforetest=0;		/* Amount of free huge pages before testing */
 int aftertest=0;		/* Amount of free huge pages after testing */
-int hugepagesmapped=0;		/* Amount of huge pages mapped after testing */
+char *mount_point=NULL;
 
-void setup();			/* Main setup function of test */
-void cleanup();			/* cleanup function for the test */
-
-void help()
-{
-	printf("  -H /..  Location of hugetlbfs, i.e. -H /var/hugetlbfs \n");
-}
+void setup(void);			/* Main setup function of test */
+void cleanup(void);			/* cleanup function for the test */
 
 int
 main(int ac, char **av)
 {
 	int lc;			/* loop counter */
-	char *msg;		/* message returned from parse_opts */
-        int Hflag=0;              /* binary flag: opt or not */
 	int page_sz=0;
 
-       	option_t options[] = {

(quoted diff) +13 -12

-	if (Hflag == 0) {
-		tst_brkm(TBROK, NULL, "-H option is REQUIRED for this test, use -h for options help");
-		tst_exit();
-	}
-
 	setup();
 
 	for (lc = 0; TEST_LOOPING(lc); lc++) {

@@ -189,18 +166,22 @@ main(int ac, char **av)
  * 	     Write some known data into file and get the size of the file.
  */
 void
-setup()
+setup(void)
 {
-	char mypid[40];
-
-	sprintf(mypid,"/%d",getpid());
-	TEMPFILE=strcat(mypid,TEMPFILE);
-	TEMPFILE=strcat(Hopt,TEMPFILE);
+	tst_require_root(NULL);
 
 	tst_sig(FORK, DEF_HANDLER, cleanup);
 
 	TEST_PAUSE;
 
+	tst_tmpdir();
+	mount_point = get_tst_tmpdir();
+
+	mount_hugetlbfs(mount_point);
+	hugepage_alloc(1024);
+
+	snprintf(TEMPFILE, sizeof(TEMPFILE), "%s/mmapfile%d", 
+		mount_point, getpid());
 }
 
 /*

@@ -209,7 +190,7 @@ setup()
  * 	       Remove the temporary directory created.
  */
 void
-cleanup()
+cleanup(void)
 {
 	/*
 	 * print timing stats if that option was specified.

@@ -218,4 +199,6 @@ cleanup()
 
 	unlink(TEMPFILE);
 
+	umount_hugetlbfs(mount_point);
+	tst_rmdir();
 }

The parse_opts() should stay here but with NULL parameters there are some default options and it makes the test bail out on invalid options passed.

hi,

I am sorry for replying your comments so late. Here, I seperate all the code into 6 patches.

The purpose of this patch set is to automatically mount hugetlbfs for hugemmap tests, so that users don't need to mount hugetlbfs themselves before testing.

I made a new library, including some common functions, mounting hugetlbfs and allocating hugepages for test programs. And testcase hugemmap01 ~ hugemmap04 used these functions to mount hugetlbfs before testing.

Please comment! Thanks:)

hi,

I have been waiting such a long time for the feedback of this patch set. Does anybody have any time to give some comments?
Thanks:)

Quoted 15 lines · tangchen

hi,

I am sorry for replying your comments so late. Here, I seperate all the code into 6 patches.

The purpose of this patch set is to automatically mount hugetlbfs for hugemmap tests, so that users don't need to mount hugetlbfs themselves before testing.

I made a new library, including some common functions, mounting hugetlbfs and allocating hugepages for test programs. And testcase hugemmap01 ~ hugemmap04 used these functions to mount hugetlbfs before testing.