[SCM] CTDB repository - branch master updated - ctdb-1.13-179-g5aba53e
Ronnie Sahlberg
sahlberg at samba.org
Sun May 20 20:22:26 MDT 2012
The branch, master has been updated
via 5aba53e6adcfcd7edbdac9e30aa5fcba176aca00 (commit)
from f59b40b3f8ea3da8ffb8601bc025e83c237072d5 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5aba53e6adcfcd7edbdac9e30aa5fcba176aca00
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Mon May 21 09:17:05 2012 +1000
TEVENT: Add back tracking of long runnig events to the local copy of tevent library
-----------------------------------------------------------------------
Summary of changes:
lib/tevent/tevent_epoll.c | 4 +++
lib/tevent/tevent_internal.h | 2 +
lib/tevent/tevent_select.c | 4 +++
lib/tevent/tevent_standard.c | 4 +++
lib/tevent/tevent_util.c | 52 ++++++++++++++++++++++++++++++++++++++++++
5 files changed, 66 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/tevent_epoll.c b/lib/tevent/tevent_epoll.c
index f5a69dd..7c09dd7 100644
--- a/lib/tevent/tevent_epoll.c
+++ b/lib/tevent/tevent_epoll.c
@@ -242,6 +242,8 @@ static void epoll_change_event(struct epoll_event_context *epoll_ev, struct teve
}
}
+extern pid_t ctdbd_pid;
+
/*
event loop handling using epoll
*/
@@ -264,7 +266,9 @@ static int epoll_event_loop(struct epoll_event_context *epoll_ev, struct timeval
return 0;
}
+ if (getpid() == ctdbd_pid) tevent_before_wait(epoll_ev->ev);
ret = epoll_wait(epoll_ev->epoll_fd, events, MAXEVENTS, timeout);
+ if (getpid() == ctdbd_pid) tevent_after_wait(epoll_ev->ev);
if (ret == -1 && errno == EINTR && epoll_ev->ev->signal_events) {
if (tevent_common_check_signal(epoll_ev->ev)) {
diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h
index 7f1d876..707bfab 100644
--- a/lib/tevent/tevent_internal.h
+++ b/lib/tevent/tevent_internal.h
@@ -313,3 +313,5 @@ bool tevent_poll_init(void);
#ifdef HAVE_EPOLL
bool tevent_epoll_init(void);
#endif
+void tevent_before_wait(struct tevent_context *ev);
+void tevent_after_wait(struct tevent_context *ev);
diff --git a/lib/tevent/tevent_select.c b/lib/tevent/tevent_select.c
index 51c1dec..6fa38ce 100644
--- a/lib/tevent/tevent_select.c
+++ b/lib/tevent/tevent_select.c
@@ -130,6 +130,8 @@ static struct tevent_fd *select_event_add_fd(struct tevent_context *ev, TALLOC_C
return fde;
}
+extern pid_t ctdbd_pid;
+
/*
event loop handling using select()
*/
@@ -167,7 +169,9 @@ static int select_event_loop_select(struct select_event_context *select_ev, stru
return 0;
}
+ if (getpid() == ctdbd_pid) tevent_before_wait(select_ev->ev);
selrtn = select(select_ev->maxfd+1, &r_fds, &w_fds, NULL, tvalp);
+ if (getpid() == ctdbd_pid) tevent_after_wait(select_ev->ev);
if (selrtn == -1 && errno == EINTR &&
select_ev->ev->signal_events) {
diff --git a/lib/tevent/tevent_standard.c b/lib/tevent/tevent_standard.c
index 534576c..4041b6a 100644
--- a/lib/tevent/tevent_standard.c
+++ b/lib/tevent/tevent_standard.c
@@ -256,6 +256,8 @@ static void epoll_change_event(struct std_event_context *std_ev, struct tevent_f
}
}
+extern pid_t ctdbd_pid;
+
/*
event loop handling using epoll
*/
@@ -278,7 +280,9 @@ static int epoll_event_loop(struct std_event_context *std_ev, struct timeval *tv
return 0;
}
+ if (getpid() == ctdbd_pid) tevent_before_wait(std_ev->ev);
ret = epoll_wait(std_ev->epoll_fd, events, MAXEVENTS, timeout);
+ if (getpid() == ctdbd_pid) tevent_after_wait(std_ev->ev);
if (ret == -1 && errno == EINTR && std_ev->ev->signal_events) {
if (tevent_common_check_signal(std_ev->ev)) {
diff --git a/lib/tevent/tevent_util.c b/lib/tevent/tevent_util.c
index 16af8f3..e3a1605 100644
--- a/lib/tevent/tevent_util.c
+++ b/lib/tevent/tevent_util.c
@@ -105,3 +105,55 @@ bool ev_set_close_on_exec(int fd)
#endif
return false;
}
+
+
+static struct timeval tevent_before_wait_ts;
+static struct timeval tevent_after_wait_ts;
+
+/*
+ * measure the time difference between multiple arrivals
+ * to the point where we wait for new events to come in
+ *
+ * allows to measure how long it takes to work on a
+ * event
+ */
+void tevent_before_wait(struct tevent_context *ev) {
+
+ struct timeval diff;
+ struct timeval now = tevent_timeval_current();
+
+ if (!tevent_timeval_is_zero(&tevent_after_wait_ts)) {
+ diff = tevent_timeval_until(&tevent_after_wait_ts, &now);
+ if (diff.tv_sec > 3) {
+ tevent_debug(ev, TEVENT_DEBUG_ERROR, __location__
+ " Handling event took %d seconds!",
+ (int) diff.tv_sec);
+ }
+ }
+
+ tevent_before_wait_ts = tevent_timeval_current();
+
+}
+
+/*
+ * measure how long the select()/epoll() call took
+ *
+ * allows to measure how long we are waiting for new events
+ */
+void tevent_after_wait(struct tevent_context *ev) {
+
+ struct timeval diff;
+ struct timeval now = tevent_timeval_current();
+
+ if (!tevent_timeval_is_zero(&tevent_before_wait_ts)) {
+ diff = tevent_timeval_until(&tevent_before_wait_ts, &now);
+ if (diff.tv_sec > 3) {
+ tevent_debug(ev, TEVENT_DEBUG_FATAL, __location__
+ " No event for %d seconds!",
+ (int) diff.tv_sec);
+ }
+ }
+
+ tevent_after_wait_ts = tevent_timeval_current();
+
+}
--
CTDB repository
More information about the samba-cvs
mailing list