diff --git a/api/services/control/control.pb.go b/api/services/control/control.pb.go index 625b554a744d..db97db6141ec 100644 --- a/api/services/control/control.pb.go +++ b/api/services/control/control.pb.go @@ -1505,6 +1505,8 @@ type BuildHistoryRecord struct { Generation int32 `protobuf:"varint,12,opt,name=Generation,proto3" json:"Generation,omitempty"` Trace *Descriptor `protobuf:"bytes,13,opt,name=trace,proto3" json:"trace,omitempty"` Pinned bool `protobuf:"varint,14,opt,name=pinned,proto3" json:"pinned,omitempty"` + NumCachedSteps int32 `protobuf:"varint,15,opt,name=numCachedSteps,proto3" json:"numCachedSteps,omitempty"` + NumTotalSteps int32 `protobuf:"varint,16,opt,name=numTotalSteps,proto3" json:"numTotalSteps,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1641,6 +1643,20 @@ func (m *BuildHistoryRecord) GetPinned() bool { return false } +func (m *BuildHistoryRecord) GetNumCachedSteps() int32 { + if m != nil { + return m.NumCachedSteps + } + return 0 +} + +func (m *BuildHistoryRecord) GetNumTotalSteps() int32 { + if m != nil { + return m.NumTotalSteps + } + return 0 +} + type UpdateBuildHistoryRequest struct { Ref string `protobuf:"bytes,1,opt,name=Ref,proto3" json:"Ref,omitempty"` Pinned bool `protobuf:"varint,2,opt,name=Pinned,proto3" json:"Pinned,omitempty"` @@ -1962,146 +1978,148 @@ func init() { func init() { proto.RegisterFile("control.proto", fileDescriptor_0c5120591600887d) } var fileDescriptor_0c5120591600887d = []byte{ - // 2213 bytes of a gzipped FileDescriptorProto + // 2246 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x59, 0xcd, 0x6e, 0x1b, 0xc9, - 0x11, 0xf6, 0x90, 0x12, 0x7f, 0x8a, 0x94, 0x56, 0x6e, 0x7b, 0x8d, 0xc9, 0xc4, 0x2b, 0xc9, 0xb3, - 0x36, 0x22, 0x38, 0xf6, 0x50, 0xab, 0xac, 0x63, 0xaf, 0x9c, 0x38, 0x16, 0x45, 0x66, 0x2d, 0xc7, - 0x86, 0xb5, 0x2d, 0x79, 0x0d, 0x2c, 0xe0, 0x04, 0x23, 0xb2, 0x45, 0x0f, 0x34, 0x9c, 0x99, 0x74, - 0x37, 0xb5, 0xe6, 0x3e, 0x40, 0x80, 0xcd, 0x21, 0xc8, 0x25, 0xc8, 0x25, 0xf7, 0x9c, 0x72, 0xce, - 0x13, 0x04, 0xf0, 0x31, 0xe7, 0x3d, 0x38, 0x81, 0x1f, 0x20, 0xc8, 0x31, 0x97, 0x00, 0x8b, 0xfe, - 0x19, 0xb2, 0x49, 0x0e, 0x25, 0xca, 0xf6, 0x89, 0x5d, 0xdd, 0x55, 0x35, 0x55, 0xd5, 0xd5, 0xd5, - 0x5f, 0x35, 0x61, 0xa1, 0x15, 0x47, 0x9c, 0xc6, 0xa1, 0x97, 0xd0, 0x98, 0xc7, 0x68, 0xa9, 0x1b, - 0x1f, 0xf4, 0xbd, 0x83, 0x5e, 0x10, 0xb6, 0x8f, 0x02, 0xee, 0x1d, 0x7f, 0xe2, 0xdc, 0xec, 0x04, - 0xfc, 0x45, 0xef, 0xc0, 0x6b, 0xc5, 0xdd, 0x5a, 0x27, 0xee, 0xc4, 0x35, 0xc9, 0x78, 0xd0, 0x3b, - 0x94, 0x94, 0x24, 0xe4, 0x48, 0x29, 0x70, 0x56, 0x3a, 0x71, 0xdc, 0x09, 0xc9, 0x90, 0x8b, 0x07, - 0x5d, 0xc2, 0xb8, 0xdf, 0x4d, 0x34, 0xc3, 0x0d, 0x43, 0x9f, 0xf8, 0x58, 0x2d, 0xfd, 0x58, 0x8d, - 0xc5, 0xe1, 0x31, 0xa1, 0xb5, 0xe4, 0xa0, 0x16, 0x27, 0x4c, 0x73, 0xd7, 0xa6, 0x72, 0xfb, 0x49, - 0x50, 0xe3, 0xfd, 0x84, 0xb0, 0xda, 0xd7, 0x31, 0x3d, 0x22, 0x54, 0x0b, 0x6c, 0x8c, 0x9b, 0xab, - 0xec, 0xf1, 0x93, 0x80, 0xe9, 0x61, 0x8d, 0x26, 0xad, 0x1a, 0xe3, 0x3e, 0xef, 0xa5, 0x1f, 0xb9, - 0x75, 0x82, 0x49, 0x3d, 0xda, 0x22, 0x49, 0x1c, 0x06, 0xad, 0xbe, 0x30, 0x4c, 0x8d, 0x94, 0x98, - 0xfb, 0x3b, 0x0b, 0xaa, 0xbb, 0xb4, 0x17, 0x11, 0x4c, 0x7e, 0xdb, 0x23, 0x8c, 0xa3, 0x4b, 0x50, - 0x38, 0x0c, 0x42, 0x4e, 0xa8, 0x6d, 0xad, 0xe6, 0xd7, 0xca, 0x58, 0x53, 0x68, 0x09, 0xf2, 0x7e, - 0x18, 0xda, 0xb9, 0x55, 0x6b, 0xad, 0x84, 0xc5, 0x10, 0xad, 0x41, 0xf5, 0x88, 0x90, 0xa4, 0xd1, - 0xa3, 0x3e, 0x0f, 0xe2, 0xc8, 0xce, 0xaf, 0x5a, 0x6b, 0xf9, 0xfa, 0xdc, 0xab, 0xd7, 0x2b, 0x16, - 0x1e, 0x59, 0x41, 0x2e, 0x94, 0x05, 0x5d, 0xef, 0x73, 0xc2, 0xec, 0x39, 0x83, 0x6d, 0x38, 0xed, - 0x5e, 0x87, 0xa5, 0x46, 0xc0, 0x8e, 0x9e, 0x32, 0xbf, 0x73, 0x9a, 0x2d, 0xee, 0x43, 0x38, 0x6f, - 0xf0, 0xb2, 0x24, 0x8e, 0x18, 0x41, 0xb7, 0xa0, 0x40, 0x49, 0x2b, 0xa6, 0x6d, 0xc9, 0x5c, 0xd9, - 0xf8, 0xc8, 0x1b, 0x4f, 0x03, 0x4f, 0x0b, 0x08, 0x26, 0xac, 0x99, 0xdd, 0x3f, 0xe7, 0xa1, 0x62, - 0xcc, 0xa3, 0x45, 0xc8, 0xed, 0x34, 0x6c, 0x6b, 0xd5, 0x5a, 0x2b, 0xe3, 0xdc, 0x4e, 0x03, 0xd9, - 0x50, 0x7c, 0xdc, 0xe3, 0xfe, 0x41, 0x48, 0xb4, 0xef, 0x29, 0x89, 0x2e, 0xc2, 0xfc, 0x4e, 0xf4, - 0x94, 0x11, 0xe9, 0x78, 0x09, 0x2b, 0x02, 0x21, 0x98, 0xdb, 0x0b, 0xbe, 0x21, 0xca, 0x4d, 0x2c, - 0xc7, 0xc8, 0x81, 0xc2, 0xae, 0x4f, 0x49, 0xc4, 0xed, 0x79, 0xa1, 0xb7, 0x9e, 0xb3, 0x2d, 0xac, - 0x67, 0x50, 0x1d, 0xca, 0xdb, 0x94, 0xf8, 0x9c, 0xb4, 0xb7, 0xb8, 0x5d, 0x58, 0xb5, 0xd6, 0x2a, - 0x1b, 0x8e, 0xa7, 0x36, 0xd9, 0x4b, 0xf3, 0xcf, 0xdb, 0x4f, 0xf3, 0xaf, 0x5e, 0x7a, 0xf5, 0x7a, - 0xe5, 0xdc, 0x1f, 0xff, 0x25, 0x62, 0x37, 0x10, 0x43, 0xf7, 0x01, 0x1e, 0xf9, 0x8c, 0x3f, 0x65, - 0x52, 0x49, 0xf1, 0x54, 0x25, 0x73, 0x52, 0x81, 0x21, 0x83, 0x96, 0x01, 0x64, 0x10, 0xb6, 0xe3, - 0x5e, 0xc4, 0xed, 0x92, 0xb4, 0xdd, 0x98, 0x41, 0xab, 0x50, 0x69, 0x10, 0xd6, 0xa2, 0x41, 0x22, - 0xb7, 0xba, 0x2c, 0xc3, 0x63, 0x4e, 0x09, 0x0d, 0x2a, 0x82, 0xfb, 0xfd, 0x84, 0xd8, 0x20, 0x19, - 0x8c, 0x19, 0xb1, 0x97, 0x7b, 0x2f, 0x7c, 0x4a, 0xda, 0x76, 0x45, 0x86, 0x4b, 0x53, 0x22, 0xbe, - 0x2a, 0x12, 0xcc, 0xae, 0xca, 0x4d, 0x4e, 0x49, 0xf7, 0xf7, 0x45, 0xa8, 0xee, 0x89, 0xe3, 0x94, - 0xa6, 0xc3, 0x12, 0xe4, 0x31, 0x39, 0xd4, 0x7b, 0x23, 0x86, 0xc8, 0x03, 0x68, 0x90, 0xc3, 0x20, - 0x0a, 0xa4, 0x55, 0x39, 0xe9, 0xf8, 0xa2, 0x97, 0x1c, 0x78, 0xc3, 0x59, 0x6c, 0x70, 0x20, 0x07, - 0x4a, 0xcd, 0x97, 0x49, 0x4c, 0x45, 0x4a, 0xe5, 0xa5, 0x9a, 0x01, 0x8d, 0x9e, 0xc1, 0x42, 0x3a, - 0xde, 0xe2, 0x9c, 0x8a, 0x44, 0x15, 0x69, 0xf4, 0xc9, 0x64, 0x1a, 0x99, 0x46, 0x79, 0x23, 0x32, - 0xcd, 0x88, 0xd3, 0x3e, 0x1e, 0xd5, 0x23, 0x3c, 0xdc, 0x23, 0x8c, 0x09, 0x0b, 0xe5, 0xf6, 0xe3, - 0x94, 0x14, 0xe6, 0xfc, 0x92, 0xc6, 0x11, 0x27, 0x51, 0x5b, 0x6e, 0x7d, 0x19, 0x0f, 0x68, 0x61, - 0x4e, 0x3a, 0x56, 0xe6, 0x14, 0x67, 0x32, 0x67, 0x44, 0x46, 0x9b, 0x33, 0x32, 0x87, 0x36, 0x61, - 0x7e, 0xdb, 0x6f, 0xbd, 0x20, 0x72, 0x97, 0x2b, 0x1b, 0xcb, 0x93, 0x0a, 0xe5, 0xf2, 0x13, 0xb9, - 0xad, 0x4c, 0x1e, 0xd4, 0x73, 0x58, 0x89, 0xa0, 0x5f, 0x43, 0xb5, 0x19, 0xf1, 0x80, 0x87, 0xa4, - 0x2b, 0x77, 0xac, 0x2c, 0x76, 0xac, 0xbe, 0xf9, 0xdd, 0xeb, 0x95, 0x9f, 0x4e, 0x2d, 0x3f, 0x3d, - 0x1e, 0x84, 0x35, 0x62, 0x48, 0x79, 0x86, 0x0a, 0x3c, 0xa2, 0x0f, 0x7d, 0x05, 0x8b, 0xa9, 0xb1, - 0x3b, 0x51, 0xd2, 0xe3, 0xcc, 0x06, 0xe9, 0xf5, 0xc6, 0x8c, 0x5e, 0x2b, 0x21, 0xe5, 0xf6, 0x98, - 0x26, 0x11, 0xec, 0x9d, 0x88, 0x13, 0x1a, 0xf9, 0xa1, 0x4e, 0xc1, 0x01, 0x8d, 0x76, 0x44, 0xa6, - 0x89, 0x2a, 0xb9, 0x2b, 0x6b, 0xa3, 0x5d, 0x95, 0xa1, 0xb9, 0x36, 0xf9, 0x55, 0xb3, 0x96, 0x7a, - 0x8a, 0x19, 0x8f, 0x88, 0x3a, 0xf7, 0x01, 0x4d, 0xa6, 0x84, 0x48, 0xdd, 0x23, 0xd2, 0x4f, 0x53, - 0xf7, 0x88, 0xf4, 0x45, 0xf5, 0x38, 0xf6, 0xc3, 0x9e, 0xaa, 0x2a, 0x65, 0xac, 0x88, 0xcd, 0xdc, - 0x1d, 0x4b, 0x68, 0x98, 0xdc, 0xc5, 0x33, 0x69, 0xf8, 0x02, 0x2e, 0x64, 0x44, 0x24, 0x43, 0xc5, - 0x55, 0x53, 0xc5, 0xe4, 0xd1, 0x19, 0xaa, 0x74, 0xff, 0x96, 0x87, 0xaa, 0x99, 0x17, 0x68, 0x1d, - 0x2e, 0x28, 0x3f, 0x31, 0x39, 0x6c, 0x90, 0x84, 0x92, 0x96, 0x28, 0x46, 0x5a, 0x79, 0xd6, 0x12, - 0xda, 0x80, 0x8b, 0x3b, 0x5d, 0x3d, 0xcd, 0x0c, 0x91, 0x9c, 0x3c, 0xf6, 0x99, 0x6b, 0x28, 0x86, - 0x0f, 0x95, 0x2a, 0x19, 0x09, 0x43, 0x28, 0x2f, 0xf3, 0xe2, 0xb3, 0x93, 0x93, 0xd7, 0xcb, 0x94, - 0x55, 0xe9, 0x91, 0xad, 0x17, 0xfd, 0x1c, 0x8a, 0x6a, 0x21, 0x3d, 0xff, 0x1f, 0x9f, 0xfc, 0x09, - 0xa5, 0x2c, 0x95, 0x11, 0xe2, 0xca, 0x0f, 0x66, 0xcf, 0x9f, 0x41, 0x5c, 0xcb, 0x38, 0x0f, 0xc0, - 0x99, 0x6e, 0xf2, 0x59, 0x52, 0xc0, 0xfd, 0xab, 0x05, 0xe7, 0x27, 0x3e, 0x24, 0x2e, 0x27, 0x59, - 0x9e, 0x95, 0x0a, 0x39, 0x46, 0x0d, 0x98, 0x57, 0x05, 0x26, 0x27, 0x0d, 0xf6, 0x66, 0x30, 0xd8, - 0x33, 0xaa, 0x8b, 0x12, 0x76, 0xee, 0x00, 0xbc, 0x5d, 0xb2, 0xba, 0x7f, 0xb7, 0x60, 0x41, 0x1f, - 0x66, 0x7d, 0x93, 0xfb, 0xb0, 0x94, 0x1e, 0xa1, 0x74, 0x4e, 0xdf, 0xe9, 0xb7, 0xa6, 0xd6, 0x01, - 0xc5, 0xe6, 0x8d, 0xcb, 0x29, 0x1b, 0x27, 0xd4, 0x39, 0xdb, 0x69, 0x5e, 0x8d, 0xb1, 0x9e, 0xc9, - 0xf2, 0x2b, 0xb0, 0xb0, 0x27, 0x21, 0xd8, 0xd4, 0x0b, 0xca, 0xfd, 0xaf, 0x05, 0x8b, 0x29, 0x8f, - 0xf6, 0xee, 0x53, 0x28, 0x1d, 0x13, 0xca, 0xc9, 0x4b, 0xc2, 0xb4, 0x57, 0xf6, 0xa4, 0x57, 0x5f, - 0x4a, 0x0e, 0x3c, 0xe0, 0x44, 0x9b, 0x50, 0x52, 0x70, 0x8f, 0xa4, 0x1b, 0xb5, 0x3c, 0x4d, 0x4a, - 0x7f, 0x6f, 0xc0, 0x8f, 0x6a, 0x30, 0x17, 0xc6, 0x1d, 0xa6, 0xcf, 0xcc, 0x0f, 0xa7, 0xc9, 0x3d, - 0x8a, 0x3b, 0x58, 0x32, 0xa2, 0xbb, 0x50, 0xfa, 0xda, 0xa7, 0x51, 0x10, 0x75, 0xd2, 0x53, 0xb0, - 0x32, 0x4d, 0xe8, 0x99, 0xe2, 0xc3, 0x03, 0x01, 0x01, 0xa8, 0x0a, 0x6a, 0x0d, 0x3d, 0x84, 0x42, - 0x3b, 0xe8, 0x10, 0xc6, 0x55, 0x48, 0xea, 0x1b, 0xe2, 0x2e, 0xf9, 0xee, 0xf5, 0xca, 0x75, 0xe3, - 0xb2, 0x88, 0x13, 0x12, 0x09, 0xf8, 0xee, 0x07, 0x11, 0xa1, 0x02, 0xde, 0xde, 0x54, 0x22, 0x5e, - 0x43, 0xfe, 0x60, 0xad, 0x41, 0xe8, 0x0a, 0xd4, 0x95, 0x20, 0xeb, 0xc5, 0xdb, 0xe9, 0x52, 0x1a, - 0xc4, 0x31, 0x88, 0xfc, 0x2e, 0xd1, 0x10, 0x40, 0x8e, 0x05, 0x3e, 0x69, 0x89, 0x3c, 0x6f, 0x4b, - 0xe4, 0x56, 0xc2, 0x9a, 0x42, 0x9b, 0x50, 0x64, 0xdc, 0xa7, 0xa2, 0xe6, 0xcc, 0xcf, 0x08, 0xac, - 0x52, 0x01, 0x74, 0x0f, 0xca, 0xad, 0xb8, 0x9b, 0x84, 0x44, 0x48, 0x17, 0x66, 0x94, 0x1e, 0x8a, - 0x88, 0xd4, 0x23, 0x94, 0xc6, 0x54, 0x42, 0xba, 0x32, 0x56, 0x04, 0xba, 0x0d, 0x0b, 0x09, 0x8d, - 0x3b, 0x94, 0x30, 0xf6, 0x39, 0x8d, 0x7b, 0x89, 0xbe, 0xc8, 0xcf, 0x8b, 0xe2, 0xbd, 0x6b, 0x2e, - 0xe0, 0x51, 0x3e, 0xf7, 0x3f, 0x39, 0xa8, 0x9a, 0x29, 0x32, 0x81, 0x75, 0x1f, 0x42, 0x41, 0x25, - 0x9c, 0xca, 0xf5, 0xb7, 0x8b, 0xb1, 0xd2, 0x90, 0x19, 0x63, 0x1b, 0x8a, 0xad, 0x1e, 0x95, 0x40, - 0x58, 0xc1, 0xe3, 0x94, 0x14, 0x9e, 0xf2, 0x98, 0xfb, 0xa1, 0x8c, 0x71, 0x1e, 0x2b, 0x42, 0x60, - 0xe3, 0x41, 0xe7, 0x75, 0x36, 0x6c, 0x3c, 0x10, 0x33, 0xf7, 0xaf, 0xf8, 0x4e, 0xfb, 0x57, 0x3a, - 0xf3, 0xfe, 0xb9, 0xff, 0xb0, 0xa0, 0x3c, 0x38, 0x5b, 0x46, 0x74, 0xad, 0x77, 0x8e, 0xee, 0x48, - 0x64, 0x72, 0x6f, 0x17, 0x99, 0x4b, 0x50, 0x60, 0x9c, 0x12, 0xbf, 0xab, 0x3a, 0x37, 0xac, 0x29, - 0x51, 0xc5, 0xba, 0xac, 0x23, 0x77, 0xa8, 0x8a, 0xc5, 0xd0, 0xfd, 0x9f, 0x05, 0x0b, 0x23, 0xc7, - 0xfd, 0xbd, 0xfa, 0x72, 0x11, 0xe6, 0x43, 0x72, 0x4c, 0x54, 0x6f, 0x99, 0xc7, 0x8a, 0x10, 0xb3, - 0xec, 0x45, 0x4c, 0xb9, 0x34, 0xae, 0x8a, 0x15, 0x21, 0x6c, 0x6e, 0x13, 0xee, 0x07, 0xa1, 0xac, - 0x4b, 0x55, 0xac, 0x29, 0x61, 0x73, 0x8f, 0x86, 0x1a, 0x5f, 0x8b, 0x21, 0x72, 0x61, 0x2e, 0x88, - 0x0e, 0x63, 0x9d, 0x36, 0x12, 0xd9, 0x28, 0x9c, 0xb6, 0x13, 0x1d, 0xc6, 0x58, 0xae, 0xa1, 0x2b, - 0x50, 0xa0, 0x7e, 0xd4, 0x21, 0x29, 0xb8, 0x2e, 0x0b, 0x2e, 0x2c, 0x66, 0xb0, 0x5e, 0x70, 0x5d, - 0xa8, 0xca, 0xfe, 0xf4, 0x31, 0x61, 0xa2, 0x1b, 0x12, 0x69, 0xdd, 0xf6, 0xb9, 0x2f, 0xdd, 0xae, - 0x62, 0x39, 0x76, 0x6f, 0x00, 0x7a, 0x14, 0x30, 0xfe, 0x4c, 0xb6, 0xf0, 0xec, 0xb4, 0xe6, 0x75, - 0x0f, 0x2e, 0x8c, 0x70, 0xeb, 0x6b, 0xe1, 0x67, 0x63, 0xed, 0xeb, 0xd5, 0xc9, 0x8a, 0x2b, 0x5f, - 0x0a, 0x3c, 0x25, 0x38, 0xd6, 0xc5, 0x2e, 0x40, 0x45, 0xfa, 0xa5, 0xbe, 0xed, 0xfa, 0x50, 0x55, - 0xa4, 0x56, 0xfe, 0x05, 0x7c, 0x90, 0x2a, 0xfa, 0x92, 0x50, 0xd9, 0x8a, 0x58, 0x32, 0x2e, 0x3f, - 0x9a, 0xf6, 0x95, 0xfa, 0x28, 0x3b, 0x1e, 0x97, 0x77, 0x09, 0x5c, 0x90, 0x3c, 0x0f, 0x02, 0xc6, - 0x63, 0xda, 0x4f, 0xbd, 0x5e, 0x06, 0xd8, 0x6a, 0xf1, 0xe0, 0x98, 0x3c, 0x89, 0x42, 0x75, 0x8d, - 0x96, 0xb0, 0x31, 0x93, 0x5e, 0x91, 0xb9, 0x61, 0x0f, 0x77, 0x19, 0xca, 0x4d, 0x9f, 0x86, 0xfd, - 0xe6, 0xcb, 0x80, 0xeb, 0x56, 0x7a, 0x38, 0xe1, 0xfe, 0xc1, 0x82, 0xf3, 0xe6, 0x77, 0x9a, 0xc7, - 0xa2, 0x5c, 0xdc, 0x85, 0x39, 0x9e, 0xe2, 0x98, 0xc5, 0x2c, 0x27, 0x26, 0x44, 0x04, 0xd4, 0xc1, - 0x52, 0xc8, 0x88, 0xb4, 0x3a, 0x38, 0x57, 0x4f, 0x16, 0x1f, 0x8b, 0xf4, 0xff, 0x8b, 0x80, 0x26, - 0x97, 0x33, 0x7a, 0x53, 0xb3, 0xb9, 0xcb, 0x8d, 0x35, 0x77, 0xcf, 0xc7, 0x9b, 0x3b, 0x75, 0x35, - 0xdf, 0x9e, 0xc5, 0x92, 0x19, 0x5a, 0xbc, 0x3b, 0x50, 0x4e, 0xd1, 0x4d, 0x7a, 0x81, 0x3b, 0x93, - 0xaa, 0x07, 0x00, 0x68, 0xc8, 0x8c, 0xd6, 0xd2, 0x1b, 0x47, 0xdd, 0x75, 0x28, 0xad, 0x29, 0x34, - 0x69, 0x79, 0x1a, 0x57, 0xe8, 0x5b, 0xe8, 0xde, 0xd9, 0xde, 0x2d, 0xe6, 0xc6, 0xdf, 0x2c, 0xea, - 0x50, 0xd9, 0x4e, 0x0b, 0xe5, 0x19, 0x1e, 0x2d, 0x4c, 0x21, 0xb4, 0xae, 0x81, 0x8d, 0x2a, 0xcd, - 0x97, 0x27, 0x5d, 0x4c, 0x1f, 0x28, 0x62, 0xaa, 0x91, 0xcd, 0x61, 0x06, 0xb4, 0x2c, 0xcb, 0x00, - 0x6d, 0xce, 0x14, 0xfb, 0x19, 0xf1, 0x25, 0xfa, 0x0c, 0x0a, 0x98, 0xb0, 0x5e, 0xc8, 0xe5, 0x4b, - 0x48, 0x65, 0xe3, 0xca, 0x14, 0xed, 0x8a, 0x49, 0x9e, 0x55, 0x2d, 0x80, 0x7e, 0x05, 0x45, 0x35, - 0x62, 0x76, 0x65, 0x5a, 0xcb, 0x9f, 0x61, 0x99, 0x96, 0xd1, 0x0d, 0x85, 0xa6, 0xc4, 0x71, 0xfc, - 0x9c, 0x44, 0x44, 0xbf, 0xd0, 0x89, 0xb6, 0x76, 0x1e, 0x1b, 0x33, 0x68, 0x03, 0xe6, 0x39, 0xf5, - 0x5b, 0xc4, 0x5e, 0x98, 0x21, 0x84, 0x8a, 0x55, 0x14, 0xb6, 0x24, 0x88, 0x22, 0xd2, 0xb6, 0x17, - 0x15, 0x52, 0x52, 0xd4, 0x7b, 0xe8, 0x5b, 0xdf, 0x07, 0x2a, 0x77, 0x9e, 0x43, 0xd5, 0x8c, 0x45, - 0x86, 0xec, 0xed, 0xd1, 0xae, 0x77, 0x86, 0xbd, 0x31, 0x40, 0xff, 0x73, 0xf8, 0xc1, 0xd3, 0xa4, - 0xed, 0x73, 0x92, 0x55, 0xfd, 0x26, 0xab, 0xc0, 0x25, 0x28, 0xec, 0xaa, 0x60, 0xa9, 0xd7, 0x43, - 0x4d, 0x89, 0xf9, 0x06, 0x11, 0x79, 0xac, 0x4b, 0x9e, 0xa6, 0xdc, 0xcb, 0xe0, 0x64, 0xa9, 0x57, - 0xc1, 0x70, 0xff, 0x92, 0x03, 0x18, 0x6e, 0x08, 0xfa, 0x08, 0xa0, 0x4b, 0xda, 0x81, 0xff, 0x1b, - 0x3e, 0x6c, 0xea, 0xca, 0x72, 0x46, 0x76, 0x76, 0x43, 0xf8, 0x9d, 0x7b, 0x67, 0xf8, 0x8d, 0x60, - 0x8e, 0x05, 0xdf, 0x10, 0x0d, 0x15, 0xe4, 0x18, 0x3d, 0x81, 0x8a, 0x1f, 0x45, 0x31, 0x97, 0xa9, - 0x94, 0x36, 0xbc, 0x37, 0x4f, 0x4a, 0x21, 0x6f, 0x6b, 0xc8, 0xaf, 0x32, 0xd5, 0xd4, 0xe0, 0xdc, - 0x83, 0xa5, 0x71, 0x86, 0x33, 0x35, 0x64, 0xdf, 0x5a, 0xf0, 0xc1, 0xd8, 0xd6, 0xa1, 0x4f, 0x07, - 0x27, 0xd1, 0x9a, 0x21, 0xc5, 0xd3, 0x43, 0x78, 0x1f, 0xaa, 0x5b, 0x9c, 0x8b, 0xca, 0xa3, 0x7c, - 0x53, 0x2d, 0xd7, 0xc9, 0xb2, 0x23, 0x12, 0xee, 0x9f, 0xac, 0xe1, 0x5b, 0x63, 0x66, 0xdf, 0x7d, - 0x77, 0xb4, 0xef, 0xbe, 0x36, 0xbd, 0x40, 0xbf, 0xcf, 0x76, 0xfb, 0xfa, 0x2f, 0xe0, 0xc3, 0xcc, - 0xcb, 0x11, 0x55, 0xa0, 0xb8, 0xb7, 0xbf, 0x85, 0xf7, 0x9b, 0x8d, 0xa5, 0x73, 0xa8, 0x0a, 0xa5, - 0xed, 0x27, 0x8f, 0x77, 0x1f, 0x35, 0xf7, 0x9b, 0x4b, 0x96, 0x58, 0x6a, 0x34, 0xc5, 0xb8, 0xb1, - 0x94, 0xdb, 0xf8, 0xb6, 0x00, 0xc5, 0x6d, 0xf5, 0x7f, 0x0b, 0xda, 0x87, 0xf2, 0xe0, 0x21, 0x1e, - 0xb9, 0x19, 0xd1, 0x19, 0x7b, 0xd1, 0x77, 0x3e, 0x3e, 0x91, 0x47, 0x17, 0xcf, 0x07, 0x30, 0x2f, - 0xff, 0x92, 0x40, 0x19, 0x2d, 0xae, 0xf9, 0x5f, 0x85, 0x73, 0xf2, 0x13, 0xff, 0xba, 0x25, 0x34, - 0xc9, 0xf7, 0x81, 0x2c, 0x4d, 0xe6, 0x03, 0xa2, 0xb3, 0x72, 0xca, 0xc3, 0x02, 0x7a, 0x0c, 0x05, - 0xdd, 0x34, 0x65, 0xb1, 0x9a, 0xaf, 0x00, 0xce, 0xea, 0x74, 0x06, 0xa5, 0x6c, 0xdd, 0x42, 0x8f, - 0x07, 0x6f, 0xc2, 0x59, 0xa6, 0x99, 0x88, 0xd3, 0x39, 0x65, 0x7d, 0xcd, 0x5a, 0xb7, 0xd0, 0x57, - 0x50, 0x31, 0x30, 0x25, 0xca, 0x40, 0x34, 0x93, 0x00, 0xd5, 0xb9, 0x76, 0x0a, 0x97, 0xf6, 0xbc, - 0x09, 0x73, 0xf2, 0x20, 0x65, 0x04, 0xdb, 0x80, 0x9c, 0x59, 0x66, 0x8e, 0x40, 0xd0, 0x03, 0x05, - 0x92, 0x49, 0x64, 0x66, 0x1f, 0xba, 0x76, 0xda, 0xdd, 0x36, 0x35, 0x6d, 0x26, 0x92, 0x78, 0xdd, - 0x42, 0x31, 0xa0, 0xc9, 0xe2, 0x89, 0x7e, 0x9c, 0x91, 0x25, 0xd3, 0x2a, 0xb8, 0x73, 0x63, 0x36, - 0x66, 0xe5, 0x54, 0xbd, 0xfa, 0xea, 0xcd, 0xb2, 0xf5, 0xcf, 0x37, 0xcb, 0xd6, 0xbf, 0xdf, 0x2c, - 0x5b, 0x07, 0x05, 0x89, 0x5a, 0x7e, 0xf2, 0x7d, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1f, 0xdc, 0xb1, - 0x33, 0x8f, 0x1c, 0x00, 0x00, + 0x11, 0xde, 0xe1, 0x3f, 0x8b, 0x94, 0x4c, 0xb7, 0xbd, 0xc6, 0x64, 0xe2, 0x95, 0xe4, 0x59, 0x3b, + 0x11, 0x1c, 0x7b, 0xa8, 0x65, 0xd6, 0xb1, 0x57, 0x4e, 0x1c, 0x8b, 0x22, 0xb3, 0x96, 0x63, 0xc3, + 0xda, 0x96, 0xbc, 0x06, 0x16, 0x70, 0x82, 0x11, 0xd9, 0xa2, 0x07, 0x1a, 0xce, 0x4c, 0xba, 0x9b, + 0x5a, 0x73, 0x1f, 0x20, 0xc0, 0xe6, 0x10, 0xe4, 0x12, 0xe4, 0x92, 0x7b, 0x4e, 0x39, 0xe7, 0x09, + 0x02, 0x18, 0xc8, 0x25, 0xe7, 0x3d, 0x38, 0x81, 0x1f, 0x20, 0xc8, 0x31, 0xc7, 0xa0, 0x7f, 0x86, + 0x1c, 0x92, 0x43, 0x89, 0xb2, 0x7d, 0x62, 0x57, 0x77, 0x55, 0x4d, 0x55, 0x75, 0x75, 0xf5, 0x57, + 0x4d, 0x58, 0xea, 0x84, 0x01, 0xa7, 0xa1, 0xef, 0x44, 0x34, 0xe4, 0x21, 0xaa, 0xf5, 0xc3, 0x83, + 0xa1, 0x73, 0x30, 0xf0, 0xfc, 0xee, 0x91, 0xc7, 0x9d, 0xe3, 0x4f, 0xac, 0x9b, 0x3d, 0x8f, 0xbf, + 0x18, 0x1c, 0x38, 0x9d, 0xb0, 0x5f, 0xef, 0x85, 0xbd, 0xb0, 0x2e, 0x19, 0x0f, 0x06, 0x87, 0x92, + 0x92, 0x84, 0x1c, 0x29, 0x05, 0xd6, 0x6a, 0x2f, 0x0c, 0x7b, 0x3e, 0x19, 0x73, 0x71, 0xaf, 0x4f, + 0x18, 0x77, 0xfb, 0x91, 0x66, 0xb8, 0x91, 0xd0, 0x27, 0x3e, 0x56, 0x8f, 0x3f, 0x56, 0x67, 0xa1, + 0x7f, 0x4c, 0x68, 0x3d, 0x3a, 0xa8, 0x87, 0x11, 0xd3, 0xdc, 0xf5, 0xb9, 0xdc, 0x6e, 0xe4, 0xd5, + 0xf9, 0x30, 0x22, 0xac, 0xfe, 0x75, 0x48, 0x8f, 0x08, 0xd5, 0x02, 0x8d, 0x69, 0x73, 0x95, 0x3d, + 0x6e, 0xe4, 0x31, 0x3d, 0xac, 0xd3, 0xa8, 0x53, 0x67, 0xdc, 0xe5, 0x83, 0xf8, 0x23, 0xb7, 0x4e, + 0x30, 0x69, 0x40, 0x3b, 0x24, 0x0a, 0x7d, 0xaf, 0x33, 0x14, 0x86, 0xa9, 0x91, 0x12, 0xb3, 0x7f, + 0x6b, 0x40, 0x75, 0x97, 0x0e, 0x02, 0x82, 0xc9, 0x6f, 0x06, 0x84, 0x71, 0x74, 0x09, 0x0a, 0x87, + 0x9e, 0xcf, 0x09, 0x35, 0x8d, 0xb5, 0xec, 0x7a, 0x19, 0x6b, 0x0a, 0xd5, 0x20, 0xeb, 0xfa, 0xbe, + 0x99, 0x59, 0x33, 0xd6, 0x4b, 0x58, 0x0c, 0xd1, 0x3a, 0x54, 0x8f, 0x08, 0x89, 0x5a, 0x03, 0xea, + 0x72, 0x2f, 0x0c, 0xcc, 0xec, 0x9a, 0xb1, 0x9e, 0x6d, 0xe6, 0x5e, 0xbd, 0x5e, 0x35, 0xf0, 0xc4, + 0x0a, 0xb2, 0xa1, 0x2c, 0xe8, 0xe6, 0x90, 0x13, 0x66, 0xe6, 0x12, 0x6c, 0xe3, 0x69, 0xfb, 0x3a, + 0xd4, 0x5a, 0x1e, 0x3b, 0x7a, 0xca, 0xdc, 0xde, 0x69, 0xb6, 0xd8, 0x0f, 0xe1, 0x7c, 0x82, 0x97, + 0x45, 0x61, 0xc0, 0x08, 0xba, 0x05, 0x05, 0x4a, 0x3a, 0x21, 0xed, 0x4a, 0xe6, 0x4a, 0xe3, 0x23, + 0x67, 0x3a, 0x0d, 0x1c, 0x2d, 0x20, 0x98, 0xb0, 0x66, 0xb6, 0xff, 0x94, 0x85, 0x4a, 0x62, 0x1e, + 0x2d, 0x43, 0x66, 0xa7, 0x65, 0x1a, 0x6b, 0xc6, 0x7a, 0x19, 0x67, 0x76, 0x5a, 0xc8, 0x84, 0xe2, + 0xe3, 0x01, 0x77, 0x0f, 0x7c, 0xa2, 0x7d, 0x8f, 0x49, 0x74, 0x11, 0xf2, 0x3b, 0xc1, 0x53, 0x46, + 0xa4, 0xe3, 0x25, 0xac, 0x08, 0x84, 0x20, 0xb7, 0xe7, 0x7d, 0x43, 0x94, 0x9b, 0x58, 0x8e, 0x91, + 0x05, 0x85, 0x5d, 0x97, 0x92, 0x80, 0x9b, 0x79, 0xa1, 0xb7, 0x99, 0x31, 0x0d, 0xac, 0x67, 0x50, + 0x13, 0xca, 0xdb, 0x94, 0xb8, 0x9c, 0x74, 0xb7, 0xb8, 0x59, 0x58, 0x33, 0xd6, 0x2b, 0x0d, 0xcb, + 0x51, 0x9b, 0xec, 0xc4, 0xf9, 0xe7, 0xec, 0xc7, 0xf9, 0xd7, 0x2c, 0xbd, 0x7a, 0xbd, 0xfa, 0xc1, + 0x1f, 0xfe, 0x25, 0x62, 0x37, 0x12, 0x43, 0xf7, 0x01, 0x1e, 0xb9, 0x8c, 0x3f, 0x65, 0x52, 0x49, + 0xf1, 0x54, 0x25, 0x39, 0xa9, 0x20, 0x21, 0x83, 0x56, 0x00, 0x64, 0x10, 0xb6, 0xc3, 0x41, 0xc0, + 0xcd, 0x92, 0xb4, 0x3d, 0x31, 0x83, 0xd6, 0xa0, 0xd2, 0x22, 0xac, 0x43, 0xbd, 0x48, 0x6e, 0x75, + 0x59, 0x86, 0x27, 0x39, 0x25, 0x34, 0xa8, 0x08, 0xee, 0x0f, 0x23, 0x62, 0x82, 0x64, 0x48, 0xcc, + 0x88, 0xbd, 0xdc, 0x7b, 0xe1, 0x52, 0xd2, 0x35, 0x2b, 0x32, 0x5c, 0x9a, 0x12, 0xf1, 0x55, 0x91, + 0x60, 0x66, 0x55, 0x6e, 0x72, 0x4c, 0xda, 0xbf, 0x2b, 0x42, 0x75, 0x4f, 0x1c, 0xa7, 0x38, 0x1d, + 0x6a, 0x90, 0xc5, 0xe4, 0x50, 0xef, 0x8d, 0x18, 0x22, 0x07, 0xa0, 0x45, 0x0e, 0xbd, 0xc0, 0x93, + 0x56, 0x65, 0xa4, 0xe3, 0xcb, 0x4e, 0x74, 0xe0, 0x8c, 0x67, 0x71, 0x82, 0x03, 0x59, 0x50, 0x6a, + 0xbf, 0x8c, 0x42, 0x2a, 0x52, 0x2a, 0x2b, 0xd5, 0x8c, 0x68, 0xf4, 0x0c, 0x96, 0xe2, 0xf1, 0x16, + 0xe7, 0x54, 0x24, 0xaa, 0x48, 0xa3, 0x4f, 0x66, 0xd3, 0x28, 0x69, 0x94, 0x33, 0x21, 0xd3, 0x0e, + 0x38, 0x1d, 0xe2, 0x49, 0x3d, 0xc2, 0xc3, 0x3d, 0xc2, 0x98, 0xb0, 0x50, 0x6e, 0x3f, 0x8e, 0x49, + 0x61, 0xce, 0x2f, 0x68, 0x18, 0x70, 0x12, 0x74, 0xe5, 0xd6, 0x97, 0xf1, 0x88, 0x16, 0xe6, 0xc4, + 0x63, 0x65, 0x4e, 0x71, 0x21, 0x73, 0x26, 0x64, 0xb4, 0x39, 0x13, 0x73, 0x68, 0x13, 0xf2, 0xdb, + 0x6e, 0xe7, 0x05, 0x91, 0xbb, 0x5c, 0x69, 0xac, 0xcc, 0x2a, 0x94, 0xcb, 0x4f, 0xe4, 0xb6, 0x32, + 0x79, 0x50, 0x3f, 0xc0, 0x4a, 0x04, 0xfd, 0x0a, 0xaa, 0xed, 0x80, 0x7b, 0xdc, 0x27, 0x7d, 0xb9, + 0x63, 0x65, 0xb1, 0x63, 0xcd, 0xcd, 0xef, 0x5e, 0xaf, 0xfe, 0x64, 0x6e, 0xf9, 0x19, 0x70, 0xcf, + 0xaf, 0x93, 0x84, 0x94, 0x93, 0x50, 0x81, 0x27, 0xf4, 0xa1, 0xaf, 0x60, 0x39, 0x36, 0x76, 0x27, + 0x88, 0x06, 0x9c, 0x99, 0x20, 0xbd, 0x6e, 0x2c, 0xe8, 0xb5, 0x12, 0x52, 0x6e, 0x4f, 0x69, 0x12, + 0xc1, 0xde, 0x09, 0x38, 0xa1, 0x81, 0xeb, 0xeb, 0x14, 0x1c, 0xd1, 0x68, 0x47, 0x64, 0x9a, 0xa8, + 0x92, 0xbb, 0xb2, 0x36, 0x9a, 0x55, 0x19, 0x9a, 0x6b, 0xb3, 0x5f, 0x4d, 0xd6, 0x52, 0x47, 0x31, + 0xe3, 0x09, 0x51, 0xeb, 0x3e, 0xa0, 0xd9, 0x94, 0x10, 0xa9, 0x7b, 0x44, 0x86, 0x71, 0xea, 0x1e, + 0x91, 0xa1, 0xa8, 0x1e, 0xc7, 0xae, 0x3f, 0x50, 0x55, 0xa5, 0x8c, 0x15, 0xb1, 0x99, 0xb9, 0x63, + 0x08, 0x0d, 0xb3, 0xbb, 0x78, 0x26, 0x0d, 0x5f, 0xc0, 0x85, 0x94, 0x88, 0xa4, 0xa8, 0xb8, 0x9a, + 0x54, 0x31, 0x7b, 0x74, 0xc6, 0x2a, 0xed, 0xbf, 0x66, 0xa1, 0x9a, 0xcc, 0x0b, 0xb4, 0x01, 0x17, + 0x94, 0x9f, 0x98, 0x1c, 0xb6, 0x48, 0x44, 0x49, 0x47, 0x14, 0x23, 0xad, 0x3c, 0x6d, 0x09, 0x35, + 0xe0, 0xe2, 0x4e, 0x5f, 0x4f, 0xb3, 0x84, 0x48, 0x46, 0x1e, 0xfb, 0xd4, 0x35, 0x14, 0xc2, 0x87, + 0x4a, 0x95, 0x8c, 0x44, 0x42, 0x28, 0x2b, 0xf3, 0xe2, 0xb3, 0x93, 0x93, 0xd7, 0x49, 0x95, 0x55, + 0xe9, 0x91, 0xae, 0x17, 0xfd, 0x0c, 0x8a, 0x6a, 0x21, 0x3e, 0xff, 0x1f, 0x9f, 0xfc, 0x09, 0xa5, + 0x2c, 0x96, 0x11, 0xe2, 0xca, 0x0f, 0x66, 0xe6, 0xcf, 0x20, 0xae, 0x65, 0xac, 0x07, 0x60, 0xcd, + 0x37, 0xf9, 0x2c, 0x29, 0x60, 0xff, 0xc5, 0x80, 0xf3, 0x33, 0x1f, 0x12, 0x97, 0x93, 0x2c, 0xcf, + 0x4a, 0x85, 0x1c, 0xa3, 0x16, 0xe4, 0x55, 0x81, 0xc9, 0x48, 0x83, 0x9d, 0x05, 0x0c, 0x76, 0x12, + 0xd5, 0x45, 0x09, 0x5b, 0x77, 0x00, 0xde, 0x2e, 0x59, 0xed, 0xbf, 0x19, 0xb0, 0xa4, 0x0f, 0xb3, + 0xbe, 0xc9, 0x5d, 0xa8, 0xc5, 0x47, 0x28, 0x9e, 0xd3, 0x77, 0xfa, 0xad, 0xb9, 0x75, 0x40, 0xb1, + 0x39, 0xd3, 0x72, 0xca, 0xc6, 0x19, 0x75, 0xd6, 0x76, 0x9c, 0x57, 0x53, 0xac, 0x67, 0xb2, 0xfc, + 0x0a, 0x2c, 0xed, 0x49, 0x08, 0x36, 0xf7, 0x82, 0xb2, 0xff, 0x6b, 0xc0, 0x72, 0xcc, 0xa3, 0xbd, + 0xfb, 0x14, 0x4a, 0xc7, 0x84, 0x72, 0xf2, 0x92, 0x30, 0xed, 0x95, 0x39, 0xeb, 0xd5, 0x97, 0x92, + 0x03, 0x8f, 0x38, 0xd1, 0x26, 0x94, 0x14, 0xdc, 0x23, 0xf1, 0x46, 0xad, 0xcc, 0x93, 0xd2, 0xdf, + 0x1b, 0xf1, 0xa3, 0x3a, 0xe4, 0xfc, 0xb0, 0xc7, 0xf4, 0x99, 0xf9, 0xfe, 0x3c, 0xb9, 0x47, 0x61, + 0x0f, 0x4b, 0x46, 0x74, 0x17, 0x4a, 0x5f, 0xbb, 0x34, 0xf0, 0x82, 0x5e, 0x7c, 0x0a, 0x56, 0xe7, + 0x09, 0x3d, 0x53, 0x7c, 0x78, 0x24, 0x20, 0x00, 0x55, 0x41, 0xad, 0xa1, 0x87, 0x50, 0xe8, 0x7a, + 0x3d, 0xc2, 0xb8, 0x0a, 0x49, 0xb3, 0x21, 0xee, 0x92, 0xef, 0x5e, 0xaf, 0x5e, 0x4f, 0x5c, 0x16, + 0x61, 0x44, 0x02, 0x01, 0xdf, 0x5d, 0x2f, 0x20, 0x54, 0xc0, 0xdb, 0x9b, 0x4a, 0xc4, 0x69, 0xc9, + 0x1f, 0xac, 0x35, 0x08, 0x5d, 0x9e, 0xba, 0x12, 0x64, 0xbd, 0x78, 0x3b, 0x5d, 0x4a, 0x83, 0x38, + 0x06, 0x81, 0xdb, 0x27, 0x1a, 0x02, 0xc8, 0xb1, 0xc0, 0x27, 0x1d, 0x91, 0xe7, 0x5d, 0x89, 0xdc, + 0x4a, 0x58, 0x53, 0x68, 0x13, 0x8a, 0x8c, 0xbb, 0x54, 0xd4, 0x9c, 0xfc, 0x82, 0xc0, 0x2a, 0x16, + 0x40, 0xf7, 0xa0, 0xdc, 0x09, 0xfb, 0x91, 0x4f, 0x84, 0x74, 0x61, 0x41, 0xe9, 0xb1, 0x88, 0x48, + 0x3d, 0x42, 0x69, 0x48, 0x25, 0xa4, 0x2b, 0x63, 0x45, 0xa0, 0xdb, 0xb0, 0x14, 0xd1, 0xb0, 0x47, + 0x09, 0x63, 0x9f, 0xd3, 0x70, 0x10, 0xe9, 0x8b, 0xfc, 0xbc, 0x28, 0xde, 0xbb, 0xc9, 0x05, 0x3c, + 0xc9, 0x67, 0xff, 0x27, 0x03, 0xd5, 0x64, 0x8a, 0xcc, 0x60, 0xdd, 0x87, 0x50, 0x50, 0x09, 0xa7, + 0x72, 0xfd, 0xed, 0x62, 0xac, 0x34, 0xa4, 0xc6, 0xd8, 0x84, 0x62, 0x67, 0x40, 0x25, 0x10, 0x56, + 0xf0, 0x38, 0x26, 0x85, 0xa7, 0x3c, 0xe4, 0xae, 0x2f, 0x63, 0x9c, 0xc5, 0x8a, 0x10, 0xd8, 0x78, + 0xd4, 0x79, 0x9d, 0x0d, 0x1b, 0x8f, 0xc4, 0x92, 0xfb, 0x57, 0x7c, 0xa7, 0xfd, 0x2b, 0x9d, 0x79, + 0xff, 0xec, 0xbf, 0x1b, 0x50, 0x1e, 0x9d, 0xad, 0x44, 0x74, 0x8d, 0x77, 0x8e, 0xee, 0x44, 0x64, + 0x32, 0x6f, 0x17, 0x99, 0x4b, 0x50, 0x60, 0x9c, 0x12, 0xb7, 0xaf, 0x3a, 0x37, 0xac, 0x29, 0x51, + 0xc5, 0xfa, 0xac, 0x27, 0x77, 0xa8, 0x8a, 0xc5, 0xd0, 0xfe, 0x9f, 0x01, 0x4b, 0x13, 0xc7, 0xfd, + 0xbd, 0xfa, 0x72, 0x11, 0xf2, 0x3e, 0x39, 0x26, 0xaa, 0xb7, 0xcc, 0x62, 0x45, 0x88, 0x59, 0xf6, + 0x22, 0xa4, 0x5c, 0x1a, 0x57, 0xc5, 0x8a, 0x10, 0x36, 0x77, 0x09, 0x77, 0x3d, 0x5f, 0xd6, 0xa5, + 0x2a, 0xd6, 0x94, 0xb0, 0x79, 0x40, 0x7d, 0x8d, 0xaf, 0xc5, 0x10, 0xd9, 0x90, 0xf3, 0x82, 0xc3, + 0x50, 0xa7, 0x8d, 0x44, 0x36, 0x0a, 0xa7, 0xed, 0x04, 0x87, 0x21, 0x96, 0x6b, 0xe8, 0x0a, 0x14, + 0xa8, 0x1b, 0xf4, 0x48, 0x0c, 0xae, 0xcb, 0x82, 0x0b, 0x8b, 0x19, 0xac, 0x17, 0x6c, 0x1b, 0xaa, + 0xb2, 0x3f, 0x7d, 0x4c, 0x98, 0xe8, 0x86, 0x44, 0x5a, 0x77, 0x5d, 0xee, 0x4a, 0xb7, 0xab, 0x58, + 0x8e, 0xed, 0x1b, 0x80, 0x1e, 0x79, 0x8c, 0x3f, 0x93, 0x2d, 0x3c, 0x3b, 0xad, 0x79, 0xdd, 0x83, + 0x0b, 0x13, 0xdc, 0xfa, 0x5a, 0xf8, 0xe9, 0x54, 0xfb, 0x7a, 0x75, 0xb6, 0xe2, 0xca, 0x97, 0x02, + 0x47, 0x09, 0x4e, 0x75, 0xb1, 0x4b, 0x50, 0x91, 0x7e, 0xa9, 0x6f, 0xdb, 0x2e, 0x54, 0x15, 0xa9, + 0x95, 0x7f, 0x01, 0xe7, 0x62, 0x45, 0x5f, 0x12, 0x2a, 0x5b, 0x11, 0x43, 0xc6, 0xe5, 0x87, 0xf3, + 0xbe, 0xd2, 0x9c, 0x64, 0xc7, 0xd3, 0xf2, 0x36, 0x81, 0x0b, 0x92, 0xe7, 0x81, 0xc7, 0x78, 0x48, + 0x87, 0xb1, 0xd7, 0x2b, 0x00, 0x5b, 0x1d, 0xee, 0x1d, 0x93, 0x27, 0x81, 0xaf, 0xae, 0xd1, 0x12, + 0x4e, 0xcc, 0xc4, 0x57, 0x64, 0x66, 0xdc, 0xc3, 0x5d, 0x86, 0x72, 0xdb, 0xa5, 0xfe, 0xb0, 0xfd, + 0xd2, 0xe3, 0xba, 0x95, 0x1e, 0x4f, 0xd8, 0xbf, 0x37, 0xe0, 0x7c, 0xf2, 0x3b, 0xed, 0x63, 0x51, + 0x2e, 0xee, 0x42, 0x8e, 0xc7, 0x38, 0x66, 0x39, 0xcd, 0x89, 0x19, 0x11, 0x01, 0x75, 0xb0, 0x14, + 0x4a, 0x44, 0x5a, 0x1d, 0x9c, 0xab, 0x27, 0x8b, 0x4f, 0x45, 0xfa, 0x1f, 0x25, 0x40, 0xb3, 0xcb, + 0x29, 0xbd, 0x69, 0xb2, 0xb9, 0xcb, 0x4c, 0x35, 0x77, 0xcf, 0xa7, 0x9b, 0x3b, 0x75, 0x35, 0xdf, + 0x5e, 0xc4, 0x92, 0x05, 0x5a, 0xbc, 0x3b, 0x50, 0x8e, 0xd1, 0x4d, 0x7c, 0x81, 0x5b, 0xb3, 0xaa, + 0x47, 0x00, 0x68, 0xcc, 0x8c, 0xd6, 0xe3, 0x1b, 0x47, 0xdd, 0x75, 0x28, 0xae, 0x29, 0x34, 0xea, + 0x38, 0x1a, 0x57, 0xe8, 0x5b, 0xe8, 0xde, 0xd9, 0xde, 0x2d, 0x72, 0xd3, 0x6f, 0x16, 0x4d, 0xa8, + 0x6c, 0xc7, 0x85, 0xf2, 0x0c, 0x8f, 0x16, 0x49, 0x21, 0xb4, 0xa1, 0x81, 0x8d, 0x2a, 0xcd, 0x97, + 0x67, 0x5d, 0x8c, 0x1f, 0x28, 0x42, 0xaa, 0x91, 0xcd, 0x61, 0x0a, 0xb4, 0x2c, 0xcb, 0x00, 0x6d, + 0x2e, 0x14, 0xfb, 0x05, 0xf1, 0x25, 0xfa, 0x0c, 0x0a, 0x98, 0xb0, 0x81, 0xcf, 0xe5, 0x4b, 0x48, + 0xa5, 0x71, 0x65, 0x8e, 0x76, 0xc5, 0x24, 0xcf, 0xaa, 0x16, 0x40, 0xbf, 0x84, 0xa2, 0x1a, 0x31, + 0xb3, 0x32, 0xaf, 0xe5, 0x4f, 0xb1, 0x4c, 0xcb, 0xe8, 0x86, 0x42, 0x53, 0xe2, 0x38, 0x7e, 0x4e, + 0x02, 0xa2, 0x5f, 0xe8, 0x44, 0x5b, 0x9b, 0xc7, 0x89, 0x19, 0xd4, 0x80, 0x3c, 0xa7, 0x6e, 0x87, + 0x98, 0x4b, 0x0b, 0x84, 0x50, 0xb1, 0x8a, 0xc2, 0x16, 0x79, 0x41, 0x40, 0xba, 0xe6, 0xb2, 0x42, + 0x4a, 0x8a, 0x42, 0x3f, 0x80, 0xe5, 0x60, 0xd0, 0x97, 0xcd, 0x42, 0x77, 0x8f, 0x93, 0x88, 0x99, + 0xe7, 0xe4, 0xf7, 0xa6, 0x66, 0xd1, 0x55, 0x58, 0x0a, 0x06, 0xfd, 0x7d, 0x71, 0xc3, 0x2b, 0xb6, + 0x9a, 0x64, 0x9b, 0x9c, 0x7c, 0x0f, 0x5d, 0xf0, 0xfb, 0xc0, 0xf8, 0xd6, 0x73, 0xa8, 0x26, 0x23, + 0x9b, 0x22, 0x7b, 0x7b, 0xb2, 0x87, 0x5e, 0x60, 0xa7, 0x13, 0x2d, 0xc4, 0x73, 0xf8, 0xde, 0xd3, + 0xa8, 0xeb, 0x72, 0x92, 0x56, 0x4b, 0x67, 0x6b, 0xca, 0x25, 0x28, 0xec, 0xaa, 0xd0, 0xab, 0xb7, + 0x48, 0x4d, 0x89, 0xf9, 0x16, 0x11, 0xa7, 0x42, 0x17, 0x50, 0x4d, 0xd9, 0x97, 0xc1, 0x4a, 0x53, + 0xaf, 0x82, 0x61, 0xff, 0x39, 0x03, 0x30, 0xde, 0x5e, 0xf4, 0x11, 0x40, 0x9f, 0x74, 0x3d, 0xf7, + 0xd7, 0x7c, 0xdc, 0x22, 0x96, 0xe5, 0x8c, 0xec, 0x13, 0xc7, 0x60, 0x3e, 0xf3, 0xce, 0x60, 0x1e, + 0x41, 0x8e, 0x79, 0xdf, 0x10, 0x0d, 0x3c, 0xe4, 0x18, 0x3d, 0x81, 0x8a, 0x1b, 0x04, 0x21, 0x97, + 0x89, 0x19, 0xb7, 0xcf, 0x37, 0x4f, 0x4a, 0x48, 0x67, 0x6b, 0xcc, 0xaf, 0xf2, 0x3e, 0xa9, 0xc1, + 0xba, 0x07, 0xb5, 0x69, 0x86, 0x33, 0xb5, 0x77, 0xdf, 0x1a, 0x70, 0x6e, 0x6a, 0xeb, 0xd0, 0xa7, + 0xa3, 0x73, 0x6d, 0x2c, 0x70, 0x60, 0xe2, 0x23, 0x7d, 0x1f, 0xaa, 0x5b, 0x9c, 0x8b, 0x3a, 0xa6, + 0x7c, 0x53, 0x0d, 0xdc, 0xc9, 0xb2, 0x13, 0x12, 0xf6, 0x1f, 0x8d, 0xf1, 0xcb, 0x65, 0x6a, 0x17, + 0x7f, 0x77, 0xb2, 0x8b, 0xbf, 0x36, 0xbf, 0xdc, 0xbf, 0xcf, 0xe6, 0xfd, 0xfa, 0xcf, 0xe1, 0xc3, + 0xd4, 0xab, 0x16, 0x55, 0xa0, 0xb8, 0xb7, 0xbf, 0x85, 0xf7, 0xdb, 0xad, 0xda, 0x07, 0xa8, 0x0a, + 0xa5, 0xed, 0x27, 0x8f, 0x77, 0x1f, 0xb5, 0xf7, 0xdb, 0x35, 0x43, 0x2c, 0xb5, 0xda, 0x62, 0xdc, + 0xaa, 0x65, 0x1a, 0xdf, 0x16, 0xa0, 0xb8, 0xad, 0xfe, 0xbd, 0x41, 0xfb, 0x50, 0x1e, 0x3d, 0xeb, + 0x23, 0x3b, 0x25, 0x3a, 0x53, 0xff, 0x0f, 0x58, 0x1f, 0x9f, 0xc8, 0xa3, 0x4b, 0xf1, 0x03, 0xc8, + 0xcb, 0x3f, 0x38, 0x50, 0x4a, 0xc3, 0x9c, 0xfc, 0xe7, 0xc3, 0x3a, 0xf9, 0x0f, 0x83, 0x0d, 0x43, + 0x68, 0x92, 0xaf, 0x0d, 0x69, 0x9a, 0x92, 0xcf, 0x91, 0xd6, 0xea, 0x29, 0xcf, 0x14, 0xe8, 0x31, + 0x14, 0x74, 0x0b, 0x96, 0xc6, 0x9a, 0x7c, 0x53, 0xb0, 0xd6, 0xe6, 0x33, 0x28, 0x65, 0x1b, 0x06, + 0x7a, 0x3c, 0x7a, 0x61, 0x4e, 0x33, 0x2d, 0x89, 0x5f, 0xad, 0x53, 0xd6, 0xd7, 0x8d, 0x0d, 0x03, + 0x7d, 0x05, 0x95, 0x04, 0x42, 0x45, 0x29, 0xf8, 0x68, 0x16, 0xee, 0x5a, 0xd7, 0x4e, 0xe1, 0xd2, + 0x9e, 0xb7, 0x21, 0x27, 0x0f, 0x52, 0x4a, 0xb0, 0x13, 0x00, 0x36, 0xcd, 0xcc, 0x09, 0x40, 0x7b, + 0xa0, 0x20, 0x37, 0x09, 0x92, 0xd9, 0x87, 0xae, 0x9d, 0x76, 0x53, 0xce, 0x4d, 0x9b, 0x99, 0x24, + 0xde, 0x30, 0x50, 0x08, 0x68, 0xb6, 0x78, 0xa2, 0x1f, 0xa5, 0x64, 0xc9, 0xbc, 0x0a, 0x6e, 0xdd, + 0x58, 0x8c, 0x59, 0x39, 0xd5, 0xac, 0xbe, 0x7a, 0xb3, 0x62, 0xfc, 0xf3, 0xcd, 0x8a, 0xf1, 0xef, + 0x37, 0x2b, 0xc6, 0x41, 0x41, 0x62, 0xa0, 0x1f, 0xff, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xca, 0xd0, + 0xd7, 0x6e, 0xdd, 0x1c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3945,6 +3963,18 @@ func (m *BuildHistoryRecord) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + if m.NumTotalSteps != 0 { + i = encodeVarintControl(dAtA, i, uint64(m.NumTotalSteps)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x80 + } + if m.NumCachedSteps != 0 { + i = encodeVarintControl(dAtA, i, uint64(m.NumCachedSteps)) + i-- + dAtA[i] = 0x78 + } if m.Pinned { i-- if m.Pinned { @@ -5071,6 +5101,12 @@ func (m *BuildHistoryRecord) Size() (n int) { if m.Pinned { n += 2 } + if m.NumCachedSteps != 0 { + n += 1 + sovControl(uint64(m.NumCachedSteps)) + } + if m.NumTotalSteps != 0 { + n += 2 + sovControl(uint64(m.NumTotalSteps)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -9989,6 +10025,44 @@ func (m *BuildHistoryRecord) Unmarshal(dAtA []byte) error { } } m.Pinned = bool(v != 0) + case 15: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field NumCachedSteps", wireType) + } + m.NumCachedSteps = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowControl + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.NumCachedSteps |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 16: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field NumTotalSteps", wireType) + } + m.NumTotalSteps = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowControl + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.NumTotalSteps |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipControl(dAtA[iNdEx:]) diff --git a/api/services/control/control.proto b/api/services/control/control.proto index 6bb692d839eb..9289d05cb15d 100644 --- a/api/services/control/control.proto +++ b/api/services/control/control.proto @@ -204,8 +204,9 @@ message BuildHistoryRecord { int32 Generation = 12; Descriptor trace = 13; bool pinned = 14; + int32 numCachedSteps = 15; + int32 numTotalSteps = 16; // TODO: tags - // TODO: steps/cache summary // TODO: unclipped logs } diff --git a/cmd/buildctl/debug/monitor.go b/cmd/buildctl/debug/monitor.go index 34bb9c319ecc..2cf83e9326bf 100644 --- a/cmd/buildctl/debug/monitor.go +++ b/cmd/buildctl/debug/monitor.go @@ -48,6 +48,9 @@ func monitor(clicontext *cli.Context) error { return err } fmt.Printf("event: %s ref:%s\n", ev.Type.String(), ev.Record.Ref) + if ev.Record.NumTotalSteps != 0 { + fmt.Printf(" cache: %d/%d\n", ev.Record.NumCachedSteps, ev.Record.NumTotalSteps) + } if ev.Record.Logs != nil { fmt.Printf(" logs: %s\n", ev.Record.Logs) } diff --git a/solver/llbsolver/history.go b/solver/llbsolver/history.go index 80bbb5ae7012..5c326f83fed3 100644 --- a/solver/llbsolver/history.go +++ b/solver/llbsolver/history.go @@ -44,6 +44,12 @@ type HistoryQueue struct { deleted map[string]struct{} } +type StatusImportResult struct { + Descriptor ocispecs.Descriptor + NumCachedSteps int + NumTotalSteps int +} + func NewHistoryQueue(opt HistoryQueueOpt) *HistoryQueue { if opt.CleanConfig == nil { opt.CleanConfig = &config.HistoryConfig{ @@ -433,7 +439,7 @@ func (w *Writer) Commit(ctx context.Context) (*ocispecs.Descriptor, func(), erro }, nil } -func (h *HistoryQueue) ImportStatus(ctx context.Context, ch chan *client.SolveStatus) (_ *ocispecs.Descriptor, _ func(), err error) { +func (h *HistoryQueue) ImportStatus(ctx context.Context, ch chan *client.SolveStatus) (_ *StatusImportResult, _ func(), err error) { defer func() { if ch == nil { return @@ -455,8 +461,19 @@ func (h *HistoryQueue) ImportStatus(ctx context.Context, ch chan *client.SolveSt } }() + vtxMap := make(map[digest.Digest]bool) + buf := make([]byte, 32*1024) for st := range ch { + for _, vtx := range st.Vertexes { + if _, ok := vtxMap[vtx.Digest]; !ok { + vtxMap[vtx.Digest] = false + } + if vtx.Cached { + vtxMap[vtx.Digest] = true + } + } + hdr := make([]byte, 4) for _, pst := range st.Marshal() { sz := pst.Size() @@ -479,7 +496,23 @@ func (h *HistoryQueue) ImportStatus(ctx context.Context, ch chan *client.SolveSt if err := bufW.Flush(); err != nil { return nil, nil, err } - return w.Commit(ctx) + desc, release, err := w.Commit(ctx) + if err != nil { + return nil, nil, err + } + + numCached := 0 + for _, cached := range vtxMap { + if cached { + numCached++ + } + } + + return &StatusImportResult{ + Descriptor: *desc, + NumCachedSteps: numCached, + NumTotalSteps: len(vtxMap), + }, release, nil } func (h *HistoryQueue) Listen(ctx context.Context, req *controlapi.BuildHistoryRequest, f func(*controlapi.BuildHistoryEvent) error) error { diff --git a/solver/llbsolver/solver.go b/solver/llbsolver/solver.go index 9084bf10cd93..69b8d6d00dea 100644 --- a/solver/llbsolver/solver.go +++ b/solver/llbsolver/solver.go @@ -269,17 +269,19 @@ func (s *Solver) recordBuildHistory(ctx context.Context, id string, req frontend } eg.Go(func() error { - desc, releaseStatus, err := s.history.ImportStatus(ctx2, ch) + st, releaseStatus, err := s.history.ImportStatus(ctx2, ch) if err != nil { return err } mu.Lock() releasers = append(releasers, releaseStatus) rec.Logs = &controlapi.Descriptor{ - Digest: desc.Digest, - Size_: desc.Size, - MediaType: desc.MediaType, + Digest: st.Descriptor.Digest, + Size_: st.Descriptor.Size, + MediaType: st.Descriptor.MediaType, } + rec.NumCachedSteps = int32(st.NumCachedSteps) + rec.NumTotalSteps = int32(st.NumTotalSteps) mu.Unlock() return nil })