mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
aa84489d18
There are two goals: one, to use less memory per dynamic state in order to allow millions of dynamic states to be allocated in light-weight threading scenarios. The second goal is to prevent dynamic states from being actively mutated in two threads at once. This second goal does mean that dynamic states object that escape into scheme are now copies that won't receive further updates; an incompatible change, but one which we hope doesn't affect anyone. * libguile/cache-internal.h: New file. * libguile/fluids.c (is_dynamic_state, get_dynamic_state) (save_dynamic_state, restore_dynamic_state, add_entry) (copy_value_table): New functions. (scm_i_fluid_print, scm_i_dynamic_state_print): Move up. (new_fluid): No need for a number. (scm_fluid_p: scm_is_fluid): Inline IS_FLUID uses. (fluid_set_x, fluid_ref): Adapt to dynamic state changes. (scm_fluid_set_x, scm_fluid_unset_x): Call fluid_set_x. (scm_swap_fluid): Rewrite in terms of fluid_ref and fluid_set. (swap_fluid): Use internal fluid_set_x. (scm_i_make_initial_dynamic_state): Adapt to dynamic state representation change. (scm_dynamic_state_p, scm_is_dynamic_state): Use new accessors. (scm_current_dynamic_state): Use make_dynamic_state. (scm_dynwind_current_dynamic_state): Use new accessor. * libguile/fluids.h: Remove internal definitions. Add new struct definition. * libguile/threads.h (scm_i_thread): Use scm_t_dynamic_state for dynamic state. * libguile/threads.c (guilify_self_1, guilify_self_2): (scm_i_init_thread_for_guile, scm_init_guile): (scm_call_with_new_thread): (scm_init_threads, scm_init_threads_default_dynamic_state): Adapt to scm_i_thread change. (scm_i_with_guile, with_guile): Remove "and parent" suffix. (scm_i_reset_fluid): Remove unneeded function. * doc/ref/api-scheduling.texi (Fluids and Dynamic States): Remove scm_make_dynamic_state docs. Update current-dynamic-state docs. * libguile/vm-engine.c (vm_engine): Update fluid-ref and fluid-set! inlined fast paths for dynamic state changes. * libguile/vm.c (vm_error_unbound_fluid): Remove now-unused function. * NEWS: Update. * module/ice-9/deprecated.scm (make-dynamic-state): New definition. * libguile/deprecated.h: * libguile/deprecated.c (scm_make_dynamic_state): Move here. * libguile/__scm.h (scm_t_dynamic_state): New typedef. * libguile/dynstack.h: * libguile/dynstack.c (scm_dynstack_push_fluid): (scm_dynstack_unwind_fluid): Take raw dynstate in these internal functions. * libguile/throw.c (catch): Adapt to dynstack changes.
209 lines
7.7 KiB
C
209 lines
7.7 KiB
C
/* classes: h_files */
|
||
|
||
#ifndef SCM_DYNSTACK_H
|
||
#define SCM_DYNSTACK_H
|
||
|
||
/* Copyright (C) 2012, 2013 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
|
||
* as published by the Free Software Foundation; either version 3 of
|
||
* the License, or (at your option) any later version.
|
||
*
|
||
* This library is distributed in the hope that it will be useful, but
|
||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
* Lesser General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU Lesser General Public
|
||
* License along with this library; if not, write to the Free Software
|
||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||
* 02110-1301 USA
|
||
*/
|
||
|
||
|
||
|
||
#include "libguile/__scm.h"
|
||
|
||
|
||
|
||
typedef struct
|
||
{
|
||
scm_t_bits *base;
|
||
scm_t_bits *top;
|
||
scm_t_bits *limit;
|
||
} scm_t_dynstack;
|
||
|
||
|
||
|
||
/* Items on the dynstack are preceded by two-word headers, giving the
|
||
offset of the preceding item (or 0 if there is none) and the type,
|
||
flags, and length of the following dynstack entry, in words. In
|
||
addition, there is a "null header" at the top of the stack,
|
||
indicating the length of the previous item, but with a tag of zero.
|
||
|
||
For example, consider an empty dynstack, with a capacity of 6 words:
|
||
|
||
+----------+----------+ +
|
||
|prev=0 |tag=0 | |
|
||
+----------+----------+ +
|
||
^base ^top limit^
|
||
|
||
Now we evaluate (dynamic-wind enter thunk leave). That will result
|
||
in a dynstack of:
|
||
|
||
/ the len=2 words \
|
||
+----------+----------+----------+----------+----------+----------+
|
||
|prev=0 |tag:len=2 |enter |leave |prev=4 |tag=0 |
|
||
+----------+----------+----------+----------+----------+----------+
|
||
^base top,limit^
|
||
|
||
The tag is a combination of the type of the dynstack item, some flags
|
||
associated with the item, and the length of the item. See
|
||
SCM_MAKE_DYNSTACK_TAG below for the details.
|
||
|
||
This arrangement makes it possible to have variable-length dynstack
|
||
items, and yet be able to traverse them forwards or backwards. */
|
||
|
||
#define SCM_DYNSTACK_HEADER_LEN 2
|
||
|
||
#define SCM_DYNSTACK_PREV_OFFSET(top) ((top)[-2])
|
||
#define SCM_DYNSTACK_SET_PREV_OFFSET(top, offset) (top)[-2] = (offset)
|
||
|
||
#define SCM_DYNSTACK_TAG(top) ((top)[-1])
|
||
#define SCM_DYNSTACK_SET_TAG(top, tag) (top)[-1] = (tag)
|
||
|
||
typedef enum {
|
||
SCM_DYNSTACK_TYPE_NONE = 0,
|
||
SCM_DYNSTACK_TYPE_FRAME,
|
||
SCM_DYNSTACK_TYPE_UNWINDER,
|
||
SCM_DYNSTACK_TYPE_REWINDER,
|
||
SCM_DYNSTACK_TYPE_WITH_FLUID,
|
||
SCM_DYNSTACK_TYPE_PROMPT,
|
||
SCM_DYNSTACK_TYPE_DYNWIND,
|
||
} scm_t_dynstack_item_type;
|
||
|
||
#define SCM_DYNSTACK_TAG_TYPE_MASK 0xf
|
||
#define SCM_DYNSTACK_TAG_FLAGS_MASK 0xf0
|
||
#define SCM_DYNSTACK_TAG_FLAGS_SHIFT 4
|
||
#define SCM_DYNSTACK_TAG_LEN_SHIFT 8
|
||
|
||
#define SCM_MAKE_DYNSTACK_TAG(type, flags, len) \
|
||
((type) | (flags) | ((len) << SCM_DYNSTACK_TAG_LEN_SHIFT))
|
||
|
||
#define SCM_DYNSTACK_TAG_TYPE(tag) \
|
||
((tag) & SCM_DYNSTACK_TAG_TYPE_MASK)
|
||
#define SCM_DYNSTACK_TAG_FLAGS(tag) \
|
||
((tag) & SCM_DYNSTACK_TAG_FLAGS_MASK)
|
||
#define SCM_DYNSTACK_TAG_LEN(tag) \
|
||
((tag) >> SCM_DYNSTACK_TAG_LEN_SHIFT)
|
||
|
||
#define SCM_DYNSTACK_PREV(top) \
|
||
(SCM_DYNSTACK_PREV_OFFSET (top) \
|
||
? ((top) - SCM_DYNSTACK_PREV_OFFSET (top)) : NULL)
|
||
#define SCM_DYNSTACK_NEXT(top) \
|
||
(SCM_DYNSTACK_TAG (top) \
|
||
? ((top) + SCM_DYNSTACK_TAG_LEN (SCM_DYNSTACK_TAG (top)) \
|
||
+ SCM_DYNSTACK_HEADER_LEN) \
|
||
: NULL)
|
||
|
||
#define SCM_DYNSTACK_FIRST(dynstack) \
|
||
((dynstack)->base + SCM_DYNSTACK_HEADER_LEN)
|
||
|
||
#define SCM_DYNSTACK_CAPACITY(dynstack) \
|
||
((dynstack)->limit - (dynstack)->base)
|
||
#define SCM_DYNSTACK_SPACE(dynstack) \
|
||
((dynstack)->limit - (dynstack)->top)
|
||
#define SCM_DYNSTACK_HEIGHT(dynstack) \
|
||
((dynstack)->top - (dynstack)->base)
|
||
|
||
#define SCM_DYNSTACK_HAS_SPACE(dynstack, n) \
|
||
(SCM_DYNSTACK_SPACE (dynstack) >= n + SCM_DYNSTACK_HEADER_LEN)
|
||
|
||
typedef enum {
|
||
SCM_F_DYNSTACK_FRAME_REWINDABLE = (1 << SCM_DYNSTACK_TAG_FLAGS_SHIFT)
|
||
} scm_t_dynstack_frame_flags;
|
||
|
||
typedef enum {
|
||
SCM_F_DYNSTACK_WINDER_EXPLICIT = (1 << SCM_DYNSTACK_TAG_FLAGS_SHIFT)
|
||
} scm_t_dynstack_winder_flags;
|
||
|
||
typedef enum {
|
||
SCM_F_DYNSTACK_PROMPT_ESCAPE_ONLY = (1 << SCM_DYNSTACK_TAG_FLAGS_SHIFT)
|
||
} scm_t_dynstack_prompt_flags;
|
||
|
||
typedef void (*scm_t_guard) (void *);
|
||
|
||
|
||
|
||
|
||
/* Pushing and popping entries on the dynamic stack. */
|
||
|
||
SCM_INTERNAL void scm_dynstack_push_frame (scm_t_dynstack *,
|
||
scm_t_dynstack_frame_flags);
|
||
SCM_INTERNAL void scm_dynstack_push_rewinder (scm_t_dynstack *,
|
||
scm_t_dynstack_winder_flags,
|
||
scm_t_guard, void *);
|
||
SCM_INTERNAL void scm_dynstack_push_unwinder (scm_t_dynstack *,
|
||
scm_t_dynstack_winder_flags,
|
||
scm_t_guard, void *);
|
||
SCM_INTERNAL void scm_dynstack_push_fluid (
|
||
scm_t_dynstack *, SCM fluid, SCM value,
|
||
scm_t_dynamic_state *dynamic_state);
|
||
SCM_INTERNAL void scm_dynstack_push_prompt (scm_t_dynstack *,
|
||
scm_t_dynstack_prompt_flags,
|
||
SCM key,
|
||
scm_t_ptrdiff fp_offset,
|
||
scm_t_ptrdiff sp_offset,
|
||
scm_t_uint32 *ip,
|
||
scm_i_jmp_buf *registers);
|
||
SCM_INTERNAL void scm_dynstack_push_dynwind (scm_t_dynstack *,
|
||
SCM enter, SCM leave);
|
||
|
||
SCM_INTERNAL void scm_dynstack_pop (scm_t_dynstack *);
|
||
|
||
|
||
|
||
|
||
/* Capturing, winding, and unwinding. */
|
||
|
||
SCM_INTERNAL scm_t_dynstack* scm_dynstack_capture_all (scm_t_dynstack *dynstack);
|
||
SCM_INTERNAL scm_t_dynstack* scm_dynstack_capture (scm_t_dynstack *dynstack,
|
||
scm_t_bits *item);
|
||
|
||
SCM_INTERNAL void scm_dynstack_wind_1 (scm_t_dynstack *, scm_t_bits *);
|
||
SCM_INTERNAL scm_t_bits scm_dynstack_unwind_1 (scm_t_dynstack *);
|
||
|
||
SCM_INTERNAL void scm_dynstack_wind (scm_t_dynstack *, scm_t_bits *);
|
||
SCM_INTERNAL void scm_dynstack_unwind (scm_t_dynstack *, scm_t_bits *);
|
||
|
||
|
||
|
||
|
||
/* Miscellany. */
|
||
|
||
SCM_INTERNAL scm_t_bits* scm_dynstack_unwind_fork (scm_t_dynstack *,
|
||
scm_t_dynstack *);
|
||
|
||
SCM_INTERNAL void scm_dynstack_unwind_frame (scm_t_dynstack *);
|
||
SCM_INTERNAL void scm_dynstack_unwind_fluid
|
||
(scm_t_dynstack *dynstack, scm_t_dynamic_state *dynamic_state);
|
||
|
||
SCM_INTERNAL scm_t_bits* scm_dynstack_find_prompt (scm_t_dynstack *, SCM,
|
||
scm_t_dynstack_prompt_flags *,
|
||
scm_t_ptrdiff *,
|
||
scm_t_ptrdiff *,
|
||
scm_t_uint32 **,
|
||
scm_i_jmp_buf **);
|
||
|
||
SCM_INTERNAL void scm_dynstack_wind_prompt (scm_t_dynstack *, scm_t_bits *,
|
||
scm_t_ptrdiff, scm_i_jmp_buf *);
|
||
|
||
|
||
#endif /* SCM_DYNSTACK_H */
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|