zig

commit c518b7b8bf71ad77adc96b5c9dabea277fe3ee43 (tree)
parent 381f845287c8aef25a5351be81dfdfad055f0785
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Tue, 28 May 2019 12:46:44 -0400

thread.spawn: bubble up mprotect error.OutOfMemory

Diffstat:
M
std/os.zig
 | 
9
+++++++++
M
std/thread.zig
 | 
1
-

2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/std/os.zig b/std/os.zig
@@ -1883,7 +1883,16 @@ pub fn inotify_rm_watch(inotify_fd: i32, wd: i32) void {
 }
 
 pub const MProtectError = error{
+    /// The memory cannot be given the specified access.  This can happen, for example, if you
+    /// mmap(2)  a  file  to  which  you have read-only access, then ask mprotect() to mark it
+    /// PROT_WRITE.
     AccessDenied,
+
+    /// Changing  the  protection  of a memory region would result in the total number of map‐
+    /// pings with distinct attributes (e.g., read versus read/write protection) exceeding the
+    /// allowed maximum.  (For example, making the protection of a range PROT_READ in the mid‐
+    /// dle of a region currently protected as PROT_READ|PROT_WRITE would result in three map‐
+    /// pings: two read/write mappings at each end and a read-only mapping in the middle.)
     OutOfMemory,
     Unexpected,
 };
diff --git a/std/thread.zig b/std/thread.zig
@@ -277,7 +277,6 @@ pub const Thread = struct {
             mmap_slice,
             os.PROT_READ | os.PROT_WRITE,
         ) catch |err| switch (err) {
-            error.OutOfMemory => unreachable,
             error.AccessDenied => unreachable,
             else => |e| return e,
         };