Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feat: send network average speed to the server

Browse Source
This commit is contained in:
Laurent Clouet
2021-06-22 16:10:35 +02:00
parent 138d68f791
commit 6a483e9885
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/sheepit/client/Server.java
View File

@@ -272,6 +272,8 @@ public class Server extends Thread {
HttpUrl.Builder urlBuilder = Objects.requireNonNull(HttpUrl.parse(this.getPage("request-job"))).newBuilder() HttpUrl.Builder urlBuilder = Objects.requireNonNull(HttpUrl.parse(this.getPage("request-job"))).newBuilder()
.addQueryParameter("computemethod", String.valueOf(user_config.computeMethodToInt())) .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("cpu_cores", String.valueOf(user_config.getNbCores() == -1 ? os.getCPU().cores() : user_config.getNbCores()))
.addQueryParameter("ram_max", String.valueOf(maxMemory)) .addQueryParameter("ram_max", String.valueOf(maxMemory))
.addQueryParameter("rendertime_max", String.valueOf(user_config.getMaxRenderTime())); .addQueryParameter("rendertime_max", String.valueOf(user_config.getMaxRenderTime()));

4
src/com/sheepit/client/TransferStats.java
View File

@@ -33,4 +33,8 @@ public class TransferStats {
return Utils.formatDataConsumption((long) (this.bytes / (0.1f))); return Utils.formatDataConsumption((long) (this.bytes / (0.1f)));
} }
} }
public long getRawAverageSessionSpeed() {
return this.millis != 0 ? (long) (this.bytes / (this.millis / 1000f)) : 0;
}
} }