mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-04 06:06:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

c/multi: Use precise sleeper for scheduled frame waiting

Browse source
This commit is contained in:
Jakob Bornecrantz 2022-09-02 23:57:33 +01:00 committed by Ryan Pavlik
parent e21b74059c
commit 0b2c7e207d
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/xrt/compositor/multi/comp_multi_compositor.c
View file

@ -219,7 +219,7 @@ wait_for_scheduled_free(struct multi_compositor *mc)
os_mutex_unlock(&mc->slot_lock); os_mutex_unlock(&mc->slot_lock);
os_nanosleep(U_TIME_1MS_IN_NS); os_precise_sleeper_nanosleep(&mc->scheduled_sleeper, U_TIME_1MS_IN_NS);
os_mutex_lock(&mc->slot_lock); os_mutex_lock(&mc->slot_lock);
} }
@ -566,7 +566,7 @@ multi_compositor_wait_frame(struct xrt_compositor *xc,
out_predicted_display_period_ns); // out_predicted_display_period_ns); //
// Wait until the given wake up time. // Wait until the given wake up time.
u_wait_until(&mc->sleeper, wake_up_time_ns); u_wait_until(&mc->frame_sleeper, wake_up_time_ns);
uint64_t now_ns = os_monotonic_get_ns(); uint64_t now_ns = os_monotonic_get_ns();
@ -873,7 +873,8 @@ multi_compositor_destroy(struct xrt_compositor *xc)
// Does null checking. // Does null checking.
u_pa_destroy(&mc->upa); u_pa_destroy(&mc->upa);
os_precise_sleeper_deinit(&mc->sleeper); os_precise_sleeper_deinit(&mc->frame_sleeper);
os_precise_sleeper_deinit(&mc->scheduled_sleeper);
os_mutex_destroy(&mc->slot_lock); os_mutex_destroy(&mc->slot_lock);
os_mutex_destroy(&mc->event.mutex); os_mutex_destroy(&mc->event.mutex);
@ -942,7 +943,10 @@ multi_compositor_create(struct multi_system_compositor *msc,
mc->base.base.info = msc->xcn->base.info; mc->base.base.info = msc->xcn->base.info;
// Used in wait frame. // Used in wait frame.
os_precise_sleeper_init(&mc->sleeper); os_precise_sleeper_init(&mc->frame_sleeper);
// Used in scheduled waiting function.
os_precise_sleeper_init(&mc->scheduled_sleeper);
// This is safe to do without a lock since we are not on the list yet. // This is safe to do without a lock since we are not on the list yet.
u_paf_create(msc->upaf, &mc->upa); u_paf_create(msc->upaf, &mc->upa);

7
src/xrt/compositor/multi/comp_multi_private.h
View file

@ -101,8 +101,11 @@ struct multi_compositor
//! Owning system compositor. //! Owning system compositor.
struct multi_system_compositor *msc; struct multi_system_compositor *msc;
//! Only matters for Windows and in process. //! Used to implement wait frame, only used for in process.
struct os_precise_sleeper sleeper; struct os_precise_sleeper frame_sleeper;
//! Used when waiting for the scheduled frame to complete.
struct os_precise_sleeper scheduled_sleeper;
struct struct
{ {