[llvm-commits] [vmkit] r48945 - /vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Sat Mar 29 07:35:25 2008
New Revision: 48945

URL: http://llvm.org/viewvc/llvm-project?rev=48945&view=rev
Log:
Distinguish between single execution and isolates when creating isolates

Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp?rev=48945&r1=48944&r2=48945&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp Sat Mar 29 07:35:25 2008
@@ -451,8 +451,10 @@
   isolate->loadedFields = FieldMap::allocate();
   isolate->javaTypes = jnjvm::TypeMap::allocate(); 
   isolate->globalRefsLock = mvm::Lock::allocNormal();
+#ifndef SINGLE_VM
   isolate->statics = StaticInstanceMap::allocate();  
   isolate->delegatees = DelegateeMap::allocate(); 
+#endif
 
   return isolate;
 }
@@ -499,6 +501,8 @@
 #ifndef SINGLE_VM
   isolate->statics = StaticInstanceMap::allocate();  
   isolate->delegatees = DelegateeMap::allocate(); 
+#else
+  isolate->threadSystem = ThreadSystem::allocateThreadSystem();
 #endif
   
   return isolate;