Format and Refactor Flip Server.

net/tools/flip_server/output_ordering.cc

Index: net/tools/flip_server/output_ordering.cc
diff --git a/net/tools/flip_server/output_ordering.cc b/net/tools/flip_server/output_ordering.cc
index 6a42869bc8ed98aa74019aa45077ea61c10738ba..4f8870d46ed16d0456ac2798fc16811cc335d3f4 100644
--- a/net/tools/flip_server/output_ordering.cc
+++ b/net/tools/flip_server/output_ordering.cc
@@ -9,13 +9,10 @@
 #include "net/tools/flip_server/flip_config.h"
 #include "net/tools/flip_server/sm_connection.h"
 
-
 namespace net {
 
 OutputOrdering::PriorityMapPointer::PriorityMapPointer()
-    : ring(NULL),
-      alarm_enabled(false) {
-}
+    : ring(NULL), alarm_enabled(false) {}
 
 // static
 double OutputOrdering::server_think_time_in_s_ = 0.0;
@@ -27,9 +24,7 @@ OutputOrdering::OutputOrdering(SMConnectionInterface* connection)
     epoll_server_ = connection->epoll_server();
 }
 
-OutputOrdering::~OutputOrdering() {
-  Reset();
-}
+OutputOrdering::~OutputOrdering() { Reset(); }
 
 void OutputOrdering::Reset() {
   while (!stream_ids_.empty()) {
@@ -53,11 +48,7 @@ OutputOrdering::BeginOutputtingAlarm::BeginOutputtingAlarm(
     OutputOrdering* oo,
     OutputOrdering::PriorityMapPointer* pmp,
     const MemCacheIter& mci)
-    : output_ordering_(oo),
-      pmp_(pmp),
-      mci_(mci),
-      epoll_server_(NULL) {
-}
+    : output_ordering_(oo), pmp_(pmp), mci_(mci), epoll_server_(NULL) {}
 
 OutputOrdering::BeginOutputtingAlarm::~BeginOutputtingAlarm() {
   if (epoll_server_ && pmp_->alarm_enabled)
@@ -110,35 +101,31 @@ void OutputOrdering::AddToOutputOrder(const MemCacheIter& mci) {
     double tmp_think_time_in_s = strtod(x_server_latency.c_str(), &endp);
     if (endp != x_server_latency.c_str() + x_server_latency.size()) {
       LOG(ERROR) << "Unable to understand X-Server-Latency of: "
-                 << x_server_latency << " for resource: "
-                 <<  mci.file_data->filename().c_str();
+                 << x_server_latency
+                 << " for resource: " << mci.file_data->filename().c_str();
     } else {
       think_time_in_s = tmp_think_time_in_s;
     }
   }
   StreamIdToPriorityMap::iterator sitpmi;
-  sitpmi = stream_ids_.insert(
-      std::pair<uint32, PriorityMapPointer>(mci.stream_id,
-                                            PriorityMapPointer())).first;
+  sitpmi = stream_ids_.insert(std::pair<uint32, PriorityMapPointer>(
+                                  mci.stream_id, PriorityMapPointer())).first;
   PriorityMapPointer& pmp = sitpmi->second;
 
   BeginOutputtingAlarm* boa = new BeginOutputtingAlarm(this, &pmp, mci);
   VLOG(1) << "Server think time: " << think_time_in_s;
-  epoll_server_->RegisterAlarmApproximateDelta(
-      think_time_in_s * 1000000, boa);
+  epoll_server_->RegisterAlarmApproximateDelta(think_time_in_s * 1000000, boa);
 }
 
 void OutputOrdering::SpliceToPriorityRing(PriorityRing::iterator pri) {
   MemCacheIter& mci = *pri;
   PriorityMap::iterator pmi = priority_map_.find(mci.priority);
   if (pmi == priority_map_.end()) {
-    pmi = priority_map_.insert(
-        std::pair<uint32, PriorityRing>(mci.priority, PriorityRing())).first;
+    pmi = priority_map_.insert(std::pair<uint32, PriorityRing>(
+                                   mci.priority, PriorityRing())).first;
   }
 
-  pmi->second.splice(pmi->second.end(),
-                     first_data_senders_,
-                     pri);
+  pmi->second.splice(pmi->second.end(), first_data_senders_, pri);
   StreamIdToPriorityMap::iterator sitpmi = stream_ids_.find(mci.stream_id);
   sitpmi->second.ring = &(pmi->second);
 }
@@ -150,8 +137,8 @@ MemCacheIter* OutputOrdering::GetIter() {
       SpliceToPriorityRing(first_data_senders_.begin());
     } else {
       first_data_senders_.splice(first_data_senders_.end(),
-                                first_data_senders_,
-                                first_data_senders_.begin());
+                                 first_data_senders_,
+                                 first_data_senders_.begin());
       mci.max_segment_size = kInitialDataSendersThreshold;
       return &mci;
     }
@@ -163,9 +150,7 @@ MemCacheIter* OutputOrdering::GetIter() {
       continue;
     }
     MemCacheIter& mci = first_ring.front();
-    first_ring.splice(first_ring.end(),
-                      first_ring,
-                      first_ring.begin());
+    first_ring.splice(first_ring.end(), first_ring, first_ring.begin());
     mci.max_segment_size = kSpdySegmentSize;
     return &mci;
   }