From cd009965838afa51f5aaafd0bd814fa5b0e221ac Mon Sep 17 00:00:00 2001
From: Carsten Grohmann <mail@carstengrohmann.de>
Date: Sun, 5 Jan 2020 01:07:26 +0100
Subject: [PATCH] Rename item according to the naming convention

---
 OOMAnalyser.html | 8 ++++----
 OOMAnalyser.py   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/OOMAnalyser.html b/OOMAnalyser.html
index 74326d3..c7a236c 100644
--- a/OOMAnalyser.html
+++ b/OOMAnalyser.html
@@ -197,8 +197,8 @@ function goBack() {
     <div id="explanation">
         <p>
             The process &quot;<span id="explain_trigger_proc_name"></span>&quot; (pid <span id="explain_trigger_proc_pid"></span>)
-            requested <span class="text--append-suffix-kbytes" id="explain_trigger_proc_requested_memory_kbytes"></span>
-            (<span class="text--append-suffix-pages" id="explain_trigger_proc_requested_memory"></span>) memory.
+            requested <span class="text--append-suffix-kbytes" id="explain_trigger_proc_requested_memory_pages_kb"></span>
+            (<span class="text--append-suffix-pages" id="explain_trigger_proc_requested_memory_pages"></span>) memory.
 
             The system couldn't satisfy this request and started the OOM killer to free memory. The OOM killer
             calculates a score for each process and terminates the process with the highest score.
@@ -273,8 +273,8 @@ r'^Killed process \d+ \(.*\) total-vm:(?P<system_total_vm_kb>\d+)kB, anon-rss:(?
         <tr>
             <td>Requested memory<br>(order)</td>
             <td class="text--align-right">
-                <span id="trigger_proc_requested_memory"></span> (2<span id="trigger_proc_order" class="text__superscript"></span>) pages /
-                <span class="text--append-suffix-kbytes" id="trigger_proc_requested_memory_kbytes"></span>
+                <span id="trigger_proc_requested_memory_pages"></span> (2<span class="text__superscript" id="trigger_proc_order"></span>) pages /
+                <span class="text--append-suffix-kbytes" id="trigger_proc_requested_memory_pages_kb"></span>
             </td>
             <td>The kernel specifies the requested number of pages as exponent of power of two.
         </tr>
diff --git a/OOMAnalyser.py b/OOMAnalyser.py
index 47ad62c..80287cc 100644
--- a/OOMAnalyser.py
+++ b/OOMAnalyser.py
@@ -605,8 +605,8 @@ class OOMAnalyser(object):
 
     def _calc_trigger_process_values(self):
         """Calculate all values related with the trigger process"""
-        self.results['trigger_proc_requested_memory'] = 2 ** self.results['trigger_proc_order']
-        self.results['trigger_proc_requested_memory_kbytes'] = self.results['page_size']
+        self.results['trigger_proc_requested_memory_pages'] = 2 ** self.results['trigger_proc_order']
+        self.results['trigger_proc_requested_memory_pages_kb'] = self.results['page_size']
 
         # process gfp_mask
         if self.results['trigger_proc_gfp_flags'] != '<not found>':     # None has been is converted to '<not found>'
@@ -1123,7 +1123,7 @@ Killed process 6576 (java) total-vm:33914892kB, anon-rss:20629004kB, file-rss:0k
         # copy entries for explanation section
         for i in ('killed_proc_name', 'killed_proc_pid', 'killed_proc_rss_kb', 'killed_proc_score', 'page_size',
                   'ram_pages', 'swap_total_kb', 'swap_used_kb', 'trigger_proc_name', 'trigger_proc_pid',
-                  'trigger_proc_requested_memory', 'trigger_proc_requested_memory_kbytes',
+                  'trigger_proc_requested_memory_pages', 'trigger_proc_requested_memory_pages_kb',
                   ):
             self.oom_details['explain_'+i] = self.oom_details.get(i)