niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up return code types

Browse source 
* Remove dds_return_t / dds_retcode_t distinction (now there is only
  dds_return_t and all error codes are always negative)

* Remove Q_ERR_... error codes and replace them by DDS_RETCODE_...
  ones so that there is only one set of error codes

* Replace a whole bunch "int" return types that were used to return
  Q_ERR_... codes by "dds_return_t" return types

Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2019-05-23 16:51:43 +02:00 • committed by eboasson
parent a652ecb78e
commit 19aec98b8a
126 changed files with 1565 additions and 1722 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/tools/ddsperf/ddsperf.c
View file

@ -564,7 +564,7 @@ static uint32_t pubthread (void *varg)
{
printf ("write error: %d\n", result);
fflush (stdout);
if (dds_err_nr (result) != DDS_RETCODE_TIMEOUT)
if (result != DDS_RETCODE_TIMEOUT)
exit (2);
timeouts++;
/* retry with original timestamp, it really is just a way of reporting
@ -800,7 +800,7 @@ static bool process_data (dds_entity_t rd, struct subthread_arg *arg)
if ((wr_pong = get_pong_writer (iseq[i].publication_handle)) != 0)
{
dds_return_t rc;
if ((rc = dds_write_ts (wr_pong, mseq[i], iseq[i].source_timestamp - 1)) < 0 && dds_err_nr(rc) != DDS_RETCODE_TIMEOUT)
if ((rc = dds_write_ts (wr_pong, mseq[i], iseq[i].source_timestamp - 1)) < 0 && rc != DDS_RETCODE_TIMEOUT)
error2 ("dds_write_ts (wr_pong, mseq[i], iseq[i].source_timestamp): %d\n", (int) rc);
dds_write_flush (wr_pong);
}
@ -828,7 +828,7 @@ static bool process_ping (dds_entity_t rd, struct subthread_arg *arg)
if ((wr_pong = get_pong_writer (iseq[i].publication_handle)) != 0)
{
dds_return_t rc;
if ((rc = dds_write_ts (wr_pong, mseq[i], iseq[i].source_timestamp | 1)) < 0 && dds_err_nr(rc) != DDS_RETCODE_TIMEOUT)
if ((rc = dds_write_ts (wr_pong, mseq[i], iseq[i].source_timestamp | 1)) < 0 && rc != DDS_RETCODE_TIMEOUT)
error2 ("dds_write_ts (wr_pong, mseq[i], iseq[i].source_timestamp): %d\n", (int) rc);
dds_write_flush (wr_pong);
}
@ -863,7 +863,7 @@ static bool process_pong (dds_entity_t rd, struct subthread_arg *arg)
cur_ping_time = dds_time ();
cur_ping_seq = ++(*seq);
ddsrt_mutex_unlock (&pongwr_lock);
if ((rc = dds_write_ts (wr_ping, mseq[i], dds_time () | 1)) < 0 && dds_err_nr(rc) != DDS_RETCODE_TIMEOUT)
if ((rc = dds_write_ts (wr_ping, mseq[i], dds_time () | 1)) < 0 && rc != DDS_RETCODE_TIMEOUT)
error2 ("dds_write (wr_ping, mseq[i]): %d\n", (int) rc);
dds_write_flush (wr_ping);
}
@ -916,7 +916,7 @@ static void maybe_send_new_ping (dds_time_t tnow, dds_time_t *tnextping)
cur_ping_seq++;
baggage = init_sample (&data, cur_ping_seq);
ddsrt_mutex_unlock (&pongwr_lock);
if ((rc = dds_write_ts (wr_ping, &data, dds_time () | 1)) < 0 && dds_err_nr (rc) != DDS_RETCODE_TIMEOUT)
if ((rc = dds_write_ts (wr_ping, &data, dds_time () | 1)) < 0 && rc != DDS_RETCODE_TIMEOUT)
error2 ("send_new_ping: dds_write (wr_ping, &data): %d\n", (int) rc);
dds_write_flush (wr_ping);
if (baggage)

2
src/tools/pubsub/common.h
View file

@ -119,7 +119,7 @@ bool dds_err_check (dds_return_t err, unsigned flags, const char *where);
#define DDS_CHECK_FAIL 0x02
#define DDS_CHECK_EXIT 0x04
#define dds_err_str(x) (dds_strretcode(dds_err_nr(x)))
#define dds_err_str(x) (dds_strretcode(x))
#define DDS_TO_STRING(n) #n
#define DDS_INT_TO_STRING(n) DDS_TO_STRING(n)

2
src/tools/pubsub/pubsub.c
View file

@ -2792,7 +2792,7 @@ int main(int argc, char *argv[]) {
ddsrt_threadattr_t attr;
ddsrt_threadattr_init(&attr);
dds_retcode_t osres;
dds_return_t osres;
if (want_writer) {
for (i = 0; i <= specidx; i++) {