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

Deterministic iteration order for reproducible codegen #846

Merged
merged 2 commits into from
Dec 10, 2024
Merged

Deterministic iteration order for reproducible codegen #846

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
40a591c
Use OrderedDict for reproducible codegen
harrysarson Dec 4, 2024
a9ea6b0
Use deterministic iteration in type_support header
harrysarson Dec 5, 2024
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
5 changes: 3 additions & 2 deletions rosidl_generator_c/resource/full__description.c.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@# Included from rosidl_generator_c/resource/idl__description.c.em
@{
from collections import OrderedDict
from rosidl_generator_c import escape_string
from rosidl_generator_c import idl_structure_type_to_c_include_prefix
from rosidl_generator_c import type_hash_to_c_definition
Expand Down Expand Up @@ -31,7 +32,7 @@ def utf8_encode(value_string):
return escape_string(repr(value_string.encode('utf-8'))[2:-1])

implicit_type_names = set(td['type_description']['type_name'] for td, _ in implicit_type_descriptions)
includes = set()
includes = OrderedDict()
clalancette marked this conversation as resolved.
Show resolved Hide resolved
toplevel_msg, _ = toplevel_type_description

for referenced_td in toplevel_msg['referenced_type_descriptions']:
Expand All @@ -40,7 +41,7 @@ for referenced_td in toplevel_msg['referenced_type_descriptions']:
names = referenced_td['type_name'].split('/')
_type = NamespacedType(names[:-1], names[-1])
include_prefix = idl_structure_type_to_c_include_prefix(_type, 'detail')
includes.add(include_prefix + '__functions.h')
includes[include_prefix + '__functions.h'] = None
clalancette marked this conversation as resolved.
Show resolved Hide resolved

full_type_descriptions = [toplevel_type_description] + implicit_type_descriptions
full_type_names = [t['type_description']['type_name'] for t, _ in full_type_descriptions]
Expand Down
9 changes: 6 additions & 3 deletions rosidl_generator_c/resource/idl__type_support.c.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,19 @@ include_parts = [package_name] + list(interface_path.parents[0].parts) + [
'detail', convert_camel_case_to_lower_case_underscore(interface_path.stem)]
include_base = '/'.join(include_parts)

include_directives = {
top_level_includes = [
'rosidl_typesupport_interface/macros.h',
include_base + '__type_support.h',
include_base + '__struct.h',
include_base + '__functions.h'}
include_base + '__functions.h']

include_directives = set(top_level_includes)

}@

#include <string.h>

@[for header_file in include_directives]@
@[for header_file in top_level_includes]@
#include "@(header_file)"
@[end for]@

Expand Down
Loading