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.

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

Environment file feature #2211

Merged
merged 6 commits into from
Sep 18, 2021
Merged

Environment file feature #2211

merged 6 commits into from
Sep 18, 2021

Conversation

MiguelCompany
Copy link
Member

No description provided.

@MiguelCompany MiguelCompany added this to the v2.4.0 milestone Sep 17, 2021
@MiguelCompany
Copy link
Member Author

@richiprosima Please test mac

EduPonz
EduPonz previously approved these changes Sep 17, 2021
Copy link

@EduPonz EduPonz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI 🚀

@MiguelCompany
Copy link
Member Author

@richiprosima Please test aarch64

JLBuenoLopez and others added 5 commits September 18, 2021 20:45
* Refs #12199: file_exists implementation

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: file_exists unit test

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: linters

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: Minor improvement on test

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

Co-authored-by: Iker Luengo <ikerluengo@eprosima.com>
* Refs #12199: load_environment_file implementation

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: load_environment_file tests

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: linters

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: Check file is unserializeable and test

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Refs #12199: complete doxygen documentation

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

Co-authored-by: Iker Luengo <ikerluengo@eprosima.com>
…t file (#2159)

* Refs #12199: refactor load_environment_server_info taking into account environment file

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: add test cases to load_environment_server_info

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: fix Windows build

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: use specific configuration file in blackbox tests

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
* Refs #12199: add FileWatch header-only library and first PoC

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Implement watchers on SystemInfo and updated PoC

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Refs #12199: Test on watchers on SystemInfo

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Refs #12199: Linters

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Refs #12199: Removing code for PoC

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Refs #12199: Avoid warning on FileWatch

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Refs #12199: Only windows and linux supported

If the platform is neither of these, the new methods do nothing.
Otherwise, it fails when compiling on mac.

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Refs #12199: remove macro redefinition warning in Windows

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: linters

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: apply review suggestions

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: notify when the file is closed and has been modified so the file modified callback is run once

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: modify FileWatch test

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: avoid waiting and instead block until callback is executed

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: linters

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: fix Windows and MacOS executions. Fix Windows comparison warning

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: ensure that file modification callback is only run once

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: fix datarace in FileWatchTest

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

Co-authored-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
* Refs #12199: refactor SystemInfo::get_env to use string instead of char*

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: set and get environment_file implementation

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: get & set environment file test

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: refactor get_env to read also from file. Update corresponding test

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: remove unused parameter from callback. Fix test after rebase

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: add feature test

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: feature implementation

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: linters

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: fix bug with FASTDDS_STATISTICS enabled

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: avoid including private header in public header file. Fix Windows warning

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: apply suggestion of moving to RTPSDomainImpl all code related with file watcher

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: linters

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: fix ServerClientEnvironmentSetUp test

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: fix AddDiscoveryServerToListFromEnvironmentFile in Windows

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: disable AddDiscoveryServerToListFromEnvironmentFile in Apple

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: remove conflicting cases from ServerClientEnvironmentSetUp test

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: remove unused member (fix Clang warning)

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: apply review suggestion: move client_override flag to RTPSParticipantImpl

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: add review suggestions

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: not run AddDiscoveryServerToListFromEnvironmentFile in Windows

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: linters

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
@MiguelCompany
Copy link
Member Author

@EduPonz I have rebased this and added a commit to fix StatisticsDataWriterQosTest, which was not updated on #2176 and #2180.

@MiguelCompany MiguelCompany force-pushed the feature/load-environment-file branch from 91c3c86 to 140f4f4 Compare September 18, 2021 18:56
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany force-pushed the feature/load-environment-file branch from 140f4f4 to 4598cc0 Compare September 18, 2021 18:58
Copy link

@EduPonz EduPonz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Last changes look good to me, although uncrustify would need to be fixed

@MiguelCompany
Copy link
Member Author

Uncrustify failed on a third-party file. That's not an error, is it?

Copy link

@EduPonz EduPonz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@EduPonz
Copy link

EduPonz commented Sep 18, 2021

All failures are unrelated to this PR, so I'll go ahead and merge it

@EduPonz EduPonz merged commit 83643d0 into master Sep 18, 2021
@EduPonz EduPonz deleted the feature/load-environment-file branch September 18, 2021 22:13
SamuelWHalodi pushed a commit to SamuelWHalodi/Fast-DDS that referenced this pull request Oct 4, 2021
* Add SystemInfo::file_exists (eProsima#2155)

* Refs #12199: file_exists implementation

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: file_exists unit test

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: linters

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: Minor improvement on test

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

Co-authored-by: Iker Luengo <ikerluengo@eprosima.com>

* Load environment file (eProsima#2157)

* Refs #12199: load_environment_file implementation

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: load_environment_file tests

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: linters

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: Check file is unserializeable and test

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Refs #12199: complete doxygen documentation

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

Co-authored-by: Iker Luengo <ikerluengo@eprosima.com>

* Refactor load environment server info to take into account environment file (eProsima#2159)

* Refs #12199: refactor load_environment_server_info taking into account environment file

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: add test cases to load_environment_server_info

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: fix Windows build

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: use specific configuration file in blackbox tests

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* filewatch integration (eProsima#2161)

* Refs #12199: add FileWatch header-only library and first PoC

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Implement watchers on SystemInfo and updated PoC

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Refs #12199: Test on watchers on SystemInfo

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Refs #12199: Linters

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Refs #12199: Removing code for PoC

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Refs #12199: Avoid warning on FileWatch

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Refs #12199: Only windows and linux supported

If the platform is neither of these, the new methods do nothing.
Otherwise, it fails when compiling on mac.

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Refs #12199: remove macro redefinition warning in Windows

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: linters

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: apply review suggestions

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: notify when the file is closed and has been modified so the file modified callback is run once

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: modify FileWatch test

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: avoid waiting and instead block until callback is executed

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: linters

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: fix Windows and MacOS executions. Fix Windows comparison warning

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: ensure that file modification callback is only run once

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: fix datarace in FileWatchTest

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

Co-authored-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Reload environment file information (eProsima#2205)

* Refs #12199: refactor SystemInfo::get_env to use string instead of char*

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: set and get environment_file implementation

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: get & set environment file test

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: refactor get_env to read also from file. Update corresponding test

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: remove unused parameter from callback. Fix test after rebase

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: add feature test

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: feature implementation

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: linters

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: fix bug with FASTDDS_STATISTICS enabled

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: avoid including private header in public header file. Fix Windows warning

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: apply suggestion of moving to RTPSDomainImpl all code related with file watcher

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: linters

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: fix ServerClientEnvironmentSetUp test

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: fix AddDiscoveryServerToListFromEnvironmentFile in Windows

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: disable AddDiscoveryServerToListFromEnvironmentFile in Apple

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: remove conflicting cases from ServerClientEnvironmentSetUp test

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: remove unused member (fix Clang warning)

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: apply review suggestion: move client_override flag to RTPSParticipantImpl

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: add review suggestions

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: not run AddDiscoveryServerToListFromEnvironmentFile in Windows

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Refs #12199: linters

Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>

* Fixed and improved StatisticsDataWriterQosTest.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

Co-authored-by: José Luis Bueno López <69244257+JLBuenoLopez-eProsima@users.noreply.github.com>
Co-authored-by: Iker Luengo <ikerluengo@eprosima.com>
Co-authored-by: IkerLuengo <57146230+IkerLuengo@users.noreply.github.com>
Co-authored-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
Signed-off-by: Samuel Wilhelmsson <samuel@halodi.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants