DoSocketTimeouts and TickTimers only need to be called once a second. Why they were being called once every time around the mainloop, up to 30 times a second, is beyond me.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4937 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 4 insertions, 5 deletions

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index c5f1a962f..69f812d55 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -725,17 +725,16 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
 		{
 			irc::whowas::MaintainWhoWas(TIME);
 		}
+		Timers->TickTimers(TIME);
+		if (process_module_sockets)
+			this->DoSocketTimeouts(TIME);
 	}
 
 	/* Process timeouts on module sockets each time around
 	 * the loop. There shouldnt be many module sockets, at
 	 * most, 20 or so, so this won't be much of a performance
 	 * hit at all.   
-	 */ 
-	if (process_module_sockets)
-		this->DoSocketTimeouts(TIME);
-	 
-	Timers->TickTimers(TIME);
+	 */
 	 
 	/* Call the socket engine to wait on the active
 	 * file descriptors. The socket engine has everything's