X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_events.cc;h=421c81d42cac7828793f8e7068a1074570fa9f80;hb=6de0f8a8a8348b502344bbd3a50b8c54f4d7afaf;hp=4df5111b03eaf797b83aba6861f680c7c77bf195;hpb=c11c01ef200ce01ec454ff1d8023732d2cd6b06e;p=ardour.git

diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc
index 4df5111b03..421c81d42c 100644
--- a/libs/ardour/session_events.cc
+++ b/libs/ardour/session_events.cc
@@ -24,6 +24,7 @@
 
 #include "pbd/error.h"
 #include "pbd/enumwriter.h"
+#include "pbd/stacktrace.h"
 
 #include "ardour/ardour.h"
 #include "ardour/audio_diskstream.h"
@@ -56,20 +57,37 @@ SessionEvent::create_per_thread_pool (const std::string& name, uint32_t nitems)
 }
 
 void *
-SessionEvent::operator new (size_t) 
+SessionEvent::operator new (size_t)
 {
 	CrossThreadPool* p = pool->per_thread_pool ();
 	SessionEvent* ev = static_cast<SessionEvent*> (p->alloc ());
+	DEBUG_TRACE (DEBUG::SessionEvents, string_compose ("%1 Allocating SessionEvent from %2 ev @ %3\n", pthread_self(), p->name(), ev));
+#ifndef NDEBUG
+	if (DEBUG::SessionEvents & PBD::debug_bits) {
+		stacktrace (cerr, 40);
+	}
+#endif
 	ev->own_pool = p;
 	return ev;
 }
-    
-void 
-SessionEvent::operator delete (void *ptr, size_t /*size*/) 
+
+void
+SessionEvent::operator delete (void *ptr, size_t /*size*/)
 {
 	Pool* p = pool->per_thread_pool ();
 	SessionEvent* ev = static_cast<SessionEvent*> (ptr);
 
+	DEBUG_TRACE (DEBUG::SessionEvents, string_compose (
+		             "%1 Deleting SessionEvent @ %2 ev thread pool = %3 ev pool = %4\n",
+		             pthread_self(), ev, p->name(), ev->own_pool->name()
+		             ));
+
+#ifndef NDEBUG
+	if (DEBUG::SessionEvents & PBD::debug_bits) {
+		stacktrace (cerr, 40);
+	}
+#endif
+
 	if (p == ev->own_pool) {
 		p->release (ptr);
 	} else {
@@ -78,21 +96,21 @@ SessionEvent::operator delete (void *ptr, size_t /*size*/)
 }
 
 void
-SessionEventManager::add_event (nframes64_t frame, SessionEvent::Type type, nframes64_t target_frame)
+SessionEventManager::add_event (framepos_t frame, SessionEvent::Type type, framepos_t target_frame)
 {
 	SessionEvent* ev = new SessionEvent (type, SessionEvent::Add, frame, target_frame, 0);
 	queue_event (ev);
 }
 
 void
-SessionEventManager::remove_event (nframes64_t frame, SessionEvent::Type type)
+SessionEventManager::remove_event (framepos_t frame, SessionEvent::Type type)
 {
 	SessionEvent* ev = new SessionEvent (type, SessionEvent::Remove, frame, 0, 0);
 	queue_event (ev);
 }
 
 void
-SessionEventManager::replace_event (SessionEvent::Type type, nframes64_t frame, nframes64_t target)
+SessionEventManager::replace_event (SessionEvent::Type type, framepos_t frame, framepos_t target)
 {
 	SessionEvent* ev = new SessionEvent (type, SessionEvent::Replace, frame, target, 0);
 	queue_event (ev);
@@ -115,7 +133,7 @@ SessionEventManager::dump_events () const
 	}
 	cerr << "Next event: ";
 
-        if ((Events::const_iterator) next_event == events.end()) {
+	if ((Events::const_iterator) next_event == events.end()) {
 		cerr << "none" << endl;
 	} else {
 		cerr << "at " << (*next_event)->action_frame << ' '