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

Bring QoS operations naming scheme in line with the rest

Browse source 
The main naming scheme is OPER_TYPE (i.e., dds_create_participant) but the QoS operations were named TYPE_OPER (i.e., dds_qos_create). This commit brings the QoS scheme in line with the rest, retaining the old names as a deprecated interface.

Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2018-11-09 11:16:24 +01:00
parent a519d9f597
commit 651bdfee06
36 changed files with 206 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/tools/pubsub/common.c
View file

@ -257,13 +257,13 @@ int change_publisher_partitions(dds_entity_t pub, unsigned npartitions, const ch
dds_qos_t *qos;
dds_return_t rc;
qos = dds_qos_create();
qos = dds_create_qos();
rc = dds_get_qos(pub, qos);
if (rc == DDS_SUCCESS) {
dds_qset_partition(qos, npartitions, partitions);
rc = dds_set_qos(pub, qos);
}
dds_qos_delete(qos);
dds_delete_qos(qos);
return rc;
}
@ -271,25 +271,25 @@ int change_subscriber_partitions(dds_entity_t sub, unsigned npartitions, const c
dds_qos_t *qos;
dds_return_t rc;
qos = dds_qos_create();
qos = dds_create_qos();
rc = dds_get_qos(sub, qos);
if (rc == DDS_SUCCESS) {
dds_qset_partition(qos, npartitions, partitions);
rc = dds_set_qos(sub, qos);
}
dds_qos_delete(qos);
dds_delete_qos(qos);
return rc;
}
static dds_qos_t *get_topic_qos(dds_entity_t tp) {
dds_qos_t *tQos = dds_qos_create();
dds_qos_t *tQos = dds_create_qos();
dds_return_t rc = dds_get_qos(tp, tQos);
error_abort(rc, "dds_qos_get_topic_qos");
return tQos;
}
dds_qos_t *new_tqos(void) {
dds_qos_t *q = dds_qos_create();
dds_qos_t *q = dds_create_qos();
/* Not all defaults are those of DCPS: */
dds_qset_reliability(q, DDS_RELIABILITY_RELIABLE, DDS_SECS(1));
@ -299,21 +299,21 @@ dds_qos_t *new_tqos(void) {
dds_qos_t *new_rdqos(dds_entity_t tp) {
dds_qos_t *tQos = get_topic_qos(tp);
dds_qos_t *qos = dds_qos_create();
dds_qos_t *qos = dds_create_qos();
dds_return_t rc = dds_qos_copy(qos, tQos);
error_abort(rc ,"new_rdqos: dds_qos_copy");
dds_qos_delete(tQos);
dds_return_t rc = dds_copy_qos(qos, tQos);
error_abort(rc ,"new_rdqos: dds_copy_qos");
dds_delete_qos(tQos);
return qos;
}
dds_qos_t *new_wrqos(dds_entity_t tp) {
dds_qos_t *tQos = get_topic_qos(tp);
dds_qos_t *qos = dds_qos_create();
dds_qos_t *qos = dds_create_qos();
dds_return_t rc = dds_qos_copy(qos, tQos);
error_abort(rc ,"new_wrqos: dds_qos_copy");
dds_qos_delete(tQos);
dds_return_t rc = dds_copy_qos(qos, tQos);
error_abort(rc ,"new_wrqos: dds_copy_qos");
dds_delete_qos(tQos);
/* Not all defaults are those of DCPS: */
dds_qset_writer_data_lifecycle(qos, false);
@ -329,7 +329,7 @@ dds_entity_t new_topic(const char *name, const dds_topic_descriptor_t *topicDesc
dds_entity_t new_publisher(dds_qos_t *q, unsigned npartitions, const char **partitions) {
dds_qos_t *pQos;
if (q == NULL) {
pQos = dds_qos_create();
pQos = dds_create_qos();
} else {
pQos = q;
}
@ -337,14 +337,14 @@ dds_entity_t new_publisher(dds_qos_t *q, unsigned npartitions, const char **part
dds_entity_t pub = dds_create_publisher(dp, pQos, NULL);
error_abort(pub, "new_publisher: dds_create_publisher");
if (q == NULL)
dds_qos_delete(pQos);
dds_delete_qos(pQos);
return pub;
}
dds_entity_t new_subscriber(dds_qos_t *q, unsigned npartitions, const char **partitions) {
dds_qos_t *sQos;
if (q == NULL) {
sQos = dds_qos_create();
sQos = dds_create_qos();
} else {
sQos = q;
}
@ -352,7 +352,7 @@ dds_entity_t new_subscriber(dds_qos_t *q, unsigned npartitions, const char **par
dds_entity_t sub = dds_create_subscriber(dp, sQos, NULL);
error_abort(sub, "new_subscriber: dds_create_subscriber");
if (q == NULL)
dds_qos_delete(sQos);
dds_delete_qos(sQos);
return sub;
}

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

@ -1589,7 +1589,7 @@ static int check_eseq(struct eseq_admin *ea, unsigned seq, unsigned keyval, cons
//static int subscriber_needs_access(dds_entity_t sub) {
// dds_qos_t *qos;
// int x;
// if ((qos = dds_qos_create()) == NULL)
// if ((qos = dds_create_qos()) == NULL)
// return DDS_RETCODE_OUT_OF_RESOURCES;
// dds_qos_get(sub, qos);
// if (qos == NULL)
@ -2534,16 +2534,16 @@ int MAIN(int argc, char *argv[]) {
for (i = 0; i < (unsigned) (argc - os_get_optind()); i++)
ps[i] = expand_envvars(argv[(unsigned) os_get_optind() + i]);
if (want_reader) {
qos = dds_qos_create();
qos = dds_create_qos();
setqos_from_args(DDS_KIND_SUBSCRIBER, qos, nqsubscriber, qsubscriber);
sub = new_subscriber(qos, (unsigned) (argc - os_get_optind()), (const char **) ps);
dds_qos_delete(qos);
dds_delete_qos(qos);
}
if (want_writer) {
qos = dds_qos_create();
qos = dds_create_qos();
setqos_from_args(DDS_KIND_PUBLISHER, qos, nqpublisher, qpublisher);
pub = new_publisher(qos, (unsigned) (argc - os_get_optind()), (const char **) ps);
dds_qos_delete(qos);
dds_delete_qos(qos);
}
for (i = 0; i < (unsigned) (argc - os_get_optind()); i++)
dds_free(ps[i]);
@ -2582,7 +2582,7 @@ int MAIN(int argc, char *argv[]) {
assert(spec[i].tp);
// assert(spec[i].rd.topicsel != ARB || spec[i].rd.tgtp != NULL);
// assert(spec[i].wr.topicsel != ARB || spec[i].wr.tgtp != NULL);
dds_qos_delete(qos);
dds_delete_qos(qos);
if (spec[i].cftp_expr == NULL)
spec[i].cftp = spec[i].tp;
@ -2604,7 +2604,7 @@ int MAIN(int argc, char *argv[]) {
setqos_from_args(DDS_KIND_READER, qos, nqreader, qreader);
spec[i].rd.rd = new_datareader_listener(sub, spec[i].cftp, qos, rdlistener);
spec[i].rd.sub = sub;
dds_qos_delete(qos);
dds_delete_qos(qos);
}
if (spec[i].wr.mode != WRM_NONE) {
@ -2616,7 +2616,7 @@ int MAIN(int argc, char *argv[]) {
spec[i].wr.dupwr = dds_create_writer(pub, spec[i].tp, qos, NULL);
error_abort(spec[i].wr.dupwr, "dds_writer_create failed");
}
dds_qos_delete(qos);
dds_delete_qos(qos);
}
}