46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
|
From 51a68c31497d1895602d5c6851e23a9027d9675d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ankit Kumar <ankit@linux.vnet.ibm.com>
|
||
|
|
Date: Thu, 10 Aug 2017 15:04:32 +0530
|
||
|
|
Subject: [PATCH] Don't split by default
|
||
|
|
|
||
|
|
References: bsc#1036223, bsc#1068234
|
||
|
|
Patch-mainline: v0.8.17
|
||
|
|
Git-commit: 51a68c31497d1895602d5c6851e23a9027d9675d
|
||
|
|
|
||
|
|
Currently, we are default'ing to "SPILT" as well as multi-threading
|
||
|
|
when KDUMPTOOL_FLAGS="". Ensure split is enabled only when it is set
|
||
|
|
explicitly with KDUMPTOOL_FLAGS="SPLIT".
|
||
|
|
|
||
|
|
Signed-off-by: Ankit Kumar <ankit@linux.vnet.ibm.com>
|
||
|
|
---
|
||
|
|
kdumptool/savedump.cc | 11 ++++-------
|
||
|
|
1 file changed, 4 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/kdumptool/savedump.cc b/kdumptool/savedump.cc
|
||
|
|
index ec66e63bd29b..e832bf98b762 100644
|
||
|
|
--- a/kdumptool/savedump.cc
|
||
|
|
+++ b/kdumptool/savedump.cc
|
||
|
|
@@ -294,15 +294,12 @@ void SaveDump::saveDump(const RootDirURLVector &urlv)
|
||
|
|
if (cpus > online_cpus)
|
||
|
|
cpus = online_cpus;
|
||
|
|
}
|
||
|
|
- if (!config->kdumptoolContainsFlag("NOSPLIT") &&
|
||
|
|
- !config->kdumptoolContainsFlag("SINGLE") &&
|
||
|
|
+ if (!config->kdumptoolContainsFlag("SINGLE") &&
|
||
|
|
cpus > 1) {
|
||
|
|
- if (!useElf)
|
||
|
|
- m_split = cpus;
|
||
|
|
- else
|
||
|
|
- cerr << "Splitting ELF dumps is not supported." << endl;
|
||
|
|
|
||
|
|
- if (config->kdumptoolContainsFlag("SPLIT")) {
|
||
|
|
+ /* The check for NOSPLIT is for backward compatibility */
|
||
|
|
+ if (config->kdumptoolContainsFlag("SPLIT") &&
|
||
|
|
+ !config->kdumptoolContainsFlag("NOSPLIT")) {
|
||
|
|
if (!useElf)
|
||
|
|
m_split = cpus;
|
||
|
|
else
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|