Persistent conns in TSocketPool
Summary: Added support for persistent conns in TSocketPool
Also, added some util functions in TNonblockingServer
Reviewed By: mcslee
Test Plan: Ran a test search cluster with these changes - open was only called once (I put fprintfs in open and close), after which the socket was reused
Revert: OK
TracCamp Project: Thrift
DiffCamp Revision: 11425
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665668 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/src/server/TNonblockingServer.h b/lib/cpp/src/server/TNonblockingServer.h
index 7c6bc7f..0c3c6d5 100644
--- a/lib/cpp/src/server/TNonblockingServer.h
+++ b/lib/cpp/src/server/TNonblockingServer.h
@@ -64,6 +64,9 @@
// Event struct, for use with eventBase_
struct event serverEvent_;
+ // Number of TConnection object we've created
+ size_t numTConnections_;
+
/**
* This is a stack of all the objects that have been created but that
* are NOT currently in use. When we close a connection, we place it on this
@@ -82,7 +85,8 @@
port_(port),
frameResponses_(true),
threadPoolProcessing_(false),
- eventBase_(NULL) {}
+ eventBase_(NULL),
+ numTConnections_(0) {}
TNonblockingServer(boost::shared_ptr<TProcessor> processor,
boost::shared_ptr<TProtocolFactory> protocolFactory,
@@ -93,7 +97,8 @@
port_(port),
frameResponses_(true),
threadManager_(threadManager),
- eventBase_(NULL) {
+ eventBase_(NULL),
+ numTConnections_(0) {
setInputTransportFactory(boost::shared_ptr<TTransportFactory>(new TTransportFactory()));
setOutputTransportFactory(boost::shared_ptr<TTransportFactory>(new TTransportFactory()));
setInputProtocolFactory(protocolFactory);
@@ -113,7 +118,8 @@
port_(port),
frameResponses_(true),
threadManager_(threadManager),
- eventBase_(NULL) {
+ eventBase_(NULL),
+ numTConnections_(0) {
setInputTransportFactory(inputTransportFactory);
setOutputTransportFactory(outputTransportFactory);
setInputProtocolFactory(inputProtocolFactory);
@@ -128,6 +134,10 @@
threadPoolProcessing_ = (threadManager != NULL);
}
+ boost::shared_ptr<ThreadManager> getThreadManager() {
+ return threadManager_;
+ }
+
bool isThreadPoolProcessing() const {
return threadPoolProcessing_;
}
@@ -148,6 +158,18 @@
return eventBase_;
}
+ void incrementNumConnections(size_t incr=1) {
+ numTConnections_ += incr;
+ }
+
+ size_t getNumConnections() {
+ return numTConnections_;
+ }
+
+ size_t getNumIdleConnections() {
+ return connectionStack_.size();
+ }
+
TConnection* createConnection(int socket, short flags);
void returnConnection(TConnection* connection);
@@ -163,7 +185,6 @@
void registerEvents(event_base* base);
void serve();
-
};
/**
@@ -304,6 +325,11 @@
outputTransport_ = boost::shared_ptr<TMemoryBuffer>(new TMemoryBuffer());
init(socket, eventFlags, s);
+ server_->incrementNumConnections();
+ }
+
+ ~TConnection() {
+ server_->incrementNumConnections(-1);
}
// Initialize