| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 20 Nov 2014 18:02:03 +0100
From: Jan Kiszka <jan.kiszka@...mens.com>
To: Thomas Gleixner <tglx@...utronix.de>, linux-kernel@...r.kernel.org
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Jason Wessel <jason.wessel@...driver.com>,
kgdb-bugreport@...ts.sourceforge.net,
Andi Kleen <andi@...stfloor.org>,
Tom Tromey <tromey@...hat.com>,
Ben Widawsky <ben@...dawsk.net>, Borislav Petkov <bp@...e.de>,
Tatiana Al-Chueyr Martins <tatiana.alchueyr@...il.com>
Subject: [PATCH v10 26/27] scripts/gdb: Convert CpuList to generator function
Yet another code simplification.
Signed-off-by: Jan Kiszka <jan.kiszka@...mens.com>
---
scripts/gdb/linux/cpus.py | 71 ++++++++++++++++++++------------------------
scripts/gdb/linux/modules.py | 2 +-
2 files changed, 33 insertions(+), 40 deletions(-)
diff --git a/scripts/gdb/linux/cpus.py b/scripts/gdb/linux/cpus.py
index 8045871..4297b83 100644
--- a/scripts/gdb/linux/cpus.py
+++ b/scripts/gdb/linux/cpus.py
@@ -61,50 +61,43 @@ def cpu_mask_invalidate(event):
gdb.events.new_objfile.disconnect(cpu_mask_invalidate)
-class CpuList():
- def __init__(self, mask_name):
- global cpu_mask
- self.mask = None
- if mask_name in cpu_mask:
- self.mask = cpu_mask[mask_name]
- if self.mask is None:
- self.mask = gdb.parse_and_eval(mask_name + ".bits")
- if hasattr(gdb, 'events'):
- cpu_mask[mask_name] = self.mask
- gdb.events.stop.connect(cpu_mask_invalidate)
- if hasattr(gdb.events, 'new_objfile'):
- gdb.events.new_objfile.connect(cpu_mask_invalidate)
- self.bits_per_entry = self.mask[0].type.sizeof * 8
- self.num_entries = self.mask.type.sizeof * 8 / self.bits_per_entry
- self.entry = -1
- self.bits = 0
-
- def __iter__(self):
- return self
-
- def __next__(self):
- while self.bits == 0:
- self.entry += 1
- if self.entry == self.num_entries:
- raise StopIteration
- self.bits = self.mask[self.entry]
- if self.bits != 0:
- self.bit = 0
+def cpu_list(mask_name):
+ global cpu_mask
+ mask = None
+ if mask_name in cpu_mask:
+ mask = cpu_mask[mask_name]
+ if mask is None:
+ mask = gdb.parse_and_eval(mask_name + ".bits")
+ if hasattr(gdb, 'events'):
+ cpu_mask[mask_name] = mask
+ gdb.events.stop.connect(cpu_mask_invalidate)
+ if hasattr(gdb.events, 'new_objfile'):
+ gdb.events.new_objfile.connect(cpu_mask_invalidate)
+ bits_per_entry = mask[0].type.sizeof * 8
+ num_entries = mask.type.sizeof * 8 / bits_per_entry
+ entry = -1
+ bits = 0
+
+ while True:
+ while bits == 0:
+ entry += 1
+ if entry == num_entries:
+ return
+ bits = mask[entry]
+ if bits != 0:
+ bit = 0
break
- while self.bits & 1 == 0:
- self.bits >>= 1
- self.bit += 1
-
- cpu = self.entry * self.bits_per_entry + self.bit
+ while bits & 1 == 0:
+ bits >>= 1
+ bit += 1
- self.bits >>= 1
- self.bit += 1
+ cpu = entry * bits_per_entry + bit
- return cpu
+ bits >>= 1
+ bit += 1
- def next(self):
- return self.__next__()
+ yield cpu
class PerCpu(gdb.Function):
diff --git a/scripts/gdb/linux/modules.py b/scripts/gdb/linux/modules.py
index 6d49722..a1504c4 100644
--- a/scripts/gdb/linux/modules.py
+++ b/scripts/gdb/linux/modules.py
@@ -75,7 +75,7 @@ class LxLsmod(gdb.Command):
for module in module_list():
ref = 0
module_refptr = module['refptr']
- for cpu in cpus.CpuList("cpu_possible_mask"):
+ for cpu in cpus.cpu_list("cpu_possible_mask"):
refptr = cpus.per_cpu(module_refptr, cpu)
ref += refptr['incs']
ref -= refptr['decs']
--
1.8.4.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists