Improve resource pool destruction
This commit is contained in:
parent
eebb42e7a7
commit
61451907a9
2 changed files with 116 additions and 40 deletions
|
@ -21,6 +21,7 @@
|
|||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-9)
|
||||
#:use-module (srfi srfi-9 gnu)
|
||||
#:use-module (srfi srfi-71)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (ice-9 exceptions)
|
||||
#:use-module (fibers)
|
||||
|
@ -179,10 +180,13 @@
|
|||
(backtrace))))
|
||||
#:unwind? #t)))
|
||||
|
||||
(unless success?
|
||||
(sleep 5)
|
||||
(if success?
|
||||
(put-message channel
|
||||
(list 'remove resource))
|
||||
(begin
|
||||
(sleep 5)
|
||||
|
||||
(loop)))))))
|
||||
(loop))))))))
|
||||
|
||||
(define (spawn-fiber-for-checkout reply-channel resource)
|
||||
(spawn-fiber
|
||||
|
@ -221,12 +225,20 @@
|
|||
(('add-resource resource)
|
||||
(if (= (length resources) max-size)
|
||||
(begin
|
||||
(spawn-fiber-to-destroy-resource resource)
|
||||
(if destructor
|
||||
(begin
|
||||
(spawn-fiber-to-destroy-resource resource)
|
||||
|
||||
(loop resources
|
||||
available
|
||||
waiters
|
||||
resources-last-used))
|
||||
(loop (cons resource resources)
|
||||
available
|
||||
waiters
|
||||
(cons (get-internal-real-time)
|
||||
resources-last-used)))
|
||||
(loop resources
|
||||
available
|
||||
waiters
|
||||
(cons (get-internal-real-time)
|
||||
resources-last-used))))
|
||||
|
||||
(if (null? waiters)
|
||||
(loop (cons resource resources)
|
||||
|
@ -321,6 +333,26 @@
|
|||
(get-internal-real-time))
|
||||
resources-last-used)))))
|
||||
|
||||
(('remove resource)
|
||||
(let ((index
|
||||
(list-index (lambda (x)
|
||||
(eq? x resource))
|
||||
resources)))
|
||||
(define (remove-at-index! lst i)
|
||||
(let ((start
|
||||
end
|
||||
(split-at! lst i)))
|
||||
(append
|
||||
start
|
||||
(cdr end))))
|
||||
|
||||
(loop (remove-at-index! resources index)
|
||||
available ; resource shouldn't be in this list
|
||||
waiters
|
||||
(remove-at-index!
|
||||
resources-last-used
|
||||
index))))
|
||||
|
||||
(('stats reply)
|
||||
(let ((stats
|
||||
`((resources . ,(length resources))
|
||||
|
@ -361,10 +393,11 @@
|
|||
resources
|
||||
resources-last-used-seconds)))
|
||||
|
||||
(for-each
|
||||
(lambda (resource)
|
||||
(spawn-fiber-to-destroy-resource resource))
|
||||
resources-to-destroy)
|
||||
(when destructor
|
||||
(for-each
|
||||
(lambda (resource)
|
||||
(spawn-fiber-to-destroy-resource resource))
|
||||
resources-to-destroy))
|
||||
|
||||
(loop (lset-difference eq? resources resources-to-destroy)
|
||||
(lset-difference eq? available resources-to-destroy)
|
||||
|
@ -378,22 +411,29 @@
|
|||
resources-last-used))))
|
||||
|
||||
(('destroy reply)
|
||||
(if (= (length resources) (length available))
|
||||
(if (null? resources)
|
||||
(put-message reply 'destroy-success)
|
||||
|
||||
(begin
|
||||
(for-each
|
||||
(lambda (resource)
|
||||
(spawn-fiber-to-destroy-resource resource))
|
||||
resources)
|
||||
(put-message reply 'destroy-success))
|
||||
(begin
|
||||
(if destructor
|
||||
(spawn-fiber-to-destroy-resource resource)
|
||||
(spawn-fiber
|
||||
(lambda ()
|
||||
(put-message channel
|
||||
(list 'remove resource)))
|
||||
#:parallel? #t)))
|
||||
available)
|
||||
|
||||
(spawn-fiber
|
||||
(lambda ()
|
||||
(perform-operation
|
||||
(choice-operation
|
||||
(put-operation reply 'resource-pool-destroy-failed)
|
||||
(sleep-operation 10)))))
|
||||
(sleep 0.1)
|
||||
(put-message channel
|
||||
(list 'destroy reply))))
|
||||
|
||||
(loop resources
|
||||
available
|
||||
'()
|
||||
waiters
|
||||
resources-last-used))))
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue