summaryrefslogtreecommitdiffstats
path: root/runtime/probes/shellsnoop
diff options
context:
space:
mode:
authortrz <trz>2005-06-21 14:13:01 +0000
committertrz <trz>2005-06-21 14:13:01 +0000
commitaac3ed25e8dc7355b5f28fae2878f644df14ef7d (patch)
treec2d284ccffb7dd9a82b000bd9c7152e5abbf160f /runtime/probes/shellsnoop
parentbd2b1e6816b486d5c85a4693f0b3579df4376ed5 (diff)
downloadsystemtap-steved-aac3ed25e8dc7355b5f28fae2878f644df14ef7d.tar.gz
systemtap-steved-aac3ed25e8dc7355b5f28fae2878f644df14ef7d.tar.xz
systemtap-steved-aac3ed25e8dc7355b5f28fae2878f644df14ef7d.zip
Added merging/sorting of per-cpu data, transport config/selection by probe, etc
Diffstat (limited to 'runtime/probes/shellsnoop')
-rw-r--r--runtime/probes/shellsnoop/shellsnoop.c12
-rwxr-xr-xruntime/probes/shellsnoop/stp23
2 files changed, 19 insertions, 16 deletions
diff --git a/runtime/probes/shellsnoop/shellsnoop.c b/runtime/probes/shellsnoop/shellsnoop.c
index 86d2e54d..21ad6b18 100644
--- a/runtime/probes/shellsnoop/shellsnoop.c
+++ b/runtime/probes/shellsnoop/shellsnoop.c
@@ -1,7 +1,17 @@
#define STP_NETLINK_ONLY
#define STP_NUM_STRINGS 1
+
+static unsigned n_subbufs = 4;
+static unsigned subbuf_size = 65536;
+
#include "runtime.h"
+#ifdef STP_NETLINK_ONLY
+static int transport_mode = STP_TRANSPORT_NETLINK;
+#else
+static int transport_mode = STP_TRANSPORT_RELAYFS;
+#endif
+
#define NEED_INT64_VALS
#define NEED_STRING_VALS
@@ -118,7 +128,7 @@ int init_module(void)
return -1;
}
- if (_stp_transport_open(n_subbufs, subbuf_size, pid) < 0) {
+ if (_stp_transport_open(transport_mode, n_subbufs, subbuf_size, pid) < 0) {
printk("init_module: Couldn't open transport\n");
return -1;
}
diff --git a/runtime/probes/shellsnoop/stp b/runtime/probes/shellsnoop/stp
index ac5472f8..4baf70ff 100755
--- a/runtime/probes/shellsnoop/stp
+++ b/runtime/probes/shellsnoop/stp
@@ -7,8 +7,8 @@ else
exit
fi
-RELAYFS=`grep " relayfs_mmap" /proc/kallsyms`
-if [ "$RELAYFS" == "" ]
+RELAYFS=`lsmod | grep relayfs |awk '{print $1}'`
+if [ "$RELAYFS" != "relayfs" ]
then
/sbin/insmod ../../relayfs/relayfs.ko
fi
@@ -32,18 +32,11 @@ fi
#/sbin/insmod $modulename
-# print to screen only, 4 8K buffers
-#../../stpd/stpd -p -b 8192 -n 4
+# print to screen only
+#../../stpd/stpd -p $modulename
-# print to screen
-../../stpd/stpd -b 8192 -n 4 $modulename
-
-# log to files (relayfs), 4 8K buffers
-#../../stpd/stpd -r -b 65536 -n 4 $modulename
-
-# print to screen and log to files, 4 8K buffers
-#../../stpd/stpd -b 8192 -n 4
-
-# no screen or log
-#../../stpd/stpd -q -b 8192 -n 4
+# print to screen and log to files (file logging only if #define STP_NETLINK_ONLY commented out in module)
+../../stpd/stpd $modulename
+# no screen, log to files (file logging only if #define STP_NETLINK_ONLY commented out in module)
+#../../stpd/stpd -q $modulename