termux-packages/packages/redis/bio.c.patch

22 lines
882 B
Diff
Raw Normal View History

diff -uNr redis-6.0.9/src/bio.c redis-6.0.9.mod/src/bio.c
--- redis-6.0.9/src/bio.c 2020-10-27 07:12:01.000000000 +0000
+++ redis-6.0.9.mod/src/bio.c 2020-11-22 17:02:03.692060558 +0000
@@ -266,15 +266,7 @@
for (j = 0; j < BIO_NUM_OPS; j++) {
if (bio_threads[j] == pthread_self()) continue;
2020-05-13 11:33:34 +02:00
- if (bio_threads[j] && pthread_cancel(bio_threads[j]) == 0) {
- if ((err = pthread_join(bio_threads[j],NULL)) != 0) {
- serverLog(LL_WARNING,
- "Bio thread for job type #%d can not be joined: %s",
- j, strerror(err));
- } else {
- serverLog(LL_WARNING,
- "Bio thread for job type #%d terminated",j);
- }
- }
+ pthread_kill(bio_threads[j], 0);
2020-05-13 11:33:34 +02:00
+ serverLog(LL_WARNING, "Bio thread for job type #%d terminated",j);
}
}