[vmkit-commits] [vmkit] r59252 - in /vmkit/trunk: include/mvm/VirtualMachine.h lib/JnJVM/Classpath/ClasspathVMThread.cpp lib/JnJVM/VMCore/JavaInitialise.cpp lib/JnJVM/VMCore/JavaJIT.cpp lib/JnJVM/VMCore/JavaJITOpcodes.cpp lib/JnJVM/VMCore/JavaObject.cpp lib/JnJVM/VMCore/JavaRuntimeJIT.cpp lib/JnJVM/VMCore/JavaThread.cpp lib/JnJVM/VMCore/Jnjvm.cpp lib/JnJVM/VMCore/JnjvmModule.cpp lib/JnJVM/VMCore/JnjvmModule.h lib/JnJVM/VMCore/VirtualTables.cpp
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Thu Nov 13 09:47:27 PST 2008
Author: geoffray
Date: Thu Nov 13 11:47:23 2008
New Revision: 59252
URL: http://llvm.org/viewvc/llvm-project?rev=59252&view=rev
Log:
Code cleanup: remove SERVICE_VM and SERVICE_GC macros.
Modified:
vmkit/trunk/include/mvm/VirtualMachine.h
vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaInitialise.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaJITOpcodes.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp
vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.h
vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp
Modified: vmkit/trunk/include/mvm/VirtualMachine.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/VirtualMachine.h?rev=59252&r1=59251&r2=59252&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/VirtualMachine.h (original)
+++ vmkit/trunk/include/mvm/VirtualMachine.h Thu Nov 13 11:47:23 2008
@@ -51,6 +51,8 @@
#ifdef SERVICE
uint64_t memoryUsed;
uint64_t gcTriggered;
+ uint64_t executionTime;
+ uint64_t numThreads;
#endif
mvm::Allocator gcAllocator;
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp?rev=59252&r1=59251&r2=59252&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp Thu Nov 13 11:47:23 2008
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include <string.h>
+#include <cstring>
#include "types.h"
@@ -23,10 +23,6 @@
#include "Jnjvm.h"
#include "NativeUtil.h"
-#ifdef SERVICE_VM
-#include "ServiceDomain.h"
-#endif
-
using namespace jnjvm;
extern "C" {
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaInitialise.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaInitialise.cpp?rev=59252&r1=59251&r2=59252&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaInitialise.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaInitialise.cpp Thu Nov 13 11:47:23 2008
@@ -14,10 +14,6 @@
#include "JavaThread.h"
#include "Jnjvm.h"
-#ifdef SERVICE_VM
-#include "ServiceDomain.h"
-#endif
-
#ifdef ISOLATE_SHARING
#include "SharedMaps.h"
#include "IsolateSharedLoader.h"
@@ -43,9 +39,6 @@
INIT(UserClassArray);
INIT(UserConstantPool);
#endif
-#ifdef SERVICE_VM
- INIT(ServiceDomain);
-#endif
#undef INIT
#define INIT(X) { \
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp?rev=59252&r1=59251&r2=59252&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp Thu Nov 13 11:47:23 2008
@@ -12,7 +12,7 @@
#define JNJVM_COMPILE 0
#define JNJVM_EXECUTE 0
-#include <string.h>
+#include <cstring>
#include <llvm/Constants.h>
#include <llvm/DerivedTypes.h>
@@ -43,10 +43,6 @@
#include "Reader.h"
#include "Zip.h"
-#ifdef SERVICE_VM
-#include "ServiceDomain.h"
-#endif
-
using namespace jnjvm;
using namespace llvm;
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaJITOpcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaJITOpcodes.cpp?rev=59252&r1=59251&r2=59252&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaJITOpcodes.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaJITOpcodes.cpp Thu Nov 13 11:47:23 2008
@@ -36,10 +36,6 @@
#include "OpcodeNames.def"
-#ifdef SERVICE_VM
-#include "ServiceDomain.h"
-#endif
-
using namespace jnjvm;
using namespace llvm;
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp?rev=59252&r1=59251&r2=59252&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaObject.cpp Thu Nov 13 11:47:23 2008
@@ -17,10 +17,6 @@
#include "JavaThread.h"
#include "Jnjvm.h"
-#ifdef SERVICE_VM
-#include "ServiceDomain.h"
-#endif
-
using namespace jnjvm;
void JavaCond::notify() {
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp?rev=59252&r1=59251&r2=59252&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp Thu Nov 13 11:47:23 2008
@@ -24,10 +24,6 @@
#include "Jnjvm.h"
#include "LockedMap.h"
-#ifdef SERVICE_VM
-#include "ServiceDomain.h"
-#endif
-
using namespace jnjvm;
extern "C" void* jnjvmVirtualLookup(CacheNode* cache, JavaObject *obj) {
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp?rev=59252&r1=59251&r2=59252&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaThread.cpp Thu Nov 13 11:47:23 2008
@@ -37,13 +37,6 @@
interruptFlag = 0;
state = StateRunning;
pendingException = 0;
-#ifdef SERVICE_VM
- ServiceDomain* domain = (ServiceDomain*)vm;
- domain->startExecution();
- domain->lock->lock();
- domain->numThreads++;
- domain->lock->unlock();
-#endif
}
JavaThread::~JavaThread() {}
Modified: vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp?rev=59252&r1=59251&r2=59252&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp Thu Nov 13 11:47:23 2008
@@ -9,12 +9,12 @@
#define JNJVM_LOAD 0
-#include <float.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cfloat>
+#include <climits>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
#include "debug.h"
#include "mvm/JIT.h"
@@ -33,9 +33,6 @@
#include "JnjvmModuleProvider.h"
#include "LockedMap.h"
#include "Reader.h"
-#ifdef SERVICE_VM
-#include "ServiceDomain.h"
-#endif
#include "Zip.h"
using namespace jnjvm;
@@ -858,10 +855,6 @@
vm->loadBootstrap();
-#ifdef SERVICE_VM
- ServiceDomain::initialise((ServiceDomain*)vm);
-#endif
-
ClArgumentsInfo& info = vm->argumentsInfo;
if (info.agents.size()) {
Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp?rev=59252&r1=59251&r2=59252&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp Thu Nov 13 11:47:23 2008
@@ -1089,15 +1089,6 @@
#endif
#endif
-#ifdef SERVICE_VM
- AquireObjectInSharedDomainFunction =
- module->getFunction("JavaObjectAquireInSharedDomain");
- ReleaseObjectInSharedDomainfunction =
- module->getFunction("JavaObjectReleaseInSharedDomain");
- ServiceCallStartFunction = module->getFunction("serviceCallStart");
- ServiceCallStopFunction = module->getFunction("serviceCallStop");
-#endif
-
#ifdef WITH_TRACER
MarkAndTraceFunction = module->getFunction("MarkAndTrace");
JavaObjectTracerFunction = module->getFunction("JavaObjectTracer");
Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.h?rev=59252&r1=59251&r2=59252&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.h Thu Nov 13 11:47:23 2008
@@ -288,12 +288,6 @@
llvm::Function* AquireObjectFunction;
llvm::Function* ReleaseObjectFunction;
llvm::Function* GetConstantPoolAtFunction;
-#ifdef SERVICE_VM
- llvm::Function* AquireObjectInSharedDomainFunction;
- llvm::Function* ReleaseObjectInSharedDomainFunction;
- llvm::Function* ServiceCallStartFunction;
- llvm::Function* ServiceCallStopFunction;
-#endif
llvm::Function* MultiCallNewFunction;
#ifdef ISOLATE
Modified: vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp?rev=59252&r1=59251&r2=59252&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/VirtualTables.cpp Thu Nov 13 11:47:23 2008
@@ -18,9 +18,7 @@
#include "Jnjvm.h"
#include "JnjvmClassLoader.h"
#include "LockedMap.h"
-#ifdef SERVICE_VM
-#include "ServiceDomain.h"
-#endif
+
#ifdef ISOLATE_SHARING
#include "SharedMaps.h"
#include "IsolateSharedLoader.h"
@@ -45,9 +43,6 @@
INIT(UserClassArray);
INIT(UserConstantPool);
#endif
-#ifdef SERVICE_VM
- INIT(ServiceDomain);
-#endif
#undef INIT
@@ -206,10 +201,3 @@
byteClasses->MARK_AND_TRACE;
}
#endif
-
-#ifdef SERVICE_VM
-void ServiceDomain::TRACER {
- JavaIsolate::CALL_TRACER;
- classes->MARK_AND_TRACE;
-}
-#endif
More information about the vmkit-commits
mailing list