6b02648ff2
* harbour/source/rtl/fssize.c
* harbour/source/rtl/hbffind.c
* harbour/source/rtl/filesys.c
* set _LARGEFILE64_SOURCE in all builds and use HB_USE_LARGEFILE64
macro (set automatically when __USE_LARGEFILE64 is defined too or
HB_OS_HPUX && O_LARGEFILE) to enable large file support in 32 bit
POSIX systems. It should help to enable large file support in other
then Linux different 32 bit *nixes.
I hope it will resolve Sandro problems with HPUX.
* harbour/source/vm/itemapi.c
* do not return DATE item value in hb_itemGetNDDec()
It was old and unused xHarbour only code - now hb_itemGetNDDec()
is compatible with hb_itemGetND()
* harbour/source/rtl/seconds.c
! fixed typo in BSD builds
BTW can someone test current SVN code with Solaris?
I will not be able to make such test myself in the nearest few weeks.
309 lines
8.8 KiB
C
309 lines
8.8 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* SECONDS() function
|
|
*
|
|
* Copyright 1999 Jose Lalin <dezac@corevia.com>
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
#define HB_OS_WIN_32_USED
|
|
|
|
#include "hbapi.h"
|
|
#include "hbdate.h"
|
|
|
|
#include <time.h>
|
|
|
|
#if ( defined( HB_OS_BSD ) || defined( HB_OS_LINUX ) ) && !defined( __WATCOMC__ )
|
|
#include <sys/time.h>
|
|
#elif !( defined( HB_WINCE ) && defined( _MSC_VER ) )
|
|
#include <sys/timeb.h>
|
|
#endif
|
|
#if defined( OS_UNIX_COMPATIBLE )
|
|
#include <sys/times.h>
|
|
#include <unistd.h>
|
|
#endif
|
|
#if defined( HB_OS_WIN_32 )
|
|
#include <windows.h>
|
|
#elif defined(_MSC_VER)
|
|
#define timeb _timeb
|
|
#define ftime _ftime
|
|
#endif
|
|
|
|
HB_EXPORT void hb_dateTimeStamp( LONG * plJulian, LONG * plMilliSec )
|
|
{
|
|
#if defined(HB_OS_WIN_32)
|
|
SYSTEMTIME st;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_dateTimeStamp(%p,%p)", plJulian, plMilliSec));
|
|
|
|
GetLocalTime( &st );
|
|
|
|
*plJulian = hb_dateEncode( st.wYear, st.wMonth, st.wDay );
|
|
*plMilliSec = ( ( st.wHour * 60 + st.wMinute ) * 60 + st.wSecond ) * 1000 +
|
|
st.wMilliseconds;
|
|
#elif defined( HB_OS_LINUX ) && !defined( __WATCOMC__ )
|
|
struct timeval tv;
|
|
struct tm st;
|
|
time_t seconds;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_dateTimeStamp(%p,%p)", plJulian, plMilliSec));
|
|
|
|
gettimeofday( &tv, NULL );
|
|
seconds = tv.tv_sec;
|
|
localtime_r( &seconds, &st );
|
|
*plJulian = hb_dateEncode( st.tm_year + 1900, st.tm_mon + 1, st.tm_mday );
|
|
*plMilliSec = ( ( st.tm_hour * 60 + st.tm_min ) * 60 + st.tm_sec ) * 1000 +
|
|
tv.tv_usec / 1000;
|
|
#elif defined( HB_OS_BSD )
|
|
struct timeval tv;
|
|
struct tm * st;
|
|
time_t seconds;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_dateTimeStamp(%p,%p)", plJulian, plMilliSec));
|
|
|
|
gettimeofday( &tv, NULL );
|
|
seconds = tv.tv_sec;
|
|
st = localtime( &seconds );
|
|
*plJulian = hb_dateEncode( st->tm_year + 1900, st->tm_mon + 1, st->tm_mday );
|
|
*plMilliSec = ( ( st->tm_hour * 60 + st->tm_min ) * 60 + st->tm_sec ) * 1000 +
|
|
tv.tv_usec / 1000.0;
|
|
#else
|
|
struct timeb tb;
|
|
struct tm * st;
|
|
time_t seconds;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_dateTimeStamp(%p,%p)", plJulian, plMilliSec));
|
|
|
|
ftime( &tb );
|
|
seconds = tb.time;
|
|
st = localtime( &seconds );
|
|
|
|
*plJulian = hb_dateEncode( st->tm_year + 1900, st->tm_mon + 1, st->tm_mday );
|
|
*plMilliSec = ( ( st->tm_hour * 60 + st->tm_min ) * 60 + st->tm_sec ) * 1000 +
|
|
tb.millitm;
|
|
#endif
|
|
}
|
|
|
|
HB_EXPORT HB_ULONG hb_dateMilliSeconds( void )
|
|
{
|
|
#if defined(HB_OS_WIN_32)
|
|
SYSTEMTIME st;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_dateMilliSeconds()"));
|
|
|
|
GetLocalTime( &st );
|
|
|
|
return ( HB_ULONG ) hb_dateEncode( st.wYear, st.wMonth, st.wDay ) * 86400000L +
|
|
( ( st.wHour * 60 + st.wMinute ) * 60 + st.wSecond ) * 1000 +
|
|
st.wMilliseconds;
|
|
#elif ( defined( HB_OS_LINUX ) || defined( HB_OS_BSD ) ) && !defined( __WATCOMC__ )
|
|
struct timeval tv;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_dateMilliSeconds()"));
|
|
|
|
gettimeofday( &tv, NULL );
|
|
|
|
return ( HB_ULONG ) tv.tv_sec * 1000 + tv.tv_usec / 1000;
|
|
#else
|
|
struct timeb tb;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_dateMilliSeconds()"));
|
|
|
|
ftime( &tb );
|
|
|
|
return ( HB_ULONG ) tb.time * 1000 + tb.millitm;
|
|
#endif
|
|
}
|
|
|
|
HB_EXPORT double hb_dateSeconds( void )
|
|
{
|
|
#if defined(HB_OS_WIN_32)
|
|
SYSTEMTIME SystemTime;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_dateSeconds()"));
|
|
|
|
GetLocalTime( &SystemTime );
|
|
|
|
return ( SystemTime.wHour * 3600 ) +
|
|
( SystemTime.wMinute * 60 ) +
|
|
SystemTime.wSecond +
|
|
( ( double ) SystemTime.wMilliseconds / 1000.0 );
|
|
#elif defined( HB_OS_LINUX ) && !defined( __WATCOMC__ )
|
|
struct timeval tv;
|
|
struct tm oTime;
|
|
time_t seconds;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_dateSeconds()"));
|
|
|
|
gettimeofday( &tv, NULL );
|
|
seconds = tv.tv_sec;
|
|
localtime_r( &seconds, &oTime );
|
|
return ( oTime.tm_hour * 3600 ) +
|
|
( oTime.tm_min * 60 ) +
|
|
oTime.tm_sec +
|
|
( ( double ) tv.tv_usec / 1000000.0 );
|
|
#elif defined( HB_OS_BSD )
|
|
struct timeval tv;
|
|
struct tm * oTime;
|
|
time_t seconds;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_dateSeconds()"));
|
|
|
|
gettimeofday( &tv, NULL );
|
|
seconds = tv.tv_sec;
|
|
oTime = localtime( &seconds );
|
|
return ( oTime->tm_hour * 3600 ) +
|
|
( oTime->tm_min * 60 ) +
|
|
oTime->tm_sec +
|
|
( ( double ) tv.tv_usec / 1000000.0 );
|
|
#else
|
|
struct timeb tb;
|
|
struct tm * oTime;
|
|
time_t seconds;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_dateSeconds()"));
|
|
|
|
ftime( &tb );
|
|
seconds = tb.time;
|
|
oTime = localtime( &seconds );
|
|
|
|
return ( oTime->tm_hour * 3600 ) +
|
|
( oTime->tm_min * 60 ) +
|
|
oTime->tm_sec +
|
|
( ( double ) tb.millitm / 1000.0 );
|
|
#endif
|
|
}
|
|
|
|
HB_FUNC( SECONDS )
|
|
{
|
|
hb_retnd( hb_dateSeconds() );
|
|
}
|
|
|
|
HB_FUNC( HB_CLOCKS2SECS )
|
|
{
|
|
#ifdef CLOCKS_PER_SEC
|
|
hb_retnd( ( double ) hb_parnint( 1 ) / CLOCKS_PER_SEC );
|
|
#else
|
|
hb_retnd( ( double ) hb_parnint( 1 ) / 1000 );
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
secondsCPU(n) -> nTime
|
|
FlagShip/CLIP compatible function, which reports how many CPU and/or
|
|
system seconds have elapsed since the beginning of the program execution.
|
|
n == 1 utime -> user CPU time of the current process
|
|
n == 2 stime -> system CPU time behalf of the current process
|
|
n == 3 u + s -> sum of utime + stime (default)
|
|
n == 11 cutime -> sum of the user CPU time of the current + child process
|
|
n == 12 cstime -> sum of the system CPU time of the current + child process
|
|
n == 13 cu+cs -> sum of cutime + cstime
|
|
*/
|
|
HB_EXPORT double hb_secondsCPU( int n )
|
|
{
|
|
double d = 0.0;
|
|
#if defined( HB_OS_WIN_32 ) && !defined( OS_UNIX_COMPATIBLE )
|
|
FILETIME Create, Exit, Kernel, User;
|
|
#endif
|
|
|
|
if( ( n < 1 || n > 3 ) && ( n < 11 || n > 13 ) )
|
|
n = 3;
|
|
|
|
#if defined( OS_UNIX_COMPATIBLE )
|
|
{
|
|
struct tms tm;
|
|
|
|
times(&tm);
|
|
|
|
if( n > 10 )
|
|
{
|
|
n -= 10;
|
|
if( n & 1 )
|
|
d += tm.tms_cutime;
|
|
if( n & 2 )
|
|
d += tm.tms_cstime;
|
|
}
|
|
if( n & 1 )
|
|
d += tm.tms_utime;
|
|
if( n & 2 )
|
|
d += tm.tms_stime;
|
|
|
|
/* In POSIX-1996 the CLK_TCK symbol is mentioned as obsolescent */
|
|
/* d /= CLK_TCK; */
|
|
d /= (double) sysconf(_SC_CLK_TCK);
|
|
}
|
|
#else
|
|
if( n > 10 )
|
|
n -= 10;
|
|
#if defined( HB_OS_WIN_32 )
|
|
if( hb_iswinnt() &&
|
|
GetProcessTimes( GetCurrentProcess(), &Create, &Exit, &Kernel, &User ) )
|
|
{
|
|
if( n & 1 )
|
|
{
|
|
d += ( double ) ( ( ( HB_LONG ) User.dwHighDateTime << 32 ) +
|
|
( HB_LONG ) User.dwLowDateTime );
|
|
}
|
|
if( n & 2 )
|
|
{
|
|
d += ( double ) ( ( ( HB_LONG ) Kernel.dwHighDateTime << 32 ) +
|
|
( HB_LONG ) Kernel.dwLowDateTime );
|
|
}
|
|
d /= 10000000.0;
|
|
}
|
|
else
|
|
#endif
|
|
{
|
|
/* TODO: this code is only for DOS and other platforms which cannot
|
|
calculate process time */
|
|
if( n & 1 )
|
|
d = hb_dateSeconds( );
|
|
}
|
|
#endif
|
|
return d;
|
|
}
|