Merge branch 'develop'0.4

3 files changed, 69 insertions, 15 deletions

diff --git a/systemtap/src/ioriot.stp b/systemtap/src/ioriot.stp
index 9ea6a68..ee77263 100644
--- a/systemtap/src/ioriot.stp
+++ b/systemtap/src/ioriot.stp
@@ -71,6 +71,15 @@ function absolute_path (path) {
     return task_dentry_path(tc, pwd_dentry, pwd_mnt) . "/" . path;
 }
 
+# Stop probing after 1h (for safety)
+probe timer.s(3600) {
+    exit();
+}
+
+probe begin {
+    printf("#|capture_version=%d|\n", 2);
+}
+
 probe syscall.open.return, syscall.openat.return {
     if (execname() != "stapio") {
         pathname = user_string(@entry($filename))
@@ -100,6 +109,20 @@ probe syscall.lseek.return {
     }
 }
 
+probe syscall.llseek.return {
+    if(execname() != "stapio") {
+        printf("t=%d;:,i=%d:%d;:,o=%s;:,d=%d;:,O=%d;:,W=%d;:,b=%d;:,\n",
+                gettimeofday_ms(),
+                pid(),
+                tid(),
+                name,
+                @entry($fd),
+                (@entry($offset_high) << 32 | @entry($offset_low)),
+                @entry($whence),
+                $return);
+    }
+}
+
 probe syscall.fcntl.return {
     if(execname() != "stapio") {
         printf("t=%d;:,i=%d:%d;:,o=%s;:,d=%d;:,F=%d;:,G=%d;:,s=%d;:,\n",
@@ -583,9 +606,4 @@ probe syscall.exit_group {
     }
 }
 
-# Stop probing after 1h (for safety)
-probe timer.s(3600) {
-    exit();
-}
-
 # vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4
diff --git a/systemtap/src/javaioriot.stp b/systemtap/src/javaioriot.stp
index 3943971..b0e960c 100644
--- a/systemtap/src/javaioriot.stp
+++ b/systemtap/src/javaioriot.stp
@@ -71,6 +71,15 @@ function absolute_path (path) {
     return task_dentry_path(tc, pwd_dentry, pwd_mnt) . "/" . path;
 }
 
+# Stop probing after 1h (for safety)
+probe timer.s(3600) {
+    exit();
+}
+
+probe begin {
+    printf("#|capture_version=%d|\n", 2);
+}
+
 probe syscall.open.return, syscall.openat.return {
     if (execname() == "java") {
         pathname = user_string(@entry($filename))
@@ -100,6 +109,20 @@ probe syscall.lseek.return {
     }
 }
 
+probe syscall.llseek.return {
+    if(execname() == "java") {
+        printf("t=%d;:,i=%d:%d;:,o=%s;:,d=%d;:,O=%d;:,W=%d;:,b=%d;:,\n",
+                gettimeofday_ms(),
+                pid(),
+                tid(),
+                name,
+                @entry($fd),
+                (@entry($offset_high) << 32 | @entry($offset_low)),
+                @entry($whence),
+                $return);
+    }
+}
+
 probe syscall.fcntl.return {
     if(execname() == "java") {
         printf("t=%d;:,i=%d:%d;:,o=%s;:,d=%d;:,F=%d;:,G=%d;:,s=%d;:,\n",
@@ -583,9 +606,4 @@ probe syscall.exit_group {
     }
 }
 
-# Stop probing after 1h (for safety)
-probe timer.s(3600) {
-    exit();
-}
-
 # vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4
diff --git a/systemtap/src/targetedioriot.stp b/systemtap/src/targetedioriot.stp
index f72dc66..539b826 100644
--- a/systemtap/src/targetedioriot.stp
+++ b/systemtap/src/targetedioriot.stp
@@ -71,6 +71,15 @@ function absolute_path (path) {
     return task_dentry_path(tc, pwd_dentry, pwd_mnt) . "/" . path;
 }
 
+# Stop probing after 1h (for safety)
+probe timer.s(3600) {
+    exit();
+}
+
+probe begin {
+    printf("#|capture_version=%d|\n", 2);
+}
+
 probe syscall.open.return, syscall.openat.return {
     if (pid() == target()) {
         pathname = user_string(@entry($filename))
@@ -100,6 +109,20 @@ probe syscall.lseek.return {
     }
 }
 
+probe syscall.llseek.return {
+    if(pid() == target()) {
+        printf("t=%d;:,i=%d:%d;:,o=%s;:,d=%d;:,O=%d;:,W=%d;:,b=%d;:,\n",
+                gettimeofday_ms(),
+                pid(),
+                tid(),
+                name,
+                @entry($fd),
+                (@entry($offset_high) << 32 | @entry($offset_low)),
+                @entry($whence),
+                $return);
+    }
+}
+
 probe syscall.fcntl.return {
     if(pid() == target()) {
         printf("t=%d;:,i=%d:%d;:,o=%s;:,d=%d;:,F=%d;:,G=%d;:,s=%d;:,\n",
@@ -583,9 +606,4 @@ probe syscall.exit_group {
     }
 }
 
-# Stop probing after 1h (for safety)
-probe timer.s(3600) {
-    exit();
-}
-
 # vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4