Merged features/inband -r4812:5218 into trunk. This group of changes

includes:

 * working stand-alone mblock code
 * work-in-progress on usrp inband signaling

usrp now depends on mblock, and guile is a dependency.



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5221 221aa14e-8319-0410-a670-987f0aec2ac5

1 files changed, 41 insertions, 10 deletions

diff --git a/mblock/src/lib/Makefile.am b/mblock/src/lib/Makefile.am
index 6273e16d2..604f97246 100644
--- a/mblock/src/lib/Makefile.am
+++ b/mblock/src/lib/Makefile.am
@@ -28,28 +28,41 @@ TESTS = test_mblock
 lib_LTLIBRARIES = libmblock.la libmblock-qa.la
 
 EXTRA_DIST = 				\
-	README.locking			
+	README.locking			\
+	qa_bitset.mbh			
 
 
+BUILT_SOURCES =				\
+	qa_bitset_mbh.cc		
+
+qa_bitset_mbh.cc : qa_bitset.mbh
+	$(COMPILE_MBH) qa_bitset.mbh qa_bitset_mbh.cc
+
 # These are the source files that go into the mblock shared library
 libmblock_la_SOURCES =			\
+	mb_class_registry.cc		\
 	mb_connection.cc		\
 	mb_endpoint.cc			\
 	mb_exception.cc			\
+	mb_gettid.cc			\
 	mb_mblock.cc			\
 	mb_mblock_impl.cc		\
 	mb_message.cc			\
 	mb_msg_accepter.cc		\
+	mb_msg_accepter_msgq.cc		\
 	mb_msg_accepter_smp.cc		\
 	mb_msg_queue.cc			\
 	mb_port.cc			\
 	mb_port_simple.cc		\
 	mb_protocol_class.cc		\
 	mb_runtime.cc			\
+	mb_runtime_base.cc		\
 	mb_runtime_nop.cc		\
-	mb_runtime_placeholder.cc	\
-	mb_runtime_thread_per_mblock.cc	\
-	mb_util.cc			
+	mb_runtime_thread_per_block.cc	\
+	mb_time.cc			\
+	mb_timer_queue.cc		\
+	mb_util.cc			\
+	mb_worker.cc			
 
 
 # magic flags
@@ -62,19 +75,20 @@ libmblock_la_LIBADD = 			\
 	-lstdc++			
 
 include_HEADERS =			\
+	mb_class_registry.h		\
 	mb_common.h			\
 	mb_exception.h			\
+	mb_gettid.h			\
 	mb_mblock.h			\
 	mb_message.h			\
 	mb_msg_accepter.h		\
+	mb_msg_accepter_msgq.h		\
 	mb_msg_queue.h			\
 	mb_port.h			\
 	mb_port_simple.h		\
 	mb_protocol_class.h		\
 	mb_runtime.h			\
-	mb_runtime_nop.h		\
-	mb_runtime_placeholder.h	\
-	mb_runtime_thread_per_mblock.h	\
+	mb_time.h			\
 	mb_util.h			
 
 
@@ -83,18 +97,30 @@ noinst_HEADERS = 			\
 	mb_endpoint.h			\
 	mb_mblock_impl.h		\
 	mb_msg_accepter_smp.h		\
+	mb_runtime_base.h		\
+	mb_runtime_nop.h		\
+	mb_runtime_thread_per_block.h	\
+	mb_timer_queue.h		\
+	mb_worker.h			\
 	mbi_runtime_lock.h		\
 	qa_mblock.h			\
 	qa_mblock_prims.h		\
-	qa_mblock_send.h		
+	qa_mblock_send.h		\
+	qa_mblock_sys.h			\
+	qa_timeouts.h			
 
 
 # Build the qa code into its own library
 
 libmblock_qa_la_SOURCES =		\
+	qa_bitset.cc			\
+	qa_bitset_mbh.cc		\
+	qa_disconnect.cc		\
 	qa_mblock.cc			\
 	qa_mblock_prims.cc		\
-	qa_mblock_send.cc		
+	qa_mblock_send.cc		\
+	qa_mblock_sys.cc		\
+	qa_timeouts.cc			
 
 
 # magic flags
@@ -107,9 +133,14 @@ libmblock_qa_la_LIBADD = 		\
 	-lstdc++			
 
 
-noinst_PROGRAMS	= test_mblock
+noinst_PROGRAMS	= 			\
+	test_mblock			\
+	benchmark_send			
 
 test_mblock_SOURCES = test_mblock.cc
 test_mblock_LDADD   = libmblock-qa.la
 
+benchmark_send_SOURCES = benchmark_send.cc
+benchmark_send_LDADD   = libmblock-qa.la
+
 CLEANFILES = $(BUILT_SOURCES) *.pyc