BIND 10 trac404, updated. 69e7fd6b5782434c809f90d8060e148318ba3c7e [trac404] Small cleanup & comment update
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Apr 4 17:14:33 UTC 2011
The branch, trac404 has been updated
via 69e7fd6b5782434c809f90d8060e148318ba3c7e (commit)
from 56b5bef538df18c95ad5df3aaf7ebff4464de7c6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 69e7fd6b5782434c809f90d8060e148318ba3c7e
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Mon Apr 4 19:14:14 2011 +0200
[trac404] Small cleanup & comment update
-----------------------------------------------------------------------
Summary of changes:
src/lib/dns/benchmarks/rdatarender_bench.cc | 2 +
src/lib/dns/rdatafields.cc | 101 +++++++++++---------------
src/lib/dns/rdatafields.h | 13 +++-
3 files changed, 56 insertions(+), 60 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/dns/benchmarks/rdatarender_bench.cc b/src/lib/dns/benchmarks/rdatarender_bench.cc
index e6fce8d..060ab65 100644
--- a/src/lib/dns/benchmarks/rdatarender_bench.cc
+++ b/src/lib/dns/benchmarks/rdatarender_bench.cc
@@ -75,6 +75,8 @@ public:
data_length_ = fields.getDataLength();
data_store_.assign(fields.getData(), fields.getData() + data_length_);
+ // Vector guarantees that the elements are stored in continuous array
+ // in memory, so this is actually correct by the standard
data_ptr_ = &data_store_[0];
}
void toWire(MessageRenderer& renderer) const {
diff --git a/src/lib/dns/rdatafields.cc b/src/lib/dns/rdatafields.cc
index ea74cc3..b387eac 100644
--- a/src/lib/dns/rdatafields.cc
+++ b/src/lib/dns/rdatafields.cc
@@ -37,16 +37,14 @@ namespace rdata {
///
/// It manages a local storage for the data when \c RdataFields is constructed
/// from an \c Rdata.
-/// The implementation is hidden here to hide non portable details such as
-/// std::vector.
/// To minimize construction overhead in the other case, an instance of
-/// this class is instantiated only when necessary.
+/// this class is instantiated only when necessary - we don't need the vectors
+/// when only rendering.
struct RdataFields::RdataFieldsDetail {
RdataFieldsDetail(const vector<FieldSpec>& fields,
- const void* data, size_t data_length) :
+ const uint8_t* data, size_t data_length) :
allocated_fields_(fields),
- allocated_data_(static_cast<const uint8_t*>(data),
- static_cast<const uint8_t*>(data) + data_length)
+ allocated_data_(data, data + data_length)
{}
const vector<FieldSpec> allocated_fields_;
const vector<uint8_t> allocated_data_;
@@ -84,11 +82,42 @@ public:
virtual void setTruncated() { truncated_ = true; }
virtual void setLengthLimit(size_t len) { length_limit_ = len; }
virtual void setCompressMode(CompressMode mode) { mode_ = mode; }
- virtual void writeUint8(uint8_t data);
- virtual void writeUint16(uint16_t data);
- virtual void writeUint32(uint32_t data);
- virtual void writeData(const void *data, size_t len);
- virtual void writeName(const Name& name, bool compress);
+ virtual void writeUint8(uint8_t data) {
+ buffer_.writeUint8(data);
+ if (fields_.empty() || fields_.back().type != RdataFields::DATA) {
+ fields_.push_back(RdataFields::FieldSpec(RdataFields::DATA, 0));
+ }
+ fields_.back().len += sizeof(data);
+ }
+ virtual void writeUint16(uint16_t data) {
+ buffer_.writeUint16(data);
+ if (fields_.empty() || fields_.back().type != RdataFields::DATA) {
+ fields_.push_back(RdataFields::FieldSpec(RdataFields::DATA, 0));
+ }
+ fields_.back().len += sizeof(data);
+ }
+ virtual void writeUint32(uint32_t data) {
+ buffer_.writeUint32(data);
+ if (fields_.empty() || fields_.back().type != RdataFields::DATA) {
+ fields_.push_back(RdataFields::FieldSpec(RdataFields::DATA, 0));
+ }
+ fields_.back().len += sizeof(data);
+ }
+ virtual void writeData(const void *data, size_t len) {
+ buffer_.writeData(data, len);
+ if (fields_.empty() || fields_.back().type != RdataFields::DATA) {
+ fields_.push_back(RdataFields::FieldSpec(RdataFields::DATA, 0));
+ }
+ fields_.back().len += len;
+ }
+ virtual void writeName(const Name& name, bool compress) {
+ const RdataFields::Type field_type =
+ compress ? RdataFields::COMPRESSIBLE_NAME :
+ RdataFields::INCOMPRESSIBLE_NAME;
+ name.toWire(buffer_);
+ fields_.push_back(RdataFields::FieldSpec(field_type,
+ name.getLength()));
+ }
virtual void clear() {
isc_throw(Unexpected, "unexpected clear() for RdataFieldComposer");
@@ -110,50 +139,6 @@ public:
vector<RdataFields::FieldSpec> fields_;
};
-void
-RdataFieldComposer::writeUint8(uint8_t data) {
- buffer_.writeUint8(data);
- if (fields_.empty() || fields_.back().type != RdataFields::DATA) {
- fields_.push_back(RdataFields::FieldSpec(RdataFields::DATA, 0));
- }
- fields_.back().len += sizeof(data);
-}
-
-void
-RdataFieldComposer::writeUint16(uint16_t data) {
- buffer_.writeUint16(data);
- if (fields_.empty() || fields_.back().type != RdataFields::DATA) {
- fields_.push_back(RdataFields::FieldSpec(RdataFields::DATA, 0));
- }
- fields_.back().len += sizeof(data);
-}
-
-void
-RdataFieldComposer::writeUint32(uint32_t data) {
- buffer_.writeUint32(data);
- if (fields_.empty() || fields_.back().type != RdataFields::DATA) {
- fields_.push_back(RdataFields::FieldSpec(RdataFields::DATA, 0));
- }
- fields_.back().len += sizeof(data);
-}
-
-void
-RdataFieldComposer::writeData(const void *data, size_t len) {
- buffer_.writeData(data, len);
- if (fields_.empty() || fields_.back().type != RdataFields::DATA) {
- fields_.push_back(RdataFields::FieldSpec(RdataFields::DATA, 0));
- }
- fields_.back().len += len;
-}
-
-void
-RdataFieldComposer::writeName(const Name& name, bool compress) {
- const RdataFields::Type field_type =
- compress ? RdataFields::COMPRESSIBLE_NAME :
- RdataFields::INCOMPRESSIBLE_NAME;
- name.toWire(buffer_);
- fields_.push_back(RdataFields::FieldSpec(field_type, name.getLength()));
-}
}
RdataFields::RdataFields(const Rdata& rdata) {
@@ -165,7 +150,8 @@ RdataFields::RdataFields(const Rdata& rdata) {
if (nfields_ > 0) {
assert(data_length_ > 0);
detail_ = new RdataFieldsDetail(field_composer.fields_,
- field_composer.getData(),
+ static_cast<const uint8_t*>
+ (field_composer.getData()),
field_composer.getLength());
data_ = &detail_->allocated_data_[0];
fields_ = &detail_->allocated_fields_[0];
@@ -233,8 +219,7 @@ RdataFields::toWire(AbstractMessageRenderer& renderer) const {
// This should be improved in a future version.
InputBuffer buffer(data_ + offset, fields_[i].len);
renderer.writeName(Name(buffer),
- fields_[i].type == COMPRESSIBLE_NAME ?
- true : false);
+ fields_[i].type == COMPRESSIBLE_NAME);
}
offset += fields_[i].len;
}
diff --git a/src/lib/dns/rdatafields.h b/src/lib/dns/rdatafields.h
index 8385215..7be905a 100644
--- a/src/lib/dns/rdatafields.h
+++ b/src/lib/dns/rdatafields.h
@@ -320,8 +320,16 @@ public:
/// \brief Return a pointer to a sequence of \c FieldSpec for the
/// \c RdataFields.
///
+ /// The data is just opaque internal representation, as a sequence
+ /// of bytes (unsigned char * because of C/C++ aliasing rules).
+ ///
/// This method never throws an exception.
- const void* getFieldSpecData() const { return (fields_); }
+ const uint8_t* getFieldSpecData() const {
+ // Nasty cast, because C++ authors didn't read the C specification
+ // about pointers. We can't return void* from it, that would break
+ // aliasing rules.
+ return ((const uint8_t*) fields_);
+ }
/// \brief Return the specification of the field identified by the given
/// index.
@@ -373,7 +381,8 @@ private:
const uint8_t* data_;
size_t data_length_;
- // hide further details within the implementation
+ // hide further details within the implementation and don't create vectors
+ // every time we don't need them.
struct RdataFieldsDetail;
RdataFieldsDetail* detail_;
};
More information about the bind10-changes
mailing list