edd6a13d5f
Someone will need to fix threading, as using pthread_kill(t, 0) will most likely cause issues. Android does not provide pthread_cancel and similar.
22 lines
882 B
Diff
22 lines
882 B
Diff
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;
|
|
- 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);
|
|
+ serverLog(LL_WARNING, "Bio thread for job type #%d terminated",j);
|
|
}
|
|
}
|