ruby-dev

前田です。

shugo@aianet.ne.jp (Shugo Maeda) writes:

> > しかし、やっぱ、もっとうまい方法が欲しい気がしますね…。
> 
> ちょっと思うところがあるので試してみます。
> # 反応がなかったら失敗したと思ってください(^^;

callccを使わない場合には効率がほとんど落ちないようにしました。
とりあえず試した範囲ではうまく行っているようです。
# 他にもSCOPE_DONT_RECYCLEをセットしないといけないところが
# ありそうですけど...。

ruby-1.3からのパッチです。
# ついでにcall_ccからcallccに変えました。


-- 
前田 修吾 (mailto:shugo@aianet.ne.jp)

Attachments (1)

eval.c.diff (3.2 KB, text/x-diff)

--- eval.c.orig	Sat Jan 16 13:55:30 1999
+++ eval.c	Mon Jan 18 16:55:31 1999
@@ -641,15 +641,26 @@
     ruby_scope = _scope;		\
     scope_vmode = SCOPE_PUBLIC;
 
+#define SCOPE_DONT_RECYCLE FL_USER2
+
+static void scope_dup(struct SCOPE *);
+
 #define POP_SCOPE() \
     if (ruby_scope->flag == SCOPE_ALLOCA) {\
-	ruby_scope->local_vars = 0;\
-	ruby_scope->local_tbl  = 0;\
-	if (ruby_scope != top_scope)\
-            rb_gc_force_recycle((VALUE)ruby_scope);\
+	if (FL_TEST(ruby_scope, SCOPE_DONT_RECYCLE)) {\
+	    if (ruby_scope->flag == SCOPE_ALLOCA)\
+		scope_dup(ruby_scope);\
+	    FL_SET(_old, SCOPE_DONT_RECYCLE);\
+	}\
+	else {\
+	    ruby_scope->local_vars = 0;\
+	    ruby_scope->local_tbl  = 0;\
+	    if (ruby_scope != top_scope)\
+		rb_gc_force_recycle((VALUE)ruby_scope);\
+	}\
     }\
     else {\
-        ruby_scope->flag |= SCOPE_NOSTACK;\
+	ruby_scope->flag |= SCOPE_NOSTACK;\
     }\
     ruby_scope = _old;\
     scope_vmode = _vmode;\
@@ -3103,6 +3114,8 @@
     POP_VARS();
     ruby_block = block;
     ruby_frame = ruby_frame->prev;
+    if (FL_TEST(ruby_scope, SCOPE_DONT_RECYCLE))
+	FL_SET(old_scope, SCOPE_DONT_RECYCLE);
     ruby_scope = old_scope;
     if (state) JUMP_TAG(state);
     return result;
@@ -4084,6 +4097,8 @@
     rb_in_eval--;
     if (!NIL_P(scope)) {
 	ruby_frame = ruby_frame->prev;
+	if (FL_TEST(ruby_scope, SCOPE_DONT_RECYCLE))
+	    FL_SET(old_scope, SCOPE_DONT_RECYCLE);
 	ruby_scope = old_scope;
 	ruby_block = old_block;
 	ruby_calling_block = old_call_block;
@@ -6816,6 +6831,77 @@
     }
 }
 
+static VALUE rb_cContinuation;
+
+static VALUE
+rb_callcc(self)
+    VALUE self;
+{
+    thread_t th = ALLOC(struct thread);
+
+    th->status = THREAD_RUNNABLE;
+
+    th->status = 0;
+    th->result = 0;
+    th->rb_errinfo = Qnil;
+
+    th->stk_ptr = 0;
+    th->stk_len = 0;
+    th->stk_max = 0;
+    th->wait_for = 0;
+    th->fd = 0;
+    th->delay = 0.0;
+    th->join = 0;
+
+    th->frame = 0;
+    th->scope = 0;
+    th->klass = 0;
+    th->dyna_vars = 0;
+    th->block = 0;
+    th->iter = 0;
+    th->tag = 0;
+    th->rb_errinfo = 0;
+    th->last_status = 0;
+    th->last_line = 0;
+    th->last_match = 0;
+    th->abort = 0;
+
+    th->thread = Data_Wrap_Struct(rb_cContinuation, thread_mark,
+				  thread_free, th);
+
+    FL_SET(ruby_scope, SCOPE_DONT_RECYCLE);
+    rb_thread_save_context(th);
+    if (setjmp(th->context)) {
+	return th->result;
+    }
+    else {
+	return rb_yield(th->thread);
+    }
+}
+
+static VALUE
+rb_continuation_call(argc, argv, cont)
+    int argc;
+    VALUE *argv;
+    VALUE cont;
+{
+    thread_t th = rb_thread_check(cont);
+
+    switch (argc) {
+    case 0:
+	th->result = Qnil;
+	break;
+    case 1:
+	th->result = *argv;
+	break;
+    default:
+	th->result = rb_ary_new4(argc, argv);
+	break;
+    }
+    rb_thread_restore_context(th, 0);
+    return Qnil;
+}
+
 void
 Init_Thread()
 {
@@ -6855,6 +6941,11 @@
 
     /* allocate main thread */
     main_thread = rb_thread_alloc(rb_cThread);
+
+    rb_cContinuation = rb_define_class("Continuation", rb_cObject);
+    rb_undef_method(CLASS_OF(rb_cContinuation), "new");
+    rb_define_method(rb_cContinuation, "call", rb_continuation_call, -1);
+    rb_define_method(rb_mKernel, "callcc", rb_callcc, 0);
 }
 #endif

Thread

Prev Next

In This Thread

Prev Next

[#4060] [patch] require problem — shugo@... (Shugo Maeda)

[#4061] [patch] readline — shugo@... (Shugo Maeda)

[#4076] Re: call/cc — shugo@... (Shugo Maeda)

[#4090] finalizers — matz@... (Yukihiro Matsumoto)

[#4091] THREAD -> USE_THREAD — WATANABE Hirofumi <watanabe@...>

[#4094] Re: [ruby-list:11525] ruby 1.2.1 released — Hiroshi Igarashi <igarashi@...>

[#4095] Ruby on CYGWIN — TAKAHASHI Masayoshi <maki@...>

[#4100] RE: finalizers — 助田 雅紀 <masaki.suketa@...>

[#4131] Object#nonnil? — Fukuda Masaki <fukuda@...>

[#4164] status of ruby-mswin32 — KIMURA Koichi <kimura@...>

[#4166] RE: status of ruby-mswin32 — 助田 雅紀 <masaki.suketa@...>

[#4168] Re: status of ruby-mswin32 — 助田 雅紀 <masaki.suketa@...>

[#4170] Re: status of ruby-mswin32 — 助田 雅紀 <masaki.suketa@...>

[#4174] unshift,push — ttate@...

[#4177] String#push — shugo@... (Shugo Maeda)

[#4182] Time#eql? — Masaki Fukushima <fukusima@...>

[#4186] UTF-8 patch for Ruby-1.2.1 — Yoshida Masato <yoshidam@...>

[#4193] open with O_CREAT|O_EXCL — 民斗 <tommy@...>

[#4203] Compile via WATCOM C — ARIMA Yasuhiro <fit0298@...>

[#4207] some trouble with ruby-1.2.1 — Jun Adachi <adachi@...>

[#4219] Re: Compile via WATCOM C — 助田 雅紀 <masaki.suketa@...>

[#4226] Re: ruby 1.2.2 preliminary release — WATANABE Hirofumi <watanabe@...>

[#4230] Re: Compile via WATCOM C — 助田 雅紀 <masaki.suketa@...>

[#4236] Re: ruby 1.2.2 preliminary release — KIMURA Koichi <kbk@...>

[#4237] extmk.rb.in patch, environment variable — Ryo HAYASAKA <hayasaka@...>

[#4241] Re: ruby 1.2.2 preliminary release — WATANABE Hirofumi <eban@...>

[#4243] [BUG] Array.fill(val,Range) — Koji Arai <JCA02266@...>

[#4244] %//, %!! — Wakou Aoyama <wakou@...>

[#4245] raise in ruby-1.3 — Kazuhiro HIWADA <hiwada@...>

[#4246] Re: ruby 1.2.2 preliminary release — KIMURA Koichi <kimura@...>

[#4248] patch for ruby-mswin32 — Koji Oda <oda@...1.qnes.nec.co.jp>

[#4249] Makefile patch for mswin32 — Koji Oda <oda@...1.qnes.nec.co.jp>

[#4274] Re: UTF-8 patch for Ruby — okabe katsuyuki <HGC02147@...>

[#4290] signed/unsigned char — ARIMA Yasuhiro <fit0298@...>

[#4294] patch for mswin32 (2) — KIMURA Koichi <kbk@...>

[#4302] ruby-1.3 MacRuby patch — 藤本尚邦 / Hisakuni FUJIMOTO <hisa@...>

[#4306] MacRuby 1.3 binary test release — 藤本尚邦 / Hisakuni FUJIMOTO <hisa@...>

[#4327] pack("F") for bigendian float — gotoken@... (GOTO Kentaro)

[#4341] cascades on ruby — Kazunori NISHI <kazunori@...>

[#4347] ordered number — "D.Kanda" <MAP2303@...>

[#4349] Re: [ruby-list:11707] Re: ruby 1.2.2 released — EGUCHI Osamu <eguchi@...>

[#4419] Re: module Precision — Inaba Hiroto <inaba@...>

[#4420] ruby 1.3.1-990126 — matz@... (Yukihiro Matsumoto)

[#4442] Forward: ruby 1.3.1-990126 — matz@... (Yukihiro Matsumoto)

[#4452] permit to put a comma — Koji Arai <JCA02266@...>

[#4468] ruby 1.3.1-990128 — matz@... (Yukihiro Matsumoto)

[#4480] option -h — Wakou Aoyama <wakou@...>

[#4481] bug? thread — WATANABE Tetsuya <tetsu@...>

[#4498] cookie on cgi-lib.rb — IKARASHI Akira <ikarashi@...>

[#4502] [Array|Enumerable]#find_dup — aamine@...

[#4515] struct.c:ref_func[] — Tadayoshi Funaba <tadf@...>

[#4518] Inf.0 — gotoken@... (GOTO Kentaro)

[#4526] SEGV on EWS48 — Koji Arai <JCA02266@...>

[ruby-dev:4206] Re: callcc

Attachments (1)

Thread

In This Thread

[#4100] RE: finalizers — 助田　雅紀 <masaki.suketa@...>

[#4166] RE: status of ruby-mswin32 — 助田　雅紀 <masaki.suketa@...>

[#4168] Re: status of ruby-mswin32 — 助田　雅紀 <masaki.suketa@...>

[#4170] Re: status of ruby-mswin32 — 助田　雅紀 <masaki.suketa@...>

[#4219] Re: Compile via WATCOM C — 助田　雅紀 <masaki.suketa@...>

[#4230] Re: Compile via WATCOM C — 助田　雅紀 <masaki.suketa@...>