ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8091 from leoetlino/traversal-chrono 

TraversalServer: use C++ <chrono> instead of gettimeofday
This commit is contained in:
Léo Lam 2019-05-11 10:44:49 +02:00 committed by GitHub
parent 3ab06dcd02 916a97b869
commit e35ccd5a9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/Common/TraversalServer.cpp
View File

@ -3,13 +3,13 @@
// The central server implementation.
#include <arpa/inet.h>
#include <cerrno>
#include <chrono>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <fcntl.h>
#include <netinet/in.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
#include <unordered_map>
@ -411,12 +411,9 @@ int main()
// note: switch to recvmmsg (yes, mmsg) if this becomes
// expensive
rv = recvfrom(sock, &packet, sizeof(packet), 0, (sockaddr*)&raddr, &addrLen);
if (gettimeofday(&tv, nullptr) < 0)
{
perror("gettimeofday");
exit(1);
}
currentTime = (u64)tv.tv_sec * 1000000 + tv.tv_usec;
currentTime = std::chrono::duration_cast<std::chrono::microseconds>(
std::chrono::system_clock::now().time_since_epoch())
.count();
if (rv < 0)
{
if (errno != EINTR && errno != EAGAIN)