diff options
author | Marius Vollmer <mvo@zagadka.de> | 1997-06-16 19:09:11 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 1997-06-16 19:09:11 +0000 |
commit | 419e9e117fa110de24b87ace73984f133887078c (patch) | |
tree | f70d0d329433545effbc249fe2e4f98a7f6a79c6 /libguile/dynl-shl.c | |
parent | cc0b33128194d56e08b3deabe3916b8753a30f9f (diff) | |
download | guile-419e9e117fa110de24b87ace73984f133887078c.tar.gz |
* dynl.c (scm_dynamic_call, scm_dynamic_args_call): Wrap dynamic
function call in SCM_DEFER_INTS/SCM_ALLOW_INTS.
(scm_dynamic_link, scm_dynamic_unlink, scm_dynamic_func): Always
call the sysdep functions with deferred ints.
* dynl.c, dynl-dl.c, dynl-dld.c, dynl-shl.c (sysdep_dynl_link,
sysdep_dynl_unlink, sysdep_dynl_func): Expect to be called with
deferred interrupts and insert SCM_ALLOW_INTS before throwing an
error.
* dynl.c (scm_dynamic_unlink, scm_dynamic_call): Return
SCM_UNSPECIFIED.
Diffstat (limited to 'libguile/dynl-shl.c')
-rw-r--r-- | libguile/dynl-shl.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/libguile/dynl-shl.c b/libguile/dynl-shl.c index 9d0ee613b..c6c4f97fe 100644 --- a/libguile/dynl-shl.c +++ b/libguile/dynl-shl.c @@ -61,7 +61,10 @@ sysdep_dynl_link (fname, subr) BIND_TOGETHER || BIND_VERBOSE || DYNAMIC_PATH, 0L); if (NULL==shl) + { + SCM_ALLOW_INTS; scm_misc_error (subr, "dynamic linking failed", SCM_EOL); + } return shl; } @@ -70,13 +73,11 @@ sysdep_dynl_unlink (handle, subr) void *handle; char *subr; { - int status; - - SCM_DEFER_INTS; - status = shl_unload ((shl_t) handle); - SCM_ALLOW_INTS; - if (status) - scm_misc_error (subr, "dynamic unlinking failed", SCM_EOL); + if (shl_unload ((shl_t) handle)) + { + SCM_ALLOW_INTS; + scm_misc_error (subr, "dynamic unlinking failed", SCM_EOL); + } } static void * @@ -87,13 +88,15 @@ sysdep_dynl_func (symb, handle, subr) { int status, i; struct shl_symbol *sym; - SCM_DEFER_INTS; + status = shl_getsymbols((shl_t) handle, TYPE_PROCEDURE, EXPORT_SYMBOLS, malloc, &sym); - SCM_ALLOW_INTS; + for (i=0; i<status; ++i) { if (strcmp(symb, sym[i].name) == 0) return sym[i].value; } + + SCM_ALLOW_INTS; scm_misc_error (subr, "undefined function", scm_cons (scm_makfrom0str (symb), SCM_EOL)); } |