Remote server PRIVMSG/NOTICE to nickname support

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

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 41f40dc2bef696380d690db94b1817e9b1e58c48..95d11980008a84e0ea8c44669a86693791b7ef43 100644 (file)
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -434,21 +434,25 @@ const char* BufferedSocket::Read()
        }
 }
 
-void BufferedSocket::MarkAsClosed()
-{
-}
-
-// There are two possible outcomes to this function.
-// It will either write all of the data, or an undefined amount.
-// If an undefined amount is written the connection has failed
-// and should be aborted.
-int BufferedSocket::Write(const std::string &data)
+/*
+ * This function formerly tried to flush write buffer each call.
+ * While admirable in attempting to get the data out to wherever
+ * it is going, on a full socket, it's just going to syscall write() and
+ * EAGAIN constantly, instead of waiting in the SE to know if it can write
+ * which will chew a bit of CPU.
+ *
+ * So, now this function returns void (take note) and just adds to the sendq.
+ *
+ * It'll get written at a determinate point when the socketengine tells us it can write.
+ *             -- w00t (april 1, 2008)
+ */
+void BufferedSocket::Write(const std::string &data)
 {
-       /* Try and append the data to the back of the queue, and send it on its way
-        */
+       /* Append the data to the back of the queue ready for writing */
        outbuffer.push_back(data);
+
+       /* Mark ourselves as wanting write */
        this->Instance->SE->WantWrite(this);
-       return (!this->FlushWriteBuffer());
 }
 
 bool BufferedSocket::FlushWriteBuffer()