No subject


Wed Jan 19 09:13:35 PST 2011


---
 server/red_channel.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/red_channel.c b/server/red_channel.c
index bfa6aaf..990b9d9 100644
--- a/server/red_channel.c
+++ b/server/red_channel.c
@@ -570,17 +570,18 @@ void red_channel_pipe_add_type(RedChannel *channel, int pipe_item_type)
     red_channel_push(channel);
 }
 
-static PipeItem *red_channel_pipe_get(RedChannel *channel)
+static inline PipeItem *red_channel_pipe_get(RedChannel *channel)
 {
     PipeItem *item;
 
     if (!channel || channel->send_data.blocked ||
-        (channel->handle_acks &&
-         (channel->ack_data.messages_window > channel->ack_data.client_window * 2)) ||
         !(item = (PipeItem *)ring_get_tail(&channel->pipe))) {
         return NULL;
     }
-
+    if (channel->handle_acks && (channel->ack_data.messages_window > channel->ack_data.client_window * 2)) {
+        channel->send_data.blocked = TRUE;
+        return NULL;
+    }
     --channel->pipe_size;
     ring_remove(&item->link);
     return item;
-- 
1.7.3.4



More information about the Spice-devel mailing list