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

Rename dds_instance_lookup to dds_lookup_instance

Browse source 
Signed-off-by: Firas Sahli <firas.sahli@adlinktech.com>
This commit is contained in:
Firas Sahli 2018-11-27 09:08:14 +01:00
parent af7e34f143
commit 99f410bc49
No known key found for this signature in database
GPG key ID: C19E9D4A9279539F
7 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/core/ddsc/include/ddsc/dds.h
View file

@ -1611,7 +1611,7 @@ dds_dispose_ts(
*
* <b><i>Instance Handle</i></b><br>
* The given instance handle must correspond to the value that was returned by either
* the dds_register_instance operation, dds_register_instance_ts or dds_instance_lookup.
* the dds_register_instance operation, dds_register_instance_ts or dds_lookup_instance.
* If there is no correspondence, then the result of the operation is unspecified.
*
* @param[in] writer The writer to dispose the data instance from.
@ -3051,7 +3051,7 @@ dds_return_loan(
T x = { ... };
T y;
dds_instance_handle_t ih;
ih = dds_instance_lookup (e, &x);
ih = dds_lookup_instance (e, &x);
dds_instance_get_key (e, ih, &y);
*/
@ -3065,6 +3065,13 @@ dds_return_loan(
*/
_Pre_satisfies_(entity & DDS_ENTITY_KIND_MASK)
DDS_EXPORT dds_instance_handle_t
dds_lookup_instance(
dds_entity_t entity,
const void *data);
_Pre_satisfies_(entity & DDS_ENTITY_KIND_MASK)
DDS_EXPORT dds_instance_handle_t
DDS_DEPRECATED_EXPORT
dds_instance_lookup (
dds_entity_t entity,
const void *data);

11
src/core/ddsc/src/dds_instance.c
View file

@ -375,7 +375,7 @@ dds_dispose_ih_ts(
_Pre_satisfies_(entity & DDS_ENTITY_KIND_MASK)
dds_instance_handle_t
dds_instance_lookup(
dds_lookup_instance(
dds_entity_t entity,
const void *data)
{
@ -401,6 +401,15 @@ err:
return ih;
}
_Pre_satisfies_(entity & DDS_ENTITY_KIND_MASK)
dds_instance_handle_t
dds_instance_lookup (
dds_entity_t entity,
const void *data)
{
return dds_lookup_instance(entity, data);
}
_Pre_satisfies_(entity & DDS_ENTITY_KIND_MASK)
dds_return_t
dds_instance_get_key(

6
src/core/ddsc/tests/dispose.c
View file

@ -903,7 +903,7 @@ CU_Theory((dds_entity_t *writer), ddsc_dispose_ih, non_writers, .init=disposing_
CU_Test(ddsc_dispose_ih, disposing_old_instance, .init=disposing_init, .fini=disposing_fini)
{
Space_Type1 oldInstance = { 0, 22, 22 };
dds_instance_handle_t hdl = dds_instance_lookup(g_writer, &oldInstance);
dds_instance_handle_t hdl = dds_lookup_instance(g_writer, &oldInstance);
dds_return_t ret;
ret = dds_dispose_ih(g_writer, hdl);
@ -1001,7 +1001,7 @@ CU_Theory((dds_entity_t *writer), ddsc_dispose_ih_ts, non_writers, .init=disposi
CU_Test(ddsc_dispose_ih_ts, disposing_old_instance, .init=disposing_init, .fini=disposing_fini)
{
Space_Type1 oldInstance = { 0, 22, 22 };
dds_instance_handle_t hdl = dds_instance_lookup(g_writer, &oldInstance);
dds_instance_handle_t hdl = dds_lookup_instance(g_writer, &oldInstance);
dds_return_t ret;
ret = dds_dispose_ih_ts(g_writer, hdl, g_present);
@ -1043,7 +1043,7 @@ CU_Test(ddsc_dispose_ih_ts, disposing_old_instance, .init=disposing_init, .fini=
CU_Test(ddsc_dispose_ih_ts, disposing_past_sample, .init=disposing_init, .fini=disposing_fini)
{
Space_Type1 oldInstance = { 0, 0, 0 };
dds_instance_handle_t hdl = dds_instance_lookup(g_writer, &oldInstance);
dds_instance_handle_t hdl = dds_lookup_instance(g_writer, &oldInstance);
dds_return_t ret;
/* Disposing a sample in the past should trigger a lost sample. */

2
src/core/ddsc/tests/read_instance.c
View file

@ -236,7 +236,7 @@ read_instance_init(void)
sample.long_1 = 0;
sample.long_2 = 0;
sample.long_3 = 0;
g_hdl_valid = dds_instance_lookup(g_reader, &sample);
g_hdl_valid = dds_lookup_instance(g_reader, &sample);
CU_ASSERT_NOT_EQUAL_FATAL(g_hdl_valid, DDS_HANDLE_NIL);
dds_delete_qos(qos);

7
src/core/ddsc/tests/register.c
View file

@ -199,23 +199,22 @@ CU_Test(ddsc_register_instance, registering_new_instance, .init=registering_init
dds_instance_handle_t instHndl, instHndl2;
dds_return_t ret;
Space_Type1 newInstance = { INITIAL_SAMPLES, 0, 0 };
instHndl = dds_instance_lookup(g_writer, &newInstance);
instHndl = dds_lookup_instance(g_writer, &newInstance);
CU_ASSERT_EQUAL_FATAL(instHndl, DDS_HANDLE_NIL);
ret = dds_register_instance(g_writer, &instHndl2, &newInstance);
CU_ASSERT_EQUAL_FATAL(ret, DDS_RETCODE_OK);
instHndl = dds_instance_lookup(g_writer, &newInstance);
CU_ASSERT_EQUAL_FATAL(instHndl, instHndl2);
instHndl = dds_lookup_instance(g_writer, &newInstance);
}
CU_Test(ddsc_register_instance, data_already_available, .init=registering_init, .fini=registering_fini)
{
dds_instance_handle_t instHndl, instHndl2;
dds_return_t ret;
instHndl = dds_instance_lookup(g_writer, &g_data);
instHndl = dds_lookup_instance(g_writer, &g_data);
CU_ASSERT_NOT_EQUAL_FATAL(instHndl, DDS_HANDLE_NIL);
ret = dds_register_instance(g_writer, &instHndl2, &g_data);
CU_ASSERT_EQUAL_FATAL(ret, DDS_RETCODE_OK);
CU_ASSERT_EQUAL_FATAL(instHndl2, instHndl);
}

2
src/core/ddsc/tests/take_instance.c
View file

@ -237,7 +237,7 @@ take_instance_init(void)
sample.long_1 = 0;
sample.long_2 = 0;
sample.long_3 = 0;
g_hdl_valid = dds_instance_lookup(g_reader, &sample);
g_hdl_valid = dds_lookup_instance(g_reader, &sample);
CU_ASSERT_NOT_EQUAL_FATAL(g_hdl_valid, DDS_HANDLE_NIL);
dds_delete_qos(qos);

6
src/core/ddsc/tests/unregister.c
View file

@ -427,7 +427,7 @@ CU_Theory((dds_entity_t *writer), ddsc_unregister_instance_ih, non_writers, .ini
CU_Test(ddsc_unregister_instance_ih, unregistering_old_instance, .init=unregistering_init, .fini=unregistering_fini)
{
Space_Type1 oldInstance = { 0, 22, 22 };
dds_instance_handle_t hdl = dds_instance_lookup(g_writer, &oldInstance);
dds_instance_handle_t hdl = dds_lookup_instance(g_writer, &oldInstance);
dds_return_t ret;
ret = dds_unregister_instance_ih(g_writer, hdl);
@ -525,7 +525,7 @@ CU_Theory((dds_entity_t *writer), ddsc_unregister_instance_ih_ts, non_writers, .
CU_Test(ddsc_unregister_instance_ih_ts, unregistering_old_instance, .init=unregistering_init, .fini=unregistering_fini)
{
Space_Type1 oldInstance = { 0, 22, 22 };
dds_instance_handle_t hdl = dds_instance_lookup(g_writer, &oldInstance);
dds_instance_handle_t hdl = dds_lookup_instance(g_writer, &oldInstance);
dds_return_t ret;
ret = dds_unregister_instance_ih_ts(g_writer, hdl, g_present);
@ -567,7 +567,7 @@ CU_Test(ddsc_unregister_instance_ih_ts, unregistering_old_instance, .init=unregi
CU_Test(ddsc_unregister_instance_ih_ts, unregistering_past_sample, .init=unregistering_init, .fini=unregistering_fini)
{
Space_Type1 oldInstance = { 0, 0, 0 };
dds_instance_handle_t hdl = dds_instance_lookup(g_writer, &oldInstance);
dds_instance_handle_t hdl = dds_lookup_instance(g_writer, &oldInstance);
dds_attach_t triggered;
dds_return_t ret;