From: fche <fche>
Date: Fri, 22 Jun 2007 15:26:10 +0000 (+0000)
Subject: 2007-06-22  Frank Ch. Eigler  <fche@elastic.org>
X-Git-Tag: release-0.5.14~21
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=126c384c1325e1cdd391dc15a6d601d893b8f985;p=systemtap.git

2007-06-22  Frank Ch. Eigler  <fche@elastic.org>

	* syscalls_cfg_trunc.stp: New file for configuration global.
	* syscalls.stp (add_key, mount), syscalls2.stp (write):
	Use parameter.
---

diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index 99d377294..96850d17e 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-22  Frank Ch. Eigler  <fche@elastic.org>
+
+	* syscalls_cfg_trunc.stp: New file for configuration global.
+	* syscalls.stp (add_key, mount), syscalls2.stp (write):
+	Use parameter.
+
 2007-06-15  Martin Hunt  <hunt@redhat.com>
 
 	* syscalls.stp: Add sys_fcntl64, sys_oabi_fstat64, 
@@ -7,7 +13,7 @@
 
 2007-06-14  Mike Mason <mmlnx@us.ibm.com>
 
-        * socket.stp: removed extra assignment to "size" in 
+	* socket.stp: removed extra assignment to "size" in 
 	socket.aio_write.return
 
 2007-06-07  Martin Hunt  <hunt@redhat.com>
diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp
index 841f9f438..ba52cc093 100644
--- a/tapset/syscalls.stp
+++ b/tapset/syscalls.stp
@@ -83,7 +83,7 @@ probe syscall.add_key = kernel.function("sys_add_key") ? {
 	argstr = sprintf("%s, %s, %s, %d, %d", 
 			user_string_quoted($_type),
 			user_string_quoted($_description),
-			text_strn(user_string($_payload),20,1),
+			text_strn(user_string($_payload),syscall_string_trunc,1),
 			$plen, $ringid)
 }
 probe syscall.add_key.return = kernel.function("sys_add_key").return ? {
@@ -2071,7 +2071,7 @@ probe syscall.mount =
 	filesystemtype = user_string($type)
 	mountflags = $flags
 	mountflags_str = _mountflags_str($flags)
-	data = text_strn(user_string($data),30,1)
+	data = text_strn(user_string($data),syscall_string_trunc,1)
 	argstr = sprintf("%s, %s, %s, %s, %s", 
 		user_string_quoted($dev_name), 
 		user_string_quoted($dir_name), 
diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index 831067ad4..fec0dc552 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -2488,7 +2488,7 @@ probe syscall.write = kernel.function("sys_write") {
 	fd = $fd
 	buf_uaddr = $buf
 	count = $count
-	argstr = sprintf("%d, %s, %d", $fd, text_strn(user_string($buf),20,1), $count)
+	argstr = sprintf("%d, %s, %d", $fd, text_strn(user_string($buf),syscall_string_trunc,1), $count)
 }
 probe syscall.write.return = kernel.function("sys_write").return {
 	name = "write"
diff --git a/tapset/syscalls_cfg_trunc.stp b/tapset/syscalls_cfg_trunc.stp
new file mode 100644
index 000000000..8fe227653
--- /dev/null
+++ b/tapset/syscalls_cfg_trunc.stp
@@ -0,0 +1,3 @@
+
+# Default length for string truncation in e.g. read/write syscall arguments.
+global syscall_string_trunc = 50