[llvm-commits] [vmkit] r50352 - in /vmkit/trunk/lib/JnJVM: Classpath/ClasspathVMThread.cpp VMCore/JavaIsolate.cpp VMCore/JavaThread.h VMCore/ServiceDomain.cpp VMCore/ServiceDomain.h
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Mon Apr 28 09:11:55 PDT 2008
Author: geoffray
Date: Mon Apr 28 11:11:55 2008
New Revision: 50352
URL: http://llvm.org/viewvc/llvm-project?rev=50352&view=rev
Log:
Code cleanup for service-environments.
Modified:
vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp
vmkit/trunk/lib/JnJVM/VMCore/JavaThread.h
vmkit/trunk/lib/JnJVM/VMCore/ServiceDomain.cpp
vmkit/trunk/lib/JnJVM/VMCore/ServiceDomain.h
Modified: vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp?rev=50352&r1=50351&r2=50352&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Classpath/ClasspathVMThread.cpp Mon Apr 28 11:11:55 2008
@@ -26,6 +26,10 @@
#include "Jnjvm.h"
#include "NativeUtil.h"
+#ifdef SERVICE_VM
+#include "ServiceDomain.h"
+#endif
+
using namespace jnjvm;
extern "C" {
@@ -67,7 +71,7 @@
ts->nonDaemonLock->unlock();
}
-#ifdef SERVICE_DOMAIN
+#ifdef SERVICE_VM
((ServiceDomain*)isolate)->numThreads++;
#endif
JavaMethod* method = vmthClass->lookupMethod(Jnjvm::runName, Jnjvm::clinitType, ACC_VIRTUAL, true);
@@ -82,7 +86,7 @@
ts->nonDaemonLock->unlock();
}
-#ifdef SERVICE_DOMAIN
+#ifdef SERVICE_VM
((ServiceDomain*)isolate)->numThreads--;
#endif
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp?rev=50352&r1=50351&r2=50352&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaIsolate.cpp Mon Apr 28 11:11:55 2008
@@ -330,9 +330,6 @@
}
void JavaIsolate::executeClass(const char* className, ArrayObject* args) {
-#ifdef SERVICE_VM
- JavaThread::get()->executionTime = time(0);
-#endif
try {
JavaJIT::invokeOnceVoid(this, appClassLoader, className, "main",
"([Ljava/lang/String;)V", ACC_STATIC, args);
Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaThread.h?rev=50352&r1=50351&r2=50352&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaThread.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaThread.h Mon Apr 28 11:11:55 2008
@@ -45,8 +45,6 @@
static const unsigned int StateWaiting;
static const unsigned int StateInterrupted;
- JavaObject* cacheObject; // cache for allocations patching
-
virtual void print(mvm::PrintBuffer *buf) const;
virtual void TRACER;
virtual void destroyer(size_t sz);
@@ -62,9 +60,6 @@
static bool compareException(Class*);
static JavaObject* getJavaException();
void returnFromNative();
-#ifdef SERVICE_VM
- time_t executionTime;
-#endif
};
} // end namespace jnjvm
Modified: vmkit/trunk/lib/JnJVM/VMCore/ServiceDomain.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/ServiceDomain.cpp?rev=50352&r1=50351&r2=50352&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/ServiceDomain.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/ServiceDomain.cpp Mon Apr 28 11:11:55 2008
@@ -115,18 +115,10 @@
service->gcTriggered = 0;
service->numThreads = 0;
- service->loadBootstrap();
service->lock = mvm::Lock::allocNormal();
return service;
}
-void ServiceDomain::loadBootstrap() {
- // load and initialise math since it is responsible for dlopen'ing
- // libjavalang.so and we are optimizing some math operations
- //loadName(asciizConstructUTF8("java/lang/Math"),
- // CommonClass::jnjvmClassLoader, true, true, true);
-}
-
void ServiceDomain::serviceError(const char* str) {
fprintf(stderr, str);
abort();
@@ -140,36 +132,28 @@
extern "C" void serviceCallStart(ServiceDomain* caller,
ServiceDomain* callee) {
- assert(caller && "No caller in service stop?");
- assert(callee && "No callee in service stop?");
- assert(caller->getVirtualTable() == ServiceDomain::VT && "Caller not a service domain?");
- assert(callee->getVirtualTable() == ServiceDomain::VT && "Callee not a service domain?");
+ assert(caller && "No caller in service start?");
+ assert(callee && "No callee in service start?");
+ assert(caller->getVirtualTable() == ServiceDomain::VT &&
+ "Caller not a service domain?");
+ assert(callee->getVirtualTable() == ServiceDomain::VT &&
+ "Callee not a service domain?");
JavaThread* th = JavaThread::get();
th->isolate = callee;
-#ifdef SERVICE_VM
- time_t t = time(NULL);
caller->lock->lock();
- caller->executionTime += t - th->executionTime;
caller->interactions[callee]++;
caller->lock->unlock();
- th->executionTime = t;
-#endif
}
extern "C" void serviceCallStop(ServiceDomain* caller,
ServiceDomain* callee) {
assert(caller && "No caller in service stop?");
assert(callee && "No callee in service stop?");
- assert(caller->getVirtualTable() == ServiceDomain::VT && "Caller not a service domain?");
- assert(callee->getVirtualTable() == ServiceDomain::VT && "Callee not a service domain?");
+ assert(caller->getVirtualTable() == ServiceDomain::VT &&
+ "Caller not a service domain?");
+ assert(callee->getVirtualTable() == ServiceDomain::VT &&
+ "Callee not a service domain?");
JavaThread* th = JavaThread::get();
th->isolate = caller;
-#ifdef SERVICE_VM
- time_t t = time(NULL);
- callee->lock->lock();
- callee->executionTime += t - th->executionTime;
- callee->lock->unlock();
- th->executionTime = t;
-#endif
}
Modified: vmkit/trunk/lib/JnJVM/VMCore/ServiceDomain.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/ServiceDomain.h?rev=50352&r1=50351&r2=50352&view=diff
==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/ServiceDomain.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/ServiceDomain.h Mon Apr 28 11:11:55 2008
@@ -39,14 +39,12 @@
virtual void print(mvm::PrintBuffer* buf) const;
virtual void TRACER;
virtual void destroyer(size_t sz);
- void loadBootstrap();
static ServiceDomain* allocateService(JavaIsolate* callingVM);
llvm::GlobalVariable* llvmDelegatee();
void serviceError(const char* str);
mvm::Lock* lock;
ClassMap* classes;
- struct timeval started;
uint64 executionTime;
uint64 memoryUsed;
uint64 gcTriggered;
More information about the llvm-commits
mailing list