Merge pull request #2333 from gacholio/vmcheck

Atomic-free JNI work
eclipse-openj9 · Jul 5, 2018 · bf93b31 · bf93b31
2 parents 8a36fcd + 66ac77d
commit bf93b31
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/runtime/vmchk/checkthreads.c b/runtime/vmchk/checkthreads.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 1991, 2017 IBM Corp. and others
+ * Copyright (c) 1991, 2018 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -67,8 +67,13 @@ checkJ9VMThreadSanity(J9JavaVM *vm)
 	do {
 		verifyJ9VMThread(vm, thread);
 
-		if (J9_PUBLIC_FLAGS_VM_ACCESS == (DBG_ARROW(thread, publicFlags) & J9_PUBLIC_FLAGS_VM_ACCESS)) {
-			numberOfThreadsWithVMAccess++;
+#if defined(J9VM_INTERP_ATOMIC_FREE_JNI)
+		if (!DBG_ARROW(thread, inNative))
+#endif /* J9VM_INTERP_ATOMIC_FREE_JNI */
+		{
+			if (J9_PUBLIC_FLAGS_VM_ACCESS == (DBG_ARROW(thread, publicFlags) & J9_PUBLIC_FLAGS_VM_ACCESS)) {
+				numberOfThreadsWithVMAccess++;
+			}
 		}
 
 		count++;