pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-08 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

server/red_channel: add red_channel_all_blocked

Browse Source
This commit is contained in:
Alon Levy 2010-11-11 15:51:24 +02:00
parent b7dbc14b1c
commit 7a650e9641
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/red_channel.c
View File

@ -701,6 +701,16 @@ void red_channel_ack_set_client_window(RedChannel *channel, int client_window)
channel->ack_data.client_window = client_window;
}
int red_channel_all_blocked(RedChannel *channel)
{
return channel->send_data.blocked;
}
int red_channel_any_blocked(RedChannel *channel)
{
return channel->send_data.blocked;
}
/* accessors for RedChannel */
SpiceMarshaller *red_channel_get_marshaller(RedChannel *channel)
{

6
server/red_channel.h
View File

@ -251,6 +251,12 @@ void red_channel_shutdown(RedChannel *channel);
int red_channel_get_first_socket(RedChannel *channel);
/* return TRUE if all of the connected clients to this channel are blocked */
int red_channel_all_blocked(RedChannel *channel);
/* return TRUE if any of the connected clients to this channel are blocked */
int red_channel_any_blocked(RedChannel *channel);
// TODO: unstaticed for display/cursor channels. they do some specific pushes not through
// adding elements or on events. but not sure if this is actually required (only result
// should be that they ""try"" a little harder, but if the event system is correct it

10
server/red_worker.c
View File

@ -4289,7 +4289,7 @@ static int red_process_commands(RedWorker *worker, uint32_t max_pipe_size, int *
red_error("bad command type");
}
n++;
if ((worker->display_channel && worker->display_channel->common.base.send_data.blocked) ||
if ((worker->display_channel && red_channel_all_blocked(&worker->display_channel->common.base)) ||
red_now() - start > 10 * 1000 * 1000) {
worker->epoll_timeout = 0;
return n;
@ -9133,7 +9133,7 @@ static void handle_channel_events(EventListener *in_listener, uint32_t events)
red_channel_receive(channel);
}
if (channel->send_data.blocked) {
if (red_channel_any_blocked(channel)) {
red_channel_send(channel);
}
}
@ -9410,7 +9410,7 @@ static void red_wait_outgoing_item(RedChannel *channel)
uint64_t end_time;
int blocked;
if (!channel || !channel->send_data.blocked) {
if (!channel || !red_channel_all_blocked(channel)) {
return;
}
red_ref_channel(channel);
@ -9422,7 +9422,7 @@ static void red_wait_outgoing_item(RedChannel *channel)
usleep(DETACH_SLEEP_DURATION);
red_channel_receive(channel);
red_channel_send(channel);
} while ((blocked = channel->send_data.blocked) && red_now() < end_time);
} while ((blocked = red_channel_all_blocked(channel)) && red_now() < end_time);
if (blocked) {
red_printf("timeout");
@ -9448,7 +9448,7 @@ static void red_wait_pipe_item_sent(RedChannel *channel, PipeItem *item)
end_time = red_now() + CHANNEL_PUSH_TIMEOUT;
if (channel->send_data.blocked) {
if (red_channel_all_blocked(channel)) {
red_channel_receive(channel);
red_channel_send(channel);
}