From ba591722a2a34b39699afb870ebd7fa901dff2ad Mon Sep 17 00:00:00 2001
From: Andreas Romeyke <andreas.romeyke@slub-dresden.de>
Date: Tue, 24 Jan 2023 17:37:07 +0100
Subject: [PATCH] - fixed throughput() functions
---
.../plugin/storage/nfs/SLUBStoragePlugin.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/java/org/slub/rosetta/dps/repository/plugin/storage/nfs/SLUBStoragePlugin.java b/java/org/slub/rosetta/dps/repository/plugin/storage/nfs/SLUBStoragePlugin.java
index 8fa9efa..0d9916e 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/storage/nfs/SLUBStoragePlugin.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/storage/nfs/SLUBStoragePlugin.java
@@ -93,20 +93,19 @@ public class SLUBStoragePlugin extends AbstractStorageHandler {
log.info("SLUBStoragePlugin instantiated (using DIR_ROOT="+DIR_ROOT+" BLOCK_SIZE="+BLOCK_SIZE);
}
- private String throughput(long start, long end, String filename) {
+ private String throughput(long starttime_in_ms, long endtime_in_ms, String filename) {
try {
long fsize = Files.size(Paths.get(filename));
- if (fsize > 0) {
- return ((end - start) / fsize) + " Bytes/s";
- }
+ throughput(starttime_in_ms, endtime_in_ms, fsize);
} catch (IOException e) {
/* do nothing */
}
return "(unknown) Bytes/s";
}
- private String throughput(long start, long end, long fsize) {
- if (fsize > 0) {
- return ((end-start)/fsize) + " Bytes/s";
+ private String throughput(long starttime_in_ms, long endtime_in_ms, long fsize) {
+ long duration_in_ms = endtime_in_ms - starttime_in_ms;
+ if (fsize > 0 && duration_in_ms >= 0) {
+ return (duration_in_ms / fsize) + " kBytes/s"; /* kBytes because ms */
}
return "(unknown) Bytes/s";
}
--
GitLab