winlin

rename ISrsCodec size to nb_bytes.

@@ -67,9 +67,9 @@ public: @@ -67,9 +67,9 @@ public:
67 virtual ~ISrsCodec(); 67 virtual ~ISrsCodec();
68 public: 68 public:
69 /** 69 /**
70 - * get the size of object to encode object to bytes. 70 + * get the number of bytes to code to.
71 */ 71 */
72 - virtual int size() = 0; 72 + virtual int nb_bytes() = 0;
73 /** 73 /**
74 * encode object to bytes in SrsBuffer. 74 * encode object to bytes in SrsBuffer.
75 */ 75 */
@@ -64,7 +64,7 @@ bool SrsKafkaString::empty() @@ -64,7 +64,7 @@ bool SrsKafkaString::empty()
64 return _size <= 0; 64 return _size <= 0;
65 } 65 }
66 66
67 -int SrsKafkaString::size() 67 +int SrsKafkaString::nb_bytes()
68 { 68 {
69 return _size == -1? 2 : 2 + _size; 69 return _size == -1? 2 : 2 + _size;
70 } 70 }
@@ -159,7 +159,7 @@ bool SrsKafkaBytes::empty() @@ -159,7 +159,7 @@ bool SrsKafkaBytes::empty()
159 return _size <= 0; 159 return _size <= 0;
160 } 160 }
161 161
162 -int SrsKafkaBytes::size() 162 +int SrsKafkaBytes::nb_bytes()
163 { 163 {
164 return 4 + (_size == -1? 0 : _size); 164 return 4 + (_size == -1? 0 : _size);
165 } 165 }
@@ -234,7 +234,7 @@ SrsKafkaRequestHeader::~SrsKafkaRequestHeader() @@ -234,7 +234,7 @@ SrsKafkaRequestHeader::~SrsKafkaRequestHeader()
234 234
235 int SrsKafkaRequestHeader::header_size() 235 int SrsKafkaRequestHeader::header_size()
236 { 236 {
237 - return 2 + 2 + 4 + client_id->size(); 237 + return 2 + 2 + 4 + client_id->nb_bytes();
238 } 238 }
239 239
240 int SrsKafkaRequestHeader::message_size() 240 int SrsKafkaRequestHeader::message_size()
@@ -307,7 +307,7 @@ bool SrsKafkaRequestHeader::is_consumer_metadata_request() @@ -307,7 +307,7 @@ bool SrsKafkaRequestHeader::is_consumer_metadata_request()
307 return _api_key == SrsKafkaApiKeyConsumerMetadataRequest; 307 return _api_key == SrsKafkaApiKeyConsumerMetadataRequest;
308 } 308 }
309 309
310 -int SrsKafkaRequestHeader::size() 310 +int SrsKafkaRequestHeader::nb_bytes()
311 { 311 {
312 return 4 + header_size(); 312 return 4 + header_size();
313 } 313 }
@@ -403,7 +403,7 @@ int32_t SrsKafkaResponseHeader::correlation_id() @@ -403,7 +403,7 @@ int32_t SrsKafkaResponseHeader::correlation_id()
403 return _correlation_id; 403 return _correlation_id;
404 } 404 }
405 405
406 -int SrsKafkaResponseHeader::size() 406 +int SrsKafkaResponseHeader::nb_bytes()
407 { 407 {
408 return 4 + header_size(); 408 return 4 + header_size();
409 } 409 }
@@ -505,9 +505,9 @@ SrsKafkaApiKey SrsKafkaRequest::api_key() @@ -505,9 +505,9 @@ SrsKafkaApiKey SrsKafkaRequest::api_key()
505 return header.api_key(); 505 return header.api_key();
506 } 506 }
507 507
508 -int SrsKafkaRequest::size() 508 +int SrsKafkaRequest::nb_bytes()
509 { 509 {
510 - return header.size(); 510 + return header.nb_bytes();
511 } 511 }
512 512
513 int SrsKafkaRequest::encode(SrsBuffer* buf) 513 int SrsKafkaRequest::encode(SrsBuffer* buf)
@@ -533,9 +533,9 @@ void SrsKafkaResponse::update_header(int s) @@ -533,9 +533,9 @@ void SrsKafkaResponse::update_header(int s)
533 header.set_total_size(s); 533 header.set_total_size(s);
534 } 534 }
535 535
536 -int SrsKafkaResponse::size() 536 +int SrsKafkaResponse::nb_bytes()
537 { 537 {
538 - return header.size(); 538 + return header.nb_bytes();
539 } 539 }
540 540
541 int SrsKafkaResponse::encode(SrsBuffer* buf) 541 int SrsKafkaResponse::encode(SrsBuffer* buf)
@@ -562,9 +562,9 @@ void SrsKafkaTopicMetadataRequest::add_topic(string topic) @@ -562,9 +562,9 @@ void SrsKafkaTopicMetadataRequest::add_topic(string topic)
562 topics.append(new SrsKafkaString(topic)); 562 topics.append(new SrsKafkaString(topic));
563 } 563 }
564 564
565 -int SrsKafkaTopicMetadataRequest::size() 565 +int SrsKafkaTopicMetadataRequest::nb_bytes()
566 { 566 {
567 - return SrsKafkaRequest::size() + topics.size(); 567 + return SrsKafkaRequest::nb_bytes() + topics.nb_bytes();
568 } 568 }
569 569
570 int SrsKafkaTopicMetadataRequest::encode(SrsBuffer* buf) 570 int SrsKafkaTopicMetadataRequest::encode(SrsBuffer* buf)
@@ -610,9 +610,9 @@ SrsKafkaBroker::~SrsKafkaBroker() @@ -610,9 +610,9 @@ SrsKafkaBroker::~SrsKafkaBroker()
610 { 610 {
611 } 611 }
612 612
613 -int SrsKafkaBroker::size() 613 +int SrsKafkaBroker::nb_bytes()
614 { 614 {
615 - return 4 + host.size() + 4; 615 + return 4 + host.nb_bytes() + 4;
616 } 616 }
617 617
618 int SrsKafkaBroker::encode(SrsBuffer* buf) 618 int SrsKafkaBroker::encode(SrsBuffer* buf)
@@ -678,9 +678,9 @@ SrsKafkaPartitionMetadata::~SrsKafkaPartitionMetadata() @@ -678,9 +678,9 @@ SrsKafkaPartitionMetadata::~SrsKafkaPartitionMetadata()
678 { 678 {
679 } 679 }
680 680
681 -int SrsKafkaPartitionMetadata::size() 681 +int SrsKafkaPartitionMetadata::nb_bytes()
682 { 682 {
683 - return 2 + 4 + 4 + replicas.size() + isr.size(); 683 + return 2 + 4 + 4 + replicas.nb_bytes() + isr.nb_bytes();
684 } 684 }
685 685
686 int SrsKafkaPartitionMetadata::encode(SrsBuffer* buf) 686 int SrsKafkaPartitionMetadata::encode(SrsBuffer* buf)
@@ -742,9 +742,9 @@ SrsKafkaTopicMetadata::~SrsKafkaTopicMetadata() @@ -742,9 +742,9 @@ SrsKafkaTopicMetadata::~SrsKafkaTopicMetadata()
742 { 742 {
743 } 743 }
744 744
745 -int SrsKafkaTopicMetadata::size() 745 +int SrsKafkaTopicMetadata::nb_bytes()
746 { 746 {
747 - return 2 + name.size() + metadatas.size(); 747 + return 2 + name.nb_bytes() + metadatas.nb_bytes();
748 } 748 }
749 749
750 int SrsKafkaTopicMetadata::encode(SrsBuffer* buf) 750 int SrsKafkaTopicMetadata::encode(SrsBuffer* buf)
@@ -803,9 +803,9 @@ SrsKafkaTopicMetadataResponse::~SrsKafkaTopicMetadataResponse() @@ -803,9 +803,9 @@ SrsKafkaTopicMetadataResponse::~SrsKafkaTopicMetadataResponse()
803 { 803 {
804 } 804 }
805 805
806 -int SrsKafkaTopicMetadataResponse::size() 806 +int SrsKafkaTopicMetadataResponse::nb_bytes()
807 { 807 {
808 - return SrsKafkaResponse::size() + brokers.size() + metadatas.size(); 808 + return SrsKafkaResponse::nb_bytes() + brokers.nb_bytes() + metadatas.nb_bytes();
809 } 809 }
810 810
811 int SrsKafkaTopicMetadataResponse::encode(SrsBuffer* buf) 811 int SrsKafkaTopicMetadataResponse::encode(SrsBuffer* buf)
@@ -928,7 +928,7 @@ int SrsKafkaProtocol::send_and_free_message(SrsKafkaRequest* msg) @@ -928,7 +928,7 @@ int SrsKafkaProtocol::send_and_free_message(SrsKafkaRequest* msg)
928 // TODO: FIXME: refine for performance issue. 928 // TODO: FIXME: refine for performance issue.
929 SrsAutoFree(SrsKafkaRequest, msg); 929 SrsAutoFree(SrsKafkaRequest, msg);
930 930
931 - int size = msg->size(); 931 + int size = msg->nb_bytes();
932 if (size <= 0) { 932 if (size <= 0) {
933 return ret; 933 return ret;
934 } 934 }
@@ -976,7 +976,7 @@ int SrsKafkaProtocol::recv_message(SrsKafkaResponse** pmsg) @@ -976,7 +976,7 @@ int SrsKafkaProtocol::recv_message(SrsKafkaResponse** pmsg)
976 SrsKafkaResponseHeader header; 976 SrsKafkaResponseHeader header;
977 977
978 // ensure enough bytes for response header. 978 // ensure enough bytes for response header.
979 - if ((ret = reader->grow(skt, header.size())) != ERROR_SUCCESS) { 979 + if ((ret = reader->grow(skt, header.nb_bytes())) != ERROR_SUCCESS) {
980 srs_error("kafka recv message failed. ret=%d", ret); 980 srs_error("kafka recv message failed. ret=%d", ret);
981 return ret; 981 return ret;
982 } 982 }
@@ -1077,7 +1077,7 @@ int SrsKafkaClient::fetch_metadata(string topic, SrsKafkaTopicMetadataResponse** @@ -1077,7 +1077,7 @@ int SrsKafkaClient::fetch_metadata(string topic, SrsKafkaTopicMetadataResponse**
1077 vector<string> srs_kafka_array2vector(SrsKafkaArray<SrsKafkaString>* arr) 1077 vector<string> srs_kafka_array2vector(SrsKafkaArray<SrsKafkaString>* arr)
1078 { 1078 {
1079 vector<string> strs; 1079 vector<string> strs;
1080 - for (int i = 0; i < arr->size(); i++) { 1080 + for (int i = 0; i < arr->nb_bytes(); i++) {
1081 } 1081 }
1082 return strs; 1082 return strs;
1083 } 1083 }
@@ -79,7 +79,7 @@ public: @@ -79,7 +79,7 @@ public:
79 virtual bool empty(); 79 virtual bool empty();
80 // interface ISrsCodec 80 // interface ISrsCodec
81 public: 81 public:
82 - virtual int size(); 82 + virtual int nb_bytes();
83 virtual int encode(SrsBuffer* buf); 83 virtual int encode(SrsBuffer* buf);
84 virtual int decode(SrsBuffer* buf); 84 virtual int decode(SrsBuffer* buf);
85 }; 85 };
@@ -103,7 +103,7 @@ public: @@ -103,7 +103,7 @@ public:
103 virtual bool empty(); 103 virtual bool empty();
104 // interface ISrsCodec 104 // interface ISrsCodec
105 public: 105 public:
106 - virtual int size(); 106 + virtual int nb_bytes();
107 virtual int encode(SrsBuffer* buf); 107 virtual int encode(SrsBuffer* buf);
108 virtual int decode(SrsBuffer* buf); 108 virtual int decode(SrsBuffer* buf);
109 }; 109 };
@@ -149,13 +149,13 @@ public: @@ -149,13 +149,13 @@ public:
149 } 149 }
150 // interface ISrsCodec 150 // interface ISrsCodec
151 public: 151 public:
152 - virtual int size() 152 + virtual int nb_bytes()
153 { 153 {
154 int s = 4; 154 int s = 4;
155 155
156 for (SrsIterator it = elems.begin(); it != elems.end(); ++it) { 156 for (SrsIterator it = elems.begin(); it != elems.end(); ++it) {
157 T* elem = *it; 157 T* elem = *it;
158 - s += elem->size(); 158 + s += elem->nb_bytes();
159 } 159 }
160 160
161 return s; 161 return s;
@@ -230,9 +230,9 @@ public: @@ -230,9 +230,9 @@ public:
230 } 230 }
231 // interface ISrsCodec 231 // interface ISrsCodec
232 public: 232 public:
233 - virtual int size() 233 + virtual int nb_bytes()
234 { 234 {
235 - return 4 + sizeof(int32_t) * (int)elems.size(); 235 + return 4 + 4 * (int)elems.size();
236 } 236 }
237 virtual int encode(SrsBuffer* buf) 237 virtual int encode(SrsBuffer* buf)
238 { 238 {
@@ -384,7 +384,7 @@ public: @@ -384,7 +384,7 @@ public:
384 virtual bool is_consumer_metadata_request(); 384 virtual bool is_consumer_metadata_request();
385 // interface ISrsCodec 385 // interface ISrsCodec
386 public: 386 public:
387 - virtual int size(); 387 + virtual int nb_bytes();
388 virtual int encode(SrsBuffer* buf); 388 virtual int encode(SrsBuffer* buf);
389 virtual int decode(SrsBuffer* buf); 389 virtual int decode(SrsBuffer* buf);
390 }; 390 };
@@ -450,7 +450,7 @@ public: @@ -450,7 +450,7 @@ public:
450 virtual int32_t correlation_id(); 450 virtual int32_t correlation_id();
451 // interface ISrsCodec 451 // interface ISrsCodec
452 public: 452 public:
453 - virtual int size(); 453 + virtual int nb_bytes();
454 virtual int encode(SrsBuffer* buf); 454 virtual int encode(SrsBuffer* buf);
455 virtual int decode(SrsBuffer* buf); 455 virtual int decode(SrsBuffer* buf);
456 }; 456 };
@@ -546,7 +546,7 @@ public: @@ -546,7 +546,7 @@ public:
546 virtual SrsKafkaApiKey api_key(); 546 virtual SrsKafkaApiKey api_key();
547 // interface ISrsCodec 547 // interface ISrsCodec
548 public: 548 public:
549 - virtual int size(); 549 + virtual int nb_bytes();
550 virtual int encode(SrsBuffer* buf); 550 virtual int encode(SrsBuffer* buf);
551 virtual int decode(SrsBuffer* buf); 551 virtual int decode(SrsBuffer* buf);
552 }; 552 };
@@ -569,7 +569,7 @@ public: @@ -569,7 +569,7 @@ public:
569 virtual void update_header(int s); 569 virtual void update_header(int s);
570 // interface ISrsCodec 570 // interface ISrsCodec
571 public: 571 public:
572 - virtual int size(); 572 + virtual int nb_bytes();
573 virtual int encode(SrsBuffer* buf); 573 virtual int encode(SrsBuffer* buf);
574 virtual int decode(SrsBuffer* buf); 574 virtual int decode(SrsBuffer* buf);
575 }; 575 };
@@ -599,7 +599,7 @@ public: @@ -599,7 +599,7 @@ public:
599 virtual void add_topic(std::string topic); 599 virtual void add_topic(std::string topic);
600 // interface ISrsCodec 600 // interface ISrsCodec
601 public: 601 public:
602 - virtual int size(); 602 + virtual int nb_bytes();
603 virtual int encode(SrsBuffer* buf); 603 virtual int encode(SrsBuffer* buf);
604 virtual int decode(SrsBuffer* buf); 604 virtual int decode(SrsBuffer* buf);
605 }; 605 };
@@ -619,7 +619,7 @@ public: @@ -619,7 +619,7 @@ public:
619 virtual ~SrsKafkaBroker(); 619 virtual ~SrsKafkaBroker();
620 // interface ISrsCodec 620 // interface ISrsCodec
621 public: 621 public:
622 - virtual int size(); 622 + virtual int nb_bytes();
623 virtual int encode(SrsBuffer* buf); 623 virtual int encode(SrsBuffer* buf);
624 virtual int decode(SrsBuffer* buf); 624 virtual int decode(SrsBuffer* buf);
625 }; 625 };
@@ -636,7 +636,7 @@ public: @@ -636,7 +636,7 @@ public:
636 virtual ~SrsKafkaPartitionMetadata(); 636 virtual ~SrsKafkaPartitionMetadata();
637 // interface ISrsCodec 637 // interface ISrsCodec
638 public: 638 public:
639 - virtual int size(); 639 + virtual int nb_bytes();
640 virtual int encode(SrsBuffer* buf); 640 virtual int encode(SrsBuffer* buf);
641 virtual int decode(SrsBuffer* buf); 641 virtual int decode(SrsBuffer* buf);
642 }; 642 };
@@ -651,7 +651,7 @@ public: @@ -651,7 +651,7 @@ public:
651 virtual ~SrsKafkaTopicMetadata(); 651 virtual ~SrsKafkaTopicMetadata();
652 // interface ISrsCodec 652 // interface ISrsCodec
653 public: 653 public:
654 - virtual int size(); 654 + virtual int nb_bytes();
655 virtual int encode(SrsBuffer* buf); 655 virtual int encode(SrsBuffer* buf);
656 virtual int decode(SrsBuffer* buf); 656 virtual int decode(SrsBuffer* buf);
657 }; 657 };
@@ -674,7 +674,7 @@ public: @@ -674,7 +674,7 @@ public:
674 virtual ~SrsKafkaTopicMetadataResponse(); 674 virtual ~SrsKafkaTopicMetadataResponse();
675 // interface ISrsCodec 675 // interface ISrsCodec
676 public: 676 public:
677 - virtual int size(); 677 + virtual int nb_bytes();
678 virtual int encode(SrsBuffer* buf); 678 virtual int encode(SrsBuffer* buf);
679 virtual int decode(SrsBuffer* buf); 679 virtual int decode(SrsBuffer* buf);
680 }; 680 };