X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketImpl.cc;h=291b3f1b8ff90417348e93973bb535e30bd24b51;hb=57daeae6f2e924ce3f16f9677c3474f531cba9e5;hp=4bb7eeef925b0ea100d330b9f13946a17a18e343;hpb=943a6b0973f66bc699c6e7b404da256145e93acf;p=senf.git

diff --git a/senf/Packets/PacketImpl.cc b/senf/Packets/PacketImpl.cc
index 4bb7eee..291b3f1 100644
--- a/senf/Packets/PacketImpl.cc
+++ b/senf/Packets/PacketImpl.cc
@@ -27,15 +27,17 @@
 
 // Custom includes
 #include <iterator>
+#include <map>
+#include <string>
 #include <boost/format.hpp>
 #include <senf/Utils/String.hh>
 #include "Packets.hh"
 
 //#include "PacketImpl.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::detail::PacketImpl
 
 prefix_ senf::detail::PacketImpl::~PacketImpl()
@@ -45,6 +47,19 @@ prefix_ senf::detail::PacketImpl::~PacketImpl()
     eraseInterpreters(interpreters_.begin(), interpreters_.end());
 }
 
+prefix_ void senf::detail::PacketImpl::release()
+{
+    SENF_ASSERT(refcount_ >= 1, "Internal failure: Releasing dead PacketImpl ??");
+    // uah ... we need to be extremely careful here. If refcount_ is 1, we want to commit suicide,
+    // however the destructor will remove all PacketInterpreters from the list and will thereby
+    // decrement refcount -> only decrement refcount_ when *not* calling delete (otherwise
+    // the assert above will fail)
+    if (refcount_ == 1)
+        delete this;
+    else
+        -- refcount_;
+}
+
 // interpreter chain
 
 prefix_ void senf::detail::PacketImpl::appendInterpreter(PacketInterpreterBase * p)
@@ -106,7 +121,7 @@ prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, differ
     // b) 'self'
     // c) Those that come afterwards
     // For a), the change must be inside the packet since 'self' must be within those packets
-    // For b), the change must also be within since that's the packet we are changeing
+    // For b), the change must also be within since that's the packet we are changing
     // For c), the change must be outside the packet (we don't allow an upper packet to mess with
     // the the data owned by a packet further down the chain). It can be before or after the
     // packet.
@@ -121,7 +136,7 @@ prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, differ
     interpreter_list::iterator const i_end (interpreters_.end());
     if (++i != i_end)
         if (pos <= difference_type(i->begin_))
-            // pos is before the packet, it must then be before all futher packets ...
+            // pos is before the packet, it must then be before all further packets ...
             for (; i != i_end; ++i) {
                 i->begin_ += n;
                 i->end_ += n;
@@ -133,48 +148,68 @@ prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, differ
 
 prefix_ void senf::detail::PacketImpl::dumpAnnotations(std::ostream & os)
 {
-    for (AnnotationRegistry::key_t key (AnnotationRegistry::instance().keyBegin());
-         key != AnnotationRegistry::instance().keyEnd(); ++key) {
-        void * antn (annotation(key));
+    for (AnnotationRegistry::iterator i (AnnotationRegistry::instance().begin());
+         i != AnnotationRegistry::instance().end(); ++i) {
+        void * antn (annotation(*i));
         if (antn)
-            AnnotationRegistry::instance().dump(key, os, antn);
+            AnnotationRegistry::instance().dump(*i, os, antn);
     }
 }
 
-prefix_ void * senf::detail::PacketImpl::complexAnnotation(AnnotationRegistry::key_t key)
+prefix_ void senf::detail::PacketImpl::clearAnnotations()
+{
+    ::memset(simpleAnnotations_, 0, sizeof(simpleAnnotations_));
+    complexAnnotations_.clear();
+}
+
+prefix_ void senf::detail::PacketImpl::assignAnnotations(PacketImpl const & other)
+{
+    std::copy(&other.simpleAnnotations_[0], &other.simpleAnnotations_[0] +
+            sizeof(simpleAnnotations_)/sizeof(simpleAnnotations_[0]), simpleAnnotations_);
+    complexAnnotations_.assign(
+            other.complexAnnotations_.begin(), other.complexAnnotations_.end());
+}
+
+prefix_ void * senf::detail::PacketImpl::complexAnnotation(AnnotationRegistry::key_type key)
 {
-    SENF_ASSERT( key<0, "complexAnnotation called with invalid key");
-#ifdef SENF_PACKET_NO_COMPLEX_ANNOTATIONS
-    return 0;
-#else
-    while (complexAnnotations_.size() < ComplexAnnotations::size_type(-key))
-        complexAnnotations_.push_back(0);
-    if (complexAnnotations_.is_null(-key-1))
-        return 0;
-    return complexAnnotations_[-key-1].get();
-#endif
+    SENF_ASSERT( key < 0, "complexAnnotation called with invalid key");
+    return (ComplexAnnotations::size_type(-key-1) >= complexAnnotations_.size()
+            || complexAnnotations_.is_null(-key-1))
+        ? 0 : complexAnnotations_[-key-1].get();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::detail::AnnotationRegistry
 
+prefix_ void senf::detail::AnnotationRegistry::dump(key_type key, std::ostream & os,
+                                                    void * annotation)
+    const
+{
+    Registry::const_iterator i (registry_.find(key));
+    if (i != registry_.end()) {
+        os << fieldName(i->second->v_name());
+        i->second->v_dump(os, annotation);
+        os << "\n";
+    }
+}
+
 prefix_ void senf::detail::AnnotationRegistry::dumpRegistrations(std::ostream & os)
 {
-#ifdef SENF_DEBUG
-    boost::format fmt ("%4.4s  %-56.56s  %-7.7s  %5d\n");
+    boost::format fmt ("%-56.56s  %-4.4s  %-7.7s  %5d\n");
     os << "SENF_PACKET_ANNOTATION_SLOTS = " << SENF_PACKET_ANNOTATION_SLOTS << "\n"
        << "SENF_PACKET_ANNOTATION_SLOTSIZE = " << SENF_PACKET_ANNOTATION_SLOTSIZE << "\n";
-    os << fmt % "SLOT" % "TYPE" % "COMPLEX" % "SIZE";
-    for (key_t key (keyBegin()); key != keyEnd(); ++key) {
-        std::string nm (name(key));
+    os << fmt % "TYPE" % "FAST" % "COMPLEX" % "SIZE";
+
+    for (Index::const_iterator i (index_.begin()), i_end (index_.end()); i != i_end; ++i) {
+        key_type key (i->second);
+        std::string nm (i->first);
         if (nm.size() > 56) nm.erase(nm.begin(), nm.begin()+nm.size()-32);
         os << fmt
-            % (key >= 0 ? senf::str(key) : "")
             % nm
+            % (key >= 0 ? "yes" : "no")
             % (isComplex(key) ? "yes" : "no")
             % size(key);
     }
-#endif
 }
 
 prefix_ void senf::dumpPacketAnnotationRegistry(std::ostream & os)
@@ -182,7 +217,7 @@ prefix_ void senf::dumpPacketAnnotationRegistry(std::ostream & os)
     senf::detail::AnnotationRegistry::instance().dumpRegistrations(os);
 }
 
-/////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "PacketImpl.mpp"