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

[client/host/idd/obs] scheduler: validate phase feedback

Browse Source 
Bump KVMFR to version 28 and attach generation, epoch, and deadline
identities to cadence deliveries and their timing records.

Accept phase corrections only for the exact completed publication. Keep
VM and client clocks independent by exchanging relative phase errors.

Make submission, completion, and work-estimate accounting best effort
so scheduler state cannot delay GPU submission or frame publication.
This commit is contained in:
Geoffrey McRae
2026-08-06 16:05:05 +10:00
parent 983cf588e3
commit 515f4ba06f
16 changed files with 688 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
obs/frame_scheduler.c
View File

@@ -61,13 +61,14 @@ void lgFrameSchedulerSetPeriod(LGFrameScheduler * scheduler,
return;
++scheduler->generation;
scheduler->resetPending = true;
scheduler->immediatePending = true;
scheduler->phaseError = 0;
scheduler->feedbackFrameSerial = 0;
scheduler->feedbackScheduleEpoch = 0;
scheduler->feedbackSamples = 0;
scheduler->feedbackDirty = false;
scheduler->resetPending = true;
scheduler->immediatePending = true;
scheduler->phaseError = 0;
scheduler->feedbackFrameSerial = 0;
scheduler->feedbackScheduleEpoch = 0;
scheduler->feedbackDeadlineSerial = 0;
scheduler->feedbackSamples = 0;
scheduler->feedbackDirty = false;
}
void lgFrameSchedulerRequestImmediate(LGFrameScheduler * scheduler)
@@ -78,31 +79,35 @@ void lgFrameSchedulerRequestImmediate(LGFrameScheduler * scheduler)
void lgFrameSchedulerObserveFrame(LGFrameScheduler * scheduler,
uint32_t frameSerial, uint32_t generation, uint32_t scheduleEpoch,
uint64_t readyTime)
uint32_t deadlineSerial, uint64_t readyTime)
{
if (!generation || !scheduleEpoch ||
if (!generation || !scheduleEpoch || !deadlineSerial ||
(scheduler->readyFrameSerial == frameSerial &&
scheduler->readyGeneration == generation &&
scheduler->readyScheduleEpoch == scheduleEpoch))
scheduler->readyScheduleEpoch == scheduleEpoch &&
scheduler->readyDeadlineSerial == deadlineSerial))
return;
scheduler->readyFrameSerial = frameSerial;
scheduler->readyGeneration = generation;
scheduler->readyScheduleEpoch = scheduleEpoch;
scheduler->readyTime = readyTime;
scheduler->readyFrameSerial = frameSerial;
scheduler->readyGeneration = generation;
scheduler->readyScheduleEpoch = scheduleEpoch;
scheduler->readyDeadlineSerial = deadlineSerial;
scheduler->readyTime = readyTime;
}
void lgFrameSchedulerFeedback(LGFrameScheduler * scheduler,
uint32_t frameSerial, uint32_t generation, uint32_t scheduleEpoch,
uint64_t tickTime)
uint32_t deadlineSerial, uint64_t tickTime)
{
if (!scheduler->active || generation != scheduler->generation ||
!scheduleEpoch ||
!scheduleEpoch || !deadlineSerial ||
(frameSerial == scheduler->feedbackFrameSerial &&
scheduleEpoch == scheduler->feedbackScheduleEpoch) ||
scheduleEpoch == scheduler->feedbackScheduleEpoch &&
deadlineSerial == scheduler->feedbackDeadlineSerial) ||
scheduler->readyFrameSerial != frameSerial ||
scheduler->readyGeneration != generation ||
scheduler->readyScheduleEpoch != scheduleEpoch)
scheduler->readyScheduleEpoch != scheduleEpoch ||
scheduler->readyDeadlineSerial != deadlineSerial)
return;
if (scheduler->feedbackScheduleEpoch &&
@@ -132,7 +137,8 @@ void lgFrameSchedulerFeedback(LGFrameScheduler * scheduler,
++scheduler->feedbackSamples;
scheduler->feedbackFrameSerial = frameSerial;
scheduler->feedbackScheduleEpoch = scheduleEpoch;
scheduler->feedbackScheduleEpoch = scheduleEpoch;
scheduler->feedbackDeadlineSerial = deadlineSerial;
scheduler->feedbackDirty = true;
}
@@ -159,17 +165,20 @@ void lgFrameSchedulerUpdate(LGFrameScheduler * scheduler,
scheduler->feedbackFrameSerial;
const uint32_t feedbackScheduleEpoch =
scheduler->feedbackScheduleEpoch;
const uint32_t feedbackDeadlineSerial =
scheduler->feedbackDeadlineSerial;
const KVMFRFrameSchedule message = {
.msg.type = KVMFR_MESSAGE_FRAME_SCHEDULE,
.clientID = scheduler->clientID,
.generation = scheduler->generation,
.flags = flags,
.period = scheduler->period,
.targetSlack = FRAME_SCHEDULER_TARGET_SLACK_NS,
.phaseError = scheduler->phaseError,
.feedbackFrameSerial = feedbackFrameSerial,
.feedbackScheduleEpoch = feedbackScheduleEpoch,
.lease = FRAME_SCHEDULER_LEASE_MS,
.msg.type = KVMFR_MESSAGE_FRAME_SCHEDULE,
.clientID = scheduler->clientID,
.generation = scheduler->generation,
.flags = flags,
.period = scheduler->period,
.targetSlack = FRAME_SCHEDULER_TARGET_SLACK_NS,
.phaseError = scheduler->phaseError,
.feedbackFrameSerial = feedbackFrameSerial,
.feedbackScheduleEpoch = feedbackScheduleEpoch,
.feedbackDeadlineSerial = feedbackDeadlineSerial,
.lease = FRAME_SCHEDULER_LEASE_MS,
};
if (lgmpClientSendData(queue, &message, sizeof(message), NULL) != LGMP_OK)
@@ -180,6 +189,7 @@ void lgFrameSchedulerUpdate(LGFrameScheduler * scheduler,
scheduler->immediatePending = false;
scheduler->lastSend = now;
if (scheduler->feedbackFrameSerial == feedbackFrameSerial &&
scheduler->feedbackScheduleEpoch == feedbackScheduleEpoch)
scheduler->feedbackScheduleEpoch == feedbackScheduleEpoch &&
scheduler->feedbackDeadlineSerial == feedbackDeadlineSerial)
scheduler->feedbackDirty = false;
}

6
obs/frame_scheduler.h
View File

@@ -41,11 +41,13 @@ typedef struct LGFrameScheduler
int64_t phaseError;
uint32_t feedbackFrameSerial;
uint32_t feedbackScheduleEpoch;
uint32_t feedbackDeadlineSerial;
unsigned feedbackSamples;
uint32_t readyFrameSerial;
uint32_t readyGeneration;
uint32_t readyScheduleEpoch;
uint32_t readyDeadlineSerial;
uint64_t readyTime;
}
LGFrameScheduler;
@@ -57,10 +59,10 @@ void lgFrameSchedulerSetPeriod(LGFrameScheduler * scheduler,
void lgFrameSchedulerRequestImmediate(LGFrameScheduler * scheduler);
void lgFrameSchedulerObserveFrame(LGFrameScheduler * scheduler,
uint32_t frameSerial, uint32_t generation, uint32_t scheduleEpoch,
uint64_t readyTime);
uint32_t deadlineSerial, uint64_t readyTime);
void lgFrameSchedulerFeedback(LGFrameScheduler * scheduler,
uint32_t frameSerial, uint32_t generation, uint32_t scheduleEpoch,
uint64_t tickTime);
uint32_t deadlineSerial, uint64_t tickTime);
void lgFrameSchedulerUpdate(LGFrameScheduler * scheduler,
PLGMPClientQueue queue, uint64_t now);

79
obs/lg.c
View File

@@ -43,6 +43,8 @@
#include "cursor.effect.h"
#include "frame_scheduler.h"
#define LG_FRAME_TIMING_SPIN_COUNT 4096
/* scRGB reference white in cd/m² (OBS GS_CS_709_SCRGB is defined as
* 1.0 = 80 cd/m²). PQ encodes an absolute 0..10000 cd/m² range, so linear
* PQ output is scaled by 10000 / 80 to reach the scRGB convention. */
@@ -180,8 +182,8 @@ typedef struct
{
LGMPMessage msg;
PLGMPClientQueue queue;
uint32_t generation;
uint32_t scheduleEpoch;
uint32_t scheduleDeadlineSerial;
bool owner;
}
LGFrameMessage;
@@ -210,6 +212,18 @@ static bool lgFrameSerialNewer(uint32_t lhs, uint32_t rhs)
return (int32_t)(lhs - rhs) > 0;
}
static bool lgFrameMessageHasMatchingDeadline(
bool owner, const LGMPMessage * message, const KVMFRFrame * frame)
{
if (!owner)
return false;
const uint32_t epoch = (uint32_t)(message->udata >> 32);
const uint32_t deadlineSerial = (uint32_t)message->udata;
return deadlineSerial && epoch == frame->scheduleEpoch &&
deadlineSerial == frame->scheduleDeadlineSerial;
}
static LGMP_STATUS lgFrameProcessNewest(LGPlugin * this,
LGFrameMessage * result)
{
@@ -260,7 +274,10 @@ static LGMP_STATUS lgFrameProcessNewest(LGPlugin * this,
const bool replace = lgFrameSerialNewer(
frame->frameSerial, selected->frameSerial) ||
(frame->frameSerial == selected->frameSerial &&
owner && !result->owner);
((owner && !result->owner) ||
(lgFrameMessageHasMatchingDeadline(owner, &msg, frame) &&
!lgFrameMessageHasMatchingDeadline(
result->owner, &result->msg, selected))));
PLGMPClientQueue discard = queues[i].queue;
if (replace)
{
@@ -277,13 +294,43 @@ static LGMP_STATUS lgFrameProcessNewest(LGPlugin * this,
if (result->owner)
{
result->generation = (uint32_t)(result->msg.udata >> 32);
result->scheduleEpoch = (uint32_t)result->msg.udata;
result->scheduleEpoch = (uint32_t)(result->msg.udata >> 32);
result->scheduleDeadlineSerial = (uint32_t)result->msg.udata;
}
return result->queue ? LGMP_OK : LGMP_ERR_QUEUE_EMPTY;
}
static bool lgFrameTimingReady(const KVMFRFrame * frame)
{
return __atomic_load_n(&frame->timingValid, __ATOMIC_ACQUIRE) &&
frame->timingSerial == frame->frameSerial;
}
static bool lgFramePhaseIdentity(const LGFrameMessage * message,
const KVMFRFrame * frame, uint32_t * generation)
{
if (!message->owner || !message->scheduleEpoch ||
!message->scheduleDeadlineSerial)
return false;
for (unsigned i = 0;
!lgFrameTimingReady(frame) && i < LG_FRAME_TIMING_SPIN_COUNT;
++i)
{
}
if (!lgFrameTimingReady(frame) ||
!(frame->timingFlags & KVMFR_FRAME_TIMING_PHASE_VALID) ||
!frame->scheduleGeneration ||
frame->scheduleEpoch != message->scheduleEpoch ||
frame->scheduleDeadlineSerial != message->scheduleDeadlineSerial)
return false;
*generation = frame->scheduleGeneration;
return true;
}
static void lgFrameUnsubscribeOwnerQueues(LGPlugin * this)
{
for (unsigned int i = 0; i < LGMP_Q_FRAME_LEN; ++i)
@@ -666,9 +713,11 @@ static void * frameThread(void * data)
fb, (size_t)frame->dataHeight * frame->pitch))
{
now = os_gettime_ns();
lgFrameSchedulerObserveFrame(&this->frameScheduler,
frame->frameSerial, frameMessage.generation,
frameMessage.scheduleEpoch, now);
uint32_t generation;
if (lgFramePhaseIdentity(&frameMessage, frame, &generation))
lgFrameSchedulerObserveFrame(&this->frameScheduler,
frame->frameSerial, generation, frameMessage.scheduleEpoch,
frameMessage.scheduleDeadlineSerial, now);
}
}
}
@@ -1557,12 +1606,16 @@ static void lgVideoTick(void * data, float seconds)
}
const uint64_t readyTime = os_gettime_ns();
lgFrameSchedulerObserveFrame(&this->frameScheduler,
frame->frameSerial, frameMessage.generation,
frameMessage.scheduleEpoch, readyTime);
lgFrameSchedulerFeedback(&this->frameScheduler,
frame->frameSerial, frameMessage.generation,
frameMessage.scheduleEpoch, tickTime);
uint32_t generation;
if (lgFramePhaseIdentity(&frameMessage, frame, &generation))
{
lgFrameSchedulerObserveFrame(&this->frameScheduler,
frame->frameSerial, generation, frameMessage.scheduleEpoch,
frameMessage.scheduleDeadlineSerial, readyTime);
lgFrameSchedulerFeedback(&this->frameScheduler,
frame->frameSerial, generation, frameMessage.scheduleEpoch,
frameMessage.scheduleDeadlineSerial, tickTime);
}
}
this->frameSerial = frame->frameSerial;