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

[eb]

Author: eb
Date: 2007-03-26 20:38:29 -0600 (Mon, 26 Mar 2007)
New Revision: 4799

Modified:
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock.cc
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock.h
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock_impl.cc
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock_impl.h
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_port_simple.cc
   
gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_runtime_single_threaded.cc
   gnuradio/branches/developers/eb/mb/mblock/src/lib/qa_mblock_send.cc
Log:
renamed fullname -> instance_name

Modified: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock.cc
===================================================================
--- gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock.cc      
2007-03-27 01:27:56 UTC (rev 4798)
+++ gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock.cc      
2007-03-27 02:38:29 UTC (rev 4799)
@@ -121,15 +121,15 @@
 }
 
 std::string
-mb_mblock::fullname() const
+mb_mblock::instance_name() const
 {
-  return d_impl->fullname();
+  return d_impl->instance_name();
 }
 
 void
-mb_mblock::set_fullname(const std::string name)
+mb_mblock::set_instance_name(const std::string name)
 {
-  d_impl->set_fullname(name);
+  d_impl->set_instance_name(name);
 }
 
 mb_mblock *

Modified: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock.h
===================================================================
--- gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock.h       
2007-03-27 01:27:56 UTC (rev 4798)
+++ gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock.h       
2007-03-27 02:38:29 UTC (rev 4799)
@@ -179,10 +179,10 @@
 public:
   virtual ~mb_mblock();
 
-  void set_fullname(const std::string name);
+  void set_instance_name(const std::string name);
   
   //! Return full name of this block
-  std::string fullname() const;
+  std::string instance_name() const;
 
   //! Return the parent of this mblock, or 0 if we're the top-level block.
   mb_mblock *parent() const;

Modified: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock_impl.cc
===================================================================
--- gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock_impl.cc 
2007-03-27 01:27:56 UTC (rev 4798)
+++ gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock_impl.cc 
2007-03-27 02:38:29 UTC (rev 4799)
@@ -51,7 +51,7 @@
 ////////////////////////////////////////////////////////////////////////
 
 mb_mblock_impl::mb_mblock_impl(mb_mblock *mb)
-  : d_mb(mb), d_mb_parent(0), d_fullname("<unknown>")
+  : d_mb(mb), d_mb_parent(0), d_instance_name("<unknown>")
 {
 }
 
@@ -252,8 +252,8 @@
 }
 
 void
-mb_mblock_impl::set_fullname(const std::string &name)
+mb_mblock_impl::set_instance_name(const std::string &name)
 {
-  d_fullname = name;
+  d_instance_name = name;
 }
 

Modified: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock_impl.h
===================================================================
--- gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock_impl.h  
2007-03-27 01:27:56 UTC (rev 4798)
+++ gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock_impl.h  
2007-03-27 02:38:29 UTC (rev 4799)
@@ -40,7 +40,7 @@
   mb_mblock                   *d_mb;           // pointer to our associated 
mblock
   mb_mblock                   *d_mb_parent;    // pointer to our parent
 
-  std::string                  d_fullname;     // hierarchical name
+  std::string                  d_instance_name;        // hierarchical name
 
   mb_port_map_t                        d_port_map;     // our ports
   mb_comp_map_t                        d_comp_map;     // our components
@@ -148,10 +148,10 @@
   msgq() { return d_msgq; }
 
   //! Return full name of this block
-  std::string fullname() const { return d_fullname; }
+  std::string instance_name() const { return d_instance_name; }
 
   //! Set the name of this block
-  void set_fullname(const std::string &name);
+  void set_instance_name(const std::string &name);
 
   /*!
    * \brief If bound, store endpoint from the other end of the connection.

Modified: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_port_simple.cc
===================================================================
--- gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_port_simple.cc 
2007-03-27 01:27:56 UTC (rev 4798)
+++ gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_port_simple.cc 
2007-03-27 02:38:29 UTC (rev 4799)
@@ -49,7 +49,7 @@
 mb_port_simple::send(pmt_t signal, pmt_t data, pmt_t metadata, mb_pri_t 
priority)
 {
   if (port_type() == mb_port::RELAY)  // Can't send directly to a RELAY port
-    throw mbe_invalid_port_type(mblock(), mblock()->fullname(), port_name());
+    throw mbe_invalid_port_type(mblock(), mblock()->instance_name(), 
port_name());
 
   mb_msg_accepter_sptr  accepter = find_accepter(this);
   if (accepter)

Modified: 
gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_runtime_single_threaded.cc
===================================================================
--- 
gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_runtime_single_threaded.cc 
    2007-03-27 01:27:56 UTC (rev 4798)
+++ 
gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_runtime_single_threaded.cc 
    2007-03-27 02:38:29 UTC (rev 4799)
@@ -44,7 +44,7 @@
   public:
     bool operator()(mb_mblock *mblock, const std::string &path)
     {
-      mblock->set_fullname(path);
+      mblock->set_instance_name(path);
       mblock->init_fsm();
       return true;
     }

Modified: gnuradio/branches/developers/eb/mb/mblock/src/lib/qa_mblock_send.cc
===================================================================
--- gnuradio/branches/developers/eb/mb/mblock/src/lib/qa_mblock_send.cc 
2007-03-27 01:27:56 UTC (rev 4798)
+++ gnuradio/branches/developers/eb/mb/mblock/src/lib/qa_mblock_send.cc 
2007-03-27 02:38:29 UTC (rev 4799)
@@ -86,10 +86,10 @@
 void
 sr1::init_fsm()
 {
-  // std::cout << fullname() << "[sr1]: init_fsm\n";
+  // std::cout << instance_name() << "[sr1]: init_fsm\n";
 
   // send two messages to each port
-  pmt_t our_name = pmt_intern(fullname());
+  pmt_t our_name = pmt_intern(instance_name());
   d_p1->send(s_status, pmt_list3(our_name, s_p1, pmt_from_long(0)));
   d_p1->send(s_status, pmt_list3(our_name, s_p1, pmt_from_long(1)));
 
@@ -127,10 +127,10 @@
 void
 sr0::init_fsm()
 {
-  // std::cout << fullname() << "[sr0]: init_fsm\n";
+  // std::cout << instance_name() << "[sr0]: init_fsm\n";
 
   // send two messages to p0
-  pmt_t our_name = pmt_intern(fullname());
+  pmt_t our_name = pmt_intern(instance_name());
   d_p0->send(s_control, pmt_list3(our_name, s_p0, pmt_from_long(0)));
   d_p0->send(s_control, pmt_list3(our_name, s_p0, pmt_from_long(1)));
 }
@@ -253,10 +253,10 @@
 void
 rr2::init_fsm()
 {
-  // std::cout << fullname() << "[rr2]: init_fsm\n";
+  // std::cout << instance_name() << "[rr2]: init_fsm\n";
 
   // send two messages via p1
-  pmt_t our_name = pmt_intern(fullname());
+  pmt_t our_name = pmt_intern(instance_name());
   d_p1->send(s_status, pmt_list3(our_name, s_p1, pmt_from_long(0)));
   d_p1->send(s_status, pmt_list3(our_name, s_p1, pmt_from_long(1)));
 }