BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2025-07-01 23:46:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

send download speed to game UI, bump version to 2.1.4

Browse Source
This commit is contained in:
Lion Kortlepel 2024-09-24 21:50:09 +02:00
parent d6dfe85f69
commit cbb5502a40
No known key found for this signature in database
GPG Key ID: 4322FF2B4C71259B
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Network/Resources.cpp
View File

@ -8,6 +8,8 @@
#include "Network/network.hpp" #include "Network/network.hpp"
#include <chrono> #include <chrono>
#include <iomanip>
#include <ios>
#include <mutex> #include <mutex>
#if defined(_WIN32) #if defined(_WIN32)
@ -123,13 +125,19 @@ void UpdateUl(bool D, const std::string& msg) {
UlStatus = "UlLoading Resource " + msg; UlStatus = "UlLoading Resource " + msg;
} }
uint32_t DownloadSpeedMbits = 0; float DownloadSpeed = 0;
void AsyncUpdate(uint64_t& Rcv, uint64_t Size, const std::string& Name) { void AsyncUpdate(uint64_t& Rcv, uint64_t Size, const std::string& Name) {
do { do {
double pr = double(Rcv) / double(Size) * 100; double pr = double(Rcv) / double(Size) * 100;
std::string Per = std::to_string(trunc(pr * 10) / 10); std::string Per = std::to_string(trunc(pr * 10) / 10);
UpdateUl(true, Name + " (" + Per.substr(0, Per.find('.') + 2) + "%) at " + (DownloadSpeedMbits == 0 ? "?" : std::to_string(DownloadSpeedMbits)) + " Mbit/s"); std::string SpeedString = "";
if (DownloadSpeed > 0.01) {
std::stringstream ss;
ss << " at " << std::setprecision(1) << std::fixed << DownloadSpeed << " Mbit/s";
SpeedString = ss.str();
}
UpdateUl(true, Name + " (" + Per.substr(0, Per.find('.') + 2) + "%)" + SpeedString);
std::this_thread::sleep_for(std::chrono::milliseconds(100)); std::this_thread::sleep_for(std::chrono::milliseconds(100));
} while (!Terminate && Rcv < Size); } while (!Terminate && Rcv < Size);
} }
@ -146,12 +154,12 @@ std::vector<char> TCPRcvRaw(SOCKET Sock, uint64_t& GRcv, uint64_t Size) {
std::vector<char> File(Size); std::vector<char> File(Size);
uint64_t Rcv = 0; uint64_t Rcv = 0;
auto start = std::chrono::high_resolution_clock::now();
int i = 0; int i = 0;
do { do {
auto start = std::chrono::high_resolution_clock::now();
// receive at most some MB at a time // receive at most some MB at a time
int Len = std::min(int(Size - Rcv), 2 * 1024 * 1024); int Len = std::min(int(Size - Rcv), 1 * 1024 * 1024);
int32_t Temp = recv(Sock, &File[Rcv], Len, MSG_WAITALL); int32_t Temp = recv(Sock, &File[Rcv], Len, MSG_WAITALL);
if (Temp < 1) { if (Temp < 1) {
info(std::to_string(Temp)); info(std::to_string(Temp));
@ -165,9 +173,9 @@ std::vector<char> TCPRcvRaw(SOCKET Sock, uint64_t& GRcv, uint64_t Size) {
auto end = std::chrono::high_resolution_clock::now(); auto end = std::chrono::high_resolution_clock::now();
auto difference = end - start; auto difference = end - start;
float bits_per_s = float(Temp * 8) / float(std::chrono::duration_cast<std::chrono::milliseconds>(difference).count()); float bits_per_s = float(Rcv * 8) / float(std::chrono::duration_cast<std::chrono::milliseconds>(difference).count());
float megabits_per_s = bits_per_s / 1000; float megabits_per_s = bits_per_s / 1000;
DownloadSpeedMbits = uint32_t(megabits_per_s); DownloadSpeed = megabits_per_s;
// every 8th iteration print the speed // every 8th iteration print the speed
if (i % 8 == 0) { if (i % 8 == 0) {
debug("Download speed: " + std::to_string(uint32_t(megabits_per_s)) + "Mbit/s"); debug("Download speed: " + std::to_string(uint32_t(megabits_per_s)) + "Mbit/s");
@ -207,6 +215,8 @@ SOCKET InitDSock() {
} }
std::vector<char> MultiDownload(SOCKET MSock, SOCKET DSock, uint64_t Size, const std::string& Name) { std::vector<char> MultiDownload(SOCKET MSock, SOCKET DSock, uint64_t Size, const std::string& Name) {
DownloadSpeed = 0;
uint64_t GRcv = 0; uint64_t GRcv = 0;
uint64_t MSize = Size / 2; uint64_t MSize = Size / 2;

2
src/Startup.cpp
View File

@ -84,7 +84,7 @@ std::string GetVer() {
return "2.1"; return "2.1";
} }
std::string GetPatch() { std::string GetPatch() {
return ".3"; return ".4";
} }
std::string GetEP(char* P) { std::string GetEP(char* P) {