]>
Commit | Line | Data |
---|---|---|
cd748f27 | 1 | /* |
cd748f27 | 2 | * DEBUG: section 43 AIOPS |
3 | * AUTHOR: Stewart Forster <slf@connect.com.au> | |
4 | * | |
2b6662ba | 5 | * SQUID Web Proxy Cache http://www.squid-cache.org/ |
cd748f27 | 6 | * ---------------------------------------------------------- |
7 | * | |
2b6662ba | 8 | * Squid is the result of efforts by numerous individuals from |
9 | * the Internet community; see the CONTRIBUTORS file for full | |
10 | * details. Many organizations have provided support for Squid's | |
11 | * development; see the SPONSORS file for full details. Squid is | |
12 | * Copyrighted (C) 2001 by the Regents of the University of | |
13 | * California; see the COPYRIGHT file for full details. Squid | |
14 | * incorporates software developed and/or copyrighted by other | |
15 | * sources; see the CREDITS file for full details. | |
cd748f27 | 16 | * |
17 | * This program is free software; you can redistribute it and/or modify | |
18 | * it under the terms of the GNU General Public License as published by | |
19 | * the Free Software Foundation; either version 2 of the License, or | |
20 | * (at your option) any later version. | |
26ac0430 | 21 | * |
cd748f27 | 22 | * This program is distributed in the hope that it will be useful, |
23 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
24 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
25 | * GNU General Public License for more details. | |
26ac0430 | 26 | * |
cd748f27 | 27 | * You should have received a copy of the GNU General Public License |
28 | * along with this program; if not, write to the Free Software | |
29 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. | |
30 | * | |
31 | */ | |
32 | ||
e4116bdb | 33 | #ifndef _REENTRANT |
34 | #error "_REENTRANT MUST be defined to build squid async io support." | |
35 | #endif | |
36 | ||
582c2af2 | 37 | #include "squid.h" |
b9ae18aa | 38 | #include "DiskThreads.h" |
4d5904f7 | 39 | #include "SquidConfig.h" |
cd748f27 | 40 | |
4d5904f7 FC |
41 | #include <stdio.h> |
42 | #include <sys/stat.h> | |
43 | #include <fcntl.h> | |
44 | #include <pthread.h> | |
45 | #include <errno.h> | |
46 | #include <dirent.h> | |
47 | #include <signal.h> | |
cd748f27 | 48 | #if HAVE_SCHED_H |
4d5904f7 | 49 | #include <sched.h> |
cd748f27 | 50 | #endif |
1ff991dc | 51 | #include "DiskIO/DiskThreads/CommIO.h" |
985c86bc | 52 | #include "SquidTime.h" |
a553a5a3 | 53 | #include "Store.h" |
cd748f27 | 54 | |
55 | #define RIDICULOUS_LENGTH 4096 | |
56 | ||
c04d4f40 | 57 | enum _squidaio_thread_status { |
cd748f27 | 58 | _THREAD_STARTING = 0, |
59 | _THREAD_WAITING, | |
60 | _THREAD_BUSY, | |
61 | _THREAD_FAILED, | |
62 | _THREAD_DONE | |
63 | }; | |
c04d4f40 | 64 | typedef enum _squidaio_thread_status squidaio_thread_status; |
cd748f27 | 65 | |
26ac0430 | 66 | typedef struct squidaio_request_t { |
62e76326 | 67 | |
c04d4f40 | 68 | struct squidaio_request_t *next; |
69 | squidaio_request_type request_type; | |
cd748f27 | 70 | int cancelled; |
71 | char *path; | |
72 | int oflag; | |
73 | mode_t mode; | |
74 | int fd; | |
75 | char *bufferp; | |
ee139403 | 76 | size_t buflen; |
cd748f27 | 77 | off_t offset; |
78 | int whence; | |
79 | int ret; | |
80 | int err; | |
62e76326 | 81 | |
cd748f27 | 82 | struct stat *tmpstatp; |
62e76326 | 83 | |
cd748f27 | 84 | struct stat *statp; |
c04d4f40 | 85 | squidaio_result_t *resultp; |
2fadd50d | 86 | } squidaio_request_t; |
cd748f27 | 87 | |
26ac0430 | 88 | typedef struct squidaio_request_queue_t { |
55f0e6f7 | 89 | pthread_mutex_t mutex; |
90 | pthread_cond_t cond; | |
c04d4f40 | 91 | squidaio_request_t *volatile head; |
92 | squidaio_request_t *volatile *volatile tailp; | |
55f0e6f7 | 93 | unsigned long requests; |
f0debecb | 94 | unsigned long blocked; /* main failed to lock the queue */ |
2fadd50d | 95 | } squidaio_request_queue_t; |
55f0e6f7 | 96 | |
c04d4f40 | 97 | typedef struct squidaio_thread_t squidaio_thread_t; |
62e76326 | 98 | |
26ac0430 | 99 | struct squidaio_thread_t { |
c04d4f40 | 100 | squidaio_thread_t *next; |
cd748f27 | 101 | pthread_t thread; |
c04d4f40 | 102 | squidaio_thread_status status; |
62e76326 | 103 | |
c04d4f40 | 104 | struct squidaio_request_t *current_req; |
55f0e6f7 | 105 | unsigned long requests; |
106 | }; | |
cd748f27 | 107 | |
c04d4f40 | 108 | static void squidaio_queue_request(squidaio_request_t *); |
109 | static void squidaio_cleanup_request(squidaio_request_t *); | |
d9c252f2 | 110 | void *squidaio_thread_loop(void *); |
c04d4f40 | 111 | static void squidaio_do_open(squidaio_request_t *); |
112 | static void squidaio_do_read(squidaio_request_t *); | |
113 | static void squidaio_do_write(squidaio_request_t *); | |
114 | static void squidaio_do_close(squidaio_request_t *); | |
115 | static void squidaio_do_stat(squidaio_request_t *); | |
efa3acd1 | 116 | static void squidaio_do_unlink(squidaio_request_t *); |
cd748f27 | 117 | #if AIO_OPENDIR |
c04d4f40 | 118 | static void *squidaio_do_opendir(squidaio_request_t *); |
cd748f27 | 119 | #endif |
c04d4f40 | 120 | static void squidaio_debug(squidaio_request_t *); |
121 | static void squidaio_poll_queues(void); | |
cd748f27 | 122 | |
c04d4f40 | 123 | static squidaio_thread_t *threads = NULL; |
124 | static int squidaio_initialised = 0; | |
cd748f27 | 125 | |
58cd5bbd | 126 | #define AIO_LARGE_BUFS 16384 |
127 | #define AIO_MEDIUM_BUFS AIO_LARGE_BUFS >> 1 | |
128 | #define AIO_SMALL_BUFS AIO_LARGE_BUFS >> 2 | |
129 | #define AIO_TINY_BUFS AIO_LARGE_BUFS >> 3 | |
55f0e6f7 | 130 | #define AIO_MICRO_BUFS 128 |
58cd5bbd | 131 | |
a3efa961 | 132 | static MemAllocator *squidaio_large_bufs = NULL; /* 16K */ |
133 | static MemAllocator *squidaio_medium_bufs = NULL; /* 8K */ | |
134 | static MemAllocator *squidaio_small_bufs = NULL; /* 4K */ | |
135 | static MemAllocator *squidaio_tiny_bufs = NULL; /* 2K */ | |
136 | static MemAllocator *squidaio_micro_bufs = NULL; /* 128K */ | |
58cd5bbd | 137 | |
cd748f27 | 138 | static int request_queue_len = 0; |
a3efa961 | 139 | static MemAllocator *squidaio_request_pool = NULL; |
140 | static MemAllocator *squidaio_thread_pool = NULL; | |
c04d4f40 | 141 | static squidaio_request_queue_t request_queue; |
62e76326 | 142 | |
26ac0430 | 143 | static struct { |
c04d4f40 | 144 | squidaio_request_t *head, **tailp; |
62e76326 | 145 | } |
f0debecb | 146 | |
62e76326 | 147 | request_queue2 = { |
148 | ||
26ac0430 AJ |
149 | NULL, &request_queue2.head |
150 | }; | |
c04d4f40 | 151 | static squidaio_request_queue_t done_queue; |
62e76326 | 152 | |
26ac0430 | 153 | static struct { |
c04d4f40 | 154 | squidaio_request_t *head, **tailp; |
62e76326 | 155 | } |
f0debecb | 156 | |
62e76326 | 157 | done_requests = { |
158 | ||
26ac0430 AJ |
159 | NULL, &done_requests.head |
160 | }; | |
cd748f27 | 161 | static pthread_attr_t globattr; |
5e5c622b | 162 | #if HAVE_SCHED_H |
62e76326 | 163 | |
cd748f27 | 164 | static struct sched_param globsched; |
5e5c622b | 165 | #endif |
cd748f27 | 166 | static pthread_t main_thread; |
167 | ||
a3efa961 | 168 | static MemAllocator * |
c04d4f40 | 169 | squidaio_get_pool(int size) |
58cd5bbd | 170 | { |
58cd5bbd | 171 | if (size <= AIO_LARGE_BUFS) { |
62e76326 | 172 | if (size <= AIO_MICRO_BUFS) |
a3efa961 | 173 | return squidaio_micro_bufs; |
62e76326 | 174 | else if (size <= AIO_TINY_BUFS) |
a3efa961 | 175 | return squidaio_tiny_bufs; |
62e76326 | 176 | else if (size <= AIO_SMALL_BUFS) |
a3efa961 | 177 | return squidaio_small_bufs; |
62e76326 | 178 | else if (size <= AIO_MEDIUM_BUFS) |
a3efa961 | 179 | return squidaio_medium_bufs; |
62e76326 | 180 | else |
a3efa961 | 181 | return squidaio_large_bufs; |
182 | } | |
62e76326 | 183 | |
a3efa961 | 184 | return NULL; |
58cd5bbd | 185 | } |
186 | ||
211f1d0b | 187 | void * |
c04d4f40 | 188 | squidaio_xmalloc(int size) |
58cd5bbd | 189 | { |
190 | void *p; | |
a3efa961 | 191 | MemAllocator *pool; |
58cd5bbd | 192 | |
c04d4f40 | 193 | if ((pool = squidaio_get_pool(size)) != NULL) { |
b001e822 | 194 | p = pool->alloc(); |
58cd5bbd | 195 | } else |
62e76326 | 196 | p = xmalloc(size); |
58cd5bbd | 197 | |
198 | return p; | |
199 | } | |
200 | ||
55f0e6f7 | 201 | static char * |
c04d4f40 | 202 | squidaio_xstrdup(const char *str) |
55f0e6f7 | 203 | { |
204 | char *p; | |
f0debecb | 205 | int len = strlen(str) + 1; |
55f0e6f7 | 206 | |
e6ccf245 | 207 | p = (char *)squidaio_xmalloc(len); |
55f0e6f7 | 208 | strncpy(p, str, len); |
209 | ||
210 | return p; | |
211 | } | |
212 | ||
211f1d0b | 213 | void |
c04d4f40 | 214 | squidaio_xfree(void *p, int size) |
58cd5bbd | 215 | { |
a3efa961 | 216 | MemAllocator *pool; |
58cd5bbd | 217 | |
c04d4f40 | 218 | if ((pool = squidaio_get_pool(size)) != NULL) { |
dc47f531 | 219 | pool->freeOne(p); |
58cd5bbd | 220 | } else |
62e76326 | 221 | xfree(p); |
58cd5bbd | 222 | } |
223 | ||
55f0e6f7 | 224 | static void |
c04d4f40 | 225 | squidaio_xstrfree(char *str) |
55f0e6f7 | 226 | { |
a3efa961 | 227 | MemAllocator *pool; |
f0debecb | 228 | int len = strlen(str) + 1; |
55f0e6f7 | 229 | |
c04d4f40 | 230 | if ((pool = squidaio_get_pool(len)) != NULL) { |
dc47f531 | 231 | pool->freeOne(str); |
55f0e6f7 | 232 | } else |
62e76326 | 233 | xfree(str); |
55f0e6f7 | 234 | } |
235 | ||
d06925a4 | 236 | void |
c04d4f40 | 237 | squidaio_init(void) |
cd748f27 | 238 | { |
239 | int i; | |
c04d4f40 | 240 | squidaio_thread_t *threadp; |
cd748f27 | 241 | |
c04d4f40 | 242 | if (squidaio_initialised) |
62e76326 | 243 | return; |
cd748f27 | 244 | |
245 | pthread_attr_init(&globattr); | |
62e76326 | 246 | |
cd748f27 | 247 | #if HAVE_PTHREAD_ATTR_SETSCOPE |
62e76326 | 248 | |
cd748f27 | 249 | pthread_attr_setscope(&globattr, PTHREAD_SCOPE_SYSTEM); |
62e76326 | 250 | |
cd748f27 | 251 | #endif |
5e5c622b | 252 | #if HAVE_SCHED_H |
62e76326 | 253 | |
cd748f27 | 254 | globsched.sched_priority = 1; |
62e76326 | 255 | |
5e5c622b | 256 | #endif |
62e76326 | 257 | |
cd748f27 | 258 | main_thread = pthread_self(); |
62e76326 | 259 | |
5e5c622b | 260 | #if HAVE_SCHED_H && HAVE_PTHREAD_SETSCHEDPARAM |
62e76326 | 261 | |
cd748f27 | 262 | pthread_setschedparam(main_thread, SCHED_OTHER, &globsched); |
62e76326 | 263 | |
cd748f27 | 264 | #endif |
5e5c622b | 265 | #if HAVE_SCHED_H |
62e76326 | 266 | |
cd748f27 | 267 | globsched.sched_priority = 2; |
62e76326 | 268 | |
5e5c622b | 269 | #endif |
270 | #if HAVE_SCHED_H && HAVE_PTHREAD_ATTR_SETSCHEDPARAM | |
62e76326 | 271 | |
cd748f27 | 272 | pthread_attr_setschedparam(&globattr, &globsched); |
62e76326 | 273 | |
cd748f27 | 274 | #endif |
275 | ||
5a3501d2 | 276 | /* Give each thread a smaller 256KB stack, should be more than sufficient */ |
277 | pthread_attr_setstacksize(&globattr, 256 * 1024); | |
278 | ||
55f0e6f7 | 279 | /* Initialize request queue */ |
280 | if (pthread_mutex_init(&(request_queue.mutex), NULL)) | |
62e76326 | 281 | fatal("Failed to create mutex"); |
282 | ||
55f0e6f7 | 283 | if (pthread_cond_init(&(request_queue.cond), NULL)) |
62e76326 | 284 | fatal("Failed to create condition variable"); |
285 | ||
55f0e6f7 | 286 | request_queue.head = NULL; |
62e76326 | 287 | |
55f0e6f7 | 288 | request_queue.tailp = &request_queue.head; |
62e76326 | 289 | |
55f0e6f7 | 290 | request_queue.requests = 0; |
62e76326 | 291 | |
55f0e6f7 | 292 | request_queue.blocked = 0; |
293 | ||
294 | /* Initialize done queue */ | |
295 | if (pthread_mutex_init(&(done_queue.mutex), NULL)) | |
62e76326 | 296 | fatal("Failed to create mutex"); |
297 | ||
55f0e6f7 | 298 | if (pthread_cond_init(&(done_queue.cond), NULL)) |
62e76326 | 299 | fatal("Failed to create condition variable"); |
300 | ||
55f0e6f7 | 301 | done_queue.head = NULL; |
62e76326 | 302 | |
55f0e6f7 | 303 | done_queue.tailp = &done_queue.head; |
62e76326 | 304 | |
55f0e6f7 | 305 | done_queue.requests = 0; |
62e76326 | 306 | |
55f0e6f7 | 307 | done_queue.blocked = 0; |
cd748f27 | 308 | |
45bb0381 AJ |
309 | // Initialize the thread I/O pipes before creating any threads |
310 | // see bug 3189 comment 5 about race conditions. | |
311 | CommIO::Initialize(); | |
312 | ||
55f0e6f7 | 313 | /* Create threads and get them to sit in their wait loop */ |
04eb0689 | 314 | squidaio_thread_pool = memPoolCreate("aio_thread", sizeof(squidaio_thread_t)); |
62e76326 | 315 | |
9fbbe256 | 316 | assert(NUMTHREADS); |
62e76326 | 317 | |
cb4185f1 | 318 | for (i = 0; i < NUMTHREADS; ++i) { |
b001e822 | 319 | threadp = (squidaio_thread_t *)squidaio_thread_pool->alloc(); |
62e76326 | 320 | threadp->status = _THREAD_STARTING; |
321 | threadp->current_req = NULL; | |
322 | threadp->requests = 0; | |
323 | threadp->next = threads; | |
324 | threads = threadp; | |
325 | ||
326 | if (pthread_create(&threadp->thread, &globattr, squidaio_thread_loop, threadp)) { | |
327 | fprintf(stderr, "Thread creation failed\n"); | |
328 | threadp->status = _THREAD_FAILED; | |
329 | continue; | |
330 | } | |
cd748f27 | 331 | } |
332 | ||
333 | /* Create request pool */ | |
04eb0689 | 334 | squidaio_request_pool = memPoolCreate("aio_request", sizeof(squidaio_request_t)); |
62e76326 | 335 | |
04eb0689 | 336 | squidaio_large_bufs = memPoolCreate("squidaio_large_bufs", AIO_LARGE_BUFS); |
62e76326 | 337 | |
04eb0689 | 338 | squidaio_medium_bufs = memPoolCreate("squidaio_medium_bufs", AIO_MEDIUM_BUFS); |
62e76326 | 339 | |
04eb0689 | 340 | squidaio_small_bufs = memPoolCreate("squidaio_small_bufs", AIO_SMALL_BUFS); |
62e76326 | 341 | |
04eb0689 | 342 | squidaio_tiny_bufs = memPoolCreate("squidaio_tiny_bufs", AIO_TINY_BUFS); |
62e76326 | 343 | |
04eb0689 | 344 | squidaio_micro_bufs = memPoolCreate("squidaio_micro_bufs", AIO_MICRO_BUFS); |
c04d4f40 | 345 | |
346 | squidaio_initialised = 1; | |
cd748f27 | 347 | } |
348 | ||
d06925a4 | 349 | void |
350 | squidaio_shutdown(void) | |
351 | { | |
352 | if (!squidaio_initialised) | |
353 | return; | |
354 | ||
355 | /* This is the same as in squidaio_sync */ | |
356 | do { | |
357 | squidaio_poll_queues(); | |
358 | } while (request_queue_len > 0); | |
359 | ||
360 | CommIO::NotifyIOClose(); | |
361 | ||
362 | squidaio_initialised = 0; | |
363 | } | |
cd748f27 | 364 | |
59a09b98 | 365 | void * |
c04d4f40 | 366 | squidaio_thread_loop(void *ptr) |
cd748f27 | 367 | { |
e6ccf245 | 368 | squidaio_thread_t *threadp = (squidaio_thread_t *)ptr; |
c04d4f40 | 369 | squidaio_request_t *request; |
e6ccf245 | 370 | sigset_t newSig; |
cd748f27 | 371 | |
372 | /* | |
373 | * Make sure to ignore signals which may possibly get sent to | |
374 | * the parent squid thread. Causes havoc with mutex's and | |
375 | * condition waits otherwise | |
376 | */ | |
377 | ||
e6ccf245 | 378 | sigemptyset(&newSig); |
379 | sigaddset(&newSig, SIGPIPE); | |
380 | sigaddset(&newSig, SIGCHLD); | |
605f2c3e | 381 | #if defined(_SQUID_LINUX_THREADS_) |
62e76326 | 382 | |
e6ccf245 | 383 | sigaddset(&newSig, SIGQUIT); |
384 | sigaddset(&newSig, SIGTRAP); | |
cd748f27 | 385 | #else |
62e76326 | 386 | |
e6ccf245 | 387 | sigaddset(&newSig, SIGUSR1); |
388 | sigaddset(&newSig, SIGUSR2); | |
cd748f27 | 389 | #endif |
62e76326 | 390 | |
e6ccf245 | 391 | sigaddset(&newSig, SIGHUP); |
392 | sigaddset(&newSig, SIGTERM); | |
393 | sigaddset(&newSig, SIGINT); | |
394 | sigaddset(&newSig, SIGALRM); | |
395 | pthread_sigmask(SIG_BLOCK, &newSig, NULL); | |
cd748f27 | 396 | |
cd748f27 | 397 | while (1) { |
62e76326 | 398 | threadp->current_req = request = NULL; |
399 | request = NULL; | |
400 | /* Get a request to process */ | |
401 | threadp->status = _THREAD_WAITING; | |
402 | pthread_mutex_lock(&request_queue.mutex); | |
403 | ||
404 | while (!request_queue.head) { | |
405 | pthread_cond_wait(&request_queue.cond, &request_queue.mutex); | |
406 | } | |
407 | ||
408 | request = request_queue.head; | |
409 | ||
410 | if (request) | |
411 | request_queue.head = request->next; | |
412 | ||
413 | if (!request_queue.head) | |
414 | request_queue.tailp = &request_queue.head; | |
415 | ||
416 | pthread_mutex_unlock(&request_queue.mutex); | |
417 | ||
418 | /* process the request */ | |
419 | threadp->status = _THREAD_BUSY; | |
420 | ||
421 | request->next = NULL; | |
422 | ||
423 | threadp->current_req = request; | |
424 | ||
425 | errno = 0; | |
426 | ||
427 | if (!request->cancelled) { | |
428 | switch (request->request_type) { | |
429 | ||
430 | case _AIO_OP_OPEN: | |
431 | squidaio_do_open(request); | |
432 | break; | |
433 | ||
434 | case _AIO_OP_READ: | |
435 | squidaio_do_read(request); | |
436 | break; | |
437 | ||
438 | case _AIO_OP_WRITE: | |
439 | squidaio_do_write(request); | |
440 | break; | |
441 | ||
442 | case _AIO_OP_CLOSE: | |
443 | squidaio_do_close(request); | |
444 | break; | |
445 | ||
efa3acd1 | 446 | case _AIO_OP_UNLINK: |
447 | squidaio_do_unlink(request); | |
448 | break; | |
449 | ||
cd748f27 | 450 | #if AIO_OPENDIR /* Opendir not implemented yet */ |
62e76326 | 451 | |
452 | case _AIO_OP_OPENDIR: | |
453 | squidaio_do_opendir(request); | |
454 | break; | |
cd748f27 | 455 | #endif |
62e76326 | 456 | |
457 | case _AIO_OP_STAT: | |
458 | squidaio_do_stat(request); | |
459 | break; | |
460 | ||
461 | default: | |
462 | request->ret = -1; | |
463 | request->err = EINVAL; | |
464 | break; | |
465 | } | |
466 | } else { /* cancelled */ | |
467 | request->ret = -1; | |
468 | request->err = EINTR; | |
469 | } | |
470 | ||
471 | threadp->status = _THREAD_DONE; | |
472 | /* put the request in the done queue */ | |
473 | pthread_mutex_lock(&done_queue.mutex); | |
474 | *done_queue.tailp = request; | |
475 | done_queue.tailp = &request->next; | |
476 | pthread_mutex_unlock(&done_queue.mutex); | |
477 | CommIO::NotifyIOCompleted(); | |
cb4185f1 | 478 | ++ threadp->requests; |
55f0e6f7 | 479 | } /* while forever */ |
62e76326 | 480 | |
cd748f27 | 481 | return NULL; |
c04d4f40 | 482 | } /* squidaio_thread_loop */ |
cd748f27 | 483 | |
484 | static void | |
c04d4f40 | 485 | squidaio_queue_request(squidaio_request_t * request) |
cd748f27 | 486 | { |
cd748f27 | 487 | static int high_start = 0; |
bf8fe701 | 488 | debugs(43, 9, "squidaio_queue_request: " << request << " type=" << request->request_type << " result=" << request->resultp); |
cd748f27 | 489 | /* Mark it as not executed (failing result, no error) */ |
55f0e6f7 | 490 | request->ret = -1; |
491 | request->err = 0; | |
492 | /* Internal housekeeping */ | |
493 | request_queue_len += 1; | |
494 | request->resultp->_data = request; | |
495 | /* Play some tricks with the request_queue2 queue */ | |
496 | request->next = NULL; | |
62e76326 | 497 | |
40173038 | 498 | if (pthread_mutex_trylock(&request_queue.mutex) == 0) { |
62e76326 | 499 | if (request_queue2.head) { |
500 | /* Grab blocked requests */ | |
501 | *request_queue.tailp = request_queue2.head; | |
502 | request_queue.tailp = request_queue2.tailp; | |
503 | } | |
504 | ||
505 | /* Enqueue request */ | |
506 | *request_queue.tailp = request; | |
507 | ||
508 | request_queue.tailp = &request->next; | |
509 | ||
510 | pthread_cond_signal(&request_queue.cond); | |
511 | ||
512 | pthread_mutex_unlock(&request_queue.mutex); | |
513 | ||
514 | if (request_queue2.head) { | |
515 | /* Clear queue of blocked requests */ | |
516 | request_queue2.head = NULL; | |
517 | request_queue2.tailp = &request_queue2.head; | |
518 | } | |
40173038 | 519 | } else { |
62e76326 | 520 | /* Oops, the request queue is blocked, use request_queue2 */ |
521 | *request_queue2.tailp = request; | |
522 | request_queue2.tailp = &request->next; | |
55f0e6f7 | 523 | } |
62e76326 | 524 | |
55f0e6f7 | 525 | if (request_queue2.head) { |
62e76326 | 526 | static int filter = 0; |
527 | static int filter_limit = 8; | |
528 | ||
529 | if (++filter >= filter_limit) { | |
530 | filter_limit += filter; | |
531 | filter = 0; | |
e0236918 | 532 | debugs(43, DBG_IMPORTANT, "squidaio_queue_request: WARNING - Queue congestion"); |
62e76326 | 533 | } |
cd748f27 | 534 | } |
62e76326 | 535 | |
cd748f27 | 536 | /* Warn if out of threads */ |
55f0e6f7 | 537 | if (request_queue_len > MAGIC1) { |
62e76326 | 538 | static int last_warn = 0; |
539 | static int queue_high, queue_low; | |
540 | ||
541 | if (high_start == 0) { | |
542 | high_start = squid_curtime; | |
543 | queue_high = request_queue_len; | |
544 | queue_low = request_queue_len; | |
545 | } | |
546 | ||
547 | if (request_queue_len > queue_high) | |
548 | queue_high = request_queue_len; | |
549 | ||
550 | if (request_queue_len < queue_low) | |
551 | queue_low = request_queue_len; | |
552 | ||
553 | if (squid_curtime >= (last_warn + 15) && | |
554 | squid_curtime >= (high_start + 5)) { | |
e0236918 | 555 | debugs(43, DBG_IMPORTANT, "squidaio_queue_request: WARNING - Disk I/O overloading"); |
62e76326 | 556 | |
557 | if (squid_curtime >= (high_start + 15)) | |
e0236918 | 558 | debugs(43, DBG_IMPORTANT, "squidaio_queue_request: Queue Length: current=" << |
bf8fe701 | 559 | request_queue_len << ", high=" << queue_high << |
560 | ", low=" << queue_low << ", duration=" << | |
561 | (long int) (squid_curtime - high_start)); | |
62e76326 | 562 | |
563 | last_warn = squid_curtime; | |
564 | } | |
cd748f27 | 565 | } else { |
62e76326 | 566 | high_start = 0; |
cd748f27 | 567 | } |
62e76326 | 568 | |
55f0e6f7 | 569 | /* Warn if seriously overloaded */ |
cd748f27 | 570 | if (request_queue_len > RIDICULOUS_LENGTH) { |
fa84c01d FC |
571 | debugs(43, DBG_CRITICAL, "squidaio_queue_request: Async request queue growing uncontrollably!"); |
572 | debugs(43, DBG_CRITICAL, "squidaio_queue_request: Syncing pending I/O operations.. (blocking)"); | |
62e76326 | 573 | squidaio_sync(); |
fa84c01d | 574 | debugs(43, DBG_CRITICAL, "squidaio_queue_request: Synced"); |
cd748f27 | 575 | } |
c04d4f40 | 576 | } /* squidaio_queue_request */ |
cd748f27 | 577 | |
cd748f27 | 578 | static void |
c04d4f40 | 579 | squidaio_cleanup_request(squidaio_request_t * requestp) |
cd748f27 | 580 | { |
c04d4f40 | 581 | squidaio_result_t *resultp = requestp->resultp; |
cd748f27 | 582 | int cancelled = requestp->cancelled; |
583 | ||
584 | /* Free allocated structures and copy data back to user space if the */ | |
585 | /* request hasn't been cancelled */ | |
62e76326 | 586 | |
cd748f27 | 587 | switch (requestp->request_type) { |
62e76326 | 588 | |
cd748f27 | 589 | case _AIO_OP_STAT: |
62e76326 | 590 | |
591 | if (!cancelled && requestp->ret == 0) | |
41d00cd3 | 592 | memcpy(requestp->statp, requestp->tmpstatp, sizeof(struct stat)); |
62e76326 | 593 | |
594 | squidaio_xfree(requestp->tmpstatp, sizeof(struct stat)); | |
595 | ||
596 | squidaio_xstrfree(requestp->path); | |
597 | ||
598 | break; | |
599 | ||
cd748f27 | 600 | case _AIO_OP_OPEN: |
62e76326 | 601 | if (cancelled && requestp->ret >= 0) |
602 | /* The open() was cancelled but completed */ | |
603 | close(requestp->ret); | |
604 | ||
605 | squidaio_xstrfree(requestp->path); | |
606 | ||
607 | break; | |
608 | ||
cd748f27 | 609 | case _AIO_OP_CLOSE: |
62e76326 | 610 | if (cancelled && requestp->ret < 0) |
611 | /* The close() was cancelled and never got executed */ | |
612 | close(requestp->fd); | |
613 | ||
614 | break; | |
615 | ||
cd748f27 | 616 | case _AIO_OP_UNLINK: |
62e76326 | 617 | |
cd748f27 | 618 | case _AIO_OP_OPENDIR: |
62e76326 | 619 | squidaio_xstrfree(requestp->path); |
620 | ||
621 | break; | |
622 | ||
cd748f27 | 623 | case _AIO_OP_READ: |
62e76326 | 624 | break; |
625 | ||
cd748f27 | 626 | case _AIO_OP_WRITE: |
62e76326 | 627 | break; |
628 | ||
cd748f27 | 629 | default: |
62e76326 | 630 | break; |
cd748f27 | 631 | } |
62e76326 | 632 | |
cd748f27 | 633 | if (resultp != NULL && !cancelled) { |
62e76326 | 634 | resultp->aio_return = requestp->ret; |
635 | resultp->aio_errno = requestp->err; | |
cd748f27 | 636 | } |
62e76326 | 637 | |
dc47f531 | 638 | squidaio_request_pool->freeOne(requestp); |
c04d4f40 | 639 | } /* squidaio_cleanup_request */ |
cd748f27 | 640 | |
cd748f27 | 641 | int |
c04d4f40 | 642 | squidaio_cancel(squidaio_result_t * resultp) |
cd748f27 | 643 | { |
e6ccf245 | 644 | squidaio_request_t *request = (squidaio_request_t *)resultp->_data; |
cd748f27 | 645 | |
55f0e6f7 | 646 | if (request && request->resultp == resultp) { |
bf8fe701 | 647 | debugs(43, 9, "squidaio_cancel: " << request << " type=" << request->request_type << " result=" << request->resultp); |
62e76326 | 648 | request->cancelled = 1; |
649 | request->resultp = NULL; | |
650 | resultp->_data = NULL; | |
651 | resultp->result_type = _AIO_OP_NONE; | |
652 | return 0; | |
55f0e6f7 | 653 | } |
62e76326 | 654 | |
cd748f27 | 655 | return 1; |
c04d4f40 | 656 | } /* squidaio_cancel */ |
cd748f27 | 657 | |
cd748f27 | 658 | int |
c04d4f40 | 659 | squidaio_open(const char *path, int oflag, mode_t mode, squidaio_result_t * resultp) |
cd748f27 | 660 | { |
e65c313f | 661 | squidaio_init(); |
c04d4f40 | 662 | squidaio_request_t *requestp; |
cd748f27 | 663 | |
b001e822 | 664 | requestp = (squidaio_request_t *)squidaio_request_pool->alloc(); |
62e76326 | 665 | |
c04d4f40 | 666 | requestp->path = (char *) squidaio_xstrdup(path); |
62e76326 | 667 | |
cd748f27 | 668 | requestp->oflag = oflag; |
62e76326 | 669 | |
cd748f27 | 670 | requestp->mode = mode; |
62e76326 | 671 | |
cd748f27 | 672 | requestp->resultp = resultp; |
62e76326 | 673 | |
cd748f27 | 674 | requestp->request_type = _AIO_OP_OPEN; |
62e76326 | 675 | |
cd748f27 | 676 | requestp->cancelled = 0; |
62e76326 | 677 | |
12e137b0 | 678 | resultp->result_type = _AIO_OP_OPEN; |
cd748f27 | 679 | |
c04d4f40 | 680 | squidaio_queue_request(requestp); |
62e76326 | 681 | |
cd748f27 | 682 | return 0; |
683 | } | |
684 | ||
cd748f27 | 685 | static void |
c04d4f40 | 686 | squidaio_do_open(squidaio_request_t * requestp) |
cd748f27 | 687 | { |
688 | requestp->ret = open(requestp->path, requestp->oflag, requestp->mode); | |
689 | requestp->err = errno; | |
690 | } | |
691 | ||
cd748f27 | 692 | int |
ee139403 | 693 | squidaio_read(int fd, char *bufp, size_t bufs, off_t offset, int whence, squidaio_result_t * resultp) |
cd748f27 | 694 | { |
c04d4f40 | 695 | squidaio_request_t *requestp; |
cd748f27 | 696 | |
b001e822 | 697 | requestp = (squidaio_request_t *)squidaio_request_pool->alloc(); |
62e76326 | 698 | |
cd748f27 | 699 | requestp->fd = fd; |
62e76326 | 700 | |
cd748f27 | 701 | requestp->bufferp = bufp; |
62e76326 | 702 | |
cd748f27 | 703 | requestp->buflen = bufs; |
62e76326 | 704 | |
cd748f27 | 705 | requestp->offset = offset; |
62e76326 | 706 | |
cd748f27 | 707 | requestp->whence = whence; |
62e76326 | 708 | |
cd748f27 | 709 | requestp->resultp = resultp; |
62e76326 | 710 | |
cd748f27 | 711 | requestp->request_type = _AIO_OP_READ; |
62e76326 | 712 | |
cd748f27 | 713 | requestp->cancelled = 0; |
62e76326 | 714 | |
12e137b0 | 715 | resultp->result_type = _AIO_OP_READ; |
cd748f27 | 716 | |
c04d4f40 | 717 | squidaio_queue_request(requestp); |
62e76326 | 718 | |
cd748f27 | 719 | return 0; |
720 | } | |
721 | ||
cd748f27 | 722 | static void |
c04d4f40 | 723 | squidaio_do_read(squidaio_request_t * requestp) |
cd748f27 | 724 | { |
725 | lseek(requestp->fd, requestp->offset, requestp->whence); | |
211f1d0b | 726 | requestp->ret = read(requestp->fd, requestp->bufferp, requestp->buflen); |
cd748f27 | 727 | requestp->err = errno; |
728 | } | |
729 | ||
cd748f27 | 730 | int |
ee139403 | 731 | squidaio_write(int fd, char *bufp, size_t bufs, off_t offset, int whence, squidaio_result_t * resultp) |
cd748f27 | 732 | { |
c04d4f40 | 733 | squidaio_request_t *requestp; |
cd748f27 | 734 | |
b001e822 | 735 | requestp = (squidaio_request_t *)squidaio_request_pool->alloc(); |
62e76326 | 736 | |
cd748f27 | 737 | requestp->fd = fd; |
62e76326 | 738 | |
d06925a4 | 739 | requestp->bufferp = bufp; |
62e76326 | 740 | |
cd748f27 | 741 | requestp->buflen = bufs; |
62e76326 | 742 | |
cd748f27 | 743 | requestp->offset = offset; |
62e76326 | 744 | |
cd748f27 | 745 | requestp->whence = whence; |
62e76326 | 746 | |
cd748f27 | 747 | requestp->resultp = resultp; |
62e76326 | 748 | |
cd748f27 | 749 | requestp->request_type = _AIO_OP_WRITE; |
62e76326 | 750 | |
cd748f27 | 751 | requestp->cancelled = 0; |
62e76326 | 752 | |
12e137b0 | 753 | resultp->result_type = _AIO_OP_WRITE; |
cd748f27 | 754 | |
c04d4f40 | 755 | squidaio_queue_request(requestp); |
62e76326 | 756 | |
cd748f27 | 757 | return 0; |
758 | } | |
759 | ||
cd748f27 | 760 | static void |
c04d4f40 | 761 | squidaio_do_write(squidaio_request_t * requestp) |
cd748f27 | 762 | { |
d06925a4 | 763 | requestp->ret = write(requestp->fd, requestp->bufferp, requestp->buflen); |
cd748f27 | 764 | requestp->err = errno; |
765 | } | |
766 | ||
cd748f27 | 767 | int |
c04d4f40 | 768 | squidaio_close(int fd, squidaio_result_t * resultp) |
cd748f27 | 769 | { |
c04d4f40 | 770 | squidaio_request_t *requestp; |
cd748f27 | 771 | |
b001e822 | 772 | requestp = (squidaio_request_t *)squidaio_request_pool->alloc(); |
62e76326 | 773 | |
cd748f27 | 774 | requestp->fd = fd; |
62e76326 | 775 | |
cd748f27 | 776 | requestp->resultp = resultp; |
62e76326 | 777 | |
cd748f27 | 778 | requestp->request_type = _AIO_OP_CLOSE; |
62e76326 | 779 | |
cd748f27 | 780 | requestp->cancelled = 0; |
62e76326 | 781 | |
12e137b0 | 782 | resultp->result_type = _AIO_OP_CLOSE; |
cd748f27 | 783 | |
c04d4f40 | 784 | squidaio_queue_request(requestp); |
62e76326 | 785 | |
cd748f27 | 786 | return 0; |
787 | } | |
788 | ||
cd748f27 | 789 | static void |
c04d4f40 | 790 | squidaio_do_close(squidaio_request_t * requestp) |
cd748f27 | 791 | { |
792 | requestp->ret = close(requestp->fd); | |
793 | requestp->err = errno; | |
794 | } | |
795 | ||
cd748f27 | 796 | int |
62e76326 | 797 | |
c04d4f40 | 798 | squidaio_stat(const char *path, struct stat *sb, squidaio_result_t * resultp) |
cd748f27 | 799 | { |
e65c313f | 800 | squidaio_init(); |
c04d4f40 | 801 | squidaio_request_t *requestp; |
cd748f27 | 802 | |
b001e822 | 803 | requestp = (squidaio_request_t *)squidaio_request_pool->alloc(); |
62e76326 | 804 | |
c04d4f40 | 805 | requestp->path = (char *) squidaio_xstrdup(path); |
62e76326 | 806 | |
cd748f27 | 807 | requestp->statp = sb; |
62e76326 | 808 | |
c04d4f40 | 809 | requestp->tmpstatp = (struct stat *) squidaio_xmalloc(sizeof(struct stat)); |
62e76326 | 810 | |
cd748f27 | 811 | requestp->resultp = resultp; |
62e76326 | 812 | |
cd748f27 | 813 | requestp->request_type = _AIO_OP_STAT; |
62e76326 | 814 | |
cd748f27 | 815 | requestp->cancelled = 0; |
62e76326 | 816 | |
12e137b0 | 817 | resultp->result_type = _AIO_OP_STAT; |
cd748f27 | 818 | |
c04d4f40 | 819 | squidaio_queue_request(requestp); |
62e76326 | 820 | |
cd748f27 | 821 | return 0; |
822 | } | |
823 | ||
cd748f27 | 824 | static void |
c04d4f40 | 825 | squidaio_do_stat(squidaio_request_t * requestp) |
cd748f27 | 826 | { |
827 | requestp->ret = stat(requestp->path, requestp->tmpstatp); | |
828 | requestp->err = errno; | |
829 | } | |
830 | ||
15a47d1d | 831 | int |
efa3acd1 | 832 | squidaio_unlink(const char *path, squidaio_result_t * resultp) |
15a47d1d | 833 | { |
e65c313f | 834 | squidaio_init(); |
c04d4f40 | 835 | squidaio_request_t *requestp; |
15a47d1d | 836 | |
b001e822 | 837 | requestp = (squidaio_request_t *)squidaio_request_pool->alloc(); |
62e76326 | 838 | |
efa3acd1 | 839 | requestp->path = squidaio_xstrdup(path); |
62e76326 | 840 | |
15a47d1d | 841 | requestp->resultp = resultp; |
62e76326 | 842 | |
efa3acd1 | 843 | requestp->request_type = _AIO_OP_UNLINK; |
62e76326 | 844 | |
15a47d1d | 845 | requestp->cancelled = 0; |
62e76326 | 846 | |
efa3acd1 | 847 | resultp->result_type = _AIO_OP_UNLINK; |
15a47d1d | 848 | |
c04d4f40 | 849 | squidaio_queue_request(requestp); |
62e76326 | 850 | |
15a47d1d | 851 | return 0; |
852 | } | |
853 | ||
15a47d1d | 854 | static void |
efa3acd1 | 855 | squidaio_do_unlink(squidaio_request_t * requestp) |
15a47d1d | 856 | { |
efa3acd1 | 857 | requestp->ret = unlink(requestp->path); |
15a47d1d | 858 | requestp->err = errno; |
859 | } | |
860 | ||
cd748f27 | 861 | #if AIO_OPENDIR |
c04d4f40 | 862 | /* XXX squidaio_opendir NOT implemented yet.. */ |
cd748f27 | 863 | |
864 | int | |
c04d4f40 | 865 | squidaio_opendir(const char *path, squidaio_result_t * resultp) |
cd748f27 | 866 | { |
c04d4f40 | 867 | squidaio_request_t *requestp; |
cd748f27 | 868 | int len; |
869 | ||
b001e822 | 870 | requestp = squidaio_request_pool->alloc(); |
62e76326 | 871 | |
12e137b0 | 872 | resultp->result_type = _AIO_OP_OPENDIR; |
62e76326 | 873 | |
cd748f27 | 874 | return -1; |
875 | } | |
876 | ||
877 | static void | |
c04d4f40 | 878 | squidaio_do_opendir(squidaio_request_t * requestp) |
cd748f27 | 879 | { |
880 | /* NOT IMPLEMENTED */ | |
881 | } | |
882 | ||
883 | #endif | |
884 | ||
55f0e6f7 | 885 | static void |
c04d4f40 | 886 | squidaio_poll_queues(void) |
55f0e6f7 | 887 | { |
888 | /* kick "overflow" request queue */ | |
62e76326 | 889 | |
55f0e6f7 | 890 | if (request_queue2.head && |
62e76326 | 891 | pthread_mutex_trylock(&request_queue.mutex) == 0) { |
892 | *request_queue.tailp = request_queue2.head; | |
893 | request_queue.tailp = request_queue2.tailp; | |
894 | pthread_cond_signal(&request_queue.cond); | |
895 | pthread_mutex_unlock(&request_queue.mutex); | |
896 | request_queue2.head = NULL; | |
897 | request_queue2.tailp = &request_queue2.head; | |
55f0e6f7 | 898 | } |
62e76326 | 899 | |
55f0e6f7 | 900 | /* poll done queue */ |
901 | if (done_queue.head && pthread_mutex_trylock(&done_queue.mutex) == 0) { | |
62e76326 | 902 | |
903 | struct squidaio_request_t *requests = done_queue.head; | |
904 | done_queue.head = NULL; | |
905 | done_queue.tailp = &done_queue.head; | |
906 | pthread_mutex_unlock(&done_queue.mutex); | |
907 | *done_requests.tailp = requests; | |
908 | request_queue_len -= 1; | |
909 | ||
910 | while (requests->next) { | |
911 | requests = requests->next; | |
912 | request_queue_len -= 1; | |
913 | } | |
914 | ||
915 | done_requests.tailp = &requests->next; | |
55f0e6f7 | 916 | } |
55f0e6f7 | 917 | } |
cd748f27 | 918 | |
c04d4f40 | 919 | squidaio_result_t * |
920 | squidaio_poll_done(void) | |
cd748f27 | 921 | { |
c04d4f40 | 922 | squidaio_request_t *request; |
923 | squidaio_result_t *resultp; | |
cd748f27 | 924 | int cancelled; |
55f0e6f7 | 925 | int polled = 0; |
cd748f27 | 926 | |
62e76326 | 927 | AIO_REPOLL: |
55f0e6f7 | 928 | request = done_requests.head; |
62e76326 | 929 | |
55f0e6f7 | 930 | if (request == NULL && !polled) { |
62e76326 | 931 | CommIO::ResetNotifications(); |
932 | squidaio_poll_queues(); | |
933 | polled = 1; | |
934 | request = done_requests.head; | |
55f0e6f7 | 935 | } |
62e76326 | 936 | |
55f0e6f7 | 937 | if (!request) { |
62e76326 | 938 | return NULL; |
cd748f27 | 939 | } |
62e76326 | 940 | |
bf8fe701 | 941 | debugs(43, 9, "squidaio_poll_done: " << request << " type=" << request->request_type << " result=" << request->resultp); |
55f0e6f7 | 942 | done_requests.head = request->next; |
62e76326 | 943 | |
55f0e6f7 | 944 | if (!done_requests.head) |
62e76326 | 945 | done_requests.tailp = &done_requests.head; |
946 | ||
55f0e6f7 | 947 | resultp = request->resultp; |
62e76326 | 948 | |
55f0e6f7 | 949 | cancelled = request->cancelled; |
62e76326 | 950 | |
c04d4f40 | 951 | squidaio_debug(request); |
62e76326 | 952 | |
bf8fe701 | 953 | debugs(43, 5, "DONE: " << request->ret << " -> " << request->err); |
62e76326 | 954 | |
c04d4f40 | 955 | squidaio_cleanup_request(request); |
62e76326 | 956 | |
cd748f27 | 957 | if (cancelled) |
62e76326 | 958 | goto AIO_REPOLL; |
959 | ||
cd748f27 | 960 | return resultp; |
c04d4f40 | 961 | } /* squidaio_poll_done */ |
cd748f27 | 962 | |
963 | int | |
c04d4f40 | 964 | squidaio_operations_pending(void) |
cd748f27 | 965 | { |
55f0e6f7 | 966 | return request_queue_len + (done_requests.head ? 1 : 0); |
cd748f27 | 967 | } |
968 | ||
969 | int | |
c04d4f40 | 970 | squidaio_sync(void) |
cd748f27 | 971 | { |
55f0e6f7 | 972 | /* XXX This might take a while if the queue is large.. */ |
62e76326 | 973 | |
cd748f27 | 974 | do { |
62e76326 | 975 | squidaio_poll_queues(); |
cd748f27 | 976 | } while (request_queue_len > 0); |
62e76326 | 977 | |
c04d4f40 | 978 | return squidaio_operations_pending(); |
cd748f27 | 979 | } |
980 | ||
981 | int | |
c04d4f40 | 982 | squidaio_get_queue_len(void) |
cd748f27 | 983 | { |
984 | return request_queue_len; | |
985 | } | |
986 | ||
987 | static void | |
c04d4f40 | 988 | squidaio_debug(squidaio_request_t * request) |
cd748f27 | 989 | { |
55f0e6f7 | 990 | switch (request->request_type) { |
62e76326 | 991 | |
cd748f27 | 992 | case _AIO_OP_OPEN: |
bf8fe701 | 993 | debugs(43, 5, "OPEN of " << request->path << " to FD " << request->ret); |
62e76326 | 994 | break; |
995 | ||
cd748f27 | 996 | case _AIO_OP_READ: |
bf8fe701 | 997 | debugs(43, 5, "READ on fd: " << request->fd); |
62e76326 | 998 | break; |
999 | ||
cd748f27 | 1000 | case _AIO_OP_WRITE: |
bf8fe701 | 1001 | debugs(43, 5, "WRITE on fd: " << request->fd); |
62e76326 | 1002 | break; |
1003 | ||
cd748f27 | 1004 | case _AIO_OP_CLOSE: |
bf8fe701 | 1005 | debugs(43, 5, "CLOSE of fd: " << request->fd); |
62e76326 | 1006 | break; |
1007 | ||
cd748f27 | 1008 | case _AIO_OP_UNLINK: |
bf8fe701 | 1009 | debugs(43, 5, "UNLINK of " << request->path); |
62e76326 | 1010 | break; |
1011 | ||
cd748f27 | 1012 | default: |
62e76326 | 1013 | break; |
cd748f27 | 1014 | } |
1015 | } | |
b0465494 | 1016 | |
1017 | void | |
1018 | squidaio_stats(StoreEntry * sentry) | |
1019 | { | |
1020 | squidaio_thread_t *threadp; | |
1021 | int i; | |
1022 | ||
1023 | if (!squidaio_initialised) | |
1024 | return; | |
1025 | ||
1026 | storeAppendPrintf(sentry, "\n\nThreads Status:\n"); | |
1027 | ||
1028 | storeAppendPrintf(sentry, "#\tID\t# Requests\n"); | |
1029 | ||
1030 | threadp = threads; | |
1031 | ||
cb4185f1 | 1032 | for (i = 0; i < NUMTHREADS; ++i) { |
691aef5a | 1033 | storeAppendPrintf(sentry, "%i\t0x%lx\t%ld\n", i + 1, (unsigned long)threadp->thread, threadp->requests); |
b0465494 | 1034 | threadp = threadp->next; |
1035 | } | |
1036 | } |