From bf5f15b1cb8b145d857cba7dc8fea5822b774f23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Thu, 14 Jan 2016 14:36:38 +0100 Subject: [PATCH] 2016-01-14 14:36 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/vm/fm.c ! added missing HB_STACK_TLS_PRELOAD --- ChangeLog.txt | 4 ++++ src/vm/fm.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index bc38587fc7..fbe16f4e93 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,10 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2016-01-14 14:36 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * src/vm/fm.c + ! added missing HB_STACK_TLS_PRELOAD + 2016-01-14 14:04 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * ChangeLog.txt * include/hbmemory.ch diff --git a/src/vm/fm.c b/src/vm/fm.c index cc82074fee..ca8758bbcd 100644 --- a/src/vm/fm.c +++ b/src/vm/fm.c @@ -1550,6 +1550,8 @@ HB_FUNC( __FM_ALLOCLIMIT ) { hb_xclean(); #if defined( HB_FM_DLMT_ALLOC ) + HB_STACK_TLS_PRELOAD; + hb_retns( mspace_footprint_limit( hb_mspace() ) ); if( HB_ISNUM( 1 ) ) { @@ -1560,6 +1562,8 @@ HB_FUNC( __FM_ALLOCLIMIT ) mspace_set_footprint_limit( hb_mspace(), nLimit ); } #elif defined( HB_FM_DL_ALLOC ) + HB_STACK_TLS_PRELOAD; + hb_retns( dlmalloc_footprint_limit() ); if( HB_ISNUM( 1 ) ) { @@ -1570,6 +1574,8 @@ HB_FUNC( __FM_ALLOCLIMIT ) dlmalloc_set_footprint_limit( ( size_t ) nLimit ); } #elif defined( HB_FM_STATISTICS ) + HB_STACK_TLS_PRELOAD; + hb_retns( s_nMemoryLimConsumed ? s_nMemoryLimConsumed : -1 ); if( HB_ISNUM( 1 ) ) {