[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-189-g4c7296c

[Volker Lendecke]

The branch, master has been updated
       via  4c7296cc0c0770ea547b67d668d5b42ab00a27da (commit)
       via  c001b456cf0c9fdfd90a5239e3b86168d0fbb5aa (commit)
      from  1021c752ea4fec887d732ac02b8cfbadc45d8686 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4c7296cc0c0770ea547b67d668d5b42ab00a27da
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jan 27 19:45:51 2009 +0100

    Avoid valgrind errors
    
    In event handlers, we might destroy other events that are pending in the lists.
    We can only run one event safely per select call.
    
    Yes, I've seen these valgrind errors :-)
    
    Jeremy, with ccdd921e61 you had checked in the change to run multiple events.
    Do you remember why it was necessary and could not be solved in a different
    way?
    
    Volker

commit c001b456cf0c9fdfd90a5239e3b86168d0fbb5aa
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jan 27 19:41:34 2009 +0100

    Fix a valgrind error when the socket dies
    
    Don't reference anything that might have been deleted in the async_req_error
    call.

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/events.c       |   48 +++++++++++--------------------------------
 source3/libsmb/async_smb.c |   13 ++++++++---
 2 files changed, 22 insertions(+), 39 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/events.c b/source3/lib/events.c
index 4484d53..44b4562 100644
--- a/source3/lib/events.c
+++ b/source3/lib/events.c
@@ -83,45 +83,24 @@ bool event_add_to_select_args(struct tevent_context *ev,
 bool run_events(struct tevent_context *ev,
 		int selrtn, fd_set *read_fds, fd_set *write_fds)
 {
-	bool fired = false;
-	struct tevent_fd *fde, *next;
+	struct tevent_fd *fde;
+	struct timeval now;
 
 	if (ev->signal_events &&
 	    tevent_common_check_signal(ev)) {
 		return true;
 	}
 
-	/* Run all events that are pending, not just one (as we
-	   did previously. */
-
-	while (ev->timer_events) {
-		struct timeval now;
-		GetTimeOfDay(&now);
-
-		if (timeval_compare(
-			    &now, &ev->timer_events->next_event) < 0) {
-			/* Nothing to do yet */
-			DEBUG(11, ("run_events: Nothing to do\n"));
-			break;
-		}
-
-		DEBUG(10, ("Running event \"%s\" %p\n",
-			   ev->timer_events->handler_name,
-			   ev->timer_events));
+	GetTimeOfDay(&now);
 
-		ev->timer_events->handler(
-			ev,
-			ev->timer_events, now,
-			ev->timer_events->private_data);
+	if ((ev->timer_events != NULL)
+	    && (timeval_compare(&now, &ev->timer_events->next_event) >= 0)) {
 
-		fired = true;
-	}
+		DEBUG(10, ("Running timed event \"%s\" %p\n",
+			   ev->timer_events->handler_name, ev->timer_events));
 
-	if (fired) {
-		/*
-		 * We might have changed the socket status during the timed
-		 * events, return to run select again.
-		 */
+		ev->timer_events->handler(ev, ev->timer_events, now,
+					  ev->timer_events->private_data);
 		return true;
 	}
 
@@ -129,23 +108,22 @@ bool run_events(struct tevent_context *ev,
 		/*
 		 * No fd ready
 		 */
-		return fired;
+		return false;
 	}
 
-	for (fde = ev->fd_events; fde; fde = next) {
+	for (fde = ev->fd_events; fde; fde = fde->next) {
 		uint16 flags = 0;
 
-		next = fde->next;
 		if (FD_ISSET(fde->fd, read_fds)) flags |= EVENT_FD_READ;
 		if (FD_ISSET(fde->fd, write_fds)) flags |= EVENT_FD_WRITE;
 
 		if (flags & fde->flags) {
 			fde->handler(ev, fde, flags, fde->private_data);
-			fired = true;
+			return true;
 		}
 	}
 
-	return fired;
+	return false;
 }
 
 
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index a1fcf8e..a4bbe6d 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -1022,7 +1022,7 @@ static void cli_state_handler(struct event_context *event_ctx,
 			      struct fd_event *event, uint16 flags, void *p)
 {
 	struct cli_state *cli = (struct cli_state *)p;
-	struct cli_request *req;
+	struct cli_request *req, *next;
 	NTSTATUS status;
 
 	DEBUG(11, ("cli_state_handler called with flags %d\n", flags));
@@ -1128,9 +1128,14 @@ static void cli_state_handler(struct event_context *event_ctx,
 	return;
 
  sock_error:
-	for (req = cli->outstanding_requests; req; req = req->next) {
-		int i;
-		for (i=0; i<req->num_async; i++) {
+
+	for (req = cli->outstanding_requests; req; req = next) {
+		int i, num_async;
+
+		next = req->next;
+		num_async = req->num_async;
+
+		for (i=0; i<num_async; i++) {
 			async_req_error(req->async[i], status);
 		}
 	}


-- 
Samba Shared Repository