[net] Change order of RequestPriority to natural: higher > lower

net/spdy/spdy_session.cc

Index: net/spdy/spdy_session.cc
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index be67c993506402d5d4d75a53da3d3898c25f495c..612e3a4233bee63b9df58482e12c43ad36c768ea 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -535,7 +535,7 @@ void SpdySession::ProcessPendingCreateStreams() {
   while (!max_concurrent_streams_ ||
          active_streams_.size() < max_concurrent_streams_) {
     bool no_pending_create_streams = true;
-    for (int i = 0;i < NUM_PRIORITIES;++i) {
+    for (int i = NUM_PRIORITIES - 1; i >= MINIMUM_PRIORITY; --i) {
       if (!create_stream_queues_[i].empty()) {
         PendingCreateStream pending_create = create_stream_queues_[i].front();
         create_stream_queues_[i].pop();
@@ -568,7 +568,7 @@ void SpdySession::CancelPendingCreateStreams(
     return;
   }
 
-  for (int i = 0;i < NUM_PRIORITIES;++i) {
+  for (int i = 0; i < NUM_PRIORITIES; ++i) {

[Ryan Hamilton, 2012/04/23 22:51:05]

Should this loop be reversed too, like the previous one?

[szym, 2012/04/24 00:19:31]

This loop is order-agnostic. It goes through all elements and its iterations are
independent. The previous loop breaks on first hit.

     PendingCreateStreamQueue tmp;
     // Make a copy removing this trans
     while (!create_stream_queues_[i].empty()) {
@@ -590,6 +590,9 @@ int SpdySession::CreateStreamImpl(
     RequestPriority priority,
     scoped_refptr<SpdyStream>* spdy_stream,
     const BoundNetLog& stream_net_log) {
+  DCHECK_GE(priority, net::MINIMUM_PRIORITY);

[Ryan Hamilton, 2012/04/23 22:51:05]

nit: no need for net:: prefix

[szym, 2012/04/24 00:19:31]

Agreed.

+  DCHECK_LT(priority, net::NUM_PRIORITIES);
+
   // Make sure that we don't try to send https/wss over an unauthenticated, but
   // encrypted SSL socket.
   if (is_secure_ && certificate_error_code_ != OK &&
@@ -622,7 +625,6 @@ int SpdySession::CreateStreamImpl(
       static_cast<int>(priority), 0, 10, 11);
 
   // TODO(mbelshe): Optimize memory allocations
-  DCHECK(priority >= net::HIGHEST && priority < net::NUM_PRIORITIES);
 
   DCHECK_EQ(active_streams_[stream_id].get(), stream.get());
   return OK;
@@ -834,7 +836,7 @@ void SpdySession::ResetStream(SpdyStreamId stream_id,
       buffered_spdy_framer_->CreateRstStream(stream_id, status));
 
   // Default to lowest priority unless we know otherwise.
-  int priority = 3;
+  RequestPriority priority = net::IDLE;

[Ryan Hamilton, 2012/04/23 22:51:05]

nit: no need for net::

[szym, 2012/04/24 00:19:31]

net::IDLE is shadowed by enum SpdySession::State IDLE.

[Ryan Hamilton, 2012/04/24 00:42:11]

I see.  *shakes fist at C++*  I'm looking fwd to c++ class enums to solve this
annoying issue.

[Ryan Hamilton, 2012/04/24 00:42:11]

I see.  *shakes fist at C++*  I'm looking fwd to c++ class enums to solve this
annoying issue.

   if(IsStreamActive(stream_id)) {
     scoped_refptr<SpdyStream> stream = active_streams_[stream_id];
     priority = stream->priority();
@@ -1092,7 +1094,7 @@ void SpdySession::CloseAllStreams(net::Error status) {
     unclaimed_pushed_streams_.clear();
   }
 
-  for (int i = 0;i < NUM_PRIORITIES;++i) {
+  for (int i = 0; i < NUM_PRIORITIES; ++i) {

[Ryan Hamilton, 2012/04/23 22:51:05]

Same question about reversing the loop

[szym, 2012/04/24 00:19:31]

Same answer. Order-agnostic, unless the order of calling
|pending_create.callback.Run(ERR_ABORTED)| matters. Does it?

[Ryan Hamilton, 2012/04/24 00:42:11]

Gotcha.  That makes sense.

     while (!create_stream_queues_[i].empty()) {
       PendingCreateStream pending_create = create_stream_queues_[i].front();
       create_stream_queues_[i].pop();
@@ -1124,7 +1126,7 @@ int SpdySession::GetNewStreamId() {
 }
 
 void SpdySession::QueueFrame(SpdyFrame* frame,
-                             SpdyPriority priority,
+                             RequestPriority priority,
                              SpdyStream* stream) {
   int length = SpdyFrame::kHeaderSize + frame->length();
   IOBuffer* buffer = new IOBuffer(length);
@@ -1739,7 +1741,7 @@ void SpdySession::SendSettings() {
   scoped_ptr<SpdySettingsControlFrame> settings_frame(
       buffered_spdy_framer_->CreateSettings(settings_map_new));
   sent_settings_ = true;
-  QueueFrame(settings_frame.get(), 0, NULL);
+  QueueFrame(settings_frame.get(), HIGHEST, NULL);
 }
 
 void SpdySession::HandleSetting(uint32 id, uint32 value) {
@@ -1816,8 +1818,7 @@ void SpdySession::WritePingFrame(uint32 unique_id) {
   DCHECK(buffered_spdy_framer_.get());
   scoped_ptr<SpdyPingControlFrame> ping_frame(
       buffered_spdy_framer_->CreatePingFrame(next_ping_id_));
-  QueueFrame(
-      ping_frame.get(), buffered_spdy_framer_->GetHighestPriority(), NULL);
+  QueueFrame(ping_frame.get(), HIGHEST, NULL);
 
   if (net_log().IsLoggingAllEvents()) {
     net_log().AddEvent(