Mon, 26 May 2025 21:02:14 +0200
extend postgresql vfs resource table
| 1 | 1 | /* |
| 2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | |
| 3 | * | |
|
44
3da1f7b6847f
added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
4 | * Copyright 2013 Olaf Wintermann. All rights reserved. |
| 1 | 5 | * |
| 6 | * Redistribution and use in source and binary forms, with or without | |
| 7 | * modification, are permitted provided that the following conditions are met: | |
| 8 | * | |
| 9 | * 1. Redistributions of source code must retain the above copyright | |
| 10 | * notice, this list of conditions and the following disclaimer. | |
| 11 | * | |
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
| 13 | * notice, this list of conditions and the following disclaimer in the | |
| 14 | * documentation and/or other materials provided with the distribution. | |
| 15 | * | |
| 16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | |
| 17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
| 18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |
| 19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | |
| 20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
| 21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
| 22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
| 23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
| 24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
| 25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
| 26 | * POSSIBILITY OF SUCH DAMAGE. | |
| 27 | */ | |
| 28 | ||
| 29 | #include <stdio.h> | |
| 30 | #include <stdlib.h> | |
| 31 | #include <unistd.h> | |
|
67
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
32 | |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
33 | #include "atomic.h" |
| 1 | 34 | #include "thrpool.h" |
| 35 | ||
|
67
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
36 | static threadpool_job kill_job; |
| 1 | 37 | |
|
67
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
38 | threadpool_t* threadpool_new(int min, int max) { |
|
569
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
39 | log_ereport(LOG_INFORM, "new threadpool (min: %d, max: %d)", min, max); |
| 1 | 40 | threadpool_t *pool = malloc(sizeof(threadpool_t)); |
| 41 | pool->queue = NULL; | |
| 42 | pool->queue_len = 0; | |
|
67
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
43 | pool->num_idle = 0; |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
44 | pool->min_threads = min; |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
45 | pool->max_threads = max; |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
46 | pool->num_threads = 0; |
|
569
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
47 | pool->last_job = 0; |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
48 | pool->last_thread = -1; |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
49 | |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
50 | pool->threads = calloc(max, sizeof(pthread_t)); |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
51 | pool->thrstatus = calloc(max, sizeof(int)); |
| 1 | 52 | |
| 53 | pthread_mutex_init(&pool->queue_lock, NULL); | |
| 54 | pthread_mutex_init(&pool->avlbl_lock, NULL); | |
|
357
f45e962edf45
add separate threadpool_start function for creating initial threadpool threads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
55 | pthread_cond_init(&pool->available, NULL); |
| 1 | 56 | |
|
357
f45e962edf45
add separate threadpool_start function for creating initial threadpool threads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
57 | return pool; |
|
f45e962edf45
add separate threadpool_start function for creating initial threadpool threads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
58 | } |
|
f45e962edf45
add separate threadpool_start function for creating initial threadpool threads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
59 | |
|
f45e962edf45
add separate threadpool_start function for creating initial threadpool threads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
60 | int threadpool_start(threadpool_t *pool) { |
| 1 | 61 | /* create pool threads */ |
|
357
f45e962edf45
add separate threadpool_start function for creating initial threadpool threads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
62 | for(int i=0;i<pool->min_threads;i++) { |
|
570
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
63 | if (pthread_create(&pool->threads[i], NULL, threadpool_func, pool) != 0) { |
|
408
56edda8701e0
replace perror() messages with log_ereport in thrpool.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
358
diff
changeset
|
64 | log_ereport(LOG_FAILURE, "threadpool_start: pthread_create failed: %s", strerror(errno)); |
|
357
f45e962edf45
add separate threadpool_start function for creating initial threadpool threads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
65 | return 1; |
|
570
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
66 | } else { |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
67 | log_ereport(LOG_DEBUG, "thread started: %lu", (unsigned long)pool->threads[i]); |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
68 | pthread_detach(pool->threads[i]); |
| 1 | 69 | } |
| 70 | } | |
|
357
f45e962edf45
add separate threadpool_start function for creating initial threadpool threads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
115
diff
changeset
|
71 | return 0; |
| 1 | 72 | } |
| 73 | ||
| 74 | void* threadpool_func(void *data) { | |
| 75 | threadpool_t *pool = (threadpool_t*)data; | |
|
67
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
76 | |
|
569
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
77 | pthread_t thr_self = pthread_self(); |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
78 | int thr_index = -1; |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
79 | for(int i=0;i<pool->max_threads;i++) { |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
80 | if(pool->threads[i] == thr_self) { |
|
570
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
81 | thr_index = i; // TODO: this is stupid, trasfer the thread index per data |
|
569
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
82 | break; |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
83 | } |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
84 | } |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
85 | |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
86 | if(thr_index == -1) { |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
87 | log_ereport(LOG_CATASTROPHE, "threadpool: cannot find thread index for thread %ull\n", (unsigned long long)thr_self); |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
88 | return NULL; |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
89 | } |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
90 | |
|
67
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
91 | ws_atomic_inc32(&pool->num_threads); |
| 1 | 92 | for(;;) { |
|
569
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
93 | threadpool_job *job = threadpool_get_job(pool, thr_index); |
|
67
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
94 | if(job == &kill_job) { |
| 1 | 95 | break; |
| 96 | } | |
| 97 | ||
| 98 | job->callback(job->data); | |
| 99 | ||
| 100 | free(job); | |
| 101 | } | |
|
556
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
408
diff
changeset
|
102 | uint32_t nthreads = ws_atomic_dec32(&pool->num_threads); |
|
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
408
diff
changeset
|
103 | if(nthreads == 0) { |
|
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
408
diff
changeset
|
104 | log_ereport(LOG_INFORM, "threadpool closed"); // TODO: log threadpool name |
|
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
408
diff
changeset
|
105 | } |
| 1 | 106 | return NULL; |
| 107 | } | |
| 108 | ||
|
569
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
109 | threadpool_job* threadpool_get_job(threadpool_t *pool, int thread_index) { |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
110 | struct timespec timeout; |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
111 | clock_gettime(CLOCK_REALTIME, &timeout); |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
112 | timeout.tv_sec += 30; |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
113 | |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
114 | while(pthread_mutex_timedlock(&pool->queue_lock, &timeout)) { |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
115 | log_ereport(LOG_INFORM, "threadpool_get_job: mutex timeout"); |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
116 | timeout.tv_sec += 30; |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
117 | } |
| 1 | 118 | |
| 119 | threadpool_job *job = NULL; | |
|
67
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
120 | pool->num_idle++; |
| 1 | 121 | while(job == NULL) { |
| 122 | if(pool->queue_len == 0) { | |
|
569
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
123 | timeout.tv_sec += 30; |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
124 | while(pthread_cond_timedwait(&pool->available, &pool->queue_lock, &timeout)) { |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
125 | log_ereport(LOG_DEBUG, "threadpool_get_job: cond timeout: thread: %d queue: %u", thread_index, (unsigned int)pool->queue_len); |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
126 | timeout.tv_sec += 60; |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
127 | } |
| 1 | 128 | continue; |
| 129 | } else { | |
| 130 | pool_queue_t *q = pool->queue; | |
| 131 | job = q->job; | |
| 132 | pool->queue = q->next; | |
| 133 | pool->queue_len--; | |
| 134 | free(q); | |
| 135 | } | |
| 136 | } | |
|
67
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
137 | pool->num_idle--; |
|
569
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
138 | |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
139 | pool->last_thread = thread_index; |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
140 | pool->last_job = time(NULL); |
| 1 | 141 | |
| 142 | pthread_mutex_unlock(&pool->queue_lock); | |
| 143 | return job; | |
| 144 | } | |
| 145 | ||
| 146 | void threadpool_run(threadpool_t *pool, job_callback_f func, void *data) { | |
|
358
f3b490a2150c
start threadpool in threadpool_run() if no threads are created yet
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
357
diff
changeset
|
147 | // TODO: handle errors |
|
f3b490a2150c
start threadpool in threadpool_run() if no threads are created yet
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
357
diff
changeset
|
148 | |
|
f3b490a2150c
start threadpool in threadpool_run() if no threads are created yet
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
357
diff
changeset
|
149 | if(pool->num_threads == 0) { |
|
f3b490a2150c
start threadpool in threadpool_run() if no threads are created yet
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
357
diff
changeset
|
150 | threadpool_start(pool); |
|
f3b490a2150c
start threadpool in threadpool_run() if no threads are created yet
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
357
diff
changeset
|
151 | } |
|
f3b490a2150c
start threadpool in threadpool_run() if no threads are created yet
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
357
diff
changeset
|
152 | |
| 1 | 153 | threadpool_job *job = malloc(sizeof(threadpool_job)); |
| 154 | job->callback = func; | |
| 155 | job->data = data; | |
| 156 | ||
|
569
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
157 | struct timespec timeout; |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
158 | clock_gettime(CLOCK_REALTIME, &timeout); |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
159 | timeout.tv_sec += 30; |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
160 | |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
161 | while(pthread_mutex_timedlock(&pool->queue_lock, &timeout)) { |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
162 | log_ereport(LOG_INFORM, "threadpool_run: mutex timeout"); |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
163 | timeout.tv_sec += 30; |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
164 | } |
|
67
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
165 | threadpool_enqueue_job(pool, job); |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
166 | |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
167 | int create_thread = 0; |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
168 | int destroy_thread = 0; |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
169 | int diff = pool->queue_len - pool->num_idle; |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
170 | if(diff > 0 && pool->num_threads < pool->max_threads) { |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
171 | create_thread = 1; |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
172 | } else if(diff < 0 && pool->num_threads > pool->min_threads) { |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
173 | destroy_thread = 1; |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
174 | } |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
175 | |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
176 | //if(pool->queue_len == 1) { |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
177 | pthread_cond_signal(&pool->available); |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
178 | //} |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
179 | |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
180 | if(create_thread) { |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
181 | pthread_t t; |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
182 | if (pthread_create(&t, NULL, threadpool_func, pool) != 0) { |
|
408
56edda8701e0
replace perror() messages with log_ereport in thrpool.c
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
358
diff
changeset
|
183 | log_ereport(LOG_FAILURE, "threadpool_run: pthread_create failed: %s", strerror(errno)); |
|
67
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
184 | } |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
185 | } |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
186 | if(destroy_thread) { |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
187 | threadpool_enqueue_job(pool, &kill_job); |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
188 | pthread_cond_signal(&pool->available); |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
189 | } |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
190 | |
|
569
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
191 | // some diagnostics: |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
192 | // if the queue has multiple elements, but the last job was started |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
193 | // over a minute ago, print some diagnostic message, because |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
194 | // this does look wrong |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
195 | if(pool->queue_len > 5 && pool->last_job != 0) { |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
196 | // reuse timeout sec value, because we don't need the most accurate |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
197 | // time value here |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
198 | time_t current = timeout.tv_sec; |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
199 | if(pool->last_job + 60 < current) { |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
200 | // looks like the threadpool is blocked |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
201 | struct tm lastjob; |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
202 | localtime_r(&pool->last_job, &lastjob); |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
203 | log_ereport( |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
204 | LOG_WARN, |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
205 | "high threadpool wait time: queue: %u lastjob: %02d:%02d:%02d", |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
206 | (unsigned int)pool->queue_len, |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
207 | lastjob.tm_hour, lastjob.tm_min, lastjob.tm_sec); |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
208 | } |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
209 | } |
|
70bca6190669
add threadpool debug logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
556
diff
changeset
|
210 | |
|
67
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
211 | pthread_mutex_unlock(&pool->queue_lock); |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
212 | } |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
213 | |
|
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
214 | void threadpool_enqueue_job(threadpool_t *pool, threadpool_job *job) { |
| 1 | 215 | pool_queue_t *q = malloc(sizeof(pool_queue_t)); |
| 216 | q->job = job; | |
| 217 | q->next = NULL; | |
|
67
50505dc3f8a6
dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
44
diff
changeset
|
218 | |
| 1 | 219 | if(pool->queue == NULL) { |
| 220 | pool->queue = q; | |
| 221 | } else { | |
| 222 | pool_queue_t *last_elem = pool->queue; | |
| 223 | while(last_elem->next != NULL) { | |
| 224 | last_elem = last_elem->next; | |
| 225 | } | |
| 226 | last_elem->next = q; | |
| 227 | } | |
| 228 | pool->queue_len++; | |
| 229 | } | |
|
556
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
408
diff
changeset
|
230 | |
|
570
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
231 | void threadpool_shutdown(threadpool_t *pool, int timeout) { |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
232 | struct timespec ts; |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
233 | |
|
556
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
408
diff
changeset
|
234 | int nthreads = pool->max_threads; |
|
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
408
diff
changeset
|
235 | for(int i=0;i<nthreads;i++) { |
|
570
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
236 | clock_gettime(CLOCK_REALTIME, &ts); |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
237 | ts.tv_sec += timeout; |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
238 | if(pthread_mutex_timedlock(&pool->queue_lock, &ts)) { |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
239 | log_ereport(LOG_FAILURE, "failed to shutdown threadpool: timeout"); |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
240 | return; |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
241 | } |
|
556
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
408
diff
changeset
|
242 | threadpool_enqueue_job(pool, &kill_job); |
|
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
408
diff
changeset
|
243 | pthread_cond_signal(&pool->available); |
|
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
408
diff
changeset
|
244 | pthread_mutex_unlock(&pool->queue_lock); |
|
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
408
diff
changeset
|
245 | } |
|
570
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
246 | |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
247 | // not the nicest way to wait for threads to shutdown, but it is very |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
248 | // simple and good enough for the webserver shutdown |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
249 | sleep(1); |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
250 | // check if all threads are closed |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
251 | time_t t = time(NULL); |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
252 | time_t end = t + timeout; |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
253 | int i = 0; |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
254 | while(t < end || i < 2) { |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
255 | uint32_t num_threads = pool->num_threads; |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
256 | if(num_threads == 0) { |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
257 | break; |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
258 | } |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
259 | |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
260 | log_ereport(LOG_VERBOSE, "threadpool_shutdown: wait for thread shutdown: %u threads still running", (unsigned int)num_threads); |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
261 | sleep(5); |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
262 | i++; |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
263 | t = time(NULL); |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
264 | } |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
265 | |
|
577
4f5ccaea4a92
add shutdown cleanup (listener, log, threadpool)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
266 | if(pool->num_threads == 0) { |
|
4f5ccaea4a92
add shutdown cleanup (listener, log, threadpool)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
267 | // it's possible that we send too many kill jobs, cleanup the queue |
|
4f5ccaea4a92
add shutdown cleanup (listener, log, threadpool)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
268 | while(pool->queue) { |
|
4f5ccaea4a92
add shutdown cleanup (listener, log, threadpool)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
269 | pool_queue_t *q = pool->queue->next; |
|
4f5ccaea4a92
add shutdown cleanup (listener, log, threadpool)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
270 | free(pool->queue); |
|
4f5ccaea4a92
add shutdown cleanup (listener, log, threadpool)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
271 | pool->queue = q; |
|
4f5ccaea4a92
add shutdown cleanup (listener, log, threadpool)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
272 | } |
|
4f5ccaea4a92
add shutdown cleanup (listener, log, threadpool)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
273 | |
|
4f5ccaea4a92
add shutdown cleanup (listener, log, threadpool)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
274 | free(pool->threads); |
|
4f5ccaea4a92
add shutdown cleanup (listener, log, threadpool)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
275 | free(pool->thrstatus); |
|
4f5ccaea4a92
add shutdown cleanup (listener, log, threadpool)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
276 | free(pool); |
|
4f5ccaea4a92
add shutdown cleanup (listener, log, threadpool)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
576
diff
changeset
|
277 | |
|
570
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
278 | log_ereport(LOG_VERBOSE, "threadpool_shutdown successful"); |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
279 | } else if(t > end) { |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
280 | log_ereport(LOG_WARN, "threadpool_shutdown: timeout"); |
|
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
281 | } |
|
556
b036ccad4b49
improve webserver shutdown and free some stuff to make the valgrind output cleaner
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
408
diff
changeset
|
282 | } |
|
570
f95868a8ec37
improve threadpool_shutdown cleanup
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
569
diff
changeset
|
283 |