summaryrefslogtreecommitdiffstats
path: root/client/red_client.cpp
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2010-10-09 22:13:58 +0200
committerHans de Goede <hdegoede@redhat.com>2010-10-09 22:27:53 +0200
commit3a4051d7ce70914e5cb88496a6a2510ede793325 (patch)
tree39e9b81ef88d9bdadfc35fb854867a693e72c588 /client/red_client.cpp
parent1e34c14c64f1149fa5c30302d62442d7ce7c79b2 (diff)
downloadspice-3a4051d7ce70914e5cb88496a6a2510ede793325.tar.gz
spice-3a4051d7ce70914e5cb88496a6a2510ede793325.tar.xz
spice-3a4051d7ce70914e5cb88496a6a2510ede793325.zip
spicec: Do not try to do accounting of pci memory
Without this patch spicec reproducely hangs in GlzDecoderWindow::pre_decode_update_window(). When GlzDecoderWindow::will_overflow() returns true, GlzDecoderWindow::pre_decode_update_window(), waits for a call to GlzDecoderWindow::post_decode() to free up some memory This happens even though there still is pci memory available (otherwise the driver would not have been able to send an image to decode in the first place). The GlzDecoderWindow::post_decode() call never happens as the server is waiting for a reply to the decode of the hanging image, causing the client to hang for ever. This patch fixes this by simply removing the "attempted" pci memory accounting. As there is no need for that, as the driver already must keep track of pci memory usage. I've verified that both the old and new Xorg drivers take care of not overusing the pci memory themselves I would expect the same to be true for the windows driver. Note the calculating of the glz_window_size in red_client.cpp cannot be removed as the calculated value is send as part of the SpiceMsgcDisplayInit on connect.
Diffstat (limited to 'client/red_client.cpp')
-rw-r--r--client/red_client.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/client/red_client.cpp b/client/red_client.cpp
index 61974b57..b9e1421e 100644
--- a/client/red_client.cpp
+++ b/client/red_client.cpp
@@ -367,7 +367,7 @@ RedClient::RedClient(Application& application)
, _agent_caps_size(0)
, _agent_caps(NULL)
, _migrate (*this)
- , _glz_window (0, _glz_debug)
+ , _glz_window (_glz_debug)
{
Platform::set_clipboard_listener(this);
MainChannelLoop* message_loop = static_cast<MainChannelLoop*>(get_message_handler());
@@ -951,7 +951,6 @@ void RedClient::handle_init(RedPeer::InMessage* message)
_connection_id = init->session_id;
set_mm_time(init->multi_media_time);
calc_pixmap_cach_and_glz_window_size(init->display_channels_hint, init->ram_hint);
- _glz_window.set_pixels_capacity(_glz_window_size);
set_mouse_mode(init->supported_mouse_modes, init->current_mouse_mode);
_agent_tokens = init->agent_tokens;
_agent_connected = !!init->agent_connected;