diff --git a/wrk/httpz/build.zig b/wrk/httpz/build.zig new file mode 100644 index 0000000..e96de8f --- /dev/null +++ b/wrk/httpz/build.zig @@ -0,0 +1,60 @@ +const std = @import("std"); + +// Although this function looks imperative, note that its job is to +// declaratively construct a build graph that will be executed by an external +// runner. +pub fn build(b: *std.Build) void { + // Standard target options allows the person running `zig build` to choose + // what target to build for. Here we do not override the defaults, which + // means any target is allowed, and the default is native. Other options + // for restricting supported target set are available. + const target = b.standardTargetOptions(.{}); + + // Standard optimization options allow the person running `zig build` to select + // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not + // set a preferred release mode, allowing the user to decide how to optimize. + const optimize = b.standardOptimizeOption(.{}); + + const exe = b.addExecutable(.{ + .name = "httpz", + .root_source_file = b.path("main.zig"), + .target = target, + .optimize = optimize, + }); + + const httpz = b.dependency("httpz", .{ + .target = target, + .optimize = optimize, + }); + + // the executable from your call to b.addExecutable(...) + exe.root_module.addImport("httpz", httpz.module("httpz")); + + // This declares intent for the executable to be installed into the + // standard location when the user invokes the "install" step (the default + // step when running `zig build`). + b.installArtifact(exe); + + // This *creates* a Run step in the build graph, to be executed when another + // step is evaluated that depends on it. The next line below will establish + // such a dependency. + const run_cmd = b.addRunArtifact(exe); + + // By making the run step depend on the install step, it will be run from the + // installation directory rather than directly from within the cache directory. + // This is not necessary, however, if the application depends on other installed + // files, this ensures they will be present and in the expected location. + run_cmd.step.dependOn(b.getInstallStep()); + + // This allows the user to pass arguments to the application in the build + // command itself, like this: `zig build run -- arg1 arg2 etc` + if (b.args) |args| { + run_cmd.addArgs(args); + } + + // This creates a build step. It will be visible in the `zig build --help` menu, + // and can be selected like this: `zig build run` + // This will evaluate the `run` step rather than the default, which is "install". + const run_step = b.step("run", "Run the app"); + run_step.dependOn(&run_cmd.step); +} diff --git a/wrk/httpz/build.zig.zon b/wrk/httpz/build.zig.zon new file mode 100644 index 0000000..10bfb92 --- /dev/null +++ b/wrk/httpz/build.zig.zon @@ -0,0 +1,39 @@ +.{ + // This is the default name used by packages depending on this one. For + // example, when a user runs `zig fetch --save `, this field is used + // as the key in the `dependencies` table. Although the user can choose a + // different name, most users will stick with this provided value. + // + // It is redundant to include "zig" in this name because it is already + // within the Zig package namespace. + .name = "httpz", + + // This is a [Semantic Version](https://semver.org/). + // In a future version of Zig it will be used for package deduplication. + .version = "0.0.0", + + // This field is optional. + // This is currently advisory only; Zig does not yet do anything + // with this value. + //.minimum_zig_version = "0.11.0", + + // This field is optional. + // Each dependency must either provide a `url` and `hash`, or a `path`. + // `zig build --fetch` can be used to fetch all dependencies of a package, recursively. + // Once all dependencies are fetched, `zig build` no longer requires + // internet connectivity. + .dependencies = .{ + .httpz = .{ + .url = "git+https://github.com/karlseguin/http.zig?ref=master#ffdce2eeb8499c0b5001f5c5bf141cc33c22b215", + .hash = "12209018285fde7ae6216acafe44fc199036239e1f24bda2b513bbcc1b6bc9a70752", + }, + }, + .paths = .{ + "build.zig", + "build.zig.zon", + "src", + // For example... + //"LICENSE", + //"README.md", + }, +} diff --git a/wrk/httpz/main.zig b/wrk/httpz/main.zig new file mode 100644 index 0000000..b60ea98 --- /dev/null +++ b/wrk/httpz/main.zig @@ -0,0 +1,21 @@ +const std = @import("std"); +const httpz = @import("httpz"); + +pub fn main() !void { + var gpa = std.heap.GeneralPurposeAllocator(.{ + .thread_safe = true, + }){}; + const allocator = gpa.allocator(); + + var server = try httpz.Server(void).init(allocator, .{ .port = 3000 }, {}); + + defer server.deinit(); + var router = server.router(.{}); + + router.get("/", index, .{}); + try server.listen(); +} + +fn index(_: *httpz.Request, res: *httpz.Response) !void { + res.body = "HI FROM ZIG-HTTPZ"; +} diff --git a/wrk/measure.sh b/wrk/measure.sh index 5520f0a..2690e0e 100755 --- a/wrk/measure.sh +++ b/wrk/measure.sh @@ -9,6 +9,11 @@ SUBJECT=$1 TSK_SRV="taskset -c 0,1,2,3" TSK_LOAD="taskset -c 4,5,6,7" +if [ $(echo $(uname)) = "Darwin" ] ; then + TSK_SRV="" + TSK_LOAD="" +fi + if [ "$SUBJECT" = "" ] ; then echo "usage: $0 subject # subject: zig or go" exit 1 @@ -21,6 +26,14 @@ if [ "$SUBJECT" = "zig-zap" ] ; then URL=http://127.0.0.1:3000 fi +if [ "$SUBJECT" = "httpz" ] ; then + cd wrk/httpz + zig build -Doptimize=ReleaseFast > /dev/null + $TSK_SRV ./zig-out/bin/httpz & + PID=$! + URL=http://127.0.0.1:3000 +fi + if [ "$SUBJECT" = "zigstd" ] ; then zig build -Doptimize=ReleaseFast wrk_zigstd > /dev/null $TSK_SRV ./zig-out/bin/wrk_zigstd &