add finalizer logging

diff --git a/ChangeLog b/ChangeLog
index b5ae024200e10230cda7b6df36a64431cd772b06..87accbf59c3495f959b249292e43b13e78a8d027 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-29  MenTaLguY  <mental@rydia.net>
+
+       * src/Makefile_insert, src/gc-finalized.cpp, src/gc-finalized.h:
+
+         add finalizer logging
+
 2006-04-29  MenTaLguY  <mental@rydia.net>
 
        * src/debug/simple-event.h: simplify the SimpleEvent API more

diff --git a/src/Makefile_insert b/src/Makefile_insert
index 00c3be726c040fb70501602d5eed3549d3a15e21..18f6b7b039b442fd3a75fc78c5155d6e07fb23a1 100644 (file)
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -230,7 +230,7 @@ libinkpost_a_SOURCES =      \
        gc-alloc.h      \
        gc-anchored.h gc-anchored.cpp   \
        gc-core.h       \
-       gc-finalized.h  \
+       gc-finalized.h gc-finalized.cpp \
        gc-managed.h    \
        gc-soft-ptr.h   \
        gc.cpp  \

diff --git a/src/gc-finalized.cpp b/src/gc-finalized.cpp
new file mode 100644 (file)
index 0000000..5b9aa3c
--- /dev/null
+++ b/src/gc-finalized.cpp
@@ -0,0 +1,64 @@
+/*
+ * Inkscape::GC::Finalized - mixin for GC-managed objects with non-trivial
+ *                           destructors
+ *
+ * Copyright 2006 MenTaLguY <mental@rydia.net>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * See the file COPYING for details.
+ *
+ */
+
+#include <typeinfo>
+#include "debug/simple-event.h"
+#include "debug/event-tracker.h"
+#include "util/format.h"
+#include "util/share.h"
+#include "gc-finalized.h"
+
+namespace Inkscape {
+
+namespace GC {
+
+namespace {
+
+// workaround for g++ 4.0.2
+typedef Debug::SimpleEvent<Debug::Event::FINALIZERS> BaseEvent;
+
+class FinalizerEvent : public BaseEvent {
+public:
+    FinalizerEvent(Finalized *object)
+    : BaseEvent(Util::share_static_string("gc-finalizer"))
+    {
+        _addProperty("base", Util::format("%p", Core::base(object)));
+        _addProperty("pointer", Util::format("%p", object));
+        _addProperty("class", Util::share_static_string(typeid(*object).name()));
+    }
+};
+
+}
+
+void Finalized::_invoke_dtor(void *base, void *offset) {
+    Finalized *object=_unoffset(base, offset);
+    Debug::EventTracker<FinalizerEvent> tracker(object);
+    object->~Finalized();
+}
+
+}
+
+}
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :

diff --git a/src/gc-finalized.h b/src/gc-finalized.h
index 046816b60b56581ea68b5dc7912fd4016b3fc60d..738d37692f205bf618f2fa268d4174dfb4821349 100644 (file)
--- a/src/gc-finalized.h
+++ b/src/gc-finalized.h
@@ -114,9 +114,7 @@ public:
 
 private:
     /// invoke the destructor for an object given a base and offset pair
-    static void _invoke_dtor(void *base, void *offset) {
-        _unoffset(base, offset)->~Finalized();
-    }
+    static void _invoke_dtor(void *base, void *offset);
 
     /// turn 'this' pointer into an offset-from-base-address (stored as void *)
     static void *_offset(void *base, Finalized *self) {