From d0133748718444ebd8d95513f7649f300a60d985 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 22 Oct 2015 12:20:31 +0800 Subject: [PATCH] rename ISrsCodec size to nb_bytes. --- trunk/src/kernel/srs_kernel_buffer.hpp | 4 +-- trunk/src/protocol/srs_kafka_stack.cpp | 44 +++++++++++++------------- trunk/src/protocol/srs_kafka_stack.hpp | 30 +++++++++--------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/trunk/src/kernel/srs_kernel_buffer.hpp b/trunk/src/kernel/srs_kernel_buffer.hpp index f79e08f33..6b85aa537 100644 --- a/trunk/src/kernel/srs_kernel_buffer.hpp +++ b/trunk/src/kernel/srs_kernel_buffer.hpp @@ -67,9 +67,9 @@ public: virtual ~ISrsCodec(); public: /** - * get the size of object to encode object to bytes. + * get the number of bytes to code to. */ - virtual int size() = 0; + virtual int nb_bytes() = 0; /** * encode object to bytes in SrsBuffer. */ diff --git a/trunk/src/protocol/srs_kafka_stack.cpp b/trunk/src/protocol/srs_kafka_stack.cpp index 87dabe6a3..9b966a2dc 100644 --- a/trunk/src/protocol/srs_kafka_stack.cpp +++ b/trunk/src/protocol/srs_kafka_stack.cpp @@ -64,7 +64,7 @@ bool SrsKafkaString::empty() return _size <= 0; } -int SrsKafkaString::size() +int SrsKafkaString::nb_bytes() { return _size == -1? 2 : 2 + _size; } @@ -159,7 +159,7 @@ bool SrsKafkaBytes::empty() return _size <= 0; } -int SrsKafkaBytes::size() +int SrsKafkaBytes::nb_bytes() { return 4 + (_size == -1? 0 : _size); } @@ -234,7 +234,7 @@ SrsKafkaRequestHeader::~SrsKafkaRequestHeader() int SrsKafkaRequestHeader::header_size() { - return 2 + 2 + 4 + client_id->size(); + return 2 + 2 + 4 + client_id->nb_bytes(); } int SrsKafkaRequestHeader::message_size() @@ -307,7 +307,7 @@ bool SrsKafkaRequestHeader::is_consumer_metadata_request() return _api_key == SrsKafkaApiKeyConsumerMetadataRequest; } -int SrsKafkaRequestHeader::size() +int SrsKafkaRequestHeader::nb_bytes() { return 4 + header_size(); } @@ -403,7 +403,7 @@ int32_t SrsKafkaResponseHeader::correlation_id() return _correlation_id; } -int SrsKafkaResponseHeader::size() +int SrsKafkaResponseHeader::nb_bytes() { return 4 + header_size(); } @@ -505,9 +505,9 @@ SrsKafkaApiKey SrsKafkaRequest::api_key() return header.api_key(); } -int SrsKafkaRequest::size() +int SrsKafkaRequest::nb_bytes() { - return header.size(); + return header.nb_bytes(); } int SrsKafkaRequest::encode(SrsBuffer* buf) @@ -533,9 +533,9 @@ void SrsKafkaResponse::update_header(int s) header.set_total_size(s); } -int SrsKafkaResponse::size() +int SrsKafkaResponse::nb_bytes() { - return header.size(); + return header.nb_bytes(); } int SrsKafkaResponse::encode(SrsBuffer* buf) @@ -562,9 +562,9 @@ void SrsKafkaTopicMetadataRequest::add_topic(string topic) topics.append(new SrsKafkaString(topic)); } -int SrsKafkaTopicMetadataRequest::size() +int SrsKafkaTopicMetadataRequest::nb_bytes() { - return SrsKafkaRequest::size() + topics.size(); + return SrsKafkaRequest::nb_bytes() + topics.nb_bytes(); } int SrsKafkaTopicMetadataRequest::encode(SrsBuffer* buf) @@ -610,9 +610,9 @@ SrsKafkaBroker::~SrsKafkaBroker() { } -int SrsKafkaBroker::size() +int SrsKafkaBroker::nb_bytes() { - return 4 + host.size() + 4; + return 4 + host.nb_bytes() + 4; } int SrsKafkaBroker::encode(SrsBuffer* buf) @@ -678,9 +678,9 @@ SrsKafkaPartitionMetadata::~SrsKafkaPartitionMetadata() { } -int SrsKafkaPartitionMetadata::size() +int SrsKafkaPartitionMetadata::nb_bytes() { - return 2 + 4 + 4 + replicas.size() + isr.size(); + return 2 + 4 + 4 + replicas.nb_bytes() + isr.nb_bytes(); } int SrsKafkaPartitionMetadata::encode(SrsBuffer* buf) @@ -742,9 +742,9 @@ SrsKafkaTopicMetadata::~SrsKafkaTopicMetadata() { } -int SrsKafkaTopicMetadata::size() +int SrsKafkaTopicMetadata::nb_bytes() { - return 2 + name.size() + metadatas.size(); + return 2 + name.nb_bytes() + metadatas.nb_bytes(); } int SrsKafkaTopicMetadata::encode(SrsBuffer* buf) @@ -803,9 +803,9 @@ SrsKafkaTopicMetadataResponse::~SrsKafkaTopicMetadataResponse() { } -int SrsKafkaTopicMetadataResponse::size() +int SrsKafkaTopicMetadataResponse::nb_bytes() { - return SrsKafkaResponse::size() + brokers.size() + metadatas.size(); + return SrsKafkaResponse::nb_bytes() + brokers.nb_bytes() + metadatas.nb_bytes(); } int SrsKafkaTopicMetadataResponse::encode(SrsBuffer* buf) @@ -928,7 +928,7 @@ int SrsKafkaProtocol::send_and_free_message(SrsKafkaRequest* msg) // TODO: FIXME: refine for performance issue. SrsAutoFree(SrsKafkaRequest, msg); - int size = msg->size(); + int size = msg->nb_bytes(); if (size <= 0) { return ret; } @@ -976,7 +976,7 @@ int SrsKafkaProtocol::recv_message(SrsKafkaResponse** pmsg) SrsKafkaResponseHeader header; // ensure enough bytes for response header. - if ((ret = reader->grow(skt, header.size())) != ERROR_SUCCESS) { + if ((ret = reader->grow(skt, header.nb_bytes())) != ERROR_SUCCESS) { srs_error("kafka recv message failed. ret=%d", ret); return ret; } @@ -1077,7 +1077,7 @@ int SrsKafkaClient::fetch_metadata(string topic, SrsKafkaTopicMetadataResponse** vector srs_kafka_array2vector(SrsKafkaArray* arr) { vector strs; - for (int i = 0; i < arr->size(); i++) { + for (int i = 0; i < arr->nb_bytes(); i++) { } return strs; } diff --git a/trunk/src/protocol/srs_kafka_stack.hpp b/trunk/src/protocol/srs_kafka_stack.hpp index 6e253e744..4e25f2f9e 100644 --- a/trunk/src/protocol/srs_kafka_stack.hpp +++ b/trunk/src/protocol/srs_kafka_stack.hpp @@ -79,7 +79,7 @@ public: virtual bool empty(); // interface ISrsCodec public: - virtual int size(); + virtual int nb_bytes(); virtual int encode(SrsBuffer* buf); virtual int decode(SrsBuffer* buf); }; @@ -103,7 +103,7 @@ public: virtual bool empty(); // interface ISrsCodec public: - virtual int size(); + virtual int nb_bytes(); virtual int encode(SrsBuffer* buf); virtual int decode(SrsBuffer* buf); }; @@ -149,13 +149,13 @@ public: } // interface ISrsCodec public: - virtual int size() + virtual int nb_bytes() { int s = 4; for (SrsIterator it = elems.begin(); it != elems.end(); ++it) { T* elem = *it; - s += elem->size(); + s += elem->nb_bytes(); } return s; @@ -230,9 +230,9 @@ public: } // interface ISrsCodec public: - virtual int size() + virtual int nb_bytes() { - return 4 + sizeof(int32_t) * (int)elems.size(); + return 4 + 4 * (int)elems.size(); } virtual int encode(SrsBuffer* buf) { @@ -384,7 +384,7 @@ public: virtual bool is_consumer_metadata_request(); // interface ISrsCodec public: - virtual int size(); + virtual int nb_bytes(); virtual int encode(SrsBuffer* buf); virtual int decode(SrsBuffer* buf); }; @@ -450,7 +450,7 @@ public: virtual int32_t correlation_id(); // interface ISrsCodec public: - virtual int size(); + virtual int nb_bytes(); virtual int encode(SrsBuffer* buf); virtual int decode(SrsBuffer* buf); }; @@ -546,7 +546,7 @@ public: virtual SrsKafkaApiKey api_key(); // interface ISrsCodec public: - virtual int size(); + virtual int nb_bytes(); virtual int encode(SrsBuffer* buf); virtual int decode(SrsBuffer* buf); }; @@ -569,7 +569,7 @@ public: virtual void update_header(int s); // interface ISrsCodec public: - virtual int size(); + virtual int nb_bytes(); virtual int encode(SrsBuffer* buf); virtual int decode(SrsBuffer* buf); }; @@ -599,7 +599,7 @@ public: virtual void add_topic(std::string topic); // interface ISrsCodec public: - virtual int size(); + virtual int nb_bytes(); virtual int encode(SrsBuffer* buf); virtual int decode(SrsBuffer* buf); }; @@ -619,7 +619,7 @@ public: virtual ~SrsKafkaBroker(); // interface ISrsCodec public: - virtual int size(); + virtual int nb_bytes(); virtual int encode(SrsBuffer* buf); virtual int decode(SrsBuffer* buf); }; @@ -636,7 +636,7 @@ public: virtual ~SrsKafkaPartitionMetadata(); // interface ISrsCodec public: - virtual int size(); + virtual int nb_bytes(); virtual int encode(SrsBuffer* buf); virtual int decode(SrsBuffer* buf); }; @@ -651,7 +651,7 @@ public: virtual ~SrsKafkaTopicMetadata(); // interface ISrsCodec public: - virtual int size(); + virtual int nb_bytes(); virtual int encode(SrsBuffer* buf); virtual int decode(SrsBuffer* buf); }; @@ -674,7 +674,7 @@ public: virtual ~SrsKafkaTopicMetadataResponse(); // interface ISrsCodec public: - virtual int size(); + virtual int nb_bytes(); virtual int encode(SrsBuffer* buf); virtual int decode(SrsBuffer* buf); };