mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 16:50:41 +01:00
perf(inproc): replace portal pseudo-polling with event-driven frame wait (#193)
* perf(portal): wait for frames without polling * fix(portal): use monotonic clock for condition variable wait deadline * fix(portal): compute wait_for_first_frame deadline with monotonic clock
This commit is contained in:
1 parent
13c92d8f68
commit
2dd3280b7e
4 files changed
+104
-8
No files matched your search
@@ -558,7 +558,7 @@ static int wait_for_first_frame(struct uu_portal *p) {
|
||||
while (!p->sequence && !p->error && !open_cancelled(p) && !(p->dma_requested && p->dma_bad)) {
|
||||
gint64 remaining = deadline - g_get_monotonic_time();
|
||||
if (remaining <= 0) break;
|
||||
clock_gettime(CLOCK_REALTIME, &until);
|
||||
clock_gettime(CLOCK_MONOTONIC, &until);
|
||||
gint64 wait_us = MIN(100000, remaining);
|
||||
until.tv_nsec += wait_us * 1000;
|
||||
if (until.tv_nsec >= 1000000000) { until.tv_sec++; until.tv_nsec -= 1000000000; }
|
||||
@@ -616,7 +616,12 @@ static struct uu_portal *open_persist(const char *restore, void (*save_token)(co
|
||||
for (gchar **desktop = desktops; *desktop; desktop++)
|
||||
if (!g_ascii_strcasecmp(*desktop, "GNOME")) p->absolute_stream_pixels = 1;
|
||||
g_strfreev(desktops);
|
||||
pthread_mutex_init(&p->lock, NULL); pthread_cond_init(&p->changed, NULL);
|
||||
pthread_mutex_init(&p->lock, NULL);
|
||||
pthread_condattr_t cond_attr;
|
||||
pthread_condattr_init(&cond_attr);
|
||||
pthread_condattr_setclock(&cond_attr, CLOCK_MONOTONIC);
|
||||
pthread_cond_init(&p->changed, &cond_attr);
|
||||
pthread_condattr_destroy(&cond_attr);
|
||||
p->context = g_main_context_new(); g_main_context_push_thread_default(p->context);
|
||||
p->bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
|
||||
if (!p->bus) { *error = 1; goto done; }
|
||||
@@ -832,6 +837,36 @@ int uu_portal_capture_alive(struct uu_portal *p) {
|
||||
pthread_mutex_unlock(&p->lock);
|
||||
return alive;
|
||||
}
|
||||
int uu_portal_wait_frame(struct uu_portal *p, int64_t timeout_us) {
|
||||
if (!p || atomic_load(&p->closed)) return -1;
|
||||
pthread_mutex_lock(&p->lock);
|
||||
if (p->error || atomic_load(&p->closed) || stream_stalled(p)) {
|
||||
pthread_mutex_unlock(&p->lock);
|
||||
return -1;
|
||||
}
|
||||
uint64_t prev_seq = p->sequence;
|
||||
if (timeout_us <= 0) {
|
||||
int ready = (p->sequence != prev_seq);
|
||||
pthread_mutex_unlock(&p->lock);
|
||||
return ready;
|
||||
}
|
||||
struct timespec until;
|
||||
clock_gettime(CLOCK_MONOTONIC, &until);
|
||||
until.tv_sec += timeout_us / 1000000LL;
|
||||
until.tv_nsec += (long)(timeout_us % 1000000LL) * 1000L;
|
||||
if (until.tv_nsec >= 1000000000L) {
|
||||
until.tv_sec += 1;
|
||||
until.tv_nsec -= 1000000000L;
|
||||
}
|
||||
while (p->sequence == prev_seq && !p->error && !atomic_load(&p->closed) && !stream_stalled(p)) {
|
||||
int rc = pthread_cond_timedwait(&p->changed, &p->lock, &until);
|
||||
if (rc != 0) break; // timeout or error
|
||||
}
|
||||
int res = (p->error || atomic_load(&p->closed) || stream_stalled(p)) ? -1 :
|
||||
(p->sequence != prev_seq) ? 1 : 0;
|
||||
pthread_mutex_unlock(&p->lock);
|
||||
return res;
|
||||
}
|
||||
void uu_portal_input_dispatch(struct uu_portal *p) {
|
||||
if (p->ei) portal_eis_dispatch(p);
|
||||
}
|
||||
|
||||
@@ -25,6 +25,9 @@ int uu_portal_clipboard_set(struct uu_portal *portal, const uint8_t *text, size_
|
||||
int uu_portal_clipboard_poll(struct uu_portal *portal, uint8_t *text, size_t capacity);
|
||||
int uu_portal_alive(struct uu_portal *portal);
|
||||
int uu_portal_capture_alive(struct uu_portal *portal);
|
||||
/* Wait for a new frame or status change with a timeout in microseconds.
|
||||
* Returns 1 if a new frame or status change occurred, 0 on timeout, <0 on closed/error. */
|
||||
int uu_portal_wait_frame(struct uu_portal *portal, int64_t timeout_us);
|
||||
void uu_portal_input_dispatch(struct uu_portal *portal);
|
||||
void uu_portal_logical_size(struct uu_portal *portal, uint32_t *width, uint32_t *height);
|
||||
void uu_portal_reset_frame(struct uu_portal *portal);
|
||||
|
||||
Reference in new issue
Block a user