Commit 0b4a9d8f authored by Costin Grigoras's avatar Costin Grigoras
Browse files

Message changes

parent 3b204e73
...@@ -42,7 +42,7 @@ public class SEBenchmark { ...@@ -42,7 +42,7 @@ public class SEBenchmark {
private static final AtomicInteger completed = new AtomicInteger(); private static final AtomicInteger completed = new AtomicInteger();
private static final long startup = System.currentTimeMillis(); private static long startup;
private static final Object lock = new Object(); private static final Object lock = new Object();
...@@ -63,9 +63,12 @@ public class SEBenchmark { ...@@ -63,9 +63,12 @@ public class SEBenchmark {
} }
} }
final double rate = (uploadedSoFar.longValue() * 1000. / (System.currentTimeMillis() - startup)) / 1024 / 1024; final long dTime = System.currentTimeMillis() - startup;
System.err.println("So far " + completed + " files (" + Format.size(uploadedSoFar.longValue()) + ") have completed, for an average rate of " + (Format.point(rate) + " MB/s")); final double rate = (uploadedSoFar.longValue() * 1000. / dTime) / 1024 / 1024;
System.err.println("So far " + completed + " files (" + Format.size(uploadedSoFar.longValue()) + ") have completed in " + Format.toInterval(dTime) + ", for an average rate of "
+ (Format.point(rate) + " MB/s"));
} }
} }
}; };
...@@ -105,12 +108,16 @@ public class SEBenchmark { ...@@ -105,12 +108,16 @@ public class SEBenchmark {
break; break;
try (Timing timing = new Timing()) { try (Timing timing = new Timing()) {
IOUtils.upload(localFile, testPath, account, null, "-S", seName); LFN target = IOUtils.upload(localFile, testPath, account, null, "-S", seName);
System.err.println("Thread " + tNo + " completed one upload in " + timing + " (" + Format.point(localFile.length() / timing.getSeconds() / 1024 / 1024) + " MB/s)"); if (target != null) {
System.err.println("Thread " + tNo + " completed one upload in " + timing + " (" + Format.point(localFile.length() / timing.getSeconds() / 1024 / 1024) + " MB/s)");
uploadedSoFar.addAndGet(localFile.length()); uploadedSoFar.addAndGet(localFile.length());
completed.incrementAndGet(); completed.incrementAndGet();
}
else
System.err.println("Failed to upload to " + testPath);
} }
catch (final IOException e) { catch (final IOException e) {
System.err.println("Thread " + tNo + " failed to upload a file: " + e.getMessage()); System.err.println("Thread " + tNo + " failed to upload a file: " + e.getMessage());
...@@ -188,6 +195,8 @@ public class SEBenchmark { ...@@ -188,6 +195,8 @@ public class SEBenchmark {
final List<UploadThread> tList = new ArrayList<>(threads); final List<UploadThread> tList = new ArrayList<>(threads);
startup = System.currentTimeMillis();
for (int i = 0; i < threads; i++) { for (int i = 0; i < threads; i++) {
final UploadThread ut = new UploadThread(iterations, seName); final UploadThread ut = new UploadThread(iterations, seName);
ut.start(); ut.start();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment