[svn] commit: r4028 - in /branches/trac449/src/lib/cache: Makefile.am cache_entry_key.h message_cache.cc message_cache.h message_entry.cc message_entry.h
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Dec 28 08:50:44 UTC 2010
Author: zhanglikun
Date: Tue Dec 28 08:50:44 2010
New Revision: 4028
Log:
Implement the interface MessageCache::Lookup.
Added:
branches/trac449/src/lib/cache/cache_entry_key.h
Modified:
branches/trac449/src/lib/cache/Makefile.am
branches/trac449/src/lib/cache/message_cache.cc
branches/trac449/src/lib/cache/message_cache.h
branches/trac449/src/lib/cache/message_entry.cc
branches/trac449/src/lib/cache/message_entry.h
Modified: branches/trac449/src/lib/cache/Makefile.am
==============================================================================
--- branches/trac449/src/lib/cache/Makefile.am (original)
+++ branches/trac449/src/lib/cache/Makefile.am Tue Dec 28 08:50:44 2010
@@ -26,5 +26,6 @@
libcache_la_SOURCES += message_entry.h message_entry.cc
libcache_la_SOURCES += rrset_cache.h rrset_cache.cc
libcache_la_SOURCES += rrset_entry.h rrset_entry.cc
+libcache_la_SOURCES += cache_entry_key.h
CLEANFILES = *.gcno *.gcda
Modified: branches/trac449/src/lib/cache/message_cache.cc
==============================================================================
--- branches/trac449/src/lib/cache/message_cache.cc (original)
+++ branches/trac449/src/lib/cache/message_cache.cc Tue Dec 28 08:50:44 2010
@@ -14,18 +14,21 @@
// $Id$
-#include "message_cache.h"
#include <nsas/nsas_entry_compare.h>
#include <nsas/hash_table.h>
#include <nsas/hash_deleter.h>
+#include "message_cache.h"
+#include "cache_entry_key.h"
using namespace isc::nsas;
+using namespace isc::dns;
namespace isc {
namespace cache {
MessageCache::MessageCache(boost::shared_ptr<RRsetCache> rrset_cache,
- uint32_t cache_size):
+ uint32_t cache_size, uint16_t message_class):
+ message_class_(message_class),
rrset_cache_(rrset_cache),
message_table_(new NsasEntryCompare<MessageEntry>, cache_size),
message_lru_((3 * cache_size),
@@ -35,16 +38,26 @@
}
bool
-MessageCache::lookUp(const isc::dns::Name&,
- const isc::dns::RRType&,
- const isc::dns::RRClass&,
- isc::dns::Message& )
+MessageCache::lookup(const isc::dns::Name& qname,
+ const isc::dns::RRType& qtype,
+ const uint16_t query_header,
+ isc::dns::Message& response)
{
- return true;
+ std::pair<const char*, const uint32_t> keydata = genCacheEntryKey(qname, qtype);
+
+ //TODO, HashKey need to be refactored, since we don't need query class
+ // as the parameters.
+ boost::shared_ptr<MessageEntry> msg_entry = message_table_.get(HashKey(
+ keydata.first, keydata.second, RRClass(message_class_)));
+ if(msg_entry) {
+ return msg_entry->genMessage(time(NULL), query_header, response);
+ }
+
+ return false;
}
bool
-MessageCache::update(const isc::dns::Message&) {
+MessageCache::update(const Message&) {
return true;
}
Modified: branches/trac449/src/lib/cache/message_cache.h
==============================================================================
--- branches/trac449/src/lib/cache/message_cache.h (original)
+++ branches/trac449/src/lib/cache/message_cache.h Tue Dec 28 08:50:44 2010
@@ -36,20 +36,23 @@
///
class MessageCache {
public:
-
/// \param cache_size The size of message cache.
MessageCache(boost::shared_ptr<RRsetCache> rrset_cache_,
- uint32_t cache_size);
+ uint32_t cache_size, uint16_t message_class);
/// \brief Look up message in cache.
/// \param message generated response message if the message entry
/// can be found.
+ /// \param query_header the uint16_t length header of the query message.
+ /// The message in the cache maybe need to be refactored when answering the
+ /// lookup according the query header(flags).
+ ///
/// \return return true if the message can be found in cache, or else,
/// return false.
//TODO Maybe some user just want to get the message_entry.
- bool lookUp(const isc::dns::Name& qname,
+ bool lookup(const isc::dns::Name& qname,
const isc::dns::RRType& qtype,
- const isc::dns::RRClass& qclass,
+ const uint16_t query_header,
isc::dns::Message& message);
/// \brief Update the message in the cache with the new one.
@@ -69,7 +72,7 @@
bool resize(uint32_t size);
private:
- uint16_t class_; // The class of the message cache.
+ uint16_t message_class_; // The class of the message cache.
boost::shared_ptr<RRsetCache> rrset_cache_;
isc::nsas::HashTable<MessageEntry> message_table_;
isc::nsas::LruList<MessageEntry> message_lru_;
Modified: branches/trac449/src/lib/cache/message_entry.cc
==============================================================================
--- branches/trac449/src/lib/cache/message_entry.cc (original)
+++ branches/trac449/src/lib/cache/message_entry.cc Tue Dec 28 08:50:44 2010
@@ -30,12 +30,12 @@
}
-void
-MessageEntry::generateMessage(const time_t&,
- const uint16_t,
- isc::dns::Message&)
+bool
+MessageEntry::genMessage(const time_t&,
+ const uint16_t,
+ isc::dns::Message&)
{
-
+ return true;
}
void
Modified: branches/trac449/src/lib/cache/message_entry.h
==============================================================================
--- branches/trac449/src/lib/cache/message_entry.h (original)
+++ branches/trac449/src/lib/cache/message_entry.h Tue Dec 28 08:50:44 2010
@@ -31,6 +31,9 @@
class RRsetEntry;
class RRsetCache;
+/// \brief Message Entry
+/// The object of MessageEntry represents one response message
+/// answered to the recursor client.
class MessageEntry : public NsasEntry<MessageEntry>,
public Fetchable
{
@@ -52,9 +55,11 @@
/// as "expire_time - time_now" (expire_time is the
/// expiration time of the rrset).
/// \param query_header the query message header.
- void generateMessage(const time_t& time_now,
- const uint16_t query_header,
- isc::dns::Message& response);
+ /// \return return true if the response message can be generated
+ /// from the cached information, or else, return false.
+ bool genMessage(const time_t& time_now,
+ const uint16_t query_header,
+ isc::dns::Message& response);
protected:
// Initialize the message entry with dns message.
void initMessageEntry(const isc::dns::Message& message);
More information about the bind10-changes
mailing list