8000 P2PMatchingReport: display misses by rollback depth and rollback_slack; remove the 1.10.2 room fields by inada-s-ai[bot] · Pull Request #440 · inada-s/gdxsv · GitHub
[go: up one dir, main page]

Skip to content
Merged
22 changes: 8 additions & 14 deletions gdxsv/lbs_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -1914,6 +1914,12 @@ func p2pMatchingReportFields(r *proto.P2PMatchingReport) []zap.Field {
timingStatsField("present_interval", r.PresentInterval),
timingStatsField("rollback_frame_time", r.RollbackFrameTime),
frameTimingField("frame_timing", r.FrameTiming),
zap.Int32s("present_depth_hist", r.PresentDepthHist),
zap.Int32s("late_present_depth_hist", r.LatePresentDepthHist),
zap.Int32s("dropped_depth_hist", r.DroppedDepthHist),
zap.Int32("display_stats_presents", r.DisplayStatsPresents),
zap.Int32s("display_miss_depth_hist", r.DisplayMissDepthHist),
zap.Int32("display_composed_presents", r.DisplayComposedPresents),
}
}

Expand All @@ -1922,11 +1928,8 @@ type frameTimingLog struct{ s *proto.FrameTiming }
func (l frameTimingLog) MarshalLogObject(e zapcore.ObjectEncoder) error {
e.AddInt32("period_us", l.s.PeriodUs)
addTimingStats(e, "work", l.s.Work)
addTimingStats(e, "rollback_room", l.s.RollbackRoom)
e.AddInt32("over_period", l.s.OverPeriod)
if err := e.AddArray("over_period_depth_hist", int32s(l.s.OverPeriodDepthHist)); err != nil {
return err
}
e.AddInt32("present_wait_elasticity", l.s.PresentWaitElasticity)
addTimingStats(e, "rollback_slack", l.s.RollbackSlack)
addTimingStats(e, "present_wait", l.s.PresentWait)
addTimingStats(e, "render_wait", l.s.RenderWait)
addTimingStats(e, "rollback_wait", l.s.RollbackWait)
Expand All @@ -1942,15 +1945,6 @@ func frameTimingField(key string, s *proto.FrameTiming) zap.Field {
return zap.Object(key, frameTimingLog{s})
}

type int32s []int32

func (a int32s) MarshalLogArray(e zapcore.ArrayEncoder) error {
for _, v := range a {
e.AppendInt32(v)
}
return nil
}

// addTimingStats: skipped when not sent, like timingStatsField.
func addTimingStats(e zapcore.ObjectEncoder, key string, s *proto.TimingStats) {
if s != nil {
Expand Down
53 changes: 46 additions & 7 deletions gdxsv/lbs_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

"go.uber.org/zap"
"go.uber.org/zap/zaptest/observer"
"google.golang.org/protobuf/encoding/protowire"
"google.golang.org/protobuf/proto"
)

Expand Down Expand Up @@ -255,11 +256,27 @@ func Test_p2pMatchingReportFields(t *testing.T) {
TimesyncFrames: []int32{300, 1800},
PresentInterval: &pb.TimingStats{Count: 5400, MeanUs: 16683, P99Us: 17100, OffPeriod: 3},
RollbackFrameTime: &pb.TimingStats{Count: 154, MeanUs: 3900, P50Us: 3700, P99Us: 6100, MaxUs: 7400},
FrameTiming: &pb.FrameTiming{PeriodUs: 16683, OverPeriod: 12, OverPeriodDepthHist: []int32{0, 1, 2, 9},
Work: &pb.TimingStats{Count: 5400, P50Us: 6100, P99Us: 15200, MaxUs: 21000},
RollbackRoom: &pb.TimingStats{Count: 5400, P1Us: -800, P5Us: 4200, P50Us: 9500},
RenderWait: &pb.TimingStats{Count: 5380, P50Us: 900, MaxUs: 30500}},
FrameTiming: &pb.FrameTiming{PeriodUs: 16683,
Work: &pb.TimingStats{Count: 5400, P50Us: 6100, P99Us: 15200, MaxUs: 21000},
RenderWait: &pb.TimingStats{Count: 5380, P50Us: 900, MaxUs: 30500}},
PresentDepthHist: []int32{5200, 120, 30, 4},
LatePresentDepthHist: []int32{3, 0, 1, 3},
DroppedDepthHist: []int32{3, 0, 1, 4},
DisplayStatsPresents: 5354,
DisplayMissDepthHist: []int32{2, 0, 1, 5},
DisplayComposedPresents: 40,
}
// The removed fields as 1.10.2 still sends them: rollback_room = 3, over_period = 4, over_period_depth_hist = 5.
room, err := proto.Marshal(&pb.TimingStats{Count: 5400, P1Us: -800, P5Us: 4200, P50Us: 9500})
must(t, err)
var old []byte
old = protowire.AppendTag(old, 3, protowire.BytesType)
old = protowire.AppendBytes(old, room)
old = protowire.AppendTag(old, 4, protowire.VarintType)
old = protowire.AppendVarint(old, 12)
old = protowire.AppendTag(old, 5, protowire.BytesType)
old = protowire.AppendBytes(old, []byte{0, 1, 2, 9})
report.FrameTiming.ProtoReflect().SetUnknown(old)
// Through the wire format, as the handler gets it.
bin, err := proto.Marshal(report)
must(t, err)
Expand All @@ -285,15 +302,37 @@ func Test_p2pMatchingReportFields(t *testing.T) {
f["rollback_frame_time"])
ft := f["frame_timing"].(map[string]interface{})
assertEq(t, int32(16683), ft["period_us"])
assertEq(t, int32(12), ft["over_period"])
assertEq(t, []interface{}{int32(0), int32(1), int32(2), int32(9)}, ft["over_period_depth_hist"])
assertEq(t, int32(15200), ft["work"].(map[string]interface{})["p99_us"])
assertEq(t, int32(-800), ft["rollback_room"].(map[string]interface{})["p1_us"])
assertEq(t, int32(30500), ft["render_wait"].(map[string]interface{})["max_us"])
// The removed 1.10.2 fields arrive as unknown fields and are not logged.
assertEq(t, len(old), len(got.FrameTiming.ProtoReflect().GetUnknown()))
for _, k := range []string{"rollback_room", "over_period", "over_period_depth_hist"} {
_, ok := ft[k]
assertEq(t, false, ok)
}
// A wait this client did not have (threaded rendering on: no Present wait): not logged.
_, ok := ft["present_wait"]
assertEq(t, false, ok)
// Not sent (an older client): not logged.
_, ok = f["socket_read_gap"]
assertEq(t, false, ok)
assertEq(t, []interface{}{int32(5200), int32(120), int32(30), int32(4)}, f["present_depth_hist"])
assertEq(t, []interface{}{int32(3), int32(0), int32(1), int32(3)}, f["late_present_depth_hist"])
assertEq(t, []interface{}{int32(3), int32(0), int32(1), int32(4)}, f["dropped_depth_hist"])
assertEq(t, int32(5354), f["display_stats_presents"])
assertEq(t, []interface{}{int32(2), int32(0), int32(1), int32(5)}, f["display_miss_depth_hist"])
assertEq(t, int32(40), f["display_composed_presents"])

// A client after 1.10.2: the slack and elasticity.
report.FrameTiming = &pb.FrameTiming{PeriodUs: 16683, PresentWaitElasticity: 850,
RollbackSlack: &pb.TimingStats{Count: 5400, P1Us: 9800, P50Us: 12100}}
bin, err = proto.Marshal(report)
must(t, err)
var got2 pb.P2PMatchingReport
must(t, proto.Unmarshal(bin, &got2))
core, logs = observer.New(zap.InfoLevel)
zap.New(core).Info("P2PMatchingReport", p2pMatchingReportFields(&got2)...)
ft = logs.All()[0].ContextMap()["frame_timing"].(map[string]interface{})
assertEq(t, int32(850), ft["present_wait_elasticity"])
assertEq(t, int32(9800), ft["rollback_slack"].(map[string]interface{})["p1_us"])
}
Loading
Loading
0