| ... | ... | @@ -1,3 +1,6 @@ |
| 1 | const std = @import("../index.zig"); |
| 2 | const assert = std.debug.assert; |
| 3 | |
| 1 | 4 | ////////////////////////// |
| 2 | 5 | //// IPC structures //// |
| 3 | 6 | ////////////////////////// |
| ... | ... | @@ -5,28 +8,36 @@ |
| 5 | 8 | pub const Message = struct { |
| 6 | 9 | sender: MailboxId, |
| 7 | 10 | receiver: MailboxId, |
| 8 | | type: usize, |
| 9 | | payload: usize, |
| 10 | | buffer: ?[]const u8, |
| 11 | code: usize, |
| 12 | args: [5]usize, |
| 13 | payload: ?[]const u8, |
| 11 | 14 | |
| 12 | 15 | pub fn from(mailbox_id: &const MailboxId) Message { |
| 13 | 16 | return Message { |
| 14 | 17 | .sender = MailboxId.Undefined, |
| 15 | 18 | .receiver = *mailbox_id, |
| 16 | | .type = 0, |
| 17 | | .payload = 0, |
| 18 | | .buffer = null, |
| 19 | .code = undefined, |
| 20 | .args = undefined, |
| 21 | .payload = null, |
| 19 | 22 | }; |
| 20 | 23 | } |
| 21 | 24 | |
| 22 | | pub fn to(mailbox_id: &const MailboxId, msg_type: usize) Message { |
| 23 | | return Message { |
| 25 | pub fn to(mailbox_id: &const MailboxId, msg_code: usize, args: ...) Message { |
| 26 | var message = Message { |
| 24 | 27 | .sender = MailboxId.This, |
| 25 | 28 | .receiver = *mailbox_id, |
| 26 | | .type = msg_type, |
| 27 | | .payload = 0, |
| 28 | | .buffer = null, |
| 29 | .code = msg_code, |
| 30 | .args = undefined, |
| 31 | .payload = null, |
| 29 | 32 | }; |
| 33 | |
| 34 | assert (args.len <= message.args.len); |
| 35 | comptime var i = 0; |
| 36 | inline while (i < args.len) : (i += 1) { |
| 37 | message.args[i] = args[i]; |
| 38 | } |
| 39 | |
| 40 | return message; |
| 30 | 41 | } |
| 31 | 42 | |
| 32 | 43 | pub fn as(self: &const Message, sender: &const MailboxId) Message { |
| ... | ... | @@ -35,15 +46,9 @@ pub const Message = struct { |
| 35 | 46 | return message; |
| 36 | 47 | } |
| 37 | 48 | |
| 38 | | pub fn data(self: &const Message, var_data: var) Message { |
| 49 | pub fn withPayload(self: &const Message, payload: []const u8) Message { |
| 39 | 50 | var message = *self; |
| 40 | | |
| 41 | | if (@canImplicitCast([]const u8, var_data)) { |
| 42 | | message.buffer = var_data; |
| 43 | | } else { |
| 44 | | message.payload = var_data; |
| 45 | | } |
| 46 | | |
| 51 | message.payload = payload; |
| 47 | 52 | return message; |
| 48 | 53 | } |
| 49 | 54 | }; |
| ... | ... | @@ -91,7 +96,7 @@ pub fn read(fd: i32, buf: &u8, count: usize) usize { |
| 91 | 96 | var message = Message.from(MailboxId.This); |
| 92 | 97 | receive(&message); |
| 93 | 98 | |
| 94 | | buf[i] = u8(message.payload); |
| 99 | buf[i] = u8(message.args[0]); |
| 95 | 100 | } |
| 96 | 101 | }, |
| 97 | 102 | else => unreachable, |
| ... | ... | @@ -104,7 +109,7 @@ pub fn write(fd: i32, buf: &const u8, count: usize) usize { |
| 104 | 109 | switch (fd) { |
| 105 | 110 | STDOUT_FILENO, STDERR_FILENO => { |
| 106 | 111 | send(Message.to(Server.Terminal, 1) |
| 107 | | .data(buf[0..count])); |
| 112 | .withPayload(buf[0..count])); |
| 108 | 113 | }, |
| 109 | 114 | else => unreachable, |
| 110 | 115 | } |
Andrea Orru <andrea@orru.io> 2018-04-12 22:24:57-07:00
std