Skip to content

Commit 497c80c

Browse files
ianicianic
committed
make zlib with zig master
1 parent ea365fe commit 497c80c

File tree

4 files changed

+115
-30
lines changed

4 files changed

+115
-30
lines changed

‎zlib/build.zig

+15-4
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,25 @@ const zlib = @import("zlib.zig");
33

44
pub fn build(b: *std.build.Builder) void {
55
const target = b.standardTargetOptions(.{});
6-
const mode = b.standardReleaseOptions();
6+
const optimize = b.standardOptimizeOption(.{});
77

8-
const lib = zlib.create(b, target, mode);
9-
lib.step.install();
8+
const lib = zlib.create(b, target, optimize);
9+
b.installArtifact(lib.step);
1010

11-
const tests = b.addTest("src/main.zig");
11+
const tests = b.addTest(.{
12+
.root_source_file = .{ .path = "src/main.zig" },
13+
});
1214
lib.link(tests, .{});
1315

1416
const test_step = b.step("test", "Run tests");
1517
test_step.dependOn(&tests.step);
18+
19+
const bin = b.addExecutable(.{
20+
.name = "example1",
21+
.root_source_file = .{ .path = "example/example1.zig" },
22+
.target = target,
23+
.optimize = optimize,
24+
});
25+
lib.link(bin, .{ .import_name = "zlib" });
26+
b.installArtifact(bin);
1627
}

‎zlib/example/example1.zig

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
const std = @import("std");
2+
const zlib = @import("zlib");
3+
4+
pub fn main() !void {
5+
var gpa = std.heap.GeneralPurposeAllocator(.{}){};
6+
defer _ = gpa.deinit();
7+
const allocator = gpa.allocator();
8+
9+
std.debug.print("Pero\n", .{});
10+
11+
const input = "Hello";
12+
var cmp = try zlib.Compressor.init(allocator, .{ .header = .none });
13+
defer cmp.deinit();
14+
const compressed = try cmp.compressAllAlloc(input);
15+
defer allocator.free(compressed);
16+
//try std.testing.expectEqualSlices(u8, &[_]u8{ 0xf2, 0x48, 0xcd, 0xc9, 0xc9, 0x07, 0x04, 0x00, 0x00, 0xff, 0xff }, compressed);
17+
18+
var dcp = try zlib.Decompressor.init(allocator, .{ .header = .none });
19+
defer dcp.deinit();
20+
const decompressed = try dcp.decompressAllAlloc(compressed);
21+
defer allocator.free(decompressed);
22+
23+
try std.testing.expectEqualSlices(u8, input, decompressed);
24+
25+
std.debug.print("decompressed: {s}\n", .{decompressed});
26+
}
27+
28+
test "Hello from example1" {
29+
const allocator = std.testing.allocator;
30+
const input = "Hello";
31+
32+
var cmp = try zlib.Compressor.init(allocator, .{ .header = .none });
33+
defer cmp.deinit();
34+
const compressed = try cmp.compressAllAlloc(input);
35+
defer allocator.free(compressed);
36+
//try std.testing.expectEqualSlices(u8, &[_]u8{ 0xf2, 0x48, 0xcd, 0xc9, 0xc9, 0x07, 0x04, 0x00, 0x00, 0xff, 0xff }, compressed);
37+
38+
var dcp = try zlib.Decompressor.init(allocator, .{ .header = .none });
39+
defer dcp.deinit();
40+
const decompressed = try dcp.decompressAllAlloc(compressed);
41+
defer allocator.free(decompressed);
42+
43+
try std.testing.expectEqualSlices(u8, input, decompressed);
44+
}
45+
46+
// test with:
47+
// $ zig test --library z -freference-trace example/example1.zig --main-pkg-path . --deps zlib=zlib --mod zlib::src/main.zig
48+
49+
// build with:
50+
// zig build

‎zlib/src/main.zig

+40-21
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ fn zalloc(private: ?*anyopaque, items: c_uint, size: c_uint) callconv(.C) ?*anyo
6464
if (private == null)
6565
return null;
6666

67-
const allocator = @ptrCast(*Allocator, @alignCast(@alignOf(*Allocator), private.?));
68-
var buf = allocator.alloc(u8, ZallocHeader.size_of_aligned + (items * size)) catch return null;
69-
const header = @ptrCast(*ZallocHeader, @alignCast(@alignOf(*ZallocHeader), buf.ptr));
67+
const allocator: *Allocator = @ptrCast(@alignCast(private.?));
68+
var buf = allocator.allocWithOptions(u8, ZallocHeader.size_of_aligned + (items * size), @alignOf(*ZallocHeader), null) catch return null;
69+
const header: *ZallocHeader = @ptrCast(@alignCast(buf.ptr));
7070
header.* = .{
7171
.magic = magic_value,
7272
.size = items * size,
@@ -79,15 +79,16 @@ fn zfree(private: ?*anyopaque, addr: ?*anyopaque) callconv(.C) void {
7979
if (private == null)
8080
return;
8181

82-
const allocator = @ptrCast(*Allocator, @alignCast(@alignOf(*Allocator), private.?));
83-
const header = @intToPtr(*ZallocHeader, @ptrToInt(addr.?) - ZallocHeader.size_of_aligned);
82+
const allocator: *Allocator = @ptrCast(@alignCast(private.?));
83+
const header = @as(*ZallocHeader, @ptrFromInt(@intFromPtr(addr.?) - ZallocHeader.size_of_aligned));
84+
8485
if (builtin.mode != .ReleaseFast) {
8586
if (header.magic != magic_value)
8687
@panic("magic value is incorrect");
8788
}
8889

8990
var buf: []align(alignment) u8 = undefined;
90-
buf.ptr = @ptrCast([*]align(alignment) u8, @alignCast(alignment, header));
91+
buf.ptr = @as([*]align(alignment) u8, @ptrCast(header));
9192
buf.len = ZallocHeader.size_of_aligned + header.size;
9293
allocator.free(buf);
9394
}
@@ -118,7 +119,7 @@ fn zStreamInit(allocator: Allocator) !*c.z_stream {
118119
}
119120

120121
fn zStreamDeinit(allocator: Allocator, stream: *c.z_stream) void {
121-
const pinned = @ptrCast(*Allocator, @alignCast(@alignOf(*Allocator), stream.@"opaque".?));
122+
const pinned: *Allocator = @ptrCast(@alignCast(stream.@"opaque".?));
122123
allocator.destroy(pinned);
123124
allocator.destroy(stream);
124125
}
@@ -203,8 +204,8 @@ pub fn CompressorWriter(comptime WriterType: type) type {
203204
var tmp: [4096]u8 = undefined;
204205

205206
// uncompressed
206-
self.stream.next_in = @intToPtr([*]u8, @ptrToInt(buf.ptr));
207-
self.stream.avail_in = @intCast(c_uint, buf.len);
207+
self.stream.next_in = @as([*]u8, @ptrFromInt(@intFromPtr(buf.ptr)));
208+
self.stream.avail_in = @as(c_uint, @intCast(buf.len));
208209

209210
while (true) {
210211
// compressed
@@ -288,10 +289,10 @@ pub fn DecompressorReader(comptime ReaderType: type) type {
288289
self.pos += try self.inner.readAll(self.tmp[self.pos..]);
289290

290291
self.stream.next_in = &self.tmp;
291-
self.stream.avail_in = @intCast(c_uint, self.pos);
292+
self.stream.avail_in = @as(c_uint, @intCast(self.pos));
292293

293-
self.stream.next_out = @intToPtr([*]u8, @ptrToInt(buf.ptr));
294-
self.stream.avail_out = @intCast(c_uint, buf.len);
294+
self.stream.next_out = @as([*]u8, @ptrFromInt(@intFromPtr(buf.ptr)));
295+
self.stream.avail_out = @as(c_uint, @intCast(buf.len));
295296

296297
var rc = c.inflate(self.stream, c.Z_SYNC_FLUSH);
297298
if (rc != c.Z_OK and rc != c.Z_STREAM_END)
@@ -344,17 +345,17 @@ pub const Compressor = struct {
344345
// Compresses to new allocated buffer.
345346
// Caller owns returned memory.
346347
pub fn compressAllAlloc(self: *Self, uncompressed: []const u8) ![]u8 {
347-
self.stream.next_in = @intToPtr([*]u8, @ptrToInt(uncompressed.ptr));
348-
self.stream.avail_in = @intCast(c_uint, uncompressed.len);
348+
self.stream.next_in = @as([*]u8, @ptrFromInt(@intFromPtr(uncompressed.ptr)));
349+
self.stream.avail_in = @as(c_uint, @intCast(uncompressed.len));
349350

350351
var tmp = try self.allocator.alloc(u8, chunk_size);
351352
var len: usize = 0; // used part of the tmp buffer
352353

353354
var flag = c.Z_PARTIAL_FLUSH;
354355
while (true) {
355356
var out = tmp[len..];
356-
self.stream.next_out = @intToPtr([*]u8, @ptrToInt(out.ptr));
357-
self.stream.avail_out = @intCast(c_uint, out.len);
357+
self.stream.next_out = @as([*]u8, @ptrFromInt(@intFromPtr(out.ptr)));
358+
self.stream.avail_out = @as(c_uint, @intCast(out.len));
358359

359360
var rc = c.deflate(self.stream, flag);
360361
if (rc != c.Z_OK and rc != c.Z_STREAM_END)
@@ -400,15 +401,15 @@ pub const Decompressor = struct {
400401
// Decompresses to new allocated buffer.
401402
// Caller owns returned memory.
402403
pub fn decompressAllAlloc(self: *Self, compressed: []const u8) ![]u8 {
403-
self.stream.next_in = @intToPtr([*]u8, @ptrToInt(compressed.ptr));
404-
self.stream.avail_in = @intCast(c_uint, compressed.len);
404+
self.stream.next_in = @as([*]u8, @ptrFromInt(@intFromPtr(compressed.ptr)));
405+
self.stream.avail_in = @as(c_uint, @intCast(compressed.len));
405406

406407
var tmp = try self.allocator.alloc(u8, chunk_size);
407408
var len: usize = 0; // inflated part of the tmp buffer
408409
while (true) {
409410
var out = tmp[len..];
410-
self.stream.next_out = @intToPtr([*]u8, @ptrToInt(out.ptr));
411-
self.stream.avail_out = @intCast(c_uint, out.len);
411+
self.stream.next_out = @as([*]u8, @ptrFromInt(@intFromPtr(out.ptr)));
412+
self.stream.avail_out = @as(c_uint, @intCast(out.len));
412413

413414
var rc = c.inflate(self.stream, c.Z_SYNC_FLUSH);
414415
if (rc != c.Z_OK and rc != c.Z_STREAM_END) {
@@ -439,7 +440,7 @@ test "compress gzip with zig interface" {
439440
try cmp.flush();
440441

441442
// decompress with zig std lib gzip
442-
var dcmp = try std.compress.gzip.gzipStream(allocator, fifo.reader());
443+
var dcmp = try std.compress.gzip.decompress(allocator, fifo.reader());
443444
defer dcmp.deinit();
444445
const actual = try dcmp.reader().readAllAlloc(allocator, std.math.maxInt(usize));
445446
defer allocator.free(actual);
@@ -511,3 +512,21 @@ fn showBuf(buf: []const u8) void {
511512
std.debug.print("0x{x:0>2}, ", .{b});
512513
std.debug.print("\n", .{});
513514
}
515+
516+
test "Hello" {
517+
const allocator = std.testing.allocator;
518+
const input = "Hello";
519+
520+
var cmp = try Compressor.init(allocator, .{ .header = .none });
521+
defer cmp.deinit();
522+
const compressed = try cmp.compressAllAlloc(input);
523+
defer allocator.free(compressed);
524+
//try std.testing.expectEqualSlices(u8, &[_]u8{ 0xf2, 0x48, 0xcd, 0xc9, 0xc9, 0x07, 0x04, 0x00, 0x00, 0xff, 0xff }, compressed);
525+
526+
var dcp = try Decompressor.init(allocator, .{ .header = .none });
527+
defer dcp.deinit();
528+
const decompressed = try dcp.decompressAllAlloc(compressed);
529+
defer allocator.free(decompressed);
530+
531+
try std.testing.expectEqualSlices(u8, input, decompressed);
532+
}

‎zlib/zlib.zig

+10-5
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,19 @@ pub const Library = struct {
2020
other.linkLibrary(self.step);
2121

2222
if (opts.import_name) |import_name|
23-
other.addPackagePath(import_name, package_path);
23+
other.addAnonymousModule(
24+
import_name,
25+
.{ .source_file = .{ .path = package_path } },
26+
);
2427
}
2528
};
2629

27-
pub fn create(b: *std.build.Builder, target: std.zig.CrossTarget, mode: std.builtin.Mode) Library {
28-
var ret = b.addStaticLibrary("z", null);
29-
ret.setTarget(target);
30-
ret.setBuildMode(mode);
30+
pub fn create(b: *std.build.Builder, target: std.zig.CrossTarget, optimize: std.builtin.OptimizeMode) Library {
31+
const ret = b.addStaticLibrary(.{
32+
.name = "z",
33+
.target = target,
34+
.optimize = optimize,
35+
});
3136
ret.linkLibC();
3237
ret.addCSourceFiles(srcs, &.{"-std=c89"});
3338

0 commit comments

Comments
 (0)