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

Fix the macro definition _Thrd_success in thread #3775

Closed
wants to merge 26 commits into from

Conversation

jimwang118
Copy link

@jimwang118 jimwang118 commented Aug 2, 2023

Description

When I was doing vcpkg testing msvc, the following error occurred on the fastrtps port.
E:\Jim\vcpkg\buildtrees\fastrtps\src\v2.11.1-d9ab4e5ea6\include\fastrtps/utils/TimedMutex.hpp(177): error C2065: '_Thrd_success': undeclared identifier
After investigation, this is due to the modification of the _Thrd_success macro to _Thrd_result::_Success in the thread STL and the related PR is microsoft/STL#3897. Therefore, I will modify the macro in the code to _Thrd_result::_Success.

Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

@jimwang118 Thanks!

Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

@jimwang118 Sorry to bother, but could you fix DCO?

You just need to sign-off your commit, i.e. git rebase HEAD~1 --signoff

@jimwang118
Copy link
Author

git rebase HEAD~1 --signoff

Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
@jimwang118 jimwang118 marked this pull request as draft August 2, 2023 09:14
@jimwang118
Copy link
Author

This modification will be applied in future versions of visual studio, and the old macro is still used in the current version.We need to wait for the release of the new version of STL to incorporate this PR.

@MiguelCompany
Copy link
Member

This modification will be applied in future versions of visual studio, and the old macro is still used in the current version.We need to wait for the release of the new version of STL to incorporate this PR.

The changes should then depend on the STL version, using conditional #ifdef

@jimwang118
Copy link
Author

@MiguelCompany ,The functions _Mtx_timedlock, _Mtx_init, and _Mtx_destroy are deleted in PR microsoft/STL#3912 of STL. Are there other functions that can replace these functions?

EduPonz and others added 10 commits August 22, 2023 06:48
* Refs #18395: Add regression test

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #18395: Refactor XMLParser::parseLogConfig

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
* Refs #18966. Forcing UDP for metatraffic.

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

* Refs #19255. Allowing metatraffic depends on flags.

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

* Refs #19255. NetworkFactory constructor receives RTPSParticipantAttributes.

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

* Refs #19255. Parsing property from participant attributes.

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

* Refs #19255. Remove unused mp_ResourceSemaphore.

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

* Refs #19263. Fixed NetworkFactoryTests.

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

* Refs #19263. Fixed TCPv6Tests.

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

* Refs #19263. Fixed link errors on unit tests.

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

* Refs #19263. Apply suggestions from code review.

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

* Refs #19263. Additional suggestions from code review.

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

* Refs #19263. Added possitive test.

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

* Refs #19263. Added negative test.

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

* Refs #19263. Configuration for avoid_builtin_multicast on PubSubWriter.

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

* Refs #19263. Configuration for avoid_builtin_multicast on PubSubReader.

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

* Refs #19263. Configuration for max_multicast_locators_number on PubSubReader/PubSubWriter.

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

* Refs #19263. Enable multicast discovery on new test.

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

* Refs #19263. Apply suggestions.

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

* Refs #19263. Add feature to versions.md.

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

* Refs #19263. Apply suggestion.

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

---------

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
* Refs #19315: Allow participant profiles with no rtps tag

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19315: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19315: Apply suggestions 2

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
JesusPoderoso and others added 6 commits August 22, 2023 06:48
* Custom Payload pools test implementation (eProsima#3719)

* Refs #19024: Public API implementation

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #19024: Update versions.md

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #19023: Fix build issues

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #19023: Custom Payload pools test implementation

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Refs #19023: Update test to use public API

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #19023: Please linters

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #19023: Added delay between writing and checking payload request

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
Co-authored-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Include custom pools impl (eProsima#3740)

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19024: Modified custom payload pool and datasharing interaction

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19024. Correctly set payload owner on test pools.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Co-authored-by: jsantiago-eProsima <90755661+jsantiago-eProsima@users.noreply.github.com>
Co-authored-by: Javier Santiago <javiersantiago@eprosima.com>
Co-authored-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
* Refs #19347: Fix encapsulation format in WLP. Improve WLP checks

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correctly set CDR endianess for BE

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Uncrustify

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix doxygen

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Fix Windows warning

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Correct condition when setting the payload encapsulation

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Remove legacy typedef

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19347: Initialize uint32_t variable

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
* Refs #19358. Only account for WLP heartbeats and acknacks.

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

* Refs #19358. Change test expectations.

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

* Refs #19358. Rename counters.

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

* Refs #19358. Whitelist localhost to ensure only the two test participants communicate.

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

---------

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
…ype (eProsima#3786)

* Refs #19359: Change ReturnCode when negotiating through type lookup service

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19359: Improve API reference

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

* Refs #19359: Apply suggestions

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

---------

Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
Signed-off-by: jimwang118 <wangzhijie05@beyondsoft.com>
@JLBuenoLopez JLBuenoLopez added this to the v2.12.0 milestone Sep 13, 2023
@EduPonz EduPonz modified the milestones: v2.12.0, v2.12.1 Sep 15, 2023
@MiguelCompany
Copy link
Member

I think this PR would not be necessary after #3904

@jimwang118 could you check on your side?

@jimwang118
Copy link
Author

jimwang118 commented Oct 9, 2023

Duplicate of #3904

@jimwang118 jimwang118 closed this Oct 9, 2023
@jimwang118 jimwang118 deleted the fix_STL_use branch October 9, 2023 09:47
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.

5 participants