(free-connections :accessor free-connections :initform nil)
(all-connections :accessor all-connections :initform nil)
(lock :accessor conn-pool-lock
- :initform (make-process-lock "Connection pool"))))
+ :initform (make-process-lock "Connection pool"))))
(defun acquire-from-pool (connection-spec database-type &optional pool)
;;not the list). Multiple threads getting to this test at the
;;same time might result in the free-connections getting
;;longer... meh.
- ((>= (length (free-connections pool))
- *db-pool-max-free-connections*)
+ ((and *db-pool-max-free-connections*
+ (>= (length (free-connections pool))
+ *db-pool-max-free-connections*))
(%pool-force-disconnect database)
(with-process-lock ((conn-pool-lock pool) "Remove extra Conn")
(setf (all-connections pool)
(database-execute-command "DISCARD ALL" database)))))
(defun clear-conn-pool (pool)
+ "Be careful this function will disconnect connections without regard
+to whether another thread is actively using them."
(with-process-lock ((conn-pool-lock pool) "Clear pool")
(mapc #'%pool-force-disconnect (all-connections pool))
(setf (all-connections pool) nil
if not found"
(with-process-lock (*db-pool-lock* "Find-or-create connection")
(let* ((key (list connection-spec database-type))
- (conn-pool (gethash key *db-pool*)))
+ (conn-pool (gethash key *db-pool*)))
(unless conn-pool
- (setq conn-pool (make-instance 'conn-pool
- :connection-spec connection-spec
- :pool-database-type database-type))
- (setf (gethash key *db-pool*) conn-pool))
+ (setq conn-pool (make-instance 'conn-pool
+ :connection-spec connection-spec
+ :pool-database-type database-type))
+ (setf (gethash key *db-pool*) conn-pool))
conn-pool)))
(defun disconnect-pooled (&optional clear)
(with-process-lock (*db-pool-lock* "Disconnect pooled")
(maphash
#'(lambda (key conn-pool)
- (declare (ignore key))
- (clear-conn-pool conn-pool))
+ (declare (ignore key))
+ (clear-conn-pool conn-pool))
*db-pool*)
(when clear (clrhash *db-pool*)))
t)