X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Ffg_io.cxx;h=2e06e16b9f23583f1983cfe98c5ee8619375b7e8;hb=dddc4d4b16912622ce41a9d54640fa196feab722;hp=498bdf3f0068e3191879b390ea1b43accdcc967f;hpb=a691a3a3f6b3765fe967b9a730c3ea1e7cf20de0;p=flightgear.git diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx index 498bdf3f0..2e06e16b9 100644 --- a/src/Main/fg_io.cxx +++ b/src/Main/fg_io.cxx @@ -32,183 +32,210 @@ #include #include #include +#include #include #include +#include #include +#include #include #include #include +#ifdef FG_JPEG_SERVER +# include +#endif #include +#include #include #include #include +#include +#include #include #include #include #include #include +#include + +#ifdef FG_MPLAYER_AS +#include +#endif #include "globals.hxx" +#include "fg_io.hxx" SG_USING_STD(string); -// define the global I/O channel list -io_container global_io_list; +FGIO::FGIO() +{ +} +#include STL_ALGORITHM +SG_USING_STD(for_each); -// configure a port based on the config string -static FGProtocol *parse_port_config( const string& config ) -{ - bool short_circuit = false; +static void delete_ptr( FGProtocol* p ) { delete p; } - string::size_type begin, end; +FGIO::~FGIO() +{ + shutdown_all(); + for_each( io_channels.begin(), io_channels.end(), delete_ptr ); +} - begin = 0; +// configure a port based on the config string +FGProtocol* +FGIO::parse_port_config( const string& config ) +{ SG_LOG( SG_IO, SG_INFO, "Parse I/O channel request: " << config ); - // determine protocol - end = config.find(",", begin); - if ( end == string::npos ) { - return NULL; // dummy + vector tokens = simgear::strutils::split( config, "," ); + if (tokens.empty()) + { + SG_LOG( SG_IO, SG_ALERT, + "Port configuration error: empty config string" ); + return 0; } - - string protocol = config.substr(begin, end - begin); - begin = end + 1; + + string protocol = tokens[0]; SG_LOG( SG_IO, SG_INFO, " protocol = " << protocol ); - FGProtocol *io; - if ( protocol == "atlas" ) { - FGAtlas *atlas = new FGAtlas; - io = atlas; - } else if ( protocol == "garmin" ) { - FGGarmin *garmin = new FGGarmin; - io = garmin; - } else if ( protocol == "httpd" ) { - // determine port - string port = config.substr(begin); - FGHttpd *httpd = new FGHttpd( atoi(port.c_str()) ); - io = httpd; - short_circuit = true; - } else if ( protocol == "joyclient" ) { - FGJoyClient *joyclient = new FGJoyClient; - io = joyclient; - } else if ( protocol == "native" ) { - FGNative *native = new FGNative; - io = native; - } else if ( protocol == "native_ctrls" ) { - FGNativeCtrls *native_ctrls = new FGNativeCtrls; - io = native_ctrls; - } else if ( protocol == "native_fdm" ) { - FGNativeFDM *native_fdm = new FGNativeFDM; - io = native_fdm; - } else if ( protocol == "nmea" ) { - FGNMEA *nmea = new FGNMEA; - io = nmea; - } else if ( protocol == "props" ) { - FGProps *props = new FGProps; - io = props; - } else if ( protocol == "pve" ) { - FGPVE *pve = new FGPVE; - io = pve; - } else if ( protocol == "ray" ) { - FGRAY *ray = new FGRAY; - io = ray; - } else if ( protocol == "rul" ) { - FGRUL *rul = new FGRUL; - io = rul; - } else { - return NULL; + FGProtocol *io = 0; + + try + { + if ( protocol == "atc610x" ) { + FGATC610x *atc610x = new FGATC610x; + atc610x->set_hz( 30 ); + if ( tokens.size() > 1 ) { + if ( tokens[1] == "no-rudder" ) { + atc610x->set_use_rudder( false ); + } + } + return atc610x; + } else if ( protocol == "atlas" ) { + FGAtlas *atlas = new FGAtlas; + io = atlas; + } else if ( protocol == "opengc" ) { + // char wait; + // printf("Parsed opengc\n"); cin >> wait; + FGOpenGC *opengc = new FGOpenGC; + io = opengc; + } else if ( protocol == "garmin" ) { + FGGarmin *garmin = new FGGarmin; + io = garmin; + } else if ( protocol == "httpd" ) { + // determine port + string port = tokens[1]; + return new FGHttpd( atoi(port.c_str()) ); +#ifdef FG_JPEG_SERVER + } else if ( protocol == "jpg-httpd" ) { + // determine port + string port = tokens[1]; + return new FGJpegHttpd( atoi(port.c_str()) ); +#endif + } else if ( protocol == "joyclient" ) { + FGJoyClient *joyclient = new FGJoyClient; + io = joyclient; + } else if ( protocol == "jsclient" ) { + FGJsClient *jsclient = new FGJsClient; + io = jsclient; + } else if ( protocol == "native" ) { + FGNative *native = new FGNative; + io = native; + } else if ( protocol == "native-ctrls" ) { + FGNativeCtrls *native_ctrls = new FGNativeCtrls; + io = native_ctrls; + } else if ( protocol == "native-fdm" ) { + FGNativeFDM *native_fdm = new FGNativeFDM; + io = native_fdm; + } else if ( protocol == "native-gui" ) { + FGNativeGUI *net_gui = new FGNativeGUI; + io = net_gui; + } else if ( protocol == "nmea" ) { + FGNMEA *nmea = new FGNMEA; + io = nmea; + } else if ( protocol == "props" || protocol == "telnet" ) { + io = new FGProps( tokens ); + return io; + } else if ( protocol == "pve" ) { + FGPVE *pve = new FGPVE; + io = pve; + } else if ( protocol == "ray" ) { + FGRAY *ray = new FGRAY; + io = ray; + } else if ( protocol == "rul" ) { + FGRUL *rul = new FGRUL; + io = rul; + } else if ( protocol == "generic" ) { + int n = 6; + if (tokens[1] == "socket") n++; + FGGeneric *generic = new FGGeneric( tokens[n] ); + io = generic; + +#ifdef FG_MPLAYER_AS + } else if ( protocol == "multiplay" ) {\ + //Determine dir, rate, host & port + string dir = tokens[1]; + string rate = tokens[2]; + string host = tokens[3]; + string port = tokens[4]; + return new FGMultiplay(dir, atoi(rate.c_str()), host, atoi(port.c_str())); +#endif + + } else { + return NULL; + } + } + catch (FGProtocolConfigError& err) + { + SG_LOG( SG_IO, SG_ALERT, "Port configuration error: " << err.what() ); + delete io; + return 0; } - if ( ! short_circuit ) { - // determine medium - end = config.find(",", begin); - if ( end == string::npos ) { - return NULL; // dummy - } - - string medium = config.substr(begin, end - begin); - begin = end + 1; - SG_LOG( SG_IO, SG_INFO, " medium = " << medium ); - - // determine direction - end = config.find(",", begin); - if ( end == string::npos ) { - return NULL; // dummy - } - - string direction = config.substr(begin, end - begin); - begin = end + 1; - io->set_direction( direction ); - SG_LOG( SG_IO, SG_INFO, " direction = " << direction ); - - // determine hertz - end = config.find(",", begin); - if ( end == string::npos ) { - return NULL; // dummy - } - - string hertz_str = config.substr(begin, end - begin); - begin = end + 1; - double hertz = atof( hertz_str.c_str() ); - io->set_hz( hertz ); - SG_LOG( SG_IO, SG_INFO, " hertz = " << hertz ); - - if ( medium == "serial" ) { - // device name - end = config.find(",", begin); - if ( end == string::npos ) { - return NULL; - } - - string device = config.substr(begin, end - begin); - begin = end + 1; - SG_LOG( SG_IO, SG_INFO, " device = " << device ); - - // baud - string baud = config.substr(begin); - SG_LOG( SG_IO, SG_INFO, " baud = " << baud ); - - SGSerial *ch = new SGSerial( device, baud ); - io->set_io_channel( ch ); - } else if ( medium == "file" ) { - // file name - string file = config.substr(begin); - SG_LOG( SG_IO, SG_INFO, " file name = " << file ); - - SGFile *ch = new SGFile( file ); - io->set_io_channel( ch ); - } else if ( medium == "socket" ) { - // hostname - end = config.find(",", begin); - if ( end == string::npos ) { - return NULL; - } - - string hostname = config.substr(begin, end - begin); - begin = end + 1; - SG_LOG( SG_IO, SG_INFO, " hostname = " << hostname ); - - // port string - end = config.find(",", begin); - if ( end == string::npos ) { - return NULL; - } - - string port = config.substr(begin, end - begin); - begin = end + 1; - SG_LOG( SG_IO, SG_INFO, " port string = " << port ); - - // socket style - string style_str = config.substr(begin); - SG_LOG( SG_IO, SG_INFO, " style string = " << style_str ); - - SGSocket *ch = new SGSocket( hostname, port, style_str ); - io->set_io_channel( ch ); - } + string medium = tokens[1]; + SG_LOG( SG_IO, SG_INFO, " medium = " << medium ); + + string direction = tokens[2]; + io->set_direction( direction ); + SG_LOG( SG_IO, SG_INFO, " direction = " << direction ); + + string hertz_str = tokens[3]; + double hertz = atof( hertz_str.c_str() ); + io->set_hz( hertz ); + SG_LOG( SG_IO, SG_INFO, " hertz = " << hertz ); + + if ( medium == "serial" ) { + // device name + string device = tokens[4]; + SG_LOG( SG_IO, SG_INFO, " device = " << device ); + + // baud + string baud = tokens[5]; + SG_LOG( SG_IO, SG_INFO, " baud = " << baud ); + + SGSerial *ch = new SGSerial( device, baud ); + io->set_io_channel( ch ); + } else if ( medium == "file" ) { + // file name + string file = tokens[4]; + SG_LOG( SG_IO, SG_INFO, " file name = " << file ); + + SGFile *ch = new SGFile( file ); + io->set_io_channel( ch ); + } else if ( medium == "socket" ) { + string hostname = tokens[4]; + string port = tokens[5]; + string style = tokens[6]; + + SG_LOG( SG_IO, SG_INFO, " hostname = " << hostname ); + SG_LOG( SG_IO, SG_INFO, " port = " << port ); + SG_LOG( SG_IO, SG_INFO, " style = " << style ); + + io->set_io_channel( new SGSocket( hostname, port, style ) ); } return io; @@ -217,12 +244,13 @@ static FGProtocol *parse_port_config( const string& config ) // step through the port config streams (from fgOPTIONS) and setup // serial port channels for each -void fgIOInit() { - // SG_LOG( SG_IO, SG_INFO, "I/O Channel initialization, " << +void +FGIO::init() +{ + // SG_LOG( SG_IO, SG_INFO, "I/O Channel initialization, " << // globals->get_channel_options_list()->size() << " requests." ); FGProtocol *p; - string_list *channel_options_list = globals->get_channel_options_list(); // we could almost do this in a single step except pushing a valid // port onto the port list copies the structure and destroys the @@ -230,11 +258,15 @@ void fgIOInit() { // parse the configuration strings and store the results in the // appropriate FGIOChannel structures - for ( int i = 0; i < (int)channel_options_list->size(); ++i ) { - p = parse_port_config( (*channel_options_list)[i] ); + typedef vector container; + container::iterator i = globals->get_channel_options_list()->begin(); + container::iterator end = globals->get_channel_options_list()->end(); + for (; i != end; ++i ) + { + p = parse_port_config( *i ); if ( p != NULL ) { p->open(); - global_io_list.push_back( p ); + io_channels.push_back( p ); if ( !p->is_enabled() ) { SG_LOG( SG_IO, SG_ALERT, "I/O Channel config failed." ); exit(-1); @@ -246,54 +278,62 @@ void fgIOInit() { } -// process any serial port work -void fgIOProcess() { - FGProtocol *p; - +// process any IO channel work +void +FGIO::update( double delta_time_sec ) +{ // cout << "processing I/O channels" << endl; + // cout << " Elapsed time = " << delta_time_sec << endl; - static int inited = 0; - int interval; - static SGTimeStamp last; - SGTimeStamp current; - - if ( ! inited ) { - inited = 1; - last.stamp(); - interval = 0; - } else { - current.stamp(); - interval = current - last; - last = current; - } - - for ( int i = 0; i < (int)global_io_list.size(); ++i ) { - // cout << " channel = " << i << endl; - p = global_io_list[i]; + typedef vector< FGProtocol* > container; + container::iterator i = io_channels.begin(); + container::iterator end = io_channels.end(); + for (; i != end; ++i ) { + FGProtocol* p = *i; if ( p->is_enabled() ) { - p->dec_count_down( interval ); - while ( p->get_count_down() < 0 ) { - p->process(); - p->dec_count_down( -1000000.0 / p->get_hz() ); + 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 ); + } + // double ave = elapsed_time / p->get_count(); + // cout << " ave rate = " << ave << endl; } } } } -// shutdown all I/O connections -void fgIOShutdownAll() { +void +FGIO::shutdown_all() { FGProtocol *p; // cout << "processing I/O channels" << endl; - for ( int i = 0; i < (int)global_io_list.size(); ++i ) { - // cout << " channel = " << i << endl; - p = global_io_list[i]; + typedef vector< FGProtocol* > container; + container::iterator i = io_channels.begin(); + container::iterator end = io_channels.end(); + for (; i != end; ++i ) + { + p = *i; if ( p->is_enabled() ) { p->close(); } } } + +void +FGIO::bind() +{ +} + +void +FGIO::unbind() +{ +} +