hugetlb: rename lib/ipcshm.* to lib/hugetlb.*

Signed-off-by Li Wang <[email protected]>

---
 testcases/kernel/mem/hugetlb/Makefile              |   2 +-
 testcases/kernel/mem/hugetlb/Makefile.inc          |   4 +-
 .../kernel/mem/hugetlb/hugeshmat/hugeshmat01.c     |   2 +-
 .../kernel/mem/hugetlb/hugeshmat/hugeshmat02.c     |   2 +-
 .../kernel/mem/hugetlb/hugeshmat/hugeshmat03.c     |   2 +-
 .../kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c   |   2 +-
 .../kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c   |   2 +-
 .../kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c   |   2 +-
 .../kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c     |   2 +-
 .../kernel/mem/hugetlb/hugeshmget/hugeshmget01.c   |   2 +-
 .../kernel/mem/hugetlb/hugeshmget/hugeshmget02.c   |   2 +-
 .../kernel/mem/hugetlb/hugeshmget/hugeshmget03.c   |   2 +-
 .../kernel/mem/hugetlb/hugeshmget/hugeshmget05.c   |   2 +-
 testcases/kernel/mem/hugetlb/lib/Makefile          |   2 +-
 testcases/kernel/mem/hugetlb/lib/hugetlb.c         | 116
+++++++++++++++++++++
 testcases/kernel/mem/hugetlb/lib/hugetlb.h         |  61 +++++++++++
 testcases/kernel/mem/hugetlb/lib/ipcshm.h          |  61 -----------
 testcases/kernel/mem/hugetlb/lib/libipc.c          | 116
---------------------
 18 files changed, 192 insertions(+), 192 deletions(-)
 create mode 100644 testcases/kernel/mem/hugetlb/lib/hugetlb.c
 create mode 100644 testcases/kernel/mem/hugetlb/lib/hugetlb.h
 delete mode 100644 testcases/kernel/mem/hugetlb/lib/ipcshm.h
 delete mode 100644 testcases/kernel/mem/hugetlb/lib/libipc.c

testcases/kernel/mem/hugetlb/Makefile +1 -1

index 1e8f8f8..ea7867f 100644
@@ -21,7 +21,7 @@ top_srcdir            ?= ../../../..
 include        $(top_srcdir)/include/mk/env_pre.mk
 
 LIBDIR                 := lib
-LIB                    := $(LIBDIR)/libipc_hugetlb.a
+LIB                    := $(LIBDIR)/libhugetlb.a
 FILTER_OUT_DIRS                := $(LIBDIR)
 
 $(LIBDIR):

testcases/kernel/mem/hugetlb/Makefile.inc +2 -2

index cc0ada6..c07d600 100644
@@ -22,7 +22,7 @@
 
 # DO NOT USE THIS FILE FOR hugetlb / lib!!!
 LIBIPCDIR              := ../lib
-LIBIPC                 := $(LIBIPCDIR)/libipc_hugetlb.a
+LIBIPC                 := $(LIBIPCDIR)/libhugetlb.a
 
 $(LIBIPCDIR):
        mkdir -p "$@"

@@ -31,7 +31,7 @@ $(LIBIPC): $(LIBIPCDIR)
 
 CPPFLAGS               += -I$(abs_srcdir)/$(LIBIPCDIR)
 LDFLAGS                        += -L$(abs_builddir)/$(LIBIPCDIR)
-LDLIBS                 += -lipc_hugetlb
+LDLIBS                 += -lhugetlb
 MAKE_DEPS              += $(LIBIPC)
 
 include $(top_srcdir)/testcases/kernel/mem/include/libmem.mk

testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c +1 -1

index 851d4cf..35e7216 100644
@@ -56,7 +56,7 @@
  *     none
  */
 
-#include "ipcshm.h"
+#include "hugetlb.h"
 #include "safe_macros.h"
 #include "mem.h"
 

testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c +1 -1

index 52348f1..2bac9c2 100644
@@ -51,7 +51,7 @@
  */
 
 #include <pwd.h>
-#include "ipcshm.h"
+#include "hugetlb.h"
 #include "safe_macros.h"
 #include "mem.h"
 

testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c +1 -1

index 723c8b5..fe74810 100644
@@ -57,7 +57,7 @@
  *     test must be run at root
  */
 
-#include "ipcshm.h"
+#include "hugetlb.h"
 #include "safe_macros.h"
 #include "mem.h"
 

testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c +1 -1

index 66ad1b5..d7990c7 100644
@@ -61,7 +61,7 @@
  *     none
  */
 
-#include "ipcshm.h"
+#include "hugetlb.h"
 #include "safe_macros.h"
 #include "mem.h"
 

testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c +1 -1

index 4aeb638..f79ee83 100644
@@ -53,7 +53,7 @@
  */
 
 #include <pwd.h>
-#include "ipcshm.h"
+#include "hugetlb.h"
 #include "safe_macros.h"
 #include "mem.h"
 

testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c +1 -1

index 9f5c2c9..e553a2a 100644
@@ -60,7 +60,7 @@
 
 #include <sys/types.h>
 #include <sys/wait.h>
-#include "ipcshm.h"
+#include "hugetlb.h"
 #include "safe_macros.h"
 #include "mem.h"
 

testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c +1 -1

index 9770e87..c8592b3 100644
@@ -58,7 +58,7 @@
  */
 
 #include <setjmp.h>
-#include "ipcshm.h"
+#include "hugetlb.h"
 #include "safe_macros.h"
 #include "mem.h"
 

testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c +1 -1

index ee82de3..5d45aaa 100644
@@ -58,7 +58,7 @@
  *     none
  */
 
-#include "ipcshm.h"
+#include "hugetlb.h"
 #include "safe_macros.h"
 #include "mem.h"
 

testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c +1 -1

index b995ef8..0ac4a29 100644
@@ -51,7 +51,7 @@
  *     none
  */
 
-#include "ipcshm.h"
+#include "hugetlb.h"
 #include "safe_macros.h"
 #include "mem.h"
 

testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +1 -1

index 9284669..9a2a0b2 100644
@@ -52,7 +52,7 @@
  *     none
  */
 
-#include "ipcshm.h"
+#include "hugetlb.h"
 #include "safe_macros.h"
 #include "mem.h"
 

testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c +1 -1

index 7b8f6b4..567b02d 100644
@@ -60,7 +60,7 @@
 
 #include <sys/types.h>
 #include <sys/wait.h>
-#include "ipcshm.h"
+#include "hugetlb.h"
 #include "safe_macros.h"
 #include "mem.h"
 

testcases/kernel/mem/hugetlb/lib/Makefile +1 -1

index 4cdd142..96e8e37 100644
@@ -20,6 +20,6 @@ top_srcdir            ?= ../../../../..
 
 include $(top_srcdir)/include/mk/env_pre.mk
 
-LIB                    := libipc_hugetlb.a
+LIB                    := libhugetlb.a
 
 include $(top_srcdir)/include/mk/lib.mk

testcases/kernel/mem/hugetlb/lib/hugetlb.c new file +17 -0

new file mode 100644
index 0000000..4b2a3d2
@@ -0,0 +1,116 @@
+/*
+ *
+ *   Copyright (c) International Business Machines  Corp., 2001
+ *
+ *   This program is free software;  you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ *   the GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program;  if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

02110-1301 USA
+ */

testcases/kernel/mem/hugetlb/lib/hugetlb.c new file +90 -0

+
+/*
+ * NAME
+ *     hugetlb.c
+ *
+ * DESCRIPTION
+ *     common routines for the hugepage tests.
+ *
+ *     The library contains the following routines:
+ *
+ *     getipckey()
+ *     getuserid()
+ *     rm_shm()
+ *     help()
+ */
+
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <sys/timeb.h>
+#include <pwd.h>
+#include "hugetlb.h"
+
+/*
+ * getipckey() - generates and returns a message key used by the "get"
+ *              calls to create an IPC resource.
+ */
+int getipckey(void)
+{
+       const char a = 'a';
+       int ascii_a = (int)a;
+       char *curdir = NULL;
+       size_t size = 0;
+       key_t ipc_key;
+       struct timeb time_info;
+
+       curdir = getcwd(curdir, size);
+       if (curdir == NULL)
+               tst_brkm(TBROK | TERRNO, cleanup, "getcwd(curdir)");
+
+       /*
+        * Get a Sys V IPC key
+        *
+        * ftok() requires a character as a second argument.  This is
+        * refered to as a "project identifier" in the man page.  In
+        * order to maximize the chance of getting a unique key, the
+        * project identifier is a "random character" produced by
+        * generating a random number between 0 and 25 and then adding
+        * that to the ascii value of 'a'.  The "seed" for the random
+        * number is the millisecond value that is set in the timeb
+        * structure after calling ftime().
+        */
+       ftime(&time_info);
+       srandom((unsigned int)time_info.millitm);
+
+       ipc_key = ftok(curdir, ascii_a + random() % 26);
+       if (ipc_key == -1)
+               tst_brkm(TBROK | TERRNO, cleanup, "ftok");
+
+       return ipc_key;
+}
+
+/*
+ * getuserid() - return the integer value for the "user" id
+ */
+int getuserid(char *user)
+{
+       struct passwd *ent;
+
+       ent = getpwnam(user);
+       if (ent == NULL)
+               tst_brkm(TBROK | TERRNO, cleanup, "getpwnam");
+
+       return ent->pw_uid;
+}
+
+/*
+ * rm_shm() - removes a shared memory segment.
+ */
+void rm_shm(int shm_id)
+{
+       if (shm_id == -1)
+               return;
+
+       /*
+        * check for # of attaches ?
+        */
+       if (shmctl(shm_id, IPC_RMID, NULL) == -1) {
+               tst_resm(TINFO, "WARNING: shared memory deletion failed.");
+               tst_resm(TINFO, "This could lead to IPC resource

problems.");

testcases/kernel/mem/hugetlb/lib/hugetlb.c new file +7 -0

+               tst_resm(TINFO, "id = %d", shm_id);
+       }
+}
+
+void help(void)
+{
+       printf("    -s NUM  Set the number of hugepages to be

allocated\n");

testcases/kernel/mem/hugetlb/lib/hugetlb.c new file +1 -0

+}

testcases/kernel/mem/hugetlb/lib/hugetlb.h new file +17 -0

new file mode 100644
index 0000000..6d73e9c
@@ -0,0 +1,61 @@
+/*
+ *
+ *   Copyright (c) International Business Machines  Corp., 2001
+ *
+ *   This program is free software;  you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+ *   the GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program;  if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

02110-1301 USA
+ */

testcases/kernel/mem/hugetlb/lib/hugetlb.h new file +43 -0

+
+/*
+ * hugetlb.h - common definitions for the hugepage tests
+ */
+
+#ifndef __HUGETLB_H
+#define __HUGETLB_H
+
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <errno.h>
+#include <wait.h>
+#include "test.h"
+
+#define SHM_RD 0400
+#define SHM_WR 0200
+#define SHM_RW (SHM_RD|SHM_WR)
+
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB    04000   /* segment is mapped via hugetlb */
+#endif
+
+/*
+ * to get the lower nine permission bits
+ * from shmid_ds.ipc_perm.mode
+ */
+#define MODE_MASK      0x01FF
+
+key_t shmkey;                  /* an IPC key generated by ftok() */
+
+int getipckey(void);
+int getuserid(char *user);
+void rm_shm(int shm_id);
+
+void cleanup(void);
+void setup(void);
+
+char *nr_opt;
+int sflag;
+long orig_hugepages;
+void help(void);
+
+#endif /* hugetlb.h */

testcases/kernel/mem/hugetlb/lib/ipcshm.h deleted +0 -17

deleted file mode 100644
index 194d14b..0000000
@@ -1,61 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

02110-1301 USA
- */

testcases/kernel/mem/hugetlb/lib/ipcshm.h deleted +0 -43

-
-/*
- * ipcshm.h - common definitions for the IPC shared memory tests
- */
-
-#ifndef __IPCSHM_H
-#define __IPCSHM_H
-
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <errno.h>
-#include <wait.h>
-#include "test.h"
-
-#define SHM_RD 0400
-#define SHM_WR 0200
-#define SHM_RW (SHM_RD|SHM_WR)
-
-#ifndef SHM_HUGETLB
-#define SHM_HUGETLB    04000   /* segment is mapped via hugetlb */
-#endif
-
-/*
- * to get the lower nine permission bits
- * from shmid_ds.ipc_perm.mode
- */
-#define MODE_MASK      0x01FF
-
-key_t shmkey;                  /* an IPC key generated by ftok() */
-
-int getipckey(void);
-int getuserid(char *user);
-void rm_shm(int shm_id);
-
-void cleanup(void);
-void setup(void);
-
-char *nr_opt;
-int sflag;
-long orig_hugepages;
-void help(void);
-
-#endif /* ipcshm.h */

testcases/kernel/mem/hugetlb/lib/libipc.c deleted +0 -17

deleted file mode 100644
index 1f16f22..0000000
@@ -1,116 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

02110-1301 USA
- */

testcases/kernel/mem/hugetlb/lib/libipc.c deleted +0 -90

-
-/*
- * NAME
- *     libipc.c
- *
- * DESCRIPTION
- *     common routines for the IPC system call tests.
- *
- *     The library contains the following routines:
- *
- *     getipckey()
- *     getuserid()
- *     rm_shm()
- *     help()
- */
-
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/timeb.h>
-#include <pwd.h>
-#include "ipcshm.h"
-
-/*
- * getipckey() - generates and returns a message key used by the "get"
- *              calls to create an IPC resource.
- */
-int getipckey(void)
-{
-       const char a = 'a';
-       int ascii_a = (int)a;
-       char *curdir = NULL;
-       size_t size = 0;
-       key_t ipc_key;
-       struct timeb time_info;
-
-       curdir = getcwd(curdir, size);
-       if (curdir == NULL)
-               tst_brkm(TBROK | TERRNO, cleanup, "getcwd(curdir)");
-
-       /*
-        * Get a Sys V IPC key
-        *
-        * ftok() requires a character as a second argument.  This is
-        * refered to as a "project identifier" in the man page.  In
-        * order to maximize the chance of getting a unique key, the
-        * project identifier is a "random character" produced by
-        * generating a random number between 0 and 25 and then adding
-        * that to the ascii value of 'a'.  The "seed" for the random
-        * number is the millisecond value that is set in the timeb
-        * structure after calling ftime().
-        */
-       ftime(&time_info);
-       srandom((unsigned int)time_info.millitm);
-
-       ipc_key = ftok(curdir, ascii_a + random() % 26);
-       if (ipc_key == -1)
-               tst_brkm(TBROK | TERRNO, cleanup, "ftok");
-
-       return ipc_key;
-}
-
-/*
- * getuserid() - return the integer value for the "user" id
- */
-int getuserid(char *user)
-{
-       struct passwd *ent;
-
-       ent = getpwnam(user);
-       if (ent == NULL)
-               tst_brkm(TBROK | TERRNO, cleanup, "getpwnam");
-
-       return ent->pw_uid;
-}
-
-/*
- * rm_shm() - removes a shared memory segment.
- */
-void rm_shm(int shm_id)
-{
-       if (shm_id == -1)
-               return;
-
-       /*
-        * check for # of attaches ?
-        */
-       if (shmctl(shm_id, IPC_RMID, NULL) == -1) {
-               tst_resm(TINFO, "WARNING: shared memory deletion failed.");
-               tst_resm(TINFO, "This could lead to IPC resource

problems.");

testcases/kernel/mem/hugetlb/lib/libipc.c deleted +0 -7

-               tst_resm(TINFO, "id = %d", shm_id);
-       }
-}
-
-void help(void)
-{
-       printf("    -s NUM  Set the number of hugepages to be

allocated\n");
-}
--
1.8.3.1

--
Mailing list info: http://lists.linux.it/listinfo/ltp

Hi!

testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c static void cleanup(void) · line 291

Quoted 2 lines

testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c +1 -1

-static void setup(void)
+void setup(void)

This is wrong. What you should do instead is:

* Remove the cleanup() and setup() definitions from the header from lib/

* Change the getipckey() and getuserid() to have the callback pointer as their first parameter and pass the cleanup callback in the testcases.