[vmkit-commits] [vmkit] r121366 - in /vmkit/branches/multi-vm: include/mvm/VirtualMachine.h lib/J3/VMCore/Jnjvm.cpp lib/J3/VMCore/Jnjvm.h lib/Mvm/Runtime/VirtualMachine.cpp

[Gael Thomas]

Author: gthomas
Date: Thu Dec  9 05:55:47 2010
New Revision: 121366

URL: http://llvm.org/viewvc/llvm-project?rev=121366&view=rev
Log:
uses the new runApplication function

Modified:
    vmkit/branches/multi-vm/include/mvm/VirtualMachine.h
    vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp
    vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h
    vmkit/branches/multi-vm/lib/Mvm/Runtime/VirtualMachine.cpp

Modified: vmkit/branches/multi-vm/include/mvm/VirtualMachine.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/include/mvm/VirtualMachine.h?rev=121366&r1=121365&r2=121366&view=diff
==============================================================================
--- vmkit/branches/multi-vm/include/mvm/VirtualMachine.h (original)
+++ vmkit/branches/multi-vm/include/mvm/VirtualMachine.h Thu Dec  9 05:55:47 2010
@@ -58,11 +58,11 @@
 
 	/// runApplication - launch runApplicationImpl in a vmkit thread. The vmData is not allocated.
 	///
-	void runApplication0(int argc, char** argv);
+	void runApplication(int argc, char** argv);
 
 	/// runApplication - launch starter in a vmkit thread. The vmData is not allocated.
 	///
-	void runApplication0(void (*starter)(VirtualMachine* vm, int argc, char** argv), int argc, char** argv);
+	void runApplication(void (*starter)(VirtualMachine* vm, int argc, char** argv), int argc, char** argv);
   
 //===----------------------------------------------------------------------===//
 // (2) GC-related methods.

Modified: vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp?rev=121366&r1=121365&r2=121366&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp Thu Dec  9 05:55:47 2010
@@ -1316,12 +1316,6 @@
 	mainJavaStart(mvm::Thread::get());
 }
 
-void Jnjvm::runApplication(int argc, char** argv) {
-  argumentsInfo.argc = argc;
-  argumentsInfo.argv = argv;
-  JavaThread::create(this)->mut->start((void (*)(mvm::Thread*))mainJavaStart);
-}
-
 Jnjvm::Jnjvm(mvm::BumpPtrAllocator& Alloc, mvm::VMKit* vmkit, JavaCompiler* Comp, bool dlLoad) : 
 	VirtualMachine(Alloc, vmkit), 
 	lockSystem(Alloc) {

Modified: vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h?rev=121366&r1=121365&r2=121366&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h Thu Dec  9 05:55:47 2010
@@ -282,11 +282,6 @@
 	///
   virtual void runApplicationImpl(int argc, char** argv);
   
-  /// runApplication - Runs the application with the given command line.
-  /// User-visible function, inherited by the VirtualMachine class.
-  ///
-  virtual void runApplication(int argc, char** argv);
-
 	/// associateBootstrapJavaThread - allocate a bootstrap java thread for the underlying mutator during bootstrap. 
 	///
 	void associateBootstrapJavaThread();

Modified: vmkit/branches/multi-vm/lib/Mvm/Runtime/VirtualMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/Mvm/Runtime/VirtualMachine.cpp?rev=121366&r1=121365&r2=121366&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/Mvm/Runtime/VirtualMachine.cpp (original)
+++ vmkit/branches/multi-vm/lib/Mvm/Runtime/VirtualMachine.cpp Thu Dec  9 05:55:47 2010
@@ -1,5 +1,6 @@
 #include "mvm/VirtualMachine.h"
 #include "mvm/VMKit.h"
+#include "MutatorThread.h"
 
 using namespace mvm;
 
@@ -12,14 +13,14 @@
 	vmkit->removeVM(vmID);
 }
 
-class LauncherThread : public Thread {
+class LauncherThread : public MutatorThread {
 public:
- 	void (*realStart)(VirtualMachine*, int, char**);
- 	VirtualMachine *vm;
- 	int argc;
- 	char** argv;
+ 	void          (*realStart)(VirtualMachine*, int, char**);
+ 	VirtualMachine* vm;
+ 	int             argc;
+ 	char**          argv;
 
- 	LauncherThread(VMKit* vmkit, void (*s)(VirtualMachine*, int, char**), VirtualMachine* v, int ac, char** av) : Thread(vmkit) {
+ 	LauncherThread(VMKit* vmkit, void (*s)(VirtualMachine*, int, char**), VirtualMachine* v, int ac, char** av) : MutatorThread(vmkit) {
  		realStart = s;
  		vm = v;
  		argc = ac;
@@ -34,10 +35,10 @@
  	}
 };
 
-void VirtualMachine::runApplication0(void (*starter)(VirtualMachine*, int, char**), int argc, char **argv) {
+void VirtualMachine::runApplication(void (*starter)(VirtualMachine*, int, char**), int argc, char **argv) {
 	(new LauncherThread(vmkit, starter, this, argc, argv))->start((void (*)(Thread*))LauncherThread::launch);
 }
 
-void VirtualMachine::runApplication0(int argc, char** argv) {
-	runApplication0(0, argc, argv);
+void VirtualMachine::runApplication(int argc, char** argv) {
+	runApplication(0, argc, argv);
 }