Remove code that is #if 0'd away from hugeutils.c.
Signed-off-by: Nishanth Aravamudan <[EMAIL PROTECTED]>
diff --git a/hugeutils.c b/hugeutils.c
index cb49ed6..9249628 100644
--- a/hugeutils.c
+++ b/hugeutils.c
@@ -54,38 +54,6 @@ int sharing; /* =0 */
/********************************************************************/
#define BUF_SZ 256
-#if 0
-
-struct linebuf {
- char buf[LINE_SZ];
-};
-
-static char *get_line(int fd, struct linebuf *buf)
-{
-}
-
-static int get_line(int fd, char *buf, int bufsize, int tailoffset)
-{
- int tailsize = bufsize - tailoffset;
- int datalen;
- int rc;
-
- if (tailsize < 0) {
- /* Chew remainders */
- }
-
- if (tailoffset)
- memmove(buf, buf + lastline, bufsize - lastline);
-
- rc = read(fd, buf + tailsize, bufsize - tailsize);
-
- if (tail) {
-
- }
-}
-
-#endif
-
#define MEMINFO_SIZE 2048
static long read_meminfo(const char *tag)
@@ -582,122 +550,3 @@ long hugetlbfs_num_pages(void)
{
return read_meminfo("HugePages_Total:");
}
-
-#if 0
-
-int get_sysctl(char *file)
-{
- FILE* f;
- char buf[BUF_SZ];
-
- f = fopen(file, "r");
- if (!f) {
- printf("Failed to open %s for reading\n", file);
- return(-1);
- }
- fgets(buf, BUF_SZ, f);
- fclose(f);
- return atoi(buf);
-}
-
-int set_sysctl_str(char *file, char *str)
-{
- FILE* f;
-
- f = fopen(file, "w");
- if (!f) {
- printf("Unable to open %s for writing\n", file);
- return(-1);
- }
- fputs(str, f);
- fclose(f);
- return(0);
-}
-
-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);
-}
-
-int mount_hugetlbfs(char *mountpoint, size_t strsz)
-{
- char *cmd;
- size_t cmdsz;
-
- if (strsz > BUF_SZ || strsz < 20)
- return -1;
-
- cmdsz = (30 + strsz) * sizeof(char);
- cmd = malloc(cmdsz);
- if (!cmd)
- return -1;
-
-// snprintf(mountpoint, strsz, "/tmp/hugetlbfs");
-
- mkdir(mountpoint, 0777);
-
- snprintf(cmd, cmdsz, "mount -t hugetlbfs hugetlbfs %s", mountpoint);
- return (system(cmd));
-}
-
-int find_mount_hugetlbfs(char *mountpoint, size_t strsz)
-{
- int ret;
-
- ret = find_hugetlbfs_mount(mountpoint, strsz);
-
- switch (ret) {
- case 1:
- return mount_hugetlbfs(mountpoint, strsz);
- default:
- return ret;
- }
-}
-
-int set_nr_hugepages(int num)
-{
- return set_sysctl("/proc/sys/vm/nr_hugepages", num);
-}
-
-int alloc_hugepages(int num)
-{
- int cur_free = get_nr_free_huge_pages();
- int cur_total = get_nr_total_huge_pages();
- int cur_used = cur_total - cur_free;
- int ret;
-
- if (cur_free < num) {
- ret = set_nr_hugepages(cur_used + num);
- if (ret == -1)
- goto error;
- if (get_nr_free_huge_pages() < num)
- goto error;
- }
- return 0;
-error:
- printf("Failed to allocate enough huge pages\n");
- return -1;
-}
-
-int shmem_setup(int nr_hugepages)
-{
- int ret = 0;
- 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)
- ret = set_sysctl_str("/proc/sys/kernel/shmall", buf);
- if (get_sysctl("/proc/sys/kernel/shmmax") < bytes)
- ret += set_sysctl_str("/proc/sys/kernel/shmmax", buf);
- if (ret)
- return -1;
- else
- return 0;
-}
-#endif
--
Nishanth Aravamudan <[EMAIL PROTECTED]>
IBM Linux Technology Center
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Libhugetlbfs-devel mailing list
Libhugetlbfs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/libhugetlbfs-devel
