* contrib/hbblat/blatcls.prg
! Added type checks for all params.
% File() -> hb_FileExists()
* Minor formatting.
* source/rtl/browdbx.prg
* Minor formatting in comment.
* contrib/xpp/Makefile
+ contrib/xpp/dbcmdx.c
+ contrib/xpp/tgetx.prg
+ contrib/xpp/tbcolumx.prg
+ contrib/xpp/dbjoinx.prg
+ contrib/xpp/idlex.c
+ contrib/xpp/typefilx.prg
+ contrib/xpp/philesx.c
+ contrib/xpp/browdbx.prg
+ contrib/xpp/dbdetacx.c
+ contrib/xpp/dblistx.prg
+ contrib/xpp/binnumx.c
+ contrib/xpp/mousex.c
+ contrib/xpp/dbupdatx.prg
+ contrib/xpp/dbfuncsx.prg
+ contrib/xpp/oemansix.c
+ contrib/xpp/tbrowsex.prg
+ contrib/xpp/thfuncx.prg
+ contrib/xpp/dbtotalx.prg
+ contrib/xpp/datesx.c
+ contrib/xpp/tthreadx.prg
+ contrib/xpp/dbstruxx.prg
+ contrib/xpp/dbsortx.prg
+ Made a copy of all Xbase++ related Harbour core components
into this separate lib. As we're starting to have a larger
and larger amount of Xbase++ functions, to not pollute core,
to have a clear separation of components and to allow
toggling Xbase++ compatibility at user level (instead of
Harbour level), it's a good time to make this long planned
first step. This means that now Harbour can be built with
HB_COMPAT_XPP turned off, yet - with this lib - all Xbase++
feature can still be used, and this is the recommended way.
The name of the lib is tentative and in the future it may
even be moved or renamed. 2.0.0 final version will still
have HB_COMPAT_XPP enabled in core.
; NOTE: Please add new Xbase++ compatibility functions to this lib.
; TOFIX: xpp_TBrowse() needs some internal parts from tbrowse.prg,
so current solution isn't finished.
; TOFIX: A few Xbase++ compatibility features are embedded
into core source. These should be resolved by other
means. (f.e. compiler time/runtime/hbmk2 switches, but
for that we need to move back this lib inside core)
; TODO: Decide about the status of STOD() function, which is
currently an XPP compatibility function, not in Harbour
namespace, yet it's widely used with same functionality.
261 lines
7.4 KiB
Plaintext
261 lines
7.4 KiB
Plaintext
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* XPP compatible classes to manage threads
|
|
*
|
|
* Copyright 2008 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
|
|
* www - http://www.harbour-project.org
|
|
* special thanks for Pritpal Bedi for class skeleton with info about
|
|
* Xbase++ and to other contributors which I hope will finish and fix
|
|
* this code
|
|
*
|
|
* 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 "common.ch"
|
|
#include "hbclass.ch"
|
|
#include "hbthread.ch"
|
|
|
|
/* I do not know Xbase++ values */
|
|
#define QUIT_NORESTART 1
|
|
#define QUIT_RESTART 2
|
|
|
|
|
|
/*
|
|
* SIGNAL class
|
|
*/
|
|
CREATE CLASS TSignal FUNCTION Signal
|
|
|
|
VAR cargo AS USUAL EXPORTED
|
|
VAR mutex AS USUAL PROTECTED
|
|
|
|
EXPORTED:
|
|
|
|
METHOD new()
|
|
METHOD wait( nTimeOut )
|
|
METHOD signal()
|
|
|
|
ENDCLASS
|
|
|
|
METHOD new( ... ) CLASS TSIGNAL
|
|
::mutex := hb_mutexCreate()
|
|
::Init( ... )
|
|
RETURN Self
|
|
|
|
METHOD wait( nTimeOut ) CLASS TSIGNAL
|
|
RETURN __ClsSyncWait( ::mutex, nTimeOut )
|
|
|
|
METHOD signal() CLASS TSIGNAL
|
|
__ClsSyncSignal( ::mutex )
|
|
RETURN Self
|
|
|
|
|
|
/*
|
|
* THREAD class
|
|
*/
|
|
|
|
CREATE CLASS TThread FUNCTION Thread
|
|
|
|
EXPORTED:
|
|
VAR cargo AS USUAL
|
|
VAR active AS LOGICAL READONLY INIT .f.
|
|
VAR deltaTime AS NUMERIC READONLY INIT 0
|
|
VAR interval AS USUAL READONLY INIT NIL
|
|
VAR priority AS NUMERIC READONLY INIT 0
|
|
VAR startCount AS NUMERIC READONLY INIT 0
|
|
VAR startTime AS USUAL READONLY INIT NIL
|
|
VAR atEnd AS USUAL INIT NIL
|
|
VAR atStart AS USUAL INIT NIL
|
|
VAR result AS USUAL INIT NIL
|
|
|
|
PROTECTED:
|
|
VAR maxStackSize AS USUAL INIT 50000
|
|
|
|
HIDDEN:
|
|
VAR pThreadID AS USUAL INIT NIL
|
|
|
|
EXPORTED:
|
|
METHOD new()
|
|
|
|
PROTECTED:
|
|
/* METHOD atEnd() */
|
|
/* METHOD atStart() */
|
|
METHOD execute()
|
|
|
|
EXPORTED:
|
|
METHOD quit( xResult, nRestart )
|
|
METHOD setInterval( nHSeconds )
|
|
METHOD setPriority( nPriority )
|
|
METHOD setStartTime( nSeconds )
|
|
METHOD start()
|
|
METHOD synchronize( nTimeOut )
|
|
METHOD threadSelf()
|
|
METHOD threadID()
|
|
|
|
METHOD thread INLINE ::TThread()
|
|
|
|
ENDCLASS
|
|
|
|
METHOD new( ... ) CLASS TTHREAD
|
|
LOCAL nMaxStackSize
|
|
|
|
IF PCount() == 1
|
|
nMaxStackSize := hb_PValue( 1 )
|
|
IF ISNUMBER( nMaxStackSize )
|
|
::maxStackSize := nMaxStackSize
|
|
ENDIF
|
|
ENDIF
|
|
::Init( ... )
|
|
RETURN Self
|
|
|
|
METHOD execute() CLASS TTHREAD
|
|
HB_SYMBOL_UNUSED( Self )
|
|
RETURN NIL
|
|
|
|
METHOD quit( xResult, nRestart ) CLASS TTHREAD
|
|
IF hb_threadSelf() == ::pThreadID
|
|
IF ISNUMBER( nRestart )
|
|
IF nRestart == QUIT_NORESTART
|
|
::interval := NIL
|
|
ELSEIF nRestart == QUIT_RESTART
|
|
IF ISNUMBER( ::interval )
|
|
/* TODO: do not interrupt by QUIT but restart execution */
|
|
ENDIF
|
|
ENDIF
|
|
ENDIF
|
|
IF PCOUNT() > 0
|
|
::result := xResult
|
|
ENDIF
|
|
QUIT
|
|
ENDIF
|
|
RETURN NIL
|
|
|
|
METHOD setInterval( nHSeconds ) CLASS TTHREAD
|
|
IF nHSeconds == NIL .OR. ISNUMBER( nHSeconds )
|
|
::interval := nHSeconds
|
|
ENDIF
|
|
RETURN .F.
|
|
|
|
METHOD setPriority( nPriority ) CLASS TTHREAD
|
|
/* TODO: add thread priority setting */
|
|
IF ISNUMBER( nPriority )
|
|
::priority := nPriority
|
|
ENDIF
|
|
RETURN .F.
|
|
|
|
METHOD setStartTime( nSeconds ) CLASS TTHREAD
|
|
/* TODO: add such functionality, probably by special thread */
|
|
IF ISNUMBER( nSeconds )
|
|
::startTime := nSeconds
|
|
ELSEIF nSeconds == NIL
|
|
::startTime := NIL
|
|
ENDIF
|
|
RETURN .F.
|
|
|
|
METHOD start( xAction, ... ) CLASS TTHREAD
|
|
/* TODO: thread stack size set by user ::maxStackSize */
|
|
IF ::active
|
|
RETURN .F.
|
|
ELSEIF xAction == NIL
|
|
::active := .T.
|
|
::pThreadID := hb_threadStart( HB_THREAD_INHERIT_PUBLIC, ;
|
|
{ |...|
|
|
WHILE .T.
|
|
::startTime := Seconds()
|
|
ThreadObject( Self )
|
|
::result := ::execute( ... )
|
|
::startTime := NIL
|
|
IF ISNUMBER( ::interval )
|
|
hb_idleSleep( ::interval / 100 )
|
|
LOOP
|
|
ENDIF
|
|
EXIT
|
|
ENDDO
|
|
RETURN NIL
|
|
}, ... )
|
|
ELSEIF !Empty( xAction ) .AND. ValType( xAction ) $ "CBS"
|
|
::active := .T.
|
|
::pThreadID := hb_threadStart( HB_THREAD_INHERIT_PUBLIC, ;
|
|
{ |...|
|
|
WHILE .T.
|
|
::startTime := Seconds()
|
|
ThreadObject( Self )
|
|
IF ::atStart != NIL
|
|
EVAL( ::atStart, ... )
|
|
ENDIF
|
|
::result := DO( xAction, ... )
|
|
IF ::atEnd != NIL
|
|
EVAL( ::atEnd, ... )
|
|
ENDIF
|
|
::startTime := NIL
|
|
IF ISNUMBER( ::interval )
|
|
hb_idleSleep( ::interval / 100 )
|
|
LOOP
|
|
ENDIF
|
|
EXIT
|
|
ENDDO
|
|
RETURN NIL
|
|
}, ... )
|
|
ELSE
|
|
RETURN .F.
|
|
ENDIF
|
|
RETURN .T.
|
|
|
|
METHOD synchronize( nTimeOut ) CLASS TTHREAD
|
|
LOCAL pThreadID := ::pThreadID
|
|
|
|
IF hb_threadSelf() != pThreadID
|
|
RETURN hb_threadWait( pThreadID, ;
|
|
iif( ISNUMBER( nTimeOut ) .AND. nTimeOut != 0, ;
|
|
nTimeOut / 100, ) )
|
|
ENDIF
|
|
RETURN .F.
|
|
|
|
METHOD threadSelf() CLASS TTHREAD
|
|
RETURN ::pThreadID
|
|
|
|
METHOD threadID() CLASS TTHREAD
|
|
LOCAL pThreadID := ::pThreadID
|
|
RETURN IIF( pThreadID == NIL, 0, hb_threadID( pThreadID ) )
|