-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Refactor platform specific process path #4770
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
wmoxam
wants to merge
3
commits into
crystal-lang:master
from
wmoxam:refactor-platform-specific-process-path
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| require "c/mach-o/dyld" | ||
|
|
||
| module System | ||
| # nodoc | ||
| class Process | ||
| def self.executable_path_impl | ||
| buf = GC.malloc_atomic(LibC::PATH_MAX).as(UInt8*) | ||
| size = LibC::PATH_MAX.to_u32 | ||
|
|
||
| if LibC._NSGetExecutablePath(buf, pointerof(size)) == -1 | ||
| buf = GC.malloc_atomic(size).as(UInt8*) | ||
| return nil if LibC._NSGetExecutablePath(buf, pointerof(size)) == -1 | ||
| end | ||
|
|
||
| String.new(buf) | ||
| end | ||
| end | ||
| end | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| require "c/sysctl" | ||
|
|
||
| module System | ||
| # nodoc | ||
| class Process | ||
| def self.executable_path_impl | ||
| mib = Int32[LibC::CTL_KERN, LibC::KERN_PROC, LibC::KERN_PROC_PATHNAME, -1] | ||
| buf = GC.malloc_atomic(LibC::PATH_MAX).as(UInt8*) | ||
| size = LibC::SizeT.new(LibC::PATH_MAX) | ||
|
|
||
| if LibC.sysctl(mib, 4, buf, pointerof(size), nil, 0) == 0 | ||
| String.new(buf, size - 1) | ||
| end | ||
| end | ||
| end | ||
| end |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| module System | ||
| # nodoc | ||
| class Process | ||
| def self.executable_path_impl | ||
| "/proc/self/exe" | ||
| end | ||
| end | ||
| end |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| module Crystal | ||
| # :nodoc: | ||
| module System | ||
| # :nodoc: | ||
| module Process | ||
| # Returns possible location of executable path | ||
| # def self.executable_path_impl | ||
| end | ||
| end | ||
| end | ||
|
|
||
| {% if flag?(:darwin) %} | ||
| require "./darwin/process" | ||
| {% elsif flag?(:freebsd) %} | ||
| require "./freebsd/process" | ||
| {% elsif flag?(:linux) %} | ||
| require "./linux/process" | ||
| {% else %} | ||
| module System | ||
| # nodoc | ||
| class Process | ||
| INITIAL_PATH = ENV["PATH"]? | ||
| INITIAL_PWD = Dir.current | ||
|
|
||
| def self.executable_path_impl | ||
| ::Process.find_executable(PROGRAM_NAME, INITIAL_PATH, INITIAL_PWD) | ||
| end | ||
| end | ||
| end | ||
| {% end %} |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| lib LibC | ||
| PATH_MAX = 1024 | ||
| fun _NSGetExecutablePath(buf : Char*, bufsize : UInt32*) : Int | ||
| end |
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks like repeated call to
LibC._NSGetExecutablePath(buf, pointerof(size)). Would it be possible to save result of previous call in a variable and use it here?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No. The first call will report an error and update
sizeto be the actual path length, when the default, arbitrary-sized, buffer is too small. We must make a second call with a larger buffer to get the path.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wrong call, you're right.