FS parsing with review comments by Serge.

Signed-off-by: Anjali Kulkarni <[email protected]>

Author: anjalidk

Makefile

@@ -1,7 +1,7 @@
 CC = gcc
 CFLAGS = -g -Wall -Werror -fPIC -std=gnu99
-DEPS = resource.h resource_impl.h resmem.h resnet.h resproc.h resvm.h rescpu.h
-OBJ = resource.o resmem.o resnet.o resproc.o reskern.o resvm.o rescpu.o
+DEPS = resource.h resource_impl.h resmem.h resnet.h resproc.h resvm.h rescpu.h resfs.h
+OBJ = resource.o resmem.o resnet.o resproc.o reskern.o resvm.o rescpu.o resfs.o
 TEST = test
 RM = rm -rf
 CP = cp

resfs.c

@@ -0,0 +1,79 @@
+/* Copyright (C) 2023, Oracle and/or its affiliates. All rights reserved
+ *
+ * This file is part of libresource.
+ *
+ * libresource is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * libresource 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libresource. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _RESOURCE_H
+#include "resource.h"
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include "resfs.h"
+#include "resource_impl.h"
+#include <errno.h>
+#include <libgen.h>
+
+int getfsinfo(int res_id, void *out, size_t sz, void **hint, int flags)
+{
+	int ret;
+	unsigned long long *fs;
+	char buffer[512];
+
+	switch (res_id) {
+	case FS_AIONR:
+		ret = file_to_buf(AIONR, buffer, sizeof(buffer));
+		if (ret <= 0)
+			return -1;
+		ret = sscanf(buffer, "%Lu", (unsigned long long *) out);
+		if (ret != 1)
+			return -1;
+		break;
+	case FS_AIOMAXNR:
+		ret = file_to_buf(AIOMAXNR, buffer, sizeof(buffer));
+		if (ret <= 0)
+			return -1;
+		ret = sscanf(buffer, "%Lu", (unsigned long long *) out);
+		if (ret != 1)
+			return -1;
+		break;
+	case FS_FILENR:
+		fs = (unsigned long long *) out;
+		ret = file_to_buf(FILENR, buffer, sizeof(buffer));
+		if (ret <= 0)
+			return -1;
+		ret = sscanf(buffer, "%Lu %Lu %Lu", &fs[0], &fs[1], &fs[2]);
+		if (ret != 3)
+			return -1;
+		break;
+	case FS_FILEMAXNR:
+		ret = file_to_buf(FILEMAXNR, buffer, sizeof(buffer));
+		if (ret <= 0)
+			return -1;
+		ret = sscanf(buffer, "%Lu", (unsigned long long *) out);
+		if (ret != 1)
+			return -1;
+		break;
+	default:
+		eprintf("Resource Id is invalid");
+		errno = EINVAL;
+		return -1;
+	}
+	return 0;
+
+}
+

resfs.h

@@ -0,0 +1,28 @@
+/* Copyright (C) 2023, Oracle and/or its affiliates. All rights reserved
+ *
+ * This file is part of libresource.
+ *
+ * libresource is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * libresource 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libresource. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _RESFS_H
+#define _RESFS_H
+
+#define AIONR "/proc/sys/fs/aio-nr"
+#define AIOMAXNR "/proc/sys/fs/aio-max-nr"
+#define FILENR "/proc/sys/fs/file-nr"
+#define FILEMAXNR "/proc/sys/fs/file-max"
+
+extern int getfsinfo(int res_id, void *out, size_t sz, void **hint, int flags);
+#endif /* _RESFS_H */

resource.c

@@ -32,6 +32,7 @@
 #include "resproc.h"
 #include "resvm.h"
 #include "rescpu.h"
+#include "resfs.h"
 
 /* Allocate memory for bulk resource information and initiate it
  * properly.
@@ -198,6 +199,9 @@ int res_read(int res_id, void *out, size_t out_sz, void **hint, int pid, int fla
 
 	if (res_id >= CPU_MIN && res_id < CPU_MAX)
 		return getcpuinfo(res_id, out, out_sz, hint, flags);
+
+	if (res_id >= FS_MIN && res_id < FS_MAX)
+		return getfsinfo(res_id, out, out_sz, hint, flags);
 	return 0;
 }
 

resource.h

@@ -134,6 +134,13 @@ typedef struct res_blk {
 #define RES_CPU_CORECOUNT		6002
 #define CPU_MAX 			6010
 
+#define FS_MIN                          8000
+#define FS_AIONR                        8001
+#define FS_AIOMAXNR                     8002
+#define FS_FILENR                       8003
+#define FS_FILEMAXNR                    8004
+#define FS_MAX                          8010
+
 /* Structure to return RES_MEM_INFOALL resource information */
 typedef struct res_mem_infoall {
 	size_t memfree;

test.c

@@ -52,6 +52,21 @@ void print_vmstat()
 	printf("\n");
 }
 
+void print_fs()
+{
+        unsigned long long fs_value, val[3];
+
+        res_read(FS_AIONR, &fs_value, sizeof(fs_value), NULL, 0, 0);
+        printf("FS_AIONR : %Lu\n",fs_value);
+        res_read(FS_AIOMAXNR, &fs_value, sizeof(fs_value), NULL, 0, 0);
+        printf("FS_AIOMAXNR : %Lu\n",fs_value);
+        res_read(FS_FILENR, &val, sizeof(val), NULL, 0, 0);
+        printf("FS_FILENR : %Lu %Lu %Lu\n",val[0], val[1], val[2]);
+        res_read(FS_FILEMAXNR, &fs_value, sizeof(fs_value), NULL, 0, 0);
+        printf("FS_FILEMAXNR : %Lu\n",fs_value);
+        printf("\n");
+}
+
 void print_cpuinfo()
 {
 	struct cpuinfo *cpu;
@@ -81,4 +96,7 @@ int main(int argc, char **argv)
 
 	/* CPUINFO */
 	print_cpuinfo();
+
+	/* FS */
+	print_fs();
 }