[DTrace-devel] [PATCH] Remove most mentions of statusrate
eugene.loh at oracle.com
eugene.loh at oracle.com
Tue Apr 4 22:04:27 UTC 2023
From: Eugene Loh <eugene.loh at oracle.com>
In commit 92a4d218 ("Buffer consumption semantics fixes"), the
statusrate option was basically removed. Its last possible side
effect was removed in commit f07bcd76
("Use eventfd rather than a condition variable to signal process death")
when dtrace_sleep() was removed.
Therefore, remove most mentions of statusrate. Leave code and a
test in to ensure that legacy scripts that use statusrate are not
summarily rejected.
Signed-off-by: Eugene Loh <eugene.loh at oracle.com>
---
libdtrace/dt_options.c | 2 +-
test/stress/fbtprovider/tst.tailcall.d | 3 +-
test/stress/fbtsafety/tst.basename.d | 3 +-
test/stress/fbtsafety/tst.caller.d | 4 +-
test/stress/fbtsafety/tst.cleanpath.d | 3 +-
test/stress/fbtsafety/tst.copyin.d | 9 ++---
test/stress/fbtsafety/tst.ddi_pathname.d | 3 +-
test/stress/fbtsafety/tst.dirname.d | 3 +-
test/stress/fbtsafety/tst.hton.d | 3 +-
test/stress/fbtsafety/tst.index.d | 3 +-
test/stress/fbtsafety/tst.msgdsize.d | 4 +-
test/stress/fbtsafety/tst.msgsize.d | 4 +-
test/stress/fbtsafety/tst.progenyof.d | 4 +-
test/stress/fbtsafety/tst.rw.d | 3 +-
test/stress/fbtsafety/tst.stack.d | 4 +-
test/stress/fbtsafety/tst.stackdepth.d | 4 +-
test/stress/fbtsafety/tst.stddev.d | 4 +-
test/stress/fbtsafety/tst.strchr.d | 3 +-
test/stress/fbtsafety/tst.strjoin.d | 3 +-
test/stress/fbtsafety/tst.strstr.d | 3 +-
test/stress/fbtsafety/tst.strtok.d | 3 +-
test/stress/fbtsafety/tst.substr.d | 3 +-
test/stress/fbtsafety/tst.uregs.d | 4 +-
test/stress/fbtsafety/tst.ustack.d | 4 +-
test/stress/fbtsafety/tst.ustackdepth.d | 4 +-
test/unittest/buffering/tst.cputime.sh | 3 +-
test/unittest/buffering/tst.fill1.d | 4 +-
test/unittest/fbtprovider/tst.entry.d | 3 +-
test/unittest/fbtprovider/tst.entryargs.d | 3 +-
test/unittest/fbtprovider/tst.functionentry.d | 3 +-
.../fbtprovider/tst.functionreturnvalue.d | 3 +-
test/unittest/fbtprovider/tst.ioctlargs.d | 3 +-
test/unittest/fbtprovider/tst.manyargs.d | 3 +-
test/unittest/fbtprovider/tst.offset.d | 3 +-
test/unittest/fbtprovider/tst.offsetzero.d | 3 +-
test/unittest/fbtprovider/tst.return.d | 3 +-
test/unittest/fbtprovider/tst.return0.d | 3 +-
test/unittest/fbtprovider/tst.tls.d | 3 +-
test/unittest/fbtprovider/tst.tls2.d | 3 +-
test/unittest/predicates/tst.predcache.sh | 4 +-
test/unittest/rates/tst.statusrate.d | 38 +++----------------
test/unittest/rates/tst.statusrate.r | 5 +--
42 files changed, 50 insertions(+), 130 deletions(-)
diff --git a/libdtrace/dt_options.c b/libdtrace/dt_options.c
index d25b2ac9..c9a161ae 100644
--- a/libdtrace/dt_options.c
+++ b/libdtrace/dt_options.c
@@ -1141,7 +1141,7 @@ static const dt_option_t _dtrace_rtoptions[] = {
{ "scratchsize", dt_opt_scratchsize, DTRACEOPT_SCRATCHSIZE },
{ "specsize", dt_opt_size, DTRACEOPT_SPECSIZE },
{ "stackframes", dt_opt_runtime, DTRACEOPT_STACKFRAMES },
- { "statusrate", dt_opt_rate, DTRACEOPT_STATUSRATE },
+ { "statusrate", dt_opt_rate, DTRACEOPT_STATUSRATE }, /* no longer does anything */
{ "strsize", dt_opt_strsize, DTRACEOPT_STRSIZE },
{ "ustackframes", dt_opt_runtime, DTRACEOPT_USTACKFRAMES },
{ "noresolve", dt_opt_runtime, DTRACEOPT_NORESOLVE },
diff --git a/test/stress/fbtprovider/tst.tailcall.d b/test/stress/fbtprovider/tst.tailcall.d
index 704718f7..0e5100ea 100644
--- a/test/stress/fbtprovider/tst.tailcall.d
+++ b/test/stress/fbtprovider/tst.tailcall.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -14,7 +14,6 @@
*/
#pragma D option quiet
-#pragma D option statusrate=10ms
fbt::ioctl:entry
{
diff --git a/test/stress/fbtsafety/tst.basename.d b/test/stress/fbtsafety/tst.basename.d
index 59dbbd7d..8d9a666a 100644
--- a/test/stress/fbtsafety/tst.basename.d
+++ b/test/stress/fbtsafety/tst.basename.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -8,7 +8,6 @@
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.caller.d b/test/stress/fbtsafety/tst.caller.d
index 9850d5bb..f104fdbd 100644
--- a/test/stress/fbtsafety/tst.caller.d
+++ b/test/stress/fbtsafety/tst.caller.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -14,12 +14,10 @@
* SECTION: Variables/Built-in Variables;
* Options and Tunables/bufsize;
* Options and Tunables/bufpolicy;
- * Options and Tunables/statusrate
*/
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.cleanpath.d b/test/stress/fbtsafety/tst.cleanpath.d
index d3b934dc..deccbbbb 100644
--- a/test/stress/fbtsafety/tst.cleanpath.d
+++ b/test/stress/fbtsafety/tst.cleanpath.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -8,7 +8,6 @@
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.copyin.d b/test/stress/fbtsafety/tst.copyin.d
index 8aecdfb4..2d0671fd 100644
--- a/test/stress/fbtsafety/tst.copyin.d
+++ b/test/stress/fbtsafety/tst.copyin.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -11,19 +11,18 @@
/*
* ASSERTION:
* We set our buffer size absurdly low to prevent a flood of errors that we
- * don't care about. We set our statusrate to be infinitely short to cause
- * lots of activity by the DTrace process.
+ * don't care about. We used to set our statusrate to be infinitely short
+ * to cause lots of activity by the DTrace process, but that option no longer
+ * does anything.
*
* SECTION: Actions and Subroutines/copyin();
* Options and Tunables/bufsize;
* Options and Tunables/bufpolicy;
- * Options and Tunables/statusrate
*/
#pragma D option bufsize=16
#pragma D option bufpolicy=ring
-#pragma D option statusrate=1nsec
syscall:::entry
{
diff --git a/test/stress/fbtsafety/tst.ddi_pathname.d b/test/stress/fbtsafety/tst.ddi_pathname.d
index 41ca04a4..d2cfd7b9 100644
--- a/test/stress/fbtsafety/tst.ddi_pathname.d
+++ b/test/stress/fbtsafety/tst.ddi_pathname.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -8,7 +8,6 @@
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.dirname.d b/test/stress/fbtsafety/tst.dirname.d
index 9bd0bf83..30ac9926 100644
--- a/test/stress/fbtsafety/tst.dirname.d
+++ b/test/stress/fbtsafety/tst.dirname.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -8,7 +8,6 @@
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.hton.d b/test/stress/fbtsafety/tst.hton.d
index 7bcd69e3..b6517866 100644
--- a/test/stress/fbtsafety/tst.hton.d
+++ b/test/stress/fbtsafety/tst.hton.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -8,7 +8,6 @@
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.index.d b/test/stress/fbtsafety/tst.index.d
index 4719297d..555b303b 100644
--- a/test/stress/fbtsafety/tst.index.d
+++ b/test/stress/fbtsafety/tst.index.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -8,7 +8,6 @@
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.msgdsize.d b/test/stress/fbtsafety/tst.msgdsize.d
index aefbc044..aebaf671 100644
--- a/test/stress/fbtsafety/tst.msgdsize.d
+++ b/test/stress/fbtsafety/tst.msgdsize.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -14,12 +14,10 @@
* SECTION: Actions and Subroutines/msgdsize();
* Options and Tunables/bufsize;
* Options and Tunables/bufpolicy;
- * Options and Tunables/statusrate
*/
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.msgsize.d b/test/stress/fbtsafety/tst.msgsize.d
index 2de123a6..c9fd7415 100644
--- a/test/stress/fbtsafety/tst.msgsize.d
+++ b/test/stress/fbtsafety/tst.msgsize.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -14,12 +14,10 @@
* SECTION: Actions and Subroutines/msgsize();
* Options and Tunables/bufsize;
* Options and Tunables/bufpolicy;
- * Options and Tunables/statusrate
*/
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.progenyof.d b/test/stress/fbtsafety/tst.progenyof.d
index 486455bd..2ffd96d1 100644
--- a/test/stress/fbtsafety/tst.progenyof.d
+++ b/test/stress/fbtsafety/tst.progenyof.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -13,12 +13,10 @@
* SECTION: Actions and Subroutines/progenyof();
* Options and Tunables/bufsize;
* Options and Tunables/bufpolicy;
- * Options and Tunables/statusrate
*/
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.rw.d b/test/stress/fbtsafety/tst.rw.d
index e571acc1..55ecf445 100644
--- a/test/stress/fbtsafety/tst.rw.d
+++ b/test/stress/fbtsafety/tst.rw.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -8,7 +8,6 @@
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.stack.d b/test/stress/fbtsafety/tst.stack.d
index 1c5269be..1b9a2d9d 100644
--- a/test/stress/fbtsafety/tst.stack.d
+++ b/test/stress/fbtsafety/tst.stack.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -13,12 +13,10 @@
* SECTION: Actions and Subroutines/stack();
* Options and Tunables/bufsize;
* Options and Tunables/bufpolicy;
- * Options and Tunables/statusrate
*/
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.stackdepth.d b/test/stress/fbtsafety/tst.stackdepth.d
index 8b7f10b2..b4aef585 100644
--- a/test/stress/fbtsafety/tst.stackdepth.d
+++ b/test/stress/fbtsafety/tst.stackdepth.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -14,12 +14,10 @@
* SECTION: Variables/Built-in Variables;
* Options and Tunables/bufsize;
* Options and Tunables/bufpolicy;
- * Options and Tunables/statusrate
*/
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.stddev.d b/test/stress/fbtsafety/tst.stddev.d
index 1d3a84a2..ab8dea5d 100644
--- a/test/stress/fbtsafety/tst.stddev.d
+++ b/test/stress/fbtsafety/tst.stddev.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -13,12 +13,10 @@
* SECTION: Actions and Subroutines/stddev();
* Options and Tunables/bufsize;
* Options and Tunables/bufpolicy;
- * Options and Tunables/statusrate
*/
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.strchr.d b/test/stress/fbtsafety/tst.strchr.d
index 920f9b45..2dc0b2d7 100644
--- a/test/stress/fbtsafety/tst.strchr.d
+++ b/test/stress/fbtsafety/tst.strchr.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -8,7 +8,6 @@
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.strjoin.d b/test/stress/fbtsafety/tst.strjoin.d
index a1e12424..54c0a02c 100644
--- a/test/stress/fbtsafety/tst.strjoin.d
+++ b/test/stress/fbtsafety/tst.strjoin.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -8,7 +8,6 @@
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.strstr.d b/test/stress/fbtsafety/tst.strstr.d
index c8317e54..3dd16e7a 100644
--- a/test/stress/fbtsafety/tst.strstr.d
+++ b/test/stress/fbtsafety/tst.strstr.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -8,7 +8,6 @@
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.strtok.d b/test/stress/fbtsafety/tst.strtok.d
index 878ce42e..757d81dc 100644
--- a/test/stress/fbtsafety/tst.strtok.d
+++ b/test/stress/fbtsafety/tst.strtok.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -8,7 +8,6 @@
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.substr.d b/test/stress/fbtsafety/tst.substr.d
index 929c65aa..86a79056 100644
--- a/test/stress/fbtsafety/tst.substr.d
+++ b/test/stress/fbtsafety/tst.substr.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -8,7 +8,6 @@
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.uregs.d b/test/stress/fbtsafety/tst.uregs.d
index 16a13b30..7e994158 100644
--- a/test/stress/fbtsafety/tst.uregs.d
+++ b/test/stress/fbtsafety/tst.uregs.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -12,13 +12,11 @@
* SECTION: Variables/Built-in Variables;
* Options and Tunables/bufsize;
* Options and Tunables/bufpolicy;
- * Options and Tunables/statusrate
*/
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.ustack.d b/test/stress/fbtsafety/tst.ustack.d
index 8c6cd8f7..65526d4a 100644
--- a/test/stress/fbtsafety/tst.ustack.d
+++ b/test/stress/fbtsafety/tst.ustack.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -13,12 +13,10 @@
* SECTION: Actions and Subroutines/ustack();
* Options and Tunables/bufsize;
* Options and Tunables/bufpolicy;
- * Options and Tunables/statusrate
*/
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/stress/fbtsafety/tst.ustackdepth.d b/test/stress/fbtsafety/tst.ustackdepth.d
index 3cc4540c..ad05fd93 100644
--- a/test/stress/fbtsafety/tst.ustackdepth.d
+++ b/test/stress/fbtsafety/tst.ustackdepth.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -14,12 +14,10 @@
* SECTION: Variables/Built-in Variables;
* Options and Tunables/bufsize;
* Options and Tunables/bufpolicy;
- * Options and Tunables/statusrate
*/
#pragma D option bufsize=1000
#pragma D option bufpolicy=ring
-#pragma D option statusrate=10ms
fbt:::
{
diff --git a/test/unittest/buffering/tst.cputime.sh b/test/unittest/buffering/tst.cputime.sh
index cde1fba0..bfc05011 100755
--- a/test/unittest/buffering/tst.cputime.sh
+++ b/test/unittest/buffering/tst.cputime.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -13,7 +13,6 @@ script()
$dtrace $dt_flags -s /dev/stdin -x bufpolicy=$1 $1 <<EOF
#pragma D option quiet
- #pragma D option statusrate=1hz
uint64_t total;
int thresh;
diff --git a/test/unittest/buffering/tst.fill1.d b/test/unittest/buffering/tst.fill1.d
index 087f5e3b..490fcc0c 100644
--- a/test/unittest/buffering/tst.fill1.d
+++ b/test/unittest/buffering/tst.fill1.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -14,7 +14,6 @@
* Buffers and Buffering/Buffer Sizes;
* Options and Tunables/bufsize;
* Options and Tunables/bufpolicy;
- * Options and Tunables/statusrate
*/
/*
* This is a brute-force way of testing fill buffers. We assume that each
@@ -23,7 +22,6 @@
*/
#pragma D option bufpolicy=fill
#pragma D option bufsize=64
-#pragma D option statusrate=10ms
#pragma D option quiet
int i;
diff --git a/test/unittest/fbtprovider/tst.entry.d b/test/unittest/fbtprovider/tst.entry.d
index 01a8d241..aba36952 100644
--- a/test/unittest/fbtprovider/tst.entry.d
+++ b/test/unittest/fbtprovider/tst.entry.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -17,7 +17,6 @@
/* @@trigger: futex */
#pragma D option quiet
-#pragma D option statusrate=10ms
BEGIN
{
diff --git a/test/unittest/fbtprovider/tst.entryargs.d b/test/unittest/fbtprovider/tst.entryargs.d
index 0226659b..104c97c7 100644
--- a/test/unittest/fbtprovider/tst.entryargs.d
+++ b/test/unittest/fbtprovider/tst.entryargs.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -15,7 +15,6 @@
/* @@trigger: futex */
#pragma D option quiet
-#pragma D option statusrate=10ms
BEGIN
{
diff --git a/test/unittest/fbtprovider/tst.functionentry.d b/test/unittest/fbtprovider/tst.functionentry.d
index 20837637..0243be9d 100644
--- a/test/unittest/fbtprovider/tst.functionentry.d
+++ b/test/unittest/fbtprovider/tst.functionentry.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -15,7 +15,6 @@
/* @@trigger: pid-tst-args1 */
#pragma D option quiet
-#pragma D option statusrate=10ms
fbt::SyS_ioctl:entry,
fbt::__arm64_sys_ioctl:entry,
diff --git a/test/unittest/fbtprovider/tst.functionreturnvalue.d b/test/unittest/fbtprovider/tst.functionreturnvalue.d
index 19c09e3d..1633ff9c 100644
--- a/test/unittest/fbtprovider/tst.functionreturnvalue.d
+++ b/test/unittest/fbtprovider/tst.functionreturnvalue.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -15,7 +15,6 @@
/* @@trigger: pid-tst-args1 */
#pragma D option quiet
-#pragma D option statusrate=10ms
fbt::SyS_ioctl:return,
fbt::__arm64_sys_ioctl:return,
diff --git a/test/unittest/fbtprovider/tst.ioctlargs.d b/test/unittest/fbtprovider/tst.ioctlargs.d
index 5850b07b..a064609a 100644
--- a/test/unittest/fbtprovider/tst.ioctlargs.d
+++ b/test/unittest/fbtprovider/tst.ioctlargs.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -15,7 +15,6 @@
/* @@trigger: pid-tst-args1 */
#pragma D option quiet
-#pragma D option statusrate=10ms
fbt::SyS_ioctl:entry,
fbt::__arm64_sys_ioctl:entry,
diff --git a/test/unittest/fbtprovider/tst.manyargs.d b/test/unittest/fbtprovider/tst.manyargs.d
index de1f22de..4afbb958 100644
--- a/test/unittest/fbtprovider/tst.manyargs.d
+++ b/test/unittest/fbtprovider/tst.manyargs.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -16,7 +16,6 @@
/*
#pragma D option quiet
*/
-#pragma D option statusrate=10ms
#pragma D option destructive
BEGIN
diff --git a/test/unittest/fbtprovider/tst.offset.d b/test/unittest/fbtprovider/tst.offset.d
index 4656281c..fa45cc81 100644
--- a/test/unittest/fbtprovider/tst.offset.d
+++ b/test/unittest/fbtprovider/tst.offset.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -15,7 +15,6 @@
/* @@trigger: pid-tst-args1 */
#pragma D option quiet
-#pragma D option statusrate=10ms
BEGIN
{
diff --git a/test/unittest/fbtprovider/tst.offsetzero.d b/test/unittest/fbtprovider/tst.offsetzero.d
index 8485f2f1..7f400c4d 100644
--- a/test/unittest/fbtprovider/tst.offsetzero.d
+++ b/test/unittest/fbtprovider/tst.offsetzero.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -15,7 +15,6 @@
/* @@trigger: pid-tst-args1 */
#pragma D option quiet
-#pragma D option statusrate=10ms
fbt::SyS_ioctl:entry,
fbt::__arm64_sys_ioctl:entry,
diff --git a/test/unittest/fbtprovider/tst.return.d b/test/unittest/fbtprovider/tst.return.d
index d966b05c..591b8b5c 100644
--- a/test/unittest/fbtprovider/tst.return.d
+++ b/test/unittest/fbtprovider/tst.return.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -15,7 +15,6 @@
/* @@trigger: pid-tst-args1 */
#pragma D option quiet
-#pragma D option statusrate=10ms
fbt::SyS_ioctl:return,
fbt::__arm64_sys_ioctl:return,
diff --git a/test/unittest/fbtprovider/tst.return0.d b/test/unittest/fbtprovider/tst.return0.d
index 0b7091b3..409f9ccd 100644
--- a/test/unittest/fbtprovider/tst.return0.d
+++ b/test/unittest/fbtprovider/tst.return0.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -12,7 +12,6 @@
*/
#pragma D option quiet
-#pragma D option statusrate=10ms
fbt::do_sys_poll:return
/arg1 == 0/
diff --git a/test/unittest/fbtprovider/tst.tls.d b/test/unittest/fbtprovider/tst.tls.d
index 9b65d7e1..6b8e9bf4 100644
--- a/test/unittest/fbtprovider/tst.tls.d
+++ b/test/unittest/fbtprovider/tst.tls.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -15,7 +15,6 @@
/* @@trigger: pid-tst-args1 */
#pragma D option quiet
-#pragma D option statusrate=10ms
BEGIN
{
diff --git a/test/unittest/fbtprovider/tst.tls2.d b/test/unittest/fbtprovider/tst.tls2.d
index e95ae234..af33b9bb 100644
--- a/test/unittest/fbtprovider/tst.tls2.d
+++ b/test/unittest/fbtprovider/tst.tls2.d
@@ -1,6 +1,6 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
@@ -15,7 +15,6 @@
/* @@trigger: pid-tst-args1 */
#pragma D option quiet
-#pragma D option statusrate=10ms
BEGIN
{
diff --git a/test/unittest/predicates/tst.predcache.sh b/test/unittest/predicates/tst.predcache.sh
index 1ec6927d..2e665deb 100755
--- a/test/unittest/predicates/tst.predcache.sh
+++ b/test/unittest/predicates/tst.predcache.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Oracle Linux DTrace.
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at
# http://oss.oracle.com/licenses/upl.
#
@@ -97,8 +97,6 @@ script2()
{
$dtrace -s /dev/stdin <<EOF
- #pragma D option statusrate=1ms
-
syscall:::entry
/pid == $ppid/
{
diff --git a/test/unittest/rates/tst.statusrate.d b/test/unittest/rates/tst.statusrate.d
index a7a017bb..e616d4e9 100644
--- a/test/unittest/rates/tst.statusrate.d
+++ b/test/unittest/rates/tst.statusrate.d
@@ -1,52 +1,24 @@
/*
* Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.
* Licensed under the Universal Permissive License v 1.0 as shown at
* http://oss.oracle.com/licenses/upl.
*/
-/* @@xfail: dtv2 */
/*
- * ASSERTION:
- * Positive test of statusrate option.
+ * ASSERTION: Positive test of statusrate option.
*
* SECTION: Options and Tunables/statusrate
*/
/*
- * Tests the statusrate option, by checking that the time delta between
- * exit() and END is at least as long as mandated by the statusrate.
+ * Tests the statusrate option, by checking simply that this deprecated option
+ * is not rejected.
*/
#pragma D option statusrate=10sec
-inline uint64_t NANOSEC = 1000000000;
-
-tick-1sec
-/n++ > 5/
-{
- exit(2);
- ts = timestamp;
-}
-
-END
-/(this->delta = timestamp - ts) > 2 * NANOSEC/
+BEGIN
{
exit(0);
}
-
-END
-/this->delta <= 2 * NANOSEC/
-{
- printf("delta between exit() and END (%u nanos) too small",
- this->delta);
- exit(1);
-}
-
-END
-/this->delta > 20 * NANOSEC/
-{
- printf("delta between exit() and END (%u nanos) too large",
- this->delta);
- exit(1);
-}
diff --git a/test/unittest/rates/tst.statusrate.r b/test/unittest/rates/tst.statusrate.r
index 8cf1846c..517803e0 100644
--- a/test/unittest/rates/tst.statusrate.r
+++ b/test/unittest/rates/tst.statusrate.r
@@ -1,6 +1,5 @@
FUNCTION:NAME
- :tick-1sec
- :END
+ :BEGIN
-- @@stderr --
-dtrace: script 'test/unittest/rates/tst.statusrate.d' matched 4 probes
+dtrace: script 'test/unittest/rates/tst.statusrate.d' matched 1 probe
--
2.18.4
More information about the DTrace-devel
mailing list