Defer websocket connect() #889
Closed
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
Signed-off-by: Marc Emmers <[email protected]>
…ion for OCPP1.6 ; Removed WEBSOCKET_INIT_DELAY on startup Signed-off-by: Piet Gömpel <[email protected]>
Pietfried
requested review from
hikinggrass,
maaikez and
marcemmers
as code owners
3 tasks
Pietfried
commented
Nov 28, 2024
| @@ -135,7 +135,7 @@ void ConnectivityManager::connect(std::optional<int32_t> configuration_slot_opt) | |||
| // After the websocket gets closed a reconnect will be triggered | |||
| this->websocket->disconnect(WebsocketCloseReason::ServiceRestart); | |||
| } else { | |||
| this->try_connect_websocket(); | |||
| this->websocket_timer.timeout([this] { this->try_connect_websocket(); }, std::chrono::seconds(0)); | |||
There was a problem hiding this comment.
@marcemmers I used std::chrono::seconds(0) instead of WEBSOCKET_INIT_DELAY because the WEBSOCKET_INIT_DELAY was only introduced to solve an issue with OCTT tests reconnects as far as I remember.
There was a problem hiding this comment.
Yes I don't think there would be a point delaying there. Although I think we should probably revisit misusing a timer for this at all, that would be out of scope for this.
marcemmers
approved these changes
Nov 28, 2024
* Introduced thread_mutex protecting access to threads of libwebsockets when the ~WebsocketLibwebsockets destructor was called it attempted to acquire a lock for the connection_mutex and joins the websocket_thread . But the websocket_thread runs the client_loop that also requires the lock when calling on_conn_fail, so the client_loop which could result in a deadlock Signed-off-by: Piet Gömpel <[email protected]>
|
@marcemmers please have another looks at the recent changes |
4 tasks
Hi @marcemmers , we are looking into it and considering some more changes to the |
|
Closed in favor of #896 |
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.
Describe your changes
The
start()function of the charge_point could be blocking until a connection timeout occured when connection the websocket for the first time. This change defers the call to the connect() function so that the start() function does not block anymore.Additionally introduced thread_mutex protecting access to threads of libwebsockets when the ~WebsocketLibwebsockets destructor was called it attempted to acquire a lock for the connection_mutex and joins the websocket_thread . But the websocket_thread runs the client_loop that also requires the lock when calling on_conn_fail, so the client_loop which could result in a deadlock
Issue ticket number and link
Checklist before requesting a review