* Updated network_profiler.cpp and re-enabled the test

* Added test_reasoning_throughput and network_profiler to Travis CI
* Updated ASIO transports to allow for blasting experiments
* Removed network_throughput.cpp as it would have been redundant at the moment

.travis.yml

@@ -148,7 +148,16 @@ script:
   - echo $GAMS_ROOT/scripts/$OS/base_build.sh prereqs $CLANG madara tests $SSL $JAVA $ZMQ $SIMTIME
   - $GAMS_ROOT/scripts/$OS/base_build.sh prereqs $CLANG madara tests $SSL $JAVA $ZMQ $SIMTIME
   # now run a couple of tests
+  - echo "Testing basic functionality..."
   - $MADARA_ROOT/bin/test_basic_reasoning
   - $MADARA_ROOT/bin/test_karl_exceptions
+  # performance test (useful to see if we've regressed in performance)
+  - echo "Testing reasoning throughput..."
+  - $MADARA_ROOT/bin/test_reasoning_throughput
+  # test UDP Multicast networking performance and connectivity for 60s
+  - echo "Testing multicast performance..."
+  - $MADARA_ROOT/bin/network_profiler -i 0 -s 1024 & $MADARA_ROOT/bin/network_profiler -i 0
+  # test UDP Unicast networking performance and connectivity for 60s
+  - $MADARA_ROOT/bin/network_profiler -i 0 -s 1024 -u 127.0.0.1:30000 -u 127.0.0.1:30001 & $MADARA_ROOT/bin/network_profiler -i 0 -u 127.0.0.1:30001
 
 

Tests.mpc

@@ -454,23 +454,6 @@ project (Network_Counter_Filter) : using_madara, no_karl, no_xml, null_lock, usi
   }
 }
 
-project (Network_Throughput) : using_madara, no_karl, no_xml, null_lock, using_simtime {
-  exeout = $(MADARA_ROOT)/bin
-  exename = network_throughput
-
-  requires += tests
-
-  Documentation_Files {
-  }
-
-  Header_Files {
-  }
-
-  Source_Files {
-    tests/transports/network_throughput.cpp
-  }
-}
-
 project (Network_Profiler) : using_madara, no_karl, no_xml, null_lock, using_simtime {
   exeout = $(MADARA_ROOT)/bin
   exename = network_profiler

include/madara/transport/BasicASIOTransport.cpp

@@ -15,7 +15,7 @@ namespace madara { namespace transport {
 
 namespace mcast = ip::multicast;
 
-const double BasicASIOTransport::default_read_hertz = 10.0;
+//const double BasicASIOTransport::default_read_hertz = 10.0;
 
 BasicASIOTransport::BasicASIOTransport (const std::string & id,
         knowledge::ThreadSafeContext & context,
@@ -222,9 +222,11 @@ BasicASIOTransport::setup_read_threads ()
   if (!settings_.no_receiving)
   {
     double hertz = settings_.read_thread_hertz;
-    if (hertz <= 0.0)
+    if (hertz < 0.0)
     {
-      hertz = default_read_hertz;
+      // we need to maintain backwards compatibility
+      // people should be capable of bursting reads especially
+      hertz = 0.0;
     }
 
     madara_logger_log (context_.get_logger (), logger::LOG_MAJOR,

include/madara/transport/TransportSettings.cpp

@@ -7,6 +7,54 @@
 namespace containers = madara::knowledge::containers;
 typedef madara::knowledge::KnowledgeRecord::Integer  Integer;
 
+std::string
+madara::transport::types_to_string (int id)
+{
+  if (NO_TRANSPORT == id)
+  {
+    return "None";
+  }
+  if (SPLICE == id)
+  {
+    return "Splice DDS";
+  }
+  if (NDDS == id)
+  {
+    return "RTI DDS";
+  }
+  if (UDP == id)
+  {
+    return "UDP";
+  }
+  if (TCP == id)
+  {
+    return "TCP (unsupported)";
+  }
+  if (MULTICAST == id)
+  {
+    return "UDP Multicast";
+  }
+  if (BROADCAST == id)
+  {
+    return "UDP Broadcast";
+  }
+  if (REGISTRY_SERVER == id)
+  {
+    return "UDP Registry Server";
+  }
+  if (REGISTRY_CLIENT == id)
+  {
+    return "UDP Registry Client";
+  }
+  if (ZMQ == id)
+  {
+    return "0MQ";
+  }
+
+  // otherwise, it's a custom transport
+  return "Custom";
+}
+
 madara::transport::TransportSettings::TransportSettings () : 
   write_domain (DEFAULT_DOMAIN), 
   read_threads (1),

include/madara/transport/TransportSettings.h

@@ -63,6 +63,13 @@ namespace madara
       VOTE = 20
     };
 
+    /**
+     * Converts a transport type enum to a string equivalent
+     * @param id  the id of the type to retrieve
+     * @return  the name of the registered transport
+     **/
+    MADARA_EXPORT std::string types_to_string (int id);
+
     /**
      * Holds basic transport settings
      */