Improve Jaguar network-disabled. #465
Open
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
kasperl
reviewed
Mar 13, 2024
| @@ -95,13 +95,13 @@ func RunCmd() *cobra.Command { | |||
| "program runs on the current computer instead.\n" + | |||
| "\n" + | |||
| "The following define flags have a special meaning:\n" + | |||
| " '-D jag.disabled': Disable Jaguar for this program.\n" + | |||
| " Disables the HTTP server on the device.\n" + | |||
| " '-D jag.network-disabled': Disable Jaguar for this program.\n" + | |||
There was a problem hiding this comment.
I don't like the name of this define. Not entirely sure why.
There was a problem hiding this comment.
As discussed in person: the name isn't great.
- the network isn't really disabled.
- it's only affecting Jaguar which disables the http-based endpoint
- other containers are still free to use the network.
We still need to find a better name.
src/network.toit
Outdated
| @@ -211,14 +211,16 @@ class EndpointHttp implements Endpoint: | |||
| // Handle installing containers. | |||
| else if path == "/install" and request.method == "PUT": | |||
| container-name ::= headers.single HEADER-CONTAINER-NAME | |||
| crc32 := int.parse (headers.single HEADER_CRC32) | |||
There was a problem hiding this comment.
Suggested change
| crc32 := int.parse (headers.single HEADER_CRC32) | |
| crc32 := int.parse (headers.single HEADER-CRC32) |
src/network.toit
Outdated
| respond-ok writer | ||
|
|
||
| // Handle code running. | ||
| else if path == "/run" and request.method == "PUT": | ||
| crc32 := int.parse (headers.single HEADER_CRC32) |
There was a problem hiding this comment.
Suggested change
| crc32 := int.parse (headers.single HEADER_CRC32) | |
| crc32 := int.parse (headers.single HEADER-CRC32) |
src/jaguar.toit
Outdated
| // We start the container from a separate task to allow the server | ||
| // to continue operating. This also means that the container running | ||
| // isn't covered by the flashing mutex or associated timeout. | ||
| task:: |
There was a problem hiding this comment.
We used to go through some hoops to avoid this for installed containers.
src/jaguar.toit
Outdated
| disabled / bool := false | ||
| network-free / monitor.Semaphore ::= monitor.Semaphore | ||
| container-done / monitor.Semaphore ::= monitor.Semaphore | ||
| monitor NetworkManager: |
There was a problem hiding this comment.
Maybe this should just be a wrapper around some state and a monitor.Signal.
src/jaguar.toit
Outdated
| network-is-disabled -> bool: | ||
| return network-is-disabled_ | ||
|
|
||
| start-network-endpoint -> none: |
There was a problem hiding this comment.
This isn't really starting any network endpoints.
There was a problem hiding this comment.
Changed to serve taking an endpoint and device.
Co-authored-by: Kasper Lund <[email protected]>
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.
No description provided.