OCC12186 Basic multithread safety in OCCT Kernel

diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl
index bb348d4a2a88d268367f1c654e55bb2922dc6363..2d2f9d7c9ceb2a92e30a47aa05459dcc7989fd3d 100755 (executable)
--- a/src/WOKBuilderDef/CSF.edl
+++ b/src/WOKBuilderDef/CSF.edl
@@ -11,7 +11,7 @@
 @ifnotdefined ( %CSF_EDL ) then
    @set %CSF_EDL = "";
 
-   @set %CSF_SYMBOLS = "C_COMPILER C_SysOptions C_Options CXX_COMPILER CXX_SysOptions CXX_Options F77_COMPILER F77_SysOptions F77_Options CSF_LINKER CXX_COMPILERLINKER CSF_VirtualDevice CSF_LINKER_CheckOpt CSF_LINKER_CheckOut LINKER_DBMSOpt LINKER_SysShared LINKER_SysExeC LINKER_SysExeW LINKER_SysOpt LINKER_SysLib LINKER_CheckOpt LINKER_CheckOut LibraryHeaderLib LibraryHeaderOpt JavaHome JavaLibs C_INCLUDE CXX_INCLUDE TCL_INCLUDE JAVA_COMPILER JAVA_JNI JAVA_INCLUDE X11_INCLUDE XMU_INCLUDE MOTIF_INCLUDE OPENGL_INCLUDE SOCKETLibs FPELibs advapi32 gdi32 user32 glu32 opengl32 wsock32 dpsLibs XwLibs OpenGlLibs MotifLibs TclLibs TclTkLibs" ;
+   @set %CSF_SYMBOLS = "C_COMPILER C_SysOptions C_Options CXX_COMPILER CXX_SysOptions CXX_Options F77_COMPILER F77_SysOptions F77_Options CSF_LINKER CXX_COMPILERLINKER CSF_VirtualDevice CSF_LINKER_CheckOpt CSF_LINKER_CheckOut LINKER_DBMSOpt LINKER_SysShared LINKER_SysExeC LINKER_SysExeW LINKER_SysOpt LINKER_SysLib LINKER_CheckOpt LINKER_CheckOut LibraryHeaderLib LibraryHeaderOpt JavaHome JavaLibs C_INCLUDE CXX_INCLUDE TCL_INCLUDE JAVA_COMPILER JAVA_JNI JAVA_INCLUDE X11_INCLUDE XMU_INCLUDE MOTIF_INCLUDE OPENGL_INCLUDE SOCKETLibs FPELibs ThreadLibs kernel32 advapi32 gdi32 user32 glu32 opengl32 wsock32 dpsLibs XwLibs OpenGlLibs MotifLibs TclLibs TclTkLibs DOXIGEN_HOME GRAPVIZ_HOME" ;
 
   @set %CSF_CREATECOMP_DEP = "Yes" ;
   @set %CSF_USE_EXTERNLIB  = "Yes" ;
@@ -67,7 +67,9 @@
    @set %CSF_SOCKETLibs  = "";
    @set %CSF_RISCRETURNObject = "" ;
    @set %CSF_FPELibs = "" ;
+   @set %CSF_ThreadLibs = "" ;
 
+   @set %CSF_kernel32 = "" ;
    @set %CSF_advapi32 = "" ;
    @set %CSF_gdi32 = "" ;
    @set %CSF_user32 = "" ;
@@ -123,14 +125,14 @@
        @set %STLPortLib = "";
       @endif;
       @set %CSF_CXX_SysOptions  = "-fPIC -funsigned-char -Wall -fmessage-length=0";
-      @string %CSF_CXX_Options  = "-DLIN -DLININTEL -DNO_CXX_EXCEPTION " %STLPortInclude;
+      @string %CSF_CXX_Options  = "-DLIN -DLININTEL -DOCC_CONVERT_SIGNALS " %STLPortInclude;
 
       --<< TODO : If applicable , modify the location of the c compiler. 
       @set %CSF_C_COMPILER = "/usr/bin/gcc ";
       @string %CSF_C_INCLUDE +=  "";
       -->> END TODO
 
-      @set %CSF_C_SysOptions  = "-fPIC -funsigned-char -Wall";
+      @set %CSF_C_SysOptions  = "-fPIC -funsigned-char -Wall -fexceptions";
       @set %CSF_C_Options  = "-DLIN -DLININTEL ";
 
       --<< TODO : If applicable , modify the location of the Fortran compiler. 
@@ -139,15 +141,15 @@
 
       @set %CSF_F77_SysOptions  = "-fPIC ";
 
-      @set %CSF_LINKER = "/usr/bin/ld";
+      @string %CSF_LINKER = "/usr/bin/ld " %STLPortLib;
       @set %CSF_CXX_COMPILERLINKER = %CSF_CXX_COMPILER ;
       @set %CSF_LINKER_DBMSOpt = "";
       @set %CSF_LINKER_SysShared = "-shared ";
       @set %CSF_LINKER_SysExe = "";
       @set %CSF_LINKER_SysOpt = "";
       @set %CSF_LINKER_SysLib = "-ldl -lc ";
-      @set %CSF_LINKER_CheckOpt = " -nostartfiles ";
-      @set %CSF_LINKER_CheckOut = " -o /dev/null ";
+      @set %CSF_LINKER_CheckOpt = "-nostartfiles ";
+      @set %CSF_LINKER_CheckOut = "-o /dev/null ";
       @set %CSF_SOCKETLibs = " -ldl" ;
 
       --<< TODO : If applicable , modify the root location where TCL is installed.
@@ -163,13 +165,14 @@
       @string %CSF_JAVA_INCLUDE = "-I" %CSF_JavaHome "/include -I"  %CSF_JavaHome "/include/linux ";
       @set %CSF_JAVA_COMPILER   = "javac";
       @set %CSF_JAVA_JNI        = "javah";
-      
-      @set %CSF_DOXIGEN          = "/PRODUCTS/maintenance/Linux/doxygen-1.4.1/bin/doxygen";
+
+      @set %CSF_DOXIGEN         = "/PRODUCTS/maintenance/Linux/doxygen-1.4.1/bin/doxygen";
       @set %CSF_GRAPHVIZ_HOME    = "/PRODUCTS/maintenance/Linux/graphviz/bin";
 
       @set %CSF_X11_INCLUDE = "-I/usr/X11R6/include ";
       @set %CSF_OPENGL_INCLUDE = "-I/usr/X11R6/include ";
 
+      @set %CSF_ThreadLibs = "-lpthread" ;
       @set %X11_LIB = "/usr/X11R6/lib";
 
       @string %CSF_XwLibs = "-L" %X11_LIB " -lX11 -lXext -lXmu -lXi ";
@@ -200,8 +203,8 @@
         @set %STLPortInclude = "";
        @set %STLPortLib = "";
       @endif;
-      @set %CSF_CXX_SysOptions  = "-PIC -xchip=ultra -xarch=v8 -vdelx -Usun -instances=static" ;
-      @string %CSF_CXX_Options  = "-DSOLARIS -DNO_CXX_EXCEPTION "%STLPortInclude ;
+      @set %CSF_CXX_SysOptions  = "-PIC -xchip=ultra -xarch=v8 -vdelx -Usun -instances=static " ;
+      @string %CSF_CXX_Options  = "-DSOLARIS -DOCC_CONVERT_SIGNALS "%STLPortInclude ;
       --yan @string %CSF_CXX_INCLUDE += " -I/opt/DEV5_1/SUNWspro/SC4.2/include/CC ";
       @string %CSF_CXX_INCLUDE +=  " -I" %CSF_CXX_COMPILER "/../../SC4.2/include/CC ";
 
@@ -237,22 +240,28 @@
       @set %CSF_JAVA_COMPILER   = "javac";
       @set %CSF_JAVA_JNI        = "javah";
 
-      @set %CSF_SOCKETLibs = "-lsocket -lnsl -lsunmath -lm -ldl  -lc " ;
-      @set %CSF_RISCRETURNObject = "/missing/missing/risc_return.o" ;
+      @set %CSF_DOXIGEN         = "/dn02/users_Sun/cascade/doxigen/bin/doxigen";
+      @set %CSF_GRAPHVIZ_HOME    = "/dn02/users_Sun/cascade/graphviz";
+
 
+      @set %CSF_SOCKETLibs = "-lsocket -lnsl -lsunmath -lm -ldl  -lc " ;
+      ---@set %CSF_RISCRETURNObject = "/missing/missing/risc_return.o" ;
+      @set %CSF_RISCRETURNObject = "/dn01/KAS/dev/Gallery/src/EngineStarter/risc_return.o" ;
       --<< TODO : If applicable , modify the root location where TCL is installed.
-      @set %CSF_TCL_HOME = "/PRODUCTS/tcltk-83";
+      @set %CSF_TCL_HOME = "/PRODUCTS/tcltk-84";
       -->> END TODO
 
-      @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
-      @string %CSF_TclLibs     = "-L" %CSF_TCL_HOME "/lib -R" %CSF_TCL_HOME "/lib -ltcl "; 
-      @string %CSF_TclTkLibs   = "-L" %CSF_TCL_HOME "/lib -R" %CSF_TCL_HOME "/lib -ltk "; 
+      @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include -DUSE_NON_CONST ";
+      @string %CSF_TclLibs     = "-L" %CSF_TCL_HOME "/lib -R" %CSF_TCL_HOME "/lib -ltcl8.4 "; 
+      @string %CSF_TclTkLibs   = "-L" %CSF_TCL_HOME "/lib -R" %CSF_TCL_HOME "/lib -ltk8.4 "; 
 
 
       @set %X11_LIB            = "/usr/openwin/lib";
       @set %CSF_X11_INCLUDE    = "-I/usr/openwin/include/X11 ";
       @set %CSF_OPENGL_INCLUDE = "-I/usr/openwin/include ";
 
+      @set %CSF_ThreadLibs = "-lpthread" ;
+
       @string %CSF_dpsLibs = "-L" %X11_LIB " -ldps" ;
       @string %CSF_XwLibs  = "-L" %X11_LIB " -lX11 -lXext -lXmu";
       @string %CSF_OpenGlLibs = "-L" %X11_LIB " -lGLU -lGL " ;
@@ -279,7 +288,7 @@
       @endif;
 
       @set %CSF_CXX_SysOptions  = "-nologo -MD -W3 -GX -Ob1 -Zi ";
-      @string %CSF_CXX_Options  = "-DWNT -D_WINDOWS -DWIN32  " %STLPortInclude;
+      @string %CSF_CXX_Options  = "-DWNT -D_WINDOWS -DWIN32 " %STLPortInclude;
 
       --<< TODO : If applicable , modify the root location where c compiler is installed (same as above).
       @set %CSF_C_COMPILER   = "D:/DevTools/VStudio/VC98/bin/cl ";
@@ -290,12 +299,12 @@
       @set %CSF_C_Options    = "-DWNT -D_WINDOWS -DWIN32 ";
 
       --<< TODO : If applicable , modify the root location where the Fortran compiler is installed.
-      @set %CSF_F77_COMPILER = "D:/DevTools/VStudio/DF/bin/fl32 ";
+      @set %CSF_F77_COMPILER = "D:/DevTools/VStudio/DF98/bin/fl32 ";
       -->> END TODO
 
       @set %CSF_F77_SysOptions  = "-nologo -libs:dll -Zi ";
 
-      @set %CSF_LINKER = "D:/DevTools/VStudio/VC98/bin/link" ;
+      @set %CSF_LINKER = "D:/DevTools/VStudio/VC98/bin/link ";
       @set %CSF_CXX_COMPILERLINKER = %CSF_LINKER ;
       @set %CSF_VirtualDevice = "Q:";
       @set %CSF_LINKER_DBMSOpt = "";
@@ -317,14 +326,15 @@
       @set %CSF_JAVA_COMPILER   = "javac";
       @set %CSF_JAVA_JNI        = "javah";
 
-      @set %CSF_TCL_HOME = "D:/DevTools/Tcltk/tcl8.3";
+      @set %CSF_TCL_HOME = "D:/DevTools/TclTk/tcl8.4";
       @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
-      @string %CSF_TclLibs = %CSF_TCL_HOME "/lib/tcl83.lib";
-      @string %CSF_TclTkLibs = %CSF_TCL_HOME"/lib/tk83.lib ";
-      @string %CSF_TclTkxLibs = %CSF_TCL_HOME"/lib/tkx83.lib ";
- 
+      @string %CSF_TclLibs = %CSF_TCL_HOME "/lib/tcl84.lib";
+      @string %CSF_TclTkLibs = %CSF_TCL_HOME "/lib/tk84.lib";
+      @string %CSF_TclTkxLibs = %CSF_TCL_HOME"/lib/tkx84.lib ";
+
       @set %CSF_OpenGlLibs = "opengl32.lib glu32.lib" ;
 
+      @set %CSF_kernel32 = "kernel32.lib" ;
       @set %CSF_advapi32 = "advapi32.lib" ;
       @set %CSF_gdi32 = "gdi32.lib" ;
       @set %CSF_user32 = "user32.lib" ;
@@ -333,6 +343,7 @@
       @set %CSF_wsock32 = "wsock32.lib" ;
       @set %CSF_netapi32 = "netapi32.lib";
 
+
    @endif;
 
    --
@@ -356,27 +367,31 @@
         @set %STLPortInclude = "";
        @set %STLPortLib = "";
       @endif;
-      @set %CSF_LINKER = "";
-      @set %CSF_CXX_COMPILERLINKER = %CSF_CXX_COMPILER;
-      @set %CSF_LINKER_SysShared = "";
-      @set %CSF_LINKER_SysExe = "";
-      @set %CSF_LINKER_SysOpt = "-msym ";
-      @set %CSF_LINKER_SysLib = "";
-      
+
+      @set %CSF_CXX_SysOptions = "-shared ";
+      @set %CSF_CXX_Options = "-DDECOSF1 -DOCC_CONVERT_SIGNALS -D__USE_STD_IOSTREAM ";  
+      @set %CSF_CXX_INCLUDE = "-I/usr/include/cxx -I/dn01/KAS/dev/Dec ";
+
+      @set %CSF_C_SysOptions = ""; 
+      @set %CSF_C_Options = "-DDECOSF1 -O3 -DOCC_CONVERT_SIGNALS";         
+
       @set %CSF_TCL_HOME = "/usr/tcltk";
-      @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
+      @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include/itcl ";
 
-      @string %CSF_JavaHome     = "/missing/JavaHome";
-      @string %CSF_JAVA_INCLUDE = "-I" %CSF_JavaHome "/include -I" %CSF_JavaHome "/include/ultrix ";
+      @string %CSF_JavaHome     = "/PRODUCTS/java/j2sdk1_3_1";
+      @string %CSF_JAVA_INCLUDE = "-I" %CSF_JavaHome "/include -I" %CSF_JavaHome "/include/solaris ";
       @set %CSF_JAVA_COMPILER   = "javac";
       @set %CSF_JAVA_JNI        = "javah";
 
+      @set %CSF_ThreadLibs = "-lpthread" ;
+
       @set %X11_LIB = "/usr/shlib";
       @string %CSF_XwLibs  = "-L" %X11_LIB " -lX11 -lXext -lXmu";
       @set %CSF_dpsLibs = "-ldps" ;
-
-      @string %CSF_TclLibs = %CSF_TCL_HOME "/lib -rpath " %CSF_TCL_HOME "/lib -ltcl"; 
-      @string %CSF_TclTkLibs = %CSF_TCL_HOME "/lib -rpath " %CSF_TCL_HOME "/lib -ltcl"; 
+      @string %CSF_OpenGlLibs = "-L" %X11_LIB " -lGLU -lGL " %CSF_XwLibs ;
+      
+      @string %CSF_TclLibs = "-L" %CSF_TCL_HOME "/lib/itcl -ltcl7.5i"; 
+      @string %CSF_TclTkLibs = "-L" %CSF_TCL_HOME "/lib/itcl -ltk4.1i " %CSF_XwLibs; 
    @endif;
 
    --
@@ -389,7 +404,7 @@
 
       @set %CSF_C_COMPILER   = "cc ";
       @string %CSF_C_INCLUDE +=  "";
-      @set %CSF_C_SysOptions = " -signed -n32 -mips3 ";
+      @set %CSF_C_SysOptions = " -signed -n32 -mips4 ";
       @set %CSF_C_Options    = "-DIRIX ";
 
       @set %CSF_CXX_COMPILER   = "/usr/bin/CC ";
@@ -402,12 +417,11 @@
        @set %STLPortLib = "";
       @endif;
 
-      @set %CSF_CXX_SysOptions = " -signed -n32 -mips3 -no_prelink -woff 3115 -woff 3273 -woff 1021 -woff 1188 -woff 1460 -woff 3303";
-      @string %CSF_CXX_Options  = "-DIRIX -DNO_CXX_EXCEPTION " %STLPortInclude;
+      @set %CSF_CXX_SysOptions = " -signed -n32 -mips4 -woff 3115 -woff 3273 -woff 1021 -woff 1188 -woff 1460 -woff 3303 -ptused";
+      @string %CSF_CXX_Options  = "-DIRIX -DOCC_CONVERT_SIGNALS " %STLPortInclude;
 
 
       @set %CSF_F77_COMPILER = "f77 ";
-
       @set %CSF_LINKER = "/usr/bin/ld";
       @set %CSF_CXX_COMPILERLINKER = %CSF_CXX_COMPILER ;
       @set %CSF_LINKER_SysShared = " -shared ";
@@ -417,8 +431,8 @@
       @set %CSF_LINKER_CheckOpt = " -n32 -mips3 -mmap -multigot -no_unresolved ";
       @set %CSF_LINKER_CheckOut = " -o /dev/null";
 
-
       @set %CSF_FPELibs = "-L/usr/lib32 -lfpe" ;
+      @set %CSF_pthread = "-lpthread" ;
 
       @set %CSF_TCL_HOME = "/usr/tcltk.64";
       @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include/itcl ";
@@ -432,6 +446,7 @@
       @set %CSF_JAVA_COMPILER   = "javac";
       @set %CSF_JAVA_JNI        = "javah";
 
+      @set %CSF_ThreadLibs = "-lpthread" ;
 
       @set %X11_LIB = "/usr/lib32";
 
@@ -439,8 +454,8 @@
       @string %CSF_XwLibs  = "-L" %X11_LIB " -lX11 -lXext -lXmu";
       @string %CSF_OpenGlLibs = "-L" %X11_LIB " -lGLU -lGL " ;
 
-      @string %CSF_TclLibs   = "-L" %CSF_TCL_HOME "/lib/itcl -rpath " %CSF_TCL_HOME "/lib/itcl -ltcl"; 
-      @string %CSF_TclTkLibs = "-L" %CSF_TCL_HOME "/lib/itcl -rpath " %CSF_TCL_HOME "/lib/itcl -ltk"; 
+      @string %CSF_TclLibs   = "-L" %CSF_TCL_HOME "/lib/itcl -rpath " %CSF_TCL_HOME "/lib/itcl -ltcl7.5i"; 
+      @string %CSF_TclTkLibs = "-L" %CSF_TCL_HOME "/lib/itcl -rpath " %CSF_TCL_HOME "/lib/itcl -ltk4.1i"; 
    @endif;
 
    --
@@ -477,6 +492,8 @@
 
       @set %CSF_SOCKETLibs = "" ;
 
+      @set %CSF_ThreadLibs = "-lpthread" ;
+
       @set %X11_LIB = "/usr/lib/X11R6";
 
       @set %XMU_LIB = "/PRODUCTS/Xmu-R6";
@@ -526,6 +543,8 @@
       @set %CSF_TCL_HOME = "/missing/missing ";
       @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
 
+      @set %CSF_ThreadLibs = "-lpthread" ;
+
       @set %X11_LIB = "/usr/lpp/X11/lib/R6";
       @set %CSF_XwLibs = "-L/usr/lpp/X11/lib/R6 -lX11 -lXext -lXmu ";