2005-08-19 Martin Hunt <hunt@redhat.com>

	* shellsnoop/shellsnoop.c: Remove STP_NETLINK_ONLY.
	* stp: Deleted. Use stpd directly.

9 files changed, 16 insertions, 61 deletions

diff --git a/runtime/probes/ChangeLog b/runtime/probes/ChangeLog
index e3951a6b..2ef9236f 100644
--- a/runtime/probes/ChangeLog
+++ b/runtime/probes/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-19  Martin Hunt  <hunt@redhat.com>
+
+	* shellsnoop/shellsnoop.c: Remove STP_NETLINK_ONLY.
+	* stp: Deleted. Use stpd directly.
+	
+
 2005-08-01  Martin Hunt  <hunt@redhat.com>
 
 	* agg/stat1.c (probe_exit): Remove "static"
@@ -14,6 +20,11 @@
 	* os_timer/os_timer.c (probe_exit): Ditto.
 	* scf/scf.c (probe_exit): Ditto.
 
+2005-07-28  Martin Hunt  <hunt@redhat.com>
+
+	* bench/ALL: Chnage to probe sys_getuid() and sys_getgid()
+	because those aren't used by stpd, unlike sys_read() and sys_write().
+
 2005-07-11  Martin Hunt  <hunt@redhat.com>
 
 	* build_probe: Set RELAYFS correctly.
diff --git a/runtime/probes/agg/stp b/runtime/probes/agg/stp
deleted file mode 100755
index f3feee70..00000000
--- a/runtime/probes/agg/stp
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-source ../stp
diff --git a/runtime/probes/scf/stp b/runtime/probes/scf/stp
deleted file mode 100755
index f3feee70..00000000
--- a/runtime/probes/scf/stp
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-source ../stp
diff --git a/runtime/probes/shellsnoop/shellsnoop.c b/runtime/probes/shellsnoop/shellsnoop.c
index db635d23..6c5458f5 100644
--- a/runtime/probes/shellsnoop/shellsnoop.c
+++ b/runtime/probes/shellsnoop/shellsnoop.c
@@ -1,6 +1,6 @@
-#define STP_NETLINK_ONLY
+//#define STP_RELAYFS
 #define STP_NUM_STRINGS 1
-
+#define STP_STRING_SIZE 8192
 #include "runtime.h"
 
 #define NEED_INT64_VALS
@@ -50,10 +50,10 @@ int inst_do_execve (char * filename, char __user *__user *argv, char __user *__u
 struct file * inst_filp_open (const char * filename, int flags, int mode)
 {
   _stp_map_key_int64 (pids, current->pid);
-  if (_stp_map_get_int64 (pids))
+  if (_stp_map_get_int64 (pids)) {
     _stp_printf ("%d\t%d\t%s\tO %s\n", current->pid, current->parent->pid, current->comm, filename);
-
-  _stp_print_flush();
+    _stp_print_flush();
+  }
   jprobe_return();
   return 0;
 }
diff --git a/runtime/probes/shellsnoop/stp b/runtime/probes/shellsnoop/stp
deleted file mode 100755
index f3feee70..00000000
--- a/runtime/probes/shellsnoop/stp
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-source ../stp
diff --git a/runtime/probes/stp b/runtime/probes/stp
deleted file mode 100755
index f045a9e5..00000000
--- a/runtime/probes/stp
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-if [ -n "$1" ]
-then
-    modulename=$1
-else
-    echo "Usage: stp modulename"
-    exit
-fi
-
-RELAYFS=`grep " relayfs_poll" /boot/System.map-\`uname -r\``
-if [ -z "$RELAYFS" ]
-then
-    RELAYFS=`lsmod | grep relayfs`
-    if [ -z "$RELAYFS" ]
-    then
-	/sbin/insmod ../../relayfs/relayfs.ko
-    fi
-fi
-
-if [ ! -d "/mnt/relay" ]
-then
-    mkdir /mnt/relay
-fi
-
-MOUNT=`mount | grep relayfs |awk '{print $1}'`
-if [ "$MOUNT" != "relayfs" ]
-then
-	mount -t relayfs relayfs /mnt/relay
-fi
-
-STP_CONTROL=`lsmod | grep stp_control |awk '{print $1}'`
-if [ "$STP_CONTROL" != "stp_control" ] 
-then
-	/sbin/insmod ../../transport/stp-control.ko
-fi
-
-# print to screen only
-#../../stpd/stpd -p $modulename
-
-# 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
diff --git a/runtime/probes/tasklet/stp b/runtime/probes/tasklet/stp
deleted file mode 100755
index f3feee70..00000000
--- a/runtime/probes/tasklet/stp
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-source ../stp
diff --git a/runtime/probes/test4/stp b/runtime/probes/test4/stp
deleted file mode 100755
index f3feee70..00000000
--- a/runtime/probes/test4/stp
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-source ../stp
diff --git a/runtime/probes/where_func/stp b/runtime/probes/where_func/stp
deleted file mode 100755
index f3feee70..00000000
--- a/runtime/probes/where_func/stp
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-source ../stp