Whitespace fixes on test code
Reviewed By: thrift
Test Plan: Whitespace
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665136 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/test/cpp/src/main.cpp b/test/cpp/src/main.cpp
index f048027..30b90c5 100644
--- a/test/cpp/src/main.cpp
+++ b/test/cpp/src/main.cpp
@@ -136,7 +136,7 @@
_workerCount--;
- if(_workerCount == 0) {
+ if (_workerCount == 0) {
_monitor.notify();
}
@@ -144,13 +144,13 @@
}
void loopEchoVoid() {
- for(size_t ix = 0; ix < _loopCount; ix++) {
+ for (size_t ix = 0; ix < _loopCount; ix++) {
_client->echoVoid();
}
}
void loopEchoByte() {
- for(size_t ix = 0; ix < _loopCount; ix++) {
+ for (size_t ix = 0; ix < _loopCount; ix++) {
int8_t arg = 1;
int8_t result;
result =_client->echoByte(arg);
@@ -159,7 +159,7 @@
}
void loopEchoI32() {
- for(size_t ix = 0; ix < _loopCount; ix++) {
+ for (size_t ix = 0; ix < _loopCount; ix++) {
int32_t arg = 1;
int32_t result;
result =_client->echoI32(arg);
@@ -168,7 +168,7 @@
}
void loopEchoI64() {
- for(size_t ix = 0; ix < _loopCount; ix++) {
+ for (size_t ix = 0; ix < _loopCount; ix++) {
int64_t arg = 1;
int64_t result;
result =_client->echoI64(arg);
@@ -177,7 +177,7 @@
}
void loopEchoString() {
- for(size_t ix = 0; ix < _loopCount; ix++) {
+ for (size_t ix = 0; ix < _loopCount; ix++) {
string arg = "hello";
string result;
_client->echoString(result, arg);
@@ -232,17 +232,17 @@
map<string, string> args;
- for(int ix = 1; ix < argc; ix++) {
+ for (int ix = 1; ix < argc; ix++) {
string arg(argv[ix]);
- if(arg.compare(0,2, "--") == 0) {
+ if (arg.compare(0,2, "--") == 0) {
size_t end = arg.find_first_of("=", 2);
string key = string(arg, 2, end - 2);
- if(end != string::npos) {
+ if (end != string::npos) {
args[key] = string(arg, end + 1);
} else {
args[key] = "true";
@@ -254,47 +254,47 @@
try {
- if(!args["clients"].empty()) {
+ if (!args["clients"].empty()) {
clientCount = atoi(args["clients"].c_str());
}
- if(!args["help"].empty()) {
+ if (!args["help"].empty()) {
cerr << usage.str();
return 0;
}
- if(!args["loop"].empty()) {
+ if (!args["loop"].empty()) {
loopCount = atoi(args["loop"].c_str());
}
- if(!args["call"].empty()) {
+ if (!args["call"].empty()) {
callName = args["call"];
}
- if(!args["port"].empty()) {
+ if (!args["port"].empty()) {
port = atoi(args["port"].c_str());
}
- if(!args["server"].empty()) {
+ if (!args["server"].empty()) {
runServer = args["server"] == "true";
}
- if(!args["log-request"].empty()) {
+ if (!args["log-request"].empty()) {
logRequests = args["log-request"] == "true";
}
- if(!args["replay-request"].empty()) {
+ if (!args["replay-request"].empty()) {
replayRequests = args["replay-request"] == "true";
}
- if(!args["server-type"].empty()) {
+ if (!args["server-type"].empty()) {
serverType = args["server-type"];
- if(serverType == "simple") {
+ if (serverType == "simple") {
- } else if(serverType == "thread-pool") {
+ } else if (serverType == "thread-pool") {
- } else if(serverType == "threaded") {
+ } else if (serverType == "threaded") {
} else {
@@ -302,7 +302,7 @@
}
}
- if(!args["workers"].empty()) {
+ if (!args["workers"].empty()) {
workerCount = atoi(args["workers"].c_str());
}
@@ -338,7 +338,7 @@
}
- if(runServer) {
+ if (runServer) {
shared_ptr<ServiceProcessor> serviceProcessor(new ServiceProcessor(serviceHandler));
@@ -363,7 +363,7 @@
shared_ptr<Thread> serverThread;
- if(serverType == "simple") {
+ if (serverType == "simple") {
serverThread = threadFactory->newThread(shared_ptr<TServer>(new TSimpleServer(serviceProcessor, serverSocket, transportFactory, protocolFactory)));
@@ -371,7 +371,7 @@
serverThread = threadFactory->newThread(shared_ptr<TServer>(new TThreadedServer(serviceProcessor, serverSocket, transportFactory, protocolFactory)));
- } else if(serverType == "thread-pool") {
+ } else if (serverType == "thread-pool") {
shared_ptr<ThreadManager> threadManager = ThreadManager::newSimpleThreadManager(workerCount);
@@ -399,14 +399,14 @@
set<shared_ptr<Thread> > clientThreads;
- if(callName == "echoVoid") { loopType = T_VOID;}
- else if(callName == "echoByte") { loopType = T_BYTE;}
- else if(callName == "echoI32") { loopType = T_I32;}
- else if(callName == "echoI64") { loopType = T_I64;}
- else if(callName == "echoString") { loopType = T_STRING;}
+ if (callName == "echoVoid") { loopType = T_VOID;}
+ else if (callName == "echoByte") { loopType = T_BYTE;}
+ else if (callName == "echoI32") { loopType = T_I32;}
+ else if (callName == "echoI64") { loopType = T_I64;}
+ else if (callName == "echoString") { loopType = T_STRING;}
else {throw invalid_argument("Unknown service call "+callName);}
- for(size_t ix = 0; ix < clientCount; ix++) {
+ for (size_t ix = 0; ix < clientCount; ix++) {
shared_ptr<TSocket> socket(new TSocket("127.0.01", port));
shared_ptr<TBufferedTransport> bufferedSocket(new TBufferedTransport(socket, 2048));
@@ -416,7 +416,7 @@
clientThreads.insert(threadFactory->newThread(shared_ptr<ClientThread>(new ClientThread(socket, serviceClient, monitor, threadCount, loopCount, loopType))));
}
- for(std::set<shared_ptr<Thread> >::const_iterator thread = clientThreads.begin(); thread != clientThreads.end(); thread++) {
+ for (std::set<shared_ptr<Thread> >::const_iterator thread = clientThreads.begin(); thread != clientThreads.end(); thread++) {
(*thread)->start();
}
@@ -446,7 +446,7 @@
long long minTime = 9223372036854775807LL;
long long maxTime = 0;
- for(set<shared_ptr<Thread> >::iterator ix = clientThreads.begin(); ix != clientThreads.end(); ix++) {
+ for (set<shared_ptr<Thread> >::iterator ix = clientThreads.begin(); ix != clientThreads.end(); ix++) {
shared_ptr<ClientThread> client = dynamic_pointer_cast<ClientThread>((*ix)->runnable());
@@ -454,19 +454,19 @@
assert(delta > 0);
- if(client->_startTime < firstTime) {
+ if (client->_startTime < firstTime) {
firstTime = client->_startTime;
}
- if(client->_endTime > lastTime) {
+ if (client->_endTime > lastTime) {
lastTime = client->_endTime;
}
- if(delta < minTime) {
+ if (delta < minTime) {
minTime = delta;
}
- if(delta > maxTime) {
+ if (delta > maxTime) {
maxTime = delta;
}
diff --git a/test/cpp/src/nb-main.cpp b/test/cpp/src/nb-main.cpp
index 7e69524..9fc1beb 100644
--- a/test/cpp/src/nb-main.cpp
+++ b/test/cpp/src/nb-main.cpp
@@ -16,6 +16,7 @@
#include "Service.h"
+#include <unistd.h>
#include <boost/shared_ptr.hpp>
#include <iostream>
@@ -67,16 +68,8 @@
void echoVoid() {
count("echoVoid");
-
- //Sleep to simulate work
- struct timeval time_struct;
- time_struct.tv_sec = 0;
- time_struct.tv_usec = 5000;
-
- select( (int) NULL, (fd_set *)NULL, (fd_set *)NULL,(fd_set *)NULL, &time_struct );
-
-
-
+ // Sleep to simulate work
+ usleep(5000);
return;
}
@@ -149,7 +142,7 @@
_workerCount--;
- if(_workerCount == 0) {
+ if (_workerCount == 0) {
_monitor.notify();
}
@@ -157,13 +150,13 @@
}
void loopEchoVoid() {
- for(size_t ix = 0; ix < _loopCount; ix++) {
+ for (size_t ix = 0; ix < _loopCount; ix++) {
_client->echoVoid();
}
}
void loopEchoByte() {
- for(size_t ix = 0; ix < _loopCount; ix++) {
+ for (size_t ix = 0; ix < _loopCount; ix++) {
int8_t arg = 1;
int8_t result;
result =_client->echoByte(arg);
@@ -172,7 +165,7 @@
}
void loopEchoI32() {
- for(size_t ix = 0; ix < _loopCount; ix++) {
+ for (size_t ix = 0; ix < _loopCount; ix++) {
int32_t arg = 1;
int32_t result;
result =_client->echoI32(arg);
@@ -181,7 +174,7 @@
}
void loopEchoI64() {
- for(size_t ix = 0; ix < _loopCount; ix++) {
+ for (size_t ix = 0; ix < _loopCount; ix++) {
int64_t arg = 1;
int64_t result;
result =_client->echoI64(arg);
@@ -190,7 +183,7 @@
}
void loopEchoString() {
- for(size_t ix = 0; ix < _loopCount; ix++) {
+ for (size_t ix = 0; ix < _loopCount; ix++) {
string arg = "hello";
string result;
_client->echoString(result, arg);
@@ -245,17 +238,17 @@
map<string, string> args;
- for(int ix = 1; ix < argc; ix++) {
+ for (int ix = 1; ix < argc; ix++) {
string arg(argv[ix]);
- if(arg.compare(0,2, "--") == 0) {
+ if (arg.compare(0,2, "--") == 0) {
size_t end = arg.find_first_of("=", 2);
string key = string(arg, 2, end - 2);
- if(end != string::npos) {
+ if (end != string::npos) {
args[key] = string(arg, end + 1);
} else {
args[key] = "true";
@@ -267,44 +260,44 @@
try {
- if(!args["clients"].empty()) {
+ if (!args["clients"].empty()) {
clientCount = atoi(args["clients"].c_str());
}
- if(!args["help"].empty()) {
+ if (!args["help"].empty()) {
cerr << usage.str();
return 0;
}
- if(!args["loop"].empty()) {
+ if (!args["loop"].empty()) {
loopCount = atoi(args["loop"].c_str());
}
- if(!args["call"].empty()) {
+ if (!args["call"].empty()) {
callName = args["call"];
}
- if(!args["port"].empty()) {
+ if (!args["port"].empty()) {
port = atoi(args["port"].c_str());
}
- if(!args["server"].empty()) {
+ if (!args["server"].empty()) {
runServer = args["server"] == "true";
}
- if(!args["log-request"].empty()) {
+ if (!args["log-request"].empty()) {
logRequests = args["log-request"] == "true";
}
- if(!args["replay-request"].empty()) {
+ if (!args["replay-request"].empty()) {
replayRequests = args["replay-request"] == "true";
}
- if(!args["server-type"].empty()) {
+ if (!args["server-type"].empty()) {
serverType = args["server-type"];
}
- if(!args["workers"].empty()) {
+ if (!args["workers"].empty()) {
workerCount = atoi(args["workers"].c_str());
}
@@ -340,7 +333,7 @@
}
- if(runServer) {
+ if (runServer) {
shared_ptr<ServiceProcessor> serviceProcessor(new ServiceProcessor(serviceHandler));
@@ -362,11 +355,11 @@
shared_ptr<Thread> serverThread;
- if(serverType == "simple") {
+ if (serverType == "simple") {
- serverThread = threadFactory->newThread(shared_ptr<TServer>(new TNonblockingServer(serviceProcessor, protocolFactory,port)));
+ serverThread = threadFactory->newThread(shared_ptr<TServer>(new TNonblockingServer(serviceProcessor, protocolFactory, port)));
- } else if(serverType == "thread-pool") {
+ } else if (serverType == "thread-pool") {
shared_ptr<ThreadManager> threadManager = ThreadManager::newSimpleThreadManager(workerCount);
@@ -393,14 +386,14 @@
set<shared_ptr<Thread> > clientThreads;
- if(callName == "echoVoid") { loopType = T_VOID;}
- else if(callName == "echoByte") { loopType = T_BYTE;}
- else if(callName == "echoI32") { loopType = T_I32;}
- else if(callName == "echoI64") { loopType = T_I64;}
- else if(callName == "echoString") { loopType = T_STRING;}
+ if (callName == "echoVoid") { loopType = T_VOID;}
+ else if (callName == "echoByte") { loopType = T_BYTE;}
+ else if (callName == "echoI32") { loopType = T_I32;}
+ else if (callName == "echoI64") { loopType = T_I64;}
+ else if (callName == "echoString") { loopType = T_STRING;}
else {throw invalid_argument("Unknown service call "+callName);}
- for(size_t ix = 0; ix < clientCount; ix++) {
+ for (size_t ix = 0; ix < clientCount; ix++) {
shared_ptr<TSocket> socket(new TSocket("127.0.0.1", port));
shared_ptr<TFramedTransport> framedSocket(new TFramedTransport(socket));
@@ -410,7 +403,7 @@
clientThreads.insert(threadFactory->newThread(shared_ptr<ClientThread>(new ClientThread(socket, serviceClient, monitor, threadCount, loopCount, loopType))));
}
- for(std::set<shared_ptr<Thread> >::const_iterator thread = clientThreads.begin(); thread != clientThreads.end(); thread++) {
+ for (std::set<shared_ptr<Thread> >::const_iterator thread = clientThreads.begin(); thread != clientThreads.end(); thread++) {
(*thread)->start();
}
@@ -440,7 +433,7 @@
long long minTime = 9223372036854775807LL;
long long maxTime = 0;
- for(set<shared_ptr<Thread> >::iterator ix = clientThreads.begin(); ix != clientThreads.end(); ix++) {
+ for (set<shared_ptr<Thread> >::iterator ix = clientThreads.begin(); ix != clientThreads.end(); ix++) {
shared_ptr<ClientThread> client = dynamic_pointer_cast<ClientThread>((*ix)->runnable());
@@ -448,19 +441,19 @@
assert(delta > 0);
- if(client->_startTime < firstTime) {
+ if (client->_startTime < firstTime) {
firstTime = client->_startTime;
}
- if(client->_endTime > lastTime) {
+ if (client->_endTime > lastTime) {
lastTime = client->_endTime;
}
- if(delta < minTime) {
+ if (delta < minTime) {
minTime = delta;
}
- if(delta > maxTime) {
+ if (delta > maxTime) {
maxTime = delta;
}