Merge pull request #984 from lightpanda-io/zig.0.15.1

Zig 0.15.1

Author: krichprollsch

.github/actions/install/action.yml

@@ -5,7 +5,7 @@ inputs:
   zig:
     description: 'Zig version to install'
     required: false
-    default: '0.14.1'
+    default: '0.15.1'
   arch:
     description: 'CPU arch used to select the v8 lib'
     required: false

.github/workflows/zig-fmt.yml

@@ -1,7 +1,7 @@
 name: zig-fmt
 
 env:
-  ZIG_VERSION: 0.14.1
+  ZIG_VERSION: 0.15.1
 
 on:
   pull_request:

Dockerfile

@@ -1,7 +1,7 @@
 FROM debian:stable
 
 ARG MINISIG=0.12
-ARG ZIG=0.14.1
+ARG ZIG=0.15.1
 ARG ZIG_MINISIG=RWSGOq2NVecA2UPNdBUZykf1CCb147pkmdtYxgb3Ti+JO/wCYvhbAb/U
 ARG V8=13.6.233.8
 ARG ZIG_V8=v0.1.28

README.md

@@ -165,7 +165,7 @@ You can also follow the progress of our Javascript support in our dedicated [zig
 
 ### Prerequisites
 
-Lightpanda is written with [Zig](https://ziglang.org/) `0.14.1`. You have to
+Lightpanda is written with [Zig](https://ziglang.org/) `0.15.1`. You have to
 install it with the right version in order to build the project.
 
 Lightpanda also depends on

build.zig

@@ -23,7 +23,7 @@ const Build = std.Build;
 
 /// Do not rename this constant. It is scanned by some scripts to determine
 /// which zig version to install.
-const recommended_zig_version = "0.14.1";
+const recommended_zig_version = "0.15.1";
 
 pub fn build(b: *Build) !void {
     switch (comptime builtin.zig_version.order(std.SemanticVersion.parse(recommended_zig_version) catch unreachable)) {
@@ -49,10 +49,15 @@ pub fn build(b: *Build) !void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
+    // We're still using llvm because the new x86 backend seems to crash
+    // with v8. This can be reproduced in zig-v8-fork.
+
     const lightpanda_module = b.addModule("lightpanda", .{
         .root_source_file = b.path("src/main.zig"),
         .target = target,
         .optimize = optimize,
+        .link_libc = true,
+        .link_libcpp = true,
     });
     try addDependencies(b, lightpanda_module, opts);
 
@@ -63,6 +68,7 @@ pub fn build(b: *Build) !void {
         // compile and install
         const exe = b.addExecutable(.{
             .name = "lightpanda",
+            .use_llvm = true,
             .root_module = lightpanda_module,
         });
         b.installArtifact(exe);
@@ -85,6 +91,7 @@ pub fn build(b: *Build) !void {
         // compile
         const tests = b.addTest(.{
             .root_module = lightpanda_module,
+            .use_llvm = true,
             .test_runner = .{ .path = b.path("src/test_runner.zig"), .mode = .simple },
         });
 
@@ -111,6 +118,7 @@ pub fn build(b: *Build) !void {
         // compile and install
         const wpt = b.addExecutable(.{
             .name = "lightpanda-wpt",
+            .use_llvm = true,
             .root_module = wpt_module,
         });
 

build.zig.zon

@@ -5,9 +5,9 @@
     .fingerprint = 0xda130f3af836cea0,
     .dependencies = .{
         .v8 = .{
-            .url = "https://github.com/lightpanda-io/zig-v8-fork/archive/cf412d5b3d9d608582571d821e0d552337ef690d.tar.gz",
-            .hash = "v8-0.0.0-xddH69zDAwA4fp1dBo_jEDjS5bhXycPwRlZHp6_X890t",
+            .url = "https://github.com/lightpanda-io/zig-v8-fork/archive/e62726800663d0397d8766f7185040d8b8b69402.tar.gz",
+            .hash = "v8-0.0.0-xddH69zDAwD5i0hGhAsv3SPeihlj5fXGpJyO15KqBWOn",
         },
-        //.v8 = .{ .path = "../zig-v8-fork" },
+        //.v8 = .{ .path = "../zig-v8-fork" }
     },
 }

src/browser/Scheduler.zig

@@ -129,18 +129,18 @@ test "Scheduler" {
     try testing.expectDelta(3, try s.runHighPriority(), 1);
     try testing.expectEqual(0, task.calls.items.len);
 
-    std.time.sleep(std.time.ns_per_ms * 5);
+    std.Thread.sleep(std.time.ns_per_ms * 5);
     try testing.expectEqual(null, s.runHighPriority());
     try testing.expectEqualSlices(u32, &.{1}, task.calls.items);
 
     try s.add(&task, TestTask.run2, 3, .{});
     try s.add(&task, TestTask.run1, 2, .{});
 
-    std.time.sleep(std.time.ns_per_ms * 5);
+    std.Thread.sleep(std.time.ns_per_ms * 5);
     try testing.expectDelta(null, try s.runHighPriority(), 1);
     try testing.expectEqualSlices(u32, &.{ 1, 1, 2 }, task.calls.items);
 
-    std.time.sleep(std.time.ns_per_ms * 5);
+    std.Thread.sleep(std.time.ns_per_ms * 5);
     // wont' run secondary
     try testing.expectEqual(null, try s.runHighPriority());
     try testing.expectEqualSlices(u32, &.{ 1, 1, 2 }, task.calls.items);
@@ -155,13 +155,13 @@ const TestTask = struct {
     calls: std.ArrayListUnmanaged(u32) = .{},
 
     fn run1(ctx: *anyopaque) ?u32 {
-        var self: *TestTask = @alignCast(@ptrCast(ctx));
+        var self: *TestTask = @ptrCast(@alignCast(ctx));
         self.calls.append(self.allocator, 1) catch unreachable;
         return null;
     }
 
     fn run2(ctx: *anyopaque) ?u32 {
-        var self: *TestTask = @alignCast(@ptrCast(ctx));
+        var self: *TestTask = @ptrCast(@alignCast(ctx));
         self.calls.append(self.allocator, 2) catch unreachable;
         return 2;
     }

src/browser/ScriptManager.zig

@@ -62,7 +62,7 @@ allocator: Allocator,
 buffer_pool: BufferPool,
 script_pool: std.heap.MemoryPool(PendingScript),
 
-const OrderList = std.DoublyLinkedList(*PendingScript);
+const OrderList = std.DoublyLinkedList;
 
 pub fn init(browser: *Browser, page: *Page) ScriptManager {
     // page isn't fully initialized, we can setup our reference, but that's it.
@@ -96,7 +96,7 @@ pub fn reset(self: *ScriptManager) void {
 
 fn clearList(_: *const ScriptManager, list: *OrderList) void {
     while (list.first) |node| {
-        const pending_script = node.data;
+        const pending_script: *PendingScript = @fieldParentPtr("node", node);
         // this removes it from the list
         pending_script.deinit();
     }
@@ -179,7 +179,7 @@ pub fn addFromElement(self: *ScriptManager, element: *parser.Element) !void {
         .script = script,
         .complete = false,
         .manager = self,
-        .node = .{ .data = pending_script },
+        .node = .{},
     };
 
     if (source == .@"inline") {
@@ -193,7 +193,6 @@ pub fn addFromElement(self: *ScriptManager, element: *parser.Element) !void {
         log.debug(.http, "script queue", .{ .url = remote_url.? });
     }
 
-    pending_script.node = .{ .data = pending_script };
     self.getList(&pending_script.script).append(&pending_script.node);
 
     errdefer pending_script.deinit();
@@ -323,7 +322,7 @@ fn evaluate(self: *ScriptManager) void {
     defer self.is_evaluating = false;
 
     while (self.scripts.first) |n| {
-        var pending_script = n.data;
+        var pending_script: *PendingScript = @fieldParentPtr("node", n);
         if (pending_script.complete == false) {
             return;
         }
@@ -343,7 +342,7 @@ fn evaluate(self: *ScriptManager) void {
     }
 
     while (self.deferreds.first) |n| {
-        var pending_script = n.data;
+        var pending_script: *PendingScript = @fieldParentPtr("node", n);
         if (pending_script.complete == false) {
             return;
         }
@@ -395,15 +394,15 @@ fn getList(self: *ScriptManager, script: *const Script) *OrderList {
 }
 
 fn startCallback(transfer: *Http.Transfer) !void {
-    const script: *PendingScript = @alignCast(@ptrCast(transfer.ctx));
+    const script: *PendingScript = @ptrCast(@alignCast(transfer.ctx));
     script.startCallback(transfer) catch |err| {
         log.err(.http, "SM.startCallback", .{ .err = err, .transfer = transfer });
         return err;
     };
 }
 
 fn headerCallback(transfer: *Http.Transfer) !void {
-    const script: *PendingScript = @alignCast(@ptrCast(transfer.ctx));
+    const script: *PendingScript = @ptrCast(@alignCast(transfer.ctx));
     script.headerCallback(transfer) catch |err| {
         log.err(.http, "SM.headerCallback", .{
             .err = err,
@@ -415,20 +414,20 @@ fn headerCallback(transfer: *Http.Transfer) !void {
 }
 
 fn dataCallback(transfer: *Http.Transfer, data: []const u8) !void {
-    const script: *PendingScript = @alignCast(@ptrCast(transfer.ctx));
+    const script: *PendingScript = @ptrCast(@alignCast(transfer.ctx));
     script.dataCallback(transfer, data) catch |err| {
         log.err(.http, "SM.dataCallback", .{ .err = err, .transfer = transfer, .len = data.len });
         return err;
     };
 }
 
 fn doneCallback(ctx: *anyopaque) !void {
-    const script: *PendingScript = @alignCast(@ptrCast(ctx));
+    const script: *PendingScript = @ptrCast(@alignCast(ctx));
     script.doneCallback();
 }
 
 fn errorCallback(ctx: *anyopaque, err: anyerror) void {
-    const script: *PendingScript = @alignCast(@ptrCast(ctx));
+    const script: *PendingScript = @ptrCast(@alignCast(ctx));
     script.errorCallback(err);
 }
 
@@ -682,17 +681,22 @@ const BufferPool = struct {
     available: List = .{},
     allocator: Allocator,
     max_concurrent_transfers: u8,
-    node_pool: std.heap.MemoryPool(List.Node),
+    mem_pool: std.heap.MemoryPool(Container),
 
-    const List = std.DoublyLinkedList(std.ArrayListUnmanaged(u8));
+    const List = std.DoublyLinkedList;
+
+    const Container = struct {
+        node: List.Node,
+        buf: std.ArrayListUnmanaged(u8),
+    };
 
     fn init(allocator: Allocator, max_concurrent_transfers: u8) BufferPool {
         return .{
             .available = .{},
             .count = 0,
             .allocator = allocator,
             .max_concurrent_transfers = max_concurrent_transfers,
-            .node_pool = std.heap.MemoryPool(List.Node).init(allocator),
+            .mem_pool = std.heap.MemoryPool(Container).init(allocator),
         };
     }
 
@@ -701,21 +705,23 @@ const BufferPool = struct {
 
         var node = self.available.first;
         while (node) |n| {
-            n.data.deinit(allocator);
+            const container: *Container = @fieldParentPtr("node", n);
+            container.buf.deinit(allocator);
             node = n.next;
         }
-        self.node_pool.deinit();
+        self.mem_pool.deinit();
     }
 
-    fn get(self: *BufferPool) ArrayListUnmanaged(u8) {
+    fn get(self: *BufferPool) std.ArrayListUnmanaged(u8) {
         const node = self.available.popFirst() orelse {
             // return a new buffer
             return .{};
         };
 
         self.count -= 1;
-        defer self.node_pool.destroy(node);
-        return node.data;
+        const container: *Container = @fieldParentPtr("node", node);
+        defer self.mem_pool.destroy(container);
+        return container.buf;
     }
 
     fn release(self: *BufferPool, buffer: ArrayListUnmanaged(u8)) void {
@@ -727,16 +733,16 @@ const BufferPool = struct {
             return;
         }
 
-        const node = self.node_pool.create() catch |err| {
+        const container = self.mem_pool.create() catch |err| {
             b.deinit(self.allocator);
             log.err(.http, "SM BufferPool release", .{ .err = err });
             return;
         };
 
         b.clearRetainingCapacity();
-        node.* = .{ .data = b };
+        container.* = .{ .buf = b, .node = .{} };
         self.count += 1;
-        self.available.append(node);
+        self.available.append(&container.node);
     }
 };
 
@@ -769,7 +775,7 @@ const Blocking = struct {
             return error.InvalidStatusCode;
         }
 
-        var self: *Blocking = @alignCast(@ptrCast(transfer.ctx));
+        var self: *Blocking = @ptrCast(@alignCast(transfer.ctx));
         self.buffer = self.buffer_pool.get();
     }
 
@@ -780,7 +786,7 @@ const Blocking = struct {
         //     .blocking = true,
         // });
 
-        var self: *Blocking = @alignCast(@ptrCast(transfer.ctx));
+        var self: *Blocking = @ptrCast(@alignCast(transfer.ctx));
         self.buffer.appendSlice(self.allocator, data) catch |err| {
             log.err(.http, "SM.dataCallback", .{
                 .err = err,
@@ -793,15 +799,15 @@ const Blocking = struct {
     }
 
     fn doneCallback(ctx: *anyopaque) !void {
-        var self: *Blocking = @alignCast(@ptrCast(ctx));
+        var self: *Blocking = @ptrCast(@alignCast(ctx));
         self.state = .{ .done = .{
             .buffer = self.buffer,
             .buffer_pool = self.buffer_pool,
         } };
     }
 
     fn errorCallback(ctx: *anyopaque, err: anyerror) void {
-        var self: *Blocking = @alignCast(@ptrCast(ctx));
+        var self: *Blocking = @ptrCast(@alignCast(ctx));
         self.state = .{ .err = err };
         self.buffer_pool.release(self.buffer);
     }

src/browser/dom/character_data.zig

@@ -102,7 +102,7 @@ pub const CharacterData = struct {
     // netsurf's CharacterData (text, comment) doesn't implement the
     // dom_node_get_attributes and thus will crash if we try to call nodeIsEqualNode.
     pub fn _isEqualNode(self: *parser.CharacterData, other_node: *parser.Node) !bool {
-        if (try parser.nodeType(@alignCast(@ptrCast(self))) != try parser.nodeType(other_node)) {
+        if (try parser.nodeType(@ptrCast(@alignCast(self))) != try parser.nodeType(other_node)) {
             return false;
         }
 

src/browser/dom/document.zig

@@ -258,14 +258,14 @@ pub const Document = struct {
     }
 
     pub fn getActiveElement(self: *parser.Document, page: *Page) !?*parser.Element {
-        if (page.getNodeState(@alignCast(@ptrCast(self)))) |state| {
+        if (page.getNodeState(@ptrCast(@alignCast(self)))) |state| {
             if (state.active_element) |ae| {
                 return ae;
             }
         }
 
         if (try parser.documentHTMLBody(page.window.document)) |body| {
-            return @alignCast(@ptrCast(body));
+            return @ptrCast(@alignCast(body));
         }
 
         return try parser.documentGetDocumentElement(self);
@@ -281,7 +281,7 @@ pub const Document = struct {
     // we could look for the "disabled" attribute, but that's only meaningful
     // on certain types, and libdom's vtable doesn't seem to expose this.
     pub fn setFocus(self: *parser.Document, e: *parser.ElementHTML, page: *Page) !void {
-        const state = try page.getOrCreateNodeState(@alignCast(@ptrCast(self)));
+        const state = try page.getOrCreateNodeState(@ptrCast(@alignCast(self)));
         state.active_element = @ptrCast(e);
     }
 
@@ -295,7 +295,7 @@ pub const Document = struct {
     }
 
     pub fn get_adoptedStyleSheets(self: *parser.Document, page: *Page) !Env.JsObject {
-        const state = try page.getOrCreateNodeState(@alignCast(@ptrCast(self)));
+        const state = try page.getOrCreateNodeState(@ptrCast(@alignCast(self)));
         if (state.adopted_style_sheets) |obj| {
             return obj;
         }
@@ -306,7 +306,7 @@ pub const Document = struct {
     }
 
     pub fn set_adoptedStyleSheets(self: *parser.Document, sheets: Env.JsObject, page: *Page) !void {
-        const state = try page.getOrCreateNodeState(@alignCast(@ptrCast(self)));
+        const state = try page.getOrCreateNodeState(@ptrCast(@alignCast(self)));
         state.adopted_style_sheets = try sheets.persist();
     }
 };