summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasami Hiramatsu <mhiramat@redhat.com>2008-04-30 11:52:32 -0400
committerMasami Hiramatsu <mhiramat@redhat.com>2008-04-30 11:52:32 -0400
commit453b58eda7e347076a7df00ce9d15bb0e92f6d66 (patch)
treefa72419fe0b620f311e1e988f64ce00cb9f85324
parent3b5ab982d758481ccd5003348391bea0b775d34b (diff)
downloadsystemtap-steved-453b58eda7e347076a7df00ce9d15bb0e92f6d66.tar.gz
systemtap-steved-453b58eda7e347076a7df00ce9d15bb0e92f6d66.tar.xz
systemtap-steved-453b58eda7e347076a7df00ce9d15bb0e92f6d66.zip
PR6008: Increase the limitation of the buffer size to 4095MB.
-rw-r--r--ChangeLog6
-rw-r--r--main.cxx4
-rw-r--r--runtime/staprun/ChangeLog7
-rw-r--r--runtime/staprun/common.c6
-rw-r--r--staprun.8.in2
5 files changed, 19 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index a18df886..617ec435 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-30 Masami Hiramatsu <mhiramat@redhat.com>
+
+ PR 6008
+ * main.cxx (main): Increase the limitation of buffer size to 4095MB.
+ * staprun.8.in: Ditto.
+
2008-04-29 Frank Ch. Eigler <fche@elastic.org>
PR 6466
diff --git a/main.cxx b/main.cxx
index 15016435..6546db11 100644
--- a/main.cxx
+++ b/main.cxx
@@ -482,9 +482,9 @@ main (int argc, char * const argv [])
case 's':
s.buffer_size = atoi (optarg);
- if (s.buffer_size < 1 || s.buffer_size > 64)
+ if (s.buffer_size < 1 || s.buffer_size > 4095)
{
- cerr << "Invalid buffer size (should be 1-64)." << endl;
+ cerr << "Invalid buffer size (should be 1-4095)." << endl;
usage (s, 1);
}
break;
diff --git a/runtime/staprun/ChangeLog b/runtime/staprun/ChangeLog
index 2c09f8e2..7880d92f 100644
--- a/runtime/staprun/ChangeLog
+++ b/runtime/staprun/ChangeLog
@@ -1,5 +1,12 @@
2008-04-30 Masami Hiramatsu <mhiramat@redhat.com>
+ PR 6008
+ * common.c (parse_args): Increase the limitation of the buffer size
+ to 4095MB.
+ * common.c (usage): Ditto.
+
+2008-04-30 Masami Hiramatsu <mhiramat@redhat.com>
+
* stapio.c (main): Fix a typo in a debug message.
* staprun.c (main): Ditto.
diff --git a/runtime/staprun/common.c b/runtime/staprun/common.c
index b716d27f..93da51d8 100644
--- a/runtime/staprun/common.c
+++ b/runtime/staprun/common.c
@@ -58,8 +58,8 @@ void parse_args(int argc, char **argv)
break;
case 'b':
buffer_size = (unsigned)atoi(optarg);
- if (buffer_size < 1 || buffer_size > 64) {
- err("Invalid buffer size '%d' (should be 1-64).\n", buffer_size);
+ if (buffer_size < 1 || buffer_size > 4095) {
+ err("Invalid buffer size '%d' (should be 1-4095).\n", buffer_size);
usage(argv[0]);
}
break;
@@ -130,7 +130,7 @@ void usage(char *prog)
err("-o FILE Send output to FILE.\n");
err("-b buffer size The systemtap module specifies a buffer size.\n");
err(" Setting one here will override that value. The\n");
- err(" value should be an integer between 1 and 64\n");
+ err(" value should be an integer between 1 and 4095 \n");
err(" which be assumed to be the buffer size in MB.\n");
err(" That value will be per-cpu in bulk mode.\n");
err("-L Load module and start probes, then detach.\n");
diff --git a/staprun.8.in b/staprun.8.in
index 679dda0f..ca976a4a 100644
--- a/staprun.8.in
+++ b/staprun.8.in
@@ -57,7 +57,7 @@ be in percpu files FILE_x where 'x' is the cpu number.
.B \-b BUFFER_SIZE
The systemtap module will specify a buffer size.
Setting one here will override that value. The value should be
-an integer between 1 and 64 which be assumed to be the
+an integer between 1 and 4095 which be assumed to be the
buffer size in MB. That value will be per-cpu if bulk mode is used.
.TP
.B \-L