Changeset 12140

Timestamp:

Mar 12, 2011, 10:45:14 PM (12 years ago)

Author:

jch

Message:

Revert "Protect against broken implementations of monotonic time."

There are other instances of GetMicroseconds? in the code, so a proper
paranoiac would want to work around that at a lower level.

File:

• trunk/third-party/libutp/utp.cpp (modified) (1 diff)

trunk/third-party/libutp/utp.cpp

@@ -1894 +1894 @@
                 int seq = conn->seq_nr - conn->cur_window_packets + i;
                 OutgoingPacket *pkt = (OutgoingPacket*)conn->outbuf.get(seq);
-                int64 rtt;
                 if (pkt == 0 || pkt->transmissions == 0) continue;
                 assert((int)(pkt->payload) >= 0);
                 acked_bytes += pkt->payload;
-                rtt = UTP_GetMicroseconds() - pkt->time_sent;
-                if(rtt < 0) {
-                        LOG_UTP("UTP_GetMicroseconds decreased (%ld > %ld).  "
-                                "This should not happen.",
-                                (long)pkt->time_sent,
-                                (long)(pkt->time_sent + rtt));
-                        rtt = 0;
-                }
-                min_rtt = min<int64>(min_rtt, rtt);
+                min_rtt = min<int64>(min_rtt, UTP_GetMicroseconds() - pkt->time_sent);
         }