kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

vm_dump.c: important message first

Browse source 
* vm_dump.c (rb_vm_bugreport): show the most important message, Crash
  Report log information, first.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38990 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-01-30 06:21:33 +00:00
parent e449d06f15
commit 5efb130d39
3 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Jan 30 15:21:30 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_dump.c (rb_vm_bugreport): show the most important message, Crash
Report log information, first.
Wed Jan 30 15:00:05 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca> Wed Jan 30 15:00:05 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* array.c (rb_ary_bsearch): Raise TypeError on bad return from block * array.c (rb_ary_bsearch): Raise TypeError on bad return from block

1
test/ruby/test_rubyoptions.rb
View file

@ -485,6 +485,7 @@ class TestRubyOptions < Test::Unit::TestCase
%r(\A %r(\A
-e:(?:1:)?\s\[BUG\]\sSegmentation\sfault\n -e:(?:1:)?\s\[BUG\]\sSegmentation\sfault\n
#{ Regexp.quote(RUBY_DESCRIPTION) }\n\n #{ Regexp.quote(RUBY_DESCRIPTION) }\n\n
(?:--\s(?:.+\n)*\n)?
--\sControl\sframe\sinformation\s-+\n --\sControl\sframe\sinformation\s-+\n
(?:c:.*\n)* (?:c:.*\n)*
(?: (?:

24
vm_dump.c
View file

@ -617,6 +617,19 @@ rb_vm_bugreport(void)
enum {other_runtime_info = 0}; enum {other_runtime_info = 0};
#endif #endif
const rb_vm_t *const vm = GET_VM(); const rb_vm_t *const vm = GET_VM();
#if defined __APPLE__
fputs("-- Crash Report log information "
"--------------------------------------------\n"
" See Crash Report log file under the one of following:\n"
" * ~/Library/Logs/CrashReporter\n"
" * /Library/Logs/CrashReporter\n"
" * ~/Library/Logs/DiagnosticReports\n"
" * /Library/Logs/DiagnosticReports\n"
" the more detail of.\n"
"\n",
stderr);
#endif
if (vm) { if (vm) {
SDR(); SDR();
rb_backtrace_print_as_bugreport(); rb_backtrace_print_as_bugreport();
@ -628,16 +641,7 @@ rb_vm_bugreport(void)
"-------------------------------------------\n"); "-------------------------------------------\n");
{ {
#if defined __APPLE__ #if HAVE_BACKTRACE
fprintf(stderr, "\n");
fprintf(stderr,
" See Crash Report log file under the one of following:\n"
" * ~/Library/Logs/CrashReporter\n"
" * /Library/Logs/CrashReporter\n"
" * ~/Library/Logs/DiagnosticReports\n"
" * /Library/Logs/DiagnosticReports\n"
" the more detail of.\n");
#elif HAVE_BACKTRACE
#define MAX_NATIVE_TRACE 1024 #define MAX_NATIVE_TRACE 1024
static void *trace[MAX_NATIVE_TRACE]; static void *trace[MAX_NATIVE_TRACE];
int n = backtrace(trace, MAX_NATIVE_TRACE); int n = backtrace(trace, MAX_NATIVE_TRACE);