From: Haomai Wang <haomai@xsky.com>
Date: Wed, 25 May 2016 02:24:13 +0000 (+0800)
Subject: Event: change id to idx
X-Git-Tag: ses5-milestone5~574^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cb58088256194825a42df426d52b97b4fa090563;p=ceph.git

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 df53bee4de2e..b8d806ef356b 100644
--- 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 f02e113a7b9f..f692c71bbdbf 100644
--- 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);