summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Bertalan <dani@danielbertalan.dev>2021-12-23 11:28:03 +0100
committerAli Mohammad Pur <Ali.mpfard@gmail.com>2021-12-24 17:02:40 +0330
commit05ce5d82fe71ecbca8e52e6e6dd7e0c7f178b125 (patch)
tree5555cef24865eca9f84644dfbc81923c95a18b0e
parent1c054ac56e8206a2746eec7a96683447a2dace35 (diff)
downloadserenity-05ce5d82fe71ecbca8e52e6e6dd7e0c7f178b125.zip
Ports/stress-ng: Remove obsolete patches
The following features are now available in the system, making these patches unnecessary: - isblank() function - SIGSTKSZ constant - MS_SYNC and MS_ASYNC msync() flags - EDQUOT errno constant
-rw-r--r--Ports/stress-ng/patches/0002-missing-types-and-functionality.patch12
-rw-r--r--Ports/stress-ng/patches/0004-memory-related.patch67
2 files changed, 0 insertions, 79 deletions
diff --git a/Ports/stress-ng/patches/0002-missing-types-and-functionality.patch b/Ports/stress-ng/patches/0002-missing-types-and-functionality.patch
index d7ccb1c72a..b3f55a4a80 100644
--- a/Ports/stress-ng/patches/0002-missing-types-and-functionality.patch
+++ b/Ports/stress-ng/patches/0002-missing-types-and-functionality.patch
@@ -28,18 +28,6 @@ diff -ur stress-ng-master/core-helper.c stress-ng-master-2/core-helper.c
}
/*
-diff -ur stress-ng-master/core-job.c stress-ng-master-2/core-job.c
---- stress-ng-master/core-job.c 2020-11-07 10:52:22.000000000 -0800
-+++ stress-ng-master-2/core-job.c 2020-11-08 22:32:06.607668500 -0800
-@@ -28,7 +28,7 @@
- #define RUN_SEQUENTIAL (0x01)
- #define RUN_PARALLEL (0x02)
-
--#define ISBLANK(ch) isblank((int)(ch))
-+#define ISBLANK(ch) (ch == ' ' || ch == '\t')
-
- /*
- * stress_chop()
diff -ur stress-ng-master/core-sched.c stress-ng-master-2/core-sched.c
--- stress-ng-master/core-sched.c 2020-11-07 10:52:22.000000000 -0800
+++ stress-ng-master-2/core-sched.c 2020-11-08 23:21:44.497668500 -0800
diff --git a/Ports/stress-ng/patches/0004-memory-related.patch b/Ports/stress-ng/patches/0004-memory-related.patch
index 02b4e71f03..f9d3780307 100644
--- a/Ports/stress-ng/patches/0004-memory-related.patch
+++ b/Ports/stress-ng/patches/0004-memory-related.patch
@@ -1,14 +1,3 @@
-diff -ur a/stress-stack.c b/stress-stack.c
---- a/stress-stack.c 2020-11-07 10:52:22.000000000 -0800
-+++ b/stress-stack.c 2020-11-08 22:55:15.567668500 -0800
-@@ -98,6 +98,7 @@
- {
- char *start_ptr = shim_sbrk(0);
- void *altstack;
-+ size_t SIGSTKSZ = 9000;
- ssize_t altstack_size = (SIGSTKSZ +
- STACK_ALIGNMENT +
- args->page_size) & ~(args->page_size -1);
diff -ur a/stress-str.c b/stress-str.c
--- a/stress-str.c 2020-11-07 10:52:22.000000000 -0800
+++ b/stress-str.c 2020-11-08 22:55:55.887668500 -0800
@@ -21,18 +10,6 @@ diff -ur a/stress-str.c b/stress-str.c
{ "strcasecmp", stress_strcasecmp, strcasecmp },
#endif
#if defined(HAVE_STRLCAT)
-diff -ur a/stress-vm.c b/stress-vm.c
---- a/stress-vm.c 2020-11-07 10:52:22.000000000 -0800
-+++ b/stress-vm.c 2020-11-08 22:58:41.267668500 -0800
-@@ -2124,7 +2124,7 @@
-
- ret = stress_oomable_child(args, &context, stress_vm_child, STRESS_OOMABLE_NORMAL);
-
-- (void)shim_msync(context.bit_error_count, page_size, MS_SYNC);
-+ (void)shim_msync(context.bit_error_count, page_size, 0);
- if (*context.bit_error_count > 0) {
- pr_fail("%s: detected %" PRIu64 " bit errors while "
- "stressing memory\n",
diff -ur a/stress-sigsegv.c b/stress-sigsegv.c
--- a/stress-sigsegv.c 2020-11-07 10:52:22.000000000 -0800
+++ b/stress-sigsegv.c 2020-11-08 22:50:22.327668500 -0800
@@ -50,50 +27,6 @@ diff -ur a/stress-sigsegv.c b/stress-sigsegv.c
inc_counter(args);
} else {
#if defined(SA_SIGINFO)
-diff -ur a/stress-link.c b/stress-link.c
---- a/stress-link.c 2020-11-07 10:52:22.000000000 -0800
-+++ b/stress-link.c 2020-11-08 22:44:34.267668500 -0800
-@@ -97,8 +97,7 @@
- (void)stress_temp_filename_args(args,
- newpath, sizeof(newpath), i);
- if (linkfunc(oldpath, newpath) < 0) {
-- if ((errno == EDQUOT) ||
-- (errno == ENOMEM) ||
-+ if ((errno == ENOMEM) ||
- (errno == ENOSPC)) {
- /* Try again */
- continue;
-diff -ur a/stress-mmap.c b/stress-mmap.c
---- a/stress-mmap.c 2020-11-07 10:52:22.000000000 -0800
-+++ b/stress-mmap.c 2020-11-08 22:45:51.767668500 -0800
-@@ -243,7 +243,9 @@
- const bool mmap_file = context->mmap_file;
- const int fd = context->fd;
- int no_mem_retries = 0;
-+#if 0
- const int ms_flags = context->mmap_async ? MS_ASYNC : MS_SYNC;
-+#endif
- uint8_t *mapped, **mappings;
-
- mapped = calloc(pages4k, sizeof(*mapped));
-@@ -322,7 +324,7 @@
- no_mem_retries = 0;
- if (mmap_file) {
- (void)memset(buf, 0xff, sz);
-- (void)shim_msync((void *)buf, sz, ms_flags);
-+ (void)shim_msync((void *)buf, sz, 0);
- }
- (void)stress_madvise_random(buf, sz);
- (void)stress_mincore_touch_pages(buf, context->mmap_bytes);
-@@ -424,7 +426,7 @@
- "not contain expected data\n", args->name, page_size);
- if (mmap_file) {
- (void)memset(mappings[page], n, page_size);
-- (void)shim_msync((void *)mappings[page], page_size, ms_flags);
-+ (void)shim_msync((void *)mappings[page], page_size, 0);
- #if defined(FALLOC_FL_KEEP_SIZE) && defined(FALLOC_FL_PUNCH_HOLE)
- (void)shim_fallocate(fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
- offset, page_size);
diff -ur a/stress-mmapmany.c b/stress-mmapmany.c
--- a/stress-mmapmany.c 2020-11-07 10:52:22.000000000 -0800
+++ b/stress-mmapmany.c 2020-11-08 22:47:27.567668500 -0800