X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Ftiming%2Fsg_time.cxx;h=e3b403a05486e2f68a945a5b285364fedd55acc2;hb=0b26c69222fdb27776767759e37fecc402c578ea;hp=698ae0080d085adb60e20a9102513b6840b987fc;hpb=d100ca485f8676ed5bf2ef46cfe08b19f0eb1da1;p=simgear.git diff --git a/simgear/timing/sg_time.cxx b/simgear/timing/sg_time.cxx index 698ae008..e3b403a0 100644 --- a/simgear/timing/sg_time.cxx +++ b/simgear/timing/sg_time.cxx @@ -2,7 +2,7 @@ // // Written by Curtis Olson, started August 1997. // -// Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com +// Copyright (C) 1997 Curtis L. Olson - http://www.flightgear.org/~curt // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -14,10 +14,9 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Library General Public License for more details. // -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the -// Free Software Foundation, Inc., 59 Temple Place - Suite 330, -// Boston, MA 02111-1307, USA. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // // $Id$ @@ -30,25 +29,22 @@ #include // for errno -#ifdef SG_HAVE_STD_INCLUDES -# include -# include -# include -#else -# include -# include -# include -#endif +#include +#include +#include +#include + +#include +#ifdef HAVE_SYS_TIME_H +# include // for get/setitimer, gettimeofday, struct timeval +#endif #ifdef HAVE_SYS_TIMEB_H # include // for ftime() and struct timeb #endif #ifdef HAVE_UNISTD_H # include // for gettimeofday() #endif -#ifdef HAVE_SYS_TIME_H -# include // for get/setitimer, gettimeofday, struct timeval -#endif #include // for NAN @@ -60,73 +56,71 @@ #include "timezone.h" #include "lowleveltime.h" - #define DEGHR(x) ((x)/15.) #define RADHR(x) DEGHR(x*SGD_RADIANS_TO_DEGREES) +using std::string; static const double MJD0 = 2415020.0; static const double J2000 = 2451545.0 - MJD0; static const double SIDRATE = 0.9972695677; +// tzContainer stores all the current Timezone control points/ +std::auto_ptr static_tzContainer; -SGTime::SGTime( double lon, double lat, const string& root ) +void SGTime::init( const SGGeod& location, const SGPath& root, time_t init_time ) { - SG_LOG( SG_EVENT, SG_INFO, "Initializing Time" ); - gst_diff = -9999.0; - cur_time = time(NULL); - cout << "Current greenwich mean time = " << asctime(gmtime(&cur_time)) - << endl; - cout << "Current local time = " - << asctime(localtime(&cur_time)) << endl; + if ( init_time ) { + cur_time = init_time; + } else { + cur_time = time(NULL); + } + + SG_LOG( SG_EVENT, SG_DEBUG, + "Current greenwich mean time = " << asctime(gmtime(&cur_time))); + SG_LOG( SG_EVENT, SG_DEBUG, + "Current local time = " << asctime(localtime(&cur_time))); - if ( root != (string)"" ) { - SGPath zone( root ); - zone.append( "zone.tab" ); - SG_LOG( SG_EVENT, SG_INFO, "Reading timezone info from: " - << zone.str() ); - tzContainer = new TimezoneContainer( zone.c_str() ); + if ( !root.isNull()) { + if (!static_tzContainer.get()) { + SGPath zone( root ); + zone.append( "zone.tab" ); + SG_LOG( SG_EVENT, SG_INFO, "Reading timezone info from: " + << zone.str() ); + static_tzContainer.reset(new SGTimeZoneContainer( zone.c_str() )); + } - GeoCoord location( SGD_RADIANS_TO_DEGREES * lat, SGD_RADIANS_TO_DEGREES * lon ); - GeoCoord* nearestTz = tzContainer->getNearest(location); + SGTimeZone* nearestTz = static_tzContainer->getNearest(location); SGPath name( root ); name.append( nearestTz->getDescription() ); - zonename = strdup( name.c_str() ); - SG_LOG( SG_EVENT, SG_INFO, "Using zonename = " << zonename ); + zonename = name.str(); + SG_LOG( SG_EVENT, SG_DEBUG, "Using zonename = " << zonename ); } else { - SG_LOG( SG_EVENT, SG_INFO, "*** NO TIME ZONE NAME ***" ); - tzContainer = NULL; - zonename = NULL; + zonename.erase(); } } +SGTime::SGTime( const SGGeod& location, const SGPath& root, + time_t init_time ) +{ + init(location, root, init_time); +} -SGTime::SGTime( const string& root ) { - SGTime( 0.0, 0.0, root ); +SGTime::SGTime( const SGPath& root ) { + init( SGGeod(), root, 0 ); } SGTime::SGTime() { - SGTime( 0.0, 0.0, "" ); + init( SGGeod(), SGPath(), 0 ); } SGTime::~SGTime() { - if ( tzContainer != NULL ) { - TimezoneContainer *tmp = tzContainer; - tzContainer = NULL; - delete tmp; - } - - if ( zonename != NULL ) { - char *tmp = zonename; - zonename = NULL; - delete tmp; - } } @@ -153,7 +147,7 @@ static double sidereal_precise( double mjd, double lng ) // return a courser but cheaper estimate of sidereal time -static double sidereal_course( time_t cur_time, struct tm *gmt, double lng ) +static double sidereal_course( time_t cur_time, const struct tm *gmt, double lng ) { time_t start_gmt, now; double diff, part, days, hours, lstTmp; @@ -190,28 +184,28 @@ static double sidereal_course( time_t cur_time, struct tm *gmt, double lng ) // Update the time related variables -void SGTime::update( double lon, double lat, long int warp ) { +void SGTime::update( const SGGeod& location, time_t ct, long int warp ) +{ double gst_precise, gst_course; -#if defined(_MSC_VER) || defined(__MINGW32__) + tm * gmt = &m_gmt; -#endif - SG_LOG( SG_EVENT, SG_DEBUG, "Updating time" ); // get current Unix calendar time (in seconds) // warp += warp_delta; - cur_time = time(NULL) + warp; + if ( ct ) { + cur_time = ct + warp; + } else { + cur_time = time(NULL) + warp; + } SG_LOG( SG_EVENT, SG_DEBUG, " Current Unix calendar time = " << cur_time << " warp = " << warp ); // get GMT break down for current time -#if defined(_MSC_VER) || defined(__MINGW32__) + memcpy( gmt, gmtime(&cur_time), sizeof(tm) ); -#else - gmt = gmtime(&cur_time); -#endif SG_LOG( SG_EVENT, SG_DEBUG, " Current GMT = " << gmt->tm_mon+1 << "/" << gmt->tm_mday << "/" << (1900 + gmt->tm_year) << " " @@ -219,7 +213,7 @@ void SGTime::update( double lon, double lat, long int warp ) { << gmt->tm_sec ); // calculate modified Julian date starting with current - mjd = sgTimeCurrentMJD( warp ); + mjd = sgTimeCurrentMJD( ct, warp ); // add in partial day mjd += (gmt->tm_hour / 24.0) + (gmt->tm_min / (24.0 * 60.0)) + @@ -235,66 +229,48 @@ void SGTime::update( double lon, double lat, long int warp ) { if ( gst_diff < -100.0 ) { // first time through do the expensive calculation & cheap // calculation to get the difference. - SG_LOG( SG_EVENT, SG_INFO, " First time, doing precise gst" ); + SG_LOG( SG_EVENT, SG_DEBUG, " First time, doing precise gst" ); gst_precise = gst = sidereal_precise( mjd, 0.00 ); gst_course = sidereal_course( cur_time, gmt, 0.00 ); gst_diff = gst_precise - gst_course; - lst = sidereal_course( cur_time, gmt, -(lon * SGD_RADIANS_TO_DEGREES) ) + gst_diff; + lst = sidereal_course( cur_time, gmt, + -location.getLongitudeDeg() ) + gst_diff; } else { // course + difference should drift off very slowly gst = sidereal_course( cur_time, gmt, 0.00 ) + gst_diff; - lst = sidereal_course( cur_time, gmt, -(lon * SGD_RADIANS_TO_DEGREES) ) + gst_diff; + lst = sidereal_course( cur_time, gmt, + -location.getLongitudeDeg() ) + gst_diff; } SG_LOG( SG_EVENT, SG_DEBUG, " Current lon=0.00 Sidereal Time = " << gst ); SG_LOG( SG_EVENT, SG_DEBUG, " Current LOCAL Sidereal Time = " << lst << " (" - << sidereal_precise( mjd, -(lon * SGD_RADIANS_TO_DEGREES) ) + << sidereal_precise( mjd, -location.getLongitudeDeg() ) << ") (diff = " << gst_diff << ")" ); } // Given lon/lat, update timezone information and local_offset -void SGTime::updateLocal( double lon, double lat, const string& root ) { - // sanity checking - if ( lon < -SGD_PI || lon > SGD_PI ) { - // not within -180 ... 180 - lon = 0.0; - } - if ( lat < -SGD_PI * 0.5 || lat > SGD_PI * 0.5 ) { - // not within -90 ... 90 - lat = 0.0; - } - if ( lon != lon ) { - // only true if lon == nan - SG_LOG( SG_EVENT, SG_ALERT, " Detected lon == nan, resetting to 0.0" ); - lon = 0.0; - } - if ( lat != lat ) { - // only true if lat == nan - SG_LOG( SG_EVENT, SG_ALERT, " Detected lat == nan, resetting to 0.0" ); - lat = 0.0; +void SGTime::updateLocal( const SGGeod& aLocation, const string& root ) { + SGGeod location(aLocation); + if (!aLocation.isValid()) { + location = SGGeod(); } + time_t currGMT; time_t aircraftLocalTime; - GeoCoord location( SGD_RADIANS_TO_DEGREES * lat, SGD_RADIANS_TO_DEGREES * lon ); - GeoCoord* nearestTz = tzContainer->getNearest(location); + SGTimeZone* nearestTz = static_tzContainer->getNearest(location); SGPath zone( root ); zone.append ( nearestTz->getDescription() ); - if ( zonename ) { - char *ptr = zonename; - zonename = NULL; - delete ptr; - } - zonename = strdup( zone.c_str() ); + zonename = zone.str(); //Avoid troubles when zone.tab hasn't got the right line endings - if (zonename[strlen(zonename)-1] == '\r') + if (zonename[zonename.size()-1] == '\r') { - zonename[strlen(zonename)-1]=0; + zonename[zonename.size()-1]=0; zone.set( zonename ); } @@ -359,31 +335,25 @@ double sgTimeCalcMJD(int mn, double dy, int yr) { // return the current modified Julian date (number of days elapsed // since 1900 jan 0.5), mjd. -double sgTimeCurrentMJD( long int warp ) { +double sgTimeCurrentMJD( time_t ct, long int warp ) { -#if defined(_MSC_VER) || defined(__MINGW32__) struct tm m_gmt; // copy of system gmtime(&time_t) structure -#else - struct tm *gmt; -#endif - -#if defined(_MSC_VER) || defined(__MINGW32__) - tm * gmt = &m_gmt; -#endif + struct tm *gmt = &m_gmt; // get current Unix calendar time (in seconds) // warp += warp_delta; - time_t cur_time = time(NULL) + warp; + time_t cur_time; + if ( ct ) { + cur_time = ct + warp; + } else { + cur_time = time(NULL) + warp; + } SG_LOG( SG_EVENT, SG_DEBUG, " Current Unix calendar time = " << cur_time << " warp = " << warp ); // get GMT break down for current time -#if defined(_MSC_VER) || defined(__MINGW32__) memcpy( gmt, gmtime(&cur_time), sizeof(tm) ); -#else - gmt = gmtime(&cur_time); -#endif SG_LOG( SG_EVENT, SG_DEBUG, " Current GMT = " << gmt->tm_mon+1 << "/" << gmt->tm_mday << "/" << (1900 + gmt->tm_year) << " " @@ -515,7 +485,7 @@ time_t sgTimeGetGMT(int year, int month, int day, int hour, int min, int sec) #else // ! defined ( MK_TIME_IS_GMT ) // timezone seems to work as a proper offset for Linux & Solaris -# if defined( __linux__ ) || defined( __sun__ ) ||defined(__CYGWIN__) +# if defined( __linux__ ) || defined(__sun) ||defined(__CYGWIN__) # define TIMEZONE_OFFSET_WORKS 1 # endif @@ -545,7 +515,7 @@ time_t sgTimeGetGMT(int year, int month, int day, int hour, int min, int sec) if ( daylight > 0 ) { daylight = 1; } else if ( daylight < 0 ) { - SG_LOG( SG_EVENT, FG_WARN, + SG_LOG( SG_EVENT, SG_WARN, "OOOPS, problem in sg_time.cxx, no daylight savings info." ); }