FGIO uses new SGSubsystem shutdown() logic

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 36ca64433d3f6dc923acdfcdaa59374ea88856d7..dda35d069d4d0ce44bdb5109ea9778b722f87cdb 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,
@@ -315,9 +314,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 );
@@ -339,7 +337,6 @@ FGIO::reinit()
 {
 }
 
-
 // process any IO channel work
 void
 FGIO::update( double delta_time_sec )
@@ -347,9 +344,8 @@ FGIO::update( double delta_time_sec )
     // cout << "processing I/O channels" << endl;
     // cout << "  Elapsed time = " << delta_time_sec << 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 ) {
        FGProtocol* p = *i;
 
@@ -369,24 +365,24 @@ FGIO::update( double delta_time_sec )
     }
 }
 
-
 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

diff --git a/src/Main/fg_io.hxx b/src/Main/fg_io.hxx
index c4eff1b8b95850ffdd0ce10f73461dca7ca4ea47..5637c5df56d0318404ae831eac17c97f1878147a 100644 (file)
--- a/src/Main/fg_io.hxx
+++ b/src/Main/fg_io.hxx
@@ -45,7 +45,7 @@ public:
     void unbind();
     void update( double dt );
 
-    void shutdown_all();
+    void shutdown();
 
 private:
 
@@ -55,7 +55,9 @@ private:
 
     // define the global I/O channel list
     //io_container global_io_list;
-    std::vector< FGProtocol* > io_channels;
+    
+    typedef std::vector< FGProtocol* > ProtocolVec;
+    ProtocolVec io_channels;
 };
 
 

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index c28c9f5d2f647818ad643dfcd2de1fc69b250c9d..29b791fe53d72ad50e28c8c77c12ff7da7c5a376 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -172,6 +172,7 @@ FGGlobals::~FGGlobals()
         delete ai;
     }
     
+    subsystem_mgr->shutdown();
     subsystem_mgr->unbind();
     delete subsystem_mgr;