Skip to content

Commit f08f338

Browse files
committed
revert: remove debug timing instrumentation from video write loop
1 parent a6a8b74 commit f08f338

1 file changed

Lines changed: 0 additions & 58 deletions

File tree

distribution/moq_session.go

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -500,9 +500,6 @@ func (m *MoQSession) Stats() ViewerStats {
500500
func (m *MoQSession) writeVideoLoop(ctx context.Context, sub *moqTrackSub) {
501501
var currentStream *webtransport.SendStream
502502
var currentGroupID uint32
503-
var streamOpenTotal, frameWriteTotal time.Duration
504-
var streamOpenCount, frameWriteCount int64
505-
var maxStreamOpen, maxFrameWrite time.Duration
506503

507504
closeStream := func() {
508505
if currentStream != nil {
@@ -512,35 +509,10 @@ func (m *MoQSession) writeVideoLoop(ctx context.Context, sub *moqTrackSub) {
512509
}
513510
defer closeStream()
514511

515-
// Periodic logging of write timing stats.
516-
logTicker := time.NewTicker(10 * time.Second)
517-
defer logTicker.Stop()
518-
519512
for {
520513
select {
521514
case <-ctx.Done():
522515
return
523-
case <-logTicker.C:
524-
qLen := len(sub.videoCh)
525-
var avgOpen, avgWrite float64
526-
if streamOpenCount > 0 {
527-
avgOpen = float64(streamOpenTotal.Microseconds()) / float64(streamOpenCount)
528-
}
529-
if frameWriteCount > 0 {
530-
avgWrite = float64(frameWriteTotal.Microseconds()) / float64(frameWriteCount)
531-
}
532-
m.log.Info("video write loop stats",
533-
"queue_len", qLen,
534-
"queue_cap", cap(sub.videoCh),
535-
"stream_opens", streamOpenCount,
536-
"avg_open_us", avgOpen,
537-
"max_open_us", maxStreamOpen.Microseconds(),
538-
"frame_writes", frameWriteCount,
539-
"avg_write_us", avgWrite,
540-
"max_write_us", maxFrameWrite.Microseconds(),
541-
"video_sent", m.videoSent.Load(),
542-
"video_dropped", m.videoDropped.Load(),
543-
)
544516
case frame, ok := <-sub.videoCh:
545517
if !ok {
546518
return
@@ -550,21 +522,7 @@ func (m *MoQSession) writeVideoLoop(ctx context.Context, sub *moqTrackSub) {
550522
closeStream()
551523
currentGroupID = frame.GroupID
552524

553-
t0 := time.Now()
554525
stream, err := m.session.OpenUniStreamSync(ctx)
555-
dt := time.Since(t0)
556-
streamOpenTotal += dt
557-
streamOpenCount++
558-
if dt > maxStreamOpen {
559-
maxStreamOpen = dt
560-
}
561-
if dt > 50*time.Millisecond {
562-
m.log.Warn("slow stream open",
563-
"duration_ms", dt.Milliseconds(),
564-
"queue_len", len(sub.videoCh),
565-
)
566-
}
567-
568526
if err != nil {
569527
m.log.Debug("video stream open failed", "error", err)
570528
return
@@ -583,23 +541,7 @@ func (m *MoQSession) writeVideoLoop(ctx context.Context, sub *moqTrackSub) {
583541
continue
584542
}
585543

586-
t0 := time.Now()
587544
n, err := sub.writer.WriteVideoFrame(currentStream, frame)
588-
dt := time.Since(t0)
589-
frameWriteTotal += dt
590-
frameWriteCount++
591-
if dt > maxFrameWrite {
592-
maxFrameWrite = dt
593-
}
594-
if dt > 50*time.Millisecond {
595-
m.log.Warn("slow frame write",
596-
"duration_ms", dt.Milliseconds(),
597-
"frame_size", len(frame.WireData),
598-
"keyframe", frame.IsKeyframe,
599-
"queue_len", len(sub.videoCh),
600-
)
601-
}
602-
603545
if err != nil {
604546
closeStream()
605547
m.log.Debug("video frame write failed", "error", err)

0 commit comments

Comments
 (0)