mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
e3a8c62630
* io.c (rb_io_mode_modenum): ditto. * gc.c (rb_memerror): rename from mem_error, and exported. * gc.c (Init_GC): pre-allocate NoMemoryError instance. * object.c (convert_type): error message changed from "failed to convert" to "cannot convert", since it does not try to convert if an object does not respond to the converting method. * eval.c (block_pass): convert Method to Proc using rb_check_convert_type(). * object.c (rb_check_convert_type): always convert T_DATA * eval.c (rb_thread_cleanup): should not terminate main_thread by Fatal error. * regex.c (is_in_list): need to not exclude NUL and NEWLINE. * re.c (rb_reg_expr_str): wrong backslash escapement. * re.c (rb_reg_expr_str): do not escape embedded space characters. * marshal.c (w_object): T_DATA process patch from Joel VanderWerf <vjoel@PATH.Berkeley.EDU>. This is temporary hack; it remains undocumented, and it will be removed when marshaling is re-designed. * marshal.c (r_object): ditto. * numeric.c (num_step): Integer#step is moved to Numeric#step; Fixnum#step is merged into this method. * numeric.c (int_dotimes): Fixnum#times is merged. * numeric.c (int_upto): Fixnum#upto is merged. * numeric.c (int_downto): Fixnum#downto is merged. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
99 lines
2.5 KiB
C
99 lines
2.5 KiB
C
/**********************************************************************
|
|
|
|
rubysig.h -
|
|
|
|
$Author$
|
|
$Date$
|
|
created at: Wed Aug 16 01:15:38 JST 1995
|
|
|
|
Copyright (C) 1993-2001 Yukihiro Matsumoto
|
|
|
|
**********************************************************************/
|
|
|
|
#ifndef SIG_H
|
|
#define SIG_H
|
|
|
|
#ifdef NT
|
|
typedef LONG rb_atomic_t;
|
|
|
|
# define ATOMIC_TEST(var) InterlockedExchange(&(var), 0)
|
|
# define ATOMIC_SET(var, val) InterlockedExchange(&(var), (val))
|
|
# define ATOMIC_INC(var) InterlockedIncrement(&(var))
|
|
# define ATOMIC_DEC(var) InterlockedDecrement(&(var))
|
|
|
|
/* Windows doesn't allow interrupt while system calls */
|
|
# define TRAP_BEG do {\
|
|
rb_atomic_t trap_immediate = ATOMIC_SET(rb_trap_immediate, 1)
|
|
# define TRAP_END\
|
|
ATOMIC_SET(rb_trap_immediate, trap_immediate);\
|
|
} while (0)
|
|
# define RUBY_CRITICAL(statements) do {\
|
|
win32_enter_critical();\
|
|
statements;\
|
|
win32_leave_critical();\
|
|
} while (0)
|
|
#else
|
|
typedef int rb_atomic_t;
|
|
|
|
# define ATOMIC_TEST(var) ((var) ? ((var) = 0, 1) : 0)
|
|
# define ATOMIC_SET(var, val) ((var) = (val))
|
|
# define ATOMIC_INC(var) (++(var))
|
|
# define ATOMIC_DEC(var) (--(var))
|
|
|
|
# define TRAP_BEG do {\
|
|
int trap_immediate = rb_trap_immediate;\
|
|
rb_trap_immediate = 1
|
|
# define TRAP_END rb_trap_immediate = trap_immediate;\
|
|
} while (0)
|
|
|
|
# define RUBY_CRITICAL(statements) do {\
|
|
int trap_immediate = rb_trap_immediate;\
|
|
rb_trap_immediate = 0;\
|
|
statements;\
|
|
rb_trap_immediate = trap_immediate;\
|
|
} while (0)
|
|
#endif
|
|
EXTERN rb_atomic_t rb_trap_immediate;
|
|
|
|
EXTERN int rb_prohibit_interrupt;
|
|
#define DEFER_INTS (rb_prohibit_interrupt++)
|
|
#define ALLOW_INTS do {\
|
|
rb_prohibit_interrupt--;\
|
|
CHECK_INTS;\
|
|
} while (0)
|
|
#define ENABLE_INTS (rb_prohibit_interrupt--)
|
|
|
|
VALUE rb_with_disable_interrupt _((VALUE(*)(ANYARGS),VALUE));
|
|
|
|
EXTERN rb_atomic_t rb_trap_pending;
|
|
void rb_trap_restore_mask _((void));
|
|
|
|
EXTERN int rb_thread_critical;
|
|
void rb_thread_schedule _((void));
|
|
#if defined(HAVE_SETITIMER) && !defined(__BOW__)
|
|
EXTERN int rb_thread_pending;
|
|
# define CHECK_INTS do {\
|
|
if (!rb_prohibit_interrupt) {\
|
|
if (rb_trap_pending) rb_trap_exec();\
|
|
if (rb_thread_pending && !rb_thread_critical)\
|
|
rb_thread_schedule();\
|
|
}\
|
|
} while (0)
|
|
#else
|
|
/* pseudo preemptive thread switching */
|
|
EXTERN int rb_thread_tick;
|
|
#define THREAD_TICK 500
|
|
#define CHECK_INTS do {\
|
|
if (!rb_prohibit_interrupt) {\
|
|
if (rb_trap_pending) rb_trap_exec();\
|
|
if (!rb_thread_critical) {\
|
|
if (rb_thread_tick-- <= 0) {\
|
|
rb_thread_tick = THREAD_TICK;\
|
|
rb_thread_schedule();\
|
|
}\
|
|
}\
|
|
}\
|
|
} while (0)
|
|
#endif
|
|
|
|
#endif
|