X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fforeign-load.lisp;h=7aece9f542468be1302c5c0961ce7295fb03c7ec;hb=496071a75429677a2c064e4995c379d3ba6ec458;hp=694fc27712b878192ced2d88aa2aeaa71fc4f366;hpb=079ef9dad558ca07cb8178ef428bf738112174fa;p=sbcl.git diff --git a/src/code/foreign-load.lisp b/src/code/foreign-load.lisp index 694fc27..7aece9f 100644 --- a/src/code/foreign-load.lisp +++ b/src/code/foreign-load.lisp @@ -11,17 +11,15 @@ (in-package "SB!ALIEN") -;;; Used to serialize modifications to *linkage-info*, -;;; *shared-objects* and the linkage-table proper. Calls thru -;;; linkage-table are unaffected. -(defvar *foreign-lock* - (sb!thread:make-mutex :name "foreign definition lock")) +;;; Used to serialize modifications to *shared-objects*. +(defvar *shared-objects-lock* + (sb!thread:make-mutex :name "shared object list lock")) (define-unsupported-fun load-foreign "Unsupported as of SBCL 0.8.13. See LOAD-SHARED-OBJECT." - "~S is unsupported as of SBCL 0.8.13. See LOAD-SHARED-OBJECT." + "~S is unsupported as of SBCL 0.8.13. See LOAD-SHARED-OBJECT." (load-foreign)) - + (define-unsupported-fun load-1-foreign "Unsupported as of SBCL 0.8.13. Please use LOAD-SHARED-OBJECT." "~S is unsupported as of SBCL 0.8.13. Please use LOAD-SHARED-OBJECT." @@ -35,7 +33,10 @@ (define-alien-routine dlerror c-string) -(define-alien-routine dlsym system-area-pointer +(define-alien-routine + #!-openbsd dlsym + #!+openbsd ("os_dlsym" dlsym) + system-area-pointer (handle system-area-pointer) (symbol c-string)) @@ -57,8 +58,8 @@ (if objp (setf (shared-object-sap obj) nil) (setf *runtime-dlhandle* nil)) - (error "Could not open ~:[runtime~;~:*shared object ~S~]: ~A" - obj (dlerror))) + (error "Error opening ~:[runtime~;shared object ~:*~S~]:~% ~A." + file (dlerror))) (when objp (setf (shared-object-sap obj) sap)) sap)) @@ -88,46 +89,47 @@ determined using the library filename. Reloading may not work as expected if user or library-code has called dlopen on FILE. References to foreign symbols in loaded shared objects do not survive -intact through SB-EXT:SAVE-LISP-AND die on all platforms. See +intact through SB-EXT:SAVE-LISP-AND-DIE on all platforms. See SB-EXT:SAVE-LISP-AND-DIE for details." - (sb!thread:with-mutex (*foreign-lock*) - (let* ((filename (or (unix-namestring file) file)) - (old (find filename *shared-objects* :key #'shared-object-file :test #'equal)) - (obj (or old (make-shared-object :file filename)))) - (dlopen-or-lose obj) - (setf *shared-objects* (append (remove obj *shared-objects*) - (list obj))) - #!+linkage-table - (when (or old (undefined-foreign-symbols)) - (update-linkage-table)) - (pathname filename)))) + (let ((filename (or (unix-namestring file) file)) + (old nil)) + (sb!thread:with-mutex (*shared-objects-lock*) + (setf old (find filename *shared-objects* :key #'shared-object-file :test #'equal)) + (let* ((obj (or old (make-shared-object :file filename)))) + (dlopen-or-lose obj) + (setf *shared-objects* (append (remove obj *shared-objects*) + (list obj))))) + #!+linkage-table + (when (or old (undefined-foreign-symbols-p)) + (update-linkage-table)) + (pathname filename))) (defun try-reopen-shared-object (obj) (declare (type shared-object obj)) (tagbody :dlopen (restart-case - (dlopen-or-lose obj) + (dlopen-or-lose obj) (continue () - :report "Skip this shared object and continue." - (setf (shared-object-sap obj) nil)) + :report "Skip this shared object and continue." + (setf (shared-object-sap obj) nil)) (retry () - :report "Retry loading this shared object." - (go :dlopen)) + :report "Retry loading this shared object." + (go :dlopen)) (load-other () - :report "Specify an alternate shared object file to load." - (setf (shared-object-file obj) - (tagbody :query - (format *query-io* "~&Enter pathname (evaluated):~%") - (force-output *query-io*) - (let ((pathname (ignore-errors (pathname (read *query-io*))))) - (unless (pathnamep pathname) - (format *query-io* "~&Error: invalid pathname.~%") - (go :query)) - (unix-namestring pathname))))))) + :report "Specify an alternate shared object file to load." + (setf (shared-object-file obj) + (tagbody :query + (format *query-io* "~&Enter pathname (evaluated):~%") + (force-output *query-io*) + (let ((pathname (ignore-errors (pathname (read *query-io*))))) + (unless (pathnamep pathname) + (format *query-io* "~&Error: invalid pathname.~%") + (go :query)) + (unix-namestring pathname))))))) obj) ;;; Open libraries in *SHARED-OBJECTS* and the runtime. Called during -;;; initialization. +;;; initialization. (defun reopen-shared-objects () ;; Ensure that the runtime is open (setf *runtime-dlhandle* (dlopen-or-lose) @@ -139,36 +141,55 @@ SB-EXT:SAVE-LISP-AND-DIE for details." (mapc #'dlclose-or-lose (reverse *shared-objects*)) (dlclose-or-lose)) -(let ((symbols ()) - (undefineds ())) - (defun get-dynamic-foreign-symbol-address (symbol &optional datap) - (dlerror) ; clear old errors - (unless *runtime-dlhandle* - (bug "Cannot resolve foreign symbol: lost *runtime-dlhandle*")) - (let* ((result (sap-int (dlsym *runtime-dlhandle* symbol))) - (err (dlerror)) - (addr (if (or (not (zerop result)) (not err)) - result - (dolist (obj *shared-objects*) - (let ((sap (shared-object-sap obj))) - (when sap - (setf result (sap-int (dlsym sap symbol)) - err (dlerror)) - (when (or (not (zerop result)) (not err)) - (return result)))))))) - (cond ((not addr) +(defun find-dynamic-foreign-symbol-address (symbol) + (dlerror) ; clear old errors + (unless *runtime-dlhandle* + (bug "Cannot resolve foreign symbol: lost *runtime-dlhandle*")) + ;; On real ELF & dlsym platforms the EXTERN-ALIEN-NAME is a no-op, + ;; but on platforms where dlsym is simulated we use the mangled name. + (let* ((extern (extern-alien-name symbol)) + (result (sap-int (dlsym *runtime-dlhandle* extern))) + (err (dlerror))) + (if (or (not (zerop result)) (not err)) + result + (dolist (obj *shared-objects*) + (let ((sap (shared-object-sap obj))) + (when sap + (setf result (sap-int (dlsym sap extern)) + err (dlerror)) + (when (or (not (zerop result)) (not err)) + (return result)))))))) + +(let ((symbols (make-hash-table :test #'equal)) + (undefineds (make-hash-table :test #'equal))) + (defun ensure-dynamic-foreign-symbol-address (symbol &optional datap) + "Returns the address of the foreign symbol as an integer. On linkage-table +ports if the symbols isn't found a special guard address is returned instead, +accesses to which will result in an UNDEFINED-ALIEN-ERROR. On other ports an +error is immediately signalled if the symbol isn't found. The returned address +is never in the linkage-table." + (declare (ignorable datap)) + (let ((addr (find-dynamic-foreign-symbol-address symbol))) + (cond #!-linkage-table + ((not addr) + (error 'undefined-alien-error :name symbol)) + #!+linkage-table + ((not addr) (style-warn "Undefined alien: ~S" symbol) - (pushnew symbol undefineds :test #'equal) - (remove symbol symbols :test #'equal) - (if datap - undefined-alien-address - (foreign-symbol-address-as-integer - (sb!vm:extern-alien-name "undefined_alien_function")))) + (setf (gethash symbol undefineds) t) + (remhash symbol symbols) + (if datap + undefined-alien-address + (foreign-symbol-address "undefined_alien_function"))) (addr - (pushnew symbol symbols :test #'equal) - (remove symbol undefineds :test #'equal) + (setf (gethash symbol symbols) t) + (remhash symbol undefineds) addr)))) - (defun dynamic-foreign-symbols () - symbols) - (defun undefined-foreign-symbols () - undefineds)) + (defun undefined-foreign-symbols-p () + (plusp (hash-table-count undefineds))) + (defun dynamic-foreign-symbols-p () + (plusp (hash-table-count symbols))) + (defun list-dynamic-foreign-symbols () + (loop for symbol being each hash-key in symbols + collect symbol))) +