X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=95d11980008a84e0ea8c44669a86693791b7ef43;hb=4b856bda135a08e800b96c970a10b0b6a34d433a;hp=17aaa220dc18c9ed75938e27088649d99099e3ad;hpb=bfaf7e3b27981a5144faba6d17c6e29fac735dbb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 17aaa220d..95d119800 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -116,7 +116,7 @@ BufferedSocket::BufferedSocket(InspIRCd* SI, const std::string &ipaddr, int apor
 		}
 		if (!ipvalid)
 		{
-			this->Instance->Log(DEBUG,"BUG: Hostname passed to BufferedSocket, rather than an IP address!");
+			this->Instance->Logs->Log("SOCKET", DEBUG,"BUG: Hostname passed to BufferedSocket, rather than an IP address!");
 			this->OnError(I_ERR_CONNECT);
 			this->Close();
 			this->fd = -1;
@@ -236,7 +236,7 @@ bool BufferedSocket::BindAddr(const std::string &ip)
 		}
 		j++;
 	}
-	Instance->Log(DEBUG,"nothing in the config to bind()!");
+	Instance->Logs->Log("SOCKET", DEBUG,"nothing in the config to bind()!");
 	return true;
 }
 
@@ -345,7 +345,7 @@ bool BufferedSocket::DoConnect()
 		this->SetQueues(this->fd);
 	}
 
-	Instance->Log(DEBUG,"BufferedSocket::DoConnect success");
+	Instance->Logs->Log("SOCKET", DEBUG,"BufferedSocket::DoConnect success");
 	return true;
 }
 
@@ -367,7 +367,7 @@ void BufferedSocket::Close()
 			}
 			catch (CoreException& modexcept)
 			{
-				Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+				Instance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 			}
 		}
 		Instance->SE->Shutdown(this, 2);
@@ -402,7 +402,7 @@ const char* BufferedSocket::Read()
 		}
 		catch (CoreException& modexcept)
 		{
-			Instance->Log(DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+			Instance->Logs->Log("SOCKET", DEFAULT,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 		}
 		if (MOD_RESULT < 0)
 		{
@@ -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()
@@ -470,7 +474,7 @@ bool BufferedSocket::FlushWriteBuffer()
 				}
 				catch (CoreException& modexcept)
 				{
-					Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+					Instance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 					return true;
 				}
 			}
@@ -536,7 +540,7 @@ bool BufferedSocket::FlushWriteBuffer()
 
 void SocketTimeout::Tick(time_t)
 {
-	ServerInstance->Log(DEBUG,"SocketTimeout::Tick");
+	ServerInstance->Logs->Log("SOCKET", DEBUG,"SocketTimeout::Tick");
 
 	if (ServerInstance->SE->GetRef(this->sfd) != this->sock)
 		return;
@@ -594,14 +598,14 @@ bool BufferedSocket::Poll()
 
 			if (Instance->Config->GetIOHook(this))
 			{
-				Instance->Log(DEBUG,"Hook for raw connect");
+				Instance->Logs->Log("SOCKET",DEBUG,"Hook for raw connect");
 				try
 				{
 					Instance->Config->GetIOHook(this)->OnRawSocketConnect(this->fd);
 				}
 				catch (CoreException& modexcept)
 				{
-					Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+					Instance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 				}
 			}
 			return this->OnConnected();
@@ -643,7 +647,7 @@ bool BufferedSocket::Poll()
 				}
 				catch (CoreException& modexcept)
 				{
-					Instance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+					Instance->Logs->Log("SOCKET",DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 				}
 			}