Constant eating 20% cpu since last nights commit - test fix

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

diff --git a/include/inspircd.h b/include/inspircd.h
index 5a8dbcf97cd1439f0e195e5c0735cb4707a3781d..fd657a63b2e687b6c3e4445d5ed12e33c63c7bdb 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -107,6 +107,16 @@ class InspIRCd
         void erase_module(int j);
        void BuildISupport();
        void MoveTo(std::string modulename,int slot);
+        bool expire_run;
+        int activefds[MAX_DESCRIPTORS];
+        int incomingSockfd;
+        int in_port;
+        userrec* cu;
+        InspSocket* s;
+        InspSocket* s_del;
+        unsigned int numberactive;
+        sockaddr_in sock_us;     // our port number
+        socklen_t uslen;         // length of our port number
 
  public:
        time_t startup_time;

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 9eeec73a3cb199958ced6a77170fe0a3db7aa1a0..98418a967c7fd81c012c41fc3b506a6d2876da14 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -606,7 +606,7 @@ bool InspIRCd::LoadModule(const char* filename)
 
 void InspIRCd::DoOneIteration(bool process_module_sockets)
 {
-        bool expire_run = false;
+        /*bool expire_run = false;
         int activefds[MAX_DESCRIPTORS];
         int incomingSockfd;
         int in_port;
@@ -615,7 +615,7 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
         InspSocket* s_del = NULL;
         unsigned int numberactive;
         sockaddr_in sock_us;     // our port number
-        socklen_t uslen;         // length of our port number
+        socklen_t uslen;*/         // length of our port number
 
         /* time() seems to be a pretty expensive syscall, so avoid calling it too much.
          * Once per loop iteration is pleanty.
@@ -803,6 +803,8 @@ int InspIRCd::Run()
        WritePID(Config->PID);
 
        /* main loop, this never returns */
+       expire_run = false;
+
        while (true)
        {
                DoOneIteration(true);