forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-03-16 04:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Devaev Maxim
2021-01-03 07:23:37 +03:00
parent fa846d01d7
commit 6fadbb76d1
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ustreamer/workers.c
View File

@@ -113,7 +113,7 @@ worker_s *workers_pool_wait(workers_pool_s *pool) {
if (pool->oldest_wr && !atomic_load(&pool->oldest_wr->has_job)) { if (pool->oldest_wr && !atomic_load(&pool->oldest_wr->has_job)) {
ready_wr = pool->oldest_wr; ready_wr = pool->oldest_wr;
ready_wr->job_timely = true; ready_wr->job_timely = true;
pool->oldest_wr = pool->oldest_wr->order_next; pool->oldest_wr = pool->oldest_wr->next_wr;
} else { } else {
for (unsigned number = 0; number < pool->n_workers; ++number) { for (unsigned number = 0; number < pool->n_workers; ++number) {
if ( if (
@@ -137,17 +137,17 @@ void workers_pool_assign(workers_pool_s *pool, worker_s *ready_wr/*, void *job*/
pool->oldest_wr = ready_wr; pool->oldest_wr = ready_wr;
pool->latest_wr = pool->oldest_wr; pool->latest_wr = pool->oldest_wr;
} else { } else {
if (ready_wr->order_next) { if (ready_wr->next_wr) {
ready_wr->order_next->order_prev = ready_wr->order_prev; ready_wr->next_wr->prev_wr = ready_wr->prev_wr;
} }
if (ready_wr->order_prev) { if (ready_wr->prev_wr) {
ready_wr->order_prev->order_next = ready_wr->order_next; ready_wr->prev_wr->next_wr = ready_wr->next_wr;
} }
ready_wr->order_prev = pool->latest_wr; ready_wr->prev_wr = pool->latest_wr;
pool->latest_wr->order_next = ready_wr; pool->latest_wr->next_wr = ready_wr;
pool->latest_wr = ready_wr; pool->latest_wr = ready_wr;
} }
pool->latest_wr->order_next = NULL; pool->latest_wr->next_wr = NULL;
A_MUTEX_LOCK(&ready_wr->has_job_mutex); A_MUTEX_LOCK(&ready_wr->has_job_mutex);
//ready_wr->job = job; //ready_wr->job = job;

4
src/ustreamer/workers.h
View File

@@ -49,8 +49,8 @@ typedef struct worker_sx {
long double job_start_ts; long double job_start_ts;
pthread_cond_t has_job_cond; pthread_cond_t has_job_cond;
struct worker_sx *order_prev; struct worker_sx *prev_wr;
struct worker_sx *order_next; struct worker_sx *next_wr;
struct workers_pool_sx *pool; struct workers_pool_sx *pool;
} worker_s; } worker_s;