From 34e0e4dab438dd1843b4dbeef887be90ecaed2eb Mon Sep 17 00:00:00 2001
From: Devaev Maxim <mdevaev@gmail.com>
Date: Wed, 20 Jan 2021 12:36:37 +0300
Subject: [PATCH] moved flock_timedwait_monotonic() to tools.h

---
 src/libs/memsink.c | 21 ++-------------------
 src/libs/tools.h   | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/libs/memsink.c b/src/libs/memsink.c
index ff83442..fcdb558 100644
--- a/src/libs/memsink.c
+++ b/src/libs/memsink.c
@@ -23,9 +23,6 @@
 #include "memsink.h"
 
 
-static int _flock_timedwait_monotonic(int fd, long double timeout);
-
-
 memsink_s *memsink_init(
 	const char *name, const char *obj, bool server,
 	mode_t mode, bool rm, unsigned client_ttl, unsigned timeout) {
@@ -129,7 +126,7 @@ int memsink_server_put(memsink_s *sink, const frame_s *frame) {
 		return 0; // -2
 	}
 
-	if (_flock_timedwait_monotonic(sink->fd, 1) == 0) {
+	if (flock_timedwait_monotonic(sink->fd, 1) == 0) {
 		LOG_VERBOSE("%s-sink: >>>>> Exposing new frame ...", sink->name);
 
 #		define COPY(_field) sink->mem->_field = frame->_field
@@ -170,7 +167,7 @@ int memsink_server_put(memsink_s *sink, const frame_s *frame) {
 int memsink_client_get(memsink_s *sink, frame_s *frame) { // cppcheck-suppress unusedFunction
 	assert(!sink->server); // Client only
 
-	if (_flock_timedwait_monotonic(sink->fd, sink->timeout) < 0) {
+	if (flock_timedwait_monotonic(sink->fd, sink->timeout) < 0) {
 		if (errno == EWOULDBLOCK) {
 			return -2;
 		}
@@ -211,17 +208,3 @@ int memsink_client_get(memsink_s *sink, frame_s *frame) { // cppcheck-suppress u
 		}
 		return retval;
 }
-
-static int _flock_timedwait_monotonic(int fd, long double timeout) {
-	long double deadline_ts = get_now_monotonic() + timeout;
-	int retval = -1;
-
-	while (true) {
-		retval = flock(fd, LOCK_EX | LOCK_NB);
-		if (retval == 0 || errno != EWOULDBLOCK || get_now_monotonic() > deadline_ts) {
-			break;
-		}
-		usleep(1000);
-	}
-	return retval;
-}
diff --git a/src/libs/tools.h b/src/libs/tools.h
index 946994b..a7091f2 100644
--- a/src/libs/tools.h
+++ b/src/libs/tools.h
@@ -32,6 +32,8 @@
 #include <time.h>
 #include <assert.h>
 
+#include <sys/file.h>
+
 
 #define A_CALLOC(_dest, _nmemb)		assert((_dest = calloc(_nmemb, sizeof(*(_dest)))))
 #define A_REALLOC(_dest, _nmemb)	assert((_dest = realloc(_dest, _nmemb * sizeof(*(_dest)))))
@@ -123,3 +125,17 @@ INLINE unsigned get_cores_available(void) {
 	cores_sysconf = (cores_sysconf < 0 ? 0 : cores_sysconf);
 	return max_u(min_u(cores_sysconf, 4), 1);
 }
+
+INLINE int flock_timedwait_monotonic(int fd, long double timeout) {
+	long double deadline_ts = get_now_monotonic() + timeout;
+	int retval = -1;
+
+	while (true) {
+		retval = flock(fd, LOCK_EX | LOCK_NB);
+		if (retval == 0 || errno != EWOULDBLOCK || get_now_monotonic() > deadline_ts) {
+			break;
+		}
+		usleep(1000);
+	}
+	return retval;
+}