forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-05-26 15:26:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed workers

Browse Source
This commit is contained in:
Devaev Maxim
2021-01-07 17:45:29 +03:00
parent 6377830a35
commit ebe1d20e69
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ustreamer/stream.c
View File

@@ -303,7 +303,7 @@ static workers_pool_s *_stream_init_one(stream_s *stream) {
# undef RUN # undef RUN
return workers_pool_init( return workers_pool_init(
"jpeg", stream->enc->run->n_workers, desired_interval, "JPEG", "jw", stream->enc->run->n_workers, desired_interval,
_worker_job_init, (void *)stream, _worker_job_init, (void *)stream,
_worker_job_destroy, _worker_job_destroy,
_worker_run_job); _worker_run_job);

12
src/ustreamer/workers.c
View File

@@ -27,12 +27,12 @@ static void *_worker_thread(void *v_worker);
workers_pool_s *workers_pool_init( workers_pool_s *workers_pool_init(
const char *name, unsigned n_workers, long double desired_interval, const char *name, const char *wr_prefix, unsigned n_workers, long double desired_interval,
void *(*job_init)(worker_s *wr, void *arg), void *job_init_arg, void *(*job_init)(worker_s *wr, void *arg), void *job_init_arg,
void (*job_destroy)(void *), void (*job_destroy)(void *),
bool (*run_job)(worker_s *)) { bool (*run_job)(worker_s *)) {
LOG_INFO("Creating pool '%s' with %u workers ...", name, n_workers); LOG_INFO("Creating pool %s with %u workers ...", name, n_workers);
workers_pool_s *pool; workers_pool_s *pool;
A_CALLOC(pool, 1); A_CALLOC(pool, 1);
@@ -49,14 +49,14 @@ workers_pool_s *workers_pool_init(
A_MUTEX_INIT(&pool->free_workers_mutex); A_MUTEX_INIT(&pool->free_workers_mutex);
A_COND_INIT(&pool->free_workers_cond); A_COND_INIT(&pool->free_workers_cond);
const size_t name_len = strlen(name) + 64; const size_t wr_name_len = strlen(wr_prefix) + 64;
for (unsigned number = 0; number < pool->n_workers; ++number) { for (unsigned number = 0; number < pool->n_workers; ++number) {
# define WR(_next) pool->workers[number]._next # define WR(_next) pool->workers[number]._next
WR(number) = number; WR(number) = number;
A_CALLOC(WR(name), name_len); A_CALLOC(WR(name), wr_name_len);
snprintf(WR(name), name_len, "%s-%u", name, number); snprintf(WR(name), wr_name_len, "%s-%u", wr_prefix, number);
A_MUTEX_INIT(&WR(has_job_mutex)); A_MUTEX_INIT(&WR(has_job_mutex));
atomic_init(&WR(has_job), false); atomic_init(&WR(has_job), false);
@@ -74,7 +74,7 @@ workers_pool_s *workers_pool_init(
} }
void workers_pool_destroy(workers_pool_s *pool) { void workers_pool_destroy(workers_pool_s *pool) {
LOG_INFO("Destroying workers pool '%s' ...", pool->name); LOG_INFO("Destroying workers pool %s ...", pool->name);
atomic_store(&pool->stop, true); atomic_store(&pool->stop, true);
for (unsigned number = 0; number < pool->n_workers; ++number) { for (unsigned number = 0; number < pool->n_workers; ++number) {

2
src/ustreamer/workers.h
View File

@@ -78,7 +78,7 @@ typedef struct workers_pool_sx {
workers_pool_s *workers_pool_init( workers_pool_s *workers_pool_init(
const char *name, unsigned n_workers, long double desired_interval, const char *name, const char *wr_prefix, unsigned n_workers, long double desired_interval,
void *(*job_init)(worker_s *wr, void *arg), void *job_init_arg, void *(*job_init)(worker_s *wr, void *arg), void *job_init_arg,
void (*job_destroy)(void *job), void (*job_destroy)(void *job),
bool (*run_job)(worker_s *)); bool (*run_job)(worker_s *));