Commit | Line | Data |
---|---|---|
a3ae81ab DM |
1 | --- ../../build/redis/cache/redis-3.2.8/src/bio.c 2017-02-12 16:14:57.000000000 +0100 |
2 | +++ ./src/bio.c 2017-03-02 22:46:52.999274254 +0100 | |
3 | @@ -151,8 +151,8 @@ | |
4 | ||
5 | /* Make the thread killable at any time, so that bioKillThreads() | |
6 | * can work reliably. */ | |
7 | - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); | |
8 | - pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL); | |
9 | + //pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); | |
10 | + //pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL); | |
11 | ||
12 | pthread_mutex_lock(&bio_mutex[type]); | |
13 | /* Block SIGALRM so we are sure that only the main thread will | |
14 | @@ -213,15 +213,19 @@ | |
15 | int err, j; | |
16 | ||
17 | for (j = 0; j < BIO_NUM_OPS; j++) { | |
18 | - if (pthread_cancel(bio_threads[j]) == 0) { | |
19 | - if ((err = pthread_join(bio_threads[j],NULL)) != 0) { | |
20 | - serverLog(LL_WARNING, | |
21 | - "Bio thread for job type #%d can be joined: %s", | |
22 | - j, strerror(err)); | |
23 | - } else { | |
24 | - serverLog(LL_WARNING, | |
25 | - "Bio thread for job type #%d terminated",j); | |
26 | - } | |
27 | - } | |
28 | + pthread_kill(bio_threads[j], 0); | |
29 | + serverLog(LL_WARNING, | |
30 | + "Bio thread for job type #%d terminated",j); | |
31 | + | |
32 | + //if (pthread_cancel(bio_threads[j]) == 0) { | |
33 | + // if ((err = pthread_join(bio_threads[j],NULL)) != 0) { | |
34 | + // serverLog(LL_WARNING, | |
35 | + // "Bio thread for job type #%d can be joined: %s", | |
36 | + // j, strerror(err)); | |
37 | + // } else { | |
38 | + // serverLog(LL_WARNING, | |
39 | + // "Bio thread for job type #%d terminated",j); | |
40 | + // } | |
41 | + //} | |
42 | } | |
43 | } |