jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ruby trackings patch tidy up and add changes entry

Browse source 
Closes #225
This commit is contained in:
William S Fulton 2015-09-13 13:25:29 +01:00
commit e14b392596
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGES.current
View file

@ -5,6 +5,13 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 3.0.8 (in progress) Version 3.0.8 (in progress)
=========================== ===========================
2015-09-13: kkaempf
[Ruby] Resolve tracking bug - issue #225.
The bug is that the tracking code uses a ruby hash and thus may
allocate objects (Bignum) while running the GC. This was tolerated in
1.8 but is invalid (raises an exception) in 1.9.
The patch uses a C hash (also used by ruby) instead.
2015-09-09: lyze 2015-09-09: lyze
[CFFI] Extend the "export" feature in the CFFI module to support [CFFI] Extend the "export" feature in the CFFI module to support
exporting to a specified package. exporting to a specified package.

16
Lib/ruby/rubytracking.swg
View file

@ -27,7 +27,7 @@ extern "C" {
*/ */
static st_table* swig_ruby_trackings = NULL; static st_table* swig_ruby_trackings = NULL;
VALUE get_swig_trackings_count(ANYARGS) { static VALUE swig_ruby_trackings_count(ANYARGS) {
return SWIG2NUM(swig_ruby_trackings->num_entries); return SWIG2NUM(swig_ruby_trackings->num_entries);
} }
@ -45,7 +45,7 @@ SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
*/ */
VALUE trackings_value = Qnil; VALUE trackings_value = Qnil;
/* change the variable name so that we can mix modules /* change the variable name so that we can mix modules
compiled with older SWIG's */ compiled with older SWIG's - this used to be called "@__trackings__" */
ID trackings_id = rb_intern( "@__safetrackings__" ); ID trackings_id = rb_intern( "@__safetrackings__" );
VALUE verbose = rb_gv_get("VERBOSE"); VALUE verbose = rb_gv_get("VERBOSE");
rb_gv_set("VERBOSE", Qfalse); rb_gv_set("VERBOSE", Qfalse);
@ -60,12 +60,11 @@ SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
/* No, it hasn't. Create one ourselves */ /* No, it hasn't. Create one ourselves */
swig_ruby_trackings = st_init_numtable(); swig_ruby_trackings = st_init_numtable();
rb_ivar_set( _mSWIG, trackings_id, SWIG2NUM(swig_ruby_trackings) ); rb_ivar_set( _mSWIG, trackings_id, SWIG2NUM(swig_ruby_trackings) );
} } else {
else {
swig_ruby_trackings = (st_table*)NUM2SWIG(trackings_value); swig_ruby_trackings = (st_table*)NUM2SWIG(trackings_value);
} }
rb_define_virtual_variable("SWIG_TRACKINGS_COUNT", get_swig_trackings_count, NULL); rb_define_virtual_variable("SWIG_TRACKINGS_COUNT", swig_ruby_trackings_count, NULL);
} }
/* Add a Tracking from a C/C++ struct to a Ruby object */ /* Add a Tracking from a C/C++ struct to a Ruby object */
@ -81,8 +80,7 @@ SWIGRUNTIME VALUE SWIG_RubyInstanceFor(void* ptr) {
if (st_lookup(swig_ruby_trackings, (st_data_t)ptr, &value)) { if (st_lookup(swig_ruby_trackings, (st_data_t)ptr, &value)) {
return value; return value;
} } else {
else {
return Qnil; return Qnil;
} }
} }
@ -114,13 +112,13 @@ SWIGRUNTIME void SWIG_RubyUnlinkObjects(void* ptr) {
to the passed callback function. */ to the passed callback function. */
/* Proxy method to abstract the internal trackings datatype */ /* Proxy method to abstract the internal trackings datatype */
static int _ruby_internal_iterate_callback(void* ptr, VALUE obj, void(*meth)(void* ptr, VALUE obj)) { static int swig_ruby_internal_iterate_callback(void* ptr, VALUE obj, void(*meth)(void* ptr, VALUE obj)) {
(*meth)(ptr, obj); (*meth)(ptr, obj);
return ST_CONTINUE; return ST_CONTINUE;
} }
SWIGRUNTIME void SWIG_RubyIterateTrackings( void(*meth)(void* ptr, VALUE obj) ) { SWIGRUNTIME void SWIG_RubyIterateTrackings( void(*meth)(void* ptr, VALUE obj) ) {
st_foreach(swig_ruby_trackings, (int (*)(ANYARGS))&_ruby_internal_iterate_callback, (st_data_t)meth); st_foreach(swig_ruby_trackings, (int (*)(ANYARGS))&swig_ruby_internal_iterate_callback, (st_data_t)meth);
} }
#ifdef __cplusplus #ifdef __cplusplus