* harbour/include/hbapi.h
* harbour/source/vm/dynsym.c
+ added hb_dynsymIsFunction()
* harbour/source/rtl/filehb.c
* updated comment
* harbour/source/rtl/philes.c
* renamed HB_F_EOF() to HB_FEOF()
* harbour/source/rtl/scroll.c
* harbour/source/rtl/transfrm.c
* harbour/source/rtl/file.c
* formatting
* harbour/source/rtl/substr.c
* harbour/source/rtl/trim.c
% optimization
* harbour/source/rtl/typefile.prg
% use HB_ATOKENS() instead of static .prg function
* harbour/source/rtl/setkey.c
% optimization and protection aganst possible GPF when wrong array
is passed to HB_SETKEYSAVE()
* harbour/source/rtl/xhelp.c
! do not generate RT error when HELP symbol exist
(f.e. after PUBLIC HELP) but HELP() function doesn't
! keep reference in parametes passed by reference to __XHELP()
* use only PHB_DYNS instead of PHB_SYMB
* harbour/source/rtl/seconds.c
+ added WIN32 version borrowed from XHARBOUR
* harbour/source/rtl/trace.c
! protection against possible GPF when wrong parameters are passed
* harbour/source/rtl/samples.c
! protection against possible GPF when wrong parameters are passed
Warning! We have in this file few functions without HB_ prefix.
Some of them may create conflicts with future functions for TIMEDATE
items.
* harbour/source/rtl/inkey.c
+ added support for passing array with key codes as __KEYBOARD()
parameter, covered by HB_EXTENSION macro - this is xHarbour compatible
extension. I do not like it but we already had extension with numeric
parameters and probably it would be hard to remove it now and keep
__KEYBOARD() code clean so I decided to add support also for arrays
instead of creating new function and adding conditional code covered
by HB_COMPAT_XHB macro.
* harbour/source/rtl/setfunc.prg
* accept extended __KEYBOARD() parameters when HB_EXTENSION macro
is set.
213 lines
5.7 KiB
C
213 lines
5.7 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.
|
|
*
|
|
*/
|
|
|
|
#include "hbapi.h"
|
|
#include "hbdate.h"
|
|
|
|
#include <time.h>
|
|
|
|
#if defined( HB_OS_BSD)
|
|
#include <sys/time.h>
|
|
#else
|
|
#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>
|
|
#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 );
|
|
#else
|
|
#if defined(_MSC_VER)
|
|
#define timeb _timeb
|
|
#define ftime _ftime
|
|
#endif
|
|
#if defined(HB_OS_BSD)
|
|
struct timeval tv;
|
|
struct timezone tz;
|
|
#else
|
|
struct timeb tb;
|
|
#endif
|
|
time_t seconds;
|
|
time_t fraction;
|
|
struct tm * oTime;
|
|
|
|
HB_TRACE(HB_TR_DEBUG, ("hb_dateSeconds()"));
|
|
|
|
#if defined(HB_OS_BSD)
|
|
gettimeofday( &tv, &tz );
|
|
seconds = tv.tv_sec - tz.tz_minuteswest * 60;
|
|
fraction = tv.tv_usec / 1000U;
|
|
#else
|
|
ftime( &tb );
|
|
seconds = tb.time;
|
|
fraction = tb.millitm;
|
|
#endif
|
|
|
|
oTime = localtime( &seconds );
|
|
|
|
return ( oTime->tm_hour * 3600 ) +
|
|
( oTime->tm_min * 60 ) +
|
|
oTime->tm_sec +
|
|
( ( double ) fraction / 1000.0 );
|
|
#endif
|
|
}
|
|
|
|
HB_FUNC( SECONDS )
|
|
{
|
|
hb_retnd( hb_dateSeconds() );
|
|
}
|
|
|
|
HB_FUNC( HB_CLOCKS2SECS )
|
|
{
|
|
hb_retnd((double) hb_parnl( 1 ) / CLOCKS_PER_SEC );
|
|
}
|
|
|
|
#ifdef HB_COMPAT_FLAGSHIP
|
|
|
|
/*
|
|
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 )
|
|
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;
|
|
}
|
|
|
|
HB_FUNC( SECONDSCPU )
|
|
{
|
|
hb_retnd( hb_secondsCPU( hb_parni( 1 ) ) );
|
|
}
|
|
|
|
#endif
|