mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 19:50:24 +02:00
Code Activity

Remove port locks

Browse source 
* libguile/ports.h (scm_t_port): Remove lock field.
  (scm_dynwind_lock_port, scm_c_lock_port, scm_c_try_lock_port):
  Remove.
* libguile/ports.c (scm_i_port_property, scm_i_set_port_property_x):
  Remove locking.
* libguile/ports.c (scm_c_make_port_with_encoding): Remove lock.
  (scm_i_read_bytes, scm_i_read, scm_i_write_bytes, scm_i_write): Remove
  "_unlocked" from names and adapt callers.
This commit is contained in:
Andy Wingo 2016-04-28 08:34:08 +02:00
parent 8b46a4af44
commit 2b47043052
2 changed files with 22 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

73
libguile/ports.c
View file

@ -327,9 +327,7 @@ SCM_DEFINE (scm_i_port_property, "%port-property", 2, 0, 0,
SCM_VALIDATE_OPPORT (1, port); SCM_VALIDATE_OPPORT (1, port);
pt = SCM_PTAB_ENTRY (port); pt = SCM_PTAB_ENTRY (port);
scm_i_pthread_mutex_lock (pt->lock);
result = scm_assq_ref (pt->internal->alist, key); result = scm_assq_ref (pt->internal->alist, key);
scm_i_pthread_mutex_unlock (pt->lock);
return result; return result;
} }
@ -345,9 +343,7 @@ SCM_DEFINE (scm_i_set_port_property_x, "%set-port-property!", 3, 0, 0,
SCM_VALIDATE_OPPORT (1, port); SCM_VALIDATE_OPPORT (1, port);
pt = SCM_PTAB_ENTRY (port); pt = SCM_PTAB_ENTRY (port);
scm_i_pthread_mutex_lock (pt->lock);
pt->internal->alist = scm_assq_set_x (pt->internal->alist, key, value); pt->internal->alist = scm_assq_set_x (pt->internal->alist, key, value);
scm_i_pthread_mutex_unlock (pt->lock);
return SCM_UNSPECIFIED; return SCM_UNSPECIFIED;
} }
@ -690,9 +686,6 @@ scm_c_make_port_with_encoding (scm_t_bits tag, unsigned long mode_bits,
SCM_SET_CELL_WORD_1 (ret, (scm_t_bits) entry); SCM_SET_CELL_WORD_1 (ret, (scm_t_bits) entry);
SCM_SET_CELL_WORD_2 (ret, (scm_t_bits) ptob); SCM_SET_CELL_WORD_2 (ret, (scm_t_bits) ptob);
entry->lock = scm_gc_malloc_pointerless (sizeof (*entry->lock), "port lock");
scm_i_pthread_mutex_init (entry->lock, scm_i_pthread_mutexattr_recursive);
entry->internal = pti; entry->internal = pti;
entry->file_name = SCM_BOOL_F; entry->file_name = SCM_BOOL_F;
/* By default, any port type with a seek function has random-access /* By default, any port type with a seek function has random-access
@ -1324,38 +1317,6 @@ SCM_DEFINE (scm_set_port_conversion_strategy_x, "set-port-conversion-strategy!",
#undef FUNC_NAME #undef FUNC_NAME
/* The port lock. */
static void
lock_port (void *mutex)
{
scm_i_pthread_mutex_lock ((scm_i_pthread_mutex_t *) mutex);
}
static void
unlock_port (void *mutex)
{
scm_i_pthread_mutex_unlock ((scm_i_pthread_mutex_t *) mutex);
}
void
scm_dynwind_lock_port (SCM port)
#define FUNC_NAME "dynwind-lock-port"
{
scm_i_pthread_mutex_t *lock;
SCM_VALIDATE_OPPORT (SCM_ARG1, port);
scm_c_lock_port (port, &lock);
if (lock)
{
scm_dynwind_unwind_handler (unlock_port, lock, SCM_F_WIND_EXPLICITLY);
scm_dynwind_rewind_handler (lock_port, lock, 0);
}
}
#undef FUNC_NAME
/* Input. */ /* Input. */
@ -1448,7 +1409,7 @@ scm_peek_byte_or_eof (SCM port)
} }
static size_t static size_t
scm_i_read_bytes_unlocked (SCM port, SCM dst, size_t start, size_t count) scm_i_read_bytes (SCM port, SCM dst, size_t start, size_t count)
{ {
size_t filled; size_t filled;
scm_t_ptob_descriptor *ptob = SCM_PORT_DESCRIPTOR (port); scm_t_ptob_descriptor *ptob = SCM_PORT_DESCRIPTOR (port);
@ -1463,15 +1424,15 @@ scm_i_read_bytes_unlocked (SCM port, SCM dst, size_t start, size_t count)
return filled; return filled;
} }
/* scm_i_read_unlocked is used internally to add bytes to the given port /* scm_i_read is used internally to add bytes to the given port
buffer. If the number of available bytes in the buffer does not buffer. If the number of available bytes in the buffer does not
increase after a call to scm_i_read_unlocked, that indicates EOF. */ increase after a call to scm_i_read, that indicates EOF. */
static void static void
scm_i_read_unlocked (SCM port, SCM buf) scm_i_read (SCM port, SCM buf)
{ {
size_t count; size_t count;
count = scm_i_read_bytes_unlocked (port, scm_port_buffer_bytevector (buf), count = scm_i_read_bytes (port, scm_port_buffer_bytevector (buf),
scm_to_size_t (scm_port_buffer_end (buf)), scm_to_size_t (scm_port_buffer_end (buf)),
scm_port_buffer_can_put (buf)); scm_port_buffer_can_put (buf));
scm_port_buffer_did_put (buf, count); scm_port_buffer_did_put (buf, count);
@ -1529,7 +1490,7 @@ scm_c_read_bytes (SCM port, SCM dst, size_t start, size_t count)
} }
else else
{ {
did_read = scm_i_read_bytes_unlocked (port, dst, did_read = scm_i_read_bytes (port, dst,
start + count - to_read, start + count - to_read,
to_read); to_read);
to_read -= did_read; to_read -= did_read;
@ -2408,14 +2369,14 @@ SCM_DEFINE (scm_force_output, "force-output", 0, 1, 0,
} }
#undef FUNC_NAME #undef FUNC_NAME
static void scm_i_write_unlocked (SCM port, SCM buf); static void scm_i_write (SCM port, SCM buf);
void void
scm_flush (SCM port) scm_flush (SCM port)
{ {
SCM buf = SCM_PTAB_ENTRY (port)->write_buf; SCM buf = SCM_PTAB_ENTRY (port)->write_buf;
if (scm_port_buffer_can_take (buf)) if (scm_port_buffer_can_take (buf))
scm_i_write_unlocked (port, buf); scm_i_write (port, buf);
} }
SCM SCM
@ -2438,7 +2399,7 @@ scm_fill_input (SCM port)
else else
scm_port_buffer_reset (read_buf); scm_port_buffer_reset (read_buf);
scm_i_read_unlocked (port, read_buf); scm_i_read (port, read_buf);
return read_buf; return read_buf;
} }
@ -2503,7 +2464,7 @@ scm_puts (const char *s, SCM port)
} }
static void static void
scm_i_write_bytes_unlocked (SCM port, SCM src, size_t start, size_t count) scm_i_write_bytes (SCM port, SCM src, size_t start, size_t count)
{ {
size_t written = 0; size_t written = 0;
scm_t_ptob_descriptor *ptob = SCM_PORT_DESCRIPTOR (port); scm_t_ptob_descriptor *ptob = SCM_PORT_DESCRIPTOR (port);
@ -2519,7 +2480,7 @@ scm_i_write_bytes_unlocked (SCM port, SCM src, size_t start, size_t count)
} }
static void static void
scm_i_write_unlocked (SCM port, SCM buf) scm_i_write (SCM port, SCM buf)
{ {
size_t start, count; size_t start, count;
@ -2532,7 +2493,7 @@ scm_i_write_unlocked (SCM port, SCM buf)
start = scm_to_size_t (scm_port_buffer_cur (buf)); start = scm_to_size_t (scm_port_buffer_cur (buf));
count = scm_port_buffer_can_take (buf); count = scm_port_buffer_can_take (buf);
scm_port_buffer_reset (buf); scm_port_buffer_reset (buf);
scm_i_write_bytes_unlocked (port, scm_port_buffer_bytevector (buf), start, scm_i_write_bytes (port, scm_port_buffer_bytevector (buf), start,
count); count);
} }
@ -2569,7 +2530,7 @@ scm_c_write_bytes (SCM port, SCM src, size_t start, size_t count)
full after filling it with the new data; if that's the case, we full after filling it with the new data; if that's the case, we
flush then instead. */ flush then instead. */
if (scm_port_buffer_can_put (write_buf) < count) if (scm_port_buffer_can_put (write_buf) < count)
scm_i_write_unlocked (port, write_buf); scm_i_write (port, write_buf);
{ {
signed char *src_ptr = SCM_BYTEVECTOR_CONTENTS (src) + start; signed char *src_ptr = SCM_BYTEVECTOR_CONTENTS (src) + start;
@ -2577,16 +2538,16 @@ scm_c_write_bytes (SCM port, SCM src, size_t start, size_t count)
} }
if (scm_port_buffer_can_put (write_buf) == 0) if (scm_port_buffer_can_put (write_buf) == 0)
scm_i_write_unlocked (port, write_buf); scm_i_write (port, write_buf);
} }
else else
{ {
/* Our write would overflow the buffer. Flush buffered bytes (if /* Our write would overflow the buffer. Flush buffered bytes (if
needed), then write our bytes with just one syscall. */ needed), then write our bytes with just one syscall. */
if (scm_port_buffer_can_take (write_buf)) if (scm_port_buffer_can_take (write_buf))
scm_i_write_unlocked (port, write_buf); scm_i_write (port, write_buf);
scm_i_write_bytes_unlocked (port, src, start, count); scm_i_write_bytes (port, src, start, count);
} }
} }
#undef FUNC_NAME #undef FUNC_NAME
@ -2617,7 +2578,7 @@ scm_c_write (SCM port, const void *ptr, size_t size)
written += did_put; written += did_put;
src += did_put; src += did_put;
if (scm_port_buffer_can_put (write_buf) == 0) if (scm_port_buffer_can_put (write_buf) == 0)
scm_i_write_unlocked (port, write_buf); scm_i_write (port, write_buf);
} }
} }
#undef FUNC_NAME #undef FUNC_NAME

38
libguile/ports.h
View file

@ -84,9 +84,6 @@ typedef struct
/* Link back to the port object. */ /* Link back to the port object. */
SCM port; SCM port;
/* A recursive lock for this port. */
scm_i_pthread_mutex_t *lock;
/* Pointer to internal-only port structure. */ /* Pointer to internal-only port structure. */
struct scm_port_internal *internal; struct scm_port_internal *internal;
@ -289,11 +286,6 @@ SCM_API SCM scm_set_port_encoding_x (SCM port, SCM encoding);
SCM_API SCM scm_port_conversion_strategy (SCM port); SCM_API SCM scm_port_conversion_strategy (SCM port);
SCM_API SCM scm_set_port_conversion_strategy_x (SCM port, SCM behavior); SCM_API SCM scm_set_port_conversion_strategy_x (SCM port, SCM behavior);
/* Acquiring and releasing the port lock. */
SCM_API void scm_dynwind_lock_port (SCM port);
SCM_INLINE int scm_c_lock_port (SCM port, scm_i_pthread_mutex_t **lock);
SCM_INLINE int scm_c_try_lock_port (SCM port, scm_i_pthread_mutex_t **lock);
/* Input. */ /* Input. */
SCM_API int scm_get_byte_or_eof (SCM port); SCM_API int scm_get_byte_or_eof (SCM port);
SCM_API int scm_peek_byte_or_eof (SCM port); SCM_API int scm_peek_byte_or_eof (SCM port);
@ -363,36 +355,6 @@ SCM_API SCM scm_sys_make_void_port (SCM mode);
SCM_INTERNAL void scm_init_ports (void); SCM_INTERNAL void scm_init_ports (void);
/* Inline function implementations. */
#if SCM_CAN_INLINE || defined SCM_INLINE_C_IMPLEMENTING_INLINES
SCM_INLINE_IMPLEMENTATION int
scm_c_lock_port (SCM port, scm_i_pthread_mutex_t **lock)
{
*lock = SCM_PTAB_ENTRY (port)->lock;
if (*lock)
return scm_i_pthread_mutex_lock (*lock);
else
return 0;
}
SCM_INLINE_IMPLEMENTATION int
scm_c_try_lock_port (SCM port, scm_i_pthread_mutex_t **lock)
{
*lock = SCM_PTAB_ENTRY (port)->lock;
if (*lock)
{
int ret = scm_i_pthread_mutex_trylock (*lock);
if (ret != 0)
*lock = NULL;
return ret;
}
else
return 0;
}
#endif /* SCM_CAN_INLINE || defined SCM_INLINE_C_IMPLEMENTING_INLINES */
#endif /* SCM_PORTS_H */ #endif /* SCM_PORTS_H */
/* /*