@ -75,7 +75,7 @@ hsBool plUnifiedTime::SetFromWinFileTime(const FILETIME ft)
if ( ffsecs > = MAGICWINDOWSOFFSET ) // make sure we won't end up negatice
if ( ffsecs > = MAGICWINDOWSOFFSET ) // make sure we won't end up negatice
{ {
fSecs = ( UInt32 ) ( ffsecs - MAGICWINDOWSOFFSET ) ; fSecs = ( time_t ) ( ffsecs - MAGICWINDOWSOFFSET ) ;
fMicros = ( UInt32 ) ( ff % 10000000 ) / 10 ; fMicros = ( UInt32 ) ( ff % 10000000 ) / 10 ;
return true ; return true ;
} }
@ -223,7 +223,7 @@ const plUnifiedTime & plUnifiedTime::operator=(time_t src)
const plUnifiedTime & plUnifiedTime : : operator = ( unsigned long src ) const plUnifiedTime & plUnifiedTime : : operator = ( unsigned long src )
{ {
fSecs = src ; fSecs = ( time_t ) src ;
fMicros = 0 ; fMicros = 0 ;
return * this ; return * this ;
} }
@ -238,7 +238,7 @@ const plUnifiedTime & plUnifiedTime::operator=(const struct timeval & src)
const plUnifiedTime & plUnifiedTime : : operator = ( const struct tm & src ) const plUnifiedTime & plUnifiedTime : : operator = ( const struct tm & src )
{ {
struct tm atm = src ; struct tm atm = src ;
fSecs = mktime ( & atm ) ; // this won't work after 2030 something, sorry
fSecs = mktime ( & atm ) ;
return * this ; return * this ;
} }
@ -247,16 +247,10 @@ void plUnifiedTime::SetSecsDouble(double secs)
hsAssert ( secs > = 0 , " plUnifiedTime::SetSecsDouble negative time " ) ; hsAssert ( secs > = 0 , " plUnifiedTime::SetSecsDouble negative time " ) ;
double x , y ; double x , y ;
x = modf ( secs , & y ) ; x = modf ( secs , & y ) ;
fSecs = ( UInt32 ) y ; fSecs = ( time_t ) y ;
fMicros = ( UInt32 ) ( x * 1000000 ) ; fMicros = ( UInt32 ) ( x * 1000000 ) ;
} }
void plUnifiedTime : : FromMillis ( UInt32 millis )
{
fSecs = millis / 1000 ;
fMicros = 0 ;
}
void plUnifiedTime : : ToCurrentTime ( ) void plUnifiedTime : : ToCurrentTime ( )
{ {
@ -284,7 +278,7 @@ hsBool plUnifiedTime::SetTime(short year, short month, short day, short hour, sh
atm . tm_mon = month - 1 ; atm . tm_mon = month - 1 ;
atm . tm_year = year - 1900 ; atm . tm_year = year - 1900 ;
atm . tm_isdst = dst ; atm . tm_isdst = dst ;
fSecs = mktime ( & atm ) ; // this won't work after 2030 something, sorry
fSecs = mktime ( & atm ) ;
if ( fSecs = = - 1 ) if ( fSecs = = - 1 )
return false ; return false ;
if ( fMicros > = 1000000 ) if ( fMicros > = 1000000 )
@ -296,7 +290,7 @@ hsBool plUnifiedTime::SetTime(short year, short month, short day, short hour, sh
hsBool plUnifiedTime : : GetTime ( short & year , short & month , short & day , short & hour , short & minute , short & second ) const hsBool plUnifiedTime : : GetTime ( short & year , short & month , short & day , short & hour , short & minute , short & second ) const
{ {
struct tm * time = IGetTime ( ( const time_t * ) & fSecs ) ; struct tm * time = IGetTime ( & fSecs ) ;
if ( ! time ) if ( ! time )
return false ; return false ;
year = time - > tm_year + 1900 ; year = time - > tm_year + 1900 ;
@ -324,8 +318,8 @@ const char* plUnifiedTime::Print() const
const char * plUnifiedTime : : PrintWMillis ( ) const const char * plUnifiedTime : : PrintWMillis ( ) const
{ {
static std : : string s ; static std : : string s ;
xtl : : format ( s , " %s,s:%d ,ms:%d " , xtl : : format ( s , " %s,s:%lu ,ms:%d " ,
Print ( ) , GetSecs ( ) , GetMillis ( ) ) ; Print ( ) , ( unsigned long ) GetSecs ( ) , GetMillis ( ) ) ;
return s . c_str ( ) ; return s . c_str ( ) ;
} }
@ -333,11 +327,11 @@ struct tm * plUnifiedTime::GetTm(struct tm * ptm) const
{ {
if ( ptm ! = nil ) if ( ptm ! = nil )
{ {
* ptm = * IGetTime ( ( const time_t * ) & fSecs ) ; * ptm = * IGetTime ( & fSecs ) ;
return ptm ; return ptm ;
} }
else else
return IGetTime ( ( const time_t * ) & fSecs ) ; return IGetTime ( & fSecs ) ;
} }
int plUnifiedTime : : GetYear ( ) const int plUnifiedTime : : GetYear ( ) const
@ -383,15 +377,12 @@ double plUnifiedTime::GetSecsDouble() const
} }
# pragma optimize( "", on ) // restore optimizations to their defaults
# pragma optimize( "", on ) // restore optimizations to their defaults
UInt32 plUnifiedTime : : AsMillis ( )
{
return GetSecs ( ) * 1000 ;
}
void plUnifiedTime : : Read ( hsStream * s ) void plUnifiedTime : : Read ( hsStream * s )
{ {
s - > LogSubStreamStart ( " UnifiedTime " ) ; s - > LogSubStreamStart ( " UnifiedTime " ) ;
s - > LogReadSwap ( & fSecs , " Seconds " ) ; UInt32 secs ;
s - > LogReadSwap ( & secs , " Seconds " ) ;
fSecs = ( time_t ) secs ;
s - > LogReadSwap ( & fMicros , " MicroSeconds " ) ; s - > LogReadSwap ( & fMicros , " MicroSeconds " ) ;
s - > LogSubStreamEnd ( ) ; s - > LogSubStreamEnd ( ) ;
// preserve fMode
// preserve fMode
@ -399,7 +390,7 @@ void plUnifiedTime::Read(hsStream* s)
void plUnifiedTime : : Write ( hsStream * s ) const void plUnifiedTime : : Write ( hsStream * s ) const
{ {
s - > WriteSwap ( fSecs ) ; s - > WriteSwap ( ( UInt32 ) fSecs ) ;
s - > WriteSwap ( fMicros ) ; s - > WriteSwap ( fMicros ) ;
// preserve fMode
// preserve fMode
} }
@ -458,7 +449,12 @@ bool plUnifiedTime::operator>=(const plUnifiedTime & rhs) const
plUnifiedTime : : operator timeval ( ) const plUnifiedTime : : operator timeval ( ) const
{ {
# if HS_BUILD_FOR_WIN32
// tv_secs should be a time_t, but on Windows it is a long
struct timeval t = { ( long ) fSecs , ( long ) fMicros } ;
# else
struct timeval t = { fSecs , fMicros } ; struct timeval t = { fSecs , fMicros } ;
# endif
return t ; return t ;
} }
@ -472,7 +468,7 @@ plUnifiedTime::operator struct tm() const
std : : string plUnifiedTime : : Format ( const char * fmt ) const std : : string plUnifiedTime : : Format ( const char * fmt ) const
{ {
char buf [ 128 ] ; char buf [ 128 ] ;
struct tm * t = IGetTime ( ( const time_t * ) & fSecs ) ; struct tm * t = IGetTime ( & fSecs ) ;
if ( t = = nil | | if ( t = = nil | |
! strftime ( buf , sizeof ( buf ) , fmt , t ) ) ! strftime ( buf , sizeof ( buf ) , fmt , t ) )
buf [ 0 ] = ' \0 ' ; buf [ 0 ] = ' \0 ' ;
Christian Walther
5 years ago
committed by
rarified