commit 20d166ae59b370b517871387d321bfe9c91e681f
author QUICHE team <quiche-dev@google.com> Fri Mar 12 06:21:06 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Fri Mar 12 06:21:54 2021 -0800
tree 70763416973e15a96da9ba7761f335175d98170f
parent 7988cee09126b6aa4e10164480705eb61f8f792f

Migration from EPOLL_BUG to EPOLL_BUG_V2(bug_id).

Per go/gfe-bug-improvements GFE_BUGs are getting stable IDs to allow for monitoring and alerting. Existing EPOLL_BUG instances are changed to have `epoll_bug_n_m` ID, where `n` is unique for each file, and `m` is a counter within each file, so we get `EPOLL_BUG_V2(epoll_bug_123_2))`

PiperOrigin-RevId: 362507292
Change-Id: Ic45f8ef9c414b66d8ff85fb2761d1c81d6178e85

epoll_server/platform/api/epoll_bug.h

diff --git a/epoll_server/platform/api/epoll_bug.h b/epoll_server/platform/api/epoll_bug.h
index 33a3478..21ac1ed 100644
--- a/epoll_server/platform/api/epoll_bug.h
+++ b/epoll_server/platform/api/epoll_bug.h
@@ -8,5 +8,8 @@
 #include "net/tools/epoll_server/platform/impl/epoll_bug_impl.h"
 
 #define EPOLL_BUG EPOLL_BUG_IMPL
+// V2 macro is the same as the EPOLL_BUG above, but it takes a
+// bug_id parameter.
+#define EPOLL_BUG_V2 EPOLL_BUG_V2_IMPL
 
 #endif  // QUICHE_EPOLL_SERVER_PLATFORM_API_EPOLL_BUG_H_

epoll_server/simple_epoll_server.cc

diff --git a/epoll_server/simple_epoll_server.cc b/epoll_server/simple_epoll_server.cc
index 09831db..7753740 100644
--- a/epoll_server/simple_epoll_server.cc
+++ b/epoll_server/simple_epoll_server.cc
@@ -444,7 +444,7 @@
   EPOLL_VLOG(4) << "RegisteringAlarm " << ac << " at : " << timeout_time_in_us;
   CHECK(ac);
   if (all_alarms_.find(ac) != all_alarms_.end()) {
-    EPOLL_BUG << "Alarm already exists";
+    EPOLL_BUG_V2(epoll_bug_1_1) << "Alarm already exists";
   }
 
   auto alarm_iter = alarm_map_.insert(std::make_pair(timeout_time_in_us, ac));