Skip to content

Commit

Permalink
Resign changes
Browse files Browse the repository at this point in the history
  • Loading branch information
yewman committed Oct 9, 2024
1 parent 8d6b985 commit 03fa6d5
Show file tree
Hide file tree
Showing 6 changed files with 504 additions and 407 deletions.
27 changes: 18 additions & 9 deletions src/cmd/cmd.zig
Original file line number Diff line number Diff line change
Expand Up @@ -741,10 +741,21 @@ fn validator() !void {
defer retransmit_shred_channel.deinit();

// Sockets used to retransmit shreds to peers
// This should be configured at a higher level and may consist of multiple sockets
var retransmit_send_socket = try network.Socket.create(.ipv4, .udp);
defer retransmit_send_socket.close();
try retransmit_send_socket.bind(try network.EndPoint.parse("0.0.0.0:0"));
// The number of sockets should be configurable
const retransmit_send_sockets: [3]network.Socket = .{
try network.Socket.create(.ipv4, .udp),
try network.Socket.create(.ipv4, .udp),
try network.Socket.create(.ipv4, .udp),
};
defer {
for (retransmit_send_sockets) |socket| {
socket.close();
}
}
for (retransmit_send_sockets) |_socket| {
var socket = _socket;
try socket.bind(try network.EndPoint.parse("0.0.0.0:0"));
}

// Retransmit service needs to know the nodes contact info
// This should be replaced my a contact info provider which should be used by all services other than
Expand All @@ -755,18 +766,16 @@ fn validator() !void {
var rng = std.rand.DefaultPrng.init(@bitCast(std.time.timestamp()));

// Retransmit service
const retransmit_service_handle = try std.Thread.spawn(.{}, sig.turbine.runRetransmitService, .{
const retransmit_service_handle = try std.Thread.spawn(.{}, sig.turbine.retransmit_service.run, .{
allocator,
thread_safe_contact_info,
snapshot.bank.bank_fields,
&leader_schedule_cache,
&retransmit_shred_channel,
&.{
retransmit_send_socket,
},
&retransmit_send_sockets,
&gossip_service.gossip_table_rw,
rng.random(),
&app_base.exit,
rng.random(),
app_base.logger,
});

Expand Down
7 changes: 3 additions & 4 deletions src/turbine/lib.zig
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
pub const retransmit = @import("retransmit.zig");
pub const retransmit_service = @import("retransmit_service.zig");
pub const shred_deduper = @import("shred_deduper.zig");
pub const turbine_tree = @import("turbine_tree.zig");

pub const ShredDeduper = shred_deduper.ShredDeduper;
pub const TurbineTree = turbine_tree.TurbineTree;
pub const TurbineTreeCache = turbine_tree.TurbineTreeCache;

pub const runRetransmitService = retransmit.runRetransmitService;
pub const TurbineTreeCache = turbine_tree.TurbineTreeProvider;
206 changes: 0 additions & 206 deletions src/turbine/retransmit.zig

This file was deleted.

Loading

0 comments on commit 03fa6d5

Please sign in to comment.