More dispatch pipeline refactoring #1929
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pepone
approved these changes
Mar 13, 2024
bernardnormier
commented
Mar 13, 2024
| @@ -1382,7 +1382,7 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current) | |||
| uint8_t compress = 0; | |||
| int32_t requestId = 0; | |||
| int32_t invokeNum = 0; | |||
| ObjectAdapterPtr adapter; | |||
| ObjectAdapterIPtr adapter; | |||
There was a problem hiding this comment.
We need the IPtr to get the dispatchPipeline function.
| // There is no need to clear _dispatchPipeline during destroy because _dispatchPipeline does not hold onto this | ||
| // object adapter directly. It can hold onto a communicator that holds onto this object adapter, but the | ||
| // communicator will release this refcount when it is destroyed or when the object adapter is destroyed. | ||
| const ObjectPtr _dispatchPipeline; // must be declared after _servantManager |
There was a problem hiding this comment.
It's now const thanks to the helper function in the .cpp.
externl
approved these changes
Mar 13, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed version of #1925.
This is a small follow-up to #1923. In #1923, ObjectAdapter::dispatcher() returns the dispatch pipeline, which is not quite correct when you insert your dispatcher into another object adapter.
The desired behavior is:
Connection => logger middleware associated with connection's OA => observer middleware associated with connection's OA => second OA dispatcher => second OA servant
We don't want to duplicate the logger and dispatch observer actions.
This PR fixes the code to achieve this desired behavior. I also updated the metrics test to verify it works.