[Commit-gnuradio] r4348 - gnuradio/branches/developers/eb/mb/mblock/src/lib

[eb]

Author: eb
Date: 2007-01-31 14:52:16 -0700 (Wed, 31 Jan 2007)
New Revision: 4348

Removed:
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_port_detail.cc
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_port_detail.h
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_runtime_impl.cc
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_runtime_impl.h
Modified:
   gnuradio/branches/developers/eb/mb/mblock/src/lib/Makefile.am
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_msg_queue.cc
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_msg_queue.h
Log:
work-in-progress: enabled mutexes, removed unneeded files

Modified: gnuradio/branches/developers/eb/mb/mblock/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/mb/mblock/src/lib/Makefile.am       
2007-01-31 19:04:32 UTC (rev 4347)
+++ gnuradio/branches/developers/eb/mb/mblock/src/lib/Makefile.am       
2007-01-31 21:52:16 UTC (rev 4348)
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES = $(PMT_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES)
+INCLUDES = $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(BOOST_CFLAGS) 
$(CPPUNIT_INCLUDES)
 
 TESTS = test_mblock
 
@@ -44,7 +44,6 @@
        mb_port_simple.cc               \
        mb_protocol_class.cc            \
        mb_runtime.cc                   \
-       mb_runtime_impl.cc              \
        mb_util.cc                      
 
 
@@ -53,6 +52,7 @@
 
 # link the library against the c++ standard library
 libmblock_la_LIBADD =                  \
+       $(OMNITHREAD_LIBS)              \
        $(PMT_LIBS)                     \
        -lstdc++                        
 
@@ -75,8 +75,6 @@
        mb_endpoint.h                   \
        mb_mblock_impl.h                \
        mb_msg_accepter_smp.h           \
-       mb_port_detail.h                \
-       mb_runtime_impl.h               \
        qa_mblock.h                     \
        qa_mblock_prims.h               
 

Modified: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_msg_queue.cc
===================================================================
--- gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_msg_queue.cc   
2007-01-31 19:04:32 UTC (rev 4347)
+++ gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_msg_queue.cc   
2007-01-31 21:52:16 UTC (rev 4348)
@@ -38,7 +38,7 @@
 void
 mb_msg_queue::insert(mb_message_sptr msg)
 {
-  // omni_mutex_lock   l(d_mutex);             FIXME
+  omni_mutex_lock      l(d_mutex);
   
   mb_pri_t q = mb_pri_clamp(msg->priority());
 
@@ -57,7 +57,7 @@
 mb_message_sptr
 mb_msg_queue::get_highest_pri_msg()
 {
-  // omni_mutex_lock   l(d_mutex);             FIXME
+  omni_mutex_lock      l(d_mutex);
 
   // FIXME use bitmap and ffz to find best queue in O(1)
 

Modified: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_msg_queue.h
===================================================================
--- gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_msg_queue.h    
2007-01-31 19:04:32 UTC (rev 4347)
+++ gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_msg_queue.h    
2007-01-31 21:52:16 UTC (rev 4348)
@@ -22,7 +22,7 @@
 #define INCLUDED_MB_MSG_QUEUE_H
 
 #include <mb_common.h>
-//#include <omnithread.h>      FIXME
+#include <omnithread.h>
 
 /*!
  * \brief priority queue for mblock messages
@@ -37,7 +37,7 @@
     bool empty_p() const { return head == 0; }
   };
 
-  // omni_mutex        d_mutex;        FIXME
+  omni_mutex   d_mutex;
 
   // FIXME add bitmap to indicate which queues are non-empty.
   subq         d_queue[MB_NPRI];

Deleted: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_port_detail.cc

Deleted: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_port_detail.h

Deleted: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_runtime_impl.cc

Deleted: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_runtime_impl.h