Event: change id to idx

Signed-off-by: Haomai Wang <haomai@xsky.com>

diff --git a/src/msg/async/Event.cc b/src/msg/async/Event.cc
index df53bee4de2ef18a5d7adf2eaee088457e3b2d9a..b8d806ef356ba0ff708e6442d852cc29b2e338d3 100644 (file)
--- a/src/msg/async/Event.cc
+++ b/src/msg/async/Event.cc
@@ -67,7 +67,7 @@ int EventCenter::init(int n, unsigned i)
   // can't init multi times
   assert(nevent == 0);
 
-  id = i;
+  idx = i;
 
 #ifdef HAVE_EPOLL
   driver = new EpollDriver(cct);
@@ -143,7 +143,7 @@ EventCenter::~EventCenter()
 
 void EventCenter::set_owner()
 {
-  centers[id] = local_center = this;
+  centers[idx] = local_center = this;
 }
 
 int EventCenter::create_file_event(int fd, int mask, EventCallbackRef ctxt)

diff --git a/src/msg/async/Event.h b/src/msg/async/Event.h
index f02e113a7b9febd0d7770a74f8eea7b613824c28..f692c71bbdbf032ccfac570f26f70081aa34aa51 100644 (file)
--- a/src/msg/async/Event.h
+++ b/src/msg/async/Event.h
@@ -124,7 +124,7 @@ class EventCenter {
   int notify_send_fd;
   NetHandler net;
   EventCallbackRef notify_handler;
-  unsigned id = 10000;
+  unsigned idx = 10000;
 
   int process_time_events();
   FileEvent *_get_file_event(int fd) {
@@ -146,9 +146,9 @@ class EventCenter {
   ~EventCenter();
   ostream& _event_prefix(std::ostream *_dout);
 
-  int init(int nevent, unsigned id);
+  int init(int nevent, unsigned idx);
   void set_owner();
-  unsigned get_id() { return id; }
+  unsigned get_id() { return idx; }
 
   // Used by internal thread
   int create_file_event(int fd, int mask, EventCallbackRef ctxt);