Skip to content

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

libclient/*: use new version of ASSERT macros 

Now, instead of a "custom" error checking we use the
new verison of ASSERT macros (introduced in commit
d1cb7681) which allow us to set the "err" variable
in a more generic way.
parent 2f8a4450
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 46 deletions
libclient/bpm_client.c
View file @ b487515e
......@@ -85,8 +85,7 @@ bpm_client_err_e bpm_blink_leds (bpm_client_t *self, char *service, uint32_t led
FMC130M_4CH_REPLY_TYPE operation = FMC130M_4CH_OPCODE_LEDS;
zmsg_t *request = zmsg_new ();
err = (request == NULL) ? BPM_CLIENT_ERR_ALLOC : err;
ASSERT_ALLOC(request, err_send_msg_alloc);
ASSERT_ALLOC(request, err_send_msg_alloc, BPM_CLIENT_ERR_ALLOC);
zmsg_addmem (request, &operation, sizeof (operation));
zmsg_addmem (request, &leds, sizeof (leds));
mdp_client_send (self->mdp_client, service, &request);
......@@ -158,12 +157,12 @@ static bpm_client_err_e _bpm_data_acquire (bpm_client_t *self, char *service,
* frame 0: error code */
zframe_t *err_code = zmsg_pop(report);
ASSERT_TEST(err_code != NULL, "Could not receive error code", err_null_code);
if ( *(ACQ_REPLY_TYPE *) zframe_data(err_code) != ACQ_OK) {
DBE_DEBUG (DBG_LIB_CLIENT | DBG_LVL_TRACE, "[libclient] bpm_data_acquire: "
"Data acquire was not required correctly\n");
err = BPM_CLIENT_ERR_AGAIN;
goto err_data_acquire;
}
/* Check for return code from server */
ASSERT_TEST(*(ACQ_REPLY_TYPE *) zframe_data(err_code) == ACQ_OK,
"bpm_data_acquire: Data acquire was not required correctly",
err_data_acquire, BPM_CLIENT_ERR_AGAIN);
/* If we are here, then the request was successfully acquired*/
DBE_DEBUG (DBG_LIB_CLIENT | DBG_LVL_TRACE, "[libclient] bpm_data_acquire: "
"Data acquire was successfully required\n");
......@@ -196,14 +195,14 @@ static bpm_client_err_e _bpm_check_data_acquire (bpm_client_t *self, char *servi
/* Message is:
* frame 0: error code */
zframe_t *err_code = zmsg_pop(report);
zframe_t *err_code = zmsg_pop (report);
ASSERT_TEST(err_code != NULL, "Could not receive error code", err_null_code);
if ( *(ACQ_REPLY_TYPE *) zframe_data(err_code) != ACQ_OK) {
DBE_DEBUG (DBG_LIB_CLIENT | DBG_LVL_TRACE, "[libclient] bpm_check_data_acquire: "
"Check fail: data acquire was not completed\n");
err = BPM_CLIENT_ERR_SERVER;
goto err_check_data_acquire;
}
/* Check for return code from server */
ASSERT_TEST(*(ACQ_REPLY_TYPE *) zframe_data (err_code) == ACQ_OK,
"bpm_check_data_acquire: Check fail: data acquire was not completed",
err_check_data_acquire, BPM_CLIENT_ERR_SERVER);
/* If we are here, then the request was successfully acquired*/
DBE_DEBUG (DBG_LIB_CLIENT | DBG_LVL_TRACE, "[libclient] bpm_check_data_acquire: "
"Check ok: data acquire was successfully completed\n");
......@@ -236,7 +235,8 @@ static bpm_client_err_e _bpm_wait_data_acquire_timed (bpm_client_t *self, char *
goto bpm_zctx_interrupted;
}
if ((err = _bpm_check_data_acquire (self, service)) == BPM_CLIENT_SUCCESS) {
err = _bpm_check_data_acquire (self, service);
if (err == BPM_CLIENT_SUCCESS) {
DBE_DEBUG (DBG_LIB_CLIENT | DBG_LVL_TRACE, "[libclient] "
"bpm_wait_data_acquire_timed: finished waiting\n");
goto exit;
......@@ -293,12 +293,10 @@ static bpm_client_err_e _bpm_get_data_block (bpm_client_t *self, char *service,
zframe_t *data = zmsg_pop (report);
ASSERT_TEST(data != NULL, "Could not receive data", err_null_data);
if ( *(ACQ_REPLY_TYPE *) zframe_data (err_code) != ACQ_OK) {
DBE_DEBUG (DBG_LIB_CLIENT | DBG_LVL_TRACE, "[libclient] bpm_get_data_block: "
"Data block was not acquired\n");
err = BPM_CLIENT_ERR_SERVER;
goto err_get_data_block;
}
/* Check for return code from server */
ASSERT_TEST(*(ACQ_REPLY_TYPE *) zframe_data (err_code) == ACQ_OK,
"bpm_get_data_block: Data block was not acquired",
err_get_data_block, BPM_CLIENT_ERR_SERVER);
/* Data size effectively returned */
uint32_t read_size = (acq_trans->block.data_size < data_size) ?
......@@ -360,11 +358,11 @@ bpm_client_err_e bpm_get_curve (bpm_client_t *self, char *service,
acq_trans->block.idx = block_n;
err = _bpm_get_data_block (self, service, acq_trans);
if (err != BPM_CLIENT_SUCCESS){
DBE_DEBUG (DBG_LIB_CLIENT | DBG_LVL_TRACE, "[libclient] bpm_get_curve: "
"_bpm_get_data_block failed. block_n: %u\n", block_n);
goto err_bpm_get_data_block;
}
/* Check for return code */
ASSERT_TEST(err == BPM_CLIENT_SUCCESS,
"_bpm_get_data_block failed. block_n is probably out of range",
err_bpm_get_data_block);
total_bread += acq_trans->block.bytes_read;
acq_trans->block.data = (uint32_t *)((uint8_t *)acq_trans->block.data + acq_trans->block.bytes_read);
......
libclient/rw_param_client.c
View file @ b487515e
......@@ -40,8 +40,7 @@ bpm_client_err_e param_client_send_rw (bpm_client_t *self, char *service,
bpm_client_err_e err = BPM_CLIENT_SUCCESS;
zmsg_t *request = zmsg_new ();
err = (request == NULL) ? BPM_CLIENT_ERR_ALLOC : err;
ASSERT_ALLOC(request, err_send_msg_alloc);
ASSERT_ALLOC(request, err_send_msg_alloc, BPM_CLIENT_ERR_ALLOC);
zmsg_addmem (request, &operation, sizeof (operation));
zmsg_addmem (request, &rw, sizeof (rw));
......@@ -65,8 +64,8 @@ bpm_client_err_e param_client_recv_rw (bpm_client_t *self, char *service,
/* Receive report */
*report = mdp_client_recv (self->mdp_client, NULL, NULL);
err = (*report == NULL) ? BPM_CLIENT_ERR_SERVER : err;
ASSERT_TEST(*report != NULL, "Could not receive message", err_null_msg);
ASSERT_TEST(*report != NULL, "Could not receive message", err_null_msg,
BPM_CLIENT_ERR_SERVER);
err_null_msg:
return err;
......@@ -94,15 +93,12 @@ bpm_client_err_e param_client_write (bpm_client_t *self, char *service,
/* Message is:
* frame 0: error code */
zframe_t *err_code = zmsg_pop (report);
err = (err_code == NULL) ? BPM_CLIENT_ERR_SERVER : err;
ASSERT_TEST(err_code != NULL, "Could not receive error code", err_null_code);
if (*(RW_REPLY_TYPE *) zframe_data(err_code) != RW_WRITE_OK) {
DBE_DEBUG (DBG_LIB_CLIENT | DBG_LVL_TRACE, "[libclient] rw_param_client: "
"parameter set error, try again\n");
err = BPM_CLIENT_ERR_AGAIN;
goto err_set_param;
}
ASSERT_TEST(err_code != NULL, "Could not receive error code", err_null_code,
BPM_CLIENT_ERR_SERVER);
/* Check for return code from server */
ASSERT_TEST(*(RW_REPLY_TYPE *) zframe_data(err_code) == RW_WRITE_OK,
"rw_param_client: parameter SET error, try again",
err_set_param, BPM_CLIENT_ERR_AGAIN);
err_set_param:
zframe_destroy (&err_code);
......@@ -141,13 +137,12 @@ bpm_client_err_e param_client_read (bpm_client_t *self, char *service,
zframe_t *data_out_frm = zmsg_pop(report);
ASSERT_TEST(data_out_frm != NULL, "Could not receive parameter", err_null_param);
if (*(RW_REPLY_TYPE *) zframe_data(err_code) != RW_READ_OK) {
DBE_DEBUG (DBG_LIB_CLIENT | DBG_LVL_TRACE, "[libclient] rw_param_client:: "
"paramter get error, try again\n");
err = BPM_CLIENT_ERR_AGAIN;
goto err_get_param;
}
/* Check for return code from server */
ASSERT_TEST(*(RW_REPLY_TYPE *) zframe_data(err_code) == RW_READ_OK,
"rw_param_client: parameter GET error, try again",
err_get_param, BPM_CLIENT_ERR_AGAIN);
/* Finally, copy the message contents to the user */
*param_out = *(uint32_t *) zframe_data(data_out_frm);
err_get_param:
......
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