X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Ftiming%2Fsg_time.cxx;h=6c97e62a6abe1f5179b672bf8a12c76c34f32632;hb=b5d6aa3fe4c44ecbee7f6a0b679247514fc622be;hp=d2823b7794a9738efe26349a900fc11d154dc2e7;hpb=d0d7878e0a4cc7871276db37517faf0c61693740;p=simgear.git diff --git a/simgear/timing/sg_time.cxx b/simgear/timing/sg_time.cxx index d2823b77..6c97e62a 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,15 +29,12 @@ #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 @@ -60,21 +56,20 @@ #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; -void SGTime::init( double lon, double lat, - const string& root, time_t init_time ) +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; if ( init_time ) { @@ -83,61 +78,49 @@ void SGTime::init( double lon, double lat, cur_time = time(NULL); } - cout << "Current greenwich mean time = " << asctime(gmtime(&cur_time)) - << endl; - cout << "Current local time = " - << asctime(localtime(&cur_time)) << endl; + 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( double lon, double lat, const string& root, time_t init_time ) +SGTime::SGTime( const SGGeod& location, const SGPath& root, + time_t init_time ) { - init( lon, lat, root, init_time ); + init(location, root, init_time); } - -SGTime::SGTime( const string& root ) { - init( 0.0, 0.0, root, 0 ); +SGTime::SGTime( const SGPath& root ) { + init( SGGeod(), root, 0 ); } SGTime::SGTime() { - init( 0.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; - free(tmp); - } } @@ -168,20 +151,12 @@ 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; - char tbuf[64]; now = cur_time; start_gmt = sgTimeGetGMT(gmt->tm_year, 2, 21, 12, 0, 0); - SG_LOG( SG_EVENT, SG_DEBUG, " COURSE: GMT = " - << sgTimeFormatTime(gmt, tbuf) ); - SG_LOG( SG_EVENT, SG_DEBUG, " March 21 noon (GMT) = " << start_gmt ); - diff = (now - start_gmt) / (3600.0 * 24.0); - SG_LOG( SG_EVENT, SG_DEBUG, - " Time since 3/21/" << gmt->tm_year << " GMT = " << diff ); - part = fmod(diff, 1.0); days = diff - part; hours = gmt->tm_hour + gmt->tm_min/60.0 + gmt->tm_sec/3600.0; @@ -191,24 +166,18 @@ static double sidereal_course( time_t cur_time, const struct tm *gmt, double lng while ( lstTmp < 0.0 ) { lstTmp += 24.0; } - - SG_LOG( SG_EVENT, SG_DEBUG, - " days = " << days << " hours = " << hours << " lon = " - << lng << " lst = " << lstTmp ); - + return lstTmp; } - // Update the time related variables -void SGTime::update( double lon, double lat, time_t ct, 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; @@ -217,22 +186,10 @@ void SGTime::update( double lon, double lat, time_t ct, long int 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) << " " - << gmt->tm_hour << ":" << gmt->tm_min << ":" - << gmt->tm_sec ); + memcpy( gmt, gmtime(&cur_time), sizeof(tm) ); // calculate modified Julian date starting with current mjd = sgTimeCurrentMJD( ct, warp ); @@ -242,7 +199,6 @@ void SGTime::update( double lon, double lat, time_t ct, long int warp ) { // convert "back" to Julian date + partial day (as a fraction of one) jd = mjd + MJD0; - SG_LOG( SG_EVENT, SG_DEBUG, " Current Julian Date = " << jd ); // printf(" Current Longitude = %.3f\n", FG_Longitude * SGD_RADIANS_TO_DEGREES); @@ -250,66 +206,41 @@ void SGTime::update( double lon, double lat, time_t ct, 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) ) - << ") (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; - free(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 ); } @@ -376,12 +307,8 @@ double sgTimeCalcMJD(int mn, double dy, int yr) { // since 1900 jan 0.5), mjd. 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 struct tm *gmt = &m_gmt; -#else - struct tm *gmt; -#endif // get current Unix calendar time (in seconds) // warp += warp_delta; @@ -391,21 +318,9 @@ double sgTimeCurrentMJD( time_t ct, long int 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) << " " - << gmt->tm_hour << ":" << gmt->tm_min << ":" - << gmt->tm_sec ); // calculate modified Julian date // t->mjd = cal_mjd ((int)(t->gmt->tm_mon+1), (double)t->gmt->tm_mday, @@ -430,8 +345,6 @@ double sgTimeCalcGST( double mjd ) { x /= 3600.0; gst = (1.0/SIDRATE)*hr + x; - SG_LOG( SG_EVENT, SG_DEBUG, " gst => " << gst ); - return gst; } @@ -532,7 +445,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 @@ -562,7 +475,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." ); }