Skip to content

B
Beam Positoning Monitor - Software
Commit e84d6d13 authored by Lucas Russo's avatar Lucas Russo
Browse files
Options

hal/msg/*/*_zmq_server.c: change internal function semantics 

The _thsafe_zmq_server_recv_write () function has changed
its semantics in order to allow reuse by the future *_read_block ()
and *write_block () functions
parent 760e31cc
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 24 deletions
hal/msg/smio_thsafe_ops/smio_thsafe_zmq_server.c
View file @ e84d6d13
...@@ -37,7 +37,7 @@ static int _thsafe_zmq_server_send_read (int32_t *llio_ret, uint8_t *data, ...@@ -37,7 +37,7 @@ static int _thsafe_zmq_server_send_read (int32_t *llio_ret, uint8_t *data,
static int _thsafe_zmq_server_recv_read (zmsg_t *msg, loff_t *offset); static int _thsafe_zmq_server_recv_read (zmsg_t *msg, loff_t *offset);
static int _thsafe_zmq_server_send_write (int32_t *llio_ret, void *reply_to); static int _thsafe_zmq_server_send_write (int32_t *llio_ret, void *reply_to);
static int _thsafe_zmq_server_recv_write (zmsg_t *msg, loff_t *offset, static int _thsafe_zmq_server_recv_write (zmsg_t *msg, loff_t *offset,
uint8_t *data, uint32_t size); zframe_t **data_write_frame);
/**** Open device ****/ /**** Open device ****/
void *thsafe_zmq_server_open (void *owner, void *args) void *thsafe_zmq_server_open (void *owner, void *args)
...@@ -252,18 +252,25 @@ void *thsafe_zmq_server_write_16 (void *owner, void *args) ...@@ -252,18 +252,25 @@ void *thsafe_zmq_server_write_16 (void *owner, void *args)
DBE_DEBUG (DBG_MSG | DBG_LVL_TRACE, "[smio_thsafe_server:zmq] Calling thsafe_write_16\n"); DBE_DEBUG (DBG_MSG | DBG_LVL_TRACE, "[smio_thsafe_server:zmq] Calling thsafe_write_16\n");
uint16_t data_write = 0; zframe_t *data_write_frame;
loff_t offset = 0; loff_t offset = 0;
int zerr = _thsafe_zmq_server_recv_write (*server_args->msg, &offset, int zerr = _thsafe_zmq_server_recv_write (*server_args->msg, &offset,
(uint8_t *) &data_write, THSAFE_WRITE_16_DSIZE); &data_write_frame);
ASSERT_TEST(zerr == 0, "Could receive message", err_recv_msg); ASSERT_TEST(zerr == 0, "Could receive message", err_recv_msg);
if (zframe_size (data_write_frame) != THSAFE_WRITE_16_DSIZE) {
DBE_DEBUG (DBG_MSG | DBG_LVL_ERR, "[smio_thsafe_server:zmq] Wrong received data size\n");
goto err_wrong_data_write_size;
}
/* Call llio to perform the actual operation */ /* Call llio to perform the actual operation */
int32_t llio_ret = llio_write_16 (self->llio, offset, &data_write); int32_t llio_ret = llio_write_16 (self->llio, offset, (uint16_t *) zframe_data (data_write_frame));
/* Send message back to client */ /* Send message back to client */
_thsafe_zmq_server_send_write (&llio_ret, server_args->reply_to); _thsafe_zmq_server_send_write (&llio_ret, server_args->reply_to);
err_wrong_data_write_size:
zframe_destroy (&data_write_frame);
err_recv_msg: err_recv_msg:
/* Might not be safe to do this if we fail */ /* Might not be safe to do this if we fail */
zmsg_destroy (server_args->msg); zmsg_destroy (server_args->msg);
...@@ -280,18 +287,25 @@ void *thsafe_zmq_server_write_32 (void *owner, void *args) ...@@ -280,18 +287,25 @@ void *thsafe_zmq_server_write_32 (void *owner, void *args)
DBE_DEBUG (DBG_MSG | DBG_LVL_TRACE, "[smio_thsafe_server:zmq] Calling thsafe_write_32\n"); DBE_DEBUG (DBG_MSG | DBG_LVL_TRACE, "[smio_thsafe_server:zmq] Calling thsafe_write_32\n");
uint32_t data_write = 0; zframe_t *data_write_frame;
loff_t offset = 0; loff_t offset = 0;
int zerr = _thsafe_zmq_server_recv_write (*server_args->msg, &offset, int zerr = _thsafe_zmq_server_recv_write (*server_args->msg, &offset,
(uint8_t *) &data_write, THSAFE_WRITE_32_DSIZE); &data_write_frame);
ASSERT_TEST(zerr == 0, "Could receive message", err_recv_msg); ASSERT_TEST(zerr == 0, "Could receive message", err_recv_msg);
if (zframe_size (data_write_frame) != THSAFE_WRITE_32_DSIZE) {
DBE_DEBUG (DBG_MSG | DBG_LVL_ERR, "[smio_thsafe_server:zmq] Wrong received data size\n");
goto err_wrong_data_write_size;
}
/* Call llio to perform the actual operation */ /* Call llio to perform the actual operation */
int32_t llio_ret = llio_write_32 (self->llio, offset, &data_write); int32_t llio_ret = llio_write_32 (self->llio, offset, (uint32_t *) zframe_data (data_write_frame));
/* Send message back to client */ /* Send message back to client */
_thsafe_zmq_server_send_write (&llio_ret, server_args->reply_to); _thsafe_zmq_server_send_write (&llio_ret, server_args->reply_to);
err_wrong_data_write_size:
zframe_destroy (&data_write_frame);
err_recv_msg: err_recv_msg:
/* Might not be safe to do this if we fail */ /* Might not be safe to do this if we fail */
zmsg_destroy (server_args->msg); zmsg_destroy (server_args->msg);
...@@ -308,18 +322,25 @@ void *thsafe_zmq_server_write_64 (void *owner, void *args) ...@@ -308,18 +322,25 @@ void *thsafe_zmq_server_write_64 (void *owner, void *args)
DBE_DEBUG (DBG_MSG | DBG_LVL_TRACE, "[smio_thsafe_server:zmq] Calling thsafe_write_64\n"); DBE_DEBUG (DBG_MSG | DBG_LVL_TRACE, "[smio_thsafe_server:zmq] Calling thsafe_write_64\n");
uint64_t data_write = 0; zframe_t *data_write_frame;
loff_t offset = 0; loff_t offset = 0;
int zerr = _thsafe_zmq_server_recv_write (*server_args->msg, &offset, int zerr = _thsafe_zmq_server_recv_write (*server_args->msg, &offset,
(uint8_t *) &data_write, THSAFE_WRITE_64_DSIZE); &data_write_frame);
ASSERT_TEST(zerr == 0, "Could receive message", err_recv_msg); ASSERT_TEST(zerr == 0, "Could receive message", err_recv_msg);
if (zframe_size (data_write_frame) != THSAFE_WRITE_64_DSIZE) {
DBE_DEBUG (DBG_MSG | DBG_LVL_ERR, "[smio_thsafe_server:zmq] Wrong received data size\n");
goto err_wrong_data_write_size;
}
/* Call llio to perform the actual operation */ /* Call llio to perform the actual operation */
int32_t llio_ret = llio_write_64 (self->llio, offset, &data_write); int32_t llio_ret = llio_write_64 (self->llio, offset, (uint64_t *) zframe_data (data_write_frame));
/* Send message back to client */ /* Send message back to client */
_thsafe_zmq_server_send_write (&llio_ret, server_args->reply_to); _thsafe_zmq_server_send_write (&llio_ret, server_args->reply_to);
err_wrong_data_write_size:
zframe_destroy (&data_write_frame);
err_recv_msg: err_recv_msg:
/* Might not be safe to do this if we fail */ /* Might not be safe to do this if we fail */
zmsg_destroy (server_args->msg); zmsg_destroy (server_args->msg);
...@@ -477,10 +498,11 @@ err_send_msg_alloc: ...@@ -477,10 +498,11 @@ err_send_msg_alloc:
} }
static int _thsafe_zmq_server_recv_write (zmsg_t *msg, loff_t *offset, static int _thsafe_zmq_server_recv_write (zmsg_t *msg, loff_t *offset,
uint8_t *data, uint32_t size) zframe_t **data_write_frame)
{ {
assert (offset); assert (offset);
assert (data); assert (data_write_frame);
assert (*data_write_frame);
DBE_DEBUG (DBG_MSG | DBG_LVL_TRACE, "[smio_thsafe_server:zmq] Received message:\n"); DBE_DEBUG (DBG_MSG | DBG_LVL_TRACE, "[smio_thsafe_server:zmq] Received message:\n");
#ifdef LOCAL_MSG_DBG #ifdef LOCAL_MSG_DBG
...@@ -492,23 +514,13 @@ static int _thsafe_zmq_server_recv_write (zmsg_t *msg, loff_t *offset, ...@@ -492,23 +514,13 @@ static int _thsafe_zmq_server_recv_write (zmsg_t *msg, loff_t *offset,
* frame 1: data to be written */ * frame 1: data to be written */
zframe_t *offset_frame = zmsg_pop (msg); zframe_t *offset_frame = zmsg_pop (msg);
ASSERT_ALLOC(offset, err_offset_alloc); ASSERT_ALLOC(offset, err_offset_alloc);
zframe_t *data_write_frame = zmsg_pop (msg); *data_write_frame = zmsg_pop (msg);
ASSERT_ALLOC(offset, err_data_write_alloc); ASSERT_ALLOC(*data_write_frame, err_data_write_alloc);
if (zframe_size (data_write_frame) != size) {
DBE_DEBUG (DBG_MSG | DBG_LVL_ERR, "[smio_thsafe_server:zmq] Wrong received data size\n");
goto err_wrong_data_write_size;
}
*offset = *(loff_t *) zframe_data (offset_frame); *offset = *(loff_t *) zframe_data (offset_frame);
memcpy (data, zframe_data (data_write_frame), size);
zframe_destroy (&data_write_frame);
zframe_destroy (&offset_frame); zframe_destroy (&offset_frame);
return 0; return 0;
err_wrong_data_write_size:
zframe_destroy (&data_write_frame);
err_data_write_alloc: err_data_write_alloc:
zframe_destroy (&offset_frame); zframe_destroy (&offset_frame);
err_offset_alloc: err_offset_alloc:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment