From 77053064652a9f9fc2e1ebff3229e42dc9a4d27a Mon Sep 17 00:00:00 2001 From: shangfufei Date: Tue, 27 Feb 2018 11:23:37 +0800 Subject: [PATCH] msg/async:change EventCenter::process_events(int timeout_microseconds) to EventCenter::process_events(unsigned timeout_microseconds) Signed-off-by: shangfufei --- src/msg/async/Event.cc | 2 +- src/msg/async/Event.h | 2 +- src/msg/async/Stack.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/msg/async/Event.cc b/src/msg/async/Event.cc index af5dad703ee..cda4d1a3af5 100644 --- a/src/msg/async/Event.cc +++ b/src/msg/async/Event.cc @@ -357,7 +357,7 @@ int EventCenter::process_time_events() return processed; } -int EventCenter::process_events(int timeout_microseconds, ceph::timespan *working_dur) +int EventCenter::process_events(unsigned timeout_microseconds, ceph::timespan *working_dur) { struct timeval tv; int numevents; diff --git a/src/msg/async/Event.h b/src/msg/async/Event.h index 50f2a2b8795..22229f31bbb 100644 --- a/src/msg/async/Event.h +++ b/src/msg/async/Event.h @@ -203,7 +203,7 @@ class EventCenter { uint64_t create_time_event(uint64_t milliseconds, EventCallbackRef ctxt); void delete_file_event(int fd, int mask); void delete_time_event(uint64_t id); - int process_events(int timeout_microseconds, ceph::timespan *working_dur = nullptr); + int process_events(unsigned timeout_microseconds, ceph::timespan *working_dur = nullptr); void wakeup(); // Used by external thread diff --git a/src/msg/async/Stack.cc b/src/msg/async/Stack.cc index 895cc82ee5a..86005434b87 100644 --- a/src/msg/async/Stack.cc +++ b/src/msg/async/Stack.cc @@ -41,7 +41,7 @@ std::function NetworkStack::add_thread(unsigned i) char tp_name[16]; sprintf(tp_name, "msgr-worker-%u", w->id); ceph_pthread_setname(pthread_self(), tp_name); - const uint64_t EventMaxWaitUs = 30000000; + const unsigned EventMaxWaitUs = 30000000; w->center.set_owner(); ldout(cct, 10) << __func__ << " starting" << dendl; w->initialize(); -- 2.39.5