Changeset 238 in flair-src for trunk/lib/FlairCore/src/ConnectedSocket.cpp
- Timestamp:
- May 15, 2018, 4:41:02 PM (7 years ago)
- File:
-
- 1 edited
-
trunk/lib/FlairCore/src/ConnectedSocket.cpp (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/FlairCore/src/ConnectedSocket.cpp
r15 r238 32 32 char buffer[sizeof(uint16_t)]; 33 33 size_t alreadyReceived = 0; 34 Time remainingTimeout = timeout; // ms34 Time remainingTimeout = timeout; // ns 35 35 do { 36 36 Time beforeTime = GetTime(); // ns … … 38 38 RecvMessage(buffer + alreadyReceived, 39 39 sizeof(uint16_t) - alreadyReceived, remainingTimeout); 40 remainingTimeout -= (GetTime() - beforeTime) / 100000; 41 if ((received < 0) || (remainingTimeout < 0)) 42 throw std::runtime_error("Timeout"); 40 remainingTimeout -= GetTime() - beforeTime; 41 if ((received < 0) || (remainingTimeout < 0)) throw std::runtime_error("Timeout"); 43 42 alreadyReceived += received; 44 43 } while (alreadyReceived != sizeof(uint16_t)); … … 52 51 char *buffer = (char *)&dataInNetworkEndianness; 53 52 size_t alreadySent = 0; 54 Time remainingTimeout = timeout; // ms53 Time remainingTimeout = timeout; // ns 55 54 do { 56 55 Time beforeTime = GetTime(); // ns 57 56 ssize_t sent = SendMessage( 58 57 buffer + alreadySent, sizeof(uint16_t) - alreadySent, remainingTimeout); 59 remainingTimeout -= (GetTime() - beforeTime) / 100000;58 remainingTimeout -= GetTime() - beforeTime; 60 59 if ((sent < 0) || (remainingTimeout < 0)) 61 60 throw std::runtime_error("Timeout"); … … 67 66 char buffer[sizeof(uint32_t)]; 68 67 size_t alreadyReceived = 0; 69 Time remainingTimeout = timeout; // ms68 Time remainingTimeout = timeout; // ns 70 69 do { 71 70 Time beforeTime = GetTime(); // ns … … 73 72 RecvMessage(buffer + alreadyReceived, 74 73 sizeof(uint32_t) - alreadyReceived, remainingTimeout); 75 remainingTimeout -= (GetTime() - beforeTime) / 100000;74 remainingTimeout -= GetTime() - beforeTime; 76 75 if ((received < 0) || (remainingTimeout < 0)) 77 76 throw std::runtime_error("Timeout"); … … 87 86 char *buffer = (char *)&dataInNetworkEndianness; 88 87 size_t alreadySent = 0; 89 Time remainingTimeout = timeout; // ms88 Time remainingTimeout = timeout; // ns 90 89 do { 91 90 Time beforeTime = GetTime(); // ns 92 91 ssize_t sent = SendMessage( 93 92 buffer + alreadySent, sizeof(uint32_t) - alreadySent, remainingTimeout); 94 remainingTimeout -= (GetTime() - beforeTime) / 100000;93 remainingTimeout -= GetTime() - beforeTime; 95 94 if ((sent < 0) || (remainingTimeout < 0)) 96 95 throw std::runtime_error("Timeout"); … … 108 107 RecvMessage(buffer + alreadyReceived, stringSize - alreadyReceived, 109 108 remainingTimeout); 110 remainingTimeout -= (GetTime() - beforeTime) / 100000;109 remainingTimeout -= GetTime() - beforeTime; 111 110 if ((received < 0) || (remainingTimeout < 0)) 112 111 throw std::runtime_error("Timeout");
Note:
See TracChangeset
for help on using the changeset viewer.
