X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Fpool.lisp;h=f58e752848a810a329760409a7b78b14f4e6c66a;hp=9528ac2135fff833778f53680c630072ff7f390e;hb=bada52b7a8fd2cc484dee33cccd64ca09a52ec3d;hpb=fa071351835a2c754895cb917db9c63303e7b5c1

diff --git a/sql/pool.lisp b/sql/pool.lisp
index 9528ac2..f58e752 100644
--- a/sql/pool.lisp
+++ b/sql/pool.lisp
@@ -2,34 +2,43 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          pool.cl
+;;;; Name:          pool.lisp
 ;;;; Purpose:       Support function for connection pool
 ;;;; Programmers:   Kevin M. Rosenberg, Marc Battyani
 ;;;; Date Started:  Apr 2002
 ;;;;
-;;;; $Id: pool.lisp,v 1.2 2002/10/21 07:45:50 kevin Exp $
+;;;; $Id$
 ;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2003 by Kevin M. Rosenberg
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :clsql-sys)
+(in-package clsql-sys)
 
-#-scl
-(defun make-lock (name) (declare (ignore name)) nil)
+(defun make-process-lock (name) 
+  #+allegro (mp:make-process-lock :name name)
+  #+scl (thread:make-lock name)
+  #+lispworks (mp:make-lock :name name)
+  #-(or allegro scl lispworks) (declare (ignore name))
+  #-(or allegro scl lispworks) nil)
 
-#-scl
-(defmacro with-lock-held ((lock desc) &body body)
-  (declare (ignore lock desc))
-  `(progn
-     ,@body))
+(defmacro with-process-lock ((lock desc) &body body)
+  #+scl `(thread:with-lock-held (,lock ,desc) ,@body)
+  #+(or allegro lispworks)
+  (declare (ignore desc))
+  #+(or allegro lispworks)
+  (let ((l (gensym)))
+    `(let ((,l ,lock))
+       #+allegro (mp:with-process-lock (,l) ,@body)
+       #+lispworks (mp:with-lock (,l) ,@body)))
+  #-(or scl allegro lispworks) (declare (ignore lock desc))
+  #-(or scl allegro lispworks) `(progn ,@body))
 
 (defvar *db-pool* (make-hash-table :test #'equal))
-(defvar *db-pool-lock* (make-lock "DB Pool lock"))
+(defvar *db-pool-lock* (make-process-lock "DB Pool lock"))
 
 (defclass conn-pool ()
   ((connection-spec :accessor connection-spec :initarg :connection-spec)
@@ -39,27 +48,27 @@
    (all-connections :accessor all-connections
 		    :initform (make-array 5 :fill-pointer 0 :adjustable t))
    (lock :accessor conn-pool-lock
-	 :initform (make-lock "Connection pool"))))
+	 :initform (make-process-lock "Connection pool"))))
 
 (defun acquire-from-conn-pool (pool)
-  (or (with-lock-held ((conn-pool-lock pool) "Acquire from pool")
+  (or (with-process-lock ((conn-pool-lock pool) "Acquire from pool")
 	(and (plusp (length (free-connections pool)))
 	     (vector-pop (free-connections pool))))
       (let ((conn (connect (connection-spec pool)
 			   :database-type (database-type pool)
 			   :if-exists :new)))
-	(with-lock-held ((conn-pool-lock pool) "Acquire from pool")
+	(with-process-lock ((conn-pool-lock pool) "Acquire from pool")
 	  (vector-push-extend conn (all-connections pool))
 	  (setf (conn-pool conn) pool))
 	conn)))
 
 (defun release-to-conn-pool (conn)
   (let ((pool (conn-pool conn)))
-    (with-lock-held ((conn-pool-lock pool) "Release to pool")
+    (with-process-lock ((conn-pool-lock pool) "Release to pool")
       (vector-push-extend conn (free-connections pool)))))
 
 (defun clear-conn-pool (pool)
-  (with-lock-held ((conn-pool-lock pool) "Clear pool")
+  (with-process-lock ((conn-pool-lock pool) "Clear pool")
     (loop for conn across (all-connections pool)
 	  do (setf (conn-pool conn) nil)
 	  (disconnect :database conn))
@@ -69,7 +78,7 @@
 
 (defun find-or-create-connection-pool (connection-spec database-type)
   "Find connection pool in hash table, creates a new connection pool if not found"
-  (with-lock-held (*db-pool-lock* "Find connection")
+  (with-process-lock (*db-pool-lock* "Find-or-create connection")
     (let* ((key (list connection-spec database-type))
 	   (conn-pool (gethash key *db-pool*)))
       (unless conn-pool
@@ -89,7 +98,7 @@
 
 (defun disconnect-pooled (&optional clear)
   "Disconnects all connections in the pool"
-  (with-lock-held (*db-pool-lock* "Find connection")
+  (with-process-lock (*db-pool-lock* "Disconnect pooled")
     (maphash
      #'(lambda (key conn-pool)
 	 (declare (ignore key))
@@ -97,4 +106,3 @@
      *db-pool*)
     (when clear (clrhash *db-pool*)))
   t)
-