diff options
| author | Andy Wingo <wingo@pobox.com> | 2012-02-19 12:34:20 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2012-02-19 13:30:30 +0100 |
| commit | 3753e22736feb56ad22ec802bbad16e080066789 (patch) | |
| tree | b5143e8bf15dd1c62ce32a7131975c006f44ce1f /libguile/fports.h | |
| parent | bc1bc9e32088958c1b381f9ec0056e40340433a1 (diff) | |
| download | guile-3753e22736feb56ad22ec802bbad16e080066789.tar.gz | |
move revealed-count mechanism to fports.c
* libguile/fports.c (scm_revealed_count, scm_port_revealed)
(scm_set_port_revealed_x, scm_adjust_port_revealed_x): Move these APIs
here, and only operate on fports. To keep revealed ports alive, now
we will just keep them in a data structure that the GC knows about --
a static list.
* libguile/fports.h: Add revealed count to scm_t_fport, and move decls
of revealed-count functions here.
* libguile/ports.h:
* libguile/ports.c: Adapt to change. Remove SCM_REVEALED and
SCM_SETREVEALED; since they only apply to fports now, keeping them
around would be inviting type errors.
(finalize_port): We don't need to worry about resuscitating ports
here.
* libguile/init.c: Use the scm_set_port_revealed_x function to set the
revealed counts on stream ports.
Diffstat (limited to 'libguile/fports.h')
| -rw-r--r-- | libguile/fports.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/libguile/fports.h b/libguile/fports.h index 32b6a5947..4094f14cd 100644 --- a/libguile/fports.h +++ b/libguile/fports.h @@ -3,7 +3,7 @@ #ifndef SCM_FPORTS_H #define SCM_FPORTS_H -/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2006, 2008, 2009, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2006, 2008, 2009, 2011, 2012 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -32,6 +32,9 @@ /* 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. + */ } scm_t_fport; SCM_API scm_t_bits scm_tc16_fport; @@ -54,6 +57,15 @@ SCM_API void scm_evict_ports (int fd); SCM_API SCM scm_open_file (SCM filename, SCM modes); SCM_API SCM scm_fdes_to_port (int fdes, char *mode, SCM name); SCM_API SCM scm_file_port_p (SCM obj); + + +/* Revealed counts. */ +SCM_API int scm_revealed_count (SCM port); +SCM_API SCM scm_port_revealed (SCM port); +SCM_API SCM scm_set_port_revealed_x (SCM port, SCM rcount); +SCM_API SCM scm_adjust_port_revealed_x (SCM port, SCM addend); + + SCM_INTERNAL void scm_init_fports (void); /* internal functions */ |