forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-03-11 01:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fpsi: mutexless mode

Browse Source
This commit is contained in:
Maxim Devaev
2024-03-30 19:34:43 +02:00
parent 88203f9c53
commit 3a3889d02c
2 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/libs/fpsi.c
View File

@@ -22,6 +22,8 @@
#include "fpsi.h" #include "fpsi.h"
#include <stdatomic.h>
#include <pthread.h> #include <pthread.h>
#include "types.h" #include "types.h"
@@ -36,33 +38,47 @@ us_fpsi_s *us_fpsi_init(const char *name, bool with_meta) {
US_CALLOC(fpsi, 1); US_CALLOC(fpsi, 1);
fpsi->name = us_strdup(name); fpsi->name = us_strdup(name);
fpsi->with_meta = with_meta; fpsi->with_meta = with_meta;
US_MUTEX_INIT(fpsi->mutex); atomic_init(&fpsi->ts, 0);
atomic_init(&fpsi->current, 0);
if (with_meta) {
US_MUTEX_INIT(fpsi->mutex);
}
return fpsi; return fpsi;
} }
void us_fpsi_destroy(us_fpsi_s *fpsi) { void us_fpsi_destroy(us_fpsi_s *fpsi) {
US_MUTEX_DESTROY(fpsi->mutex); if (fpsi->with_meta) {
US_MUTEX_DESTROY(fpsi->mutex);
}
free(fpsi->name); free(fpsi->name);
free(fpsi); free(fpsi);
} }
void us_fpsi_bump(us_fpsi_s *fpsi, const us_frame_s *frame) { void us_fpsi_bump(us_fpsi_s *fpsi, const us_frame_s *frame) {
US_MUTEX_LOCK(fpsi->mutex);
const sll now_sec_ts = us_floor_ms(us_get_now_monotonic());
if (fpsi->ts != now_sec_ts) {
US_LOG_PERF_FPS("FPS: %s: %u", fpsi->name, fpsi->accum);
fpsi->current = fpsi->accum;
fpsi->accum = 0;
fpsi->ts = now_sec_ts;
}
++fpsi->accum;
if (frame != NULL) { if (frame != NULL) {
assert(fpsi->with_meta); assert(fpsi->with_meta);
US_FRAME_COPY_META(frame, &fpsi->meta);
} else { } else {
assert(!fpsi->with_meta); assert(!fpsi->with_meta);
} }
US_MUTEX_UNLOCK(fpsi->mutex);
if (fpsi->with_meta) {
US_MUTEX_LOCK(fpsi->mutex);
}
const sll now_sec_ts = us_floor_ms(us_get_now_monotonic());
if (atomic_load(&fpsi->ts) != now_sec_ts) {
US_LOG_PERF_FPS("FPS: %s: %u", fpsi->name, fpsi->accum);
atomic_store(&fpsi->current, fpsi->accum);
atomic_store(&fpsi->ts, now_sec_ts);
fpsi->accum = 0;
}
++fpsi->accum;
if (fpsi->with_meta) {
assert(frame != NULL);
US_FRAME_COPY_META(frame, &fpsi->meta);
US_MUTEX_UNLOCK(fpsi->mutex);
}
} }
uint us_fpsi_get(us_fpsi_s *fpsi, us_fpsi_meta_s *meta) { uint us_fpsi_get(us_fpsi_s *fpsi, us_fpsi_meta_s *meta) {
@@ -71,12 +87,18 @@ uint us_fpsi_get(us_fpsi_s *fpsi, us_fpsi_meta_s *meta) {
} else { } else {
assert(!fpsi->with_meta); assert(!fpsi->with_meta);
} }
US_MUTEX_LOCK(fpsi->mutex);
const sll now_sec_ts = us_floor_ms(us_get_now_monotonic()); if (fpsi->with_meta) {
const uint current = (fpsi->ts == now_sec_ts ? fpsi->current : 0); US_MUTEX_LOCK(fpsi->mutex);
if (meta != NULL) { }
US_FRAME_COPY_META(&fpsi->meta, meta);
const sll now_sec_ts = us_floor_ms(us_get_now_monotonic());
const uint current = (atomic_load(&fpsi->ts) == now_sec_ts ? fpsi->current : 0);
if (fpsi->with_meta) {
assert(meta != NULL);
US_FRAME_COPY_META(&fpsi->meta, meta);
US_MUTEX_UNLOCK(fpsi->mutex);
} }
US_MUTEX_UNLOCK(fpsi->mutex);
return current; return current;
} }

6
src/libs/fpsi.h
View File

@@ -22,6 +22,8 @@
#pragma once #pragma once
#include <stdatomic.h>
#include <pthread.h> #include <pthread.h>
#include "types.h" #include "types.h"
@@ -36,8 +38,8 @@ typedef struct {
char *name; char *name;
bool with_meta; bool with_meta;
uint accum; uint accum;
ldf ts; atomic_llong ts;
uint current; atomic_uint current;
us_fpsi_meta_s meta; us_fpsi_meta_s meta;
pthread_mutex_t mutex; pthread_mutex_t mutex;
} us_fpsi_s; } us_fpsi_s;