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

generator.c: allocate structs with wrapper

Browse source 
* ext/json/generator/generator.c (cState_s_allocate): allocate
  structs with making new wrapper objects and get rid of potential
  memory leak.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-05-28 07:17:55 +00:00
parent cbf902fc33
commit 4d059bf9f5
3 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ext/json/generator/generator.c
View file

@ -526,16 +526,11 @@ static const rb_data_type_t JSON_Generator_State_type = {
}; };
#endif #endif
static JSON_Generator_State *State_allocate(void)
{
JSON_Generator_State *state = ZALLOC(JSON_Generator_State);
return state;
}
static VALUE cState_s_allocate(VALUE klass) static VALUE cState_s_allocate(VALUE klass)
{ {
JSON_Generator_State *state = State_allocate(); JSON_Generator_State *state;
return TypedData_Wrap_Struct(klass, &JSON_Generator_State_type, state); return TypedData_Make_Struct(klass, JSON_Generator_State,
&JSON_Generator_State_type, state);
} }
/* /*

5
ext/json/generator/generator.h
View file

@ -112,7 +112,6 @@ static VALUE mFalseClass_to_json(int argc, VALUE *argv, VALUE self);
static VALUE mNilClass_to_json(int argc, VALUE *argv, VALUE self); static VALUE mNilClass_to_json(int argc, VALUE *argv, VALUE self);
static VALUE mObject_to_json(int argc, VALUE *argv, VALUE self); static VALUE mObject_to_json(int argc, VALUE *argv, VALUE self);
static void State_free(void *state); static void State_free(void *state);
static JSON_Generator_State *State_allocate(void);
static VALUE cState_s_allocate(VALUE klass); static VALUE cState_s_allocate(VALUE klass);
static VALUE cState_configure(VALUE self, VALUE opts); static VALUE cState_configure(VALUE self, VALUE opts);
static VALUE cState_to_h(VALUE self); static VALUE cState_to_h(VALUE self);
@ -156,11 +155,11 @@ static inline void *ruby_zalloc(size_t n)
return p; return p;
} }
#endif #endif
#ifdef TypedData_Wrap_Struct #ifdef TypedData_Make_Struct
static const rb_data_type_t JSON_Generator_State_type; static const rb_data_type_t JSON_Generator_State_type;
#define NEW_TYPEDDATA_WRAPPER 1 #define NEW_TYPEDDATA_WRAPPER 1
#else #else
#define TypedData_Wrap_Struct(klass, ignore, json) Data_Wrap_Struct(klass, NULL, State_free, json) #define TypedData_Make_Struct(klass, type, ignore, json) Data_Make_Struct(klass, type, NULL, State_free, json)
#define TypedData_Get_Struct(self, JSON_Generator_State, ignore, json) Data_Get_Struct(self, JSON_Generator_State, json) #define TypedData_Get_Struct(self, JSON_Generator_State, ignore, json) Data_Get_Struct(self, JSON_Generator_State, json)
#endif #endif

13
test/json/test_json_generate.rb
View file

@ -344,4 +344,17 @@ EOT
assert_equal '[""]', JSON.generate([s.new]) assert_equal '[""]', JSON.generate([s.new])
end end
end end
if EnvUtil.gc_stress_to_class?
def assert_no_memory_leak(code, *rest, **opt)
code = "8.times {20_000.times {begin #{code}; rescue NoMemoryError; end}; GC.start}"
super(["-rjson/ext/generator"],
"GC.add_stress_to_class(JSON::Ext::Generator::State); "\
"#{code}", code, *rest, rss: true, limit: 1.1, **opt)
end
def test_no_memory_leak_allocate
assert_no_memory_leak("JSON::Ext::Generator::State.allocate")
end
end
end end