tigerbeetle-node 0.11.3 → 0.11.4

package/src/tigerbeetle/src/main.zig

@@ -4,11 +4,10 @@ const assert = std.debug.assert;
 const fmt = std.fmt;
 const mem = std.mem;
 const os = std.os;
-const log = std.log.scoped(.main);
+const log_main = std.log.scoped(.main);
 
 const build_options = @import("tigerbeetle_build_options");
-const config = @import("config.zig");
-pub const log_level: std.log.Level = @intToEnum(std.log.Level, config.log_level);
+const config = @import("constants.zig");
 const tracer = @import("tracer.zig");
 
 const cli = @import("cli.zig");
@@ -31,10 +30,8 @@ const SuperBlock = vsr.SuperBlockType(Storage);
 const superblock_zone_size = @import("vsr/superblock.zig").superblock_zone_size;
 const data_file_size_min = @import("vsr/superblock.zig").data_file_size_min;
 
-comptime {
-    assert(config.deployment_environment == .production or
-        config.deployment_environment == .development);
-}
+pub const log_level: std.log.Level = config.log_level;
+pub const log = config.log;
 
 pub fn main() !void {
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
@@ -129,7 +126,12 @@ const Command = struct {
         options: StateMachine.Options,
         path: [:0]const u8,
     ) !void {
-        const allocator = arena.allocator();
+        var tracer_allocator = if (config.tracer_backend == .tracy)
+            tracer.TracerAllocator.init(arena.allocator())
+        else
+            arena;
+
+        const allocator = tracer_allocator.allocator();
 
         try tracer.init(allocator);
         defer tracer.deinit(allocator);
@@ -166,13 +168,13 @@ const Command = struct {
                 node_maybe = node.next;
             }
         }
-        log.info("{}: Allocated {} bytes in {} regions during replica init", .{
+        log_main.info("{}: Allocated {} bytes in {} regions during replica init", .{
             replica.replica,
             allocation_size,
             allocation_count,
         });
 
-        log.info("{}: cluster={}: listening on {}", .{
+        log_main.info("{}: cluster={}: listening on {}", .{
             replica.replica,
             replica.cluster,
             addresses[replica.replica],
@@ -222,15 +224,15 @@ fn print_value(
     comptime field: []const u8,
     comptime value: anytype,
 ) !void {
-    if (@typeInfo(@TypeOf(value)) == .Pointer) {
-        try std.fmt.format(writer, "{s}=\"{s}\"\n", .{
+    switch (@typeInfo(@TypeOf(value))) {
+        .Fn => {}, // Ignore the log() function.
+        .Pointer => try std.fmt.format(writer, "{s}=\"{s}\"\n", .{
             field,
             std.fmt.fmtSliceEscapeLower(value),
-        });
-    } else {
-        try std.fmt.format(writer, "{s}={}\n", .{
+        }),
+        else => try std.fmt.format(writer, "{s}={}\n", .{
             field,
             value,
-        });
+        }),
     }
 }

package/src/tigerbeetle/src/message_bus.zig

@@ -6,7 +6,7 @@ const os = std.os;
 
 const is_linux = builtin.target.os.tag == .linux;
 
-const config = @import("config.zig");
+const config = @import("constants.zig");
 const log = std.log.scoped(.message_bus);
 
 const vsr = @import("vsr.zig");

package/src/tigerbeetle/src/message_pool.zig

@@ -3,7 +3,7 @@ const builtin = @import("builtin");
 const assert = std.debug.assert;
 const mem = std.mem;
 
-const config = @import("config.zig");
+const config = @import("constants.zig");
 
 const vsr = @import("vsr.zig");
 const Header = vsr.Header;
@@ -22,7 +22,7 @@ const message_size_max_padded = config.message_size_max + config.sector_size;
 pub const messages_max_replica = messages_max: {
     var sum: usize = 0;
 
-    sum += config.io_depth_read + config.io_depth_write; // Journal I/O
+    sum += config.journal_iops_read_max + config.journal_iops_write_max; // Journal I/O
     sum += config.clients_max; // SuperBlock.client_table
     sum += 1; // Replica.loopback_queue
     sum += config.pipeline_max; // Replica.pipeline

package/src/tigerbeetle/src/simulator.zig

@@ -4,7 +4,7 @@ const assert = std.debug.assert;
 const mem = std.mem;
 
 const tb = @import("tigerbeetle.zig");
-const config = @import("config.zig");
+const config = @import("constants.zig");
 const vsr = @import("vsr.zig");
 const Header = vsr.Header;
 
@@ -31,12 +31,9 @@ const log_state_transitions_only = builtin.mode != .Debug;
 
 const log_simulator = std.log.scoped(.simulator);
 
-/// You can fine tune your log levels even further (debug/info/notice/warn/err/crit/alert/emerg):
+/// You can fine tune your log levels even further (debug/info/warn/err):
 pub const log_level: std.log.Level = if (log_state_transitions_only) .info else .debug;
 
-/// Modifies compile-time constants on "config.zig".
-pub const deployment_environment = .simulation;
-
 const cluster_id = 0;
 
 var cluster: *Cluster = undefined;
@@ -44,10 +41,6 @@ var state_checker: *StateChecker = undefined;
 var storage_checker: *StorageChecker = undefined;
 
 pub fn main() !void {
-    comptime {
-        assert(config.deployment_environment == .simulation);
-    }
-
     // This must be initialized at runtime as stderr is not comptime known on e.g. Windows.
     log_buffer.unbuffered_writer = std.io.getStdErr().writer();