From fffeda17b757e9472d7926409e4ce8aaf9b0e1c5 Mon Sep 17 00:00:00 2001
From: CDS Controls <controls@x1fw1.dts.ligo-wa.caltech.edu>
Date: Fri, 6 Dec 2019 11:28:07 -0800
Subject: [PATCH] Removing some unused diagnostic messages that could overflow
under large dcu counts and corrupt the stack
---
src/ix_stream/dix_xmit.c | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/ix_stream/dix_xmit.c b/src/ix_stream/dix_xmit.c
index bbff9a1ab..fe92cdf38 100644
--- a/src/ix_stream/dix_xmit.c
+++ b/src/ix_stream/dix_xmit.c
@@ -93,8 +93,7 @@ void
print_diags( int nsys,
int lastCycle,
int sendLength,
- daq_multi_dcu_data_t* ixDataBlock,
- int dbs[] )
+ daq_multi_dcu_data_t* ixDataBlock)
{
// **********************************************************************************************
int ii = 0;
@@ -106,7 +105,7 @@ print_diags( int nsys,
sendLength );
fprintf( stderr,
"DCU ID\tCycle \t "
- "TimeSec\tTimeNSec\tDataSize\tTPCount\tTPSize\tXmitSize\n" );
+ "TimeSec\tTimeNSec\tDataSize\tTPCount\tTPSize\n" );
for ( ii = 0; ii < nsys; ii++ )
{
fprintf( stderr, "%d", ixDataBlock->header.dcuheader[ ii ].dcuId );
@@ -120,7 +119,6 @@ print_diags( int nsys,
stderr, "\t\t%d", ixDataBlock->header.dcuheader[ ii ].tpCount );
fprintf(
stderr, "\t%d", ixDataBlock->header.dcuheader[ ii ].tpBlockSize );
- fprintf( stderr, "\t%d", dbs[ ii ] );
fprintf( stderr, "\n " );
}
}
@@ -326,11 +324,9 @@ main( int argc, char** argv )
int datablock_size_running = 0;
int datablock_size_mb_s = 0;
static const int header_size = sizeof( daq_multi_dcu_header_t );
- char dcstatus[ 4096 ];
char dcs[ 48 ];
int edcuid[ 10 ];
int estatus[ 10 ];
- int edbs[ 10 ];
unsigned long ets = 0;
int timeout = 0;
int threads_rdy;
@@ -553,7 +549,7 @@ main( int argc, char** argv )
mytotaldcu,
dc_datablock_size );
print_diags(
- mytotaldcu, nextCycle, sendLength, ifoDataBlock, edbs );
+ mytotaldcu, nextCycle, sendLength, ifoDataBlock );
}
n_cycle_time = 0;
min_cycle_time = 1 << 30;
@@ -621,13 +617,6 @@ main( int argc, char** argv )
SCIFlush( sequence, SCI_FLAG_FLUSH_CPU_BUFFERS_ONLY );
}
}
- sprintf( dcstatus, "%ld ", ets );
- for ( ii = 0; ii < mytotaldcu; ii++ )
- {
- sprintf(
- dcs, "%d %d %d ", edcuid[ ii ], estatus[ ii ], edbs[ ii ] );
- strcat( dcstatus, dcs );
- }
// Increment cycle count
nextCycle++;
--
GitLab