Skip to content

Commit 49c4a43

Browse files
riptlripatel-fd
authored andcommitted
tango: minor fixes
- Fix log in cnc - Fix doc for fd_dcache_new, which incorrectly stated that the data region is zerod (Regression from commit 5bfe27b) - Fix copy-paste error in fseq doc - Harden test_ipc to prevent runaway subprocesses
1 parent ab8bbf3 commit 49c4a43

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

src/tango/cnc/fd_cnc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ fd_cnc_open( fd_cnc_t * cnc ) {
264264
running it is live. Assume it is and tell the user to try again
265265
later. */
266266

267-
FD_LOG_WARNING(( "pid %lu currently command session and unable to diagnose pid's state (%i-%s); try again later?",
267+
FD_LOG_WARNING(( "pid %lu currently has command session and unable to diagnose pid's state (%i-%s); try again later?",
268268
cnc_pid, err, fd_io_strerror( err ) ));
269269
return FD_CNC_ERR_AGAIN;
270270
}

src/tango/dcache/fd_dcache.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ fd_dcache_footprint( ulong data_sz,
9393
region is app_sz bytes. Zero is valid for data_sz and/or app_sz.
9494
9595
Returns shmem (and the memory region it points to will be formatted
96-
as a dcache with the data and application regions initialized to
97-
zero, caller is not joined) on success and NULL on failure (logs
98-
details). Reasons for failure include obviously bad shmem, bad
99-
data_sz or bad app_sz. */
96+
as a dcache with the application region initialized to zero, caller
97+
is not joined) on success and NULL on failure (logs details).
98+
Reasons for failure include obviously bad shmem, bad data_sz or bad
99+
app_sz. */
100100

101101
void *
102102
fd_dcache_new( void * shmem,

src/tango/fseq/fd_fseq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fd_fseq_new( void * shmem,
3838
if( FD_UNLIKELY( !fd_ulong_is_aligned( (ulong)shmem, fd_fseq_align() ) ) ) {
3939
FD_LOG_WARNING(( "misaligned shmem" ));
4040
return NULL;
41-
}
41+
}
4242

4343
fd_fseq_shmem_t * fseq = (fd_fseq_shmem_t *)shmem;
4444

src/tango/fseq/fd_fseq.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ fd_fseq_leave( ulong const * fseq );
7878
void *
7979
fd_fseq_delete( void * shfseq );
8080

81-
/* fd_fctl_app_laddr returns local address of the fctl's application
82-
region. This will have FD_FCTL_APP_ALIGN alignment and room for at
83-
least FD_FCTL_APP_FOOTPRINT bytes. Assumes fseq is a current local
84-
join. fd_cnc_app_laddr_const is for const correctness. The return
81+
/* fd_fseq_app_laddr returns local address of the fseq's application
82+
region. This will have FD_FSEQ_APP_ALIGN alignment and room for at
83+
least FD_FSEQ_APP_FOOTPRINT bytes. Assumes fseq is a current local
84+
join. fd_fseq_app_laddr_const is for const correctness. The return
8585
values are valid for the lifetime of the local join. */
8686

8787
FD_FN_CONST static inline void * fd_fseq_app_laddr ( ulong * fseq ) { return (void *)(fseq+2); }

src/tango/test_ipc_full

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ CORE_NEXT=$CORE_FIRST
4545
# Start up the receivers
4646

4747
for((rx_idx=0;rx_idx<rx_cnt;rx_idx++)); do
48-
taskset -c "$CORE_NEXT" "$UNIT_TEST"/test_frag_rx --tile-cpus "$CORE_NEXT" --cnc "${RX_CNC[rx_idx]}" --mcache "${TX_MCACHE[0]}" --dcache "${TX_DCACHE[0]}" --fseq "${RX_FSEQ[rx_idx]}" &
48+
timeout 15 taskset -c "$CORE_NEXT" "$UNIT_TEST"/test_frag_rx --tile-cpus "$CORE_NEXT" --cnc "${RX_CNC[rx_idx]}" --mcache "${TX_MCACHE[0]}" --dcache "${TX_DCACHE[0]}" --fseq "${RX_FSEQ[rx_idx]}" &
4949
CORE_NEXT=$((CORE_NEXT+NUMA_STRIDE))
5050
done
5151

5252
# Start up the transmitter
5353

54-
taskset -c "$CORE_NEXT" "$UNIT_TEST"/test_frag_tx --tile-cpus "$CORE_NEXT" --cnc "${TX_CNC[0]}" --mcache "${TX_MCACHE[0]}" --dcache "${TX_DCACHE[0]}" --fseqs "${RX_FSEQS}" "$@" &
54+
timeout 15 taskset -c "$CORE_NEXT" "$UNIT_TEST"/test_frag_tx --tile-cpus "$CORE_NEXT" --cnc "${TX_CNC[0]}" --mcache "${TX_MCACHE[0]}" --dcache "${TX_DCACHE[0]}" --fseqs "${RX_FSEQS}" "$@" &
5555
CORE_NEXT=$((CORE_NEXT+NUMA_STRIDE))
5656

5757
# Let run for a while

src/tango/test_ipc_meta

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ CORE_NEXT=$CORE_FIRST
4747
# Start up the receivers
4848

4949
for((rx_idx=0;rx_idx<rx_cnt;rx_idx++)); do
50-
taskset -c "$CORE_NEXT" "$UNIT_TEST"/test_meta_rx --tile-cpus "$CORE_NEXT" --cnc "${RX_CNC[rx_idx]}" --mcache "${TX_MCACHE[0]}" --fseq "${RX_FSEQ[rx_idx]}" &
50+
timeout 15 taskset -c "$CORE_NEXT" "$UNIT_TEST"/test_meta_rx --tile-cpus "$CORE_NEXT" --cnc "${RX_CNC[rx_idx]}" --mcache "${TX_MCACHE[0]}" --fseq "${RX_FSEQ[rx_idx]}" &
5151
CORE_NEXT=$((CORE_NEXT+NUMA_STRIDE))
5252
done
5353

5454
# Start up the transmitter
5555

56-
taskset -c "$CORE_NEXT" "$UNIT_TEST"/test_meta_tx --tile-cpus "$CORE_NEXT" --cnc "${TX_CNC[0]}" --mcache "${TX_MCACHE[0]}" --fseqs "${RX_FSEQS}" "$@" &
56+
timeout 15 taskset -c "$CORE_NEXT" "$UNIT_TEST"/test_meta_tx --tile-cpus "$CORE_NEXT" --cnc "${TX_CNC[0]}" --mcache "${TX_MCACHE[0]}" --fseqs "${RX_FSEQS}" "$@" &
5757
CORE_NEXT=$((CORE_NEXT+NUMA_STRIDE))
5858

5959
# Let run for a while

0 commit comments

Comments
 (0)