Permalink
Browse files

* thread_win32.c (thread_start_func_1): use already gotten stack info.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 4faa9ea commit df6ea23faff164bae0557ea551da0dfb549e8b1b @nobu nobu committed Nov 7, 2008
Showing with 5 additions and 18 deletions.
  1. +4 −0 ChangeLog
  2. +1 −18 thread_win32.c
View
@@ -1,3 +1,7 @@
+Fri Nov 7 21:23:02 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread_win32.c (thread_start_func_1): use already gotten stack info.
+
Fri Nov 7 12:26:00 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/irb.rb (IRB::Irb#eval_input): remove extra @context.prompt_i.
View
@@ -451,26 +451,10 @@ native_thread_destroy(rb_thread_t *th)
w32_close_handle(intr);
}
-static void *
-get_stack_info(const void *ptr, size_t *maxsize)
-{
- MEMORY_BASIC_INFORMATION mi;
- DWORD size;
- DWORD space;
-
- if (!VirtualQuery(ptr, &mi, sizeof(mi))) return 0;
- size = (char *)mi.BaseAddress - (char *)mi.AllocationBase;
- space = size / 5;
- if (space > 1024*1024) space = 1024*1024;
- *maxsize = size - space;
- return (VALUE *)mi.BaseAddress - 1;
-}
-
static unsigned long _stdcall
thread_start_func_1(void *th_ptr)
{
rb_thread_t *th = th_ptr;
- VALUE *stack_start;
volatile HANDLE thread_id = th->thread_id;
native_thread_init_stack(th);
@@ -480,8 +464,7 @@ thread_start_func_1(void *th_ptr)
thread_debug("thread created (th: %p, thid: %p, event: %p)\n", th,
th->thread_id, th->native_thread_data.interrupt_event);
- stack_start = get_stack_info(&stack_start, &th->machine_stack_maxsize);
- thread_start_func_2(th, stack_start, rb_ia64_bsp());
+ thread_start_func_2(th, th->machine_stack_start, rb_ia64_bsp());
w32_close_handle(thread_id);
thread_debug("thread deleted (th: %p)\n", th);

0 comments on commit df6ea23

Please sign in to comment.