diff options
| -rw-r--r-- | src/analytics/analytics_thread.zig | 3 | ||||
| -rw-r--r-- | src/http_client_async.zig | 8 | ||||
| -rw-r--r-- | src/watcher.zig | 22 |
3 files changed, 10 insertions, 23 deletions
diff --git a/src/analytics/analytics_thread.zig b/src/analytics/analytics_thread.zig index 02ae90893..9c8bae45a 100644 --- a/src/analytics/analytics_thread.zig +++ b/src/analytics/analytics_thread.zig @@ -359,7 +359,6 @@ fn readloop() anyerror!void { Output.Source.configureNamedThread(thread, "Analytics"); defer Output.flush(); - event_list = EventList.init(); var headers_entries: Headers.Entries = Headers.Entries{}; @@ -511,7 +510,7 @@ pub const EventList = struct { disabled = disabled or stuck_count > 4; this.in_buffer.reset(); -out_buffer.reset(); + out_buffer.reset(); if (comptime FeatureFlags.verbose_analytics) { Output.prettyErrorln("[Analytics] Sent {d} events", .{count}); diff --git a/src/http_client_async.zig b/src/http_client_async.zig index 947e8a944..bc9e3f2e1 100644 --- a/src/http_client_async.zig +++ b/src/http_client_async.zig @@ -226,13 +226,9 @@ pub const HTTPChannel = @import("./sync.zig").Channel(*AsyncHTTP, .{ .Static = 1 const SingleHTTPChannel = struct { const SingleHTTPCHannel_ = @import("./sync.zig").Channel(*AsyncHTTP, .{ .Static = 8 }); channel: SingleHTTPCHannel_, - pub fn reset(_: *@This()) void { - - } + pub fn reset(_: *@This()) void {} pub fn init(_: std.mem.Allocator) anyerror!SingleHTTPChannel { - return SingleHTTPChannel{ - .channel = SingleHTTPCHannel_.init() - }; + return SingleHTTPChannel{ .channel = SingleHTTPCHannel_.init() }; } }; diff --git a/src/watcher.zig b/src/watcher.zig index d97be28a1..33d5aa9a3 100644 --- a/src/watcher.zig +++ b/src/watcher.zig @@ -73,7 +73,7 @@ pub const INotify = struct { // it includes alignment / padding // but it is a sentineled value // so we can just trim it to the first null byte - return std.mem.sliceTo(@intToPtr([*]u8, @ptrToInt(this) + @sizeOf(INotifyEvent))[0..this.name_len:0], 0); + return std.mem.sliceTo(@intToPtr([*]u8, @ptrToInt(this) + @sizeOf(INotifyEvent))[0..this.name_len :0], 0); } }; pub var inotify_fd: EventListIndex = 0; @@ -244,8 +244,6 @@ pub const WatchEvent = struct { }; } - - pub fn fromKEvent(this: *WatchEvent, kevent: KEvent) void { this.* = WatchEvent{ @@ -259,8 +257,6 @@ pub const WatchEvent = struct { }; } - - pub fn fromINotify(this: *WatchEvent, event: INotify.INotifyEvent, index: WatchItemIndex) void { this.* = WatchEvent{ .op = Op{ @@ -283,8 +279,6 @@ pub const WatchEvent = struct { write: bool = false, move_to: bool = false, }; - - }; pub const Watchlist = std.MultiArrayList(WatchItem); @@ -479,14 +473,14 @@ pub fn NewWatcher(comptime ContextType: type) type { ) orelse continue, ), ); - temp_name_list[temp_name_off] = if (event.name_len > 0) - event.name() - else - null; + temp_name_list[temp_name_off] = if (event.name_len > 0) + event.name() + else + null; watchevents[watch_event_id].name_off = temp_name_off; watchevents[watch_event_id].name_len = @as(u8, @boolToInt((event.name_len > 0))); temp_name_off += @as(u8, @boolToInt((event.name_len > 0))); - + watch_event_id += 1; } @@ -496,8 +490,6 @@ pub fn NewWatcher(comptime ContextType: type) type { var last_event_index: usize = 0; var last_event_id: INotify.EventListIndex = std.math.maxInt(INotify.EventListIndex); - - for (all_events) |_, i| { if (all_events[i].name_len > 0) { this.changed_filepaths[name_off] = temp_name_list[all_events[i].name_off]; @@ -513,7 +505,7 @@ pub fn NewWatcher(comptime ContextType: type) type { last_event_id = all_events[i].index; } if (all_events.len == 0) continue :restart; - this.ctx.onFileUpdate(all_events[0 .. last_event_index + 1], this.changed_filepaths[0..name_off + 1], this.watchlist); + this.ctx.onFileUpdate(all_events[0 .. last_event_index + 1], this.changed_filepaths[0 .. name_off + 1], this.watchlist); remaining_events -= slice.len; } } |