- bknr-cvs@common-lisp.net - mailman3.common-lisp.net

[bknr-cvs] ksprotte changed trunk/projects/bos/m2/
by BKNR Commits 15 Sep '08

15 Sep '08

Revision: 3900 Author: ksprotte URL: http://bknr.net/trac/changeset/3900 free-m2s again persistent There have been problems with the transient approach (as proven by the failing test). In order to fix this fast and cleanly, it seems to be the best solution to make it persistent again. U trunk/projects/bos/m2/allocation.lisp U trunk/projects/bos/m2/m2.lisp Modified: trunk/projects/bos/m2/allocation.lisp =================================================================== --- trunk/projects/bos/m2/allocation.lisp 2008-09-15 13:14:44 UTC (rev 3899) +++ trunk/projects/bos/m2/allocation.lisp 2008-09-15 14:46:00 UTC (rev 3900) @@ -8,7 +8,7 @@ (height :reader allocation-area-height :initarg :height) (vertices :reader allocation-area-vertices :initarg :vertices) (total-m2s :reader allocation-area-total-m2s) - (free-m2s :transient t :writer (setf allocation-area-free-m2s)) ;free-m2s reader defined below + (free-m2s :accessor allocation-area-free-m2s) (bounding-box :transient t :reader allocation-area-bounding-box)) (:documentation "A polygon in which to allocate meters. LEFT, TOP, WIDTH, and @@ -27,20 +27,13 @@ (format stream "~a x ~a ~:[inactive~;active~] ID: ~a" (allocation-area-width allocation-area) (allocation-area-height allocation-area) - (allocation-area-active-p allocation-area) + (allocation-area-active-p allocation-area) (store-object-id allocation-area)))) -(defmethod allocation-area-free-m2s ((area allocation-area)) - (flet ((compute-free-m2s () - (with-slots (total-m2s free-m2s) area - (setf free-m2s (- total-m2s (calculate-allocated-m2-count area)))))) - (if (slot-boundp area 'free-m2s) - (slot-value area 'free-m2s) - (compute-free-m2s)))) - (defmethod initialize-persistent-instance :after ((allocation-area allocation-area) &key) - (with-slots (total-m2s) allocation-area - (setf total-m2s (calculate-total-m2-count allocation-area))) + (with-slots (total-m2s free-m2s) allocation-area + (setf total-m2s (calculate-total-m2-count allocation-area)) + (setf free-m2s (- total-m2s (calculate-allocated-m2-count allocation-area)))) ;; FIXME probably we dont need this and should rely on *rect-publisher* (dolist (tile (allocation-area-tiles allocation-area)) (image-tile-changed tile))) @@ -51,7 +44,7 @@ (defmethod destroy-object :before ((allocation-area allocation-area)) (notify-tiles allocation-area)) -(defmethod initialize-transient-instance :after ((allocation-area allocation-area)) +(defmethod initialize-transient-instance :after ((allocation-area allocation-area)) (notify-tiles allocation-area)) (defun compute-bounding-box (vertices) @@ -351,7 +344,7 @@ (result (search-adjacent n m2 #'allocatable-p))) (when result (assert (alexandria:setp result :test #'equal)) - (assert (= n (length result))) + (assert (= n (length result))) (return result)) (when (> (get-internal-real-time) deadline) (return nil))))))) Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2008-09-15 13:14:44 UTC (rev 3899) +++ trunk/projects/bos/m2/m2.lisp 2008-09-15 14:46:00 UTC (rev 3900) @@ -34,9 +34,9 @@ :slots (x y) :index-reader m2-at :index-initargs (:width +width+ - :height +width+ - :tile-size +m2tile-width+ - :tile-class 'image-tile)))) + :height +width+ + :tile-size +m2tile-width+ + :tile-class 'image-tile)))) (defmethod print-object ((m2 m2) stream) (if (and (slot-boundp m2 'x) @@ -55,7 +55,7 @@ (defun ensure-m2 (&rest coords) (or (m2-at coords) - (destructuring-bind (x y) coords + (destructuring-bind (x y) coords (make-object 'm2 :x x :y y)))) (defmethod get-m2-with-num ((num integer)) @@ -264,7 +264,7 @@ (worldpay-trans-id :update :initform nil) (expires :read :documentation "universal time which specifies the time the contract expires (is deleted) when it has not been paid for" - :initform nil) + :initform nil) (largest-rectangle :update)) (:default-initargs :m2s nil @@ -283,10 +283,11 @@ (defun contract-p (object) (equal (class-of object) (find-class 'contract))) -(defmethod initialize-persistent-instance :after ((contract contract) &key) +(defmethod initialize-persistent-instance :after ((contract contract) &key area) (pushnew contract (sponsor-contracts (contract-sponsor contract))) (dolist (m2 (contract-m2s contract)) - (setf (m2-contract m2) contract)) + (setf (m2-contract m2) contract) + (decf (allocation-area-free-m2s area))) (setf (contract-largest-rectangle contract) (contract-compute-largest-rectangle contract)) (publish-contract-change contract)) @@ -528,14 +529,12 @@ Sponsor-ID: ~A " m2-count (store-object-id sponsor))) - (error 'allocation-areas-exhausted :numsqm m2-count)) - ;; FREE-M2S might be lazily computed at his point, before it is - ;; decremented. If this happens, the m2s must still be free. - (decf (allocation-area-free-m2s area) m2-count) + (error 'allocation-areas-exhausted :numsqm m2-count)) (make-object 'contract :sponsor sponsor :date date :m2s m2s + :area area :expires expires :download-only download-only :paidp paidp))))

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/m2/allocation.lisp
by BKNR Commits 15 Sep '08

15 Sep '08

Revision: 3899 Author: ksprotte URL: http://bknr.net/trac/changeset/3899 print-object allocation-area: life is easier if we dont print free-m2s U trunk/projects/bos/m2/allocation.lisp Modified: trunk/projects/bos/m2/allocation.lisp =================================================================== --- trunk/projects/bos/m2/allocation.lisp 2008-09-12 15:14:56 UTC (rev 3898) +++ trunk/projects/bos/m2/allocation.lisp 2008-09-15 13:14:44 UTC (rev 3899) @@ -24,13 +24,10 @@ (defmethod print-object ((allocation-area allocation-area) stream) (print-unreadable-object (allocation-area stream :type t) - (format stream "~a x ~a ~:[inactive~;active~] free: ~s ID: ~a" + (format stream "~a x ~a ~:[inactive~;active~] ID: ~a" (allocation-area-width allocation-area) (allocation-area-height allocation-area) - (allocation-area-active-p allocation-area) - (if (slot-boundp allocation-area 'free-m2s) - (allocation-area-free-m2s allocation-area) - :unbound) + (allocation-area-active-p allocation-area) (store-object-id allocation-area)))) (defmethod allocation-area-free-m2s ((area allocation-area))

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/test/tsung3.xml
by BKNR Commits 12 Sep '08

12 Sep '08

Revision: 3898 Author: ksprotte URL: http://bknr.net/trac/changeset/3898 tsung more load U trunk/projects/bos/test/tsung3.xml Modified: trunk/projects/bos/test/tsung3.xml =================================================================== --- trunk/projects/bos/test/tsung3.xml 2008-09-12 15:06:47 UTC (rev 3897) +++ trunk/projects/bos/test/tsung3.xml 2008-09-12 15:14:56 UTC (rev 3898) @@ -36,6 +36,50 @@ <arrivalphase phase="3" duration="2" unit="minute"> <users interarrival="0.1" unit="second" maxnumber="500"></users> </arrivalphase> + + <arrivalphase phase="4" duration="7" unit="minute"> + <users interarrival="2" unit="second" maxnumber="500"></users> + </arrivalphase> + + + <arrivalphase phase="5" duration="5" unit="minute"> + <users interarrival="0.5" unit="second" maxnumber="500"></users> + </arrivalphase> + + + <arrivalphase phase="6" duration="2" unit="minute"> + <users interarrival="0.1" unit="second" maxnumber="500"></users> + </arrivalphase> + + <arrivalphase phase="7" duration="7" unit="minute"> + <users interarrival="2" unit="second" maxnumber="500"></users> + </arrivalphase> + + + <arrivalphase phase="8" duration="5" unit="minute"> + <users interarrival="0.5" unit="second" maxnumber="500"></users> + </arrivalphase> + + + <arrivalphase phase="9" duration="2" unit="minute"> + <users interarrival="0.1" unit="second" maxnumber="500"></users> + </arrivalphase> + + <arrivalphase phase="10" duration="7" unit="minute"> + <users interarrival="2" unit="second" maxnumber="500"></users> + </arrivalphase> + + + <arrivalphase phase="11" duration="5" unit="minute"> + <users interarrival="0.5" unit="second" maxnumber="500"></users> + </arrivalphase> + + + <arrivalphase phase="12" duration="2" unit="minute"> + <users interarrival="0.1" unit="second" maxnumber="500"></users> + </arrivalphase> + + </load> <options>

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/
by BKNR Commits 12 Sep '08

12 Sep '08

Revision: 3897 Author: hans URL: http://bknr.net/trac/changeset/3897 Support QuickTime movie uploads. Small other tweaks. U trunk/projects/quickhoney/src/handlers.lisp U trunk/projects/quickhoney/src/init.lisp U trunk/projects/quickhoney/src/tags.lisp U trunk/projects/quickhoney/upgrade-stuff/import.lisp U trunk/projects/quickhoney/website/static/javascript.js U trunk/projects/quickhoney/website/templates/index.xml U trunk/projects/quickhoney/website/templates/login.xml Modified: trunk/projects/quickhoney/src/handlers.lisp =================================================================== --- trunk/projects/quickhoney/src/handlers.lisp 2008-09-12 14:54:52 UTC (rev 3896) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-09-12 15:06:47 UTC (rev 3897) @@ -399,14 +399,17 @@ (progn (unless (and uploaded-image uploaded-animation) (error "files not uploaded")) - (unless (find (upload-content-type uploaded-animation) '("application/x-shockwave-flash" "video/quicktime" "application/x-director") + (unless (find (upload-content-type uploaded-animation) + '("application/x-shockwave-flash" "video/quicktime" "application/x-director") :test #'equal) - (error "Invalid content type ~A - Please upload a Flash, Shockwave or Quicktime file" (upload-content-type uploaded-animation))) + (error "Invalid content type ~A - Please upload a Flash, Shockwave or Quicktime file" + (upload-content-type uploaded-animation))) (with-image-from-upload* (uploaded-image) (let* ((animation-blob (make-blob-from-file (upload-pathname uploaded-animation) 'blob :type (upload-content-type uploaded-animation))) (image (make-store-image :name (pathname-name (upload-original-filename uploaded-image)) - :type (make-keyword-from-string (pathname-type (upload-original-filename uploaded-image))) + :type (make-keyword-from-string (pathname-type + (upload-original-filename uploaded-image))) :class-name 'quickhoney-animation-image :keywords (list :upload) :initargs (list :cat-sub (list :pixel :animation) Modified: trunk/projects/quickhoney/src/init.lisp =================================================================== --- trunk/projects/quickhoney/src/init.lisp 2008-09-12 14:54:52 UTC (rev 3896) +++ trunk/projects/quickhoney/src/init.lisp 2008-09-12 15:06:47 UTC (rev 3897) @@ -28,6 +28,8 @@ (make-rss-channel "quickhoney" "QuickHoney" "QuickHoney Illustrations" "rss/quickhoney" :items (class-instances 'quickhoney-image))) (cl-gd::load-gd-glue))) + (ensure-directories-exist + (setf tbnl:*tmp-directory* (merge-pathnames "hunchentoot-tmp/" *store-directory*))) #+cmu (actor-start (make-instance 'cron-actor)) (publish-quickhoney) Modified: trunk/projects/quickhoney/src/tags.lisp =================================================================== --- trunk/projects/quickhoney/src/tags.lisp 2008-09-12 14:54:52 UTC (rev 3896) +++ trunk/projects/quickhoney/src/tags.lisp 2008-09-12 15:06:47 UTC (rev 3897) @@ -104,12 +104,13 @@ (emit-tag-children))))) (define-bknr-tag login-status () - (cond - ((bknr.web::admin-p (bknr-session-user)) - (redirect "/index")) - ((and (bknr.web::anonymous-p (bknr-session-user)) - (query-param "__username")) - (html (:h1 "Login failed, please try again"))) - (t - (html (:h1 "Please login"))))) + (with-query-params (login) + (cond + ((bknr.web::admin-p (bknr-session-user)) + (redirect (or login "/"))) + ((and (bknr.web::anonymous-p (bknr-session-user)) + (query-param "__username")) + (html (:h1 "Login failed, please try again"))) + (t + (html (:h1 "Please login")))))) Modified: trunk/projects/quickhoney/upgrade-stuff/import.lisp =================================================================== --- trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-09-12 14:54:52 UTC (rev 3896) +++ trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-09-12 15:06:47 UTC (rev 3897) @@ -84,3 +84,7 @@ #'> :key #'blob-timestamp))) +(with-transaction (:initialize-animation-mime-types) + (dolist (animation (mapcar #'quickhoney-animation-image-animation (class-instances 'quickhoney-animation-image))) + (unless (slot-boundp animation 'bknr.datastore::type) + (setf (slot-value animation 'bknr.datastore::type) "application/x-shockwave-flash")))) \ No newline at end of file Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-12 14:54:52 UTC (rev 3896) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-12 15:06:47 UTC (rev 3897) @@ -1162,6 +1162,8 @@ } document.location.href = "/#" + path; + log('init_applicaton done'); + poll_path(); application_initialized = true; Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-09-12 14:54:52 UTC (rev 3896) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-12 15:06:47 UTC (rev 3897) @@ -233,11 +233,11 @@ <div id="upload_animation_form" class="cms_form"> <form id="upload_animation_form_element" action="/upload-animation" method="post" enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);"> - <div class="cms_title">Upload new animatoin</div> + <div class="cms_title">Upload new animation</div> <p class="cms"> Image:<br /> <input type="file" name="image-file" /><br /> - Animation (Flash File):<br /> + Animation (Flash file or QuickTime movie):<br /> <input type="file" name="animation-file" /><br /> </p> <p class="cms"> Modified: trunk/projects/quickhoney/website/templates/login.xml =================================================================== --- trunk/projects/quickhoney/website/templates/login.xml 2008-09-12 14:54:52 UTC (rev 3896) +++ trunk/projects/quickhoney/website/templates/login.xml 2008-09-12 15:06:47 UTC (rev 3897) @@ -34,7 +34,8 @@ </tr> </tbody> </table> - <button name="login" type="submit">login</button> + <button name="login" type="submit" value="/">login</button> + <button name="login" type="submit" value="/admin">login to admin area</button> </form> <h1 id="logging-in" style="display: none">Logging in...</h1>

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/test/tsung3.xml
by BKNR Commits 12 Sep '08

12 Sep '08

Revision: 3896 Author: ksprotte URL: http://bknr.net/trac/changeset/3896 enriched tsung3.xml with more sessions U trunk/projects/bos/test/tsung3.xml Modified: trunk/projects/bos/test/tsung3.xml =================================================================== --- trunk/projects/bos/test/tsung3.xml 2008-09-12 14:05:52 UTC (rev 3895) +++ trunk/projects/bos/test/tsung3.xml 2008-09-12 14:54:52 UTC (rev 3896) @@ -50,7 +50,7 @@ probabilities must be 100 --> <sessions> - <session name='GE-rec20080715-11:58' probability='97' type='ts_http'> + <session name='GE-rec20080715-11:58' probability='5' type='ts_http'> <request><http url='/kml-root?lang=de' version='1.1' method='GET'></http></request> <request><http url='/country-stats?lang=de' version='1.1' method='GET'></http></request> <request><http url='/poi-kml-all?lang=de' version='1.1' method='GET'></http></request> @@ -2145,7 +2145,7 @@ <request><http url='/image/3024985' version='1.1' method='GET'></http></request> </session> - <session name='buy-sqm' probability='3' type='ts_http'> + <session name='buy-sqm' probability='5' type='ts_http'> <request><http url='/' version='1.1' method='GET'></http></request> <request><http url='/index' version='1.1' method='GET'></http></request> <request><http url='/en/index' version='1.1' method='GET'></http></request> @@ -2248,6 +2248,432 @@ </session> + <session name='front-site-without-sat-app' probability='81' type='ts_http'> + <request><http url='/' version='1.1' method='GET'></http></request> + <request><http url='/index' version='1.1' method='GET'></http></request> + <request><http url='/en/index' version='1.1' method='GET'></http></request> + <request><http url='/static/toplevel_style.css' version='1.1' method='GET'></http></request> + <request><http url='/static/content_style.css' version='1.1' method='GET'></http></request> + <request><http url='/static/bos.js' version='1.1' method='GET'></http></request> + <request><http url='/favicon.ico' version='1.1' method='GET'></http></request> + <request><http url='/images/header_ganzneu.gif' version='1.1' method='GET'></http></request> + <request><http url='/images/pfeil_link_on.gif' version='1.1' method='GET'></http></request> + <request><http url='/images/spenden.jpg' version='1.1' method='GET'></http></request> + <request><http url='/images/trans.gif' version='1.1' method='GET'></http></request> + <request><http url='/infosystem/bilder/submit.gif' version='1.1' method='GET'></http></request> + <request><http url='/images/start_pic_headline1.jpg' version='1.1' method='GET'></http></request> + <request><http url='/images/start_pic_headline2b.jpg' version='1.1' method='GET'></http></request> + <request><http url='/images/start_pic_headline3.jpg' version='1.1' method='GET'></http></request> + <request><http url='/images/bg_content_right.gif' version='1.1' method='GET'></http></request> + <request><http url='/images/satellite_ganzneu2.gif' version='1.1' method='GET'></http></request> + <thinktime random='true' value='7'/> + + <request><http url='/en/headline2' version='1.1' method='GET'></http></request> + <request><http url='/images/pfeil_back.gif' version='1.1' method='GET'></http></request> + <request><http url='/images/pic_headline2_big.jpg' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='10'/> + + <request><http url='/en/headline3' version='1.1' method='GET'></http></request> + <request><http url='/images/pic_h3_orangutan.jpg' version='1.1' method='GET'></http></request> + <request><http url='/images/pic_h3_baer.jpg' version='1.1' method='GET'></http></request> + <request><http url='/images/pic_h3_vogel.jpg' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='18'/> + + <request><http url='/en/idea' version='1.1' method='GET'></http></request> + <request><http url='/images/projekt_pic_headline1b.jpg' version='1.1' method='GET'></http></request> + <request><http url='/images/projekt_pic_headline1c.gif' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='12'/> + + <request><http url='/en/idea_subtitle1' version='1.1' method='GET'></http></request> + <request><http url='/images/pic_headline1b_big.jpg' version='1.1' method='GET'></http></request> + <request><http url='/images/ring_en.jpg' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='6'/> + + <request><http url='/en/idea_subtitle2' version='1.1' method='GET'></http></request> + <request><http url='/images/projekt_pic_en.jpg' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='9'/> + + <request><http url='/en/bos' version='1.1' method='GET'></http></request> + <request><http url='/images/bos-logo.gif' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='3'/> + + <request><http url='/en/bestellung' version='1.1' method='GET'></http></request> + <request><http url='/static/bos_en.js' version='1.1' method='GET'></http></request> + <request><http url='/images/step1.gif' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='4'/> + + <request><http url='/en/contact' version='1.1' method='GET'></http></request> + </session> + + + + <session name='sat-app' probability='9' type='ts_http'> + <request><http url='/' version='1.1' method='GET'></http></request> + <request><http url='/index' version='1.1' method='GET'></http></request> + <request><http url='/en/index' version='1.1' method='GET'></http></request> + <request><http url='/static/toplevel_style.css' version='1.1' method='GET'></http></request> + <request><http url='/static/content_style.css' version='1.1' method='GET'></http></request> + <request><http url='/static/bos.js' version='1.1' method='GET'></http></request> + <request><http url='/favicon.ico' version='1.1' method='GET'></http></request> + <request><http url='/images/header_ganzneu.gif' version='1.1' method='GET'></http></request> + <request><http url='/images/pfeil_link_on.gif' version='1.1' method='GET'></http></request> + <request><http url='/images/spenden.jpg' version='1.1' method='GET'></http></request> + <request><http url='/images/trans.gif' version='1.1' method='GET'></http></request> + <request><http url='/infosystem/bilder/submit.gif' version='1.1' method='GET'></http></request> + <request><http url='/images/start_pic_headline1.jpg' version='1.1' method='GET'></http></request> + <request><http url='/images/start_pic_headline2b.jpg' version='1.1' method='GET'></http></request> + <request><http url='/images/start_pic_headline3.jpg' version='1.1' method='GET'></http></request> + <request><http url='/images/satellite_ganzneu2.gif' version='1.1' method='GET'></http></request> + <request><http url='/images/bg_content_right.gif' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='4'/> + + <request><http url='/en/idea' version='1.1' method='GET'></http></request> + <request><http url='/images/pfeil_back.gif' version='1.1' method='GET'></http></request> + <request><http url='/images/projekt_pic_headline1b.jpg' version='1.1' method='GET'></http></request> + <request><http url='/images/projekt_pic_headline1c.gif' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='4'/> + + <request><http url='/en/bestellung' version='1.1' method='GET'></http></request> + <request><http url='/static/bos_en.js' version='1.1' method='GET'></http></request> + <request><http url='/images/step1.gif' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='3'/> + + <request><http url='/infosystem' version='1.1' method='GET'></http></request> + <request><http url='/infosystem/de/satellitenkarte.htm' version='1.1' method='GET'></http></request> + <request><http url='/infosystem/satellitenkarte_style.css' version='1.1' method='GET'></http></request> + <request><http url='/infosystem/de/messages.js' version='1.1' method='GET'></http></request> + <request><http url='/infosystem/MochiKit.js' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='2'/> + + <request><http url='/infosystem/javascript.js' version='1.1' method='GET'></http></request> + <request><http url='/infosystem/bilder/head.gif' version='1.1' method='GET'></http></request> + <request><http url='/infosystem/bilder/spacer.gif' version='1.1' method='GET'></http></request> + <request><http url='/infosystem/bilder/uebersichtskarte_klein.gif' version='1.1' method='GET'></http></request> + <request><http url='/sponsor-login' version='1.1' method='GET'></http></request> + <request><http url='/infosystem/bilder/karte_uebersicht.jpg' version='1.1' method='GET'></http></request> + <request><http url='/infosystem/bilder/uebersicht_info1.gif' version='1.1' method='GET'></http></request> + <request><http url='/m2-javascript/' version='1.1' method='GET'></http></request> + <request><http url='/infosystem/bilder/lupe.gif' version='1.1' method='GET'></http></request> + <request><http url='/poi-javascript' version='1.1' method='GET'></http></request> + <request><http url='/infosystem/bilder/uebersicht_info2.gif' version='1.1' method='GET'></http></request> + <request><http url='/images/palme.gif' version='1.1' method='GET'></http></request> + <request><http url='/images/punkt.gif' version='1.1' method='GET'></http></request> + <request><http url='/images/sale.gif' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='4'/> + + <request><http url='/overview/6120/6930' version='1.1' method='GET'></http></request> + <request><http url='/overview/6120/7020' version='1.1' method='GET'></http></request> + <request><http url='/overview/6120/7110' version='1.1' method='GET'></http></request> + <request><http url='/overview/6120/7200' version='1.1' method='GET'></http></request> + <request><http url='/overview/6210/6930' version='1.1' method='GET'></http></request> + <request><http url='/overview/6210/7020' version='1.1' method='GET'></http></request> + <request><http url='/overview/6210/7110' version='1.1' method='GET'></http></request> + <request><http url='/overview/6210/7200' version='1.1' method='GET'></http></request> + <request><http url='/overview/6300/6930' version='1.1' method='GET'></http></request> + <request><http url='/overview/6300/7020' version='1.1' method='GET'></http></request> + <request><http url='/overview/6300/7110' version='1.1' method='GET'></http></request> + <request><http url='/overview/6300/7200' version='1.1' method='GET'></http></request> + <request><http url='/overview/6390/6930' version='1.1' method='GET'></http></request> + <request><http url='/overview/6390/7020' version='1.1' method='GET'></http></request> + <request><http url='/overview/6390/7110' version='1.1' method='GET'></http></request> + <request><http url='/overview/6390/7200' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/agroforestry/1/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/agroforestry/3/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/agroforestry/2/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/172442/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/agroforestry/4/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/agroforestry/5/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/172497/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/agroforestry/6/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/172468/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/2435348/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/172488/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/2435374/thumbnail,,55,55' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='3'/> + + <request><http url='/poi-image/agroforestry/1' version='1.1' method='GET'></http></request> + <request><http url='/image/172442' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='2'/> + + <request><http url='/poi-image/agroforestry/5' version='1.1' method='GET'></http></request> + <request><http url='/image/2435348' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='4'/> + + <request><http url='/overview/5400/8280' version='1.1' method='GET'></http></request> + <request><http url='/overview/5400/8370' version='1.1' method='GET'></http></request> + <request><http url='/overview/5400/8460' version='1.1' method='GET'></http></request> + <request><http url='/overview/5400/8550' version='1.1' method='GET'></http></request> + <request><http url='/overview/5490/8280' version='1.1' method='GET'></http></request> + <request><http url='/overview/5490/8370' version='1.1' method='GET'></http></request> + <request><http url='/overview/5490/8460' version='1.1' method='GET'></http></request> + <request><http url='/overview/5490/8550' version='1.1' method='GET'></http></request> + <request><http url='/overview/5580/8280' version='1.1' method='GET'></http></request> + <request><http url='/overview/5580/8370' version='1.1' method='GET'></http></request> + <request><http url='/overview/5580/8460' version='1.1' method='GET'></http></request> + <request><http url='/overview/5580/8550' version='1.1' method='GET'></http></request> + <request><http url='/overview/5670/8280' version='1.1' method='GET'></http></request> + <request><http url='/overview/5670/8370' version='1.1' method='GET'></http></request> + <request><http url='/overview/5670/8460' version='1.1' method='GET'></http></request> + <request><http url='/overview/5670/8550' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/amphibians/1/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/amphibians/2/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/2463444/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/amphibians/3/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/2463456/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/2463467/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/amphibians/4/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/amphibians/5/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/amphibians/6/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/2463483/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/2463508/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/2463520/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/overview/5850/6840' version='1.1' method='GET'></http></request> + <request><http url='/overview/5850/6930' version='1.1' method='GET'></http></request> + <request><http url='/overview/5850/7020' version='1.1' method='GET'></http></request> + <request><http url='/overview/5850/7110' version='1.1' method='GET'></http></request> + <request><http url='/overview/5940/6840' version='1.1' method='GET'></http></request> + <request><http url='/overview/5940/6930' version='1.1' method='GET'></http></request> + <request><http url='/overview/5940/7020' version='1.1' method='GET'></http></request> + <request><http url='/overview/5940/7110' version='1.1' method='GET'></http></request> + <request><http url='/overview/6030/6840' version='1.1' method='GET'></http></request> + <request><http url='/overview/6030/6930' version='1.1' method='GET'></http></request> + <request><http url='/overview/6030/7020' version='1.1' method='GET'></http></request> + <request><http url='/overview/6030/7110' version='1.1' method='GET'></http></request> + <request><http url='/overview/6120/6840' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/arboretum/1/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/arboretum/2/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/464128/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/464137/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/arboretum/3/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/arboretum/4/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/arboretum/5/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/464147/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/arboretum/6/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/500539/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/500550/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/508066/thumbnail,,55,55' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='2'/> + + <request><http url='/overview/7470/4590' version='1.1' method='GET'></http></request> + <request><http url='/overview/7470/4680' version='1.1' method='GET'></http></request> + <request><http url='/overview/7470/4770' version='1.1' method='GET'></http></request> + <request><http url='/overview/7470/4860' version='1.1' method='GET'></http></request> + <request><http url='/overview/7560/4590' version='1.1' method='GET'></http></request> + <request><http url='/overview/7560/4680' version='1.1' method='GET'></http></request> + <request><http url='/overview/7560/4770' version='1.1' method='GET'></http></request> + <request><http url='/overview/7560/4860' version='1.1' method='GET'></http></request> + <request><http url='/overview/7650/4590' version='1.1' method='GET'></http></request> + <request><http url='/overview/7650/4680' version='1.1' method='GET'></http></request> + <request><http url='/overview/7650/4770' version='1.1' method='GET'></http></request> + <request><http url='/overview/7650/4860' version='1.1' method='GET'></http></request> + <request><http url='/overview/7740/4590' version='1.1' method='GET'></http></request> + <request><http url='/overview/7740/4680' version='1.1' method='GET'></http></request> + <request><http url='/overview/7740/4770' version='1.1' method='GET'></http></request> + <request><http url='/overview/7740/4860' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/biodiversity/1/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/biodiversity/2/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/biodiversity/3/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/biodiversity/5/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/biodiversity/4/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/2093327/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/2093342/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/2093355/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/2093388/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/2093375/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/biodiversity/6/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/2093411/thumbnail,,55,55' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='1'/> + + <request><http url='/poi-image/biodiversity/1' version='1.1' method='GET'></http></request> + <request><http url='/image/2093327' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='2'/> + + <request><http url='/poi-image/biodiversity/3' version='1.1' method='GET'></http></request> + <request><http url='/image/2093355' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='4'/> + + <request><http url='/poi-image/biodiversity/6' version='1.1' method='GET'></http></request> + <request><http url='/image/2093411' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='6'/> + + <request><http url='/image/545876' version='1.1' method='GET'></http></request> + <request><http url='/overview/4770/8100' version='1.1' method='GET'></http></request> + <request><http url='/overview/4770/8190' version='1.1' method='GET'></http></request> + <request><http url='/overview/4770/8280' version='1.1' method='GET'></http></request> + <request><http url='/overview/4770/8370' version='1.1' method='GET'></http></request> + <request><http url='/overview/4860/8100' version='1.1' method='GET'></http></request> + <request><http url='/overview/4860/8190' version='1.1' method='GET'></http></request> + <request><http url='/overview/4860/8280' version='1.1' method='GET'></http></request> + <request><http url='/overview/4860/8370' version='1.1' method='GET'></http></request> + <request><http url='/overview/4950/8100' version='1.1' method='GET'></http></request> + <request><http url='/overview/4950/8190' version='1.1' method='GET'></http></request> + <request><http url='/overview/4950/8280' version='1.1' method='GET'></http></request> + <request><http url='/overview/4950/8370' version='1.1' method='GET'></http></request> + <request><http url='/overview/5040/8100' version='1.1' method='GET'></http></request> + <request><http url='/overview/5040/8190' version='1.1' method='GET'></http></request> + <request><http url='/overview/5040/8280' version='1.1' method='GET'></http></request> + <request><http url='/overview/5040/8370' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/fireprotection/1/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/fireprotection/2/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/fireprotection/3/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/116975/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/fireprotection/4/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/116966/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/116957/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/116948/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/fireprotection/5/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/poi-image/fireprotection/6/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/116939/thumbnail,,55,55' version='1.1' method='GET'></http></request> + <request><http url='/image/2418751/thumbnail,,55,55' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='3'/> + + <request><http url='/poi-image/fireprotection/6' version='1.1' method='GET'></http></request> + <request><http url='/image/2418751' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='7'/> + + <request><http url='/overview/6480/6120/background/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6480/6210/background/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6480/6300/background/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6480/6390/background/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6570/6120/background/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6570/6210/background/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6570/6300/background/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6570/6390/background/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6660/6120/background/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6660/6210/background/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6660/6300/background/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6660/6390/background/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6750/6120/background/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6750/6210/background/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6750/6300/background/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6750/6390/background/areas/contracts' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='7'/> + + <request><http url='/overview/6480/6120/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6480/6210/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6480/6300/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6480/6390/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6570/6120/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6570/6210/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6570/6300/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6570/6390/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6660/6120/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6660/6210/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6660/6300/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6660/6390/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6750/6120/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6750/6210/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6750/6300/areas/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6750/6390/areas/contracts' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='5'/> + + <request><http url='/overview/6480/6120/background/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6480/6210/background/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6480/6300/background/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6480/6390/background/contracts' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='1'/> + + <request><http url='/overview/6570/6120/background/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6570/6210/background/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6570/6300/background/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6570/6390/background/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6660/6120/background/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6660/6210/background/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6660/6300/background/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6660/6390/background/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6750/6120/background/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6750/6210/background/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6750/6300/background/contracts' version='1.1' method='GET'></http></request> + <request><http url='/overview/6750/6390/background/contracts' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='5'/> + + <request><http url='/overview/6480/6120/background' version='1.1' method='GET'></http></request> + <request><http url='/overview/6480/6210/background' version='1.1' method='GET'></http></request> + <request><http url='/overview/6480/6300/background' version='1.1' method='GET'></http></request> + <request><http url='/overview/6480/6390/background' version='1.1' method='GET'></http></request> + <request><http url='/overview/6570/6120/background' version='1.1' method='GET'></http></request> + <request><http url='/overview/6570/6210/background' version='1.1' method='GET'></http></request> + <request><http url='/overview/6570/6300/background' version='1.1' method='GET'></http></request> + <request><http url='/overview/6570/6390/background' version='1.1' method='GET'></http></request> + <request><http url='/overview/6660/6120/background' version='1.1' method='GET'></http></request> + <request><http url='/overview/6660/6210/background' version='1.1' method='GET'></http></request> + <request><http url='/overview/6660/6300/background' version='1.1' method='GET'></http></request> + <request><http url='/overview/6660/6390/background' version='1.1' method='GET'></http></request> + <request><http url='/overview/6750/6120/background' version='1.1' method='GET'></http></request> + <request><http url='/overview/6750/6210/background' version='1.1' method='GET'></http></request> + <request><http url='/overview/6750/6300/background' version='1.1' method='GET'></http></request> + <request><http url='/overview/6750/6390/background' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='6'/> + + <request><http url='/m2-javascript/6610/6232' version='1.1' method='GET'></http></request> + <request><http url='/contract-image/3037429/ffff00' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='2'/> + + <request><http url='/m2-javascript/6621/6227' version='1.1' method='GET'></http></request> + <request><http url='/contract-image/3037427/ffff00' version='1.1' method='GET'></http></request> + <request><http url='/m2-javascript/6625/6222' version='1.1' method='GET'></http></request> + <request><http url='/contract-image/3037425/ffff00' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='1'/> + + <request><http url='/m2-javascript/6635/6228' version='1.1' method='GET'></http></request> + <request><http url='/contract-image/3037423/ffff00' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='2'/> + + <request><http url='/m2-javascript/6627/6237' version='1.1' method='GET'></http></request> + <request><http url='/contract-image/3037421/ffff00' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='3'/> + + <request><http url='/m2-javascript/6662/6226' version='1.1' method='GET'></http></request> + <request><http url='/contract-image/3037419/ffff00' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='1'/> + + <request><http url='/m2-javascript/6663/6228' version='1.1' method='GET'></http></request> + <request><http url='/contract-image/3037417/ffff00' version='1.1' method='GET'></http></request> + + <thinktime random='true' value='2'/> + + <request><http url='/m2-javascript/6662/6236' version='1.1' method='GET'></http></request> + <request><http url='/contract-image/3037407/ffff00' version='1.1' method='GET'></http></request> + </session> + + + + + + + </sessions> </tsung>

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/m2/
by BKNR Commits 12 Sep '08

12 Sep '08

Revision: 3895 Author: ksprotte URL: http://bknr.net/trac/changeset/3895 bos big changes for allocation mechanics - ensure-m2 now uses (make-object 'm2 ...) instead of make-instance - make-contract has been restructured: - allocate-m2s-for-sale is called first - outside a transactional context - free m2s are then passed to (make-object 'contract ...) - allocation-area-free-m2s is now transient and computed lazily the first time when it is read U trunk/projects/bos/m2/allocation-cache.lisp U trunk/projects/bos/m2/allocation.lisp U trunk/projects/bos/m2/m2.lisp Modified: trunk/projects/bos/m2/allocation-cache.lisp =================================================================== --- trunk/projects/bos/m2/allocation-cache.lisp 2008-09-12 13:42:55 UTC (rev 3894) +++ trunk/projects/bos/m2/allocation-cache.lisp 2008-09-12 14:05:52 UTC (rev 3895) @@ -177,25 +177,27 @@ (<= 1 n +threshold+)) (defun find-exact-match (n &key remove) - "Will return a free contiguous region of size N -as a list of m2 instances. If no such region exactly -matching N can be found, simply returns NIL. + "Will return a free contiguous region of size N as a list of m2 +instances and as a second value the corresponding allocation-area. If +no such region exactly matching N can be found, simply returns NIL. If REMOVE is T then the returned region is removed from -the cache and FREE-M2S of the affected allocation-area -is decremented." - (let ((region (cond - ((not (size-indexed-p n)) nil) - (remove (awhen (index-pop n) - (with-slots (area region) it - (decf (allocation-area-free-m2s area) n) - region))) - (t (awhen (index-lookup n) - (cache-entry-region it)))))) - (if region - (incf (hit-count *allocation-cache*)) - (incf (miss-count *allocation-cache*))) - region)) +the cache." + (flet ((hit (cache-entry) + (incf (hit-count *allocation-cache*)) + (values (cache-entry-region cache-entry) + (cache-entry-area cache-entry))) + (miss () + (incf (miss-count *allocation-cache*)) + nil)) + (cond + ((not (size-indexed-p n)) (miss)) + (remove (aif (index-pop n) + (hit it) + (miss))) + (t (aif (index-lookup n) + (hit it) + (miss)))))) (defun add-area (allocation-area) (dolist (region (free-regions allocation-area) Modified: trunk/projects/bos/m2/allocation.lisp =================================================================== --- trunk/projects/bos/m2/allocation.lisp 2008-09-12 13:42:55 UTC (rev 3894) +++ trunk/projects/bos/m2/allocation.lisp 2008-09-12 14:05:52 UTC (rev 3895) @@ -1,16 +1,15 @@ (in-package :bos.m2) -(define-persistent-class allocation-area () - ((active-p :update) - (left :update) - (top :update) - (width :update) - (height :update) - (vertices :update) - (y :update) - (total-m2s :read) - (free-m2s :update) - (bounding-box :update :transient t)) +(defpersistent-class allocation-area () + ((active-p :accessor allocation-area-active-p :initarg :active-p) + (left :reader allocation-area-left :initarg :left) + (top :reader allocation-area-top :initarg :top) + (width :reader allocation-area-width :initarg :width) + (height :reader allocation-area-height :initarg :height) + (vertices :reader allocation-area-vertices :initarg :vertices) + (total-m2s :reader allocation-area-total-m2s) + (free-m2s :transient t :writer (setf allocation-area-free-m2s)) ;free-m2s reader defined below + (bounding-box :transient t :reader allocation-area-bounding-box)) (:documentation "A polygon in which to allocate meters. LEFT, TOP, WIDTH, and HEIGHT designate the bounding rectangle of the polygon. @@ -34,10 +33,17 @@ :unbound) (store-object-id allocation-area)))) +(defmethod allocation-area-free-m2s ((area allocation-area)) + (flet ((compute-free-m2s () + (with-slots (total-m2s free-m2s) area + (setf free-m2s (- total-m2s (calculate-allocated-m2-count area)))))) + (if (slot-boundp area 'free-m2s) + (slot-value area 'free-m2s) + (compute-free-m2s)))) + (defmethod initialize-persistent-instance :after ((allocation-area allocation-area) &key) - (with-slots (total-m2s free-m2s) allocation-area - (setf total-m2s (calculate-total-m2-count allocation-area)) - (setf free-m2s (- total-m2s (calculate-allocated-m2-count allocation-area)))) + (with-slots (total-m2s) allocation-area + (setf total-m2s (calculate-total-m2-count allocation-area))) ;; FIXME probably we dont need this and should rely on *rect-publisher* (dolist (tile (allocation-area-tiles allocation-area)) (image-tile-changed tile))) @@ -48,7 +54,7 @@ (defmethod destroy-object :before ((allocation-area allocation-area)) (notify-tiles allocation-area)) -(defmethod initialize-transient-instance :after ((allocation-area allocation-area)) +(defmethod initialize-transient-instance :after ((allocation-area allocation-area)) (notify-tiles allocation-area)) (defun compute-bounding-box (vertices) @@ -348,29 +354,33 @@ (result (search-adjacent n m2 #'allocatable-p))) (when result (assert (alexandria:setp result :test #'equal)) - (assert (= n (length result))) - (decf (allocation-area-free-m2s area) n) + (assert (= n (length result))) (return result)) (when (> (get-internal-real-time) deadline) (return nil))))))) (defun allocate-m2s-for-sale (n) "The main entry point to the allocation machinery. Will return a - list of N m2 instances or NIL if the requested amount cannot be - allocated." - (or (bos.m2.allocation-cache:find-exact-match n :remove t) - (dolist (area (active-allocation-areas)) - (when (<= n (allocation-area-free-m2s area)) - (let ((m2s (allocate-in-area area n))) - (when m2s - (return m2s))))) - (dolist (area (inactive-nonempty-allocation-areas)) - (when (<= n (allocation-area-free-m2s area)) - (let ((m2s (allocate-in-area area n))) - (when m2s - (activate-allocation-area area) - (return m2s))))))) +list of N m2 instances or NIL if the requested amount cannot be +allocated. As a second value, returns the corresponding +allocation-area. +The returned m2s are still free and (decf (allocation-area-free-m2s +area) n) has not yet happened." + (alexandria:nth-value-or 0 + (bos.m2.allocation-cache:find-exact-match n :remove t) + (dolist (area (active-allocation-areas)) + (when (<= n (allocation-area-free-m2s area)) + (let ((m2s (allocate-in-area area n))) + (when m2s + (return (values m2s area)))))) + (dolist (area (inactive-nonempty-allocation-areas)) + (when (<= n (allocation-area-free-m2s area)) + (let ((m2s (allocate-in-area area n))) + (when m2s + (activate-allocation-area area) + (return (values m2s area)))))))) + (defgeneric return-contract-m2s (m2s) (:documentation "Mark the given square meters as free, so that they can be re-allocated.")) Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2008-09-12 13:42:55 UTC (rev 3894) +++ trunk/projects/bos/m2/m2.lisp 2008-09-12 14:05:52 UTC (rev 3895) @@ -55,8 +55,8 @@ (defun ensure-m2 (&rest coords) (or (m2-at coords) - (destructuring-bind (x y) coords - (make-instance 'm2 :x x :y y)))) + (destructuring-bind (x y) coords + (make-object 'm2 :x x :y y)))) (defmethod get-m2-with-num ((num integer)) (multiple-value-bind (y x) (truncate num +width+) @@ -296,9 +296,9 @@ (when sponsor (setf (sponsor-contracts sponsor) (remove contract (sponsor-contracts sponsor))))) (publish-contract-change contract :type 'delete) + (return-contract-m2s (contract-m2s contract)) (dolist (m2 (contract-m2s contract)) - (setf (m2-contract m2) nil)) - (return-contract-m2s (contract-m2s contract))) + (setf (m2-contract m2) nil))) (defun get-contract (id) (let ((contract (store-object-with-id id))) @@ -499,26 +499,14 @@ (warn "Old tx-make-contract transaction used, contract dates may be wrong") (tx-do-make-contract sponsor m2-count :date date :paidp paidp :expires expires)) -(deftransaction do-make-contract (sponsor m2-count &key date paidp expires download-only) - (let ((m2s (allocate-m2s-for-sale m2-count))) - (if m2s - (let ((contract (make-object 'contract - :sponsor sponsor - :date date - :m2s m2s - :expires expires - :download-only download-only))) - (when paidp - (contract-set-paidp contract paidp)) - contract) - (warn "can't create contract, ~A square meters for ~A could not be allocated" m2-count sponsor)))) - (define-condition allocation-areas-exhausted (simple-error) ((numsqm :initarg :numsqm :reader numsqm)) (:report (lambda (condition stream) (format stream "Could not satisfy your request for ~A sqms, please contact the BOS office" (numsqm condition))))) +(defvar *make-contract-lock* (bt:make-lock "make-contract-lock")) + (defun make-contract (sponsor m2-count &key (date (get-universal-time)) paidp @@ -527,22 +515,30 @@ (unless (and (integerp m2-count) (plusp m2-count)) (error "number of square meters must be a positive integer")) - (let ((contract (do-make-contract sponsor m2-count - :date date - :paidp paidp - :expires expires - :download-only download-only))) - (unless contract - (send-system-mail :subject "Contact creation failed - Allocation areas exhaused" - :text (format nil "A contract for ~A square meters could not be created, presumably because no + (bt:with-lock-held (*make-contract-lock*) + (multiple-value-bind (m2s area) + (allocate-m2s-for-sale m2-count) + (unless m2s + (warn "can't create contract, ~A square meters for ~A could not be allocated" m2-count sponsor) + (send-system-mail :subject "Contact creation failed - Allocation areas exhaused" + :text (format nil "A contract for ~A square meters could not be created, presumably because no suitable allocation area was found. Please check the free allocation areas and add more space. Sponsor-ID: ~A " - m2-count (store-object-id sponsor))) - (error 'allocation-areas-exhausted :numsqm m2-count)) - contract)) + m2-count (store-object-id sponsor))) + (error 'allocation-areas-exhausted :numsqm m2-count)) + ;; FREE-M2S might be lazily computed at his point, before it is + ;; decremented. If this happens, the m2s must still be free. + (decf (allocation-area-free-m2s area) m2-count) + (make-object 'contract + :sponsor sponsor + :date date + :m2s m2s + :expires expires + :download-only download-only + :paidp paidp)))) (deftransaction recolorize-contracts (&optional colors) "Assigns a new color to each contract choosing from COLORS, so

1 0

[bknr-cvs] hans changed trunk/bknr/web/src/web/template-handler.lisp
by BKNR Commits 12 Sep '08

12 Sep '08

Revision: 3894 Author: hans URL: http://bknr.net/trac/changeset/3894 Kill template-not-found condition as it was neither used nor useful and made *BREAK-ON-SIGNALS* painful to use. U trunk/bknr/web/src/web/template-handler.lisp Modified: trunk/bknr/web/src/web/template-handler.lisp =================================================================== --- trunk/bknr/web/src/web/template-handler.lisp 2008-09-12 04:34:21 UTC (rev 3893) +++ trunk/bknr/web/src/web/template-handler.lisp 2008-09-12 13:42:55 UTC (rev 3894) @@ -23,14 +23,6 @@ (defun user-error (str &rest args) (error 'user-error :format-control str :format-arguments args)) -;; template-not-found is raised when a template could not be found - -(define-condition template-not-found (simple-error) - ()) - -(defun template-not-found (&rest path) - (error 'template-not-found :format-control "Template ~S not found" :format-arguments path)) - (defclass template-expander () ((command-packages :initarg :command-packages :initform nil @@ -239,15 +231,14 @@ (template-expander-catch-all expander)) (multiple-value-setq (pathname ret-components) (find-template (template-expander-destination expander) default-template-components))) - (unless pathname - (template-not-found template-name)) - (values pathname - ret-components - (with-output-to-string (s) - (dolist (component (subseq components 0 (- (length components) - (length ret-components)))) - (write-char #\/ s) - (write-string component s))))))) + (when pathname + (values pathname + ret-components + (with-output-to-string (s) + (dolist (component (subseq components 0 (- (length components) + (length ret-components)))) + (write-char #\/ s) + (write-string component s)))))))) (defun get-cached-template (pathname expander) (let* ((table (template-expander-cached-templates expander)) @@ -296,23 +287,22 @@ env)) (incf i))) (setf env (acons :*path-arg* (first args) env)) - (if (probe-file template-pathname) - ;; Wir koennten hier direkt auf *html-stream* schreiben ohne - ;; den Umweg ueber einen String zu gehen. Aber: Wir moechten - ;; im Allgemeinen erst waehrend des Expandierens noch merken - ;; koennen, dass z.B. ein Fehler vorliegt oder ein Redirect - ;; geschickt werden muss. Daher waere es keine gute Idee, sich - ;; zu diesem Zeitpunkt schon auf einen HTTP response code - ;; festgelegt zu haben. - (let ((*default-pathname-defaults* (make-pathname :host (pathname-host template-pathname) - :device (pathname-device template-pathname) - :directory (pathname-directory template-pathname)))) - (with-output-to-string (stream) - (emit-template handler - stream - (get-cached-template template-pathname handler) - env))) - (template-not-found template-pathname)))) + (when (probe-file template-pathname) + ;; Wir koennten hier direkt auf *html-stream* schreiben ohne + ;; den Umweg ueber einen String zu gehen. Aber: Wir moechten + ;; im Allgemeinen erst waehrend des Expandierens noch merken + ;; koennen, dass z.B. ein Fehler vorliegt oder ein Redirect + ;; geschickt werden muss. Daher waere es keine gute Idee, sich + ;; zu diesem Zeitpunkt schon auf einen HTTP response code + ;; festgelegt zu haben. + (let ((*default-pathname-defaults* (make-pathname :host (pathname-host template-pathname) + :device (pathname-device template-pathname) + :directory (pathname-directory template-pathname)))) + (with-output-to-string (stream) + (emit-template handler + stream + (get-cached-template template-pathname handler) + env)))))) (defmethod error-template-pathname (handler &optional (error-type "user-error")) (find-template-pathname handler error-type)) @@ -337,12 +327,6 @@ (simple-condition-format-control c) (simple-condition-format-arguments c)) :response-code +http-ok+)) - (template-not-found (c) - (send-error-response handler (apply #'format - nil - (simple-condition-format-control c) - (simple-condition-format-arguments c)) - :response-code +http-not-found+)) (serious-condition (c) (warn "unexpected failure: ~A" c) (send-error-response handler (format nil "Internal Error:~%~%~A~%" c))))) @@ -351,11 +335,8 @@ `(invoke-with-error-handlers (lambda () ,@body) ,handler)) (defmethod handler-matches-p ((handler template-handler)) - (handler-case - (find-template-pathname handler (subseq (script-name*) 1)) - (template-not-found (c) - (declare (ignore c)) - nil))) + (or (template-expander-catch-all handler) + (find-template-pathname handler (subseq (script-name*) 1)))) (defmethod handle ((handler template-handler)) (with-error-handlers (handler)

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/website/static/javascript.js
by BKNR Commits 12 Sep '08

12 Sep '08

Revision: 3893 Author: hans URL: http://bknr.net/trac/changeset/3893 permalink am image detail U trunk/projects/quickhoney/website/static/javascript.js Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-11 18:11:33 UTC (rev 3892) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-12 04:34:21 UTC (rev 3893) @@ -249,6 +249,10 @@ } } +function permalink(path) { + return A({ href: '/' + path, onclick: function () { document.location.href = '#' + path; return false; } }, 'permalink'); +} + function make_upload_item(item) { var color = pages[item.category] ? pages[item.category].link_color : '000000'; @@ -260,7 +264,7 @@ DIV(null, H1(null, item.name), item.date, ' by ', item.owner, ' | ', - A({ href: '/' + path, onclick: function () { jump_to(path) } }, 'permalink'), + permalink(path), BR(), item.description)); } @@ -284,7 +288,7 @@ DIV(null, H1(null, item.title), item.date, ' by ', item.owner, ' | ', - A({ href: 'news/' + item.name }, 'permalink'), + permalink('news/' + item.name), BR(), DIV({ 'class': 'item-text' }, item.text), delete_button)); @@ -1004,15 +1008,18 @@ var image_info = []; - replaceChildNodes("metadata", "Image name: ", current_image.name, BR()); + var link = current_directory + '/' + current_subdirectory + '/' + encodeURI(query_result[query_position].name); + + replaceChildNodes("metadata", "Image name: ", current_image.name, " ", permalink(link), BR()); if (current_image.client != "") { appendChildNodes("metadata", "Client: ", current_image.client, BR()); } - appendChildNodes("metadata", current_image.width + "x" + current_image.height + "px | " + percent + "%"); + appendChildNodes("metadata", current_image.width + "x" + current_image.height + + "px | " + percent + "%"); + if (may_enlarge) { - replaceChildNodes("full_click", A({ href: '#' + current_directory + '/' + current_subdirectory + '/' - + encodeURI(query_result[query_position].name), onclick: enlarge }, + replaceChildNodes("full_click", A({ href: '#' + link, onclick: enlarge }, "full size")); } else { replaceChildNodes("full_click");

1 0

[bknr-cvs] hans changed trunk/projects/lisp-ecoop/src/
by BKNR Commits 11 Sep '08

11 Sep '08

Revision: 3892 Author: hans URL: http://bknr.net/trac/changeset/3892 Minor production server changes. U trunk/projects/lisp-ecoop/src/handlers.lisp U trunk/projects/lisp-ecoop/src/tags.lisp Modified: trunk/projects/lisp-ecoop/src/handlers.lisp =================================================================== --- trunk/projects/lisp-ecoop/src/handlers.lisp 2008-09-11 18:10:02 UTC (rev 3891) +++ trunk/projects/lisp-ecoop/src/handlers.lisp 2008-09-11 18:11:33 UTC (rev 3892) @@ -49,7 +49,6 @@ (defmethod handle ((handler make-submission-handler)) (with-query-params (type title abstract) - (format t "type: ~A symbol: ~A~%" type (find-symbol (string-upcase type) :lisp-ecoop)) (let ((submission (make-object (find-symbol (string-upcase type) :lisp-ecoop) :title title :abstract abstract))) Modified: trunk/projects/lisp-ecoop/src/tags.lisp =================================================================== --- trunk/projects/lisp-ecoop/src/tags.lisp 2008-09-11 18:10:02 UTC (rev 3891) +++ trunk/projects/lisp-ecoop/src/tags.lisp 2008-09-11 18:11:33 UTC (rev 3892) @@ -60,7 +60,7 @@ (let ((file-name (upload-pathname (request-uploaded-file "document")))) (with-open-file (pdf file-name) (if (cl-ppcre:scan "^%PDF-" (read-line pdf)) - (let* ((submission (make-object (find-symbol (string-upcase type) :lisp-ecoop) + (let* ((submission (make-object (find-symbol (string-upcase type) :lisp-ecoop) :submitters (list participant) :title title :abstract abstract)) (document (make-object 'document :info info :submission submission))) (blob-from-file document file-name) @@ -393,4 +393,4 @@ (pathname (find-template-pathname expander "toplevel")) (toplevel (bknr.web::get-cached-template pathname expander)) (bknr.web::*toplevel-children* bknr.web::*tag-children*)) - (emit-template-node expander (bknr.web::parsed-template-dom toplevel)))) \ No newline at end of file + (emit-template-node expander (bknr.web::parsed-template-dom toplevel))))

1 0

[bknr-cvs] hans changed trunk/projects/lisp-ecoop/src/tags.lisp
by BKNR Commits 11 Sep '08

11 Sep '08

Revision: 3891 Author: hans URL: http://bknr.net/trac/changeset/3891 Fix PAGE tag U trunk/projects/lisp-ecoop/src/tags.lisp Modified: trunk/projects/lisp-ecoop/src/tags.lisp =================================================================== --- trunk/projects/lisp-ecoop/src/tags.lisp 2008-09-11 10:42:16 UTC (rev 3890) +++ trunk/projects/lisp-ecoop/src/tags.lisp 2008-09-11 18:10:02 UTC (rev 3891) @@ -393,4 +393,4 @@ (pathname (find-template-pathname expander "toplevel")) (toplevel (bknr.web::get-cached-template pathname expander)) (bknr.web::*toplevel-children* bknr.web::*tag-children*)) - (emit-template-node expander toplevel))) \ No newline at end of file + (emit-template-node expander (bknr.web::parsed-template-dom toplevel)))) \ No newline at end of file

1 0