Commit c7ac645d authored by Tobias Klauser's avatar Tobias Klauser Committed by Tobias Klauser

runtime: fix reference to sys{Fault,Free,Reserve,Unused,Used} in comments

Change-Id: Icbaedc49c810c63c51d56ae394d2f70e4d64b3e0
Reviewed-on: https://go-review.googlesource.com/136495
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: default avatarIan Lance Taylor <iant@golang.org>
parent 0ee8a559
...@@ -328,27 +328,27 @@ var physPageSize uintptr ...@@ -328,27 +328,27 @@ var physPageSize uintptr
// may use larger alignment, so the caller must be careful to realign the // may use larger alignment, so the caller must be careful to realign the
// memory obtained by sysAlloc. // memory obtained by sysAlloc.
// //
// SysUnused notifies the operating system that the contents // sysUnused notifies the operating system that the contents
// of the memory region are no longer needed and can be reused // of the memory region are no longer needed and can be reused
// for other purposes. // for other purposes.
// SysUsed notifies the operating system that the contents // sysUsed notifies the operating system that the contents
// of the memory region are needed again. // of the memory region are needed again.
// //
// SysFree returns it unconditionally; this is only used if // sysFree returns it unconditionally; this is only used if
// an out-of-memory error has been detected midway through // an out-of-memory error has been detected midway through
// an allocation. It is okay if SysFree is a no-op. // an allocation. It is okay if sysFree is a no-op.
// //
// SysReserve reserves address space without allocating memory. // sysReserve reserves address space without allocating memory.
// If the pointer passed to it is non-nil, the caller wants the // If the pointer passed to it is non-nil, the caller wants the
// reservation there, but SysReserve can still choose another // reservation there, but sysReserve can still choose another
// location if that one is unavailable. // location if that one is unavailable.
// NOTE: SysReserve returns OS-aligned memory, but the heap allocator // NOTE: sysReserve returns OS-aligned memory, but the heap allocator
// may use larger alignment, so the caller must be careful to realign the // may use larger alignment, so the caller must be careful to realign the
// memory obtained by sysAlloc. // memory obtained by sysAlloc.
// //
// SysMap maps previously reserved address space for use. // sysMap maps previously reserved address space for use.
// //
// SysFault marks a (already sysAlloc'd) region to fault // sysFault marks a (already sysAlloc'd) region to fault
// if accessed. Used only for debugging the runtime. // if accessed. Used only for debugging the runtime.
func mallocinit() { func mallocinit() {
......
...@@ -339,18 +339,18 @@ func (s *mspan) sweep(preserve bool) bool { ...@@ -339,18 +339,18 @@ func (s *mspan) sweep(preserve bool) bool {
// Free large span to heap // Free large span to heap
// NOTE(rsc,dvyukov): The original implementation of efence // NOTE(rsc,dvyukov): The original implementation of efence
// in CL 22060046 used SysFree instead of SysFault, so that // in CL 22060046 used sysFree instead of sysFault, so that
// the operating system would eventually give the memory // the operating system would eventually give the memory
// back to us again, so that an efence program could run // back to us again, so that an efence program could run
// longer without running out of memory. Unfortunately, // longer without running out of memory. Unfortunately,
// calling SysFree here without any kind of adjustment of the // calling sysFree here without any kind of adjustment of the
// heap data structures means that when the memory does // heap data structures means that when the memory does
// come back to us, we have the wrong metadata for it, either in // come back to us, we have the wrong metadata for it, either in
// the MSpan structures or in the garbage collection bitmap. // the MSpan structures or in the garbage collection bitmap.
// Using SysFault here means that the program will run out of // Using sysFault here means that the program will run out of
// memory fairly quickly in efence mode, but at least it won't // memory fairly quickly in efence mode, but at least it won't
// have mysterious crashes due to confused memory reuse. // have mysterious crashes due to confused memory reuse.
// It should be possible to switch back to SysFree if we also // It should be possible to switch back to sysFree if we also
// implement and then call some kind of MHeap_DeleteSpan. // implement and then call some kind of MHeap_DeleteSpan.
if debug.efence > 0 { if debug.efence > 0 {
s.limit = 0 // prevent mlookup from finding this span s.limit = 0 // prevent mlookup from finding this span
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment