archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge revision(s) 57180: [Backport #13247]

Browse source 
memory_status.c: support old Mac OS

	* ext/-test-/memory_status/memory_status.c (read_status): use
	  TASK_BASIC_INFO instead of MACH_TASK_BASIC_INFO on old Mac OS.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@58626 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2017-05-09 14:48:49 +00:00
parent 51351b8f77
commit 33b90a28e5
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ext/-test-/memory_status/memory_status.c
View file

@ -17,12 +17,19 @@ read_status(VALUE self)
#if defined __APPLE__ #if defined __APPLE__
VALUE rss; VALUE rss;
kern_return_t error; kern_return_t error;
mach_msg_type_number_t out_count; # if defined MACH_TASK_BASIC_INFO
const task_flavor_t flavor = MACH_TASK_BASIC_INFO;
mach_msg_type_number_t out_count = MACH_TASK_BASIC_INFO_COUNT;
mach_task_basic_info_data_t taskinfo; mach_task_basic_info_data_t taskinfo;
# else
const task_flavor_t flavor = TASK_BASIC_INFO;
mach_msg_type_number_t out_count = TASK_BASIC_INFO_COUNT;
task_basic_info_data_t taskinfo;
# endif
taskinfo.virtual_size = 0; taskinfo.virtual_size = 0;
out_count = MACH_TASK_BASIC_INFO_COUNT; taskinfo.resident_size = 0;
error = task_info(mach_task_self(), MACH_TASK_BASIC_INFO, error = task_info(mach_task_self(), flavor,
(task_info_t)&taskinfo, &out_count); (task_info_t)&taskinfo, &out_count);
if (error != KERN_SUCCESS) return Qnil; if (error != KERN_SUCCESS) return Qnil;
size = ULL2NUM(taskinfo.virtual_size); size = ULL2NUM(taskinfo.virtual_size);

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.2" #define RUBY_VERSION "2.4.2"
#define RUBY_RELEASE_DATE "2017-05-09" #define RUBY_RELEASE_DATE "2017-05-09"
#define RUBY_PATCHLEVEL 120 #define RUBY_PATCHLEVEL 121
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 5 #define RUBY_RELEASE_MONTH 5