From e5c8ed073365646b543dfbbecb26882433d8350c Mon Sep 17 00:00:00 2001
From: "Ruslan (The BadAss SysMan) Laishev" <ruslan.laishev@demlabs.net>
Date: Tue, 1 Mar 2022 20:18:46 +0300
Subject: [PATCH] Reorganize code to be compiled under Mac OS.
---
dap-sdk/net/core/dap_events_socket.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/dap-sdk/net/core/dap_events_socket.c b/dap-sdk/net/core/dap_events_socket.c
index 4195a04012..0eec5a14dc 100644
--- a/dap-sdk/net/core/dap_events_socket.c
+++ b/dap-sdk/net/core/dap_events_socket.c
@@ -453,11 +453,8 @@ static void s_socket_type_queue_ptr_input_callback_delete(dap_events_socket_t *
*/
dap_events_socket_t * dap_events_socket_queue_ptr_create_input(dap_events_socket_t* a_es)
{
-int l_errno;
-char l_errbuf[128] = {0}, l_mq_name[64] = {0};
-struct mq_attr l_mq_attr;
-
dap_events_socket_t * l_es = DAP_NEW_Z(dap_events_socket_t);
+
l_es->type = DESCRIPTOR_TYPE_QUEUE;
l_es->buf_out_size_max = DAP_QUEUE_MAX_MSGS * sizeof(void*);
l_es->buf_out = DAP_NEW_Z_SIZE(byte_t,l_es->buf_out_size_max );
@@ -484,8 +481,11 @@ struct mq_attr l_mq_attr;
#endif
#ifdef DAP_EVENTS_CAPS_QUEUE_MQUEUE
+ int l_errno;
+ char l_errbuf[128] = {0}, l_mq_name[64] = {0};
+ struct mq_attr l_mq_attr = {0};
+
l_es->mqd_id = a_es->mqd_id;
- memset(&l_mq_attr, 0, sizeof(l_mq_attr));
l_mq_attr.mq_maxmsg = DAP_QUEUE_MAX_MSGS; // Don't think we need to hold more than 1024 messages
l_mq_attr.mq_msgsize = sizeof (void*); // We send only pointer on memory (???!!!),
// so use it with shared memory if you do access from another process
@@ -565,11 +565,6 @@ struct mq_attr l_mq_attr;
*/
dap_events_socket_t * s_create_type_queue_ptr(dap_worker_t * a_w, dap_events_socket_callback_queue_ptr_t a_callback)
{
-int l_errno;
-char l_errbuf[128] = {0}, l_mq_name[64] = {0};
-struct mq_attr l_mq_attr;
-static atomic_uint l_mq_last_number = 0;
-
dap_events_socket_t * l_es = DAP_NEW_Z(dap_events_socket_t);
if(!l_es){
log_it(L_ERROR,"Can't allocate esocket!");
@@ -656,7 +651,12 @@ static atomic_uint l_mq_last_number = 0;
#endif
#elif defined (DAP_EVENTS_CAPS_QUEUE_MQUEUE)
- memset(&l_mq_attr, 0, sizeof(l_mq_attr));
+ int l_errno;
+ char l_errbuf[128] = {0}, l_mq_name[64] = {0};
+ struct mq_attr l_mq_attr;
+ static atomic_uint l_mq_last_number = 0;
+
+
l_mq_attr.mq_maxmsg = DAP_QUEUE_MAX_MSGS; // Don't think we need to hold more than 1024 messages
l_mq_attr.mq_msgsize = sizeof (void*); // We send only pointer on memory (???!!!),
// so use it with shared memory if you do access from another process
--
GitLab