From 1faff1a6f69f96a4752d168308f1918b697d0015 Mon Sep 17 00:00:00 2001
From: Dmitriy Gerasimov <naeper@demlabs.net>
Date: Fri, 21 May 2021 17:29:12 +0700
Subject: [PATCH] [*] BSD repeating timer's issue fixed
---
CMakeLists.txt | 2 +-
dap-sdk/net/core/dap_timerfd.c | 7 ++++---
dap-sdk/net/core/dap_worker.c | 1 +
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 241e576efd..0d963b9c61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ project(cellframe-sdk C)
cmake_minimum_required(VERSION 3.0)
set(CMAKE_C_STANDARD 11)
-set(CELLFRAME_SDK_NATIVE_VERSION "2.9-3")
+set(CELLFRAME_SDK_NATIVE_VERSION "2.9-4")
add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"")
set(DAPSDK_MODULES "")
message("Cellframe modules: ${CELLFRAME_MODULES}")
diff --git a/dap-sdk/net/core/dap_timerfd.c b/dap-sdk/net/core/dap_timerfd.c
index 081f2bd2b2..44c26c61fe 100644
--- a/dap-sdk/net/core/dap_timerfd.c
+++ b/dap-sdk/net/core/dap_timerfd.c
@@ -243,9 +243,10 @@ static void s_es_callback_timer(struct dap_events_socket *a_event_sock)
log_it(L_WARNING, "callback_timerfd_read() failed: timerfd_settime() errno=%d\n", errno);
}
#elif defined (DAP_OS_BSD)
- struct kevent * l_event = &a_event_sock->kqueue_event;
- EV_SET(l_event, 0, a_event_sock->kqueue_base_filter, a_event_sock->kqueue_base_flags,a_event_sock->kqueue_base_fflags,a_event_sock->kqueue_data,a_event_sock);
- kevent(a_event_sock->worker->kqueue_fd,l_event,1,NULL,0,NULL);
+ dap_worker_add_events_socket_unsafe(a_event_sock,a_event_sock->worker);
+ //struct kevent * l_event = &a_event_sock->kqueue_event;
+ //EV_SET(l_event, 0, a_event_sock->kqueue_base_filter, a_event_sock->kqueue_base_flags,a_event_sock->kqueue_base_fflags,a_event_sock->kqueue_data,a_event_sock);
+ //kevent(a_event_sock->worker->kqueue_fd,l_event,1,NULL,0,NULL);
#elif defined (DAP_OS_WINDOWS)
LARGE_INTEGER l_due_time;
l_due_time.QuadPart = (long long)l_timerfd->timeout_ms * _MSEC;
diff --git a/dap-sdk/net/core/dap_worker.c b/dap-sdk/net/core/dap_worker.c
index a48574c66e..f2f9981bfc 100644
--- a/dap-sdk/net/core/dap_worker.c
+++ b/dap-sdk/net/core/dap_worker.c
@@ -1130,6 +1130,7 @@ int dap_worker_add_events_socket_unsafe( dap_events_socket_t * a_esocket, dap_wo
a_worker->poll_count++;
return 0;
#elif defined (DAP_EVENTS_CAPS_KQUEUE)
+ a_esocket->worker = a_worker;
if ( a_esocket->type == DESCRIPTOR_TYPE_QUEUE ){
return 0;
}
--
GitLab