Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2026-08-22 07:01:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[client] transport: track video component availability

Browse Source
This commit is contained in:
Geoffrey McRae
2026-08-12 22:40:07 +10:00
parent c92acb0a34
commit 4768396180
28 changed files with 3965 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/transports/SPICE/spice.c
View File

@@ -237,6 +237,7 @@ static LG_TransportStatus spiceConnectCancellable(LG_Transport * transport,
atomic_store_explicit(
&transport->sessionValid, false, memory_order_release);
lgResetEvent(transport->connectEvent);
purespice_beginConnect();
if (!lgCreateThread(
"spiceProcess", spiceSession_thread, transport, &transport->thread))
@@ -248,6 +249,7 @@ static LG_TransportStatus spiceConnectCancellable(LG_Transport * transport,
{
cancel = true;
atomic_store_explicit(&transport->stop, true, memory_order_release);
purespice_cancelConnect();
lgWaitEvent(transport->connectEvent, TIMEOUT_INFINITE);
break;
}
@@ -255,6 +257,7 @@ static LG_TransportStatus spiceConnectCancellable(LG_Transport * transport,
if (cancel || (cancelled && cancelled(opaque)))
{
atomic_store_explicit(&transport->stop, true, memory_order_release);
purespice_cancelConnect();
lgJoinThread(transport->thread, NULL);
transport->thread = NULL;
return LG_TRANSPORT_DISCONNECTED;
@@ -283,6 +286,7 @@ static void spiceDisconnect(LG_Transport * transport)
return;
atomic_store_explicit(&transport->stop, true, memory_order_release);
purespice_cancelConnect();
lgJoinThread(transport->thread, NULL);
transport->thread = NULL;
}

67
client/transports/SPICE/surface.c
View File

@@ -32,6 +32,7 @@ struct SpiceSurface
{
LG_RWLock eventsLock;
LG_Lock activationLock;
atomic_uint_fast64_t activationCancel;
const LG_SwSurfaceEventOps * events;
void * eventOpaque;
@@ -68,8 +69,17 @@ static void surfaceDetach(LG_Transport * transport)
static bool surfaceSetActive(LG_Transport * transport, bool active)
{
SpiceSurface * surface = transport->surface;
const uint64_t cancel = atomic_load_explicit(
&surface->activationCancel, memory_order_acquire);
LG_LOCK(surface->activationLock);
if (cancel != atomic_load_explicit(
&surface->activationCancel, memory_order_acquire))
{
LG_UNLOCK(surface->activationLock);
return false;
}
if (surface->active == active)
{
LG_UNLOCK(surface->activationLock);
@@ -88,8 +98,15 @@ static bool surfaceSetActive(LG_Transport * transport, bool active)
if (!atomic_load_explicit(
&transport->sessionValid, memory_order_acquire) ||
!purespice_hasChannel(PS_CHANNEL_DISPLAY) ||
!purespice_hasChannel(PS_CHANNEL_CURSOR) ||
!purespice_connectChannel(PS_CHANNEL_DISPLAY))
!purespice_hasChannel(PS_CHANNEL_CURSOR))
goto done;
purespice_beginChannelConnect(PS_CHANNEL_DISPLAY);
purespice_beginChannelConnect(PS_CHANNEL_CURSOR);
if (cancel != atomic_load_explicit(
&surface->activationCancel, memory_order_acquire))
goto done;
if (!purespice_connectChannel(PS_CHANNEL_DISPLAY))
goto done;
if (!purespice_connectChannel(PS_CHANNEL_CURSOR))
@@ -105,11 +122,23 @@ static bool surfaceSetActive(LG_Transport * transport, bool active)
if (!purespice_disconnectChannel(PS_CHANNEL_CURSOR))
{
purespice_beginChannelConnect(PS_CHANNEL_DISPLAY);
if (cancel != atomic_load_explicit(
&surface->activationCancel, memory_order_acquire))
goto done;
purespice_connectChannel(PS_CHANNEL_DISPLAY);
goto done;
}
}
if (active && cancel != atomic_load_explicit(
&surface->activationCancel, memory_order_acquire))
{
purespice_disconnectChannel(PS_CHANNEL_CURSOR);
purespice_disconnectChannel(PS_CHANNEL_DISPLAY);
goto done;
}
surface->active = active;
result = true;
@@ -118,11 +147,25 @@ done:
return result;
}
static void surfaceCancelActivation(SpiceSurface * surface)
{
atomic_fetch_add_explicit(&surface->activationCancel,
1, memory_order_acq_rel);
purespice_cancelChannelConnect(PS_CHANNEL_DISPLAY);
purespice_cancelChannelConnect(PS_CHANNEL_CURSOR);
}
static void surfaceCancelPending(LG_Transport * transport)
{
surfaceCancelActivation(transport->surface);
}
static const LG_SwSurfaceOps swSurfaceOps =
{
.attach = surfaceAttach,
.detach = surfaceDetach,
.setActive = surfaceSetActive,
.attach = surfaceAttach,
.detach = surfaceDetach,
.setActive = surfaceSetActive,
.cancelPending = surfaceCancelPending,
};
static const LG_VideoOps videoOps =
@@ -143,6 +186,7 @@ bool spiceSurface_init(SpiceSurface ** result)
LG_RWLOCK_INIT(surface->eventsLock);
LG_LOCK_INIT(surface->activationLock);
atomic_init(&surface->activationCancel, 0);
*result = surface;
return true;
}
@@ -165,12 +209,25 @@ const LG_VideoOps * spiceSurface_getVideoOps(void)
void spiceSurface_sessionStopped(SpiceSurface * surface)
{
surfaceCancelActivation(surface);
LG_LOCK(surface->activationLock);
surface->active = false;
surface->primaryValid = false;
LG_UNLOCK(surface->activationLock);
}
#ifdef ENABLE_TESTS
void spiceSurface_testLockActivation(SpiceSurface * surface)
{
LG_LOCK(surface->activationLock);
}
void spiceSurface_testUnlockActivation(SpiceSurface * surface)
{
LG_UNLOCK(surface->activationLock);
}
#endif
void spiceSurface_create(SpiceSurface * surface, unsigned int surfaceId,
PSSurfaceFormat format, unsigned int width, unsigned int height)
{

5
client/transports/SPICE/surface.h
View File

@@ -33,6 +33,11 @@ void spiceSurface_free(SpiceSurface ** surface);
const LG_VideoOps * spiceSurface_getVideoOps(void);
void spiceSurface_sessionStopped(SpiceSurface * surface);
#ifdef ENABLE_TESTS
void spiceSurface_testLockActivation(SpiceSurface * surface);
void spiceSurface_testUnlockActivation(SpiceSurface * surface);
#endif
void spiceSurface_create(SpiceSurface * surface, unsigned int surfaceId,
PSSurfaceFormat format, unsigned int width, unsigned int height);
void spiceSurface_destroy(SpiceSurface * surface, unsigned int surfaceId);