37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From 4c95895113d549b5b3b84fe1282fb13d9f5823a0 Mon Sep 17 00:00:00 2001
|
|
From: Florian Weimer <fweimer@redhat.com>
|
|
Date: Fri, 29 May 2020 17:22:35 +0200
|
|
Subject: [PATCH 1/2] journal.sh: Count CPUs optimization
|
|
|
|
---
|
|
src/journal.sh | 13 ++++---------
|
|
1 file changed, 4 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/src/journal.sh b/src/journal.sh
|
|
index f7f2fbd..74dc525 100644
|
|
--- a/src/journal.sh
|
|
+++ b/src/journal.sh
|
|
@@ -872,15 +872,10 @@ __INTERNAL_CreateHeader(){
|
|
local line size
|
|
# CPU info
|
|
if [ -f "/proc/cpuinfo" ]; then
|
|
- local count=0
|
|
- local type="unknown"
|
|
- local cpu_regex="^model\sname.*: (.*)$"
|
|
- while read -r line; do
|
|
- if [[ "$line" =~ $cpu_regex ]]; then
|
|
- type="${BASH_REMATCH[1]}"
|
|
- let count++
|
|
- fi
|
|
- done < "/proc/cpuinfo"
|
|
+ local cpu_regex count type
|
|
+ cpu_regex="^model\sname.*: (.*)$"
|
|
+ count=$(grep -cE "$cpu_regex" /proc/cpuinfo)
|
|
+ type="$(grep -E -m 1 "$cpu_regex" /proc/cpuinfo | sed -r "s/$cpu_regex/\1/")"
|
|
__INTERNAL_WriteToMetafile hw_cpu -- "$count x $type"
|
|
__INTERNAL_LogText " CPUs : $count x $type" 2> /dev/null
|
|
fi
|
|
--
|
|
2.25.4
|
|
|