2 files changed, 10 insertions, 4 deletions
diff --git a/gnuradio-runtime/gnuradio-runtime.conf.in b/gnuradio-runtime/gnuradio-runtime.conf.in
index 37d9be6f9d..0996fb21aa 100644
--- a/gnuradio-runtime/gnuradio-runtime.conf.in
+++ b/gnuradio-runtime/gnuradio-runtime.conf.in
@@ -7,7 +7,7 @@ verbose = False
 
 # The maximum number of messages a block will store up before pruning
 # the queue by popping messages from the front.
-max_messages = 100
+max_messages = 8192
 
 
 [LOG]
diff --git a/gnuradio-runtime/lib/tpb_thread_body.cc b/gnuradio-runtime/lib/tpb_thread_body.cc
index f6f09a9c3e..ea5d80a9dc 100644
--- a/gnuradio-runtime/lib/tpb_thread_body.cc
+++ b/gnuradio-runtime/lib/tpb_thread_body.cc
@@ -73,8 +73,10 @@ namespace gr {
         else {
           // If we don't have a handler but are building up messages,
           // prune the queue from the front to keep memory in check.
-          if(block->nmsgs(i.first) > max_nmsgs)
+          if(block->nmsgs(i.first) > max_nmsgs){
+            GR_LOG_WARN(LOG,"asynchronous message buffer overflowing, dropping message");
             msg = block->delete_head_nowait(i.first);
+            }
         }
       }
 
@@ -121,8 +123,10 @@ namespace gr {
             else {
                 // leave msg in queue if no handler is defined
                 // start dropping if we have too many
-                if(block->nmsgs(i.first) > max_nmsgs)
+                if(block->nmsgs(i.first) > max_nmsgs){
+                    GR_LOG_WARN(LOG,"asynchronous message buffer overflowing, dropping message");
                     msg = block->delete_head_nowait(i.first);
+                }
             }
           }
 	  if (d->done()) {
@@ -152,8 +156,10 @@ namespace gr {
             else {
                 // leave msg in queue if no handler is defined
                 // start dropping if we have too many
-                if(block->nmsgs(i.first) > max_nmsgs)
+                if(block->nmsgs(i.first) > max_nmsgs){
+                    GR_LOG_WARN(LOG,"asynchronous message buffer overflowing, dropping message");
                     msg = block->delete_head_nowait(i.first);
+                    }
                 }
             }
         }