Rebase to stress-ng to V0.18.06
Rebase to stress-ng to V0.18.06 Add single upstream patch Resolves:RHEL-65475 Signed-off-by: John Kacur <jkacur@redhat.com>
This commit is contained in:
John Kacur
parent
aa2eb170ff
commit
c090a567f8
@ -1,33 +0,0 @@
|
||||
From cdfb0b0656b6fd371cf73333af54530e8de556e1 Mon Sep 17 00:00:00 2001
|
||||
From: Colin Ian King <colin.i.king@gmail.com>
|
||||
Date: Fri, 3 May 2024 10:46:01 +0100
|
||||
Subject: [PATCH] core-asm-arm.h: declare stress_asm_arm_yield when
|
||||
HAVE_ASM_ARM_YIELD is defined
|
||||
|
||||
Don't declare inlined yield helper if yield is not available
|
||||
|
||||
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
|
||||
---
|
||||
core-asm-arm.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/core-asm-arm.h b/core-asm-arm.h
|
||||
index c275dc8b9bda..152e771811b8 100644
|
||||
--- a/core-asm-arm.h
|
||||
+++ b/core-asm-arm.h
|
||||
@@ -24,10 +24,12 @@
|
||||
|
||||
#if defined(STRESS_ARCH_ARM)
|
||||
|
||||
+#if defined(HAVE_ASM_ARM_YIELD)
|
||||
static inline void ALWAYS_INLINE stress_asm_arm_yield(void)
|
||||
{
|
||||
__asm__ __volatile__("yield;\n");
|
||||
}
|
||||
+#endif
|
||||
|
||||
/* #if defined(STRESS_ARCH_ARM) */
|
||||
#endif
|
||||
--
|
||||
2.45.0
|
||||
|
||||
83
core-stress-fflush-opened-writable-files.patch
Normal file
83
core-stress-fflush-opened-writable-files.patch
Normal file
@ -0,0 +1,83 @@
|
||||
From 69d710955063add902754f2bd841f9b12e59cc16 Mon Sep 17 00:00:00 2001
|
||||
From: Colin Ian King <colin.i.king@gmail.com>
|
||||
Date: Fri, 1 Nov 2024 12:56:24 +0000
|
||||
Subject: [PATCH] core-*, stress-*: fflush opened writable files
|
||||
|
||||
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
|
||||
---
|
||||
core-klog.c | 2 ++
|
||||
stress-jpeg.c | 1 +
|
||||
stress-ng.c | 1 +
|
||||
stress-opcode.c | 3 +++
|
||||
stress-rename.c | 1 +
|
||||
5 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/core-klog.c b/core-klog.c
|
||||
index 419e59b6f922..348608c28ac8 100644
|
||||
--- a/core-klog.c
|
||||
+++ b/core-klog.c
|
||||
@@ -223,9 +223,11 @@ log_info:
|
||||
last_logged = stress_time_now();
|
||||
}
|
||||
}
|
||||
+ (void)fflush(klog_fp);
|
||||
(void)fclose(klog_fp);
|
||||
_exit(EXIT_SUCCESS);
|
||||
}
|
||||
+ (void)fflush(klog_fp);
|
||||
(void)fclose(klog_fp);
|
||||
#endif
|
||||
}
|
||||
diff --git a/stress-jpeg.c b/stress-jpeg.c
|
||||
index 4afe5018bd4b..8a8104f37b2b 100644
|
||||
--- a/stress-jpeg.c
|
||||
+++ b/stress-jpeg.c
|
||||
@@ -316,6 +316,7 @@ PRAGMA_UNROLL_N(8)
|
||||
|
||||
(void)jpeg_write_scanlines(&cinfo, row_pointer, (JDIMENSION)y_max);
|
||||
jpeg_finish_compress(&cinfo);
|
||||
+ (void)fflush(fp);
|
||||
(void)fclose(fp);
|
||||
jpeg_destroy_compress(&cinfo);
|
||||
t2 = stress_time_now();
|
||||
diff --git a/stress-ng.c b/stress-ng.c
|
||||
index a1d38e79cfee..17bd2f42c300 100644
|
||||
--- a/stress-ng.c
|
||||
+++ b/stress-ng.c
|
||||
@@ -3770,6 +3770,7 @@ static void stress_yaml_close(FILE *yaml)
|
||||
{
|
||||
if (yaml) {
|
||||
pr_yaml(yaml, "...\n");
|
||||
+ (void)fflush(yaml);
|
||||
(void)fclose(yaml);
|
||||
}
|
||||
}
|
||||
diff --git a/stress-opcode.c b/stress-opcode.c
|
||||
index cec65ec51cde..c7c1a5b2e653 100644
|
||||
--- a/stress-opcode.c
|
||||
+++ b/stress-opcode.c
|
||||
@@ -513,6 +513,9 @@ again:
|
||||
* corruption since the child will
|
||||
* die soon anyhow
|
||||
*/
|
||||
+ (void)fflush(stdout);
|
||||
+ (void)fflush(stderr);
|
||||
+
|
||||
(void)fclose(stdin);
|
||||
(void)fclose(stdout);
|
||||
(void)fclose(stderr);
|
||||
diff --git a/stress-rename.c b/stress-rename.c
|
||||
index 0dee9e75f04a..b0b3d119e5b6 100644
|
||||
--- a/stress-rename.c
|
||||
+++ b/stress-rename.c
|
||||
@@ -267,6 +267,7 @@ restart:
|
||||
#endif
|
||||
return rc;
|
||||
}
|
||||
+ (void)fflush(fp);
|
||||
(void)fclose(fp);
|
||||
|
||||
while (stress_continue(args)) {
|
||||
--
|
||||
2.47.0
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (stress-ng-0.17.08.tar.gz) = 3df9bb507687839ad9978099bea33bc6923d324c6e6f66d441911670fcd8080e093fd02741ea8516626ae1ba357f42d2c50b6553cb75f48fd5f008e59d469777
|
||||
SHA512 (stress-ng-0.18.06.tar.xz) = 2b3da9ae31b7b766d7b727552286e3803a5a5099e844705a63d4952897920ed46deb3f657b48bebd97d7ddaaa2ce20a1037915e06f358aa3e041719fd15625b6
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
Name: stress-ng
|
||||
Version: 0.17.08
|
||||
Release: 8%{?dist}
|
||||
Version: 0.18.06
|
||||
Release: 0%{?dist}
|
||||
Summary: Stress test a computer system in various ways
|
||||
|
||||
License: GPL-2.0-or-later
|
||||
URL: https://github.com/ColinIanKing/stress-ng
|
||||
Source0: https://github.com/ColinIanKing/stress-ng/archive/V%{version}/%{name}-%{version}.tar.gz
|
||||
Source0: https://github.com/ColinIanKing/stress-ng/archive/V%{version}/%{name}-%{version}.tar.xz
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
@ -25,7 +25,7 @@ BuildRequires: zlib-devel
|
||||
BuildRequires: Judy-devel
|
||||
|
||||
# Patches
|
||||
Patch1: core-asm-arm.h-declare-stress_asm_arm_yield-when-HAV.patch
|
||||
Patch1: core-stress-fflush-opened-writable-files.patch
|
||||
|
||||
%description
|
||||
Stress test a computer system in various ways. It was designed to exercise
|
||||
@ -55,6 +55,11 @@ install -pm 644 bash-completion/%{name} \
|
||||
%{_datadir}/bash-completion/completions/%{name}
|
||||
|
||||
%changelog
|
||||
* Fri Nov 01 2024 John Kacur <jkacur@redhat.com> - 0.18.06-1
|
||||
- Rebase to stress-ng to V0.18.06
|
||||
- Add single upstream patch
|
||||
Resolves:RHEL-65475
|
||||
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.17.08-8
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
Loading…
Reference in New Issue
Block a user