ruby-changes:14076
From: nobu <ko1@a...>
Date: Mon, 23 Nov 2009 16:11:06 +0900 (JST)
Subject: [ruby-changes:14076] Ruby:r25889 (trunk): * thread_pthread.c (RUBY_STACK_MIN, RUBY_STACK_SPACE): delay for
nobu 2009-11-23 16:06:54 +0900 (Mon, 23 Nov 2009) New Revision: 25889 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25889 Log: * thread_pthread.c (RUBY_STACK_MIN, RUBY_STACK_SPACE): delay for platforms where PTHREAD_STACK_MIN is not compile time constant. [ruby-dev:39751] Modified files: trunk/ChangeLog trunk/thread_pthread.c Index: ChangeLog =================================================================== --- ChangeLog (revision 25888) +++ ChangeLog (revision 25889) @@ -1,3 +1,9 @@ +Mon Nov 23 16:06:53 2009 Nobuyoshi Nakada <nobu@r...> + + * thread_pthread.c (RUBY_STACK_MIN, RUBY_STACK_SPACE): delay for + platforms where PTHREAD_STACK_MIN is not compile time constant. + [ruby-dev:39751] + Mon Nov 23 11:26:45 2009 Nobuyoshi Nakada <nobu@r...> * dln.c (dln_find_1): removed duplication. Index: thread_pthread.c =================================================================== --- thread_pthread.c (revision 25888) +++ thread_pthread.c (revision 25889) @@ -463,15 +463,17 @@ #else RUBY_STACK_MIN_LIMIT = 512 * 1024, /* 512KB */ #endif - RUBY_STACK_MIN = ( + RUBY_STACK_SPACE_LIMIT = 1024 * 1024 +}; + #ifdef PTHREAD_STACK_MIN - (RUBY_STACK_MIN_LIMIT < PTHREAD_STACK_MIN) ? PTHREAD_STACK_MIN * 2 : +#define RUBY_STACK_MIN ((RUBY_STACK_MIN_LIMIT < PTHREAD_STACK_MIN) ? \ + PTHREAD_STACK_MIN * 2 : RUBY_STACK_MIN_LIMIT) +#else +#define RUBY_STACK_MIN (RUBY_STACK_MIN_LIMIT) #endif - RUBY_STACK_MIN_LIMIT), - RUBY_STACK_SPACE_LIMIT = 1024 * 1024, - RUBY_STACK_SPACE = (RUBY_STACK_MIN/5 > RUBY_STACK_SPACE_LIMIT ? - RUBY_STACK_SPACE_LIMIT : RUBY_STACK_MIN/5) -}; +#define RUBY_STACK_SPACE (RUBY_STACK_MIN/5 > RUBY_STACK_SPACE_LIMIT ? \ + RUBY_STACK_SPACE_LIMIT : RUBY_STACK_MIN/5) static int native_thread_create(rb_thread_t *th) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/