native: Object.wait()

Signed-off-by: imkiva <[email protected]>
imkiva · May 28, 2018 · 4d09a36 · 4d09a36
1 parent dc63433
commit 4d09a36
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/include/kivm/oop/oop.h b/include/kivm/oop/oop.h
@@ -26,9 +26,11 @@ namespace kivm {
         static void *operator new(size_t size, bool = true) noexcept;
 
         static void *operator new(size_t size, const std::nothrow_t &) noexcept = delete;
+
         static void *operator new[](size_t size, bool = true) throw();
 
         static void *operator new[](size_t size, const std::nothrow_t &) noexcept = delete;
+
         static void operator delete(void *ptr);
 
         static void operator delete[](void *ptr);
@@ -65,7 +67,7 @@ namespace kivm {
 
         inline void wait() { _monitor.wait(); }
 
-        inline void wait(long macro_sec) { _monitor.wait(macro_sec); }
+        inline void wait(jlong timeout) { _monitor.wait((jlong) timeout); }
 
         inline void notify() { _monitor.notify(); }
 

diff --git a/include/shared/monitor.h b/include/shared/monitor.h
@@ -43,7 +43,7 @@ namespace kivm {
             _cond.wait(_lock);
         }
 
-        void wait(long millisecond) {
+        void wait(jlong millisecond) {
             _cond.wait_for(_lock, std::chrono::milliseconds(millisecond));
         }
 

diff --git a/src/kivm/native/java_lang_Object.cpp b/src/kivm/native/java_lang_Object.cpp
@@ -62,3 +62,12 @@ JAVA_NATIVE void Java_java_lang_Object_notify(JNIEnv *env, jobject javaObject) {
     auto object = Resolver::javaOop(javaObject);
     object->getMarkOop()->notify();
 }
+
+JAVA_NATIVE void Java_java_lang_Object_wait(JNIEnv *env, jobject javaObject, jlong timeout) {
+    auto object = Resolver::javaOop(javaObject);
+    if (timeout == 0) {
+        object->getMarkOop()->wait();
+    } else {
+        object->getMarkOop()->wait(timeout);
+    }
+}