优化掉频繁的findChannel消耗。

kbengine · kbengine · commit 56e66324eb5d · 2016-08-24T17:45:25.000+08:00
diff --git a/kbe/src/lib/network/packet_receiver.cpp b/kbe/src/lib/network/packet_receiver.cpp
@@ -38,6 +38,7 @@ namespace Network
 //-------------------------------------------------------------------------------------
 PacketReceiver::PacketReceiver() :
 	pEndpoint_(NULL),
+	pChannel_(NULL),
 	pNetworkInterface_(NULL)
 {
 }
@@ -46,6 +47,7 @@ PacketReceiver::PacketReceiver() :
 PacketReceiver::PacketReceiver(EndPoint & endpoint,
 	   NetworkInterface & networkInterface	) :
 	pEndpoint_(&endpoint),
+	pChannel_(NULL),
 	pNetworkInterface_(&networkInterface)
 {
 }
@@ -94,7 +96,16 @@ EventDispatcher & PacketReceiver::dispatcher()
 //-------------------------------------------------------------------------------------
 Channel* PacketReceiver::getChannel()
 {
-	return pNetworkInterface_->findChannel(pEndpoint_->addr());
+	if (pChannel_)
+	{
+		if (pChannel_->isDestroyed())
+			return NULL;
+
+		return pChannel_;
+	}
+
+	pChannel_ = pNetworkInterface_->findChannel(pEndpoint_->addr());
+	return pChannel_;
 }
 
 //-------------------------------------------------------------------------------------
diff --git a/kbe/src/lib/network/packet_receiver.h b/kbe/src/lib/network/packet_receiver.h
@@ -66,6 +66,7 @@ class PacketReceiver : public InputNotificationHandler, public PoolObject
 	void onReclaimObject()
 	{
 		pEndpoint_ = NULL;
+		pChannel_ = NULL;
 		pNetworkInterface_ = NULL;
 	}
 
@@ -74,8 +75,9 @@ class PacketReceiver : public InputNotificationHandler, public PoolObject
 		return TCP_PACKET_RECEIVER;
 	}
 
-	void pEndPoint(EndPoint* pEndpoint){ 
+	void pEndPoint(EndPoint* pEndpoint) { 
 		pEndpoint_ = pEndpoint; 
+		pChannel_ = NULL;
 	}
 
 	EndPoint* pEndPoint() const { 
@@ -92,6 +94,7 @@ class PacketReceiver : public InputNotificationHandler, public PoolObject
 
 protected:
 	EndPoint* pEndpoint_;
+	Channel* pChannel_;
 	NetworkInterface* pNetworkInterface_;
 };
 
diff --git a/kbe/src/lib/network/packet_sender.cpp b/kbe/src/lib/network/packet_sender.cpp
@@ -38,6 +38,7 @@ namespace Network
 //-------------------------------------------------------------------------------------
 PacketSender::PacketSender() :
 	pEndpoint_(NULL),
+	pChannel_(NULL),
 	pNetworkInterface_(NULL)
 {
 }
@@ -46,6 +47,7 @@ PacketSender::PacketSender() :
 PacketSender::PacketSender(EndPoint & endpoint,
 	   NetworkInterface & networkInterface):
 	pEndpoint_(&endpoint),
+	pChannel_(NULL),
 	pNetworkInterface_(&networkInterface)
 {
 }
@@ -58,7 +60,16 @@ PacketSender::~PacketSender()
 //-------------------------------------------------------------------------------------
 Channel* PacketSender::getChannel()
 {
-	return pNetworkInterface_->findChannel(pEndpoint_->addr());
+	if (pChannel_)
+	{
+		if (pChannel_->isDestroyed())
+			return NULL;
+
+		return pChannel_;
+	}
+
+	pChannel_ = pNetworkInterface_->findChannel(pEndpoint_->addr());
+	return pChannel_;
 }
 
 //-------------------------------------------------------------------------------------
diff --git a/kbe/src/lib/network/packet_sender.h b/kbe/src/lib/network/packet_sender.h
@@ -49,10 +49,12 @@ class PacketSender : public OutputNotificationHandler, public PoolObject
 	void onReclaimObject()
 	{
 		pEndpoint_ = NULL;
+		pChannel_ = NULL;
 		pNetworkInterface_ = NULL;
 	}
 
-	void pEndPoint(EndPoint* pEndpoint){ 
+	void pEndPoint(EndPoint* pEndpoint) {
+		pChannel_ = NULL;
 		pEndpoint_ = pEndpoint; 
 	}
 
@@ -73,6 +75,7 @@ class PacketSender : public OutputNotificationHandler, public PoolObject
 
 protected:
 	EndPoint* pEndpoint_;
+	Channel* pChannel_;
 	NetworkInterface* pNetworkInterface_;
 };
 

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ namespace Network`
`38`	`38`	`//-------------------------------------------------------------------------------------`
`39`	`39`	`PacketReceiver::PacketReceiver() :`
`40`	`40`	`pEndpoint_(NULL),`
	`41`	`+ pChannel_(NULL),`
`41`	`42`	`pNetworkInterface_(NULL)`
`42`	`43`	`{`
`43`	`44`	`}`
`@@ -46,6 +47,7 @@ PacketReceiver::PacketReceiver() :`
`46`	`47`	`PacketReceiver::PacketReceiver(EndPoint & endpoint,`
`47`	`48`	`NetworkInterface & networkInterface ) :`
`48`	`49`	`pEndpoint_(&endpoint),`
	`50`	`+ pChannel_(NULL),`
`49`	`51`	`pNetworkInterface_(&networkInterface)`
`50`	`52`	`{`
`51`	`53`	`}`
`@@ -94,7 +96,16 @@ EventDispatcher & PacketReceiver::dispatcher()`
`94`	`96`	`//-------------------------------------------------------------------------------------`
`95`	`97`	`Channel* PacketReceiver::getChannel()`
`96`	`98`	`{`
`97`		`- return pNetworkInterface_->findChannel(pEndpoint_->addr());`
	`99`	`+ if (pChannel_)`
	`100`	`+ {`
	`101`	`+ if (pChannel_->isDestroyed())`
	`102`	`+ return NULL;`
	`103`	`+`
	`104`	`+ return pChannel_;`
	`105`	`+ }`
	`106`	`+`
	`107`	`+ pChannel_ = pNetworkInterface_->findChannel(pEndpoint_->addr());`
	`108`	`+ return pChannel_;`
`98`	`109`	`}`
`99`	`110`
`100`	`111`	`//-------------------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ class PacketReceiver : public InputNotificationHandler, public PoolObject`
`66`	`66`	`void onReclaimObject()`
`67`	`67`	`{`
`68`	`68`	`pEndpoint_ = NULL;`
	`69`	`+ pChannel_ = NULL;`
`69`	`70`	`pNetworkInterface_ = NULL;`
`70`	`71`	`}`
`71`	`72`
`@@ -74,8 +75,9 @@ class PacketReceiver : public InputNotificationHandler, public PoolObject`
`74`	`75`	`return TCP_PACKET_RECEIVER;`
`75`	`76`	`}`
`76`	`77`
`77`		`- void pEndPoint(EndPoint* pEndpoint){`
	`78`	`+ void pEndPoint(EndPoint* pEndpoint) {`
`78`	`79`	`pEndpoint_ = pEndpoint;`
	`80`	`+ pChannel_ = NULL;`
`79`	`81`	`}`
`80`	`82`
`81`	`83`	`EndPoint* pEndPoint() const {`
`@@ -92,6 +94,7 @@ class PacketReceiver : public InputNotificationHandler, public PoolObject`
`92`	`94`
`93`	`95`	`protected:`
`94`	`96`	`EndPoint* pEndpoint_;`
	`97`	`+ Channel* pChannel_;`
`95`	`98`	`NetworkInterface* pNetworkInterface_;`
`96`	`99`	`};`
`97`	`100`
Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,12 @@ class PacketSender : public OutputNotificationHandler, public PoolObject`
`49`	`49`	`void onReclaimObject()`
`50`	`50`	`{`
`51`	`51`	`pEndpoint_ = NULL;`
	`52`	`+ pChannel_ = NULL;`
`52`	`53`	`pNetworkInterface_ = NULL;`
`53`	`54`	`}`
`54`	`55`
`55`		`- void pEndPoint(EndPoint* pEndpoint){`
	`56`	`+ void pEndPoint(EndPoint* pEndpoint) {`
	`57`	`+ pChannel_ = NULL;`
`56`	`58`	`pEndpoint_ = pEndpoint;`
`57`	`59`	`}`
`58`	`60`
`@@ -73,6 +75,7 @@ class PacketSender : public OutputNotificationHandler, public PoolObject`
`73`	`75`
`74`	`76`	`protected:`
`75`	`77`	`EndPoint* pEndpoint_;`
	`78`	`+ Channel* pChannel_;`
`76`	`79`	`NetworkInterface* pNetworkInterface_;`
`77`	`80`	`};`
`78`	`81`