playground/unclog
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Run zig fmt

Browse source
This commit is contained in:
Armin Friedl 2024-07-01 22:32:29 +02:00
parent 60ecd10e67
commit 1b271ea203
4 changed files with 59 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build.zig
View file

@ -21,9 +21,7 @@ pub fn build(b: *std.Build) void {
.target = target,
});
relib.addIncludePath(.{ .path = "lib" });
relib.addCSourceFile(.{
.file = b.path("lib/regex_slim.c")
});
relib.addCSourceFile(.{ .file = b.path("lib/regex_slim.c") });
relib.linkLibC();
const exe = b.addExecutable(.{
@ -65,8 +63,6 @@ pub fn build(b: *std.Build) void {
const run_step = b.step("run", "Run the app");
run_step.dependOn(&run_cmd.step);
// Creates a step for unit testing. This only builds the test executable
// but does not run it.
const procnet_unit_tests = b.addTest(.{

7
src/main.zig
View file

@ -6,9 +6,7 @@ const c = @cImport({
@cInclude("signal.h");
});
pub const std_options = .{
.log_level = .err
};
pub const std_options = .{ .log_level = .err };
pub fn main() !void {
var argsit = std.process.args();
@ -101,8 +99,7 @@ fn print_proc_net(entry: *const proc.ProcNet, addr_type: []const u8) !void {
switch (entry.*) {
.V4 => |v4| {
const src_addr_pp = c.inet_ntoa(.{ .s_addr = v4.addr }); // allocates static global buffer, don't free
try stdio.writer().print("Port {d} clogged on {s} Address {s} with socket inode {d}\n",
.{v4.port, addr_type, src_addr_pp, v4.inode});
try stdio.writer().print("Port {d} clogged on {s} Address {s} with socket inode {d}\n", .{ v4.port, addr_type, src_addr_pp, v4.inode });
},
.V6 => |v6| {
try stdio.writer().print("Port {d} clogged on {s} Address ", .{ v6.port, addr_type });

49
src/procnet.zig
View file

@ -7,18 +7,9 @@ const c = @cImport({
@cInclude("arpa/inet.h");
});
pub const ProcNet = union(enum) {
V4: struct {
addr: u32,
port: u16,
inode: u32
},
V6: struct {
addr: u128,
port: u16,
inode: u32
},
V4: struct { addr: u32, port: u16, inode: u32 },
V6: struct { addr: u128, port: u16, inode: u32 },
pub fn format(value: @This(), comptime _: []const u8, _: std.fmt.FormatOptions, writer: anytype) !void {
switch (value) {
@ -38,11 +29,6 @@ pub const ProcNet = union(enum) {
try writer.print("\t{d: <10}{d}", .{ v6.port, v6.inode });
},
.RAW => |raw| {
try writer.print("{d} {d}", .{raw.port, raw.inode});
}
}
}
};
@ -55,20 +41,20 @@ pub fn read_proc_net(alloc: Allocator, comptime addr_len: enum{V4, V6}, path: []
var buf = try std.ArrayList(ProcNet).initCapacity(alloc, proc_net_parsed.len);
defer buf.deinit();
const addr_len_t = switch(addr_len){.V4 => u32, .V6 => u128};
const addr_len_t = switch (addr_len) {
.V4 => u32,
.V6 => u128,
};
for (proc_net_parsed) |line| {
const src_addr = try std.fmt.parseUnsigned(addr_len_t, line[0], 16);
const src_port = try std.fmt.parseUnsigned(u16, line[1], 16);
const inode = try std.fmt.parseUnsigned(u32, line[2], 10);
try buf.append(
switch(addr_len) {
try buf.append(switch (addr_len) {
.V4 => ProcNet{ .V4 = .{ .addr = src_addr, .port = src_port, .inode = inode } },
.V6 => ProcNet{ .V6 = .{ .addr = src_addr, .port = src_port, .inode = inode } },
}
);
});
}
return buf.toOwnedSlice();
@ -92,32 +78,21 @@ fn parse_proc_net(alloc: Allocator, path: []const u8) ![][3][]u8 {
defer arena.deinit();
while (try reader.readUntilDelimiterOrEofAlloc(arena.allocator(), '\n', 256)) |line| {
var tokens = std.ArrayList([]const u8).init(arena.allocator()); // buffer for a line in the proc file split by tokenizer
defer tokens.deinit();
var tokenizer = std.mem.tokenize(u8, line, " \t\n");
while(tokenizer.next()) |elem| { try tokens.append(elem); }
while (tokenizer.next()) |elem| {
try tokens.append(elem);
}
var src_it = std.mem.splitScalar(u8, tokens.items[1], ':');
try res.append(
.{
try alloc.dupe(u8, src_it.next().?),
try alloc.dupe(u8, src_it.next().?),
try alloc.dupe(u8, tokens.items[9])
}
);
try res.append(.{ try alloc.dupe(u8, src_it.next().?), try alloc.dupe(u8, src_it.next().?), try alloc.dupe(u8, tokens.items[9]) });
}
return res.toOwnedSlice();
}
// test "basic 2" {
// std.testing.log_level = .info;
// const alloc = std.testing.allocator;
// try read_proc_net(alloc);
// }
test "basic 3" {
std.testing.log_level = .info;
const alloc = std.testing.allocator;

15
src/procpid.zig
View file

@ -57,7 +57,7 @@ pub fn find_proc(alloc: Allocator, inode: u32) ![]ProcPid {
if (c.regexec(regex_t, entry.path, 0, null, 0) == 0) {
const stat = proc_dir.statFile(entry.path) catch |err| switch (err) {
error.AccessDenied => continue,
else => return err
else => return err,
};
if (stat.kind == .unix_domain_socket) {
@ -70,11 +70,7 @@ pub fn find_proc(alloc: Allocator, inode: u32) ![]ProcPid {
_ = compit.next().?.name; // skip /fd/
const fd = try std.fmt.parseInt(u32, compit.next().?.name, 10); // parse <fd>
try buf.append(ProcPid{
.pid = pid,
.inode = inode,
.fd = fd
});
try buf.append(ProcPid{ .pid = pid, .inode = inode, .fd = fd });
}
}
}
@ -104,10 +100,5 @@ pub fn resolve_process(alloc: Allocator, proc_pid: ProcPid) !Process {
try cmdline_buf.append(try arena_alloc.allocator().dupe(u8, cmdline_elem));
}
return Process{
.proc_pid = proc_pid,
.comm = comm,
.cmdline = try cmdline_buf.toOwnedSlice(),
.alloc = arena_alloc
};
return Process{ .proc_pid = proc_pid, .comm = comm, .cmdline = try cmdline_buf.toOwnedSlice(), .alloc = arena_alloc };
}