Tidy up

cloudfoundry · Jun 14, 2017 · dbda939 · dbda939
1 parent 5951d0b
commit dbda939
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/src/agentcontroller/controller.rs b/src/agentcontroller/controller.rs
@@ -43,21 +43,23 @@ impl<'a> AgentController<'a> {
 }
 
 impl<'a> super::MutAction for AgentController<'a> {
-    fn on_oom(&mut self, jni_env: ::env::JniEnv, resourceExhaustionFlags: ::jvmti::jint) {
-        let heap_exhausted = ::jvmti::JVMTI_RESOURCE_EXHAUSTED_JAVA_HEAP as ::jvmti::jint;
-        let threads_exhausted = ::jvmti::JVMTI_RESOURCE_EXHAUSTED_THREADS as ::jvmti::jint;
-        if resourceExhaustionFlags & heap_exhausted == heap_exhausted {
+    fn on_oom(&mut self, jni_env: ::env::JniEnv, resource_exhaustion_flags: ::jvmti::jint) {
+        const heap_exhausted: ::jvmti::jint = ::jvmti::JVMTI_RESOURCE_EXHAUSTED_JAVA_HEAP as ::jvmti::jint;
+        const threads_exhausted: ::jvmti::jint = ::jvmti::JVMTI_RESOURCE_EXHAUSTED_THREADS as ::jvmti::jint;
+        const oom_error: ::jvmti::jint = ::jvmti::JVMTI_RESOURCE_EXHAUSTED_OOM_ERROR as ::jvmti::jint;
+
+        if resource_exhaustion_flags & heap_exhausted == heap_exhausted {
             eprintln!("\nResource exhaustion event: the JVM was unable to allocate memory from the heap.");
         }
-        if resourceExhaustionFlags & threads_exhausted == threads_exhausted {
+        if resource_exhaustion_flags & threads_exhausted == threads_exhausted {
             eprintln!("\nResource exhaustion event: the JVM was unable to create a thread.");
         }
 
         if self.heuristic.on_oom() {
             for action in &self.actions {
-                action.on_oom(jni_env, resourceExhaustionFlags);
+                action.on_oom(jni_env, resource_exhaustion_flags);
             }
-        } else {
+        } else if resource_exhaustion_flags & oom_error == oom_error {
             eprintln!("\nThe JVM is about to throw a java.lang.OutOfMemoryError.");
         }
     }

diff --git a/src/agentcontroller/heaphistogram.rs b/src/agentcontroller/heaphistogram.rs
@@ -27,6 +27,6 @@ impl HeapHistogram {
 }
 
 impl super::Action for HeapHistogram {
-    fn on_oom(&self, jni_env: ::env::JniEnv, resourceExhaustionFlags: ::jvmti::jint) {
+    fn on_oom(&self, jni_env: ::env::JniEnv, resource_exhaustion_flags: ::jvmti::jint) {
     }
 }
diff --git a/src/agentcontroller/mod.rs b/src/agentcontroller/mod.rs
@@ -18,7 +18,7 @@ pub mod controller;
 
 pub trait MutAction {
     // See https://docs.oracle.com/javase/8/docs/platform/jvmti/jvmti.html#jvmtiResourceExhaustionFlags
-    fn on_oom(&mut self, jni_env: ::env::JniEnv, resourceExhaustionFlags: ::jvmti::jint);
+    fn on_oom(&mut self, jni_env: ::env::JniEnv, resource_exhaustion_flags: ::jvmti::jint);
 }
 
 mod heaphistogram;
@@ -32,5 +32,5 @@ trait Heuristic {
 
 trait Action {
     // See https://docs.oracle.com/javase/8/docs/platform/jvmti/jvmti.html#jvmtiResourceExhaustionFlags
-    fn on_oom(&self, jni_env: ::env::JniEnv, resourceExhaustionFlags: ::jvmti::jint);
+    fn on_oom(&self, jni_env: ::env::JniEnv, resource_exhaustion_flags: ::jvmti::jint);
 }
diff --git a/src/lib.rs b/src/lib.rs
@@ -53,8 +53,8 @@ impl<'a> AgentContext<'a> {
         self.ac = Some(a);
     }
 
-    pub fn on_oom(&mut self, jni_env: ::env::JniEnv, resourceExhaustionFlags: ::jvmti::jint) {
-        self.ac.as_mut().map(|mut a| a.on_oom(jni_env, resourceExhaustionFlags));
+    pub fn on_oom(&mut self, jni_env: ::env::JniEnv, resource_exhaustion_flags: ::jvmti::jint) {
+        self.ac.as_mut().map(|mut a| a.on_oom(jni_env, resource_exhaustion_flags));
     }
 }