authorgravatar for tgschultz@gmail.comtgschultz <tgschultz@gmail.com> 2018-04-18 13:55:42-05:00
committergravatar for tgschultz@gmail.comtgschultz <tgschultz@gmail.com> 2018-04-18 13:55:42-05:00
log8b66dd8c7d2809c3ec86f1eec8acc0a1c184c8c2
tree4f6724928de3809b98f448b15aa97f8059086aba
parentc90f936eef81fce3355231c4d79ecfe40df84f7e

Added unstaged changes.

9 files changed, 65 insertions(+), 45 deletions(-)

CMakeLists.txt+2
......@@ -507,6 +507,8 @@ set(ZIG_STD_FILES
507507 "os/linux/index.zig"
508508 "os/linux/x86_64.zig"
509509 "os/path.zig"
510 "os/time.zig"
511 "os/epoch.zig"
510512 "os/windows/error.zig"
511513 "os/windows/index.zig"
512514 "os/windows/util.zig"
std/c/darwin.zig+18
......@@ -3,10 +3,28 @@ pub extern "c" fn _NSGetExecutablePath(buf: &u8, bufsize: &u32) c_int;
33
44pub extern "c" fn __getdirentries64(fd: c_int, buf_ptr: &u8, buf_len: usize, basep: &i64) usize;
55
6pub extern "c" fn mach_absolute_time() u64;
7pub extern "c" fn mach_timebase_info(&mach_timebase_info_data) void;
8
69pub use @import("../os/darwin_errno.zig");
710
811pub const _errno = __error;
912
13pub const timeval = extern struct {
14 tv_sec: isize,
15 tv_usec: isize,
16};
17
18pub const timezone = extern struct {
19 tz_minuteswest: i32,
20 tz_dsttime: i32,
21};
22
23pub const mach_timebase_info_data = struct {
24 numer: u32,
25 denom: u32,
26};
27
1028/// Renamed to Stat to not conflict with the stat function.
1129pub const Stat = extern struct {
1230 dev: i32,
std/c/index.zig+1
......@@ -40,6 +40,7 @@ pub extern "c" fn dup2(old_fd: c_int, new_fd: c_int) c_int;
4040pub extern "c" fn readlink(noalias path: &const u8, noalias buf: &u8, bufsize: usize) isize;
4141pub extern "c" fn realpath(noalias file_name: &const u8, noalias resolved_name: &u8) ?&u8;
4242pub extern "c" fn sigprocmask(how: c_int, noalias set: &const sigset_t, noalias oset: ?&sigset_t) c_int;
43pub extern "c" fn gettimeofday(&timeval, ?&timezone) c_int;
4344pub extern "c" fn sigaction(sig: c_int, noalias act: &const Sigaction, noalias oact: ?&Sigaction) c_int;
4445pub extern "c" fn nanosleep(rqtp: &const timespec, rmtp: ?&timespec) c_int;
4546pub extern "c" fn setreuid(ruid: c_uint, euid: c_uint) c_int;
std/fmt/index.zig+2-1
......@@ -86,7 +86,8 @@ pub fn format(context: var, comptime Errors: type, output: fn(@typeOf(context),
8686 },
8787 's' => {
8888 state = State.Buf;
89 },'.' => {
89 },
90 '.' => {
9091 state = State.Float;
9192 },
9293 else => @compileError("Unknown format character: " ++ []u8{c}),
std/os/darwin.zig+4
......@@ -251,6 +251,10 @@ pub fn readlink(noalias path: &const u8, noalias buf_ptr: &u8, buf_len: usize) u
251251 return errnoWrap(c.readlink(path, buf_ptr, buf_len));
252252}
253253
254pub fn gettimeofday(&timeval, ?&timezone) usize {
255 return errnoWrap(c.gettimeofday(timeval, timezone));
256}
257
254258pub fn nanosleep(req: &const timespec, rem: ?&timespec) usize {
255259 return errnoWrap(c.nanosleep(req, rem));
256260}
std/os/index.zig+1-44
......@@ -18,6 +18,7 @@ pub const posix = switch(builtin.os) {
1818pub const ChildProcess = @import("child_process.zig").ChildProcess;
1919pub const path = @import("path.zig");
2020pub const File = @import("file.zig").File;
21pub const time = @import("time.zig");
2122
2223pub const FileMode = switch (builtin.os) {
2324 Os.windows => void,
......@@ -1356,50 +1357,6 @@ pub fn readLink(allocator: &Allocator, pathname: []const u8) ![]u8 {
13561357 }
13571358}
13581359
1359pub fn sleep(seconds: usize, nanoseconds: usize) void {
1360 switch(builtin.os) {
1361 Os.linux, Os.macosx, Os.ios => {
1362 posixSleep(u63(seconds), u63(nanoseconds));
1363 },
1364 Os.windows => {
1365 const milliseconds = seconds * 1000 + nanoseconds / 1000000;
1366 windows.Sleep(windows.DWORD(milliseconds));
1367 },
1368 else => @compileError("Unsupported OS"),
1369 }
1370}
1371
1372const u63 = @IntType(false, 63);
1373pub fn posixSleep(seconds: u63, nanoseconds: u63) void {
1374 var req = posix.timespec {
1375 .tv_sec = seconds,
1376 .tv_nsec = nanoseconds,
1377 };
1378 var rem: posix.timespec = undefined;
1379 while (true) {
1380 const ret_val = posix.nanosleep(&req, &rem);
1381 const err = posix.getErrno(ret_val);
1382 if (err == 0) return;
1383 switch (err) {
1384 posix.EFAULT => unreachable,
1385 posix.EINVAL => {
1386 // Sometimes Darwin returns EINVAL for no reason.
1387 // We treat it as a spurious wakeup.
1388 return;
1389 },
1390 posix.EINTR => {
1391 req = rem;
1392 continue;
1393 },
1394 else => return,
1395 }
1396 }
1397}
1398
1399test "os.sleep" {
1400 sleep(0, 1);
1401}
1402
14031360pub fn posix_setuid(uid: u32) !void {
14041361 const err = posix.getErrno(posix.setuid(uid));
14051362 if (err == 0) return;
std/os/linux/index.zig+20
......@@ -495,6 +495,26 @@ pub fn waitpid(pid: i32, status: &i32, options: i32) usize {
495495 return syscall4(SYS_wait4, @bitCast(usize, isize(pid)), @ptrToInt(status), @bitCast(usize, isize(options)), 0);
496496}
497497
498pub fn clock_gettime(clk_id: i32, tp: &timespec) usize {
499 return syscall2(SYS_clock_gettime, @bitCast(usize, isize(clk_id)), @ptrToInt(tp));
500}
501
502pub fn clock_getres(clk_id: i32, tp: &timespec) usize {
503 return syscall2(SYS_clock_getres, @bitCast(usize, isize(clk_id)), @ptrToInt(tp));
504}
505
506pub fn clock_settime(clk_id: i32, tp: &const timespec) usize {
507 return syscall2(SYS_clock_settime, @bitCast(usize, isize(clk_id)), @ptrToInt(tp));
508}
509
510pub fn gettimeofday(tv: &timeval, tz: &timezone) usize {
511 return syscall2(SYS_gettimeofday, @ptrToInt(tv), @ptrToInt(tz));
512}
513
514pub fn settimeofdat(tv: &const timeval, tz: &const timezone) usize {
515 return syscall2(SYS_settimeofday, @ptrToInt(tv), @ptrToInt(tz));
516}
517
498518pub fn nanosleep(req: &const timespec, rem: ?&timespec) usize {
499519 return syscall2(SYS_nanosleep, @ptrToInt(req), @ptrToInt(rem));
500520}
std/os/linux/x86_64.zig+10
......@@ -489,6 +489,16 @@ pub const timespec = extern struct {
489489 tv_nsec: isize,
490490};
491491
492pub const timeval = extern struct {
493 tv_sec: isize,
494 tv_usec: isize,
495};
496
497pub const timezone = extern struct {
498 tz_minuteswest: i32,
499 tz_dsttime: i32,
500};
501
492502pub const dirent = extern struct {
493503 d_ino: usize,
494504 d_off: usize,
std/os/windows/index.zig+7
......@@ -61,6 +61,8 @@ pub extern "kernel32" stdcallcc fn GetFinalPathNameByHandleA(hFile: HANDLE, lpsz
6161
6262pub extern "kernel32" stdcallcc fn GetProcessHeap() ?HANDLE;
6363
64pub extern "kernel32" stdcallcc fn GetSystemTimeAsFileTime(?&FILETIME) void;
65
6466pub extern "kernel32" stdcallcc fn HeapCreate(flOptions: DWORD, dwInitialSize: SIZE_T, dwMaximumSize: SIZE_T) ?HANDLE;
6567pub extern "kernel32" stdcallcc fn HeapDestroy(hHeap: HANDLE) BOOL;
6668pub extern "kernel32" stdcallcc fn HeapReAlloc(hHeap: HANDLE, dwFlags: DWORD, lpMem: &c_void, dwBytes: SIZE_T) ?&c_void;
......@@ -77,6 +79,10 @@ pub extern "kernel32" stdcallcc fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem
7779
7880pub extern "kernel32" stdcallcc fn MoveFileExA(lpExistingFileName: LPCSTR, lpNewFileName: LPCSTR,
7981 dwFlags: DWORD) BOOL;
82
83pub extern "kernel32" stdcallcc fn QueryPerformanceCounter(lpPerformanceCount: &LARGE_INTEGER) BOOL;
84
85pub extern "kernel32" stdcallcc fn QueryPerformanceFrequency(lpFrequency: &LARGE_INTEGER) BOOL;
8086
8187pub extern "kernel32" stdcallcc fn ReadFile(in_hFile: HANDLE, out_lpBuffer: &c_void,
8288 in_nNumberOfBytesToRead: DWORD, out_lpNumberOfBytesRead: &DWORD,
......@@ -137,6 +143,7 @@ pub const UNICODE = false;
137143pub const WCHAR = u16;
138144pub const WORD = u16;
139145pub const LARGE_INTEGER = i64;
146pub const FILETIME = i64;
140147
141148pub const TRUE = 1;
142149pub const FALSE = 0;