Windows support for the sidecar #305
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
spawn working on windows
…atadog into sidecar-windows
Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
…sidecar-windows
bantonsson
reviewed
Feb 7, 2024
bantonsson
reviewed
Feb 7, 2024
bantonsson
reviewed
Feb 7, 2024
bwoebi
force-pushed
the
sidecar-windows
branch
4 times, most recently
from
b122789 to
3161803
Compare
Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
bwoebi
force-pushed
the
sidecar-windows
branch
from
3161803 to
01b8877
Compare
Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
bantonsson
approved these changes
Feb 13, 2024
| impl ShmHandle { | ||
| pub fn new(size: usize) -> anyhow::Result<ShmHandle> { | ||
| // If one uses null_mut() for the name, DuplicateHandle will emit a very confusing "The system cannot find the file specified. (os error 2)". | ||
| // It seems like DuplicateHandle requires a name to re-open the FileMapping within another process. Oh well. Let's generate an unique one. |
|
|
||
| impl NamedShmHandle { | ||
| fn format_name(path: &CString) -> CString { | ||
| // Global\ namespace is reserved for Session ID 0. We cannot rely on our PHP process having permissions to write to Global\. |
There was a problem hiding this comment.
Using Global\ twice in this comment (and it's long).
sidecar/src/setup/windows.rs
Outdated
| }; | ||
|
|
||
| let socket_path = self.socket_path.clone(); | ||
| // Have a ProcessHandle::Getter() so that we don't immediately block in case the sidecar is still starting up, but only the first time we want to submit shared memory |
sidecar/src/setup/windows.rs
Outdated
| Ok(Channel::from_client_handle_and_pid( | ||
| unsafe { OwnedHandle::from_raw_handle(pipe) }, | ||
| ProcessHandle::Getter(Box::new(move || { | ||
| // Await the shared memory handle which will contain the pid of the sidecar - it may not be immediately available during startup |
| use super::ChannelMetadata; | ||
|
|
||
| #[derive(Debug)] | ||
| #[pin_project(project = NamedPipeProject)] |
There was a problem hiding this comment.
I think it would be good to add some comments and/or links to docs explaining projections and structural pinning for ppl unfamiliar with the code base and Rust.
Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
…dows Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
bwoebi
force-pushed
the
sidecar-windows
branch
from
4c83149 to
31e79b3
Compare
bwoebi
force-pushed
the
sidecar-windows
branch
3 times, most recently
from
d3f73c8 to
84411b3
Compare
bwoebi
force-pushed
the
sidecar-windows
branch
from
84411b3 to
e707176
Compare
ivoanjo
added a commit
that referenced
this pull request
Mar 11, 2024
…C` helper **What does this PR do?** This PR introduces a new `DDOG_CHARSLICE_C_BARE` helper, as well as undoes the change to `DDOG_CHARSLICE_C` from https://github.com/DataDog/libdatadog/pull/305/files#diff-5c00b9c49c81bf0d0a754e0bcc6e0add4fe849bf0ea4a4d1ebfac8f698150f0b There are now two helpers: `DDOG_CHARSLICE_C` that includes the `(ddog_CharSlice)` cast and `DDOG_CHARSLICE_C_BARE` which doesn't. **Motivation:** In a nutshell @bwoebi explained to me that on Windows there's times where you need to use `(ddog_CharSlice) {.ptr = ..., .len = ...}` and others where you need to use `{.ptr = ..., .len = ...}` and cannot include the cast. Thus in #305 we tweaked the helper to never have `(ddog_CharSlice)`, with the intention of using `(ddog_CharSlice) DDOG_CHARSLICE_C(...)` some times, and `DDOG_CHARSLICE_C(...)` the other times. But... this had the downside of making some of our Ruby Profiler code really ugly, as we'd need to move from `DDOG_CHARSLICE_C` to `(CharSlice) DDOG_CHARSLICE_C` in a lot of cases. Thus, this PR introduces one helper for each variant, so that we always have a nice user-friendly option for each case, and avoid needing to sprinkle casts. **Additional Notes:** Arghhh C/C++ you always manage to be weird and annoying. **How to test the change?** I've tested this change by compiling the Ruby profiler to use this branch of libdatadog, and validating that it compiles successfully on Linux.
2 tasks
bantonsson
pushed a commit
that referenced
this pull request
Mar 25, 2024
…C` helper **What does this PR do?** This PR introduces a new `DDOG_CHARSLICE_C_BARE` helper, as well as undoes the change to `DDOG_CHARSLICE_C` from https://github.com/DataDog/libdatadog/pull/305/files#diff-5c00b9c49c81bf0d0a754e0bcc6e0add4fe849bf0ea4a4d1ebfac8f698150f0b There are now two helpers: `DDOG_CHARSLICE_C` that includes the `(ddog_CharSlice)` cast and `DDOG_CHARSLICE_C_BARE` which doesn't. **Motivation:** In a nutshell @bwoebi explained to me that on Windows there's times where you need to use `(ddog_CharSlice) {.ptr = ..., .len = ...}` and others where you need to use `{.ptr = ..., .len = ...}` and cannot include the cast. Thus in #305 we tweaked the helper to never have `(ddog_CharSlice)`, with the intention of using `(ddog_CharSlice) DDOG_CHARSLICE_C(...)` some times, and `DDOG_CHARSLICE_C(...)` the other times. But... this had the downside of making some of our Ruby Profiler code really ugly, as we'd need to move from `DDOG_CHARSLICE_C` to `(CharSlice) DDOG_CHARSLICE_C` in a lot of cases. Thus, this PR introduces one helper for each variant, so that we always have a nice user-friendly option for each case, and avoid needing to sprinkle casts. **Additional Notes:** Arghhh C/C++ you always manage to be weird and annoying. **How to test the change?** I've tested this change by compiling the Ruby profiler to use this branch of libdatadog, and validating that it compiles successfully on Linux.
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.
Adds NamedPipes and spawning of the sidecar process for windows support.