This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 7b39f1c1fb Fix regex replace error
7b39f1c1fb is described below
commit 7b39f1c1fbbcac032c4f664ff1b4c190915fe5af
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Aug 21 14:32:55 2023 -0700
Fix regex replace error
---
test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java | 4 ++--
test/org/apache/catalina/tribes/test/transport/SocketNioSend.java | 2 +-
.../apache/catalina/tribes/test/transport/SocketNioValidateSend.java | 2 +-
test/org/apache/catalina/tribes/test/transport/SocketReceive.java | 2 +-
test/org/apache/catalina/tribes/test/transport/SocketSend.java | 4 ++--
.../apache/catalina/tribes/test/transport/SocketTribesReceive.java | 2 +-
.../apache/catalina/tribes/test/transport/SocketValidateReceive.java | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
b/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
index 32122ea8d6..18a3b0a295 100644
--- a/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
+++ b/test/org/apache/catalina/tribes/test/transport/SocketNioReceive.java
@@ -57,7 +57,7 @@ public class SocketNioReceive {
try {
Thread.sleep(5000);
if ( start != 0 ) {
- System.out.println("Throughput " + df.format(mb / seconds)
+ " MiBseconds, messages "+count+" accepts "+accept+", total "+mb+" MiB");
+ System.out.println("Throughput " + df.format(mb / seconds)
+ " MiB/s, messages "+count+" accepts "+accept+", total "+mb+" MiB");
}
}catch (Throwable x) {
x.printStackTrace();
@@ -82,7 +82,7 @@ public class SocketNioReceive {
if ( ( (count) % 10000) == 0) {
long time = System.currentTimeMillis();
seconds = ( (double) (time - start)) / 1000;
- System.out.println("Throughput " + df.format(mb / seconds) + "
MiBseconds, messages "+count+", total "+mb+" MiB");
+ System.out.println("Throughput " + df.format(mb / seconds) + "
MiB/s, messages "+count+", total "+mb+" MiB");
}
}
diff --git a/test/org/apache/catalina/tribes/test/transport/SocketNioSend.java
b/test/org/apache/catalina/tribes/test/transport/SocketNioSend.java
index 567e2f9965..a8246d08b9 100644
--- a/test/org/apache/catalina/tribes/test/transport/SocketNioSend.java
+++ b/test/org/apache/catalina/tribes/test/transport/SocketNioSend.java
@@ -89,7 +89,7 @@ public class SocketNioSend {
if ( ( (++count) % 10000) == 0) {
long time = System.currentTimeMillis();
double seconds = ( (double) (time - start)) / 1000;
- System.out.println("Throughput " + df.format(mb /
seconds) + " MiBseconds, total "+mb+" MiB total "+total+" bytes.");
+ System.out.println("Throughput " + df.format(mb /
seconds) + " MiB/s, total "+mb+" MiB total "+total+" bytes.");
}
}
diff --git
a/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java
b/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java
index 49f4964b5e..a3107b78da 100644
--- a/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java
+++ b/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java
@@ -86,7 +86,7 @@ public class SocketNioValidateSend {
if ( ( (++count) % 10000) == 0) {
long time = System.currentTimeMillis();
double seconds = ( (double) (time - start)) / 1000;
- System.out.println("Throughput " + df.format(mb /
seconds) + " MiBseconds, total "+mb+" MiB total "+total+" bytes.");
+ System.out.println("Throughput " + df.format(mb /
seconds) + " MiB/s, total "+mb+" MiB total "+total+" bytes.");
}
}
diff --git a/test/org/apache/catalina/tribes/test/transport/SocketReceive.java
b/test/org/apache/catalina/tribes/test/transport/SocketReceive.java
index 0faa8786e7..eb95f36e86 100644
--- a/test/org/apache/catalina/tribes/test/transport/SocketReceive.java
+++ b/test/org/apache/catalina/tribes/test/transport/SocketReceive.java
@@ -84,7 +84,7 @@ public class SocketReceive {
long time = System.currentTimeMillis();
double seconds = ((double)(time-start))/1000;
System.out.println("Throughput " + df.format(mb/seconds) +
- " MiBseconds messages " + count + ", total " + mb +
+ " MiB/s messages " + count + ", total " + mb +
" MiB total " + total + " bytes.");
}
}
\ No newline at end of file
diff --git a/test/org/apache/catalina/tribes/test/transport/SocketSend.java
b/test/org/apache/catalina/tribes/test/transport/SocketSend.java
index 1e072866f3..0cdb5ac0ec 100644
--- a/test/org/apache/catalina/tribes/test/transport/SocketSend.java
+++ b/test/org/apache/catalina/tribes/test/transport/SocketSend.java
@@ -62,8 +62,8 @@ public class SocketSend {
long time = System.currentTimeMillis();
double seconds = ((double)(time-start))/1000;
System.out.println("Throughput " + df.format(mb/seconds) +
- " MB/seconds messages " + count + ", total " + mb +
- " MB, total " + total + " bytes.");
+ " MiB/s messages " + count + ", total " + mb +
+ " MiB, total " + total + " bytes.");
}
}
out.flush();
diff --git
a/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java
b/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java
index 8314bd174f..caddfe46b9 100644
--- a/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java
+++ b/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java
@@ -97,7 +97,7 @@ public class SocketTribesReceive {
long time = System.currentTimeMillis();
double seconds = ((double)(time-start))/1000;
System.out.println("Throughput " + df.format(mb/seconds) +
- " MiBseconds messages " + count + ", total " + mb +
+ " MiB/s messages " + count + ", total " + mb +
" MiB total " + total + " bytes.");
}
}
\ No newline at end of file
diff --git
a/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
b/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
index e6b9aeeadf..31ff376855 100644
--- a/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
+++ b/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
@@ -89,7 +89,7 @@ public class SocketValidateReceive {
long time = System.currentTimeMillis();
double seconds = ((double)(time-start))/1000;
System.out.println("Throughput " + df.format(mb/seconds) +
- " MiBseconds messages " + count + ", total " + mb +
+ " MiB/s messages " + count + ", total " + mb +
" MiB total " + total + " bytes.");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
