-
Notifications
You must be signed in to change notification settings - Fork 18.4k
os: optimise cgo clearenv #70672
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
Open
+87
−3
Open
os: optimise cgo clearenv #70672
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions
src/runtime/cgo/clearenv.go
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,15 @@ | ||
| // Copyright 2025 The Go Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style | ||
| // license that can be found in the LICENSE file. | ||
|
|
||
| //go:build linux | ||
|
|
||
| package cgo | ||
|
|
||
| import _ "unsafe" // for go:linkname | ||
|
|
||
| //go:cgo_import_static x_cgo_clearenv | ||
| //go:linkname x_cgo_clearenv x_cgo_clearenv | ||
| //go:linkname _cgo_clearenv runtime._cgo_clearenv | ||
| var x_cgo_clearenv byte | ||
| var _cgo_clearenv = &x_cgo_clearenv |
19 changes: 19 additions & 0 deletions
src/runtime/cgo/gcc_clearenv.c
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,19 @@ | ||
| // Copyright 2025 The Go Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style | ||
| // license that can be found in the LICENSE file. | ||
|
|
||
| //go:build linux | ||
|
|
||
| #include "libcgo.h" | ||
|
|
||
| #include <stdlib.h> | ||
|
|
||
| /* Stub for calling clearenv */ | ||
| void | ||
| x_cgo_clearenv(void **_unused) | ||
| { | ||
| _cgo_tsan_acquire(); | ||
| clearenv(); | ||
| _cgo_tsan_release(); | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: extra newline |
||
29 changes: 29 additions & 0 deletions
src/runtime/runtime_clearenv.go
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,29 @@ | ||
| // Copyright 2025 The Go Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style | ||
| // license that can be found in the LICENSE file. | ||
|
|
||
| //go:build linux | ||
|
|
||
| package runtime | ||
|
|
||
| import "unsafe" | ||
|
|
||
| var _cgo_clearenv unsafe.Pointer // pointer to C function | ||
|
|
||
| // Clear the C environment if cgo is loaded. | ||
| func clearenv_c() { | ||
| if _cgo_clearenv == nil { | ||
| return | ||
| } | ||
| asmcgocall(_cgo_clearenv, nil) | ||
| } | ||
|
|
||
| //go:linkname syscall_runtimeClearenv syscall.runtimeClearenv | ||
| func syscall_runtimeClearenv(env map[string]int) { | ||
| clearenv_c() | ||
| // Did we just unset GODEBUG? | ||
| if _, ok := env["GODEBUG"]; ok { | ||
| godebugEnv.Store(nil) | ||
| godebugNotify(true) | ||
| } | ||
| } |
18 changes: 18 additions & 0 deletions
src/runtime/runtime_noclearenv.go
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 @@ | ||
| // Copyright 2025 The Go Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style | ||
| // license that can be found in the LICENSE file. | ||
|
|
||
| //go:build !linux | ||
|
|
||
| package runtime | ||
|
|
||
| import _ "unsafe" // for go:linkname | ||
|
|
||
| //go:linkname syscall_runtimeClearenv syscall.runtimeClearenv | ||
| func syscall_runtimeClearenv(env map[string]int) { | ||
| // The system doesn't have clearenv(3) so emulate it by unsetting all of | ||
| // the variables manually. | ||
| for k := range env { | ||
| syscall_runtimeUnsetenv(k) | ||
| } | ||
| } |
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
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.