Chris Browne cbbrowne at lists.slony.info
Wed Jun 10 14:13:43 PDT 2009
Update of /home/cvsd/slony1/slony1-engine/src/slon
In directory main.slony.info:/tmp/cvs-serv18275

Modified Files:
      Tag: REL_2_0_STABLE
	scheduler.c 
Log Message:
Per Jan's comments, this is a valid change; it also needs to be applied
to the 2.0 branch


Index: scheduler.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/scheduler.c,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -C2 -d -r1.26 -r1.26.2.1
*** scheduler.c	28 May 2008 19:09:37 -0000	1.26
--- scheduler.c	10 Jun 2009 21:13:41 -0000	1.26.2.1
***************
*** 423,439 ****
  
  		/*
- 		 * Make copies of the file descriptor sets for select(2)
- 		 */
- 		FD_ZERO(&rfds);
- 		FD_ZERO(&wfds);
- 		for (i = 0; i < sched_numfd; i++)
- 		{
- 			if (FD_ISSET(i, &sched_fdset_read))
- 				FD_SET(i, &rfds);
- 			if (FD_ISSET(i, &sched_fdset_write))
- 				FD_SET(i, &wfds);
- 		}
- 
- 		/*
  		 * Check if any of the connections in the wait queue have reached
  		 * their timeout. While doing so, we also remember the closest timeout
--- 423,426 ----
***************
*** 527,530 ****
--- 514,530 ----
  
  		/*
+ 		 * Make copies of the file descriptor sets for select(2)
+ 		 */
+ 		FD_ZERO(&rfds);
+ 		FD_ZERO(&wfds);
+ 		for (i = 0; i < sched_numfd; i++)
+ 		{
+ 			if (FD_ISSET(i, &sched_fdset_read))
+ 				FD_SET(i, &rfds);
+ 			if (FD_ISSET(i, &sched_fdset_write))
+ 				FD_SET(i, &wfds);
+ 		}
+ 
+ 		/*
  		 * Do the select(2) while unlocking the master lock.
  		 */



More information about the Slony1-commit mailing list