steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added -DREENTRANT option to Makefile 

Also renamed FACTOR_MULTITHREADED to FACTOR_REENTRANT
Phil Dawes 2009-09-07 08:18:41 +01:00
parent f7584cd826
commit 3db680547a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -18,6 +18,10 @@ else
CFLAGS += -O3 CFLAGS += -O3
endif endif
ifdef REENTRANT
CFLAGS += -DFACTOR_REENTRANT
endif
CFLAGS += $(SITE_CFLAGS) CFLAGS += $(SITE_CFLAGS)
ENGINE = $(DLL_PREFIX)factor$(DLL_SUFFIX)$(DLL_EXTENSION) ENGINE = $(DLL_PREFIX)factor$(DLL_SUFFIX)$(DLL_EXTENSION)

7
vm/vm.hpp
View File

@ -610,8 +610,9 @@ struct factorvm : factorvmdata {
}; };
#ifndef FACTOR_REENTRANT
#define FACTOR_SINGLE_THREADED_SINGLETON #define FACTOR_SINGLE_THREADED_SINGLETON
#endif
#ifdef FACTOR_SINGLE_THREADED_SINGLETON #ifdef FACTOR_SINGLE_THREADED_SINGLETON
/* calls are dispatched using the singleton vm ptr */ /* calls are dispatched using the singleton vm ptr */
@ -633,7 +634,7 @@ struct factorvm : factorvmdata {
#define SIGNAL_VM_PTR() tls_vm() #define SIGNAL_VM_PTR() tls_vm()
#endif #endif
#ifdef FACTOR_MULTITHREADED_TLS #ifdef FACTOR_REENTRANT_TLS
/* uses thread local storage to obtain vm ptr */ /* uses thread local storage to obtain vm ptr */
#define PRIMITIVE_GETVM() tls_vm() #define PRIMITIVE_GETVM() tls_vm()
#define PRIMITIVE_OVERFLOW_GETVM() tls_vm() #define PRIMITIVE_OVERFLOW_GETVM() tls_vm()
@ -642,7 +643,7 @@ struct factorvm : factorvmdata {
#define SIGNAL_VM_PTR() tls_vm() #define SIGNAL_VM_PTR() tls_vm()
#endif #endif
#ifdef FACTOR_MULTITHREADED #ifdef FACTOR_REENTRANT
#define PRIMITIVE_GETVM() ((factorvm*)myvm) #define PRIMITIVE_GETVM() ((factorvm*)myvm)
#define PRIMITIVE_OVERFLOW_GETVM() ((factorvm*)myvm) #define PRIMITIVE_OVERFLOW_GETVM() ((factorvm*)myvm)
#define VM_PTR myvm #define VM_PTR myvm