(in-package "SB!IMPL")
-(defvar *foreign-lock*) ; initialized in foreign-load.lisp
-
(define-alien-routine arch-write-linkage-table-jmp void
(table-address system-area-pointer)
(real-address system-area-pointer))
(table-address system-area-pointer)
(real-address system-area-pointer))
-(defvar *linkage-info* (make-hash-table :test 'equal))
-
-(defstruct linkage-info datap address)
+(defvar *linkage-info* (make-hash-table :test 'equal :synchronized t))
(defun write-linkage-table-entry (table-address real-address datap)
(/show0 "write-linkage-table-entry")
(let ((reloc (int-sap table-address))
- (target (int-sap real-address)))
+ (target (int-sap real-address)))
(if datap
- (arch-write-linkage-table-ref reloc target)
- (arch-write-linkage-table-jmp reloc target))))
+ (arch-write-linkage-table-ref reloc target)
+ (arch-write-linkage-table-jmp reloc target))))
;;; Add the linkage information about a foreign symbol in the
;;; persistent table, and write the linkage-table entry.
(defun link-foreign-symbol (name datap)
(/show0 "link-foreign-symbol")
(let ((table-address (+ (* (hash-table-count *linkage-info*)
- sb!vm:linkage-table-entry-size)
- sb!vm:linkage-table-space-start))
- (real-address (ensure-dynamic-foreign-symbol-address name datap)))
+ sb!vm:linkage-table-entry-size)
+ sb!vm:linkage-table-space-start))
+ (real-address (ensure-dynamic-foreign-symbol-address name datap)))
(aver real-address)
(unless (< table-address sb!vm:linkage-table-space-end)
(error "Linkage-table full (~D entries): cannot link ~S."
(hash-table-count *linkage-info*)
name))
(write-linkage-table-entry table-address real-address datap)
- (setf (gethash (cons name datap) *linkage-info*)
- (make-linkage-info :address table-address :datap datap))))
+ (setf (gethash (cons name datap) *linkage-info*) table-address)))
;;; Add a foreign linkage entry if none exists, return the address
;;; in the linkage table.
(defun ensure-foreign-symbol-linkage (name datap)
(/show0 "ensure-foreign-symbol-linkage")
- (sb!thread:with-mutex (*foreign-lock*)
- (let ((info (or (gethash (cons name datap) *linkage-info*)
- (link-foreign-symbol name datap))))
- (linkage-info-address info))))
+ (with-locked-system-table (*linkage-info*)
+ (or (gethash (cons name datap) *linkage-info*)
+ (link-foreign-symbol name datap))))
;;; Update the linkage-table. Called during initialization after all
;;; shared libraries have been reopened, and after a previously loaded
;;; shared object is reloaded.
+;;;
+;;; FIXME: Should figure out how to write only those entries that need
+;;; updating.
(defun update-linkage-table ()
- ;; Doesn't take care of its own locking -- callers are responsible
- (maphash (lambda (name-and-datap info)
- (let* ((name (car name-and-datap))
- (datap (cdr name-and-datap))
- (table-address (linkage-info-address info))
- (real-address
- (ensure-dynamic-foreign-symbol-address name datap)))
- (aver (and table-address real-address))
- (write-linkage-table-entry table-address
- real-address
- datap)))
- *linkage-info*))
+ (dohash ((name-and-datap table-address) *linkage-info* :locked t)
+ (let* ((name (car name-and-datap))
+ (datap (cdr name-and-datap))
+ (real-address
+ (ensure-dynamic-foreign-symbol-address name datap)))
+ (aver (and table-address real-address))
+ (write-linkage-table-entry table-address
+ real-address
+ datap))))