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

red-stream: Remove AsyncRead::stream

Browse Source 
AsyncRead is always included in RedStream and there are only
a possible operation pending on a RedStream.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
This commit is contained in:
Frediano Ziglio 2017-12-20 16:47:05 +00:00
parent 233f710ba9
commit 5998e34ffb
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/red-stream.c
View File

@ -38,7 +38,6 @@
#include "reds.h"
struct AsyncRead {
RedStream *stream;
void *opaque;
uint8_t *now;
uint8_t *end;
@ -492,20 +491,20 @@ void red_stream_set_async_error_handler(RedStream *stream,
stream->priv->async_read.error = error_handler;
}
static inline void async_read_clear_handlers(AsyncRead *async)
static inline void async_read_clear_handlers(RedStream *stream)
{
if (async->stream->watch) {
red_stream_remove_watch(async->stream);
}
async->stream = NULL;
AsyncRead *async = &stream->priv->async_read;
red_stream_remove_watch(stream);
async->now = NULL;
async->end = NULL;
}
static void async_read_handler(G_GNUC_UNUSED int fd,
G_GNUC_UNUSED int event,
void *data)
{
AsyncRead *async = (AsyncRead *)data;
RedStream *stream = async->stream;
RedStream *stream = data;
AsyncRead *async = &stream->priv->async_read;
SpiceCoreInterfaceInternal *core = stream->priv->core;
for (;;) {
@ -520,13 +519,13 @@ static void async_read_handler(G_GNUC_UNUSED int fd,
if (!stream->watch) {
stream->watch = core->watch_add(core, stream->socket,
SPICE_WATCH_EVENT_READ,
async_read_handler, async);
async_read_handler, stream);
}
return;
case EINTR:
break;
default:
async_read_clear_handlers(async);
async_read_clear_handlers(stream);
if (async->error) {
async->error(async->opaque, err);
}
@ -535,7 +534,7 @@ static void async_read_handler(G_GNUC_UNUSED int fd,
} else {
async->now += n;
if (async->now == async->end) {
async_read_clear_handlers(async);
async_read_clear_handlers(stream);
async->done(async->opaque);
return;
}
@ -550,13 +549,12 @@ void red_stream_async_read(RedStream *stream,
{
AsyncRead *async = &stream->priv->async_read;
g_return_if_fail(!async->stream);
async->stream = stream;
g_return_if_fail(async->now == NULL && async->end == NULL);
async->now = data;
async->end = async->now + size;
async->done = read_done_cb;
async->opaque = opaque;
async_read_handler(0, 0, async);
async_read_handler(0, 0, stream);
}