X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Fpool.cl;h=6468c56047efb68fd7335f679b913fca82065569;hb=865598033baf78cf3ba9da36a031a85eb18849e0;hp=298f1e370890c2d8ad56b59ee3270bc14dd8fdcc;hpb=f8478421f5a0440246f70aa4234ff25f416be7e3;p=clsql.git

diff --git a/sql/pool.cl b/sql/pool.cl
index 298f1e3..6468c56 100644
--- a/sql/pool.cl
+++ b/sql/pool.cl
@@ -4,10 +4,10 @@
 ;;;;
 ;;;; Name:          pool.cl
 ;;;; Purpose:       Support function for connection pool
-;;;; Programmers:   Kevin M. Rosenberg
+;;;; Programmers:   Kevin M. Rosenberg, Marc Battyani
 ;;;; Date Started:  Apr 2002
 ;;;;
-;;;; $Id: pool.cl,v 1.1 2002/04/27 20:58:11 kevin Exp $
+;;;; $Id: pool.cl,v 1.5 2002/05/04 16:21:27 marc.battyani Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -21,39 +21,59 @@
 
 (defvar *db-pool* (make-hash-table :test #'equal))
 
-(defun make-conn-vector ()
-  "Creates an empty connection vector"
-  (make-array 5 :fill-pointer 0 :adjustable t))
+(defclass conn-pool ()
+  ((connection-spec :accessor connection-spec :initarg :connection-spec)
+   (database-type :accessor database-type :initarg :database-type)
+   (free-connections :accessor free-connections
+		     :initform (make-array 5 :fill-pointer 0 :adjustable t))
+   (all-connections :accessor all-connections
+		    :initform (make-array 5 :fill-pointer 0 :adjustable t))))
 
-(defun find-or-create-conn-vector (connection-spec database-type)
+(defun acquire-from-conn-pool (pool)
+  (if (zerop (length (free-connections pool)))
+    (let ((conn (connect (connection-spec pool)
+			 :database-type (database-type pool) :if-exists :new)))
+      (vector-push-extend conn (all-connections pool))
+      (setf (conn-pool conn) pool)
+      conn)
+    (vector-pop (free-connections pool))))
+
+(defun release-to-conn-pool (conn)
+  (vector-push-extend conn (free-connections (conn-pool conn))))
+
+(defun clear-conn-pool (pool)
+  (loop for conn across (all-connections pool)
+	do (setf (conn-pool conn) nil)
+	   (disconnect :database conn))
+  (setf (fill-pointer (free-connections pool)) 0)
+  (setf (fill-pointer (all-connections pool)) 0))
+
+(defun find-or-create-conn-pool (connection-spec database-type)
   "Find connection vector in hash table, creates a new conn-vector if not found"
   (let* ((key (list connection-spec database-type))
-	 (conn-vector (gethash *db-pool* key)))
-    (unless conn-vector
-      (setq conn-vector (make-conn-vector))
-      (setf (gethash *db-pool* key) conn-vector))
-    conn-vector))
-
-(defun acquire-from-pool (connection-spec database-type)
-  (let ((conn-vector (find-or-create-conn-vector connection-spec database-type)))
-    (when (zerop (length conn-vector))
-      (vector-push-extend 
-       (connect connection-spec :database-type database-type :if-exists :new) 
-       conn-vector))
-    (vector-pop conn-vector)))
+	 (conn-pool (gethash key *db-pool*)))
+    (unless conn-pool
+      (setq conn-pool (make-instance 'conn-pool
+				     :connection-spec connection-spec
+				     :database-type database-type))
+      (setf (gethash key *db-pool*) conn-pool))
+    conn-pool))
+
+(defun acquire-from-pool (connection-spec database-type &optional pool)
+  (unless (typep pool 'conn-pool)
+    (setf pool (find-or-create-conn-pool connection-spec database-type)))
+  (acquire-from-conn-pool pool))
 
 (defun release-to-pool (database)
-  (let ((conn-vector (find-or-create-conn-vector (connection-spec database)
-					   (database-type database))))
-    (vector-push-extend database conn-vector)))
+  (release-to-conn-pool database))
 
-(defun disconnect-pooled ()
+(defun disconnect-pooled (&optional clear)
   "Disconnects all connections in the pool"
   (maphash
-   #'(lambda (key conn-vector)
+   #'(lambda (key conn-pool)
        (declare (ignore key))
-       (dotimes (i (length conn-vector))
-	 (disconnect (aref conn-vector i)))
-       (setf (fill-pointer conn-vector) 0))
+       (clear-conn-pool conn-pool))
    *db-pool*)
+  (when clear (clrhash *db-pool*))
   t)
+