RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 22:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

src/msg/async/EventKqueue.cc: adjust logging levels.

Browse Source 
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
This commit is contained in:
Willem Jan Withagen 2016-10-12 11:44:14 +02:00
parent 4e3ed5ad04
commit a534069cf4
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/msg/async/EventKqueue.cc
View File

@ -26,7 +26,6 @@
int KqueueDriver::test_kqfd() {
struct kevent ke[1];
// EV_SET(&ke[0], fd, EVFILT_READ, EV_ADD, 0, 0, NULL);
if (kevent(kqfd, ke, 0, NULL, 0, NULL) == -1) {
ldout(cct,0) << __func__ << " invalid kqfd = " << kqfd
<< cpp_strerror(errno) << dendl;
@ -106,7 +105,8 @@ int KqueueDriver::add_event(int fd, int cur_mask, int add_mask)
int oldkqfd = kqfd;
if (!pthread_equal(mythread, pthread_self())) {
ldout(cct,10) << __func__ << " We changed thread from " << mythread << " to " << pthread_self() << dendl;
ldout(cct,10) << __func__ << " We changed thread from " << mythread
<< " to " << pthread_self() << dendl;
mythread = pthread_self();
kqfd = -1;
} else if ((kqfd != -1) && (test_kqfd() < 0)) {
@ -130,7 +130,7 @@ int KqueueDriver::add_event(int fd, int cur_mask, int add_mask)
}
}
ldout(cct,10) << __func__ << " add event kqfd = " << kqfd << " fd = " << fd
ldout(cct,20) << __func__ << " add event kqfd = " << kqfd << " fd = " << fd
<< " cur_mask = " << cur_mask << " add_mask = " << add_mask
<< dendl;
@ -157,12 +157,13 @@ int KqueueDriver::del_event(int fd, int cur_mask, int del_mask)
int num = 0;
int mask = cur_mask & del_mask;
ldout(cct,10) << __func__ << " delete event kqfd = " << kqfd
ldout(cct,20) << __func__ << " delete event kqfd = " << kqfd
<< " fd = " << fd << " cur_mask = " << cur_mask
<< " del_mask = " << del_mask << dendl;
if (!pthread_equal(mythread, pthread_self())) {
ldout(cct,10) << __func__ << " We changed thread from " << mythread << " to " << pthread_self() << dendl;
ldout(cct,10) << __func__ << " We changed thread from " << mythread
<< " to " << pthread_self() << dendl;
mythread = pthread_self();
} else if ((kqfd != -1) && (test_kqfd() < 0)) {
ldout(cct,10) << __func__ << " Recreating old kqfd." << dendl;
@ -213,7 +214,8 @@ int KqueueDriver::event_wait(vector<FiredFileEvent> &fired_events, struct timeva
ldout(cct,10) << __func__ << " kqfd = " << kqfd << dendl;
if (!pthread_equal(mythread, pthread_self())) {
ldout(cct,10) << __func__ << " We changed thread from " << mythread << " to " << pthread_self() << dendl;
ldout(cct,10) << __func__ << " We changed thread from " << mythread
<< " to " << pthread_self() << dendl;
mythread = pthread_self();
kqfd = -1;
} else if ((kqfd != -1) && (test_kqfd() < 0)) {
@ -238,19 +240,19 @@ int KqueueDriver::event_wait(vector<FiredFileEvent> &fired_events, struct timeva
if (tvp != NULL) {
timeout.tv_sec = tvp->tv_sec;
timeout.tv_nsec = tvp->tv_usec * 1000;
ldout(cct,10) << __func__ << " "
ldout(cct,20) << __func__ << " "
<< timeout.tv_sec << " sec "
<< timeout.tv_nsec << " nsec"
<< dendl;
retval = kevent(kqfd, NULL, 0, res_events, size, &timeout);
} else {
ldout(cct,10) << __func__ << " event_wait: "
ldout(cct,20) << __func__ << " event_wait: "
<< " NULL"
<< dendl;
retval = kevent(kqfd, NULL, 0, res_events, size, NULL);
}
ldout(cct,10) << __func__ << " kevent retval: "
ldout(cct,25) << __func__ << " kevent retval: "
<< retval
<< dendl;
if (retval < 0) {
@ -270,7 +272,7 @@ int KqueueDriver::event_wait(vector<FiredFileEvent> &fired_events, struct timeva
for (j = 0; j < numevents; j++) {
int mask = 0;
struct kevent *e = res_events + j;
ldout(cct,10) << __func__ << " j: " << j << dendl;
ldout(cct,20) << __func__ << " j: " << j << dendl;
if (e->filter == EVFILT_READ) mask |= EVENT_READABLE;
if (e->filter == EVFILT_WRITE) mask |= EVENT_WRITABLE;