From abd6d2381b39009f8bd9faf47ddf4535a1596fdc Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 04 十二月 2019 13:24:47 +0800
Subject: [PATCH] add pollChannelCount to PollConfig
---
sysset.proto | 1
sysset.pb.go | 133 +++++++++++++++++++++++++++-----------------
2 files changed, 83 insertions(+), 51 deletions(-)
diff --git a/sysset.pb.go b/sysset.pb.go
index 7bd9562..1637b1e 100644
--- a/sysset.pb.go
+++ b/sysset.pb.go
@@ -8,6 +8,7 @@
proto "github.com/gogo/protobuf/proto"
io "io"
math "math"
+ math_bits "math/bits"
)
// Reference imports to suppress errors if they are not otherwise used.
@@ -202,10 +203,11 @@
}
type PollConfig struct {
- ServerId string `protobuf:"bytes,1,opt,name=server_id,json=serverId,proto3" json:"server_id,omitempty"`
- PollPeriod int32 `protobuf:"varint,2,opt,name=poll_period,json=pollPeriod,proto3" json:"poll_period,omitempty"`
- Delay int32 `protobuf:"varint,3,opt,name=delay,proto3" json:"delay,omitempty"`
- Enable bool `protobuf:"varint,4,opt,name=enable,proto3" json:"enable,omitempty"`
+ ServerId string `protobuf:"bytes,1,opt,name=server_id,json=serverId,proto3" json:"server_id,omitempty"`
+ PollPeriod int32 `protobuf:"varint,2,opt,name=poll_period,json=pollPeriod,proto3" json:"poll_period,omitempty"`
+ Delay int32 `protobuf:"varint,3,opt,name=delay,proto3" json:"delay,omitempty"`
+ Enable bool `protobuf:"varint,4,opt,name=enable,proto3" json:"enable,omitempty"`
+ PollChannelCount int32 `protobuf:"varint,5,opt,name=pollChannelCount,proto3" json:"pollChannelCount,omitempty"`
}
func (m *PollConfig) Reset() { *m = PollConfig{} }
@@ -267,6 +269,13 @@
return m.Enable
}
return false
+}
+
+func (m *PollConfig) GetPollChannelCount() int32 {
+ if m != nil {
+ return m.PollChannelCount
+ }
+ return 0
}
type Cluster struct {
@@ -447,45 +456,47 @@
func init() { proto.RegisterFile("sysset.proto", fileDescriptor_5be590c6b2a0d755) }
var fileDescriptor_5be590c6b2a0d755 = []byte{
- // 601 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xdd, 0x6e, 0xd3, 0x30,
- 0x14, 0x5e, 0xba, 0xb5, 0x4d, 0x4e, 0xca, 0x36, 0xac, 0x01, 0x66, 0x40, 0x28, 0xbd, 0xa1, 0x12,
- 0xd2, 0x84, 0xe0, 0x0d, 0x18, 0x37, 0x95, 0xd8, 0x54, 0x55, 0x93, 0xb8, 0xac, 0xdc, 0xf8, 0xb0,
- 0x45, 0x4b, 0x62, 0xcb, 0x76, 0xd7, 0xe6, 0x2d, 0x78, 0x17, 0x5e, 0x82, 0x1b, 0xa4, 0x5d, 0x22,
- 0x71, 0x83, 0xb6, 0x17, 0x41, 0xb6, 0x93, 0xb6, 0x1b, 0x12, 0xe2, 0xaa, 0x3d, 0xdf, 0xf7, 0x9d,
- 0x1f, 0x9f, 0x7c, 0x07, 0x7a, 0xba, 0xd2, 0x1a, 0xcd, 0x91, 0x54, 0xc2, 0x08, 0x12, 0xba, 0x9f,
- 0x42, 0x9f, 0x0f, 0x7e, 0xed, 0x40, 0xfc, 0x49, 0xa4, 0x2c, 0x3f, 0x16, 0xe5, 0x97, 0xec, 0x9c,
- 0x3c, 0x83, 0x48, 0xa3, 0xba, 0x42, 0x35, 0xcd, 0x38, 0x0d, 0xfa, 0xc1, 0x30, 0x9a, 0x84, 0x1e,
- 0x18, 0x71, 0xf2, 0x12, 0xe2, 0x9a, 0x2c, 0x59, 0x81, 0xb4, 0xe5, 0x68, 0xf0, 0xd0, 0x29, 0x2b,
- 0x70, 0x43, 0x60, 0x2a, 0x89, 0x74, 0xbb, 0x1f, 0x0c, 0xdb, 0x8d, 0xe0, 0xac, 0x92, 0xb8, 0x59,
- 0x5e, 0xd2, 0x9d, 0x3b, 0xe5, 0x25, 0x79, 0x0a, 0x21, 0xcb, 0x99, 0x2a, 0x2c, 0xd7, 0x76, 0x5c,
- 0xd7, 0xc5, 0x23, 0x49, 0x5e, 0x00, 0x78, 0x4a, 0x0a, 0x65, 0x68, 0xc7, 0xd5, 0x8d, 0x1c, 0x32,
- 0x16, 0xca, 0x90, 0xe7, 0x00, 0x0b, 0x9c, 0x4d, 0x65, 0x96, 0xda, 0xdc, 0xae, 0xaf, 0xbb, 0xc0,
- 0xd9, 0x38, 0x4b, 0x47, 0x92, 0xf4, 0xa1, 0xd7, 0xb0, 0x2e, 0x3d, 0xf4, 0x63, 0x79, 0xde, 0xe5,
- 0x1f, 0x42, 0x84, 0xba, 0x49, 0x8f, 0x7c, 0x6b, 0xd4, 0x3e, 0x3b, 0x81, 0xb8, 0xe6, 0x5c, 0x32,
- 0xf8, 0xde, 0x8e, 0x75, 0xb9, 0x43, 0xd8, 0x4f, 0xe7, 0x66, 0x5a, 0xb0, 0xe5, 0x94, 0xcf, 0x15,
- 0x33, 0x99, 0x28, 0x69, 0xec, 0x44, 0xbb, 0xe9, 0xdc, 0x9c, 0xb0, 0xe5, 0xc7, 0x1a, 0x5d, 0x29,
- 0xb3, 0x72, 0xad, 0xec, 0xad, 0x95, 0x59, 0xb9, 0x52, 0x1e, 0x42, 0xa8, 0xd0, 0xed, 0x85, 0xd3,
- 0x07, 0xfe, 0x35, 0x4d, 0x6c, 0xb7, 0x74, 0xce, 0x0c, 0x4e, 0x17, 0xac, 0xa2, 0xbb, 0x7e, 0x54,
- 0x1b, 0x7f, 0x66, 0x95, 0xa5, 0x4a, 0xb4, 0xa3, 0xe8, 0x4b, 0xba, 0xe7, 0xa9, 0x12, 0xcd, 0x09,
- 0xd3, 0x97, 0x96, 0x52, 0xc8, 0x72, 0x3b, 0x26, 0xdd, 0x77, 0x3d, 0xbb, 0x36, 0x3e, 0x61, 0x4b,
- 0xf2, 0x16, 0x0e, 0xfc, 0x6e, 0xcd, 0x85, 0x42, 0x7d, 0x21, 0x72, 0xee, 0xbf, 0xde, 0x43, 0x27,
- 0x23, 0x8e, 0x3b, 0x6b, 0x28, 0xf7, 0x15, 0x5f, 0xc3, 0xde, 0xbd, 0x0c, 0x4a, 0xfc, 0x3b, 0xee,
- 0x8a, 0x07, 0x4b, 0x80, 0xb1, 0xc8, 0xff, 0xd7, 0x5b, 0x52, 0xe4, 0xf9, 0x54, 0xa2, 0xca, 0x04,
- 0x77, 0xde, 0x6a, 0x4f, 0xc0, 0x42, 0x63, 0x87, 0x90, 0x03, 0x68, 0x73, 0xcc, 0x59, 0x55, 0xbb,
- 0xca, 0x07, 0xe4, 0x31, 0x74, 0xb0, 0x64, 0xb3, 0x1c, 0x9d, 0x9b, 0xc2, 0x49, 0x1d, 0x0d, 0xbe,
- 0x05, 0xd0, 0x3d, 0xce, 0xe7, 0xda, 0xa0, 0xb2, 0xe6, 0x49, 0xfd, 0xdf, 0x75, 0xe3, 0xa8, 0x46,
- 0x46, 0x9c, 0xbc, 0x82, 0x5e, 0x43, 0x6f, 0xd8, 0x3a, 0xae, 0x31, 0xe7, 0xeb, 0x43, 0x08, 0x25,
- 0xd3, 0x7a, 0x21, 0x14, 0x77, 0xed, 0xa3, 0xc9, 0x2a, 0xb6, 0xd5, 0xaf, 0x32, 0x65, 0xe6, 0x2c,
- 0x5f, 0x7b, 0x3a, 0xaa, 0x91, 0x91, 0x24, 0x6f, 0xa0, 0x5d, 0x0a, 0x8e, 0x9a, 0xb6, 0xfb, 0xdb,
- 0xc3, 0xf8, 0xdd, 0xa3, 0xa3, 0xe6, 0xf4, 0x8e, 0xea, 0xf1, 0x4e, 0x05, 0xc7, 0x89, 0xd7, 0x0c,
- 0x7e, 0x04, 0x10, 0x6f, 0xc0, 0x64, 0x17, 0x5a, 0xab, 0x89, 0x5b, 0x19, 0xbf, 0xf7, 0x92, 0xd6,
- 0xfd, 0x97, 0xdc, 0x59, 0xf0, 0xf6, 0xbf, 0x8f, 0x77, 0xe7, 0xaf, 0xe3, 0x7d, 0x02, 0x5d, 0x3b,
- 0x85, 0xcd, 0xf5, 0xd7, 0xd7, 0xb1, 0xe1, 0x88, 0xaf, 0x09, 0xe9, 0x2e, 0xaf, 0x21, 0xa4, 0x2d,
- 0x99, 0x2a, 0xb4, 0x66, 0x34, 0x59, 0x81, 0xf5, 0xdd, 0x81, 0x87, 0xce, 0xb2, 0x02, 0x3f, 0xd0,
- 0xef, 0x37, 0x49, 0x70, 0x7d, 0x93, 0x04, 0xbf, 0x6f, 0x92, 0xe0, 0xeb, 0x6d, 0xb2, 0x75, 0x7d,
- 0x9b, 0x6c, 0xfd, 0xbc, 0x4d, 0xb6, 0x66, 0x1d, 0xb7, 0x86, 0xf7, 0x7f, 0x02, 0x00, 0x00, 0xff,
- 0xff, 0x4c, 0xdc, 0xed, 0xe9, 0x98, 0x04, 0x00, 0x00,
+ // 626 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xcd, 0x6e, 0x13, 0x3b,
+ 0x14, 0xee, 0xa4, 0x9d, 0x64, 0xe6, 0x4c, 0x6e, 0xdb, 0x6b, 0xf5, 0xde, 0xeb, 0x5b, 0x60, 0x08,
+ 0xd9, 0x10, 0x81, 0x54, 0x21, 0x78, 0x03, 0xc2, 0x26, 0x12, 0xad, 0xa2, 0xa8, 0x12, 0xcb, 0xc8,
+ 0x19, 0x1f, 0xda, 0x51, 0x67, 0xc6, 0x96, 0xed, 0x34, 0xcd, 0x5b, 0xf0, 0x10, 0xbc, 0x01, 0x2f,
+ 0xc1, 0x06, 0xa9, 0x4b, 0x24, 0x36, 0xa8, 0x7d, 0x11, 0x64, 0x7b, 0x26, 0x49, 0x5b, 0x09, 0xb1,
+ 0x4a, 0xce, 0xf7, 0x73, 0xe6, 0xd8, 0x3e, 0x1f, 0x74, 0xf5, 0x52, 0x6b, 0x34, 0x47, 0x52, 0x09,
+ 0x23, 0x48, 0xe4, 0x7e, 0x4a, 0x7d, 0xd6, 0xff, 0xb1, 0x03, 0xc9, 0x7b, 0x91, 0xb1, 0x62, 0x28,
+ 0xaa, 0x8f, 0xf9, 0x19, 0x79, 0x04, 0xb1, 0x46, 0x75, 0x89, 0x6a, 0x9a, 0x73, 0x1a, 0xf4, 0x82,
+ 0x41, 0x3c, 0x89, 0x3c, 0x30, 0xe2, 0xe4, 0x29, 0x24, 0x35, 0x59, 0xb1, 0x12, 0x69, 0xcb, 0xd1,
+ 0xe0, 0xa1, 0x13, 0x56, 0xe2, 0x86, 0xc0, 0x2c, 0x25, 0xd2, 0xed, 0x5e, 0x30, 0x08, 0x1b, 0xc1,
+ 0xe9, 0x52, 0xe2, 0x66, 0x7b, 0x49, 0x77, 0xee, 0xb4, 0x97, 0xe4, 0x7f, 0x88, 0x58, 0xc1, 0x54,
+ 0x69, 0xb9, 0xd0, 0x71, 0x1d, 0x57, 0x8f, 0x24, 0x79, 0x02, 0xe0, 0x29, 0x29, 0x94, 0xa1, 0x6d,
+ 0xd7, 0x37, 0x76, 0xc8, 0x58, 0x28, 0x43, 0x1e, 0x03, 0x2c, 0x70, 0x36, 0x95, 0x79, 0x66, 0xbd,
+ 0x1d, 0xdf, 0x77, 0x81, 0xb3, 0x71, 0x9e, 0x8d, 0x24, 0xe9, 0x41, 0xb7, 0x61, 0x9d, 0x3d, 0xf2,
+ 0x63, 0x79, 0xde, 0xf9, 0x0f, 0x21, 0x46, 0xdd, 0xd8, 0x63, 0xff, 0x69, 0xd4, 0xde, 0x9d, 0x42,
+ 0x52, 0x73, 0xce, 0x0c, 0xfe, 0xdb, 0x8e, 0x75, 0xde, 0x01, 0xec, 0x67, 0x73, 0x33, 0x2d, 0xd9,
+ 0xd5, 0x94, 0xcf, 0x15, 0x33, 0xb9, 0xa8, 0x68, 0xe2, 0x44, 0xbb, 0xd9, 0xdc, 0x1c, 0xb3, 0xab,
+ 0x77, 0x35, 0xba, 0x52, 0xe6, 0xd5, 0x5a, 0xd9, 0x5d, 0x2b, 0xf3, 0x6a, 0xa5, 0x3c, 0x84, 0x48,
+ 0xa1, 0xbb, 0x17, 0x4e, 0xff, 0xf2, 0xa7, 0x69, 0x6a, 0x7b, 0x4b, 0x67, 0xcc, 0xe0, 0x74, 0xc1,
+ 0x96, 0x74, 0xd7, 0x8f, 0x6a, 0xeb, 0x0f, 0x6c, 0x69, 0xa9, 0x0a, 0xed, 0x28, 0xfa, 0x82, 0xee,
+ 0x79, 0xaa, 0x42, 0x73, 0xcc, 0xf4, 0x85, 0xa5, 0x14, 0xb2, 0xc2, 0x8e, 0x49, 0xf7, 0xdd, 0x37,
+ 0x3b, 0xb6, 0x3e, 0x66, 0x57, 0xe4, 0x15, 0x1c, 0xf8, 0xbb, 0x35, 0xe7, 0x0a, 0xf5, 0xb9, 0x28,
+ 0xb8, 0x7f, 0xbd, 0xbf, 0x9d, 0x8c, 0x38, 0xee, 0xb4, 0xa1, 0xdc, 0x2b, 0x3e, 0x87, 0xbd, 0x7b,
+ 0x0e, 0x4a, 0xfc, 0x39, 0xee, 0x8a, 0xfb, 0x9f, 0x03, 0x80, 0xb1, 0x28, 0xfe, 0x74, 0xb9, 0xa4,
+ 0x28, 0x8a, 0xa9, 0x44, 0x95, 0x0b, 0xee, 0x96, 0x2b, 0x9c, 0x80, 0x85, 0xc6, 0x0e, 0x21, 0x07,
+ 0x10, 0x72, 0x2c, 0xd8, 0xb2, 0x5e, 0x2b, 0x5f, 0x90, 0x7f, 0xa1, 0x8d, 0x15, 0x9b, 0x15, 0xe8,
+ 0xd6, 0x29, 0x9a, 0xd4, 0x15, 0x79, 0x01, 0xfb, 0xd6, 0x3b, 0x3c, 0x67, 0x55, 0x85, 0xc5, 0x50,
+ 0xcc, 0x2b, 0xe3, 0x96, 0x2a, 0x9c, 0x3c, 0xc0, 0xfb, 0x5f, 0x02, 0xe8, 0x0c, 0x8b, 0xb9, 0x36,
+ 0xa8, 0xec, 0xa6, 0x65, 0xfe, 0xef, 0x7a, 0xc8, 0xb8, 0x46, 0x46, 0x9c, 0x3c, 0x83, 0x6e, 0x43,
+ 0x6f, 0x64, 0x20, 0xa9, 0x31, 0x17, 0x82, 0x43, 0x88, 0x24, 0xd3, 0x7a, 0x21, 0x14, 0x77, 0xa3,
+ 0xc6, 0x93, 0x55, 0x6d, 0xbb, 0x5f, 0xe6, 0xca, 0xcc, 0x59, 0xb1, 0x0e, 0x40, 0x5c, 0x23, 0x23,
+ 0x49, 0x5e, 0x42, 0x58, 0x09, 0x8e, 0x9a, 0x86, 0xbd, 0xed, 0x41, 0xf2, 0xfa, 0x9f, 0xa3, 0x26,
+ 0xa7, 0x47, 0xf5, 0x78, 0x27, 0x82, 0xe3, 0xc4, 0x6b, 0xfa, 0xdf, 0x02, 0x48, 0x36, 0x60, 0xb2,
+ 0x0b, 0xad, 0xd5, 0xc4, 0xad, 0x9c, 0xdf, 0x3b, 0x49, 0xeb, 0xfe, 0x49, 0xee, 0x3c, 0xc6, 0xf6,
+ 0xef, 0x93, 0xbe, 0xf3, 0x20, 0xe9, 0xff, 0x41, 0xc7, 0x4e, 0x61, 0xbd, 0x3e, 0xaa, 0x6d, 0x5b,
+ 0x8e, 0xf8, 0x9a, 0x90, 0x2e, 0xa6, 0x0d, 0x21, 0x6d, 0xcb, 0x4c, 0xa1, 0xdd, 0x5c, 0x93, 0x97,
+ 0x58, 0x87, 0x14, 0x3c, 0x74, 0x9a, 0x97, 0xf8, 0x96, 0x7e, 0xbd, 0x49, 0x83, 0xeb, 0x9b, 0x34,
+ 0xf8, 0x79, 0x93, 0x06, 0x9f, 0x6e, 0xd3, 0xad, 0xeb, 0xdb, 0x74, 0xeb, 0xfb, 0x6d, 0xba, 0x35,
+ 0x6b, 0xbb, 0x6b, 0x78, 0xf3, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x0f, 0xf2, 0x7f, 0x16, 0xc5, 0x04,
+ 0x00, 0x00,
}
func (m *LocalConfig) Marshal() (dAtA []byte, err error) {
@@ -651,6 +662,11 @@
dAtA[i] = 0
}
i++
+ }
+ if m.PollChannelCount != 0 {
+ dAtA[i] = 0x28
+ i++
+ i = encodeVarintSysset(dAtA, i, uint64(m.PollChannelCount))
}
return i, nil
}
@@ -869,6 +885,9 @@
if m.Enable {
n += 2
}
+ if m.PollChannelCount != 0 {
+ n += 1 + sovSysset(uint64(m.PollChannelCount))
+ }
return n
}
@@ -941,14 +960,7 @@
}
func sovSysset(x uint64) (n int) {
- for {
- n++
- x >>= 7
- if x == 0 {
- break
- }
- }
- return n
+ return (math_bits.Len64(x|1) + 6) / 7
}
func sozSysset(x uint64) (n int) {
return sovSysset(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -1584,6 +1596,25 @@
}
}
m.Enable = bool(v != 0)
+ case 5:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field PollChannelCount", wireType)
+ }
+ m.PollChannelCount = 0
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowSysset
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ m.PollChannelCount |= int32(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
default:
iNdEx = preIndex
skippy, err := skipSysset(dAtA[iNdEx:])
diff --git a/sysset.proto b/sysset.proto
index 45e5a1f..acf87e4 100644
--- a/sysset.proto
+++ b/sysset.proto
@@ -29,6 +29,7 @@
int32 poll_period = 2;//杞鍛ㄦ湡
int32 delay = 3;//寤惰繜鏃堕棿
bool enable = 4;//鏄惁鍚敤杞
+ int32 pollChannelCount = 5;//杞閫氶亾鏁伴噺
}
message Cluster {
--
Gitblit v1.8.0