From 6a483e98853ca5c1cf979ac9bbf27c149f66add7 Mon Sep 17 00:00:00 2001 From: Laurent Clouet Date: Tue, 22 Jun 2021 16:10:35 +0200 Subject: [PATCH] Feat: send network average speed to the server --- src/com/sheepit/client/Server.java | 4 +++- src/com/sheepit/client/TransferStats.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/sheepit/client/Server.java b/src/com/sheepit/client/Server.java index f0fb46c..d271942 100644 --- a/src/com/sheepit/client/Server.java +++ b/src/com/sheepit/client/Server.java @@ -272,6 +272,8 @@ public class Server extends Thread { HttpUrl.Builder urlBuilder = Objects.requireNonNull(HttpUrl.parse(this.getPage("request-job"))).newBuilder() .addQueryParameter("computemethod", String.valueOf(user_config.computeMethodToInt())) + .addQueryParameter("network_dl", String.valueOf(dlStats.getRawAverageSessionSpeed())) + .addQueryParameter("network_up", String.valueOf(ulStats.getRawAverageSessionSpeed())) .addQueryParameter("cpu_cores", String.valueOf(user_config.getNbCores() == -1 ? os.getCPU().cores() : user_config.getNbCores())) .addQueryParameter("ram_max", String.valueOf(maxMemory)) .addQueryParameter("rendertime_max", String.valueOf(user_config.getMaxRenderTime())); @@ -281,7 +283,7 @@ public class Server extends Thread { .addQueryParameter("gpu_ram", String.valueOf(user_config.getGPUDevice().getMemory())) .addQueryParameter("gpu_type", user_config.getGPUDevice().getType()); } - + Response response = this.HTTPRequest(urlBuilder, RequestBody.create(MediaType.parse("application/xml"), this.generateXMLForMD5cache())); int r = response.code(); diff --git a/src/com/sheepit/client/TransferStats.java b/src/com/sheepit/client/TransferStats.java index 3c515d4..b63ba59 100644 --- a/src/com/sheepit/client/TransferStats.java +++ b/src/com/sheepit/client/TransferStats.java @@ -33,4 +33,8 @@ public class TransferStats { return Utils.formatDataConsumption((long) (this.bytes / (0.1f))); } } + + public long getRawAverageSessionSpeed() { + return this.millis != 0 ? (long) (this.bytes / (this.millis / 1000f)) : 0; + } }