Changes for next Iris core

CMakeLists.txt

@@ -166,9 +166,9 @@ ADD_CUSTOM_TARGET(uninstall
 # Macro to add -fPIC property to static libs 
 ########################################################################
 MACRO(IRIS_SET_PIC)
-	IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
+    IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" )
         SET_TARGET_PROPERTIES(${ARGV} PROPERTIES COMPILE_FLAGS -fPIC)
-    ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
+    ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" )
 ENDMACRO(IRIS_SET_PIC)
 
 ########################################################################

README.md

@@ -30,3 +30,9 @@ Optional:
 ## License
 
 Iris is licensed under LGPL v3. For more information see LICENSE.
+
+[![githalytics.com alpha](https://cruel-carlota.pagodabox.com/565a545f5d61e93dd441e8ee1eea0a25 "githalytics.com")](http://githalytics.com/softwareradiosystems/iris_core)
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/softwareradiosystems/iris_core/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

iris/ControllerManager.h

@@ -16,12 +16,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 3 of
  * the License, or (at your option) any later version.
- * 
+ *
  * Iris is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
- * 
+ *
  * A copy of the GNU Lesser General Public License can be found in
  * the LICENSE file in the top-level directory of this distribution
  * and at http://www.gnu.org/licenses/.
@@ -162,6 +162,52 @@ class ControllerManager
    */
   std::string getParameterValue(std::string paramName, std::string componentName);
 
+  /** Get a components' parameter name
+   *
+   * @param componentName   The name of the component containing the parameter.
+   * @param paramIndex      The paramter index
+   * @return paramValue     The parameter value returned by reference
+   */
+  std::string getParameterName(std::string componentName, int paramIndex, std::string &paramValue);
+
+  /** Get the name of an engine
+   *
+   * @param componentName   The name of the component that resides in the engine
+   * @param engineIndex     The engine index
+   * @param compIndex       The component index
+   * @return engineName     The engine name
+   */
+  std::string getEngineName(std::string componentName, int *engineIndex, int *compIndex);
+
+  /** Get the number of engines in the current radio
+  *
+  * @return The number of engine
+  */
+  int getNrEngines();
+
+  /** Get the number of components in the current radio
+  *
+  * @return The number of components
+  */
+  int getNrComponents();
+
+  /** Get the engine name for a given index
+  *
+  * @param index  The index of the engine
+  * @return       The name of the the engine
+  */
+  std::string getEngineNameFromIndex(int index);
+
+  /** Get the component name for a given index
+  *
+  * @param index  The index of the component
+  * @return       The name of the the component
+  */
+  std::string getComponentName(int index);
+
+  /// returns the number of parameters in a given component
+  int getNrParameters(std::string componentName);
+
   /** Subscribe to an event (Called by controllers)
    *
    * @param eventName       The event name.

iris/ControllerManagerCallbackInterface.h

@@ -36,6 +36,7 @@
 
 #include "irisapi/ReconfigurationDescriptions.h"
 #include "irisapi/Command.h"
+#include "RadioRepresentation.h"
 
 namespace iris
 {
@@ -56,6 +57,20 @@ class ControllerManagerCallbackInterface{
   virtual void postCommand(Command command) = 0;
 
   virtual std::string getParameterValue(std::string paramName, std::string componentName) = 0;
+
+  virtual std::string getParameterName(std::string componentName, int paramIndex, std::string &paramValue) = 0;
+
+  virtual std::string getEngineName(std::string componentName, int *engineIndex, int *compIndex) = 0;
+
+  virtual int getNrEngines() = 0;
+
+  virtual int getNrComponents() = 0;
+
+  virtual std::string getEngineNameFromIndex(int index) = 0;
+
+  virtual std::string getComponentName(int index) = 0;
+
+  virtual int getNrParameters(std::string componentName) = 0;
 };
 
 } // namespace iris

iris/DataBuffer.h

@@ -143,7 +143,6 @@ class DataBuffer : public ReadBuffer<T>, public WriteBuffer<T>
     isWriteLocked_ = true;
     if(buffer_[writeIndex_].data.size() != size)
       buffer_[writeIndex_].data.resize(size);
-    buffer_[writeIndex_].timeStamp = 0;
     setPtr = &buffer_[writeIndex_];
   };
 

iris/EngineManager.h

@@ -98,6 +98,13 @@ class EngineManager:
   void reconfigureRadio(ReconfigSet reconfigs);
   void postCommand(Command command);
   std::string getParameterValue(std::string paramName, std::string componentName);
+  std::string getParameterName(std::string componentName, int paramIndex, std::string &paramValue);
+  std::string getEngineName(std::string componentName, int *engineIndex, int *compIndex);
+  int getNrEngines();
+  int getNrComponents();
+  std::string getEngineNameFromIndex(int index);
+  std::string getComponentName(int index);
+  int getNrParameters(std::string componentName);
   void activateEvent(Event &e);
 };
 

iris/Iris.h

@@ -16,12 +16,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 3 of
  * the License, or (at your option) any later version.
- * 
+ *
  * Iris is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
- * 
+ *
  * A copy of the GNU Lesser General Public License can be found in
  * the LICENSE file in the top-level directory of this distribution
  * and at http://www.gnu.org/licenses/.
@@ -63,6 +63,9 @@ IRIS_DLL bool IRISSetContRepository(std::string rep);
 /// Set the log level
 IRIS_DLL bool IRISSetLogLevel(std::string level);
 
+/// Set the logging file
+IRIS_DLL bool IRISSetLoggingFile(std::string file);
+
 /** Load the radio
 *
 *   \param  radioConfig   The radio configuration to load.

iris/RadioRepresentation.h

@@ -16,12 +16,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 3 of
  * the License, or (at your option) any later version.
- * 
+ *
  * Iris is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
- * 
+ *
  * A copy of the GNU Lesser General Public License can be found in
  * the LICENSE file in the top-level directory of this distribution
  * and at http://www.gnu.org/licenses/.
@@ -221,6 +221,20 @@ class RadioRepresentation
   static bool findComponent(std::string name, const RadioGraph& graph, Vertex& ver);
   /// Find an engine in an EngineGraph
   static bool findEngine(std::string name, const EngineGraph& graph, EngVertex& ver);
+  /// Get the engine name for a given component
+  std::string getEngineName(std::string componentName, int *engineIndex, int *compIndex);
+  /// Get the number of engines in the current radio
+  int getNrEngines();
+  /// Get the number of components in the current radio
+  int getNrComponents();
+  /// Get the engine name for a given index
+  std::string getEngineNameFromIndex(int index);
+  /// Get the component name for a given component index
+  std::string getComponentName(int index);
+  /// Get the number of parameters of a given component
+  int  getNrParameters(std::string componentName);
+  /// Get a components' parameter name
+  std::string getParameterName(std::string componentName, int paramIndex, std::string &paramValue);
 
 private:
   /// Reconfigure a parameter within the representation

iris/System.h

@@ -16,12 +16,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 3 of
  * the License, or (at your option) any later version.
- * 
+ *
  * Iris is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
- * 
+ *
  * A copy of the GNU Lesser General Public License can be found in
  * the LICENSE file in the top-level directory of this distribution
  * and at http://www.gnu.org/licenses/.
@@ -68,6 +68,9 @@ class System
   /// Set the log level
   void setLogLevel(std::string level);
 
+  /// Set the logging file
+  void setLoggingFile(std::string file);
+
   /// Load a radio given a configuration file name
   bool loadRadio(std::string radioConfig);
 

irisapi/Command.h

@@ -16,12 +16,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 3 of
  * the License, or (at your option) any later version.
- * 
+ *
  * Iris is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
- * 
+ *
  * A copy of the GNU Lesser General Public License can be found in
  * the LICENSE file in the top-level directory of this distribution
  * and at http://www.gnu.org/licenses/.
@@ -44,6 +44,7 @@ struct Command
 {
   std::vector<boost::any> data;   ///< Data passed with this command.
   int typeId;                     ///< Type of the data.
+  bool trapWait;                  ///< Whether to wait for someone being caught before releasing trap.
   std::string commandName;        ///< Name of this command.
   std::string componentName;      ///< Target component.
   std::string engineName;         ///< Target engine.

irisapi/CommandPrison.h

@@ -120,6 +120,7 @@ class CommandPrison
     boost::mutex::scoped_lock lock(mutex_);
     boost::shared_ptr< Cage > cage(new Cage);
     cages_.insert(CagePair(c,cage));
+    trapWaitCondition_.notify_all();
     return cage->trap(lock);
   }
 
@@ -129,15 +130,26 @@ class CommandPrison
    */
   void release(Command c)
   {
-    boost::mutex::scoped_lock lock(mutex_);
-    std::pair<CageMM::iterator, CageMM::iterator> found;
-    CageMM::iterator it;
-    found = cages_.equal_range(c.commandName);
-    for (it=found.first; it!=found.second; ++it)
-    {
-      it->second->release(c);
-    }
-    cages_.erase(found.first, found.second);
+      boost::mutex::scoped_lock lock(mutex_);
+      bool foundItem = false;
+      do
+      {
+          std::pair<CageMM::iterator, CageMM::iterator> found;
+          CageMM::iterator it;
+          found = cages_.equal_range(c.commandName);
+          for (it=found.first; it!=found.second; ++it)
+          {
+              it->second->release(c);
+              foundItem = true;
+          }
+          cages_.erase(found.first, found.second);
+          if (!c.trapWait)
+              break;
+
+          if (!foundItem && c.trapWait)
+              trapWaitCondition_.wait(lock);
+      }
+      while (!foundItem);
   }
 
   /// Get the number of threads currently held in this CommandPrison.
@@ -153,6 +165,7 @@ class CommandPrison
 
   mutable boost::mutex mutex_;  ///< Mutex protecting this CommandPrison.
   CageMM cages_;                ///< The cages within this CommandPrison.
+  boost::condition_variable trapWaitCondition_; ///< Wait condition variable for CommandPrision.
 
 };
 

irisapi/ComponentEvents.h

@@ -59,7 +59,7 @@ struct EventDescription
 
 /** An interface to the events of a component
  *
- * The ComponentEvents class permits components to register events of different types. 
+ * The ComponentEvents class permits components to register events of different types.
  * These events can then be triggered by the component together with relevent data.
  */
 class ComponentEvents : boost::noncopyable
@@ -113,22 +113,22 @@ inline void ComponentEvents::activateEventInternal(std::string compName, std::st
   std::map<std::string, EventDescription>::const_iterator it = events_.find(name);
   if (it == events_.end())
     throw EventNotFoundException("Event " + name + " not found");
-  
-  if(it->second.typeId == TypeInfo<T>::identifier)
-  {
-    //std::vector<boost::any> d;
-    //d.push_back(boost::any(data));
-    //d_engine->activateEvent(name, d);
-    Event e;
-    e.data.push_back(boost::any(data));
-    e.eventName = name;
-    e.componentName = compName;
-    e.typeId = TypeInfo<T>::identifier;
-    engine_->activateEvent(e);
-    return;
-  }else{
-    throw InvalidDataTypeException("Event data type did not match registered type for event " + name); 
-  }
+
+  /*
+   * FIXME:
+   * - disable typeId check to allow complex types beyond TypeInfo.h
+   * - type checking could be done using a boost::any_cast
+   */
+  //std::vector<boost::any> d;
+  //d.push_back(boost::any(data));
+  //d_engine->activateEvent(name, d);
+  Event e;
+  e.data.push_back(boost::any(data));
+  e.eventName = name;
+  e.componentName = compName;
+  e.typeId = TypeInfo<T>::identifier;
+  engine_->activateEvent(e);
+  return;
 }
 
 template<typename T>
@@ -145,23 +145,19 @@ inline void ComponentEvents::activateEventInternal(std::string compName, std::st
   if (it == events_.end())
     throw EventNotFoundException("Event " + name + " not found");
 
-  if(it->second.typeId == TypeInfo<T>::identifier)
-  {
-    //std::vector<boost::any> d;
-    //d.resize(data.size());
-    //std::copy(data.begin(), data.end(), d.begin());
-    //d_engine->activateEvent(name, d);
-    Event e;
-    e.data.resize(data.size());
-    std::copy(data.begin(), data.end(), e.data.begin());
-    e.eventName = name;
-    e.componentName = compName;
-    e.typeId = TypeInfo<T>::identifier;
-    engine_->activateEvent(e);
-    return;
-  }else{
-    throw InvalidDataTypeException("Event data type did not match registered type for event " + name); 
-  }
+  // disable type checking as well, see above for comments
+  //std::vector<boost::any> d;
+  //d.resize(data.size());
+  //std::copy(data.begin(), data.end(), d.begin());
+  //d_engine->activateEvent(name, d);
+  Event e;
+  e.data.resize(data.size());
+  std::copy(data.begin(), data.end(), e.data.begin());
+  e.eventName = name;
+  e.componentName = compName;
+  e.typeId = TypeInfo<T>::identifier;
+  engine_->activateEvent(e);
+  return;
 }
 
 } // namespace iris