Obsolete
/
libipc-old
Archived
3
0
Fork 0
Code

Testing basic message exchange on a UNIX socket.

master
Philippe Pittoli 2022-12-23 02:35:38 +01:00
parent ceafe4c84f
commit ca0d6adbc6
2 changed files with 91 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182
zig-impl/src/context.zig
View File

@ -20,7 +20,7 @@ pub const PollFD = std.ArrayList(i32);
// Context of the whole networking state. // Context of the whole networking state.
pub const Context = struct { pub const Context = struct {
pub const IPC_HEADER_SIZE = 4; // Size (4 bytes) then content. pub const IPC_HEADER_SIZE = 5; // Size (5 bytes) then content.
pub const IPC_BASE_SIZE = 2000000; // 2 MB, plenty enough space for messages pub const IPC_BASE_SIZE = 2000000; // 2 MB, plenty enough space for messages
pub const IPC_MAX_MESSAGE_SIZE = IPC_BASE_SIZE-IPC_HEADER_SIZE; pub const IPC_MAX_MESSAGE_SIZE = IPC_BASE_SIZE-IPC_HEADER_SIZE;
pub const IPC_VERSION = 1; pub const IPC_VERSION = 1;
@ -213,6 +213,22 @@ pub const Context = struct {
} }
}; };
//test "Simple structures - init, display and memory check" {
// // origin destination
// var s = Switch.init(3,8);
// var payload = "hello!!";
// // fd type payload
// var m = Message.init(0, Message.Type.DATA, payload);
//
// // type index origin message
// var e = Event.init(Event.Type.CONNECTION, 5, 8, &m);
// // CLIENT SIDE: connection to a service.
// _ = try c.connect(path);
// // TODO: connection to a server, but switched with clientfd "3".
// _ = try c.connection_switched(path, 3);
//}
// Creating a new thread: testing UNIX communication. // Creating a new thread: testing UNIX communication.
// This is a client sending a raw "Hello world!" bytestring, // This is a client sending a raw "Hello world!" bytestring,
@ -235,28 +251,10 @@ const CommunicationTestThread = struct {
var path = fbs.getWritten(); var path = fbs.getWritten();
const socket = try net.connectUnixSocket(path); const socket = try net.connectUnixSocket(path);
defer socket.close(); defer socket.close();
// print("So we're a client now... path: {s}\n", .{path});
_ = try socket.writer().writeAll("Hello world!"); _ = try socket.writer().writeAll("Hello world!");
} }
}; };
test "Simple structures - init, display and memory check" {
// origin destination
// var s = Switch.init(3,8);
// var payload = "hello!!";
// // fd type payload
// var m = Message.init(0, Message.Type.DATA, payload);
//
// // type index origin message
// var e = Event.init(Event.Type.CONNECTION, 5, 8, &m);
// // CLIENT SIDE: connection to a service.
// _ = try c.connect(path);
// // TODO: connection to a server, but switched with clientfd "3".
// _ = try c.connection_switched(path, 3);
}
test "Context - creation, display and memory check" { test "Context - creation, display and memory check" {
const config = .{.safety = true}; const config = .{.safety = true};
var gpa = std.heap.GeneralPurposeAllocator(config){}; var gpa = std.heap.GeneralPurposeAllocator(config){};
@ -293,77 +291,77 @@ test "Context - creation, display and memory check" {
try testing.expectEqualSlices(u8, "Hello world!", buf[0..n]); try testing.expectEqualSlices(u8, "Hello world!", buf[0..n]);
} }
// // TODO: // Creating a new thread: testing UNIX communication.
// // Creating a new thread: testing UNIX communication. // This is a client sending a an instance of Message.
// // This is a client sending a raw "Hello world!" bytestring, const ConnectThenSendMessageThread = struct {
// // not an instance of Message. fn clientFn() !void {
// const ConnectThenSendMessageThread = struct { const config = .{.safety = true};
// fn clientFn() !void { var gpa = std.heap.GeneralPurposeAllocator(config){};
// const config = .{.safety = true}; defer _ = gpa.deinit();
// var gpa = std.heap.GeneralPurposeAllocator(config){}; const allocator = gpa.allocator();
// defer _ = gpa.deinit();
// const allocator = gpa.allocator(); var c = try Context.init(allocator);
// defer c.deinit(); // There. Can't leak. Isn't Zig wonderful?
// var c = try Context.init(allocator);
// defer c.deinit(); // There. Can't leak. Isn't Zig wonderful? var path_buffer: [1000]u8 = undefined;
// var path_fbs = std.io.fixedBufferStream(&path_buffer);
// var path_buffer: [1000]u8 = undefined; var path_writer = path_fbs.writer();
// var path_fbs = std.io.fixedBufferStream(&path_buffer); try c.server_path("simple-context-test", path_writer);
// var path_writer = path_fbs.writer(); var path = path_fbs.getWritten();
// try c.server_path("simple-context-test", path_writer);
// var path = path_fbs.getWritten(); // Actual UNIX socket connection.
// const socket = try net.connectUnixSocket(path);
// // Actual UNIX socket connection. defer socket.close();
// const socket = try net.connectUnixSocket(path);
// defer socket.close(); // Writing message into a buffer.
// var message_buffer: [1000]u8 = undefined;
// // Writing message into a buffer. var message_fbs = std.io.fixedBufferStream(&message_buffer);
// var message_buffer: [1000]u8 = undefined; var message_writer = message_fbs.writer();
// var message_fbs = std.io.fixedBufferStream(&message_buffer); // 'fd' parameter is not taken into account here (no loop)
// var message_writer = message_fbs.writer();
// // 'fd' parameter is not taken into account here (no loop) var m = try Message.init(0, Message.Type.DATA, allocator, "Hello world!");
// defer m.deinit();
// var m = try Message.init(0, Message.Type.DATA, allocator, "Hello world!"); _ = try m.write(message_writer);
// try m.write(message_writer);
// // print("So we're a client now... path: {s}\n", .{path});
// // print("So we're a client now... path: {s}\n", .{path}); _ = try socket.writer().writeAll(message_fbs.getWritten());
// _ = try socket.writer().writeAll(message_fbs.getWritten()); }
// } };
// };
//
// test "Context - creation, echo once" {
// test "Context - creation, echo once" { const config = .{.safety = true};
// const config = .{.safety = true}; var gpa = std.heap.GeneralPurposeAllocator(config){};
// var gpa = std.heap.GeneralPurposeAllocator(config){}; defer _ = gpa.deinit();
// defer _ = gpa.deinit();
// const allocator = gpa.allocator();
// const allocator = gpa.allocator();
// var c = try Context.init(allocator);
// var c = try Context.init(allocator); defer c.deinit(); // There. Can't leak. Isn't Zig wonderful?
// defer c.deinit(); // There. Can't leak. Isn't Zig wonderful?
// var buffer: [1000]u8 = undefined;
// var buffer: [1000]u8 = undefined; var fbs = std.io.fixedBufferStream(&buffer);
// var fbs = std.io.fixedBufferStream(&buffer); var writer = fbs.writer();
// var writer = fbs.writer(); try c.server_path("simple-context-test", writer);
// try c.server_path("simple-context-test", writer); var path = fbs.getWritten();
// var path = fbs.getWritten();
// // SERVER SIDE: creating a service.
// // SERVER SIDE: creating a service. var server = try c.server_init(path);
// var server = try c.server_init(path); defer server.deinit();
// defer server.deinit(); defer std.fs.cwd().deleteFile(path) catch {}; // Once done, remove file.
// defer std.fs.cwd().deleteFile(path) catch {}; // Once done, remove file.
// const t = try std.Thread.spawn(.{}, ConnectThenSendMessageThread.clientFn, .{});
// const t = try std.Thread.spawn(.{}, ConnectThenSendMessageThread.clientFn, .{}); defer t.join();
// defer t.join();
// // Server.accept returns a net.StreamServer.Connection.
// // Server.accept returns a net.StreamServer.Connection. var client = try server.accept();
// var client = try server.accept(); defer client.stream.close();
// defer client.stream.close(); var buf: [1000]u8 = undefined;
// var buf: [1000]u8 = undefined; const n = try client.stream.reader().read(&buf);
// const n = try client.stream.reader().read(&buf); var m = try Message.read(buf[0..n], allocator);
// var m = try Message.read(buf[0..n], allocator); defer m.deinit();
//
// try testing.expectEqual(@as(usize, 12), m.payload.len); try testing.expectEqual(@as(usize, 12), m.payload.len);
// try testing.expectEqualSlices(u8, m.payload, "Hello world!"); try testing.expectEqualSlices(u8, m.payload, "Hello world!");
// } }

10
zig-impl/src/main.zig
View File

@ -39,7 +39,6 @@ test {
_ = @import("./util.zig"); _ = @import("./util.zig");
} }
// FIRST
fn create_service() !void { fn create_service() !void {
const config = .{.safety = true}; const config = .{.safety = true};
var gpa = std.heap.GeneralPurposeAllocator(config){}; var gpa = std.heap.GeneralPurposeAllocator(config){};
@ -53,6 +52,7 @@ fn create_service() !void {
// SERVER SIDE: creating a service. // SERVER SIDE: creating a service.
_ = try ctx.server_init(path); _ = try ctx.server_init(path);
var some_event = try ctx.wait_event(); var some_event = try ctx.wait_event();
switch (some_event.t) { switch (some_event.t) {
.CONNECTION => { .CONNECTION => {
@ -77,11 +77,3 @@ pub fn main() !u8 {
try create_service(); try create_service();
return 0; return 0;
} }
// export fn add(a: i32, b: i32) i32 {
// return a + b;
// }
// test "basic add functionality" {
// try testing.expect(add(3, 7) == 10);
// }