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

Elide syscalls in fdes->port

Browse source 
* libguile/fports.h (scm_t_fport): Add options field.
  (SCM_FDES_RANDOM_P): Deprecate.
  (scm_i_fdes_to_port): Add options argument.
* libguile/fports.c (scm_i_fdes_to_port): Add options argument.  Only
  verify FD if SCM_FPORT_OPTION_VERIFY is there.
  (scm_fdes_to_port, scm_open_file_with_encoding): Adapt to
  scm_i_fdes_to_port changes.
  (fport_random_access_p): Don't try to seek if NOT_SEEKABLE option is
  set.
* libguile/deprecated.h:
* libguile/deprecated.c (SCM_FDES_RANDOM_P): Deprecate.
* NEWS: Add deprecation.
* libguile/filesys.c:
* libguile/ioext.c:
* libguile/posix.c:
* libguile/read.c:
* libguile/socket.c: Adapt callers.
This commit is contained in:
Andy Wingo 2017-02-14 21:57:35 +01:00
parent 2c02bdda19
commit 69ca2bb221
10 changed files with 114 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

11
NEWS
View file

@ -5,6 +5,17 @@ See the end for copying conditions.
Please send Guile bug reports to bug-guile@gnu.org.
Changes in 2.1.7 (changes since the 2.1.6 alpha release):
* New deprecations
** `SCM_FDES_RANDOM_P'
Instead, use `lseek (fd, 0, SEEK_CUR)' directly.
* FIXME fold in 2.1.6 changes to main NEWS
Changes in 2.1.6 (changes since the 2.1.5 alpha release):

14
libguile/deprecated.c
View file

@ -26,6 +26,9 @@
#define SCM_BUILDING_DEPRECATED_CODE
#include <sys/types.h>
#include <unistd.h>
#include "libguile/_scm.h"
#include "libguile/deprecation.h"
@ -938,6 +941,17 @@ scm_make_dynamic_state (SCM parent)
}
int
SCM_FDES_RANDOM_P (int fdes)
{
scm_c_issue_deprecation_warning
("SCM_FDES_RANDOM_P is deprecated. Use lseek (fd, 0, SEEK_CUR).");
return (lseek (fdes, 0, SEEK_CUR) == -1) ? 0 : 1;
}
void

4
libguile/deprecated.h
View file

@ -270,6 +270,10 @@ SCM_DEPRECATED SCM scm_from_contiguous_array (SCM bounds, const SCM *elts,
SCM_DEPRECATED int SCM_FDES_RANDOM_P (int fdes);
void scm_i_init_deprecated (void);
#endif

2
libguile/filesys.c
View file

@ -1509,7 +1509,7 @@ SCM_DEFINE (scm_i_mkstemp, "mkstemp!", 1, 1, 0,
scm_dynwind_end ();
port = scm_i_fdes_to_port (rv, mode_bits, tmpl);
port = scm_i_fdes_to_port (rv, mode_bits, tmpl, 0);
if (is_binary)
/* Use the binary-friendly ISO-8859-1 encoding. */
scm_i_set_port_encoding_x (port, NULL);

56
libguile/fports.c
View file

@ -264,7 +264,8 @@ scm_open_file_with_encoding (SCM filename, SCM mode,
/* Create a port from this file descriptor. The port's encoding is initially
%default-port-encoding. */
port = scm_i_fdes_to_port (fdes, scm_i_mode_bits (mode),
fport_canonicalize_filename (filename));
fport_canonicalize_filename (filename),
0);
if (binary)
{
@ -391,35 +392,41 @@ SCM_DEFINE (scm_i_open_file, "open-file", 2, 0, 1,
NAME is a string to be used as the port's filename.
*/
SCM
scm_i_fdes_to_port (int fdes, long mode_bits, SCM name)
scm_i_fdes_to_port (int fdes, long mode_bits, SCM name, unsigned options)
#define FUNC_NAME "scm_fdes_to_port"
{
SCM port;
scm_t_fport *fp;
/* Test that fdes is valid. */
#ifdef F_GETFL
int flags = fcntl (fdes, F_GETFL, 0);
if (flags == -1)
SCM_SYSERROR;
flags &= O_ACCMODE;
if (flags != O_RDWR
&& ((flags != O_WRONLY && (mode_bits & SCM_WRTNG))
|| (flags != O_RDONLY && (mode_bits & SCM_RDNG))))
if (options & SCM_FPORT_OPTION_VERIFY)
{
SCM_MISC_ERROR ("requested file mode not available on fdes", SCM_EOL);
}
/* Check that the foreign FD is valid and matches the mode
bits. */
#ifdef F_GETFL
int flags = fcntl (fdes, F_GETFL, 0);
if (flags == -1)
SCM_SYSERROR;
flags &= O_ACCMODE;
if (flags != O_RDWR
&& ((flags != O_WRONLY && (mode_bits & SCM_WRTNG))
|| (flags != O_RDONLY && (mode_bits & SCM_RDNG))))
{
SCM_MISC_ERROR ("requested file mode not available on fdes",
SCM_EOL);
}
#else
/* If we don't have F_GETFL, as on mingw, at least we can test that
it is a valid file descriptor. */
struct stat st;
if (fstat (fdes, &st) != 0)
SCM_SYSERROR;
/* If we don't have F_GETFL, as on mingw, at least we can test that
it is a valid file descriptor. */
struct stat st;
if (fstat (fdes, &st) != 0)
SCM_SYSERROR;
#endif
}
fp = (scm_t_fport *) scm_gc_malloc_pointerless (sizeof (scm_t_fport),
"file port");
fp->fdes = fdes;
fp->options = options;
port = scm_c_make_port (scm_file_port_type, mode_bits, (scm_t_bits)fp);
@ -432,7 +439,8 @@ scm_i_fdes_to_port (int fdes, long mode_bits, SCM name)
SCM
scm_fdes_to_port (int fdes, char *mode, SCM name)
{
return scm_i_fdes_to_port (fdes, scm_mode_bits (mode), name);
return scm_i_fdes_to_port (fdes, scm_mode_bits (mode), name,
SCM_FPORT_OPTION_VERIFY);
}
/* Return a lower bound on the number of bytes available for input. */
@ -669,7 +677,15 @@ fport_close (SCM port)
static int
fport_random_access_p (SCM port)
{
return SCM_FDES_RANDOM_P (SCM_FSTREAM (port)->fdes);
scm_t_fport *fp = SCM_FSTREAM (port);
if (fp->options & SCM_FPORT_OPTION_NOT_SEEKABLE)
return 0;
if (lseek (fp->fdes, 0, SEEK_CUR) == -1)
return 0;
return 1;
}
static int

29
libguile/fports.h
View file

@ -31,10 +31,13 @@
/* struct allocated for each buffered FPORT. */
typedef struct scm_t_fport {
int fdes; /* file descriptor. */
int revealed; /* 0 not revealed, > 1 revealed.
* Revealed ports do not get GC'd.
*/
/* The file descriptor. */
int fdes;
/* Revealed count; 0 indicates not revealed, > 1 revealed. Revealed
ports do not get garbage-collected. */
int revealed;
/* Set of scm_fport_option flags. */
unsigned options;
} scm_t_fport;
SCM_API scm_t_port_type *scm_file_port_type;
@ -48,9 +51,6 @@ SCM_API scm_t_port_type *scm_file_port_type;
#define SCM_OPINFPORTP(x) (SCM_OPFPORTP (x) && (SCM_CELL_WORD_0 (x) & SCM_RDNG))
#define SCM_OPOUTFPORTP(x) (SCM_OPFPORTP (x) && (SCM_CELL_WORD_0 (x) & SCM_WRTNG))
/* test whether fdes supports random access. */
#define SCM_FDES_RANDOM_P(fdes) ((lseek (fdes, 0, SEEK_CUR) == -1) ? 0 : 1)
SCM_API void scm_evict_ports (int fd);
SCM_INTERNAL int scm_i_mode_to_open_flags (SCM mode, int *is_binary,
@ -74,8 +74,19 @@ SCM_INTERNAL void scm_init_fports (void);
/* internal functions */
SCM_INTERNAL SCM scm_i_fdes_to_port (int fdes, long mode_bits, SCM name);
#ifdef BUILDING_LIBGUILE
enum scm_fport_option
{
/* FD's that aren't created by Guile probably need to be checked for
validity. We also check that the open mode is valid. */
SCM_FPORT_OPTION_VERIFY = 1U<<0,
/* We know some ports aren't seekable and can elide a syscall in
that case. */
SCM_FPORT_OPTION_NOT_SEEKABLE = 1U<<1
};
SCM_INTERNAL SCM scm_i_fdes_to_port (int fdes, long mode_bits, SCM name,
unsigned options);
#endif /* BUILDING_LIBGUILE */
#endif /* SCM_FPORTS_H */

3
libguile/ioext.c
View file

@ -226,7 +226,8 @@ SCM_DEFINE (scm_fdopen, "fdopen", 2, 0, 0,
#define FUNC_NAME s_scm_fdopen
{
return scm_i_fdes_to_port (scm_to_int (fdes),
scm_i_mode_bits (modes), SCM_BOOL_F);
scm_i_mode_bits (modes), SCM_BOOL_F,
SCM_FPORT_OPTION_VERIFY);
}
#undef FUNC_NAME

14
libguile/posix.c
View file

@ -242,8 +242,10 @@ SCM_DEFINE (scm_pipe, "pipe", 0, 0, 0,
if (rv)
SCM_SYSERROR;
p_rd = scm_fdes_to_port (fd[0], "r", sym_read_pipe);
p_wt = scm_fdes_to_port (fd[1], "w", sym_write_pipe);
p_rd = scm_i_fdes_to_port (fd[0], scm_mode_bits ("r"), sym_read_pipe,
SCM_FPORT_OPTION_NOT_SEEKABLE);
p_wt = scm_i_fdes_to_port (fd[1], scm_mode_bits ("w"), sym_write_pipe,
SCM_FPORT_OPTION_NOT_SEEKABLE);
return scm_cons (p_rd, p_wt);
}
#undef FUNC_NAME
@ -1418,12 +1420,16 @@ scm_open_process (SCM mode, SCM prog, SCM args)
if (reading)
{
close (c2p[1]);
read_port = scm_fdes_to_port (c2p[0], "r0", sym_read_pipe);
read_port = scm_i_fdes_to_port (c2p[0], scm_mode_bits ("r0"),
sym_read_pipe,
SCM_FPORT_OPTION_NOT_SEEKABLE);
}
if (writing)
{
close (p2c[0]);
write_port = scm_fdes_to_port (p2c[1], "w0", sym_write_pipe);
write_port = scm_i_fdes_to_port (p2c[1], scm_mode_bits ("w0"),
sym_write_pipe,
SCM_FPORT_OPTION_NOT_SEEKABLE);
}
return scm_values (scm_list_3 (read_port,

16
libguile/read.c
View file

@ -2105,21 +2105,17 @@ scm_i_scan_for_encoding (SCM port)
memcpy (header, scm_port_buffer_take_pointer (buf, cur), bytes_read);
header[bytes_read] = '\0';
}
else
else if (pt->rw_random)
{
/* Try to read some bytes and then seek back. Not all ports
support seeking back; and indeed some file ports (like
/dev/urandom) will succeed on an lseek (fd, 0, SEEK_CUR)---the
check performed by SCM_FPORT_FDES---but fail to seek
backwards. Hence this block comes second. We prefer to use
the read buffer in-place. */
if (SCM_FPORTP (port) && !SCM_FDES_RANDOM_P (SCM_FPORT_FDES (port)))
return NULL;
/* The port is seekable. This is OK but grubbing in the read
buffer is better, so this case is just a fallback. */
bytes_read = scm_c_read (port, header, SCM_ENCODING_SEARCH_SIZE);
header[bytes_read] = '\0';
scm_seek (port, scm_from_int (0), scm_from_int (SEEK_SET));
}
else
/* No input available and not seekable; scan fails. */
return NULL;
/* search past "coding[:=]" */
pos = header;

14
libguile/socket.c
View file

@ -367,7 +367,12 @@ SCM_DEFINE (scm_inet_pton, "inet-pton", 2, 0, 0,
SCM_SYMBOL (sym_socket, "socket");
#define SCM_SOCK_FD_TO_PORT(fd) scm_fdes_to_port (fd, "r+0", sym_socket)
static SCM
scm_socket_fd_to_port (int fd)
{
return scm_i_fdes_to_port (fd, scm_mode_bits ("r+0"), sym_socket,
SCM_FPORT_OPTION_NOT_SEEKABLE);
}
SCM_DEFINE (scm_socket, "socket", 3, 0, 0,
(SCM family, SCM style, SCM proto),
@ -391,7 +396,7 @@ SCM_DEFINE (scm_socket, "socket", 3, 0, 0,
scm_to_int (proto));
if (fd == -1)
SCM_SYSERROR;
return SCM_SOCK_FD_TO_PORT (fd);
return scm_socket_fd_to_port (fd);
}
#undef FUNC_NAME
@ -413,7 +418,8 @@ SCM_DEFINE (scm_socketpair, "socketpair", 3, 0, 0,
if (socketpair (fam, scm_to_int (style), scm_to_int (proto), fd) == -1)
SCM_SYSERROR;
return scm_cons (SCM_SOCK_FD_TO_PORT (fd[0]), SCM_SOCK_FD_TO_PORT (fd[1]));
return scm_cons (scm_socket_fd_to_port (fd[0]),
scm_socket_fd_to_port (fd[1]));
}
#undef FUNC_NAME
#endif
@ -1269,7 +1275,7 @@ SCM_DEFINE (scm_accept, "accept", 1, 0, 0,
return SCM_BOOL_F;
SCM_SYSERROR;
}
newsock = SCM_SOCK_FD_TO_PORT (newfd);
newsock = scm_socket_fd_to_port (newfd);
address = _scm_from_sockaddr (&addr, addr_size,
FUNC_NAME);