[前][次][番号順一覧][スレッド一覧]

ruby-changes:6945

From: nobu <ko1@a...>
Date: Sun, 10 Aug 2008 08:58:43 +0900 (JST)
Subject: [ruby-changes:6945] Ruby:r18463 (ruby_1_8, trunk): * gc.c (STACK_LEVEL_MAX, ruby_stack_length): returns size_t.

nobu	2008-08-10 08:56:17 +0900 (Sun, 10 Aug 2008)

  New Revision: 18463

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18463

  Log:
    * gc.c (STACK_LEVEL_MAX, ruby_stack_length): returns size_t.
      [ruby-core:18207]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/eval.c
    branches/ruby_1_8/gc.c
    branches/ruby_1_8/intern.h
    branches/ruby_1_8/node.h
    trunk/ChangeLog
    trunk/gc.c
    trunk/include/ruby/intern.h

Index: include/ruby/intern.h
===================================================================
--- include/ruby/intern.h	(revision 18462)
+++ include/ruby/intern.h	(revision 18463)
@@ -330,7 +330,7 @@
 void ruby_set_stack_size(size_t);
 NORETURN(void rb_memerror(void));
 int ruby_stack_check(void);
-int ruby_stack_length(VALUE**);
+size_t ruby_stack_length(VALUE**);
 int rb_during_gc(void);
 void rb_gc_mark_locations(VALUE*, VALUE*);
 void rb_mark_tbl(struct st_table*);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18462)
+++ ChangeLog	(revision 18463)
@@ -1,5 +1,8 @@
-Sun Aug 10 08:15:05 2008  Nobuyoshi Nakada  <nobu@r...>
+Sun Aug 10 08:56:14 2008  Nobuyoshi Nakada  <nobu@r...>
 
+	* gc.c (STACK_LEVEL_MAX, ruby_stack_length): returns size_t.
+	  [ruby-core:18207]
+
 	* configure.in (rb_cv_missing__dtos18, rb_cv_missing_fconvert),
 	  ext/digest/md5/md5.c, ext/openssl/ossl.c (main),
 	  ext/socket/extconf.rb (ipv6, wide-getaddrinfo): main should be int.
Index: gc.c
===================================================================
--- gc.c	(revision 18462)
+++ gc.c	(revision 18463)
@@ -815,7 +815,7 @@
 
 #define GC_WATER_MARK 512
 
-int
+size_t
 ruby_stack_length(VALUE **p)
 {
     rb_thread_t *th = GET_THREAD();
Index: ruby_1_8/intern.h
===================================================================
--- ruby_1_8/intern.h	(revision 18462)
+++ ruby_1_8/intern.h	(revision 18463)
@@ -251,7 +251,7 @@
 /* gc.c */
 NORETURN(void rb_memerror __((void)));
 int ruby_stack_check _((void));
-int ruby_stack_length _((VALUE**));
+size_t ruby_stack_length _((VALUE**));
 int rb_during_gc _((void));
 char *rb_source_filename _((const char*));
 void rb_gc_mark_locations _((VALUE*, VALUE*));
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 18462)
+++ ruby_1_8/ChangeLog	(revision 18463)
@@ -1,5 +1,8 @@
-Sun Aug 10 08:15:05 2008  Nobuyoshi Nakada  <nobu@r...>
+Sun Aug 10 08:56:14 2008  Nobuyoshi Nakada  <nobu@r...>
 
+	* gc.c (STACK_LEVEL_MAX, ruby_stack_length): returns size_t.
+	  [ruby-core:18207]
+
 	* configure.in (rb_cv_missing__dtos18, rb_cv_missing_fconvert),
 	  ext/digest/md5/md5.c, ext/openssl/ossl.c (main),
 	  ext/socket/extconf.rb (ipv6, wide-getaddrinfo): main should be int.
Index: ruby_1_8/eval.c
===================================================================
--- ruby_1_8/eval.c	(revision 18462)
+++ ruby_1_8/eval.c	(revision 18463)
@@ -10548,7 +10548,7 @@
     rb_thread_t th;
 {
     VALUE *pos;
-    int len;
+    size_t len;
     static VALUE tval;
 
     len = ruby_stack_length(&pos);
Index: ruby_1_8/gc.c
===================================================================
--- ruby_1_8/gc.c	(revision 18462)
+++ ruby_1_8/gc.c	(revision 18463)
@@ -490,7 +490,7 @@
 # define STACK_LEVEL_MAX (_stacksize - 4096)
 # undef HAVE_GETRLIMIT
 #elif defined(HAVE_GETRLIMIT) || defined(_WIN32)
-static unsigned int STACK_LEVEL_MAX = 655300;
+static size_t STACK_LEVEL_MAX = 655300;
 #else
 # define STACK_LEVEL_MAX 655300
 #endif
@@ -549,7 +549,7 @@
     (ret) = (STACK_LENGTH > STACK_LEVEL_MAX - GC_WATER_MARK);\
 } while (0)
 
-int
+size_t
 ruby_stack_length(p)
     VALUE **p;
 {
Index: ruby_1_8/node.h
===================================================================
--- ruby_1_8/node.h	(revision 18462)
+++ ruby_1_8/node.h	(revision 18463)
@@ -409,13 +409,13 @@
 
     VALUE result;
 
-    long   stk_len;
-    long   stk_max;
+    size_t stk_len;
+    size_t stk_max;
     VALUE *stk_ptr;
     VALUE *stk_pos;
 #ifdef __ia64
-    long   bstr_len;
-    long   bstr_max;
+    size_t bstr_len;
+    size_t bstr_max;
     VALUE *bstr_ptr;
     VALUE *bstr_pos;
 #endif

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]