fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2015-09-29 21:24 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* src/vm/hvm.c
    ! delay locking of main HVM thread stack until HVM is initialized,
      it fixes issue #107
    ! protect access to HB_STACK_TLS_PRELOAD by s_fHVMActive in
      hb_vmLockForce()
This commit is contained in:
Przemysław Czerpak
2015-09-29 21:24:15 +02:00
parent 7c0914cd43
commit 5eca8eab92
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog.txt
View File

@@ -10,6 +10,13 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2015-09-29 21:24 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/vm/hvm.c
! delay locking of main HVM thread stack until HVM is initialized,
it fixes issue #107
! protect access to HB_STACK_TLS_PRELOAD by s_fHVMActive in
hb_vmLockForce()
2015-09-25 11:41 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/rtl/filebuf.c
! removed unnecessary HB_EXPORT attribute

31
src/vm/hvm.c
View File

@@ -595,23 +595,26 @@ void hb_vmLock( void )
void hb_vmLockForce( void )
{
HB_STACK_TLS_PRELOAD
if( hb_stackId() ) /* check if thread has associated HVM stack */
if( s_fHVMActive )
{
if( hb_stackLock() == 0 )
HB_STACK_TLS_PRELOAD
if( hb_stackId() ) /* check if thread has associated HVM stack */
{
HB_VM_LOCK();
if( hb_vmThreadRequest & HB_THREQUEST_QUIT )
if( hb_stackLock() == 0 )
{
if( ! hb_stackQuitState() )
HB_VM_LOCK();
if( hb_vmThreadRequest & HB_THREQUEST_QUIT )
{
hb_stackSetQuitState( HB_TRUE );
hb_stackSetActionRequest( HB_QUIT_REQUESTED );
if( ! hb_stackQuitState() )
{
hb_stackSetQuitState( HB_TRUE );
hb_stackSetActionRequest( HB_QUIT_REQUESTED );
}
}
s_iRunningCount++;
HB_VM_UNLOCK();
}
s_iRunningCount++;
HB_VM_UNLOCK();
}
}
}
@@ -795,8 +798,6 @@ static void hb_vmStackInit( PHB_THREADSTATE pState )
hb_vmStackAdd( pState );
}
HB_VM_UNLOCK();
hb_vmLock();
}
static void hb_vmStackRelease( void )
@@ -879,6 +880,7 @@ void hb_vmThreadInit( void * Cargo )
pState = hb_threadStateNew();
hb_vmStackInit( pState ); /* initialize HVM thread stack */
hb_vmLock();
{
HB_STACK_TLS_PRELOAD
@@ -1114,6 +1116,9 @@ void hb_vmInit( HB_BOOL bStartMainProc )
/* enable executing PCODE (HVM reenter request) */
s_fHVMActive = HB_TRUE;
/* lock main HVM thread */
hb_vmLock();
#ifndef HB_NO_DEBUG
s_pDynsDbgEntry = hb_dynsymFind( "__DBGENTRY" );
if( s_pDynsDbgEntry )