From b0aeb15f9ab4059792ffef6b819bf795755ff8b4 Mon Sep 17 00:00:00 2001
From: Kevin Rosenberg <kevin@rosenberg.net>
Date: Tue, 2 Jun 2009 18:28:48 -0600
Subject: [PATCH] Version 4.0.5 02 Jun 2009  Kevin Rosenberg
 <kevin@rosenberg.net> * Version 4.0.5 * sql/database.lisp: Add process-lock
 for deleting database from a pool (thanks to Ralf Mattes).

---
 ChangeLog                  |   5 ++
 db-mysql/Makefile          |   2 +-
 db-mysql/clsql_mysql.dylib | Bin 0 -> 13048 bytes
 db-mysql/z.dylib           | Bin 0 -> 8332 bytes
 sql/#pool.lisp#            | 133 +++++++++++++++++++++++++++++++++++++++++++++
 sql/database.lisp          |  11 ++--
 uffi/clsql_uffi.dylib      | Bin 0 -> 8380 bytes
 uffi/z.dylib               | Bin 0 -> 8332 bytes
 8 files changed, 145 insertions(+), 6 deletions(-)
 create mode 100644 db-mysql/clsql_mysql.dylib
 create mode 100644 db-mysql/z.dylib
 create mode 100644 sql/#pool.lisp#
 create mode 100644 uffi/clsql_uffi.dylib
 create mode 100644 uffi/z.dylib

diff --git a/ChangeLog b/ChangeLog
index 92444cc..0e1c1d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+02 Jun 2009  Kevin Rosenberg <kevin@rosenberg.net>
+	* Version 4.0.5
+	* sql/database.lisp: Add process-lock for deleting database from
+	a pool (thanks to Ralf Mattes).
+	
 25 Feb 2008  Kevin Rosenberg <kevin@rosenberg.net>
 	* Version 4.0.4
 	* sql/expressions.lisp: Remove stray form (thanks to Samuel Ward)
diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index 63004c7..bffec74 100644
--- a/db-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -28,7 +28,7 @@ shared_lib=$(base).so
 all: $(shared_lib)
 
 CFLAGS=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /usr/local/mysql/include
-LDFLAGS=-L/usr/local/lib64/mysql -L/usr/local/lib/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/usr/local/mysql/lib -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lz -lc 
+LDFLAGS=-L/usr/local/lib64/mysql -L/usr/local/mysql/lib32 -L/usr/local/lib/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/usr/local/mysql/lib -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lz -lc 
 
 ifneq ($(OS_CYGWIN),0)
   CFLAGS=-I /cygdrive/c/Program\ Files/MySQL/MySQL\ Server\ 5.0/include
diff --git a/db-mysql/clsql_mysql.dylib b/db-mysql/clsql_mysql.dylib
new file mode 100644
index 0000000000000000000000000000000000000000..e637f21d08107c2e8fa498ccb01f61cdcb05602b
GIT binary patch
literal 13048
zcwX(BO=uHA6vtnatp=*?wpIx!QXvPus8vx<qNR%#zqJ9u!>~;@Hg-3O$p%{$Ee645
zDIWBo2QMOmHxGhZ5Vd+xK?xo__n;tHF-Q&~qQ2Rkvb*Uvy{fz)yq*8NH}B1xp@$Zx
zZ-0FGwHN@RXfZUd??(V699z(yqA@n892<lnvN!UaR<ww4F=lF`rnj^)e|#yxnTR_^
zz=s6mUXGqMwW6wT39s?9!|joe{u)uA_WJMNHMq+ckb^dRey{(uYO3DyuzX33f&P79
zjWIp#p9gD5vU}fBlN!ALb58ES{zC_kc&G0Hw|6n}{uhh&;H*DcHVVvChjb0*$zLtT
zMc@$=$7&U|wmZ4|1`h01`UhsSH-fu2j^87}eK{-9;%IN$-@V+SZ2Nro&XdaHn{B%z
z!XLxD6*#W#1*l?T8|p(Mw^dl1*uvjiBXVy;d}FW=f*=TjAP9o^8~MaP$9~^Ci@zY-
z;}`Jzd)oEc<9TP6v_4j5*4oOFN$$3knw6~EO3hBzt*M7TS5kh&XA?@TMef`qi6#9B
z$r?<=Y$aw%iBIt^fLG74;?c@X!rA7yh{U=YYFB&TSyQ;HCELl`MCB*`a&5z!YUM@Z
zczA^eoy{vuE?D8h0u@FZD^zCq!R(#;uKTADh^-3Ddc-V_vx)9Y&h=HFO-t*lyn(MW
zfVZIAPOi#WN<CvGYuH3^c@(S3wjx`Rjt5HJdKS81r*t_sCtyuQljx0Gee=YyV9n~2
z=S%Fd`ntpKZ$NH-fBf$`@BZ*-3*q@7PhW|l0YMN1K@bE%5ClOG|0VUNER;<U1VIo4
zK@bE%5X3)$?7W+n`1|bD;sNz?q51p#^+I1m&7ZHgN8C5}hq;cr`6(PaaLu=NfTGaL
zaLsw4x1#@s(6_M8J)z&D|FzH`+TFJ>T)#rio8o#BbzJCC)Ek7ZV;x24hq#y4!c*J>
z7(RW`r?2|-ZJ)mH)BN3eCt4TUGPG`R@1qA8GltnvIhWQoHms>>tqA;yKP#E#AvToF
zrL(yc7|;tCa9{tkOgWcgdOkl=E&whu4Yf4FHg7^za&wuXriN#$F;&;|Db>`RYT$fX
zK`p8Vu#{dpr88rUf7MJzOPN}l74xS{!4Uty1y<6uk)S)1)o?Ri%bhTX!y<+{+9aA&
w4K2)XjujgG*<490nk<_Rx^rbCq}P&Zn2l#KoGXCvgU&hPoJ||In|C9CKXLvlApigX

literal 0
HcwPel00001

diff --git a/db-mysql/z.dylib b/db-mysql/z.dylib
new file mode 100644
index 0000000000000000000000000000000000000000..8821d0905e05e443e97a4d083dbaef40aa6de9e2
GIT binary patch
literal 8332
zcwX(9&q~8U5XQ$Cv7*?32!fzRZyr(w1;JCrf<+O*9=t6{6K!yts!hPEhu$mr3O<65
z;1l=+{yTW^BIwnFI-A|tM5}jUe(+^>llf*Rd!6gI=l6a9=tX5v1E>oPK*!jFIz=&7
zE^e10jnRq1->32+$`9P5pp*LDf0G56Qc;5hI<(@YsC5;2R|@4qBF9K8?me!<m}3Q2
zC%v0rS21;V0<6*GPI8~Fp&Rn9^gn8d{ud+fdTC>=xKfJ$KL@gRjAtPGkMB(|jv7O)
z-rv10ojjJtu5ZJ;{_KpV-e+>M|3!?V<REHOd37a7#NQD96gk<)5NZ|VS@PfHMd!oD
zVV>737SGq3jRT(No-Gt@D%^AZz?@q!@!~uiRGryGonB2;?@@K6_t>2KGKl>7)VcK^
z`CH9K;MUCL&M5>z5ClOG1VIpl;7L5TKQ1RRv|H2o{CJS>+O3gjrxJ~a^9-tM5rQBH
zf*=TjAP9mW{y#=E_tnMBbwUlIN7Y))=S{VK!L=BH4{Oqs1IB7qW{1ART~>81$2|lw
pHfN0>w3+Ssj_2><2fmLV<V2nAgnotbdVMe4m$|HFRjRQYJ^{JydpiIC

literal 0
HcwPel00001

diff --git a/sql/#pool.lisp# b/sql/#pool.lisp#
new file mode 100644
index 0000000..4573155
--- /dev/null
+++ b/sql/#pool.lisp#
@@ -0,0 +1,133 @@
+;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; *************************************************************************
+;;;; FILE IDENTIFICATION
+;;;;
+;;;; Name:          pool.lisp
+;;;; Purpose:       Support function for connection pool
+;;;; Programmers:   Kevin M. Rosenberg, Marc Battyani
+;;;; Date Started:  Apr 2002
+;;;;
+;;;; $Id$
+;;;;
+;;;; 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.
+;;;; *************************************************************************
+
+(in-package #:clsql-sys)
+
+(defvar *db-pool* (make-hash-table :test #'equal))
+(defvar *db-pool-lock* (make-process-lock "DB Pool lock"))
+
+(defclass conn-pool ()
+  ((connection-spec :accessor connection-spec :initarg :connection-spec)
+   (database-type :accessor pool-database-type :initarg :pool-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))
+   (lock :accessor conn-pool-lock
+         :initform (make-process-lock "Connection pool"))))
+
+(defun acquire-from-conn-pool (pool)
+  (or (with-process-lock ((conn-pool-lock pool) "Acquire from pool")
+        (when (plusp (length (free-connections pool)))
+          (let ((pconn (vector-pop (free-connections pool))))
+            ;; test if connection still valid.
+            ;; Currently, on supported on MySQL
+            (cond
+              ((eq :mysql (database-type pconn))
+               (handler-case
+                   (database-query "SHOW ERRORS LIMIT 1" pconn nil nil)
+                 (error (e)
+                   ;; we could check for error type 2006 for "SERVER GONE AWAY",
+                   ;; but, it's safer just to disconnect the pooled conn for any error
+                   (warn "Database connection ~S had an error when attempted to be acquired from the pool:
+  ~S
+Disconnecting.~%"
+                         pconn e)
+                   (ignore-errors (database-disconnect pconn))
+                   nil)
+                 (:no-error (res fields)
+                   (declare (ignore res fields))
+                   pconn)))
+              (t
+               pconn)))))
+      (let ((conn (connect (connection-spec pool)
+                           :database-type (pool-database-type pool)
+                           :if-exists :new
+                           :make-default nil)))
+        (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-process-lock ((conn-pool-lock pool) "Release to pool")
+      (vector-push-extend conn (free-connections pool)))))
+
+(defun clear-conn-pool (pool)
+  (with-process-lock ((conn-pool-lock pool) "Clear pool")
+    (loop for conn across (all-connections pool)
+          do (setf (conn-pool conn) nil)
+          ;; disconnect may error if remote side closed connection
+          (ignore-errors (disconnect :database conn)))
+    (setf (fill-pointer (free-connections pool)) 0)
+    (setf (fill-pointer (all-connections pool)) 0))
+  nil)
+
+(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-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
+        (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 acquire-from-pool (connection-spec database-type &optional pool)
+  (unless (typep pool 'conn-pool)
+    (setf pool (find-or-create-connection-pool connection-spec database-type)))
+  (acquire-from-conn-pool pool))
+
+(defun release-to-pool (database)
+  (release-to-conn-pool database))
+
+(defun disconnect-pooled (&optional clear)
+  "Disconnects all connections in the pool."
+  (with-process-lock (*db-pool-lock* "Disconnect pooled")
+    (maphash
+     #'(lambda (key conn-pool)
+         (declare (ignore key))
+         (clear-conn-pool conn-pool))
+     *db-pool*)
+    (when clear (clrhash *db-pool*)))
+  t)
+
+;(defun pool-start-sql-recording (pool &key (types :command))
+;  "Start all stream in the pool recording actions of TYPES"
+;  (dolist (con (pool-connections pool))
+;    (start-sql-recording :type types
+;                        :database (connection-database con))))
+
+;(defun pool-stop-sql-recording (pool &key (types :command))
+;  "Start all stream in the pool recording actions of TYPES"
+;  (dolist (con (pool-connections pool))
+;    (stop-sql-recording :type types
+;                         :database (connection-database con))))
+
+;(defmacro with-database-connection (pool &body body)
+;  `(let ((connection (obtain-connection ,pool))
+;         (results nil))
+;    (unwind-protect
+;         (with-database ((connection-database connection))
+;           (setq results (multiple-value-list (progn ,@body))))
+;      (release-connection connection))
+;    (values-list results)))
diff --git a/sql/database.lisp b/sql/database.lisp
index 9b71644..14bcdc8 100644
--- a/sql/database.lisp
+++ b/sql/database.lisp
@@ -166,11 +166,12 @@ from a pool it will be released to this pool."
   (let ((database (find-database database :errorp (and database error))))
     (when database
       (if (conn-pool database)
-          (when (release-to-pool database)
-            (setf *connected-databases* (delete database *connected-databases*))
-            (when (eq database *default-database*)
-              (setf *default-database* (car *connected-databases*)))
-            t)
+          (with-process-lock ((conn-pool-lock pool) "Delete from pool")
+            (when (release-to-pool database)
+              (setf *connected-databases* (delete database *connected-databases*))
+              (when (eq database *default-database*)
+                (setf *default-database* (car *connected-databases*)))
+              t))
           (when (database-disconnect database)
             (setf *connected-databases* (delete database *connected-databases*))
             (when (eq database *default-database*)
diff --git a/uffi/clsql_uffi.dylib b/uffi/clsql_uffi.dylib
new file mode 100644
index 0000000000000000000000000000000000000000..3741fc2c7948b8abe90ac594c1b2039d130ce8b7
GIT binary patch
literal 8380
zcwX(9L2DCH5XUE*ZH=^aqaqXpjc2I@Ez;tt&<7T!6ihTl@Udy43E8Bj*@Y?uBkSd{
z6hDEtegN^%lZQ5z7B7-RK`+7{A{4BUL$DCUI4`?tHd1;OWPULFpPe@|%x+Gb`PBaL
z`wRet(IRNWXj2M+iW)-OLgPHaQVAF&+E-aWgr@i*&duza*-!nuzBvXk67p1m04h}b
zHAddduIk3*$vu8)-i%U%J;DLMKmY7ZVkU499kkx__vg>(rru9Ksb2MUVEzEu<C&2O
z-VgRrqu%>gPw64&pX%1$o14GOX6Jg(9|Lc8)c4@c9}3i6LK{cZhQ8#UPp^;fHg;~$
zO~0E^{CFhh{mu)h2I`3P{aV#GnL7-pBkKo<4bDLj1VIo4K@bG-FFBBxROhYy{&cDu
zUOTQAbE+MXcS-T>;RE|H-i<EqF<0syYj|=f#bFU`6SU1O!J2lZdCeN?u*mlUx)W9w
zbL2;mj4U1}+6QsLT6U!cYx8(L`{ItnT7uO@ZM%I%B=;TWI?0CE6`!?@qfqFlXo|MB
zQB$^ECDc6E4zv1&<i238NH%0+e}Y$A)*HKW2<GTIbC1UD1r?4`s^81+U31u|h&oAk
z{pD9VI$W*WJMqW-;|J&<-Io$|Uq{e@AP9mW2!bF8f*^?hlW2EmtIB=vWq)~l(f8$k
z{<`n08h~71kA=OO`zZ3?lk*sVBz?u(#m9j2VveV+QpU*gTvpFyS3$1AdD*nmJe@CP
z@};MEV65PQw<YIKtkM!UmX{0GikHia`cke}&2@9xxHSn_Y!>x$f#1A=UK!vIi3Qca

literal 0
HcwPel00001

diff --git a/uffi/z.dylib b/uffi/z.dylib
new file mode 100644
index 0000000000000000000000000000000000000000..39d4200482bdca0c2469a555e99f562962341825
GIT binary patch
literal 8332
zcwX(9F-yZx5XY}+#Dby$5d=YlI=6}rf>WU#iXtK%x;>I6+F+WNHUSlfI#=);_z4^w
z9bMeSPvB4-#6@s$>R`Q>_d*k?&I<Q~f9~FUclR!Dy~qCB=QseQQ5h8XR}=shZ3=aU
zVys-Olp%>Wv^-}_#zPqI+sFPe^n3o(G{BOy3dB&M6S=(BU6@<Qm-De0EvcyYs19S6
z;Tyy7QTeL0iMwN9jT6_3uah-YO}v%*OAX%tW|+HE+TAV|O40x8AbLl80iyrt-8l28
zIn?#b?Zf_6zxlC#ztMO;-%{j$Mi>2WqU9wgP<t|0m4cZ437(%o7kx~kRzcjw?@TLv
zHwC$%-O9O+$#t4t%i;?;CJ+Qc5ClOG1VIpgfmi;i3~m<DbUVxV9rVOrw=)y2WT4i&
z%%DaVAqavX2!bF8f*=Uu|D%O-UzN{#7vvy%R{DHCpOyYQ`g{aFrHC9I7^~Nq8F-d!
wvzl#Kb_@8}oVESHWTxX;j(3O$ZW9m0M4cT3UX{6x#!=7|v8--XYf(0Q0Z1ZX$N&HU

literal 0
HcwPel00001

-- 
2.11.4.GIT