Changeset 7404

Timestamp:

Oct 12, 2007, 9:39:21 AM (14 years ago)

Author:

gb

Message:

NOT-LOCKED, DEADLOCK lock-related conditions.

File:

• branches/working-0710/ccl/level-1/l1-error-system.lisp (modified) (2 diffs)

branches/working-0710/ccl/level-1/l1-error-system.lisp

@@ -262 +262 @@
              (format s "Current process ~s does not own lock ~s"
                      *current-process* (slot-value c 'lock)))))
+
+(define-condition not-locked (lock-protocol-error)
+  ()
+  (:report (lambda (c s)
+             (format s "Lock ~s isn't locked." (slot-value c 'lock)))))
+
+(define-condition deadlock (lock-protocol-error)
+  ()
+  (:report (lambda (c s)
+             (format s "Requested operation on ~s would cause deadlock." (slot-value c 'lock)))))
 
 (define-condition package-error (error)
@@ -576 +586 @@
   "Make an instance of a condition object using the specified initargs."
   (declare (dynamic-extent init-list))
-  (let ((class (or (and (symbolp name) (find-class name nil))
-                   name)))
-    (if (condition-p (class-prototype class))
-        (apply #'make-instance class init-list)
-        (error "~S is not a defined condition type name" name))))
+  (if (subtypep name 'condition)
+    (apply #'make-instance name init-list)
+    (error "~S is not a defined condition type name" name)))
 
 (defmethod print-object ((c condition) stream)