Merge branch 'master' of git://sources.redhat.com/git/systemtap

Conflicts:

	cache.cxx

5 files changed, 7 insertions, 0 deletions

diff --git a/runtime/staprun/common.c b/runtime/staprun/common.c
index 010cab12..6a2ac77e 100644
--- a/runtime/staprun/common.c
+++ b/runtime/staprun/common.c
@@ -451,6 +451,7 @@ int send_request(int type, void *data, int len)
 	char buf[1024];
         int rc = 0;
 
+    STAP_PROBE3(stapio, send__ctlmsg, type, data, len);
 	/* Before doing memcpy, make sure 'buf' is big enough. */
 	if ((len + 4) > (int)sizeof(buf)) {
 		_err("exceeded maximum send_request size.\n");
diff --git a/runtime/staprun/mainloop.c b/runtime/staprun/mainloop.c
index 7125a7bb..45b142bc 100644
--- a/runtime/staprun/mainloop.c
+++ b/runtime/staprun/mainloop.c
@@ -485,6 +485,7 @@ int stp_main_loop(void)
     type = *(uint32_t *) recvbuf;
     data = (void *)(recvbuf + sizeof(uint32_t));
     nb -= sizeof(uint32_t);
+    STAP_PROBE3(staprun, recv__ctlmsg, type, data, nb);
 
     switch (type) {
 #if STP_TRANSPORT_VERSION == 1
diff --git a/runtime/staprun/staprun.c b/runtime/staprun/staprun.c
index 917990dc..554eecc8 100644
--- a/runtime/staprun/staprun.c
+++ b/runtime/staprun/staprun.c
@@ -202,6 +202,7 @@ static int remove_module(const char *name, int verb)
 	close_ctl_channel();
 
 	dbug(2, "removing module %s\n", name);
+	STAP_PROBE1(staprun, remove__module, name);
 	ret = delete_module (name, 0);
 	if (ret != 0) {
 		err("Error removing module '%s': %s.\n", name, strerror(errno));
diff --git a/runtime/staprun/staprun.h b/runtime/staprun/staprun.h
index 6af04042..0a1ca885 100644
--- a/runtime/staprun/staprun.h
+++ b/runtime/staprun/staprun.h
@@ -38,6 +38,9 @@
 /* Include config.h to pick up dependency for --prefix usage. */
 #include "config.h"
 
+/* For STAP_PROBE in staprun.c, staprun_funcs.c, mainloop.c and common.c */
+#include "sys/sdt.h"
+
 extern void eprintf(const char *fmt, ...);
 extern void switch_syslog(const char *name);
 
diff --git a/runtime/staprun/staprun_funcs.c b/runtime/staprun/staprun_funcs.c
index 669dc996..ed7f4fc3 100644
--- a/runtime/staprun/staprun_funcs.c
+++ b/runtime/staprun/staprun_funcs.c
@@ -94,6 +94,7 @@ int insert_module(const char *path, const char *special_options, char **options)
 		return -1;
 	}
 
+	STAP_PROBE1(staprun, insert__module, path);
 	/* Actually insert the module */
 	ret = init_module(file, sbuf.st_size, opts);
 	saved_errno = errno;