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

red-qxl: Avoid to use AsyncCommand for GL_DRAW_ASYNC message

Browse Source 
AsyncCommand is used to handle asynchronous messages from the
dispatcher.
GL_DRAW_ASYNC is mainly using it to store the cookie.

The value of GL_DRAW_COOKIE_INVALID was choosen to allow implementing
cookies (which basically are handles) either using indexes (where 0 is
valid) or pointers (where 0 is invalid). Currently Qemu uses pointers.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
This commit is contained in:
Frediano Ziglio 2017-09-06 21:14:55 +01:00
parent 56f2a71697
commit dfdc8e3097
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/red-qxl.c
View File

@ -62,9 +62,11 @@ struct QXLState {
pthread_mutex_t scanout_mutex;
SpiceMsgDisplayGlScanoutUnix scanout;
struct AsyncCommand *gl_draw_async;
uint64_t gl_draw_cookie;
};
#define GL_DRAW_COOKIE_INVALID (~((uint64_t) 0))
int red_qxl_check_qxl_version(QXLInstance *qxl, int major, int minor)
{
int qxl_major = qxl_get_interface(qxl)->base.major_version;
@ -833,7 +835,7 @@ void spice_qxl_gl_scanout(QXLInstance *qxl,
spice_return_if_fail(qxl != NULL);
QXLState *qxl_state = qxl->st;
spice_return_if_fail(qxl_state->gl_draw_async == NULL);
spice_return_if_fail(qxl_state->gl_draw_cookie == GL_DRAW_COOKIE_INVALID);
pthread_mutex_lock(&qxl_state->scanout_mutex);
@ -877,13 +879,15 @@ void spice_qxl_gl_draw_async(QXLInstance *qxl,
spice_return_if_fail(qxl != NULL);
qxl_state = qxl->st;
if (qxl_state->scanout.drm_dma_buf_fd == -1) {
QXLInterface *interface = qxl_get_interface(qxl);
spice_warning("called spice_qxl_gl_draw_async without a buffer");
red_qxl_async_complete(qxl, async_command_alloc(qxl_state, message, cookie));
interface->async_complete(qxl, cookie);
return;
}
spice_return_if_fail(qxl_state->gl_draw_async == NULL);
spice_return_if_fail(qxl_state->gl_draw_cookie == GL_DRAW_COOKIE_INVALID);
qxl_state->gl_draw_async = async_command_alloc(qxl_state, message, cookie);
qxl_state->gl_draw_cookie = cookie;
dispatcher_send_message(qxl_state->dispatcher, message, &draw);
}
@ -899,7 +903,6 @@ void red_qxl_async_complete(QXLInstance *qxl, AsyncCommand *async_command)
case RED_WORKER_MESSAGE_DESTROY_SURFACE_WAIT_ASYNC:
case RED_WORKER_MESSAGE_FLUSH_SURFACES_ASYNC:
case RED_WORKER_MESSAGE_MONITORS_CONFIG_ASYNC:
case RED_WORKER_MESSAGE_GL_DRAW_ASYNC:
break;
case RED_WORKER_MESSAGE_CREATE_PRIMARY_SURFACE_ASYNC:
red_qxl_create_primary_surface_complete(qxl->st);
@ -916,10 +919,11 @@ void red_qxl_async_complete(QXLInstance *qxl, AsyncCommand *async_command)
void red_qxl_gl_draw_async_complete(QXLInstance *qxl)
{
QXLInterface *interface = qxl_get_interface(qxl);
/* this reset before usage prevent a possible race condition */
struct AsyncCommand *async = qxl->st->gl_draw_async;
qxl->st->gl_draw_async = NULL;
red_qxl_async_complete(qxl, async);
uint64_t cookie = qxl->st->gl_draw_cookie;
qxl->st->gl_draw_cookie = GL_DRAW_COOKIE_INVALID;
interface->async_complete(qxl, cookie);
}
void red_qxl_init(RedsState *reds, QXLInstance *qxl)
@ -935,6 +939,7 @@ void red_qxl_init(RedsState *reds, QXLInstance *qxl)
qxl_state->qxl = qxl;
pthread_mutex_init(&qxl_state->scanout_mutex, NULL);
qxl_state->scanout.drm_dma_buf_fd = -1;
qxl_state->gl_draw_cookie = GL_DRAW_COOKIE_INVALID;
qxl_state->dispatcher = dispatcher_new(RED_WORKER_MESSAGE_COUNT, NULL);
qxl_state->qxl_worker.major_version = SPICE_INTERFACE_QXL_MAJOR;
qxl_state->qxl_worker.minor_version = SPICE_INTERFACE_QXL_MINOR;