Attachment 8602 Details for Bug 9695 – Additional patch for v4-0-test

[patch] Additional patch for v4-0-test

tmp40.diff (text/plain), 1.23 KB, created by Stefan Metzmacher on 2013-03-02 08:17:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2013-03-02 08:17:18 UTC

Size: 1.23 KB

patch

obsolete

>From 22a7ad156898dcfd04a1b7e345438d3a19dca4dc Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 28 Feb 2013 10:54:21 +0100
>Subject: [PATCH] s3:lib/events: add missing TEVENT_TRACE_BEFORE/AFTER_WAIT
> handling
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit 2fb69f51c47c8859485011879afb11650835ecbe)
>---
> source3/lib/events.c |    6 ++++++
> 1 file changed, 6 insertions(+)
>
>diff --git a/source3/lib/events.c b/source3/lib/events.c
>index 947bcd4..4ae94fb 100644
>--- a/source3/lib/events.c
>+++ b/source3/lib/events.c
>@@ -290,6 +290,7 @@ static int s3_event_loop_once(struct tevent_context *ev, const char *location)
> 	int timeout;
> 	int num_pfds;
> 	int ret;
>+	int poll_errno;
> 
> 	timeout = INT_MAX;
> 
>@@ -309,7 +310,12 @@ static int s3_event_loop_once(struct tevent_context *ev, const char *location)
> 		return -1;
> 	}
> 
>+	tevent_trace_point_callback(ev, TEVENT_TRACE_BEFORE_WAIT);
> 	ret = poll(state->pfds, num_pfds, timeout);
>+	poll_errno = errno;
>+	tevent_trace_point_callback(ev, TEVENT_TRACE_AFTER_WAIT);
>+	errno = poll_errno;
>+
> 	if (ret == -1 && errno != EINTR) {
> 		tevent_debug(ev, TEVENT_DEBUG_FATAL,
> 			     "poll() failed: %d:%s\n",
>-- 
>1.7.9.5
>

Flags:

jra: review+
obnox: review+

Actions: View

Attachments on bug 9695: 8597 | 8602