summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDavid Reiss <dreiss@apache.org>2008-07-03 20:29:34 +0000
committerDavid Reiss <dreiss@apache.org>2008-07-03 20:29:34 +0000
commitaf78778acd7fb551a84aaf63e604d969123bf85d (patch)
treedb279121d2fdebf27cced752a46ab0898848c0b3 /test
parent03b574feada3862d460c7fc15dd1fb90687ff428 (diff)
downloadthrift-af78778acd7fb551a84aaf63e604d969123bf85d.tar.gz
(THRIFT-54) Remove "frameResponses" from TNonblockingServer
TNonblockingServer and TFramedTransport used to have the option to only frame messages on one side of the communication. This capability was removed from TFramedTransport because it was poorly implemented and not useful. This change removes it from TNonblockingServer as well, and removes references to it in some of the C++ test code. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@673791 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test')
-rw-r--r--test/cpp/src/TestClient.cpp10
-rw-r--r--test/cpp/src/TestServer.cpp14
2 files changed, 0 insertions, 24 deletions
diff --git a/test/cpp/src/TestClient.cpp b/test/cpp/src/TestClient.cpp
index 4b82619e0..852993897 100644
--- a/test/cpp/src/TestClient.cpp
+++ b/test/cpp/src/TestClient.cpp
@@ -37,7 +37,6 @@ int main(int argc, char** argv) {
int port = 9090;
int numTests = 1;
bool framed = false;
- bool frameInput = true;
for (int i = 0; i < argc; ++i) {
if (strcmp(argv[i], "-h") == 0) {
@@ -53,9 +52,6 @@ int main(int argc, char** argv) {
numTests = atoi(argv[++i]);
} else if (strcmp(argv[i], "-f") == 0) {
framed = true;
- } else if (strcmp(argv[i], "-fo") == 0) {
- framed = true;
- frameInput = false;
}
}
@@ -66,13 +62,7 @@ int main(int argc, char** argv) {
if (framed) {
shared_ptr<TFramedTransport> framedSocket(new TFramedTransport(socket));
- framedSocket->setRead(frameInput);
transport = framedSocket;
- if (frameInput) {
- printf("Using bi-directional framed transport mode\n");
- } else {
- printf("Using framed output only mode\n");
- }
} else {
shared_ptr<TBufferedTransport> bufferedSocket(new TBufferedTransport(socket));
transport = bufferedSocket;
diff --git a/test/cpp/src/TestServer.cpp b/test/cpp/src/TestServer.cpp
index 0c58a297f..ce18aafd4 100644
--- a/test/cpp/src/TestServer.cpp
+++ b/test/cpp/src/TestServer.cpp
@@ -274,7 +274,6 @@ int main(int argc, char **argv) {
string serverType = "simple";
string protocolType = "binary";
size_t workerCount = 4;
- bool frameOutput = true;
ostringstream usage;
@@ -309,10 +308,6 @@ int main(int argc, char **argv) {
port = atoi(args["port"].c_str());
}
- if (!args["noframe"].empty()) {
- frameOutput = false;
- }
-
if (!args["server-type"].empty()) {
serverType = args["server-type"];
if (serverType == "simple") {
@@ -400,18 +395,9 @@ int main(int argc, char **argv) {
threadedServer.serve();
} else if (serverType == "nonblocking") {
-
TNonblockingServer nonblockingServer(testProcessor, port);
- nonblockingServer.setFrameResponses(frameOutput);
- if (frameOutput) {
- printf("Using framed output mode\n");
- } else {
- printf("Using non-framed output mode\n");
- }
-
printf("Starting the nonblocking server on port %d...\n", port);
nonblockingServer.serve();
-
}
printf("done.\n");