From 6fadbb76d18a8e885f9c03406fc5480eaf6010b9 Mon Sep 17 00:00:00 2001
From: Devaev Maxim <mdevaev@gmail.com>
Date: Sun, 3 Jan 2021 07:23:37 +0300
Subject: [PATCH] refactoring

---
 src/ustreamer/workers.c | 16 ++++++++--------
 src/ustreamer/workers.h |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/ustreamer/workers.c b/src/ustreamer/workers.c
index ec80283..4c61171 100644
--- a/src/ustreamer/workers.c
+++ b/src/ustreamer/workers.c
@@ -113,7 +113,7 @@ worker_s *workers_pool_wait(workers_pool_s *pool) {
 	if (pool->oldest_wr && !atomic_load(&pool->oldest_wr->has_job)) {
 		ready_wr = pool->oldest_wr;
 		ready_wr->job_timely = true;
-		pool->oldest_wr = pool->oldest_wr->order_next;
+		pool->oldest_wr = pool->oldest_wr->next_wr;
 	} else {
 		for (unsigned number = 0; number < pool->n_workers; ++number) {
 			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->latest_wr = pool->oldest_wr;
 	} else {
-		if (ready_wr->order_next) {
-			ready_wr->order_next->order_prev = ready_wr->order_prev;
+		if (ready_wr->next_wr) {
+			ready_wr->next_wr->prev_wr = ready_wr->prev_wr;
 		}
-		if (ready_wr->order_prev) {
-			ready_wr->order_prev->order_next = ready_wr->order_next;
+		if (ready_wr->prev_wr) {
+			ready_wr->prev_wr->next_wr = ready_wr->next_wr;
 		}
-		ready_wr->order_prev = pool->latest_wr;
-		pool->latest_wr->order_next = ready_wr;
+		ready_wr->prev_wr = pool->latest_wr;
+		pool->latest_wr->next_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);
 	//ready_wr->job = job;
diff --git a/src/ustreamer/workers.h b/src/ustreamer/workers.h
index 763a3ca..0e12793 100644
--- a/src/ustreamer/workers.h
+++ b/src/ustreamer/workers.h
@@ -49,8 +49,8 @@ typedef struct worker_sx {
 	long double		job_start_ts;
 	pthread_cond_t	has_job_cond;
 
-	struct worker_sx *order_prev;
-	struct worker_sx *order_next;
+	struct worker_sx *prev_wr;
+	struct worker_sx *next_wr;
 
 	struct workers_pool_sx *pool;
 } worker_s;