From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 02/13] ipcs: add /proc and /sys path definitions
Date: Sun, 14 Oct 2012 21:22:14 +0100 [thread overview]
Message-ID: <1350246145-10600-3-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1350246145-10600-1-git-send-email-kerolasa@iki.fi>
The necessary proc and sysfs files are tested to be present. When
information files are missing the ipcs will use obsolted systems, and
data structures, as fallback.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
include/pathnames.h | 11 +++++++++++
sys-utils/ipcs.c | 21 +++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/include/pathnames.h b/include/pathnames.h
index d0ed7a1..99b8417 100644
--- a/include/pathnames.h
+++ b/include/pathnames.h
@@ -150,5 +150,16 @@
/* wdctl path */
#define _PATH_WATCHDOG_DEV "/dev/watchdog"
+/* ipc paths */
+#define _PATH_PROC_IPCMSG "/proc/sysvipc/msg"
+#define _PATH_PROC_IPCSEM "/proc/sysvipc/sem"
+#define _PATH_PROC_IPCSHM "/proc/sysvipc/shm"
+#define _PATH_PROC_IPC_MSGMAX "/proc/sys/kernel/msgmax"
+#define _PATH_PROC_IPC_MSGMNB "/proc/sys/kernel/msgmnb"
+#define _PATH_PROC_IPC_MSGMNI "/proc/sys/kernel/msgmni"
+#define _PATH_PROC_IPC_MSG "/proc/sys/kernel/sem"
+#define _PATH_PROC_IPC_SHMALL "/proc/sys/kernel/shmall"
+#define _PATH_PROC_IPC_SHMMNI "/proc/sys/kernel/shmmni"
+
#endif /* PATHNAMES_H */
diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c
index ca10c3d..900fc65 100644
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@ -34,6 +34,7 @@
#include "c.h"
#include "nls.h"
#include "closestream.h"
+#include "pathnames.h"
/*
* SHM_DEST and SHM_LOCKED are defined in kernel headers, but inside
@@ -167,6 +168,21 @@ struct proc_limits {
};
/* End of the /proc & /sys structures */
+static int test_ipc_proc_paths(void)
+{
+ if (access(_PATH_PROC_IPCMSG, F_OK) == 0 &&
+ access(_PATH_PROC_IPCSEM, F_OK) == 0 &&
+ access(_PATH_PROC_IPCSHM, F_OK) == 0 &&
+ access(_PATH_PROC_IPC_MSGMAX, F_OK) == 0 &&
+ access(_PATH_PROC_IPC_MSGMNB, F_OK) == 0 &&
+ access(_PATH_PROC_IPC_MSGMNI, F_OK) == 0 &&
+ access(_PATH_PROC_IPC_MSG, F_OK) == 0 &&
+ access(_PATH_PROC_IPC_SHMALL, F_OK) == 0 &&
+ access(_PATH_PROC_IPC_SHMMNI, F_OK) == 0)
+ return 1;
+ return 0;
+}
+
void do_shm (char format);
void do_sem (char format);
void do_msg (char format);
@@ -203,6 +219,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
int main (int argc, char **argv)
{
int opt, msg = 0, sem = 0, shm = 0, id=0, print=0;
+ int use_proc = 0;
char format = 0;
static const struct option longopts[] = {
{"id", required_argument, NULL, 'i'},
@@ -269,6 +286,10 @@ int main (int argc, char **argv)
}
}
+ use_proc = test_ipc_proc_paths();
+ if (!use_proc)
+ warnx(_("using unreliable syscalls"));
+
if (print) {
if (shm)
print_shm (id);
--
1.7.12.3
next prev parent reply other threads:[~2012-10-14 20:22 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-14 20:22 [PATCH 00/13] make ipcs to use proc Sami Kerola
2012-10-14 20:22 ` [PATCH 01/13] ipcs: add data structures to read state from /proc & /sys Sami Kerola
2012-10-14 20:22 ` Sami Kerola [this message]
2012-11-05 16:43 ` [PATCH 02/13] ipcs: add /proc and /sys path definitions Karel Zak
2012-10-14 20:22 ` [PATCH 03/13] ipcs: determine ipc limits from /proc Sami Kerola
2012-10-15 2:00 ` Mike Frysinger
2012-11-05 16:49 ` Karel Zak
2012-10-14 20:22 ` [PATCH 04/13] ipcs: add new permissions printing function Sami Kerola
2012-10-14 20:22 ` [PATCH 05/13] ipcs: read shared memory values from /proc Sami Kerola
2012-10-15 2:07 ` Mike Frysinger
2012-10-14 20:22 ` [PATCH 06/13] ipcs: read message queue " Sami Kerola
2012-10-14 20:22 ` [PATCH 07/13] ipsc: read semaphore " Sami Kerola
2012-10-14 20:22 ` [PATCH 08/13] ipcs: clean up permissions printing Sami Kerola
2012-10-14 20:22 ` [PATCH 09/13] ipcs: make individual shared memory id printing to use /proc Sami Kerola
2012-11-05 16:53 ` Karel Zak
2012-10-14 20:22 ` [PATCH 10/13] ipcs: make individual message queue " Sami Kerola
2012-10-14 20:22 ` [PATCH 11/13] ipcs: make individual semaphore " Sami Kerola
2012-10-14 20:22 ` [PATCH 12/13] ipcs: validate numeric user input Sami Kerola
2012-10-14 20:22 ` [PATCH 13/13] docs: update TODO Sami Kerola
[not found] ` <20121015153924.GL18377@x2.net.home>
2012-10-22 20:23 ` [PATCH 00/13] make ipcs to use proc Sami Kerola
2012-11-05 16:42 ` Karel Zak
2012-11-07 9:40 ` Sami Kerola
2012-11-07 10:01 ` Karel Zak
2012-11-11 23:01 ` Sami Kerola
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350246145-10600-3-git-send-email-kerolasa@iki.fi \
--to=kerolasa@iki.fi \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).