Skip to content

Commit 75a789e

Browse files
riptlptaffet-jump
authored andcommitted
Clean up mentions of mux tile
... which is now fd_stem
1 parent 98d1cb7 commit 75a789e

File tree

12 files changed

+32
-48
lines changed

12 files changed

+32
-48
lines changed

contrib/test/run_script_tests.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,6 @@ fi
5151
# FIXME: Needs a /tmp/test.pcap file
5252
#$UNIT_TEST/test_replay --tile-cpus 38-42/2 --tx-pcap /tmp/test.pcap 2> $LOG_PATH/replay
5353

54-
55-
# todo(mmcgee-jump): reenable those tests https://github.com/firedancer-io/firedancer/issues/761
56-
# if $UNIT_TEST/test_mux_ipc_init $OBJDIR && \
57-
# $UNIT_TEST/test_mux_ipc_meta 16 16 && \
58-
# $UNIT_TEST/test_mux_ipc_full 16 16 && \
59-
# $UNIT_TEST/test_mux_ipc_fini; then
60-
# echo pass > $LOG_PATH/mux_ipc
61-
# else
62-
# echo FAIL > $LOG_PATH/mux_ipc
63-
# fi
64-
6554
wait
6655

6756
for f in `ls $LOG_PATH`; do

src/app/fdctl/topology.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ fd_topo_initialize( config_t * config ) {
191191

192192
/* Sign links don't need to be reliable because they are synchronous,
193193
so there's at most one fragment in flight at a time anyway. The
194-
sign links are also not polled by the mux, instead the tiles will
194+
sign links are also not polled by fd_stem, instead the tiles will
195195
read the sign responses out of band in a dedicated spin loop. */
196196

197197
for( ulong i=0UL; i<shred_tile_cnt; i++ ) {

src/app/firedancer/topology.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ fd_topo_initialize( config_t * config ) {
667667

668668
/* Sign links don't need to be reliable because they are synchronous,
669669
so there's at most one fragment in flight at a time anyway. The
670-
sign links are also not polled by the mux, instead the tiles will
670+
sign links are also not polled by fd_stem, instead the tiles will
671671
read the sign responses out of band in a dedicated spin loop. */
672672
for( ulong i=0UL; i<shred_tile_cnt; i++ ) {
673673
/**/ fd_topob_tile_in( topo, "sign", 0UL, "metric_in", "shred_sign", i, FD_TOPOB_UNRELIABLE, FD_TOPOB_POLLED );

src/app/shared/commands/monitor/monitor.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@ find_producer_out_idx( fd_topo_t const * topo,
123123
and then returns the position of the consumer (specified by tile
124124
and index of the in of that tile) in that list. The list ordering
125125
is not important, except that it matches the ordering of fseqs
126-
provided to the mux tile, so that metrics written for each link
127-
index are retrieved at the same index here.
126+
provided to fd_stem, so that metrics written for each link index
127+
are retrieved at the same index here.
128128
129-
This is why we only count reliable links, because the mux tile only
129+
This is why we only count reliable links, because fd_stem only
130130
looks at and writes producer side diagnostics (is the link slow)
131131
for reliable links. */
132132

src/disco/bundle/fd_bundle_tile_private.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ struct fd_bundle_metrics {
4141

4242
typedef struct fd_bundle_metrics fd_bundle_metrics_t;
4343

44-
/* fd_bundle_tile_t is the context object provided to callbacks from the
45-
mux tile, and contains all state needed to progress the tile. */
44+
/* fd_bundle_tile_t is the context object provided to callbacks from
45+
stem, and contains all state needed to progress the tile. */
4646

4747
struct fd_bundle_tile {
4848
/* Key switch */

src/disco/cswtch/fd_cswtch_tile.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ scratch_footprint( fd_topo_tile_t const * tile ) {
3636

3737
static void
3838
before_credit( fd_cswtch_ctx_t * ctx,
39-
fd_stem_context_t * mux,
39+
fd_stem_context_t * stem,
4040
int * charge_busy ) {
41-
(void)mux;
41+
(void)stem;
4242

4343
long now = fd_log_wallclock();
4444
if( now<ctx->next_report_nanos ) {

src/disco/dedup/fd_dedup_tile.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@
1010
/* fd_dedup provides services to deduplicate multiple streams of input
1111
fragments and present them to a mix of reliable and unreliable
1212
consumers as though they were generated by a single multi-stream
13-
producer.
14-
15-
The dedup tile is simply a wrapper around the mux tile, that also
16-
checks the transaction signature field for duplicates and filters
17-
them out. */
13+
producer. */
1814

1915
#define IN_KIND_GOSSIP (0UL)
2016
#define IN_KIND_VERIFY (1UL)
@@ -30,8 +26,8 @@ typedef struct {
3026
ulong mtu;
3127
} fd_dedup_in_ctx_t;
3228

33-
/* fd_dedup_ctx_t is the context object provided to callbacks from the
34-
mux tile, and contains all state needed to progress the tile. */
29+
/* fd_dedup_ctx_t is the context object provided to callbacks from
30+
fd_stem, and contains all state needed to progress the tile. */
3531

3632
typedef struct {
3733
ulong tcache_depth; /* == fd_tcache_depth( tcache ), depth of this dedups's tcache (const) */

src/disco/metrics/fd_metrics.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
4646
where every value is a ulong. Tile metrics come after link metrics,
4747
so this base pointer points at the very start of the layout. You
48-
shouldn't need to use this directly, instead it's used by the mux
49-
tile when it's computing the metrics for specific links. */
48+
shouldn't need to use this directly, instead it's used by fd_stem
49+
when it's computing the metrics for specific links. */
5050
extern FD_TL ulong * fd_metrics_base_tl;
5151

5252
/* All metrics in the application are ulongs, and are laid out

src/disco/quic/fd_quic_tile.c

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,20 @@
1111
#include <linux/unistd.h>
1212
#include <sys/random.h>
1313

14-
/* fd_quic provides a TPU server tile.
14+
/* fd_quic_tile provides a TPU server tile.
1515
1616
This tile handles incoming transactions that clients request to be
1717
included in blocks. Supported protocols currently include TPU/UDP
1818
and TPU/QUIC.
1919
20-
The fd_quic tile acts as a plain old Tango producer writing to a cnc
21-
and an mcache. The tile will defragment multi-packet TPU streams
22-
coming in from QUIC, such that each mcache/dcache pair forms a
23-
complete txn. This requires the dcache mtu to be at least that of
24-
the largest allowed serialized txn size.
20+
The fd_quic tile acts as a plain old Tango producer. The tile will
21+
defragment multi-packet TPU streams coming in from QUIC, such tha
22+
each frag_meta refers to a complete txn. This requires the dcache
23+
mtu to be at least that of the largest allowed serialized txn size.
2524
26-
QUIC tiles don't service network devices directly, but rely on
27-
packets being received by net tiles and forwarded on via. a mux
28-
(multiplexer). An arbitrary number of QUIC tiles can be run. Each
29-
UDP flow must stick to one QUIC tile. */
25+
QUIC tiles don't service network devices directly, but rely on net
26+
tiles to send and receive packets. An arbitrary number of QUIC tiles
27+
can be run. Each UDP flow must stick to one QUIC tile. */
3028

3129
static inline fd_quic_limits_t
3230
quic_limits( fd_topo_tile_t const * tile ) {
@@ -92,7 +90,7 @@ legacy_stream_notify( fd_quic_ctx_t * ctx,
9290
}
9391

9492
/* Because of the separate mcache for publishing network fragments
95-
back to networking tiles, which is not managed by the mux, we
93+
back to networking tiles, which is not managed by fd_stem, we
9694
need to periodically update the sync. */
9795
static void
9896
during_housekeeping( fd_quic_ctx_t * ctx ) {

src/disco/topo/fd_topob.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,9 @@ fd_topob_tile( fd_topo_t * topo,
9595
int is_agave,
9696
int uses_keyswitch );
9797

98-
/* Add an input link to the tile. If the tile is created with the
99-
standard mux runner, it will automatically poll the in link and
100-
forward fragments to the user code (unless the link is specified
101-
as unpolled).
98+
/* Add an input link to the tile. If the tile is created with fd_stem,
99+
it will automatically poll the in link and forward fragments to the
100+
user code (unless the link is specified as unpolled).
102101
103102
An input link has an fseq which is a ulong used for returning the
104103
current reader position in sequence space, used for wiring flow

0 commit comments

Comments
 (0)