--- a/src/core/model/breakpoint.cc	Sat Nov 10 18:45:37 2012 +0100
+++ b/src/core/model/breakpoint.cc	Sat Nov 10 19:16:38 2012 +0100
@@ -21,10 +21,13 @@
 
 #include "breakpoint.h"
 #include "ns3/core-config.h"
+#include "log.h"
 #ifdef HAVE_SIGNAL_H
 # include <signal.h>
 #endif
 
+NS_LOG_COMPONENT_DEFINE ("Breakpoint");
+
 namespace ns3 {
 
 #if defined (HAVE_SIGNAL_H) && defined (SIGTRAP)
@@ -32,6 +35,8 @@
 void
 BreakpointFallback (void)
 {
+  NS_LOG_FUNCTION_NOARGS ();
+
   raise (SIGTRAP);
 }
 
@@ -40,6 +45,8 @@
 void
 BreakpointFallback (void)
 {
+  NS_LOG_FUNCTION (this);
+
   int *a = 0;
   /**
    * we test here to allow a debugger to change the value of