Merge branch 'next' of git://gitorious.org/fg/flightgear into next

[flightgear.git] / src / Main / fg_io.cxx

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index a2260731e468ea44d712daa5a1a524a04dcaeaa4..75ec5c97830f8b3ac125267d7ed5477087dd3b6b 100644 (file)
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -29,6 +29,7 @@
 #include <cstdlib>             // atoi()
 
 #include <string>
+#include <algorithm>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
@@ -76,15 +77,13 @@ FGIO::FGIO()
 {
 }
 
-#include <algorithm>
-using std::for_each;
 
-static void delete_ptr( FGProtocol* p ) { delete p; }
+
+
 
 FGIO::~FGIO()
 {
-    shutdown_all();
-    for_each( io_channels.begin(), io_channels.end(), delete_ptr );
+    
 }
 
 
@@ -94,7 +93,7 @@ FGIO::parse_port_config( const string& config )
 {
     SG_LOG( SG_IO, SG_INFO, "Parse I/O channel request: " << config );
 
-    vector<string> tokens = simgear::strutils::split( config, "," );
+    string_list tokens = simgear::strutils::split( config, "," );
     if (tokens.empty())
     {
        SG_LOG( SG_IO, SG_ALERT,
@@ -187,14 +186,21 @@ FGIO::parse_port_config( const string& config )
            FGRUL *rul = new FGRUL;
            io = rul;
         } else if ( protocol == "generic" ) {
-            int configToken;
-            if (tokens[1] == "socket")
+            size_t configToken;
+            if (tokens[1] == "socket") {
                 configToken = 7;
-            else if (tokens[1] == "file")
+            } else if (tokens[1] == "file") {
                 configToken = 5;
-            else
+            } else {
                 configToken = 6;
-            FGGeneric *generic = new FGGeneric( tokens[configToken] );
+            }
+
+            if (configToken >= tokens.size()) {
+                SG_LOG( SG_IO, SG_ALERT, "Not enough tokens passed for the generic protocol.");
+                return NULL;
+            }
+
+            FGGeneric *generic = new FGGeneric( tokens );
             io = generic;
        } else if ( protocol == "multiplay" ) {
            if ( tokens.size() != 5 ) {
@@ -300,6 +306,8 @@ FGIO::init()
     // SG_LOG( SG_IO, SG_INFO, "I/O Channel initialization, " <<
     //         globals->get_channel_options_list()->size() << " requests." );
 
+    _realDeltaTime = fgGetNode("/sim/time/delta-realtime-sec");
+    
     FGProtocol *p;
 
     // we could almost do this in a single step except pushing a valid
@@ -308,9 +316,8 @@ FGIO::init()
 
     // parse the configuration strings and store the results in the
     // appropriate FGIOChannel structures
-    typedef vector<string> container;
-    container::iterator i = globals->get_channel_options_list()->begin();
-    container::iterator end = globals->get_channel_options_list()->end();
+    string_list::iterator i = globals->get_channel_options_list()->begin();
+    string_list::iterator end = globals->get_channel_options_list()->end();
     for (; i != end; ++i )
     {
        p = parse_port_config( *i );
@@ -327,54 +334,58 @@ FGIO::init()
     }
 }
 
+void
+FGIO::reinit()
+{
+}
 
 // process any IO channel work
 void
-FGIO::update( double delta_time_sec )
+FGIO::update( double /* delta_time_sec */ )
 {
-    // cout << "processing I/O channels" << endl;
-    // cout << "  Elapsed time = " << delta_time_sec << endl;
+  // use wall-clock, not simulation, delta time, so that network
+  // protocols update when the simulation is paused
+  // see http://code.google.com/p/flightgear-bugs/issues/detail?id=125
+    double delta_time_sec = _realDeltaTime->getDoubleValue();
 
-    typedef vector< FGProtocol* > container;
-    container::iterator i = io_channels.begin();
-    container::iterator end = io_channels.end();
+    ProtocolVec::iterator i = io_channels.begin();
+    ProtocolVec::iterator end = io_channels.end();
     for (; i != end; ++i ) {
-       FGProtocol* p = *i;
-
-       if ( p->is_enabled() ) {
+      FGProtocol* p = *i;
+      if (!p->is_enabled()) {
+        continue;
+      }
+      
            p->dec_count_down( delta_time_sec );
            double dt = 1 / p->get_hz();
            if ( p->get_count_down() < 0.33 * dt ) {
              p->process();
              p->inc_count();
              while ( p->get_count_down() < 0.33 * dt ) {
-               p->inc_count_down( dt );
+          p->inc_count_down( dt );
              }
-             // double ave = elapsed_time / p->get_count();
-             // cout << "  ave rate = " << ave << endl;
-           }
-       }
-    }
+           } // of channel processing
+    } // of io_channels iteration
 }
 
-
 void
-FGIO::shutdown_all() {
+FGIO::shutdown()
+{
     FGProtocol *p;
 
-    // cout << "shutting down all I/O channels" << endl;
-
-    typedef vector< FGProtocol* > container;
-    container::iterator i = io_channels.begin();
-    container::iterator end = io_channels.end();
+    ProtocolVec::iterator i = io_channels.begin();
+    ProtocolVec::iterator end = io_channels.end();
     for (; i != end; ++i )
     {
-       p = *i;
-
-       if ( p->is_enabled() ) {
-           p->close();
-       }
+      p = *i;
+      if ( p->is_enabled() ) {
+          p->close();
+      }
+      
+      delete p;
     }
+
+  io_channels.clear();
 }
 
 void