summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2023-06-02 22:28:13 +0200
committerAndy Wingo <wingo@pobox.com>2023-06-08 10:21:28 +0200
commit00e48eb16dfda825789a66f18e86a27652f61037 (patch)
treee1d23e8937f30a4007c5e57ac3245668499f6f20
parent5af66570bb2b4a0f6b47361f9d028d4ef42d8b46 (diff)
downloadguile-00e48eb16dfda825789a66f18e86a27652f61037.tar.gz
Load (ice-9 binary-ports) from C in thread-safe way
* libguile/r6rs-ports.c: Do the usual dance to load make-custom-binary-input-port et al just once.
-rw-r--r--libguile/r6rs-ports.c37
1 files changed, 31 insertions, 6 deletions
diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c
index 2e4fc9452..7c51bf617 100644
--- a/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@@ -40,7 +40,9 @@
#include "strings.h"
#include "symbols.h"
#include "syscalls.h"
+#include "threads.h"
#include "values.h"
+#include "variable.h"
#include "vectors.h"
#include "version.h"
@@ -771,11 +773,32 @@ initialize_bytevector_output_ports (void)
/* Custom ports. */
+static SCM make_custom_binary_input_port_var;
+static SCM make_custom_binary_output_port_var;
+static SCM make_custom_binary_input_output_port_var;
+
+static scm_i_pthread_once_t make_custom_binary_port_vars =
+ SCM_I_PTHREAD_ONCE_INIT;
+
+static void
+init_make_custom_binary_port_vars (void)
+{
+ SCM mod = scm_c_resolve_module ("ice-9 binary-ports");
+ SCM iface = scm_module_public_interface (mod);
+ make_custom_binary_input_port_var =
+ scm_c_module_lookup (iface, "make-custom-binary-input-port");
+ make_custom_binary_output_port_var =
+ scm_c_module_lookup (iface, "make-custom-binary-output-port");
+ make_custom_binary_input_output_port_var =
+ scm_c_module_lookup (iface, "make-custom-binary-input/output-port");
+}
+
SCM scm_make_custom_binary_input_port (SCM id, SCM read_proc,
SCM get_position_proc,
SCM set_position_proc, SCM close_proc) {
- return scm_call_5 (scm_c_public_ref ("ice-9 binary-ports",
- "make-custom-binary-input-port"),
+ scm_i_pthread_once (&make_custom_binary_port_vars,
+ init_make_custom_binary_port_vars);
+ return scm_call_5 (scm_variable_ref (make_custom_binary_input_port_var),
id, read_proc, get_position_proc, set_position_proc,
close_proc);
}
@@ -783,8 +806,9 @@ SCM scm_make_custom_binary_input_port (SCM id, SCM read_proc,
SCM scm_make_custom_binary_output_port (SCM id, SCM write_proc,
SCM get_position_proc,
SCM set_position_proc, SCM close_proc) {
- return scm_call_5 (scm_c_public_ref ("ice-9 binary-ports",
- "make-custom-binary-output-port"),
+ scm_i_pthread_once (&make_custom_binary_port_vars,
+ init_make_custom_binary_port_vars);
+ return scm_call_5 (scm_variable_ref (make_custom_binary_output_port_var),
id, write_proc, get_position_proc, set_position_proc,
close_proc);
}
@@ -794,8 +818,9 @@ SCM scm_make_custom_binary_input_output_port (SCM id, SCM read_proc,
SCM get_position_proc,
SCM set_position_proc,
SCM close_proc) {
- return scm_call_6 (scm_c_public_ref ("ice-9 binary-ports",
- "make-custom-binary-input/output-port"),
+ scm_i_pthread_once (&make_custom_binary_port_vars,
+ init_make_custom_binary_port_vars);
+ return scm_call_6 (scm_variable_ref (make_custom_binary_input_output_port_var),
id, read_proc, write_proc, get_position_proc,
set_position_proc, close_proc);
}