From 06fb7815697a7f9bf3c405c0e9429f04e40218e1 Mon Sep 17 00:00:00 2001 From: poetinger Date: Wed, 23 Jul 2025 11:11:49 +0200 Subject: [PATCH 1/5] fix typos --- src/core/ddsc/include/dds/dds.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/ddsc/include/dds/dds.h b/src/core/ddsc/include/dds/dds.h index 39f1480ea6..2fc8d2bc3e 100644 --- a/src/core/ddsc/include/dds/dds.h +++ b/src/core/ddsc/include/dds/dds.h @@ -1553,7 +1553,7 @@ dds_get_type_name(dds_entity_t topic, char *name, size_t size); * - instance_state set to instance state if sample being filtered * matches an existing instance, NEW if not * - generation counts set to instance's generation counts if the sample - * matches an existing instance instance, 0 if not + * matches an existing instance, 0 if not */ /** @@ -2919,7 +2919,7 @@ dds_waitset_set_trigger( bool trigger); /** - * @brief This operation allows an application thread to wait for the a status + * @brief This operation allows an application thread to wait for a status * change or other trigger on (one of) the entities that are attached to * the WaitSet. * @ingroup waitset @@ -2993,7 +2993,7 @@ dds_waitset_wait( dds_duration_t reltimeout); /** - * @brief This operation allows an application thread to wait for the a status + * @brief This operation allows an application thread to wait for a status * change or other trigger on (one of) the entities that are attached to * the WaitSet. * @ingroup waitset @@ -4128,7 +4128,7 @@ dds_take_next_wl( * the sample was successfully handled and reading can continue * @retval otherwise * an error, this will propagated to the caller if it occurs on the first call - * otherwise the return valu eof read/take will be the number of samples + * otherwise the return value of read/take will be the number of samples * successfully collected */ typedef dds_return_t (*dds_read_with_collector_fn_t) ( From fd6dd4c694b18b2e69810bc1b7ae6512bb6d968b Mon Sep 17 00:00:00 2001 From: poetinger Date: Wed, 23 Jul 2025 11:38:34 +0200 Subject: [PATCH 2/5] behaviour -> behavior --- CHANGELOG.rst | 2 +- docs/dev/data path - receive.svg | 2 +- docs/dev/data path.graffle | 2 +- docs/dev/dds_security_effort.md | 2 +- docs/manual/about_dds/ddsi-transient_behavior.rst | 4 ++-- docs/manual/about_dds/discovery_participants.rst | 2 +- docs/manual/about_dds/mapping_entities.rst | 2 +- docs/manual/about_dds/publishers.rst | 2 +- docs/manual/about_dds/qos.rst | 2 +- docs/manual/about_dds/reliable_communication.rst | 4 ++-- docs/manual/about_dds/subscribers.rst | 2 +- docs/manual/config/config_file_reference.rst | 4 ++-- docs/manual/config/data-path-config.rst | 2 +- docs/manual/config/discovery-behavior.rst | 12 ++++++------ docs/manual/config/discovery-config.rst | 4 ++-- docs/manual/config/network_interfaces.rst | 10 +++++----- docs/manual/config/reporting-tracing.rst | 2 +- docs/manual/options.md | 4 ++-- .../security/proprietary_builtin_endpoints.rst | 2 +- docs/manual/shared_memory/loan_mechanism.rst | 2 +- etc/cyclonedds.rnc | 4 ++-- etc/cyclonedds.xsd | 4 ++-- examples/dynsub/dynsub.c | 2 +- ports/zephyr/README.md | 2 +- src/core/ddsc/include/dds/dds.h | 6 +++--- src/core/ddsc/include/dds/ddsc/dds_psmx.h | 6 +++--- src/core/ddsc/src/dds_psmx.c | 2 +- src/core/ddsc/src/dds_rhc_default.c | 2 +- src/core/ddsc/src/dds_subscriber.c | 2 +- src/core/ddsc/src/dds_topic.c | 2 +- src/core/ddsc/tests/destorder.c | 2 +- src/core/ddsc/tests/instance_handle.c | 2 +- src/core/ddsc/tests/listener.c | 2 +- src/core/ddsc/tests/nwpart.c | 2 +- src/core/ddsc/tests/waitset.c | 4 ++-- src/core/ddsi/include/dds/ddsi/ddsi_sertype.h | 2 +- src/core/ddsi/src/ddsi__cfgelems.h | 14 +++++++------- src/core/ddsi/src/ddsi__sockwaitset.h | 4 ++-- src/core/ddsi/src/ddsi__transmit.h | 2 +- src/core/ddsi/src/ddsi_config.c | 2 +- src/core/ddsi/src/ddsi_discovery_endpoint.c | 2 +- src/core/ddsi/src/ddsi_init.c | 2 +- src/core/ddsi/src/ddsi_receive.c | 4 ++-- src/core/ddsi/src/ddsi_threadmon.c | 2 +- src/core/xtests/rhc_torture/rhc_torture.c | 2 +- src/ddsrt/CMakeLists.txt | 2 +- src/ddsrt/include/dds/ddsrt/ifaddrs.h | 2 +- src/ddsrt/src/retcode.c | 2 +- src/ddsrt/src/time/windows/time.c | 2 +- src/idl/src/annotation.c | 2 +- .../include/dds/security/core/dds_security_fsm.h | 2 +- 51 files changed, 80 insertions(+), 80 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f8a7c00c32..c001ceec71 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -59,7 +59,7 @@ Some of the highlights: * Support for ROS2 Dashing and Eloquent (via an adaption layer). * Support for an arbitrary number of concurrent DDS domains (fully independent instantiations of DDS) in a single process. -* Abstracting the notion of samples, types and reader history caches, allowing overriding the default implementations of these to get behaviours more suited to the applications. +* Abstracting the notion of samples, types and reader history caches, allowing overriding the default implementations of these to get behaviors more suited to the applications. This is particularly relevant to language bindings and embedding Cyclone DDS in other frameworks, such as ROS2. * Platform support is extended beyond the usual Linux/Windows/macOS: FreeRTOS is now known to work, as is Solaris 2.6 on sun4m machines. * Acceptance of some malformed messages from certain implementations improved interoperability on the wire. diff --git a/docs/dev/data path - receive.svg b/docs/dev/data path - receive.svg index 72052bf6cf..97cfb2c7f9 100644 --- a/docs/dev/data path - receive.svg +++ b/docs/dev/data path - receive.svg @@ -593,7 +593,7 @@ not deliver data to an individual reader, might as well design to that - behaviour + behavior diff --git a/docs/dev/data path.graffle b/docs/dev/data path.graffle index cb84628355..4981792129 100644 --- a/docs/dev/data path.graffle +++ b/docs/dev/data path.graffle @@ -1795,7 +1795,7 @@ The deserializer operates from the {\*\expandedcolortbl;;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0 -\f0\fs18 \cf0 given that the kernel can only do groupWrite, and not deliver data to an individual reader, might as well design to that behaviour} +\f0\fs18 \cf0 given that the kernel can only do groupWrite, and not deliver data to an individual reader, might as well design to that behavior} VerticalPad 2 diff --git a/docs/dev/dds_security_effort.md b/docs/dev/dds_security_effort.md index 265363a448..fd6e9ed832 100644 --- a/docs/dev/dds_security_effort.md +++ b/docs/dev/dds_security_effort.md @@ -280,7 +280,7 @@ DDS_RETCODE_NOT_ALLOWED_BY_SECURITY in the ddsc API (not used)). Maybe we have to do some additional cleanup when a failure is encountered. -Some tests probably have to be adjusted for the new behaviour. +Some tests probably have to be adjusted for the new behavior. ## Multiple configurations diff --git a/docs/manual/about_dds/ddsi-transient_behavior.rst b/docs/manual/about_dds/ddsi-transient_behavior.rst index 86732c27de..e15d5b9559 100644 --- a/docs/manual/about_dds/ddsi-transient_behavior.rst +++ b/docs/manual/about_dds/ddsi-transient_behavior.rst @@ -1,7 +1,7 @@ -.. _`DDSI-specific transient-local behaviour`: +.. _`DDSI-specific transient-local behavior`: *************************************** -DDSI-Specific Transient-Local Behaviour +DDSI-Specific Transient-Local behavior *************************************** The DCPS specification provides *transient-local*, *transient*, diff --git a/docs/manual/about_dds/discovery_participants.rst b/docs/manual/about_dds/discovery_participants.rst index 616a49cb4c..ae85447065 100644 --- a/docs/manual/about_dds/discovery_participants.rst +++ b/docs/manual/about_dds/discovery_participants.rst @@ -37,7 +37,7 @@ writers with the two participants. For |var-project|, SEDP also exchanges inform publishers, subscribers and topics in a manner compatible with OpenSplice. The SEDP data is handled as reliable (see :ref:`reliable_coms`), transient-local data -(see :ref:`DDSI-specific transient-local behaviour`). Therefore, the SEDP Writers +(see :ref:`DDSI-specific transient-local behavior`). Therefore, the SEDP Writers send Heartbeats. If the SEDP Readers detect they have not yet received all samples and send AckNacks requesting re-transmissions, the Writer responds to these and eventually receives a pure acknowledgement informing it that the reader has now received the diff --git a/docs/manual/about_dds/mapping_entities.rst b/docs/manual/about_dds/mapping_entities.rst index 6501928416..08bd456973 100644 --- a/docs/manual/about_dds/mapping_entities.rst +++ b/docs/manual/about_dds/mapping_entities.rst @@ -6,7 +6,7 @@ Mapping of DCPS Entities to DDSI Entities Each DCPS domain participant in a domain has a corresponding DDSI participant. These DDSI participants drive the discovery of participants, readers, and writers -via the discovery protocols (:ref:`discovery_behaviour`). By default, each DDSI participant +via the discovery protocols (:ref:`discovery_behavior`). By default, each DDSI participant has a unique address on the network in the form of its own UDP/IP socket with a unique port number. diff --git a/docs/manual/about_dds/publishers.rst b/docs/manual/about_dds/publishers.rst index f212e91ca4..17e9060971 100644 --- a/docs/manual/about_dds/publishers.rst +++ b/docs/manual/about_dds/publishers.rst @@ -9,7 +9,7 @@ Publishers A Publisher is a producer of data on a Domain. It uses the :ref:`domainparticipants_bm` to gain access to the Domain and is created using it. That is, the Publisher passes down the Domain from its parent class DomainParticipant. A Publisher allows the :ref:`datawriters_bm` -associated with it to share the same behaviour, for example: +associated with it to share the same behavior, for example: - Liveliness notifications - :ref:`qos_bm` diff --git a/docs/manual/about_dds/qos.rst b/docs/manual/about_dds/qos.rst index 7d6492bab9..10a04e44fb 100644 --- a/docs/manual/about_dds/qos.rst +++ b/docs/manual/about_dds/qos.rst @@ -227,7 +227,7 @@ being accessed: For a detailed explanation of the different QoSPolicies and their effects on the -behaviour of CycloneDDS, refer to the |url::dds_spec| v1.4 section 2.2.3. +behavior of CycloneDDS, refer to the |url::dds_spec| v1.4 section 2.2.3. Default and Inherited QoSes --------------------------- diff --git a/docs/manual/about_dds/reliable_communication.rst b/docs/manual/about_dds/reliable_communication.rst index 1f4c62bf00..41630dff02 100644 --- a/docs/manual/about_dds/reliable_communication.rst +++ b/docs/manual/about_dds/reliable_communication.rst @@ -31,10 +31,10 @@ AckNack messages to inform the writer of samples received and not received. When writer indicates that it requires a response to a heartbeat, the readers sends an AckNack message (even when no samples are missing). -Combining these behaviours allows the writer to remove old samples from its WHC when it fills +Combining these behaviors allows the writer to remove old samples from its WHC when it fills up the cache, enabling readers to receive all data reliably. -The default |var-project-short| behaviour is to never to consider readers unresponsive. The +The default |var-project-short| behavior is to never to consider readers unresponsive. The DDSI specification does not define how to handle a situation where readers do not respond to a heartbeat, or fail to receive samples from a writer after a re-transmission request. A solution to this situation is to periodically check the participant containing the reader. diff --git a/docs/manual/about_dds/subscribers.rst b/docs/manual/about_dds/subscribers.rst index 583d386070..590bef55ea 100644 --- a/docs/manual/about_dds/subscribers.rst +++ b/docs/manual/about_dds/subscribers.rst @@ -8,7 +8,7 @@ Subscribers A Subscriber is a consumer of data on a Domain. It uses the :ref:`domainparticipants_bm` to gain access to the Domain and is created using it. A Subscriber allows the -:ref:`datareaders_bm` associated with it to share the same behaviour, such as: +:ref:`datareaders_bm` associated with it to share the same behavior, such as: - Liveliness notifications - :ref:`qos_bm` diff --git a/docs/manual/config/config_file_reference.rst b/docs/manual/config/config_file_reference.rst index 19156bb369..1c8ff99820 100644 --- a/docs/manual/config/config_file_reference.rst +++ b/docs/manual/config/config_file_reference.rst @@ -139,7 +139,7 @@ One of: lax, strict, pedantic This element sets the level of standards conformance of this instance of the Cyclone DDS Service. Stricter conformance typically means less interoperability with other implementations. Currently, three modes are defined: * pedantic: very strictly conform to the specification, ultimately for compliance testing, but currently of little value because it adheres even to what will most likely turn out to be editing errors in the DDSI standard. Arguably, as long as no errata have been published, the current text is in effect, and that is what pedantic currently does. - * strict: a relatively less strict view of the standard than does pedantic: it follows the established behaviour where the standard is obviously in error. + * strict: a relatively less strict view of the standard than does pedantic: it follows the established behavior where the standard is obviously in error. * lax: attempt to provide the smoothest possible interoperability, anticipating future revisions of elements in the standard in areas that other implementations do not adhere to, even though there is no good reason not to. @@ -1435,7 +1435,7 @@ The default value is: ``2147483647 B`` Boolean -This element enables heartbeat-to-ack latency among Cyclone DDS services by prepending timestamps to Heartbeat and AckNack messages and calculating round trip times. This is non-standard behaviour. The measured latencies are quite noisy and are currently not used anywhere. +This element enables heartbeat-to-ack latency among Cyclone DDS services by prepending timestamps to Heartbeat and AckNack messages and calculating round trip times. This is non-standard behavior. The measured latencies are quite noisy and are currently not used anywhere. The default value is: ``false`` diff --git a/docs/manual/config/data-path-config.rst b/docs/manual/config/data-path-config.rst index f3f30a98bc..6261cc670f 100644 --- a/docs/manual/config/data-path-config.rst +++ b/docs/manual/config/data-path-config.rst @@ -77,7 +77,7 @@ Samples in DDS can be arbitrarily large, and do not always fit within a single d DDSI can fragment samples so they can fit in UDP datagrams. IP has facilities to fragment UDP datagrams into network packets. The DDSI specification (see |url::dds2.5| section 8.4.14.1.2) describes how to send fragments (Data must only be fragmented if required). However, |var-project| -provides a fully configurable behaviour. +provides a fully configurable behavior. If the serialised form of a sample is at least the size set in: :ref:`General/FragmentSize `, diff --git a/docs/manual/config/discovery-behavior.rst b/docs/manual/config/discovery-behavior.rst index 05d3702b86..9aac0eede7 100644 --- a/docs/manual/config/discovery-behavior.rst +++ b/docs/manual/config/discovery-behavior.rst @@ -1,11 +1,11 @@ .. include:: ../external-links.part.rst -.. index:: Discovery behaviour +.. index:: Discovery behavior -.. _discovery_behaviour: +.. _discovery_behavior: ################### -Discovery behaviour +Discovery behavior ################### .. _proxy_participants_endpoints: @@ -106,8 +106,8 @@ published by a writer: - The **key value** index is used for retaining the current state of each instance in the WHC. When a new sample overwrites the state of an instance, the key value index allows dropping -samples from the sequence number index. For transient-local behaviour (see -:ref:`DDSI-specific transient-local behaviour`), the key value index also allows retaining +samples from the sequence number index. For transient-local behavior (see +:ref:`DDSI-specific transient-local behavior`), the key value index also allows retaining the current state of each instance even when all readers have acknowledged a sample. Transient-local data always requires the key values index, and by default is also @@ -149,7 +149,7 @@ The adaptive behavior can be disabled by setting :ref:`Internal/Watermarks/WhcAdaptive ` to ``false``. -While the adaptive behaviour generally handles a variety of fast and slow writers and +While the adaptive behavior generally handles a variety of fast and slow writers and readers quite well, the introduction of a very slow reader with small buffers in an existing network that is transmitting data at high rates can cause a sudden stop while the new reader tries to recover the large amount of data stored in the writer, before diff --git a/docs/manual/config/discovery-config.rst b/docs/manual/config/discovery-config.rst index f7105c0d2b..94beaa7ed0 100644 --- a/docs/manual/config/discovery-config.rst +++ b/docs/manual/config/discovery-config.rst @@ -33,13 +33,13 @@ be configured as 'addresses to be contacted', by specifying peers in: :ref:`Discovery/Peers `. Each time an SPDP message is sent, it is sent to all of these addresses. -The default behaviour is to include each IP address several times in the set of addresses +The default behavior is to include each IP address several times in the set of addresses (for participant indices 0 through :ref:`Discovery/MaxAutoParticipantIndex `). Each IP address then has a different UDP port number, each corresponding to a participant index. Configuring several peers in this way causes a large burst of packets to be sent each time an SPDP message is sent out, and each local DDSI participant causes a burst of -its own messages. Because most participant indices are not used, this is wasteful behaviour and is +its own messages. Because most participant indices are not used, this is wasteful behavior and is only attractive when it is known that there is a single DDSI process on that node. .. todo:: clarify the above section. diff --git a/docs/manual/config/network_interfaces.rst b/docs/manual/config/network_interfaces.rst index db76e2a28f..0c84aa27c3 100644 --- a/docs/manual/config/network_interfaces.rst +++ b/docs/manual/config/network_interfaces.rst @@ -11,7 +11,7 @@ network interface). The set of enabled interfaces determines the addresses that advertises in the discovery information (see :ref:`discovery_participants_endpoints`). ----------------- -Default behaviour +Default behavior ----------------- To determine the default network interface, the eligible interfaces are ranked by quality, @@ -44,12 +44,12 @@ The default address family is IPv4. To change the address family to IPv6, set: .. note:: |var-project| does not mix IPv4 and IPv6 addressing. Therefore, all DDSI participants in - the network must use the same addressing mode. When interoperating, this behaviour is + the network must use the same addressing mode. When interoperating, this behavior is the same. That is, it looks at either IPv4 or IPv6 addresses in the advertised address information in the SPDP and SEDP discovery protocols. IPv6 link-local addresses are considered undesirable because they must be published -and received via the discovery mechanism (see :ref:`discovery_behaviour`). There is no way to +and received via the discovery mechanism (see :ref:`discovery_behavior`). There is no way to determine to which interface a received link-local address is related. If IPv6 is requested and the selected interface has a non-link-local address, |var-project| @@ -57,7 +57,7 @@ operates in a *global addressing* mode and will only consider discovered non-lin addresses. In this mode, you can select any set of interfaces for listening to multicasts. .. note:: - This behaviour is identical to that when using IPv4, as IPv4 does not have + This behavior is identical to that when using IPv4, as IPv4 does not have the formal notion of address scopes that IPv6 has. If only a link-local address is available, |var-project| runs in a *link-local addressing* mode. In this mode, it accepts any address in a discovery packet (assuming that a link-local address is valid on the selected @@ -72,7 +72,7 @@ Multiple network interfaces Multiple network interfaces can be used simultaneously by listing multiple :ref:`NetworkInterface ` elements. -The default behaviour still applies, but with extended network interfaces. For example, +The default behavior still applies, but with extended network interfaces. For example, the SPDP packets advertise multiple addresses and sends these packets out on all interfaces. If link-local addresses are used, the issue with *link-local addressing* gains importance. diff --git a/docs/manual/config/reporting-tracing.rst b/docs/manual/config/reporting-tracing.rst index 3f3f3f33d0..ecd7bd75b1 100644 --- a/docs/manual/config/reporting-tracing.rst +++ b/docs/manual/config/reporting-tracing.rst @@ -108,7 +108,7 @@ The keyword *trace* enables all categories from *fatal* to *throttle*. The *topic* and *plist* categories are useful only for particular classes of discovery failures. -The *radmin* and *whc* categories only help in analysing the detailed behaviour of those two +The *radmin* and *whc* categories only help in analysing the detailed behavior of those two components and produce significant amounts of output. The file location is set in the configuration: :ref:`OutputFile ` diff --git a/docs/manual/options.md b/docs/manual/options.md index b699354fcc..02f7326250 100644 --- a/docs/manual/options.md +++ b/docs/manual/options.md @@ -87,7 +87,7 @@ One of: lax, strict, pedantic This element sets the level of standards conformance of this instance of the Cyclone DDS Service. Stricter conformance typically means less interoperability with other implementations. Currently, three modes are defined: * pedantic: very strictly conform to the specification, ultimately for compliance testing, but currently of little value because it adheres even to what will most likely turn out to be editing errors in the DDSI standard. Arguably, as long as no errata have been published, the current text is in effect, and that is what pedantic currently does. - * strict: a relatively less strict view of the standard than does pedantic: it follows the established behaviour where the standard is obviously in error. + * strict: a relatively less strict view of the standard than does pedantic: it follows the established behavior where the standard is obviously in error. * lax: attempt to provide the smoothest possible interoperability, anticipating future revisions of elements in the standard in areas that other implementations do not adhere to, even though there is no good reason not to. @@ -976,7 +976,7 @@ The default value is: `2147483647 B` #### //CycloneDDS/Domain/Internal/MeasureHbToAckLatency Boolean -This element enables heartbeat-to-ack latency among Cyclone DDS services by prepending timestamps to Heartbeat and AckNack messages and calculating round trip times. This is non-standard behaviour. The measured latencies are quite noisy and are currently not used anywhere. +This element enables heartbeat-to-ack latency among Cyclone DDS services by prepending timestamps to Heartbeat and AckNack messages and calculating round trip times. This is non-standard behavior. The measured latencies are quite noisy and are currently not used anywhere. The default value is: `false` diff --git a/docs/manual/security/proprietary_builtin_endpoints.rst b/docs/manual/security/proprietary_builtin_endpoints.rst index 07b46c5a64..bfbe67f12d 100644 --- a/docs/manual/security/proprietary_builtin_endpoints.rst +++ b/docs/manual/security/proprietary_builtin_endpoints.rst @@ -10,7 +10,7 @@ Proprietary builtin endpoints ***************************** The DDS standard contains some builtin endpoints. A few are added by the DDS Security -specification (|url::omg.security|). The behaviour of all these builtin endpoints are +specification (|url::omg.security|). The behavior of all these builtin endpoints are specified and handled by the plugins (see :ref:`Plugins_configuration`) that implement the OMG DDS Security specification. That is, they do not have to be present in the :ref:`governance document ` or :ref:`permissions document diff --git a/docs/manual/shared_memory/loan_mechanism.rst b/docs/manual/shared_memory/loan_mechanism.rst index dc06b8702d..ee329d8fce 100644 --- a/docs/manual/shared_memory/loan_mechanism.rst +++ b/docs/manual/shared_memory/loan_mechanism.rst @@ -34,7 +34,7 @@ through :c:func:`dds_write()`. .. note:: When a loaned sample has been returned to the shared memory pool (by invoking - :c:func:`dds_write()`), dereferencing the pointer is undefined behaviour. + :c:func:`dds_write()`), dereferencing the pointer is undefined behavior. If |var-project-short| is configured to use shared memory, but it is not possible to use the loan mechanism, a :c:func:`dds_write()` still writes to the shared memory diff --git a/etc/cyclonedds.rnc b/etc/cyclonedds.rnc index 46a989458f..d4023ac4ac 100644 --- a/etc/cyclonedds.rnc +++ b/etc/cyclonedds.rnc @@ -58,7 +58,7 @@ CycloneDDS configuration""" ] ] & [ a:documentation [ xml:lang="en" """

This element sets the level of standards conformance of this instance of the Cyclone DDS Service. Stricter conformance typically means less interoperability with other implementations. Currently, three modes are defined:

  • pedantic: very strictly conform to the specification, ultimately for compliance testing, but currently of little value because it adheres even to what will most likely turn out to be editing errors in the DDSI standard. Arguably, as long as no errata have been published, the current text is in effect, and that is what pedantic currently does.
    • -
  • strict: a relatively less strict view of the standard than does pedantic: it follows the established behaviour where the standard is obviously in error.
    • +
  • strict: a relatively less strict view of the standard than does pedantic: it follows the established behavior where the standard is obviously in error.
  • lax: attempt to provide the smoothest possible interoperability, anticipating future revisions of elements in the standard in areas that other implementations do not adhere to, even though there is no good reason not to.

The default value is: lax

""" ] ] element StandardsConformance { @@ -691,7 +691,7 @@ CycloneDDS configuration""" ] ] memsize }? & [ a:documentation [ xml:lang="en" """ -

This element enables heartbeat-to-ack latency among Cyclone DDS services by prepending timestamps to Heartbeat and AckNack messages and calculating round trip times. This is non-standard behaviour. The measured latencies are quite noisy and are currently not used anywhere.

+

This element enables heartbeat-to-ack latency among Cyclone DDS services by prepending timestamps to Heartbeat and AckNack messages and calculating round trip times. This is non-standard behavior. The measured latencies are quite noisy and are currently not used anywhere.

The default value is: false

""" ] ] element MeasureHbToAckLatency { xsd:boolean diff --git a/etc/cyclonedds.xsd b/etc/cyclonedds.xsd index e8106fa783..9569810b68 100644 --- a/etc/cyclonedds.xsd +++ b/etc/cyclonedds.xsd @@ -115,7 +115,7 @@ CycloneDDS configuration <p>This element sets the level of standards conformance of this instance of the Cyclone DDS Service. Stricter conformance typically means less interoperability with other implementations. Currently, three modes are defined:</p> <ul><li><i>pedantic</i>: very strictly conform to the specification, ultimately for compliance testing, but currently of little value because it adheres even to what will most likely turn out to be editing errors in the DDSI standard. Arguably, as long as no errata have been published, the current text is in effect, and that is what pedantic currently does.</li> -<li><i>strict</i>: a relatively less strict view of the standard than does pedantic: it follows the established behaviour where the standard is obviously in error.</li> +<li><i>strict</i>: a relatively less strict view of the standard than does pedantic: it follows the established behavior where the standard is obviously in error.</li> <li><i>lax</i>: attempt to provide the smoothest possible interoperability, anticipating future revisions of elements in the standard in areas that other implementations do not adhere to, even though there is no good reason not to.</li></ul> <p>The default value is: <code>lax</code></p> @@ -1027,7 +1027,7 @@ CycloneDDS configuration -<p>This element enables heartbeat-to-ack latency among Cyclone DDS services by prepending timestamps to Heartbeat and AckNack messages and calculating round trip times. This is non-standard behaviour. The measured latencies are quite noisy and are currently not used anywhere.</p> +<p>This element enables heartbeat-to-ack latency among Cyclone DDS services by prepending timestamps to Heartbeat and AckNack messages and calculating round trip times. This is non-standard behavior. The measured latencies are quite noisy and are currently not used anywhere.</p> <p>The default value is: <code>false</code></p> diff --git a/examples/dynsub/dynsub.c b/examples/dynsub/dynsub.c index 10fb752d7b..c3b81f35c7 100644 --- a/examples/dynsub/dynsub.c +++ b/examples/dynsub/dynsub.c @@ -85,7 +85,7 @@ static dds_return_t get_topic_and_typeobj (const char *topic_name, dds_duration_ // topic is discovery is enabled and/or if the topic has a durability kind of of transient or persistent: // - using a different topic QoS might result in an incompatible QoS notification if topic discovery is // enabled (everything would still work). - // - transient/persistent data behaviour is defined in terms of the topic QoS actually really matters + // - transient/persistent data behavior is defined in terms of the topic QoS actually really matters // // So we try to use dds_find_topic, and if that fails, try to go the other route using the writer's QoS // as an approximation of the topic QoS. diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md index 8a39c2dc4c..3b8cba97f3 100644 --- a/ports/zephyr/README.md +++ b/ports/zephyr/README.md @@ -31,7 +31,7 @@ $ west build -b qemu_x86 . -- -DOVERLAY_CONFIG=overlay-e1000.conf -DBUILD_ROUNDT Command-line parameters for the example can be modified in `src/rountrip_main.c` -The CycloneDDS configuration in `config.xml` is automatically converted to a char array and available as environment variable to support the default behaviour of retrieving config from `CYCLONEDDS_URI`. +The CycloneDDS configuration in `config.xml` is automatically converted to a char array and available as environment variable to support the default behavior of retrieving config from `CYCLONEDDS_URI`. Alternatively, [dds_create_domain_with_rawconfig](https://cyclonedds.io/docs/cyclonedds/latest/api/domain.html?#c.dds_create_domain_with_rawconfig) can be used without XML configuration data. ## Zephyr versions diff --git a/src/core/ddsc/include/dds/dds.h b/src/core/ddsc/include/dds/dds.h index 2fc8d2bc3e..bb276a8684 100644 --- a/src/core/ddsc/include/dds/dds.h +++ b/src/core/ddsc/include/dds/dds.h @@ -922,8 +922,8 @@ dds_get_listener(dds_entity_t entity, dds_listener_t * listener); * In case a related callback within the Listener is not set, the Listener of * the Parent entity is called recursively, until a Listener with the appropriate * callback set has been found and called. This allows the application to set - * (for instance) a default behaviour in the Listener of the containing Publisher - * and a DataWriter specific behaviour when needed. In case the callback is not + * (for instance) a default behavior in the Listener of the containing Publisher + * and a DataWriter specific behavior when needed. In case the callback is not * set in the Publishers' Listener either, the communication status will be * propagated to the Listener of the DomainParticipant of the containing * DomainParticipant. In case the callback is not set in the DomainParticipants' @@ -987,7 +987,7 @@ dds_set_listener(dds_entity_t entity, const dds_listener_t * listener); * domain entity is created using a configuration taken from the CYCLONEDDS_URI * environment variable. * - * The domain id may be specified as DDS_DOMAIN_DEFAULT, in which case the behaviour + * The domain id may be specified as DDS_DOMAIN_DEFAULT, in which case the behavior * depends on whether some domain entity already exists or not. If there is at least one, * the one with the lowest id will be used. If there are none, one is created with the * domain id taken from the first domain id specified in the configuration file (i.e., diff --git a/src/core/ddsc/include/dds/ddsc/dds_psmx.h b/src/core/ddsc/include/dds/ddsc/dds_psmx.h index 533f79cf90..3fd1d81298 100644 --- a/src/core/ddsc/include/dds/ddsc/dds_psmx.h +++ b/src/core/ddsc/include/dds/ddsc/dds_psmx.h @@ -115,7 +115,7 @@ * the "INSTANCE_NAME" key in the configuration string using @ref * dds_psmx_get_config_option_value will return the PSMX Instance Name as its value. * - * The behaviour of the constructor function is dependent on the interface version it + * The behavior of the constructor function is dependent on the interface version it * implements: * * - For version 0, it is responsible for setting: @@ -141,7 +141,7 @@ * "create_topic_type" nor "delete_psmx" is touched by Cyclone DDS if the interface is * version 0, allowing for binary backwards compatibility. * - * For creation and deletion of PSMX topics and endpoints, the expected behaviour of the + * For creation and deletion of PSMX topics and endpoints, the expected behavior of the * plugin for version 0 and version 1 is described in the documentation sections of the * create functions: * @@ -402,7 +402,7 @@ typedef struct dds_psmx_ops { * @ingroup psmx * * The PSMX Plugin is expected to represent a PSMX Endpoint using an extended version of the - * `dds_psmx_endpoint` structure. The behaviour of the plugin is dependent on the interface + * `dds_psmx_endpoint` structure. The behavior of the plugin is dependent on the interface * version it implements: * * - For version 0, it is responsible for setting: diff --git a/src/core/ddsc/src/dds_psmx.c b/src/core/ddsc/src/dds_psmx.c index f97c687e3e..57bb2fc31c 100644 --- a/src/core/ddsc/src/dds_psmx.c +++ b/src/core/ddsc/src/dds_psmx.c @@ -64,7 +64,7 @@ static bool get_check_interface_version (enum dds_psmx_interface_version *ifver, // on all supported platforms sizeof(void(*)()) == sizeof(void*) and so the offset // of create_topic_with_type matches the offset of instance_name // - // This check probably invokes undefined behaviour ... + // This check probably invokes undefined behavior ... DDSRT_STATIC_ASSERT( offsetof (struct dds_psmx, ops) == 0 && offsetof (struct dds_psmx_ops, create_topic_with_type) == offsetof (struct dds_psmx_v0, instance_name)); diff --git a/src/core/ddsc/src/dds_rhc_default.c b/src/core/ddsc/src/dds_rhc_default.c index 7c012fc43f..9a76a69f76 100644 --- a/src/core/ddsc/src/dds_rhc_default.c +++ b/src/core/ddsc/src/dds_rhc_default.c @@ -1139,7 +1139,7 @@ static void dds_rhc_register (struct dds_rhc_default *rhc, struct rhc_instance * (or re-registered) writer, but we don't want inst_accepts_sample to be affected (it was "too old" in the ordering). wr_iid_islive determines whether wr_iid is meaningful, so setting wr_iid while - leaving wr_iid_islive false gets us the desired behaviour. */ + leaving wr_iid_islive false gets us the desired behavior. */ inst->wr_iid = wr_iid; if (sample_accepted) inst->wr_iid_islive = 1; diff --git a/src/core/ddsc/src/dds_subscriber.c b/src/core/ddsc/src/dds_subscriber.c index 452191f6a3..86b0aba51f 100644 --- a/src/core/ddsc/src/dds_subscriber.c +++ b/src/core/ddsc/src/dds_subscriber.c @@ -113,7 +113,7 @@ bool dds_subscriber_compute_data_on_readers_locked (dds_subscriber *sub) // sub->m_entity.m_mutex must be locked ddsrt_avl_iter_t it; - // Returning true when some reader has DATA_AVAILABLE set isn't the correct behaviour + // Returning true when some reader has DATA_AVAILABLE set isn't the correct behavior // because it doesn't reset the DATA_ON_READERS state on the first read/take on one of // the subscriber's readers. It seems highly unlikely to be a problem in practice: // diff --git a/src/core/ddsc/src/dds_topic.c b/src/core/ddsc/src/dds_topic.c index 3c095554af..338af1d64d 100644 --- a/src/core/ddsc/src/dds_topic.c +++ b/src/core/ddsc/src/dds_topic.c @@ -518,7 +518,7 @@ dds_entity_t dds_create_topic_impl ( * * Leaving the topic QoS sparse means a default-default topic QoS of * best-effort will do "the right thing" and let a writer still default to - * reliable ... (and keep behaviour unchanged) */ + * reliable ... (and keep behavior unchanged) */ if ((rc = dds_ensure_valid_data_representation (new_qos, (*sertype)->allowed_data_representation, (*sertype)->data_type_props, DDS_KIND_TOPIC)) != DDS_RETCODE_OK) goto error; diff --git a/src/core/ddsc/tests/destorder.c b/src/core/ddsc/tests/destorder.c index 2e5247c629..04df13262e 100644 --- a/src/core/ddsc/tests/destorder.c +++ b/src/core/ddsc/tests/destorder.c @@ -70,7 +70,7 @@ CU_Test (ddsc_destorder, by_source_history) // cosequences thereof and the DCPS spec is essentially silent on the topic anyway. The // DDSI says it concerns the full history, but then only considers a single writer and // so almost by definition only makes some subtly wrong suggestions about the system - // behaviour. + // behavior. // // In my humble view of things, the only sane approach is to consider DDS as a data // space that writers update and where the writer history cache settings affect which diff --git a/src/core/ddsc/tests/instance_handle.c b/src/core/ddsc/tests/instance_handle.c index 91adc559cf..644936bbc3 100644 --- a/src/core/ddsc/tests/instance_handle.c +++ b/src/core/ddsc/tests/instance_handle.c @@ -70,7 +70,7 @@ CU_Test (ddsc_instance_handle, a, .init = instance_handle_init, .fini = instance The point behind this model is that it allows one to use an instance handle obtained on one reader and use it to read the matching instance in another reader. So that bit of - behaviour needs to be checked. + behavior needs to be checked. I'm not sure whether the "serialised" part should be included in the test, I don't think that's something that should be guaranteed in the API. However, it is worth verifying that diff --git a/src/core/ddsc/tests/listener.c b/src/core/ddsc/tests/listener.c index 32d46db9c3..7996170942 100644 --- a/src/core/ddsc/tests/listener.c +++ b/src/core/ddsc/tests/listener.c @@ -301,7 +301,7 @@ CU_Test (ddsc_listener, matched) // // Waiting for an acknowledgement therefore makes sense (and in the other runs, a 0.3s sleep // kind-a solves the problem of not known exactly how many events there will be: it means at - // least one event has been observed, and behaviour of Cyclone in a simple case like this means + // least one event has been observed, and behavior of Cyclone in a simple case like this means // the full retransmit request will be replied to with a single packet, and that therefore the // likelihood of the retransmitted data arriving within a window of 0.3s is very high. (Where // 0.3s is an attempt to pick a duration on the long side of what's needed and short enough not diff --git a/src/core/ddsc/tests/nwpart.c b/src/core/ddsc/tests/nwpart.c index 0726665ee0..774cbb55d6 100644 --- a/src/core/ddsc/tests/nwpart.c +++ b/src/core/ddsc/tests/nwpart.c @@ -450,7 +450,7 @@ CU_TheoryDataPoints(ddsc_nwpart, selected_addrs) = { (const char *[]){ // other host, mc in as_default: no, SEDP 2 uc, 0 mc "udp/193.168.0.2:31416@1001", NULL }, // - // Expected behaviour: if SEDP gives: + // Expected behavior: if SEDP gives: // - no addresses, use ppant uni- and multicast addresses // - only multicast, use those for multicast and use ppant address for unicast // - only unicast, use only those (i.e., disable multicast for this reader, cos diff --git a/src/core/ddsc/tests/waitset.c b/src/core/ddsc/tests/waitset.c index 5f7dc6bb58..b294fd2469 100644 --- a/src/core/ddsc/tests/waitset.c +++ b/src/core/ddsc/tests/waitset.c @@ -896,8 +896,8 @@ CU_Theory((bool use_nop_listener), ddsc_waitset_triggering, after_listener, .ini ret = dds_take_status (reader, &status, DDS_DATA_AVAILABLE_STATUS); CU_ASSERT_EQ_FATAL (ret, 0); - // If a nop listener, expected observed behaviour to be: first listener, then waitset - // which maps to 7; else, expected observed behaviour is just listener and no waitset + // If a nop listener, expected observed behavior to be: first listener, then waitset + // which maps to 7; else, expected observed behavior is just listener and no waitset // trigger // // There is no guarantee that the initial evaluation of the conditions by wait() won't diff --git a/src/core/ddsi/include/dds/ddsi/ddsi_sertype.h b/src/core/ddsi/include/dds/ddsi/ddsi_sertype.h index 3493d53443..a5e82f42db 100644 --- a/src/core/ddsi/include/dds/ddsi/ddsi_sertype.h +++ b/src/core/ddsi/include/dds/ddsi/ddsi_sertype.h @@ -61,7 +61,7 @@ struct ddsi_sertype { /* The old and the new happen to have the same memory layout on a 64-bit machine and so any user that memset's the ddsi_sertype to 0 before filling out the - required fields gets unchanged behaviour. 32-bit machines have a different + required fields gets unchanged behavior. 32-bit machines have a different layout and no such luck. There are presumably very few users of this type outside Cyclone DDS itself, diff --git a/src/core/ddsi/src/ddsi__cfgelems.h b/src/core/ddsi/src/ddsi__cfgelems.h index 5e8bb237c6..25bc07bc2a 100644 --- a/src/core/ddsi/src/ddsi__cfgelems.h +++ b/src/core/ddsi/src/ddsi__cfgelems.h @@ -1064,7 +1064,7 @@ static struct cfgelem compatibility_cfgelems[] = { "have been published, the current text is in effect, and " "that is what pedantic currently does.\n" "
  • strict: a relatively less strict view of the standard than " - "does pedantic: it follows the established behaviour where the " + "does pedantic: it follows the established behavior where the " "standard is obviously in error.
    • \n" "
  • lax: attempt to provide the smoothest possible " "interoperability, anticipating future revisions of elements in the " @@ -1220,7 +1220,7 @@ static struct cfgelem control_topic_cfgattrs[] = { FUNCTIONS(0, uf_boolean, 0, pf_boolean), DESCRIPTION( "

    This element controls whether Cyclone DDS should dynamically " - "create a topic to control Cyclone DDS's behaviour.

    ")), + "create a topic to control Cyclone DDS's behavior.

    ")), STRING(DEPRECATED("InitialReset"), NULL, 1, "inf", MEMBER(initial_deaf_mute_reset), FUNCTIONS(0, uf_duration_inf, 0, pf_duration), @@ -1237,15 +1237,15 @@ static struct cfgelem control_topic_cfgelems[] = { FUNCTIONS(0, uf_deaf_mute, 0, pf_boolean), DESCRIPTION( "

    This element controls whether Cyclone DDS defaults to deaf mode or to " - "normal mode. This controls the initial behaviour and what " - "behaviour it auto-reverts to.

    ")), + "normal mode. This controls the initial behavior and what " + "behavior it auto-reverts to.

    ")), BOOL(DEPRECATED("Mute"), NULL, 1, "false", MEMBER(initial_mute), FUNCTIONS(0, uf_deaf_mute, 0, pf_boolean), DESCRIPTION( "

    This element controls whether Cyclone DDS defaults to mute mode or to " - "normal mode. This controls the initial behaviour and what " - "behaviour it auto-reverts to.

    ")), + "normal mode. This controls the initial behavior and what " + "behavior it auto-reverts to.

    ")), END_MARKER }; @@ -1427,7 +1427,7 @@ static struct cfgelem internal_cfgelems[] = { DESCRIPTION( "

    This element enables heartbeat-to-ack latency among Cyclone DDS " "services by prepending timestamps to Heartbeat and AckNack messages " - "and calculating round trip times. This is non-standard behaviour. The " + "and calculating round trip times. This is non-standard behavior. The " "measured latencies are quite noisy and are currently not used " "anywhere.

    ")), INT("SynchronousDeliveryPriorityThreshold", NULL, 1, "0", diff --git a/src/core/ddsi/src/ddsi__sockwaitset.h b/src/core/ddsi/src/ddsi__sockwaitset.h index 1acc313d39..4a9d1f8caa 100644 --- a/src/core/ddsi/src/ddsi__sockwaitset.h +++ b/src/core/ddsi/src/ddsi__sockwaitset.h @@ -69,7 +69,7 @@ void ddsi_sock_waitset_trigger (struct ddsi_sock_waitset * ws); * * A connection may be associated with only one waitset at any time, and * may be added to the waitset only once. Failure to comply with this - * restriction results in undefined behaviour. + * restriction results in undefined behavior. * * Closing a connection associated with a waitset is handled gracefully: * no operations will signal errors because of it. @@ -85,7 +85,7 @@ int ddsi_sock_waitset_add (struct ddsi_sock_waitset * ws, struct ddsi_tran_conn * @component socket_waitset * * Index 0 corresponds to the first connection added to the waitset, index 1 to the - * second, etc. Behaviour is undefined when called after a successful wait but before + * second, etc. behavior is undefined when called after a successful wait but before * all events had been enumerated. * * @param ws The socket waitset diff --git a/src/core/ddsi/src/ddsi__transmit.h b/src/core/ddsi/src/ddsi__transmit.h index 279bddc287..839b0e03cf 100644 --- a/src/core/ddsi/src/ddsi__transmit.h +++ b/src/core/ddsi/src/ddsi__transmit.h @@ -31,7 +31,7 @@ struct ddsi_thread_state; recentish; serdata is unref'd. If xp == NULL, data is queued, else packed. - "nogc": no GC may occur, so it may not block to throttle the writer if the high water mark of the WHC is reached, which implies true KEEP_LAST behaviour. This is true for all the DDSI built-in writers. + "nogc": no GC may occur, so it may not block to throttle the writer if the high water mark of the WHC is reached, which implies true KEEP_LAST behavior. This is true for all the DDSI built-in writers. "gc": GC may occur, which means the writer history and watermarks can be anything. This must be used for all application data. */ diff --git a/src/core/ddsi/src/ddsi_config.c b/src/core/ddsi/src/ddsi_config.c index 30c2e01a09..cdbeb23a69 100644 --- a/src/core/ddsi/src/ddsi_config.c +++ b/src/core/ddsi/src/ddsi_config.c @@ -885,7 +885,7 @@ static enum update_result uf_int64_unit (struct ddsi_cfgst *cfgst, int64_t *elem double dmult = (double) mult; assert (dmult > 0); // avoid needing something llround(), make it positive, scale it and - // add 0.5 to get decent rounding behaviour + // add 0.5 to get decent rounding behavior const double v_dbl_abs_scaled = ((v_dbl >= 0) ? 1.0 : -1.0) * v_dbl * dmult + 0.5; // - C99, therefore 2's complement by 7.18.1.1 // - INT64_MIN = 0x8000...0 is exactly representable diff --git a/src/core/ddsi/src/ddsi_discovery_endpoint.c b/src/core/ddsi/src/ddsi_discovery_endpoint.c index 445744d0f2..267f8d63bf 100644 --- a/src/core/ddsi/src/ddsi_discovery_endpoint.c +++ b/src/core/ddsi/src/ddsi_discovery_endpoint.c @@ -488,7 +488,7 @@ void ddsi_handle_sedp_alive_endpoint (const struct ddsi_receiver_state *rst, dds GVLOGDISC (" NEW"); } - // allow, force this way: original behaviour; allow_srcloc = true means SEDP quite quickly ends up using it + // allow, force this way: original behavior; allow_srcloc = true means SEDP quite quickly ends up using it // in favour of inheriting addresses from participant const bool allow_srcloc = gv->config.tcp_use_peeraddr_for_unicast && !ddsi_is_unspec_locator (&rst->pktinfo.src); const bool force_srcloc = allow_srcloc; diff --git a/src/core/ddsi/src/ddsi_init.c b/src/core/ddsi/src/ddsi_init.c index c3c86c7682..4551353d27 100644 --- a/src/core/ddsi/src/ddsi_init.c +++ b/src/core/ddsi/src/ddsi_init.c @@ -1204,7 +1204,7 @@ int ddsi_init (struct ddsi_domaingv *gv, struct ddsi_psmx_instance_locators *psm if (!gv->m_factory->m_connless) { - // equivalent to all behaviour where global setting was simply forced to false + // equivalent to all behavior where global setting was simply forced to false // FIXME: it'd perhaps be nicer to give an error if any of these is explicitly set to allow multicast when we cannot do that gv->config.allowMulticast = DDSI_AMC_FALSE; for (int i = 0; i < gv->n_interfaces; i++) diff --git a/src/core/ddsi/src/ddsi_receive.c b/src/core/ddsi/src/ddsi_receive.c index 0ab7549638..f9503ff063 100644 --- a/src/core/ddsi/src/ddsi_receive.c +++ b/src/core/ddsi/src/ddsi_receive.c @@ -626,7 +626,7 @@ static int accept_ack_or_hb_w_timeout (ddsi_count_t new_count, ddsi_count_t *pre The type is defined in the spec as signed but without limiting them to, e.g., positive numbers. Instead of implementing them as spec'd, we implement it as unsigned to avoid integer overflow (and - the consequence undefined behaviour). Serial number arithmetic + the consequence undefined behavior). Serial number arithmetic deals with the wrap-around after 2**31-1. Cyclone pre-emptive heartbeats have "count" bitmap_base = 1, NACK @@ -929,7 +929,7 @@ static int handle_AckNack (struct ddsi_receiver_state *rst, ddsrt_etime_t tnow, /* Second, the NACK bits (literally, that is). To do so, attempt to classify the AckNack for reverse-engineered compatibility with - RTI's invalid acks and sometimes slightly odd behaviour. */ + RTI's invalid acks and sometimes slightly odd behavior. */ numbits = msg->readerSNState.numbits; msgs_sent = 0; msgs_lost = 0; diff --git a/src/core/ddsi/src/ddsi_threadmon.c b/src/core/ddsi/src/ddsi_threadmon.c index 71e0d68540..88e50cdcc4 100644 --- a/src/core/ddsi/src/ddsi_threadmon.c +++ b/src/core/ddsi/src/ddsi_threadmon.c @@ -68,7 +68,7 @@ static void update_av_ary (struct ddsi_threadmon *sl, uint32_t nthreads) av_ary[i].alive = true; av_ary[i].vt = 0; } - // passing a null pointer to memcpy is undefined behaviour, even when + // passing a null pointer to memcpy is undefined behavior, even when // copying 0 bytes if (sl->av_ary) memcpy (&av_ary[i], sl->av_ary, sl->av_ary_size * sizeof (*av_ary)); diff --git a/src/core/xtests/rhc_torture/rhc_torture.c b/src/core/xtests/rhc_torture/rhc_torture.c index 72abe34562..fbfdf6b0a8 100644 --- a/src/core/xtests/rhc_torture/rhc_torture.c +++ b/src/core/xtests/rhc_torture/rhc_torture.c @@ -82,7 +82,7 @@ static char *print_tstamp (char *buf, size_t sz, dds_time_t t) static int64_t dds_time_uniq (void) { - /* behaviour depends on time stamps being strictly monotonically increasing, but there + /* behavior depends on time stamps being strictly monotonically increasing, but there is no way of knowing whether dds_time provides sufficient resolution, so fake it */ int64_t t = dds_time (); if (t > last_dds_time) diff --git a/src/ddsrt/CMakeLists.txt b/src/ddsrt/CMakeLists.txt index f37eb6588e..e303981562 100644 --- a/src/ddsrt/CMakeLists.txt +++ b/src/ddsrt/CMakeLists.txt @@ -130,7 +130,7 @@ if(WITH_LWIP) else() if(WIN32) if(POLICY CMP0075) - # suppress warnings concerning a change in behaviour of check_include_files in + # suppress warnings concerning a change in behavior of check_include_files in # combination with CMAKE_REQUIRED_LIBRARIES cmake_policy(SET CMP0075 NEW) endif() diff --git a/src/ddsrt/include/dds/ddsrt/ifaddrs.h b/src/ddsrt/include/dds/ddsrt/ifaddrs.h index 50b73468ee..aca098eab8 100644 --- a/src/ddsrt/include/dds/ddsrt/ifaddrs.h +++ b/src/ddsrt/include/dds/ddsrt/ifaddrs.h @@ -78,7 +78,7 @@ ddsrt_freeifaddrs( * Copies the first 6 bytes of the mac address into the buffer 'mac_addr'. * Specifying an unknown interface results in DDS_RETCODE_ERROR. * If the interface exists and doesn't actually have a MAC address, like a loopback interface, - * the behaviour is platform-dependent. (On Linux, you get all 0, but that may not be universally true.) + * the behavior is platform-dependent. (On Linux, you get all 0, but that may not be universally true.) * * @param[in] interface_name the name of the interface * @param[out] mac_addr a buffer to copy the mac address into diff --git a/src/ddsrt/src/retcode.c b/src/ddsrt/src/retcode.c index f39c90ac4a..1ac21b7840 100644 --- a/src/ddsrt/src/retcode.c +++ b/src/ddsrt/src/retcode.c @@ -50,7 +50,7 @@ const char *dds_strretcode (dds_return_t ret) /* Retcodes used to be positive, but return values from the API would be a negative and so there are/were/may be places outside the core library where dds_strretcode is called with a -N for N a API return value, so ... play it safe and use the - magnitude. Specially handle INT32_MIN to avoid undefined behaviour on integer + magnitude. Specially handle INT32_MIN to avoid undefined behavior on integer overflow. */ if (ret == INT32_MIN) return xretcodes[0]; diff --git a/src/ddsrt/src/time/windows/time.c b/src/ddsrt/src/time/windows/time.c index f52efd206a..c0f794e891 100644 --- a/src/ddsrt/src/time/windows/time.c +++ b/src/ddsrt/src/time/windows/time.c @@ -133,7 +133,7 @@ ddsrt_etime_t ddsrt_time_elapsed(void) * around available (comparing the progress with the progress made by * GetTickCount), but for now we live with a risk of a forward jump on buggy * hardware. Since Microsoft does maintain a list of hardware which exhibits - * the behaviour, it is possible to only have the workaround in place only + * the behavior, it is possible to only have the workaround in place only * on the faulty hardware (see KB274323 for a list and more info). * * TODO: When the API is extended to support retrieval of clock-properties, diff --git a/src/idl/src/annotation.c b/src/idl/src/annotation.c index 7d3b82a268..6ff07ae8cf 100644 --- a/src/idl/src/annotation.c +++ b/src/idl/src/annotation.c @@ -1325,7 +1325,7 @@ static const idl_builtin_annotation_t annotations[] = { "TryConstructFailAction value default USE_DEFAULT;\n" "};", .summary = - "

    This annotation allows setting the (fallback)behaviour when constructing fails.

    ", + "

    This annotation allows setting the (fallback)behavior when constructing fails.

    ", .callback = annotate_try_construct }, { .syntax = "@annotation ignore_literal_names { boolean value default TRUE; };", .summary = diff --git a/src/security/core/include/dds/security/core/dds_security_fsm.h b/src/security/core/include/dds/security/core/dds_security_fsm.h index 7233a1c9b4..f282c556f6 100644 --- a/src/security/core/include/dds/security/core/dds_security_fsm.h +++ b/src/security/core/include/dds/security/core/dds_security_fsm.h @@ -52,7 +52,7 @@ typedef struct dds_security_fsm_state { * Template for user-defined debug methods. * It'll be called for every dispatched event, regardless of which state it * is in (which is also provided). - * This can be used to get extra information about the behaviour of the + * This can be used to get extra information about the behavior of the * state machine. * It is not allowed to call any fsm API functions from within this * debug callback. From 5ceb4552675c24d648f3dd5c7d28d44f193e67fe Mon Sep 17 00:00:00 2001 From: poetinger Date: Wed, 23 Jul 2025 11:39:31 +0200 Subject: [PATCH 3/5] serialisation -> serialization --- docs/manual/config/data-path-config.rst | 2 +- docs/manual/config/thread-config.rst | 2 +- src/core/ddsi/include/dds/ddsi/ddsi_serdata.h | 2 +- src/core/ddsi/src/ddsi__plist_context_kind.h | 4 ++-- src/core/ddsi/src/ddsi_deliver_locally.c | 2 +- src/core/ddsi/src/ddsi_plist.c | 4 ++-- src/core/ddsi/tests/plist_leasedur.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/manual/config/data-path-config.rst b/docs/manual/config/data-path-config.rst index 6261cc670f..0fd4abb5a7 100644 --- a/docs/manual/config/data-path-config.rst +++ b/docs/manual/config/data-path-config.rst @@ -141,7 +141,7 @@ Receiving of data is split into multiple threads: - Liveliness assertions - One or more delivery threads dedicated to the handling of application data: - - deserialisation + - deserialization - delivery to the DCPS data reader caches Fragmented data first enters the defragmentation stage, which is per proxy writer. The diff --git a/docs/manual/config/thread-config.rst b/docs/manual/config/thread-config.rst index 39e7aa73d0..1699891c82 100644 --- a/docs/manual/config/thread-config.rst +++ b/docs/manual/config/thread-config.rst @@ -57,7 +57,7 @@ For each defined channel: :widths: 20 80 * - ``dq.channel-name`` - - Deserialisation and asynchronous delivery of all user data. + - Deserialization and asynchronous delivery of all user data. * - ``tev.channel-name`` - Channel-specific "timed-event" handling transmission of control messages for reliable writers and Readers and re-transmission of data on request. diff --git a/src/core/ddsi/include/dds/ddsi/ddsi_serdata.h b/src/core/ddsi/include/dds/ddsi/ddsi_serdata.h index df6a669dcd..c5887415ab 100644 --- a/src/core/ddsi/include/dds/ddsi/ddsi_serdata.h +++ b/src/core/ddsi/include/dds/ddsi/ddsi_serdata.h @@ -115,7 +115,7 @@ typedef void (*ddsi_serdata_to_ser_unref_t) (struct ddsi_serdata *d, const ddsrt /* Turn serdata into an application sample (or just the key values if only key values are available); return false on error (typically out-of-memory, but if from_ser doesn't do any - validation it might be a deserialisation error, too). + validation it might be a deserialization error, too). If (bufptr != 0), then *bufptr .. buflim is space to be used from *bufptr up (with minimal padding) for any data in the sample that needs to be allocated (e.g., strings, sequences); diff --git a/src/core/ddsi/src/ddsi__plist_context_kind.h b/src/core/ddsi/src/ddsi__plist_context_kind.h index 78e45c6f89..6c1dce9b28 100644 --- a/src/core/ddsi/src/ddsi__plist_context_kind.h +++ b/src/core/ddsi/src/ddsi__plist_context_kind.h @@ -23,13 +23,13 @@ transformation is needed, and one where a liveliness is simply that. One approach would be to add (yet another) boolean boolean parameter "transform - liveliness to participant lease duration" to the (de)serialisation of parameter lists, + liveliness to participant lease duration" to the (de)serialization of parameter lists, but this would not help with the readability of the code. Using an enumerated type for the two helps, but naming it becomes problematic and raises the question whether it will always be only the liveliness QoS that needs special treatment. Another approach uses a "context" argument and leaves the way these are interpreted to - the (de)serialisation code. That way the call sites become straightforward and all + the (de)serialization code. That way the call sites become straightforward and all details on what it means to handle these parameter lists in a particular context becomes local to the (de)serialiser. */ enum ddsi_plist_context_kind { diff --git a/src/core/ddsi/src/ddsi_deliver_locally.c b/src/core/ddsi/src/ddsi_deliver_locally.c index b8e4d4a194..88362d4e90 100644 --- a/src/core/ddsi/src/ddsi_deliver_locally.c +++ b/src/core/ddsi/src/ddsi_deliver_locally.c @@ -195,7 +195,7 @@ static dds_return_t deliver_locally_slowpath (struct ddsi_domaingv *gv, struct d payload = ops->makesample (&tk, gv, rd->type, vsourceinfo); type_sample_cache_store (&tsc, rd->type, payload, tk); } - /* check payload to allow for deserialisation failures */ + /* check payload to allow for deserialization failures */ if (payload) { EETRACE (source_entity, "%s "PGUIDFMT, trace_is_first ? " =>" : "", PGUID (rd->e.guid)); diff --git a/src/core/ddsi/src/ddsi_plist.c b/src/core/ddsi/src/ddsi_plist.c index cf51fdbc2d..7a2f6eea78 100644 --- a/src/core/ddsi/src/ddsi_plist.c +++ b/src/core/ddsi/src/ddsi_plist.c @@ -890,7 +890,7 @@ static bool print_type_information (char * restrict *buf, size_t * restrict bufs // gcc with the -fshort-enums option enabled, it is a char. That happens quite a // bit on embedded platforms, judging by a few tickets. // -// This enum definition is used only in the serialisation/deserialisation code to +// This enum definition is used only in the serialization/deserialization code to // stand in for the actual type. enum xe3_prototype { XE3_PROTO_0, XE3_PROTO_1, XE3_PROTO_2, XE3_PROTO_3 }; @@ -1270,7 +1270,7 @@ void ddsi_plist_ser_generic_size_embeddable (size_t * restrict dstoff, const voi case XbCOND: SIMPLE1 (XbCOND, unsigned char); break; case XG: SIMPLE1 (XG, ddsi_guid_t); break; case XK: SIMPLE1 (XK, ddsi_keyhash_t); break; - case XbPROP: /* "propagate" boolean: when 'false'; no serialisation; no size; force early out */ + case XbPROP: /* "propagate" boolean: when 'false'; no serialization; no size; force early out */ COMPLEX (XbPROP, unsigned char, if (! *x) return); break; case XQ: COMPLEX (XQ, ddsi_octetseq_t, { const size_t elem_size = ser_generic_srcsize (desc + 1); diff --git a/src/core/ddsi/tests/plist_leasedur.c b/src/core/ddsi/tests/plist_leasedur.c index 9667729f03..5ae4e68c1b 100644 --- a/src/core/ddsi/tests/plist_leasedur.c +++ b/src/core/ddsi/tests/plist_leasedur.c @@ -31,7 +31,7 @@ /* We already used "liveliness" for participant lease durations in the API (including the built-in topics), and now dropped the "participant lease - duration" everywhere *except* in the (de)serialisation code. + duration" everywhere *except* in the (de)serialization code. That means the discovery (de)serializer is now aware of whether it is processing SPDP or SEDP data, and now needs to ignore DDSI_PI_LIVELINESS From f8e061598aae6764d534a945efe73f82123d23c7 Mon Sep 17 00:00:00 2001 From: poetinger Date: Mon, 28 Jul 2025 15:07:43 +0200 Subject: [PATCH 4/5] update doc hashes --- docs/manual/config/config_file_reference.rst | 34 +- docs/manual/options.md | 6 +- etc/cyclonedds.rnc | 22 +- etc/cyclonedds.xsd | 497 ++++++++++--------- src/core/ddsi/defconfig.c | 6 +- 5 files changed, 307 insertions(+), 258 deletions(-) diff --git a/docs/manual/config/config_file_reference.rst b/docs/manual/config/config_file_reference.rst index 1c8ff99820..c1bf54d5a1 100644 --- a/docs/manual/config/config_file_reference.rst +++ b/docs/manual/config/config_file_reference.rst @@ -302,7 +302,7 @@ This attribute determines controls the localhost will automatically be added to * true: always - * default: if multicast discovery is unavailable * + * default: if multicast discovery is unavailable * The default value is: ``default`` @@ -639,7 +639,7 @@ The default value is: ``empty`` Text -Provide an initial seed for the entity naming. Your string will be hashed to provide the random state. When provided, the same sequence of names is generated every run. Creating your entities in the same order will ensure they are the same between runs. If you run multiple nodes, set this via environment variable to ensure every node generates unique names. A random starting seed is chosen when left empty, (the default). +Provide an initial seed for the entity naming. Your string will be hashed to provide the random state. When provided, the same sequence of names is generated every run. Creating your entities in the same order will ensure they are the same between runs. If you run multiple nodes, set this via environment variable to ensure every node generates unique names. A random starting seed is chosen when left empty, (the default). The default value is: ```` @@ -710,7 +710,7 @@ This element defines a network interface. You can set autodetermine="true" to au Text -This attribute specifies the address of the interface. With ipv4 allows matching on the network part if the host part is set to zero. +This attribute specifies the address of the interface. With ipv4 allows matching on the network part if the host part is set to zero. The default value is: ```` @@ -773,7 +773,7 @@ The default value is: ``default`` Text -This attribute specifies the name of the interface. +This attribute specifies the name of the interface. The default value is: ```` @@ -2179,7 +2179,7 @@ Examples file URIs: Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg="sha-256"; boundary="----F9A8A198D6F08E1285A292ADF14DD04F" -This is an S/MIME signed message +This is an S/MIME signed message ------F9A8A198D6F08E1285A292ADF14DD04F @@ -2191,7 +2191,7 @@ xsi:noNamespaceSchemaLocation="omg\_shared\_ca\_governance.xsd"> - . . . + . . . @@ -2959,14 +2959,14 @@ The categorisation of tracing output is incomplete and hence most of the verbosi The default value is: ``none`` .. - generated from ddsi_config.h[94ad20bdb44ea1f393ba906865b1da591bbe1b57] - generated from ddsi_config.c[9fb9ace4394a1b7d50f4e0fa3905bbba2a183e36] - generated from ddsi__cfgelems.h[6e57a9213340839aeac89e7417646451cc5bb706] - generated from cfgunits.h[05f093223fce107d24dd157ebaafa351dc9df752] - generated from _confgen.h[bb9a0fc6ef1f7f7c46790ee00132e340e5fff36d] - generated from _confgen.c[0d833a6f2c98902f1249e63aed03a6164f0791d6] - generated from generate_rnc.c[b50e4b7ab1d04b2bc1d361a0811247c337b74934] - generated from generate_md.c[789b92e422631684352909cfb8bf43f6ceb16a01] - generated from generate_rst.c[3c4b523fbb57c8e4a7e247379d06a8021ccc21c4] - generated from generate_xsd.c[9bb91084fff7495aee9c025db3108549a0141957] - generated from generate_defconfig.c[02afff6935d72b7f04dc64c8a649b09f9f6143ac] + generated from ddsi_config.h[d7db98ce697e409412ec7fb0b900e10261a66c44] + generated from ddsi_config.c[2307247d4f7ee49c30fe95465ff55c8f9c692a64] + generated from ddsi__cfgelems.h[256ead267e23bf4c3079a5aaa51425875b96ff24] + generated from cfgunits.h[05f093223fce107d24dd157ebaafa351dc9df752] + generated from _confgen.h[bb9a0fc6ef1f7f7c46790ee00132e340e5fff36d] + generated from _confgen.c[0d833a6f2c98902f1249e63aed03a6164f0791d6] + generated from generate_rnc.c[b50e4b7ab1d04b2bc1d361a0811247c337b74934] + generated from generate_md.c[789b92e422631684352909cfb8bf43f6ceb16a01] + generated from generate_rst.c[3c4b523fbb57c8e4a7e247379d06a8021ccc21c4] + generated from generate_xsd.c[9bb91084fff7495aee9c025db3108549a0141957] + generated from generate_defconfig.c[02afff6935d72b7f04dc64c8a649b09f9f6143ac] diff --git a/docs/manual/options.md b/docs/manual/options.md index 02f7326250..e8e346346d 100644 --- a/docs/manual/options.md +++ b/docs/manual/options.md @@ -2069,9 +2069,9 @@ While none prevents any message from being written to a DDSI2 log file. The categorisation of tracing output is incomplete and hence most of the verbosity levels and categories are not of much use in the current release. This is an ongoing process and here we describe the target situation rather than the current situation. Currently, the most useful verbosity levels are config, fine and finest. The default value is: `none` - - - + + + diff --git a/etc/cyclonedds.rnc b/etc/cyclonedds.rnc index d4023ac4ac..2813409c54 100644 --- a/etc/cyclonedds.rnc +++ b/etc/cyclonedds.rnc @@ -1439,14 +1439,14 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==
    memsize = xsd:token { pattern = "0|(\d+(\.\d*)?([Ee][\-+]?\d+)?|\.\d+([Ee][\-+]?\d+)?) *([kMG]i?)?B" } maybe_memsize = xsd:token { pattern = "default|0|(\d+(\.\d*)?([Ee][\-+]?\d+)?|\.\d+([Ee][\-+]?\d+)?) *([kMG]i?)?B" } } -# generated from ddsi_config.h[94ad20bdb44ea1f393ba906865b1da591bbe1b57] -# generated from ddsi_config.c[9fb9ace4394a1b7d50f4e0fa3905bbba2a183e36] -# generated from ddsi__cfgelems.h[6e57a9213340839aeac89e7417646451cc5bb706] -# generated from cfgunits.h[05f093223fce107d24dd157ebaafa351dc9df752] -# generated from _confgen.h[bb9a0fc6ef1f7f7c46790ee00132e340e5fff36d] -# generated from _confgen.c[0d833a6f2c98902f1249e63aed03a6164f0791d6] -# generated from generate_rnc.c[b50e4b7ab1d04b2bc1d361a0811247c337b74934] -# generated from generate_md.c[789b92e422631684352909cfb8bf43f6ceb16a01] -# generated from generate_rst.c[3c4b523fbb57c8e4a7e247379d06a8021ccc21c4] -# generated from generate_xsd.c[9bb91084fff7495aee9c025db3108549a0141957] -# generated from generate_defconfig.c[02afff6935d72b7f04dc64c8a649b09f9f6143ac] +# generated from ddsi_config.h[d7db98ce697e409412ec7fb0b900e10261a66c44] +# generated from ddsi_config.c[2307247d4f7ee49c30fe95465ff55c8f9c692a64] +# generated from ddsi__cfgelems.h[256ead267e23bf4c3079a5aaa51425875b96ff24] +# generated from cfgunits.h[05f093223fce107d24dd157ebaafa351dc9df752] +# generated from _confgen.h[bb9a0fc6ef1f7f7c46790ee00132e340e5fff36d] +# generated from _confgen.c[0d833a6f2c98902f1249e63aed03a6164f0791d6] +# generated from generate_rnc.c[b50e4b7ab1d04b2bc1d361a0811247c337b74934] +# generated from generate_md.c[789b92e422631684352909cfb8bf43f6ceb16a01] +# generated from generate_rst.c[3c4b523fbb57c8e4a7e247379d06a8021ccc21c4] +# generated from generate_xsd.c[9bb91084fff7495aee9c025db3108549a0141957] +# generated from generate_defconfig.c[02afff6935d72b7f04dc64c8a649b09f9f6143ac] diff --git a/etc/cyclonedds.xsd b/etc/cyclonedds.xsd index 9569810b68..ab05261ba3 100644 --- a/etc/cyclonedds.xsd +++ b/etc/cyclonedds.xsd @@ -1,5 +1,10 @@ - - + + @@ -7,7 +12,7 @@ CycloneDDS configuration - + @@ -18,18 +23,18 @@ CycloneDDS configuration - - - - - - - - - - - - + + + + + + + + + + + + @@ -47,13 +52,16 @@ CycloneDDS configuration - - - - - - - + + + + + + + @@ -95,11 +103,11 @@ CycloneDDS configuration - - - - - + + + + + @@ -121,9 +129,9 @@ CycloneDDS configuration - - - + + + @@ -134,20 +142,20 @@ CycloneDDS configuration - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -228,7 +236,7 @@ CycloneDDS configuration - + @@ -272,13 +280,13 @@ CycloneDDS configuration - - - - - - - + + + + + + + @@ -367,30 +375,33 @@ CycloneDDS configuration - - - - - - + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -451,7 +462,9 @@ CycloneDDS configuration - + @@ -480,8 +493,8 @@ CycloneDDS configuration - - + + @@ -524,8 +537,8 @@ CycloneDDS configuration - - + + @@ -543,12 +556,12 @@ CycloneDDS configuration - - - - - - + + + + + + @@ -575,7 +588,9 @@ CycloneDDS configuration - + @@ -714,12 +729,12 @@ CycloneDDS configuration - - - - - - + + + + + + @@ -731,9 +746,9 @@ CycloneDDS configuration - - - + + + @@ -744,47 +759,53 @@ CycloneDDS configuration - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -822,8 +843,8 @@ CycloneDDS configuration - - + + @@ -834,9 +855,9 @@ CycloneDDS configuration - - - + + + @@ -867,7 +888,7 @@ CycloneDDS configuration <p>The ControlTopic element allows configured whether Cyclone DDS provides a special control interface via a predefined topic or not.<p> - + @@ -903,7 +924,7 @@ CycloneDDS configuration - + @@ -1049,9 +1070,9 @@ CycloneDDS configuration - - - + + + @@ -1128,9 +1149,9 @@ CycloneDDS configuration - - - + + + @@ -1244,7 +1265,7 @@ CycloneDDS configuration - + @@ -1269,10 +1290,10 @@ CycloneDDS configuration - - - - + + + + @@ -1322,9 +1343,9 @@ CycloneDDS configuration - - - + + + @@ -1335,7 +1356,11 @@ CycloneDDS configuration - + @@ -1362,7 +1387,11 @@ CycloneDDS configuration - + @@ -1403,7 +1432,11 @@ CycloneDDS configuration - + @@ -1437,8 +1470,8 @@ CycloneDDS configuration - - + + @@ -1446,12 +1479,12 @@ CycloneDDS configuration <p>The default value is: <code>false</code></p> - - - - - - + + + + + + @@ -1518,9 +1551,9 @@ CycloneDDS configuration - - - + + + @@ -1531,7 +1564,7 @@ CycloneDDS configuration - + @@ -1564,8 +1597,8 @@ CycloneDDS configuration - - + + @@ -1633,10 +1666,10 @@ CycloneDDS configuration - - - - + + + + @@ -1669,9 +1702,9 @@ CycloneDDS configuration - - - + + + @@ -1798,7 +1831,7 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==<br> <p>The Shared Memory element allows specifying various parameters related to using shared memory.</p> - + @@ -1807,8 +1840,8 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==<br> - - + + @@ -1835,7 +1868,7 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==<br> - + @@ -1844,16 +1877,16 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==<br> - - - + + + - - - - + + + + @@ -1901,7 +1934,7 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==<br> - + @@ -1912,8 +1945,8 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==<br> - - + + @@ -1941,9 +1974,9 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==<br> - - - + + + @@ -1962,9 +1995,9 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==<br> - - - + + + @@ -1990,11 +2023,11 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==<br> - - - - - + + + + + @@ -2039,7 +2072,9 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==<br> - + @@ -2075,56 +2110,70 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==<br> - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - - - + + + diff --git a/src/core/ddsi/defconfig.c b/src/core/ddsi/defconfig.c index d376aa9aa9..86b3874e1b 100644 --- a/src/core/ddsi/defconfig.c +++ b/src/core/ddsi/defconfig.c @@ -107,9 +107,9 @@ void ddsi_config_init_default (struct ddsi_config *cfg) cfg->ssl_min_version.minor = 3; #endif /* DDS_HAS_TCP_TLS */ } -/* generated from ddsi_config.h[94ad20bdb44ea1f393ba906865b1da591bbe1b57] */ -/* generated from ddsi_config.c[9fb9ace4394a1b7d50f4e0fa3905bbba2a183e36] */ -/* generated from ddsi__cfgelems.h[6e57a9213340839aeac89e7417646451cc5bb706] */ +/* generated from ddsi_config.h[d7db98ce697e409412ec7fb0b900e10261a66c44] */ +/* generated from ddsi_config.c[2307247d4f7ee49c30fe95465ff55c8f9c692a64] */ +/* generated from ddsi__cfgelems.h[256ead267e23bf4c3079a5aaa51425875b96ff24] */ /* generated from cfgunits.h[05f093223fce107d24dd157ebaafa351dc9df752] */ /* generated from _confgen.h[bb9a0fc6ef1f7f7c46790ee00132e340e5fff36d] */ /* generated from _confgen.c[0d833a6f2c98902f1249e63aed03a6164f0791d6] */ From 34b37d5c109a9685035717155e29934f08647a86 Mon Sep 17 00:00:00 2001 From: poetinger Date: Tue, 19 Aug 2025 10:49:44 +0200 Subject: [PATCH 5/5] review comment change --- README.md | 2 +- docs/manual/config/config_file_reference.rst | 22 ++++++++++---------- docs/manual/options.md | 6 +++--- etc/cyclonedds.rnc | 22 ++++++++++---------- etc/cyclonedds.xsd | 6 +++--- src/core/ddsi/defconfig.c | 6 +++--- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 2345238261..bdc1389d3c 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ Zero-configuration discovery is also included in the standard and supported by a DDS actually brings more: publish-subscribe messaging is a nice abstraction over "ordinary" networking, but plain publish-subscribe doesn't affect how one *thinks* about systems. A very powerful architecture that truly changes the perspective on distributed systems is that of the "shared data space", in itself an old idea, and really just a distributed database. Most shared data space designs have failed miserably in real-time control systems because they provided strong consistency guarantees and sacrificed too much performance and flexibility. -The *eventually consistent* shared data space of DDS has been very successful in helping with building systems that need to satisfy many "ilities": dependability, maintainability, extensibility, upgradeability, ... +The *eventually consistent* shared data space of DDS has been very successful in helping with building systems that need to satisfy many "ilities": dependability, maintainability, extensibility, upgradeability, etc. Truth be told, that's why it was invented, and publish-subscribe messaging was simply an implementation technique. Cyclone DDS aims at full coverage of the specs and today already covers most of this. diff --git a/docs/manual/config/config_file_reference.rst b/docs/manual/config/config_file_reference.rst index c1bf54d5a1..3a432d6a8d 100644 --- a/docs/manual/config/config_file_reference.rst +++ b/docs/manual/config/config_file_reference.rst @@ -2959,14 +2959,14 @@ The categorisation of tracing output is incomplete and hence most of the verbosi The default value is: ``none`` .. - generated from ddsi_config.h[d7db98ce697e409412ec7fb0b900e10261a66c44] - generated from ddsi_config.c[2307247d4f7ee49c30fe95465ff55c8f9c692a64] - generated from ddsi__cfgelems.h[256ead267e23bf4c3079a5aaa51425875b96ff24] - generated from cfgunits.h[05f093223fce107d24dd157ebaafa351dc9df752] - generated from _confgen.h[bb9a0fc6ef1f7f7c46790ee00132e340e5fff36d] - generated from _confgen.c[0d833a6f2c98902f1249e63aed03a6164f0791d6] - generated from generate_rnc.c[b50e4b7ab1d04b2bc1d361a0811247c337b74934] - generated from generate_md.c[789b92e422631684352909cfb8bf43f6ceb16a01] - generated from generate_rst.c[3c4b523fbb57c8e4a7e247379d06a8021ccc21c4] - generated from generate_xsd.c[9bb91084fff7495aee9c025db3108549a0141957] - generated from generate_defconfig.c[02afff6935d72b7f04dc64c8a649b09f9f6143ac] + generated from ddsi_config.h[94ad20bdb44ea1f393ba906865b1da591bbe1b57] + generated from ddsi_config.c[824f3aec4546af5fc49d767a9cb8d98b6554bcdd] + generated from ddsi__cfgelems.h[f09dba36857055fdfc4cf50554dd9133aa4c40d4] + generated from cfgunits.h[05f093223fce107d24dd157ebaafa351dc9df752] + generated from _confgen.h[bb9a0fc6ef1f7f7c46790ee00132e340e5fff36d] + generated from _confgen.c[0d833a6f2c98902f1249e63aed03a6164f0791d6] + generated from generate_rnc.c[b50e4b7ab1d04b2bc1d361a0811247c337b74934] + generated from generate_md.c[789b92e422631684352909cfb8bf43f6ceb16a01] + generated from generate_rst.c[3c4b523fbb57c8e4a7e247379d06a8021ccc21c4] + generated from generate_xsd.c[9bb91084fff7495aee9c025db3108549a0141957] + generated from generate_defconfig.c[02afff6935d72b7f04dc64c8a649b09f9f6143ac] diff --git a/docs/manual/options.md b/docs/manual/options.md index e8e346346d..afa871de23 100644 --- a/docs/manual/options.md +++ b/docs/manual/options.md @@ -2069,9 +2069,9 @@ While none prevents any message from being written to a DDSI2 log file. The categorisation of tracing output is incomplete and hence most of the verbosity levels and categories are not of much use in the current release. This is an ongoing process and here we describe the target situation rather than the current situation. Currently, the most useful verbosity levels are config, fine and finest. The default value is: `none` - - - + + + diff --git a/etc/cyclonedds.rnc b/etc/cyclonedds.rnc index 2813409c54..c1d050dd0a 100644 --- a/etc/cyclonedds.rnc +++ b/etc/cyclonedds.rnc @@ -1439,14 +1439,14 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==
    memsize = xsd:token { pattern = "0|(\d+(\.\d*)?([Ee][\-+]?\d+)?|\.\d+([Ee][\-+]?\d+)?) *([kMG]i?)?B" } maybe_memsize = xsd:token { pattern = "default|0|(\d+(\.\d*)?([Ee][\-+]?\d+)?|\.\d+([Ee][\-+]?\d+)?) *([kMG]i?)?B" } } -# generated from ddsi_config.h[d7db98ce697e409412ec7fb0b900e10261a66c44] -# generated from ddsi_config.c[2307247d4f7ee49c30fe95465ff55c8f9c692a64] -# generated from ddsi__cfgelems.h[256ead267e23bf4c3079a5aaa51425875b96ff24] -# generated from cfgunits.h[05f093223fce107d24dd157ebaafa351dc9df752] -# generated from _confgen.h[bb9a0fc6ef1f7f7c46790ee00132e340e5fff36d] -# generated from _confgen.c[0d833a6f2c98902f1249e63aed03a6164f0791d6] -# generated from generate_rnc.c[b50e4b7ab1d04b2bc1d361a0811247c337b74934] -# generated from generate_md.c[789b92e422631684352909cfb8bf43f6ceb16a01] -# generated from generate_rst.c[3c4b523fbb57c8e4a7e247379d06a8021ccc21c4] -# generated from generate_xsd.c[9bb91084fff7495aee9c025db3108549a0141957] -# generated from generate_defconfig.c[02afff6935d72b7f04dc64c8a649b09f9f6143ac] +# generated from ddsi_config.h[94ad20bdb44ea1f393ba906865b1da591bbe1b57] +# generated from ddsi_config.c[824f3aec4546af5fc49d767a9cb8d98b6554bcdd] +# generated from ddsi__cfgelems.h[f09dba36857055fdfc4cf50554dd9133aa4c40d4] +# generated from cfgunits.h[05f093223fce107d24dd157ebaafa351dc9df752] +# generated from _confgen.h[bb9a0fc6ef1f7f7c46790ee00132e340e5fff36d] +# generated from _confgen.c[0d833a6f2c98902f1249e63aed03a6164f0791d6] +# generated from generate_rnc.c[b50e4b7ab1d04b2bc1d361a0811247c337b74934] +# generated from generate_md.c[789b92e422631684352909cfb8bf43f6ceb16a01] +# generated from generate_rst.c[3c4b523fbb57c8e4a7e247379d06a8021ccc21c4] +# generated from generate_xsd.c[9bb91084fff7495aee9c025db3108549a0141957] +# generated from generate_defconfig.c[02afff6935d72b7f04dc64c8a649b09f9f6143ac] diff --git a/etc/cyclonedds.xsd b/etc/cyclonedds.xsd index ab05261ba3..a55b134f1a 100644 --- a/etc/cyclonedds.xsd +++ b/etc/cyclonedds.xsd @@ -2171,9 +2171,9 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==<br>     - - - + + + diff --git a/src/core/ddsi/defconfig.c b/src/core/ddsi/defconfig.c index 86b3874e1b..4d84272f63 100644 --- a/src/core/ddsi/defconfig.c +++ b/src/core/ddsi/defconfig.c @@ -107,9 +107,9 @@ void ddsi_config_init_default (struct ddsi_config *cfg) cfg->ssl_min_version.minor = 3; #endif /* DDS_HAS_TCP_TLS */ } -/* generated from ddsi_config.h[d7db98ce697e409412ec7fb0b900e10261a66c44] */ -/* generated from ddsi_config.c[2307247d4f7ee49c30fe95465ff55c8f9c692a64] */ -/* generated from ddsi__cfgelems.h[256ead267e23bf4c3079a5aaa51425875b96ff24] */ +/* generated from ddsi_config.h[94ad20bdb44ea1f393ba906865b1da591bbe1b57] */ +/* generated from ddsi_config.c[824f3aec4546af5fc49d767a9cb8d98b6554bcdd] */ +/* generated from ddsi__cfgelems.h[f09dba36857055fdfc4cf50554dd9133aa4c40d4] */ /* generated from cfgunits.h[05f093223fce107d24dd157ebaafa351dc9df752] */ /* generated from _confgen.h[bb9a0fc6ef1f7f7c46790ee00132e340e5fff36d] */ /* generated from _confgen.c[0d833a6f2c98902f1249e63aed03a6164f0791d6] */