summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-02-27 10:13:22 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-02-27 10:13:22 +0000
commit747ae4b7a56cf94562b5b339ab3adc88653aa337 (patch)
tree87fc88cae65cc992717dc542026b02cc5f161ee9
parent3ae2ad7553e2a12ecf5804f03f5943206f548770 (diff)
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
-rw-r--r--include/inspircd.h10
-rw-r--r--src/inspircd.cpp6
2 files changed, 14 insertions, 2 deletions
diff --git a/include/inspircd.h b/include/inspircd.h
index 5a8dbcf97..fd657a63b 100644
--- 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 9eeec73a3..98418a967 100644
--- 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);