summaryrefslogtreecommitdiff
path: root/src/host/library.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/host/library.zig')
-rw-r--r--src/host/library.zig27
1 files changed, 17 insertions, 10 deletions
diff --git a/src/host/library.zig b/src/host/library.zig
index f8bc4e8..91b2296 100644
--- a/src/host/library.zig
+++ b/src/host/library.zig
@@ -1,9 +1,12 @@
//! Loading sketch libraries, and noticing when a build replaces one.
//!
//! `dlopen` returns the handle it already has for a path it loaded before, so
-//! every load goes through a private copy with a fresh name. The copy is
-//! deleted right after loading: the mapping keeps the code alive, and nothing
-//! is left behind if the host dies.
+//! every load goes through a symlink with a fresh name to an fd open on the
+//! library: what loads is the file that was opened, whatever a build renames
+//! over it meanwhile. The link is deleted right after loading: the mapping
+//! keeps the code alive, and nothing is left behind if the host dies. A
+//! library rewritten in place instead (same inode) would not load again, and
+//! would change the code under the running host.
const std = @import("std");
const linux = std.os.linux;
const c = @import("c");
@@ -40,14 +43,18 @@ pub const Library = struct {
return .{ .object = object, .sketch = sketch };
}
- /// Loads `source` through a uniquely named copy in `scratch_dir`.
- pub fn openCopy(io: std.Io, source: []const u8, scratch_dir: []const u8, serial: usize) !Library {
- var buf: [std.fs.max_path_bytes]u8 = undefined;
- const copy = try std.mem.printSentinel(&buf, "{s}/sketchbook-{d}-{d}.so", .{ scratch_dir, linux.getpid(), serial }, 0);
+ /// Loads `source` through a uniquely named symlink in `scratch_dir`.
+ pub fn openFresh(io: std.Io, source: []const u8, scratch_dir: []const u8, serial: usize) !Library {
const cwd = std.Io.Dir.cwd();
- try cwd.copyFile(source, cwd, copy, io, .{});
- defer cwd.deleteFile(io, copy) catch {};
- return open(copy, source);
+ const file = try cwd.openFile(io, source, .{});
+ defer file.close(io);
+ var target_buf: [32]u8 = undefined;
+ const target = try std.mem.print(&target_buf, "/proc/self/fd/{d}", .{file.handle});
+ var buf: [std.fs.max_path_bytes]u8 = undefined;
+ const link = try std.mem.printSentinel(&buf, "{s}/sketchbook-{d}-{d}.so", .{ scratch_dir, linux.getpid(), serial }, 0);
+ try cwd.symLink(io, target, link, .{});
+ defer cwd.deleteFile(io, link) catch {};
+ return open(link, source);
}
pub fn close(self: *Library) void {