commit 823ebd7d8647d28dee6c70eaf948081f2b27508f
author wub <wub@google.com> Wed Feb 19 11:15:13 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Feb 19 11:15:49 2020 -0800
tree fc2a43fec15055427223efd1ba1100c833e6babc
parent 35e49eddef8d7c581d62a86f3947c8b14b077e96

gfe-relnote: (n/a) False deprecate --gfe2_reloadable_flag_quic_use_quic_time_for_received_timestamp.

The code where this flag is used will be deprecated soon.

PiperOrigin-RevId: 296011678
Change-Id: I1848ef3fd970457f4916ecb07233bc0e5a2daec8

quic/core/quic_packet_reader.cc

diff --git a/quic/core/quic_packet_reader.cc b/quic/core/quic_packet_reader.cc
index eed0bbd..79ebb84 100644
--- a/quic/core/quic_packet_reader.cc
+++ b/quic/core/quic_packet_reader.cc
@@ -228,9 +228,6 @@
     return false;  // recvmmsg failed.
   }
 
-  bool use_quic_time =
-      GetQuicReloadableFlag(quic_use_quic_time_for_received_timestamp);
-  QuicTime fallback_timestamp(QuicTime::Zero());
   QuicWallTime fallback_walltimestamp = QuicWallTime::Zero();
   for (int i = 0; i < packets_read; ++i) {
     if (mmsg_hdr_[i].msg_len == 0) {
@@ -264,29 +261,14 @@
       continue;
     }
 
-    // This isn't particularly desirable, but not all platforms support socket
-    // timestamping.
-    QuicTime timestamp(QuicTime::Zero());
-    if (!use_quic_time) {
-      if (packet_walltimestamp.IsZero()) {
-        if (fallback_walltimestamp.IsZero()) {
-          fallback_walltimestamp = clock.WallNow();
-        }
-        packet_walltimestamp = fallback_walltimestamp;
+    if (packet_walltimestamp.IsZero()) {
+      if (fallback_walltimestamp.IsZero()) {
+        fallback_walltimestamp = clock.WallNow();
       }
-      timestamp = clock.ConvertWallTimeToQuicTime(packet_walltimestamp);
-
-    } else {
-      QUIC_RELOADABLE_FLAG_COUNT(quic_use_quic_time_for_received_timestamp);
-      if (packet_walltimestamp.IsZero()) {
-        if (!fallback_timestamp.IsInitialized()) {
-          fallback_timestamp = clock.Now();
-        }
-        timestamp = fallback_timestamp;
-      } else {
-        timestamp = clock.ConvertWallTimeToQuicTime(packet_walltimestamp);
-      }
+      packet_walltimestamp = fallback_walltimestamp;
     }
+    QuicTime timestamp = clock.ConvertWallTimeToQuicTime(packet_walltimestamp);
+
     int ttl = 0;
     bool has_ttl =
         QuicSocketUtils::GetTtlFromMsghdr(&mmsg_hdr_[i].msg_hdr, &ttl);