51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
diff -up util-linux-2.20-rc2/sys-utils/ipcs.c.kzak util-linux-2.20-rc2/sys-utils/ipcs.c
|
|
--- util-linux-2.20-rc2/sys-utils/ipcs.c.kzak 2011-08-12 11:13:00.000000000 +0200
|
|
+++ util-linux-2.20-rc2/sys-utils/ipcs.c 2011-08-17 01:16:23.629928605 +0200
|
|
@@ -255,6 +255,28 @@ print_perms (int id, struct ipc_perm *ip
|
|
}
|
|
|
|
|
|
+static unsigned long long
|
|
+shminfo_from_proc(const char *name, unsigned long def)
|
|
+{
|
|
+ char path[256];
|
|
+ char buf[64];
|
|
+ FILE *f;
|
|
+ unsigned long long res = def;
|
|
+
|
|
+ if (!name)
|
|
+ return res;
|
|
+
|
|
+ snprintf(path, sizeof(path), "/proc/sys/kernel/%s", name);
|
|
+
|
|
+ if (!(f = fopen(path, "r")))
|
|
+ return res;
|
|
+ if (fgets(buf, sizeof(buf), f))
|
|
+ res = atoll(buf);
|
|
+ fclose(f);
|
|
+ return res;
|
|
+}
|
|
+
|
|
+
|
|
void do_shm (char format)
|
|
{
|
|
int maxid, shmid, id;
|
|
@@ -277,12 +299,12 @@ void do_shm (char format)
|
|
return;
|
|
/* glibc 2.1.3 and all earlier libc's have ints as fields
|
|
of struct shminfo; glibc 2.1.91 has unsigned long; ach */
|
|
- printf (_("max number of segments = %lu\n"),
|
|
- (unsigned long) shminfo.shmmni);
|
|
- printf (_("max seg size (kbytes) = %lu\n"),
|
|
- (unsigned long) (shminfo.shmmax >> 10));
|
|
+ printf (_("max number of segments = %llu\n"),
|
|
+ shminfo_from_proc("shmmni", shminfo.shmmni));
|
|
+ printf (_("max seg size (kbytes) = %llu\n"),
|
|
+ (shminfo_from_proc("shmmax", shminfo.shmmax) >> 10));
|
|
printf (_("max total shared memory (kbytes) = %llu\n"),
|
|
- getpagesize() / 1024 * (unsigned long long) shminfo.shmall);
|
|
+ getpagesize() / 1024 * shminfo_from_proc("shmall", shminfo.shmall));
|
|
printf (_("min seg size (bytes) = %lu\n"),
|
|
(unsigned long) shminfo.shmmin);
|
|
return;
|