Fix mqtt3 client shutdown callback #498
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
… into 5to3adapter
xiazhvera
commented
Aug 22, 2023
| @@ -1549,117 +1549,6 @@ def test_operation_statistics_uc1(self): | |||
| client.stop() | |||
| callbacks.future_stopped.result(TIMEOUT) | |||
|
|
|||
| # ============================================================== | |||
| # 5to3 ADAPTER TEST CASES | |||
| # ============================================================== | |||
There was a problem hiding this comment.
The adapter tests are moved to its own file.
bretambrose
reviewed
Aug 23, 2023
source/mqtt_client_connection.c
Outdated
| @@ -374,9 +382,11 @@ PyObject *aws_py_mqtt_client_connection_new(PyObject *self, PyObject *args) { | |||
| Py_DECREF(self_proxy); | |||
| proxy_new_failed: | |||
| use_websockets_failed: | |||
| set_on_closed_failed: | |||
There was a problem hiding this comment.
I've come to hate this pattern for cleanup. We did it early on, but it is far better (imo) to have a failure path that can safely be executed from all branch points. If scoping is an issue, declarations can be moved up to the top of the function.
Would much rather see something like this:
on_failure:
Py_XDECREF(self_proxy);
aws_mqtt_client_connection_release(py_connection->native);
aws_mem_release(allocator, py_connection);
return NULL;
bretambrose
approved these changes
Aug 25, 2023
source/mqtt_client_connection.c
Outdated
| aws_mem_release(allocator, py_connection); | ||
| creation_failed: | ||
| Py_XDECREF(self_proxy); | ||
| if (py_connection) { |
There was a problem hiding this comment.
py_connection has to be non-null at this point.
Also, maybe just "on_error:" rather than "creation_failed:"
source/mqtt_client_connection.c
Outdated
| creation_failed: | ||
| Py_XDECREF(self_proxy); | ||
| if (py_connection) { | ||
| if (py_connection->native) { |
There was a problem hiding this comment.
You also don't need to null check this either. release handles a null invocation. The original suggestion would work verbatim.
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.
Issue #, if available:
Description of changes:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.