Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check for required serdata ops before enabling PSMX on an endpoint #1859

Merged
merged 2 commits into from
Oct 23, 2023
Merged

Check for required serdata ops before enabling PSMX on an endpoint #1859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f46409e
Added check for required ops before enabling PSMX for an endpoint.
gmartin82 Oct 19, 2023
d5e9544
Adding parenthses to correct build error.
gmartin82 Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/core/ddsc/src/dds__qos.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ extern "C" {
dds_return_t dds_ensure_valid_data_representation (dds_qos_t *qos, uint32_t allowed_data_representations, bool topicqos);

/** @component qos_obj */
dds_return_t dds_ensure_valid_psmx_instances (dds_qos_t *qos, dds_psmx_endpoint_type_t forwhat, dds_data_type_properties_t data_type_props, const struct dds_psmx_set *psmx_instances);
dds_return_t dds_ensure_valid_psmx_instances (dds_qos_t *qos, dds_psmx_endpoint_type_t forwhat, const struct ddsi_sertype *stype, const struct dds_psmx_set *psmx_instances);

/** @component qos_obj */
bool dds_qos_has_psmx_instances (const dds_qos_t *qos, const char *psmx_instance_name);
Expand Down
52 changes: 29 additions & 23 deletions src/core/ddsc/src/dds_qos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "dds/ddsrt/string.h"
#include "dds/ddsi/ddsi_plist.h"
#include "dds/ddsi/ddsi_domaingv.h"
#include "dds/ddsi/ddsi_serdata.h"
#include "dds/ddsi/ddsi_sertype.h"
#include "dds__qos.h"
#include "dds__topic.h"
Expand Down Expand Up @@ -929,40 +930,45 @@ bool dds_qget_psmx_instances (const dds_qos_t * __restrict qos, uint32_t *n_out,
return true;
}

dds_return_t dds_ensure_valid_psmx_instances (dds_qos_t *qos, dds_psmx_endpoint_type_t forwhat, dds_data_type_properties_t data_type_props, const struct dds_psmx_set *psmx_instances)
dds_return_t dds_ensure_valid_psmx_instances (dds_qos_t *qos, dds_psmx_endpoint_type_t forwhat, const struct ddsi_sertype *stype, const struct dds_psmx_set *psmx_instances)
{
uint32_t n_supported = 0;
const char *supported_psmx[DDS_MAX_PSMX_INSTANCES];

if (!(qos->present & DDSI_QP_PSMX))
// Check sertype has operations required by PSMX
if ((forwhat == DDS_PSMX_ENDPOINT_TYPE_WRITER && stype->serdata_ops->from_loaned_sample) ||
(forwhat == DDS_PSMX_ENDPOINT_TYPE_READER && stype->serdata_ops->from_psmx))
{
assert (psmx_instances->length <= DDS_MAX_PSMX_INSTANCES);
for (uint32_t i = 0; i < psmx_instances->length; i++)
if (!(qos->present & DDSI_QP_PSMX))
{
struct dds_psmx *psmx = psmx_instances->instances[i];
if (psmx->ops.type_qos_supported (psmx, forwhat, data_type_props, qos))
supported_psmx[n_supported++] = psmx->instance_name;
assert (psmx_instances->length <= DDS_MAX_PSMX_INSTANCES);
for (uint32_t i = 0; i < psmx_instances->length; i++)
{
struct dds_psmx *psmx = psmx_instances->instances[i];
if (psmx->ops.type_qos_supported (psmx, forwhat, stype->data_type_props, qos))
supported_psmx[n_supported++] = psmx->instance_name;
}
}
}
else
{
uint32_t n = 0;
char **values;
dds_qget_psmx_instances (qos, &n, &values);
for (uint32_t i = 0; i < n; i++)
else
{
struct dds_psmx *psmx = NULL;
for (uint32_t s = 0; psmx == NULL && s < psmx_instances->length; s++)
uint32_t n = 0;
char **values;
dds_qget_psmx_instances (qos, &n, &values);
for (uint32_t i = 0; i < n; i++)
{
assert (psmx_instances->instances[s]);
if (strcmp (psmx_instances->instances[s]->instance_name, values[i]) == 0)
psmx = psmx_instances->instances[i];
struct dds_psmx *psmx = NULL;
for (uint32_t s = 0; psmx == NULL && s < psmx_instances->length; s++)
{
assert (psmx_instances->instances[s]);
if (strcmp (psmx_instances->instances[s]->instance_name, values[i]) == 0)
psmx = psmx_instances->instances[i];
}
if (psmx != NULL && psmx->ops.type_qos_supported (psmx, forwhat, stype->data_type_props, qos))
supported_psmx[n_supported++] = psmx->instance_name;
dds_free (values[i]);
}
if (psmx != NULL && psmx->ops.type_qos_supported (psmx, forwhat, data_type_props, qos))
supported_psmx[n_supported++] = psmx->instance_name;
dds_free (values[i]);
dds_free (values);
}
dds_free (values);
}

dds_qset_psmx_instances (qos, n_supported, supported_psmx);
Expand Down
2 changes: 1 addition & 1 deletion src/core/ddsc/src/dds_reader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ static dds_entity_t dds_create_reader_int (dds_entity_t participant_or_subscribe

if ((rc = dds_ensure_valid_data_representation (rqos, tp->m_stype->allowed_data_representation, false)) != DDS_RETCODE_OK)
goto err_data_repr;
if ((rc = dds_ensure_valid_psmx_instances (rqos, DDS_PSMX_ENDPOINT_TYPE_READER, tp->m_stype->data_type_props, &sub->m_entity.m_domain->psmx_instances)) != DDS_RETCODE_OK)
if ((rc = dds_ensure_valid_psmx_instances (rqos, DDS_PSMX_ENDPOINT_TYPE_READER, tp->m_stype, &sub->m_entity.m_domain->psmx_instances)) != DDS_RETCODE_OK)
goto err_psmx;

if ((rc = ddsi_xqos_valid (&gv->logconfig, rqos)) < 0 || (rc = validate_reader_qos(rqos)) != DDS_RETCODE_OK)
Expand Down
2 changes: 1 addition & 1 deletion src/core/ddsc/src/dds_writer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ dds_entity_t dds_create_writer (dds_entity_t participant_or_publisher, dds_entit

if ((rc = dds_ensure_valid_data_representation (wqos, tp->m_stype->allowed_data_representation, false)) != DDS_RETCODE_OK)
goto err_data_repr;
if ((rc = dds_ensure_valid_psmx_instances (wqos, DDS_PSMX_ENDPOINT_TYPE_WRITER, tp->m_stype->data_type_props, &pub->m_entity.m_domain->psmx_instances)) != DDS_RETCODE_OK)
if ((rc = dds_ensure_valid_psmx_instances (wqos, DDS_PSMX_ENDPOINT_TYPE_WRITER, tp->m_stype, &pub->m_entity.m_domain->psmx_instances)) != DDS_RETCODE_OK)
goto err_psmx;

if ((rc = ddsi_xqos_valid (&gv->logconfig, wqos)) < 0 || (rc = validate_writer_qos(wqos)) != DDS_RETCODE_OK)
Expand Down
Loading