Commit: e9ffd7fe1f9e7b52310aeacf1fd585175d971795 - ogatool (git)

oga's tools

Commit MetaInfo

• Revision: e9ffd7fe1f9e7b52310aeacf1fd585175d971795 (tree)
• Time: 2024-05-01 00:14:05
• Author: hyperoga <hyperoga@gmai...>
• Commiter: hyperoga

Log Message

V1.03 support ext meminfo file

Change Summary

• modified: cmem.c

Incremental Difference

--- a/cmem.c
+++ b/cmem.c
@@ -4,6 +4,7 @@
  *    2001/12/09 V1.00 based xmem V0.33 by oga.
  *    2005/09/11 V1.01 support Linux 2.6.x
  *    2022/05/22 V1.02 add description to usage
+ *    2024/02/05 V1.03 support ext meminfo file
  */
 
 #include <stdio.h>
@@ -13,7 +14,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#define VER	"Ver 1.02"
+#define VER	"Ver 1.03"
 #define S_MEM	"Memory"
 #define S_SWAP	"Swap"
 
@@ -23,7 +24,8 @@
 #define dprintf if (vf) printf
 
 /* globals */
-int	vf = 0;		/* verbose flag */
+int	vf = 0;		             /* verbose flag */
+char    *meminfo = "/proc/meminfo";  /* meminfo file V1.03-A */
 
 #ifdef COMMENT
    (MB)0        10        20        30        40        50        60        70
@@ -163,8 +165,9 @@ void get_memdata(mem_t *mem)
     char buf[1024];
     char *pt;
 
-    if (!(fp = fopen("/proc/meminfo","r"))) {
-        perror("fopen /proc/meminfo");
+    if (!(fp = fopen(meminfo, "r"))) {      /* V1.03-C */
+    	sprintf(buf, "fopen %s", meminfo);  /* V1.03-C */
+        perror(buf);                        /* V1.03-C */
         exit(1);
     }
     fgets(buf,sizeof(buf),fp);	/* skip header   */
@@ -458,13 +461,18 @@ int main(int a, char *b[])
 
 	for (i = 1; i<a ; i++) {
 		if (!strncmp(b[i],"-h",2)) {
-			printf("usage : cmem [-update <time>]\n");
+			printf("usage : cmem [-update <time>] [-memfile <meminfo_file>]\n");
 			printf("        # : used\n");
 			printf("        * : cached\n");
 			printf("        = : buffers\n");
 			printf("        . : free\n");
 			exit(1);
 		}
+		/* V1.03-A start */
+		if (!strncmp(b[i],"-m",2) && a > i) {
+			meminfo = b[++i];		/* meminfo file*/
+		}
+		/* V1.03-A end   */
 		if (!strncmp(b[i],"-u",2) && a > i) {
 			wait = atoi(b[++i]);		/* update time */
 		}
@@ -539,9 +547,9 @@ int main(int a, char *b[])
 		for (i = 1; i<8; i++) {
 		    if (UNIT >= 20 && i == 7) {
 		        /* max 79char */
-		        printf("      %-3d", i*UNIT);
+		        printf("      %-4d", i*UNIT);
 		    } else {
-		        printf("       %-3d", i*UNIT);
+		        printf("      %-4d", i*UNIT);
 		    }
 		}
 		printf("\n");