| 
						
					 | 
					
						
						
							
						
						12922225b8
					 | 
					
						
						
							
							Remove redundant DCB state DCB_STATE_FREED, remove obsolete assertion from poll.c, tidy up.
						
						
						
						
						
						
					 | 
					
						2015-08-25 09:11:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ae669c6f88
					 | 
					
						
						
							
							Fix mistake
						
						
						
						
						
						
					 | 
					
						2015-08-24 16:29:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						65c42e2d80
					 | 
					
						
						
							
							Move removal of closing DCB from poll list to the kill zombies processing, rather than immediately on close; modify persistent connections to obtain candidates for the pool from the kill zombies processing to be sure that they really are finished all previous processing.
						
						
						
						
						
						
					 | 
					
						2015-08-24 16:19:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7410b3dfbd
					 | 
					
						
						
							
							Cleaned up code.
						
						
						
						
						
						
					 | 
					
						2015-08-21 18:13:45 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4e5968ee15
					 | 
					
						
						
							
							Reverted changed which add a return value to dcb_log_write_failure
						
						
						
						
						
						
					 | 
					
						2015-08-18 13:12:59 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6a92a419ff
					 | 
					
						
						
							
							Remove function declaration - moved to header. Implement spin_reporter in server.c, required for correct compilation when SPINLOCK_PROFILE is defined true.
						
						
						
						
						
						
					 | 
					
						2015-07-27 09:01:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7363343499
					 | 
					
						
						
							
							Fixed dcb_write failing when the cause was EAGAIN or EWOULDBLOCK.
						
						
						
						
						
						
					 | 
					
						2015-07-22 15:34:51 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						78e046c9f8
					 | 
					
						
						
							
							Fix typo; fix double count decrement.
						
						
						
						
						
						
					 | 
					
						2015-07-21 11:00:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c33f1199d9
					 | 
					
						
						
							
							Fix lack of declaration for session_unlink_dcb; restructure dcb closedown logic to fix counting problem and reduce code.
						
						
						
						
						
						
					 | 
					
						2015-07-21 09:54:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3c999cef8d
					 | 
					
						
						
							
							Added missing subtraction of current number of connections.
						
						
						
						
						
						
					 | 
					
						2015-07-20 16:39:37 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a53c91c587
					 | 
					
						
						
							
							Fixed compiler warnings.
						
						
						
						
						
						
					 | 
					
						2015-07-20 16:29:36 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						89524b1427
					 | 
					
						
						
							
							Further tidying in dcb_write
						
						
						
						
						
						
					 | 
					
						2015-07-20 14:19:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bb1f26eda5
					 | 
					
						
						
							
							Fixes for maintainability of dcb.c; error in persistent connections.
						
						
						
						
						
						
					 | 
					
						2015-07-19 16:48:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4a0925f33d
					 | 
					
						
						
							
							Correct mistake in dcb_read; use larger integer to accomodate three byte length in modutil.
						
						
						
						
						
						
					 | 
					
						2015-07-19 09:10:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a85262171f
					 | 
					
						
						
							
							Added missing assignment of the write buffer to write queue when a write fails in dcb_write.
						
						
						
						
						
						
					 | 
					
						2015-07-16 21:47:42 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d4bc710d3e
					 | 
					
						
						
							
							Fix mistake in dcb_close.
						
						
						
						
						
						
					 | 
					
						2015-07-15 15:15:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3992f262ca
					 | 
					
						
						
							
							Fixed Coverity defects
						
						
						
						
						
						
					 | 
					
						2015-07-14 16:17:50 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						00b4d8edf5
					 | 
					
						
						
							
							Tidy up indentation, add folds around logging, in dcb_read.
						
						
						
						
						
						
					 | 
					
						2015-07-13 09:56:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a9d30b07b3
					 | 
					
						
						
							
							Fixed MXS-258: https://mariadb.atlassian.net/browse/MXS-258
						
						
						
						
						
						
					 | 
					
						2015-07-12 22:34:28 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						206f93e3ec
					 | 
					
						
						
							
							Fixed missing return values.
						
						
						
						
						
						
					 | 
					
						2015-07-11 19:02:01 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ce0d9684d4
					 | 
					
						
						
							
							A few more clarifications, I hope.
						
						
						
						
						
						
					 | 
					
						2015-07-10 17:00:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4f5de063eb
					 | 
					
						
						
							
							Merged dcb_read and dcb_read_n into a single function (dcb_read with an extra parameter).
						
						
						
						
						
						
					 | 
					
						2015-07-10 15:12:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						015cb890d4
					 | 
					
						
						
							
							Reduce complexity.
						
						
						
						
						
						
					 | 
					
						2015-07-10 14:56:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8376bbf3e6
					 | 
					
						
						
							
							Fix mismatch of int sizes; move calculation of maximum size of persistent pool to a better location.
						
						
						
						
						
						
					 | 
					
						2015-07-09 08:37:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bccf3d27d6
					 | 
					
						
						
							
							Correct name of function in debug message.
						
						
						
						
						
						
					 | 
					
						2015-07-08 16:22:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						700576ac32
					 | 
					
						
						
							
							Add the DCB address to the "Not adding DCB to persistent pool" debug message.
						
						
						
						
						
						
					 | 
					
						2015-07-08 16:15:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ce879b65c2
					 | 
					
						
						
							
							Fix wrong debug message; add maxadmin info for actual max size of persistent pool.
						
						
						
						
						
						
					 | 
					
						2015-07-08 16:03:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ba417ef633
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into MXS-122
						
						
						
						
						
						
						
						Conflicts:
	server/core/dcb.c 
						
						
					 | 
					
						2015-07-08 14:54:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4cea1b68c0
					 | 
					
						
						
							
							Simplify logic in processing of zombies list, to bring more into line with develop branch and reduce conflicts when merged.
						
						
						
						
						
						
					 | 
					
						2015-07-08 09:26:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4c8aa02c31
					 | 
					
						
						
							
							Finalise comments; change abort from assert(false) to raise(SIGABRT).
						
						
						
						
						
						
					 | 
					
						2015-07-07 16:57:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						be789855ee
					 | 
					
						
						
							
							Add lines to revision history.
						
						
						
						
						
						
					 | 
					
						2015-07-07 16:57:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						462c8e42ef
					 | 
					
						
						
							
							Fix more subtle bug and expand debug message for dcb_close entry.
						
						
						
						
						
						
					 | 
					
						2015-07-07 16:57:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d4eff72d8a
					 | 
					
						
						
							
							Fix stupid bug.
						
						
						
						
						
						
					 | 
					
						2015-07-07 16:57:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5577ef94e9
					 | 
					
						
						
							
							Wrap spinlock around more logic; simplify process zombies list logic.
						
						
						
						
						
						
					 | 
					
						2015-07-07 16:57:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9ee8d11808
					 | 
					
						
						
							
							Allow for DCB becoming a zombie during processing.
						
						
						
						
						
						
					 | 
					
						2015-07-07 16:57:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						96619e2f8f
					 | 
					
						
						
							
							Allow zombies to be submitted to dcb_close - but why does this happen?
						
						
						
						
						
						
					 | 
					
						2015-07-07 16:57:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fffd8fb73a
					 | 
					
						
						
							
							Unify DCB close processing to single function dcb_close. Remove dcb_add_to_zombieslist (incorporating logic into dcb_close). Alter logic so that DCB that is just allocated will still go to zombie list if dcb->fd is not closed.
						
						
						
						
						
						
					 | 
					
						2015-07-07 16:57:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						18a95eeb71
					 | 
					
						
						
							
							Simplify adding and removing DCBs from polling, improve error handling. Remove dcb_set_state functions as not adding value.
						
						
						
						
						
						
					 | 
					
						2015-07-07 16:57:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a72f462e2d
					 | 
					
						
						
							
							Fixes for MXS-196 and other related problems.
						
						
						
						
						
						
					 | 
					
						2015-07-07 16:57:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e5d9abbdcb
					 | 
					
						
						
							
							Fixes to Coverity defects.
						
						
						
						
						
						
					 | 
					
						2015-06-25 06:01:33 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ced5c67338
					 | 
					
						
						
							
							Tidy the lining up of a message; add documentation.
						
						
						
						
						
						
					 | 
					
						2015-06-24 14:39:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						80d130ef0c
					 | 
					
						
						
							
							Fixed dcb_write_SSL being called multiple times on failure.
						
						
						
						
						
						
					 | 
					
						2015-06-24 15:05:04 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						484781a463
					 | 
					
						
						
							
							More error logging for SSL connections.
						
						
						
						
						
						
					 | 
					
						2015-06-24 14:46:46 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						067a62b240
					 | 
					
						
						
							
							Added more error logging to dcb_write_SSL.
						
						
						
						
						
						
					 | 
					
						2015-06-24 14:34:46 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0f199d924f
					 | 
					
						
						
							
							Removed unnecessary call to SSL_get_error from dcb_accept_SSL.
						
						
						
						
						
						
					 | 
					
						2015-06-24 12:56:22 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dfbb42ead9
					 | 
					
						
						
							
							Fix missing newlines on persistent start time; fix typos.
						
						
						
						
						
						
					 | 
					
						2015-06-23 15:45:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						da987e895a
					 | 
					
						
						
							
							Merge branch 'MXS-212' into develop
						
						
						
						
						
						
					 | 
					
						2015-06-23 17:11:23 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c42d3d9f7a
					 | 
					
						
						
							
							Added missing NULL checks.
						
						
						
						
						
						
					 | 
					
						2015-06-23 17:05:31 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						09fdb0a2c2
					 | 
					
						
						
							
							Hopefully final tidy up.
						
						
						
						
						
						
					 | 
					
						2015-06-23 14:58:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						abf39303d7
					 | 
					
						
						
							
							Fixed the wrong value being returned form dcb_read_SSL.
						
						
						
						
						
						
					 | 
					
						2015-06-23 16:20:26 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |