[vmkit-commits] [vmkit] r59750 - /vmkit/trunk/tools/vmkit/Launcher.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Thu Nov 20 15:41:26 2008
New Revision: 59750

URL: http://llvm.org/viewvc/llvm-project?rev=59750&view=rev
Log:
Don't forget to wait for the vm to exit before quitting the program. And enable the GC.


Modified:
    vmkit/trunk/tools/vmkit/Launcher.cpp

Modified: vmkit/trunk/tools/vmkit/Launcher.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/Launcher.cpp?rev=59750&r1=59749&r2=59750&view=diff

==============================================================================
--- vmkit/trunk/tools/vmkit/Launcher.cpp (original)
+++ vmkit/trunk/tools/vmkit/Launcher.cpp Thu Nov 20 15:41:26 2008
@@ -63,19 +63,20 @@
   mvm::MvmModule::initialise(Fast);
   mvm::Object::initialise();
   Collector::initialise(0);
-  Collector::enable(0);
   
   if (VMToRun == RunJava) {
 #if WITH_JNJVM
     mvm::CompilationUnit* CU = mvm::VirtualMachine::initialiseJVM();
     mvm::VirtualMachine* vm = mvm::VirtualMachine::createJVM(CU);
     vm->runApplication(argc, argv);
+    vm->waitForExit();
 #endif
   } else if (VMToRun == RunNet) {
 #if WITH_N3
     mvm::CompilationUnit* CU = mvm::VirtualMachine::initialiseCLIVM();
     mvm::VirtualMachine* vm = mvm::VirtualMachine::createCLIVM(CU);
     vm->runApplication(argc, argv);
+    vm->waitForExit();
 #endif
   } else {
     mvm::CommandLine MyCl;