diff options
author | git <svn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-06-19 17:39:58 +0900 |
---|---|---|
committer | git <svn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-06-19 17:39:58 +0900 |
commit | cbe06cd3501fdadd0e6e63094da2973484d70b0b (patch) | |
tree | c60145af2da083c84ff6ea10299b978174813809 | |
parent | 3e5b885cd271e42ba4cb39dc8e612714f88ec889 (diff) | |
download | ruby-cbe06cd3501fdadd0e6e63094da2973484d70b0b.tar.gz |
* remove trailing spaces, expand tabs.
-rwxr-xr-x | bootstraptest/runner.rb | 2 | ||||
-rw-r--r-- | bootstraptest/test_thread.rb | 4 | ||||
-rw-r--r-- | thread.c | 20 | ||||
-rw-r--r-- | thread_pthread.c | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb index 3481402401..8fce3d4b99 100755 --- a/bootstraptest/runner.rb +++ b/bootstraptest/runner.rb @@ -268,7 +268,7 @@ def show_limit(testsrc, opt = '', **argh) $stderr.print '.' $stderr.print @reset $stderr.puts if @verbose - + if @tty $stderr.puts "#{erase}#{result}" else diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb index 319f9ca625..03fb441441 100644 --- a/bootstraptest/test_thread.rb +++ b/bootstraptest/test_thread.rb @@ -2,7 +2,7 @@ show_limit %q{ threads = [] begin threads << Thread.new{sleep} - + raise Exception, "skipping" if threads.count >= 10_000 rescue Exception => error puts "Thread count: #{threads.count} (#{error})" @@ -15,7 +15,7 @@ show_limit %q{ fiber = Fiber.new{Fiber.yield} fiber.resume fibers << fiber - + raise Exception, "skipping" if fibers.count >= 10_000 rescue Exception => error puts "Fiber count: #{fibers.count} (#{error})" @@ -702,15 +702,15 @@ thread_do_start(rb_thread_t *th) void rb_ec_clear_current_thread_trace_func(const rb_execution_context_t *ec); rb_control_frame_t * rb_vm_push_frame(rb_execution_context_t *sec, - const rb_iseq_t *iseq, - VALUE type, - VALUE self, - VALUE specval, - VALUE cref_or_me, - const VALUE *pc, - VALUE *sp, - int local_size, - int stack_max); + const rb_iseq_t *iseq, + VALUE type, + VALUE self, + VALUE specval, + VALUE cref_or_me, + const VALUE *pc, + VALUE *sp, + int local_size, + int stack_max); static int thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_start) @@ -817,7 +817,7 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s rb_threadptr_unlock_all_locking_mutexes(th); rb_check_deadlock(th->vm); - rb_fiber_close(th->ec->fiber_ptr); + rb_fiber_close(th->ec->fiber_ptr); } thread_cleanup_func(th, FALSE); gvl_release(th->vm); diff --git a/thread_pthread.c b/thread_pthread.c index 5cbe9e041b..75922797bb 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -1157,7 +1157,7 @@ native_thread_create(rb_thread_t *th) } else { pthread_attr_t attr; - const size_t stack_size = th->vm->default_params.thread_machine_stack_size + th->vm->default_params.thread_vm_stack_size; + const size_t stack_size = th->vm->default_params.thread_machine_stack_size + th->vm->default_params.thread_vm_stack_size; const size_t space = space_size(stack_size); th->ec->machine.stack_maxsize = stack_size - space; |