Thrift: Cleaned up whitespace.
Summary:
Replaced a lot of tabs with spaces in the thrift codebase.
Removed a lot of trailing whitespace from thrift-generated c++.
Added a few things to cleanup.sh.
Trac Bug: #
Blame Rev:
Reviewed By: mcslee
Test Plan:
Recompiled thrift.
Re-thrifted some test .thrifts.
Compiled the genrated c++.
Ran cleanup.sh.
Revert Plan: ok
Notes:
EImportant:
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665176 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/src/concurrency/ThreadManager.cpp b/lib/cpp/src/concurrency/ThreadManager.cpp
index 3d87724..d8b1e8c 100644
--- a/lib/cpp/src/concurrency/ThreadManager.cpp
+++ b/lib/cpp/src/concurrency/ThreadManager.cpp
@@ -202,8 +202,8 @@
Synchronized s(manager_->monitor_);
active = manager_->workerCount_ < manager_->workerMaxCount_;
if (active) {
- manager_->workerCount_++;
- notifyManager = manager_->workerCount_ == manager_->workerMaxCount_;
+ manager_->workerCount_++;
+ notifyManager = manager_->workerCount_ == manager_->workerMaxCount_;
}
}
@@ -227,24 +227,24 @@
*/
{
Synchronized s(manager_->monitor_);
- active = isActive();
+ active = isActive();
- while (active && manager_->tasks_.empty()) {
+ while (active && manager_->tasks_.empty()) {
manager_->idleCount_++;
idle_ = true;
manager_->monitor_.wait();
active = isActive();
idle_ = false;
manager_->idleCount_--;
- }
+ }
- if (active) {
+ if (active) {
if (!manager_->tasks_.empty()) {
task = manager_->tasks_.front();
manager_->tasks_.pop();
if (task->state_ == ThreadManager::Task::WAITING) {
task->state_ = ThreadManager::Task::EXECUTING;
- }
+ }
/* If we have a pending task max and we just dropped below it, wakeup any
thread that might be blocked on add. */
@@ -252,22 +252,22 @@
manager_->tasks_.size() == manager_->pendingTaskCountMax_ - 1) {
manager_->workerMonitor_.notify();
}
- }
- } else {
- idle_ = true;
- manager_->workerCount_--;
+ }
+ } else {
+ idle_ = true;
+ manager_->workerCount_--;
notifyManager = (manager_->workerCount_ == manager_->workerMaxCount_);
- }
+ }
}
if (task != NULL) {
- if (task->state_ == ThreadManager::Task::EXECUTING) {
- try {
+ if (task->state_ == ThreadManager::Task::EXECUTING) {
+ try {
task->run();
} catch(...) {
// XXX need to log this
- }
- }
+ }
+ }
}
}
@@ -384,7 +384,7 @@
if (idleCount_ < value) {
for (size_t ix = 0; ix < idleCount_; ix++) {
- monitor_.notify();
+ monitor_.notify();
}
} else {
monitor_.notifyAll();