summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Cavalca <dcavalca@fb.com>2020-03-11 15:48:45 -0700
committerDavide Cavalca <dcavalca@fb.com>2020-03-11 16:06:49 -0700
commit7c77abc44ac95204a8e9fd2657bdae459b90579a (patch)
tree75d9c8c6c8c7224db8bfb2695d7836922b742b12
parentffb4766ddac5b8d220ee7140ce7f9ff0446ce9cc (diff)
downloadohai-7c77abc44ac95204a8e9fd2657bdae459b90579a.tar.gz
interrupts: address review comments
Signed-off-by: Davide Cavalca <dcavalca@fb.com>
-rw-r--r--lib/ohai/plugins/linux/interrupts.rb10
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/ohai/plugins/linux/interrupts.rb b/lib/ohai/plugins/linux/interrupts.rb
index 600259ff..d4c9309f 100644
--- a/lib/ohai/plugins/linux/interrupts.rb
+++ b/lib/ohai/plugins/linux/interrupts.rb
@@ -59,16 +59,12 @@ Ohai.plugin(:Interrupts) do
interrupts[:irq][irqn] = Mash.new
interrupts[:irq][irqn][:events_by_cpu] = Mash.new
- fields = fields.split(" ", cpus + 1)
+ fields = fields.split(nil, cpus + 1)
(0..cpus - 1).each do |cpu|
- if /\d+/.match(fields[cpu])
- interrupts[:irq][irqn][:events_by_cpu][cpu] = fields[cpu].to_i
- else
- interrupts[:irq][irqn][:events_by_cpu][cpu] = 0
- end
+ interrupts[:irq][irqn][:events_by_cpu][cpu] = fields[cpu].to_i
end
# Only regular IRQs have extra fields and affinity settings
- if /\d+/.match(irqn)
+ if /^\d+$/.match(irqn)
interrupts[:irq][irqn][:type],
interrupts[:irq][irqn][:vector],
interrupts[:irq][irqn][:device] =