Added a 'max depth' to stop recursive issue

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

2 files changed, 13 insertions, 1 deletions

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 253c2246b..eae26c64e 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -72,6 +72,7 @@ std::vector<userrec*> local_users;
 extern int MODCOUNT;
 extern char LOG_FILE[MAXBUF];
 int openSockfd[MAXSOCKS];
+int yield_depth;
 sockaddr_in client,server;
 socklen_t length;
 
@@ -602,6 +603,11 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
         sockaddr_in sock_us;     // our port number
         socklen_t uslen;         // length of our port number
 
+	if (yield_depth > 3)
+		return;
+
+	yield_depth++;
+
         /* time() seems to be a pretty expensive syscall, so avoid calling it too much.
          * Once per loop iteration is pleanty.
          */
@@ -634,6 +640,7 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
 		}
                 TickMissedTimers(TIME);
                 expire_run = true;
+		yield_depth--;
                 return;
         }   
         else if ((TIME % 5) == 1)
@@ -665,7 +672,10 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
          * servers... so its nice and easy, just one call.
          */
         if (!(numberactive = SE->Wait(activefds)))
+	{
+		yield_depth--;
                 return;
+	}
 
         /**
          * Now process each of the fd's. For users, we have a fast
@@ -778,6 +788,7 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
                         break;
                 }
         }
+	yield_depth--;
 }
 
 int InspIRCd::Run()
@@ -804,6 +815,7 @@ int InspIRCd::Run()
 
 	/* main loop, this never returns */
 	expire_run = false;
+	yield_depth = 0;
 
 	while (true)
 	{
diff --git a/src/svn-rev.sh b/src/svn-rev.sh
index ea5e71ac2..4ec28ae33 100755
--- a/src/svn-rev.sh
+++ b/src/svn-rev.sh
@@ -1 +1 @@
-echo 3502
+echo 3506