Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Travis/unittest broken since b662a45

This commit is contained in:
SmallJoker 2017-04-29 14:36:55 +02:00
parent 9762650f97
commit f727f54192
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client.cpp
View File

@ -769,7 +769,7 @@ void Client::initLocalMapSaving(const Address &address,
void Client::ReceiveAll() void Client::ReceiveAll()
{ {
DSTACK(FUNCTION_NAME); DSTACK(FUNCTION_NAME);
u32 start_ms = porting::getTimeMs(); u64 start_ms = porting::getTimeMs();
for(;;) for(;;)
{ {
// Limit time even if there would be huge amounts of data to // Limit time even if there would be huge amounts of data to
@ -1631,7 +1631,7 @@ void texture_update_progress(void *args, u32 progress, u32 max_progress)
// update the loading menu -- if neccessary // update the loading menu -- if neccessary
bool do_draw = false; bool do_draw = false;
u32 time_ms = targs->last_time_ms; u64 time_ms = targs->last_time_ms;
if (cur_percent != targs->last_percent) { if (cur_percent != targs->last_percent) {
targs->last_percent = cur_percent; targs->last_percent = cur_percent;
time_ms = porting::getTimeMs(); time_ms = porting::getTimeMs();

15
src/network/connection.cpp
View File

@ -54,7 +54,8 @@ Mutex log_message_mutex;
#endif #endif
static inline float CALC_DTIME(unsigned int lasttime, unsigned int curtime) { static inline float CALC_DTIME(u64 lasttime, u64 curtime)
{
float value = ( curtime - lasttime) / 1000.0; float value = ( curtime - lasttime) / 1000.0;
return MYMAX(MYMIN(value,0.1),0.0); return MYMAX(MYMIN(value,0.1),0.0);
} }
@ -981,7 +982,7 @@ void Peer::RTTStatistics(float rtt, const std::string &profiler_id,
bool Peer::isTimedOut(float timeout) bool Peer::isTimedOut(float timeout)
{ {
MutexAutoLock lock(m_exclusive_access_mutex); MutexAutoLock lock(m_exclusive_access_mutex);
u32 current_time = porting::getTimeMs(); u64 current_time = porting::getTimeMs();
float dtime = CALC_DTIME(m_last_timeout_check,current_time); float dtime = CALC_DTIME(m_last_timeout_check,current_time);
m_last_timeout_check = current_time; m_last_timeout_check = current_time;
@ -1276,8 +1277,8 @@ void * ConnectionSendThread::run()
LOG(dout_con<<m_connection->getDesc() LOG(dout_con<<m_connection->getDesc()
<<"ConnectionSend thread started"<<std::endl); <<"ConnectionSend thread started"<<std::endl);
u32 curtime = porting::getTimeMs(); u64 curtime = porting::getTimeMs();
u32 lasttime = curtime; u64 lasttime = curtime;
PROFILE(std::stringstream ThreadIdentifier); PROFILE(std::stringstream ThreadIdentifier);
PROFILE(ThreadIdentifier << "ConnectionSend: [" << m_connection->getDesc() << "]"); PROFILE(ThreadIdentifier << "ConnectionSend: [" << m_connection->getDesc() << "]");
@ -2046,8 +2047,8 @@ void * ConnectionReceiveThread::run()
PROFILE(ThreadIdentifier << "ConnectionReceive: [" << m_connection->getDesc() << "]"); PROFILE(ThreadIdentifier << "ConnectionReceive: [" << m_connection->getDesc() << "]");
#ifdef DEBUG_CONNECTION_KBPS #ifdef DEBUG_CONNECTION_KBPS
u32 curtime = porting::getTimeMs(); u64 curtime = porting::getTimeMs();
u32 lasttime = curtime; u64 lasttime = curtime;
float debug_print_timer = 0.0; float debug_print_timer = 0.0;
#endif #endif
@ -2390,7 +2391,7 @@ SharedBuffer<u8> ConnectionReceiveThread::processPacket(Channel *channel,
// only calculate rtt from straight sent packets // only calculate rtt from straight sent packets
if (p.resend_count == 0) { if (p.resend_count == 0) {
// Get round trip time // Get round trip time
unsigned int current_time = porting::getTimeMs(); u64 current_time = porting::getTimeMs();
// a overflow is quite unlikely but as it'd result in major // a overflow is quite unlikely but as it'd result in major
// rtt miscalculation we handle it here // rtt miscalculation we handle it here

2
src/network/connection.h
View File

@ -175,7 +175,7 @@ struct BufferedPacket
Buffer<u8> data; // Data of the packet, including headers Buffer<u8> data; // Data of the packet, including headers
float time; // Seconds from buffering the packet or re-sending float time; // Seconds from buffering the packet or re-sending
float totaltime; // Seconds from buffering the packet float totaltime; // Seconds from buffering the packet
unsigned int absolute_send_time; u64 absolute_send_time;
Address address; // Sender or destination Address address; // Sender or destination
unsigned int resend_count; unsigned int resend_count;
}; };

2
src/unittest/test_connection.cpp
View File

@ -305,7 +305,7 @@ void TestConnection::testConnectSendReceive()
u16 peer_id = 132; u16 peer_id = 132;
u16 size = 0; u16 size = 0;
bool received = false; bool received = false;
u32 timems0 = porting::getTimeMs(); u64 timems0 = porting::getTimeMs();
for (;;) { for (;;) {
if (porting::getTimeMs() - timems0 > 5000 || received) if (porting::getTimeMs() - timems0 > 5000 || received)
break; break;