Test fixes for cpu eating issue

[user/henk/code/inspircd.git] / src / socket.cpp

diff --git a/src/socket.cpp b/src/socket.cpp
index 20a447ba74e6208d4902287c4bd793f0ea2a605f..767e2c468be3eb61a31484ca96c24db5841eec8f 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -71,6 +71,7 @@ InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsi
                        this->fd = -1;
                        this->state = I_ERROR;
                        this->OnError(I_ERR_SOCKET);
+                       this->ClosePending = true;
                        log(DEBUG,"OpenTCPSocket() error");
                         return;
                }
@@ -82,6 +83,7 @@ InspSocket::InspSocket(const std::string &ahost, int aport, bool listening, unsi
                                this->fd = -1;
                                this->state = I_ERROR;
                                this->OnError(I_ERR_BIND);
+                               this->ClosePending = true;
                                log(DEBUG,"BindSocket() error %s",strerror(errno));
                                return;
                        }
@@ -150,6 +152,7 @@ bool InspSocket::DoResolve()
                        this->state = I_ERROR;
                        this->OnError(I_ERR_RESOLVE);
                        this->fd = -1;
+                       this->ClosePending = true;
                        return false;
                }
                return this->DoConnect();
@@ -186,9 +189,10 @@ bool InspSocket::DoConnect()
                {
                        log(DEBUG,"Error connect() %d: %s",this->fd,strerror(errno));
                        this->OnError(I_ERR_CONNECT);
-                       this->state = I_ERROR;
                        this->Close();
+                       this->state = I_ERROR;
                        this->fd = -1;
+                       this->ClosePending = true;
                        return false;
                }
        }
@@ -209,6 +213,7 @@ void InspSocket::Close()
                shutdown(this->fd,2);
                close(this->fd);
                socket_ref[this->fd] = NULL;
+               this->ClosePending = true;
                this->fd = -1;
        }
 }
@@ -277,25 +282,20 @@ bool InspSocket::FlushWriteBuffer()
        {
                if (outbuffer.size())
                {
-                       log(DEBUG,"Writing %d to socket",outbuffer.size());
                        int result = write(this->fd,outbuffer[0].c_str(),outbuffer[0].length());
                        if (result > 0)
                        {
-                               log(DEBUG,"Wrote %d to socket",result);
                                if ((unsigned int)result == outbuffer[0].length())
                                {
                                        /* The whole block was written (usually a line)
                                         * Pop the block off the front of the queue
                                         */
-                                       log(DEBUG,"Popping front item, now %d items left",outbuffer.size());
                                        outbuffer.pop_front();
                                }
                                else
                                {
-                                       log(DEBUG,"Cutting front item");
                                        std::string temp = outbuffer[0].substr(result);
                                        outbuffer[0] = temp;
-                                       log(DEBUG,"Front item is now: ",outbuffer[0].c_str());
                                }
                        }
                        else if ((result == -1) && (errno != EAGAIN))