fxruby 1.6.31 → 1.6.32.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c657df6afb071db3ac6cd379ba544ab9a041e05
-  data.tar.gz: 420d9a5a14de3ced2f355bf256da1cb3bab2a4cf
+  metadata.gz: cd8545ecb6b779f4edd4d0c5580d8ac5efb126a8
+  data.tar.gz: 7bb176820e5eceee88c82ee8b916f3de00ebb9ac
 SHA512:
-  metadata.gz: a463b699c583cd8196654d7abbbb298e75aa4d87f353c49014ed12ffd9bb37290c8fa57df151f6775a01a8ef6daf91ac738da743bf929045f7e2fccb9526ac2e
-  data.tar.gz: d7660b4c0f1fc8e2d277fec3b23c0e930fc7196a027314caffc0a3b054f7630fde56a922cf46e3f7a1998d9776a6f2ab9afdc7ccaed85f8550def937d4582874
+  metadata.gz: b41b86c915aceb98ca1e00f148e6c96f9a89c2197651840b9087ab2286cf8d6d971f325b610093e747bf093ff0b1c05a0d30089d6b1e5adcf4bf1df5c19aa504
+  data.tar.gz: 6ae7c95c2b8263b59a4a9ad4119354788e0f09b1595727209b84cae798729d401e821f409a0d0d8f8199abbd2ae7506fd79a62acaea39c1a2cbd7f71cc165bdb

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.6.32 / unreleased
+
+* Avoid call to rb_class2name() during GC. Fixes #21
+* Use release mode, unless extconf.rb is called with --enable-debug,
+  so that all FXTRACE() and FXASSERT() calls are skiped, per default.
+
 === 1.6.31 / 2015-07-21
 
 * Replace pipe2() by pipe() and fcntl(), because pipe2() is not as portable.

data/ext/fox16_c/FXRuby.cpp

@@ -83,6 +83,17 @@ swig_type_info *FXRbTypeQuery(const char *desc){
 
 static st_table * FXRuby_Objects;
 
+static const char * const safe_rb_obj_classname(VALUE obj)
+{
+  if( rb_during_gc() ){
+    /* It's not safe to call rb_obj_classname() during GC.
+     * Return dummy value in this case. */
+    return "during GC";
+  } else {
+    return rb_obj_classname(obj);
+  }
+}
+
 /**
  * Each value in the FXRuby_Objects hash table is an instance of this
  * struct. It identifies the Ruby instance associated with a C++ object.
@@ -115,7 +126,7 @@ VALUE FXRbNewPointerObj(void *ptr,swig_type_info* ty){
     FXRubyObjDesc *desc;
     if(FXMALLOC(&desc,FXRubyObjDesc,1)){
       obj=SWIG_Ruby_NewPointerObj(ptr,ty,1);
-      FXTRACE((1,"FXRbNewPointerObj(foxObj=%p) => rubyObj=%p (%s)\n",ptr,(void *)obj,rb_obj_classname(obj)));
+      FXTRACE((1,"FXRbNewPointerObj(foxObj=%p) => rubyObj=%p (%s)\n",ptr,(void *)obj,safe_rb_obj_classname(obj)));
       desc->obj=obj;
       desc->borrowed=true;
       desc->in_gc=false;
@@ -150,25 +161,6 @@ bool FXRbIsBorrowed(void* ptr){
     }
   }
 
-bool FXRbSetInGC(const void* ptr, bool enabled){
-  FXASSERT(ptr!=0);
-  FXRubyObjDesc *desc;
-  if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t *>(&desc))!=0){
-    desc->in_gc=enabled;
-    return enabled;
-    }
-  return false;
-  }
-
-bool FXRbIsInGC(const void* ptr){
-  FXASSERT(ptr!=0);
-  FXRubyObjDesc *desc;
-  if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t *>(&desc))!=0){
-    return desc->in_gc;
-    }
-  return false;
-  }
-
 
 /**
  * FXRbConvertPtr() is just a wrapper around SWIG_ConvertPtr().
@@ -267,7 +259,7 @@ void FXRbRegisterRubyObj(VALUE rubyObj,const void* foxObj) {
   FXASSERT(!NIL_P(rubyObj));
   FXASSERT(foxObj!=0);
   FXRubyObjDesc* desc;
-  FXTRACE((1,"FXRbRegisterRubyObj(rubyObj=%p (%s),foxObj=%p)\n",(void *)rubyObj,rb_obj_classname(rubyObj),foxObj));
+  FXTRACE((1,"FXRbRegisterRubyObj(rubyObj=%p (%s),foxObj=%p)\n",(void *)rubyObj,safe_rb_obj_classname(rubyObj),foxObj));
   if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t *>(&desc))!=0){
     FXASSERT(desc->borrowed);
     /* There is already a Ruby object registered for this foxObj.
@@ -308,7 +300,7 @@ void FXRbUnregisterRubyObj2(const void* foxObj, bool alsoOwned){
     FXRubyObjDesc* desc;
     if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t *>(&desc))!=0){
       if( !alsoOwned && !desc->borrowed ) return;
-      FXTRACE((1,"FXRbUnregisterRubyObj(rubyObj=%p (%s),foxObj=%p)\n",(void *)desc->obj,rb_obj_classname(desc->obj),foxObj));
+      FXTRACE((1,"FXRbUnregisterRubyObj(rubyObj=%p (%s),foxObj=%p)\n",(void *)desc->obj,safe_rb_obj_classname(desc->obj),foxObj));
       DATA_PTR(desc->obj)=0;
       FXFREE(&desc);
       st_delete(FXRuby_Objects,reinterpret_cast<st_data_t *>(const_cast<void**>(&foxObj)),reinterpret_cast<st_data_t *>(0));
@@ -356,7 +348,7 @@ VALUE FXRbGetRubyObj(const void *foxObj,bool alsoBorrowed){
   if(foxObj!=0 && st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t *>(&desc))!=0){
     FXASSERT(desc!=0);
     if(alsoBorrowed || !desc->borrowed){
-      FXTRACE((2,"FXRbGetRubyObj(foxObj=%p) => rubyObj=%p (%s)\n",foxObj,(void *)desc->obj,rb_obj_classname(desc->obj)));
+      FXTRACE((2,"FXRbGetRubyObj(foxObj=%p) => rubyObj=%p (%s)\n",foxObj,(void *)desc->obj,safe_rb_obj_classname(desc->obj)));
       return desc->obj;
       }
     }
@@ -1435,7 +1427,6 @@ void FXRbRange2LoHi(VALUE range,FXdouble& lo,FXdouble& hi){
 void FXRbCallVoidMethod_gvlcb(FXObject* recv, const char *func) {
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  FXASSERT(!FXRbIsInGC(recv));
   rb_funcall(obj,rb_intern(func),0,NULL);
   }
 
@@ -1642,7 +1633,7 @@ void FXRbCallDCDrawMethod_gvlcb(FXDC* recv, const char * func, FXint x,FXint y,c
 FXRbMenuCommand::~FXRbMenuCommand(){
   FXAccelTable *table;
   FXWindow *owner;
-  if(acckey && !FXRbIsInGC(this)){
+  if(acckey && !rb_during_gc()){
     owner=getShell()->getOwner();
     if(owner){
       table=owner->getAccelTable();
@@ -1658,7 +1649,7 @@ FXRbMenuCommand::~FXRbMenuCommand(){
 FXRbMenuCheck::~FXRbMenuCheck(){
   FXAccelTable *table;
   FXWindow *owner;
-  if(acckey && !FXRbIsInGC(this)){
+  if(acckey && !rb_during_gc()){
     owner=getShell()->getOwner();
     if(owner){
       table=owner->getAccelTable();
@@ -1674,7 +1665,7 @@ FXRbMenuCheck::~FXRbMenuCheck(){
 FXRbMenuRadio::~FXRbMenuRadio(){
   FXAccelTable *table;
   FXWindow *owner;
-  if(acckey && !FXRbIsInGC(this)){
+  if(acckey && !rb_during_gc()){
     owner=getShell()->getOwner();
     if(owner){
       table=owner->getAccelTable();

data/ext/fox16_c/extconf.rb

@@ -230,6 +230,7 @@ def do_rake_compiler_setup
         "--without-x",
         "--enable-shared",
         "--disable-static",
+        enable_config("debug") ? "--enable-debug" : "--enable-release",
         ]
       class << recipe
         def compile
@@ -390,6 +391,10 @@ unless enable_config("win32-cross")
   end
 end
 
+unless enable_config("debug")
+  $CPPFLAGS += " -DNDEBUG"
+end
+
 # Platform-specific modifications
 do_rake_compiler_setup
 

data/ext/fox16_c/include/FXRbWindow.h

@@ -149,7 +149,7 @@ inline void klass ## _dropDisable(klass* self){ \
     FXRbCallVoidMethod(this,"killFocus"); \
     } \
   void cls::changeFocus(FXWindow* child){ \
-    if(!FXRbIsInGC(this)) FXRbCallVoidMethod(this,"changeFocus",child); \
+    if(!rb_during_gc()) FXRbCallVoidMethod(this,"changeFocus",child); \
     } \
   void cls::setDefault(FXbool enable){ \
     FXRbCallVoidMethod(this,"setDefault",enable); \
@@ -173,7 +173,7 @@ inline void klass ## _dropDisable(klass* self){ \
     FXRbCallVoidMethod(this,"position",x,y,w,h); \
     } \
   void cls::recalc(){ \
-    if(!FXRbIsInGC(this)) FXRbCallVoidMethod(this,"recalc"); \
+    if(!rb_during_gc()) FXRbCallVoidMethod(this,"recalc"); \
     } \
   void cls::reparent(FXWindow* father,FXWindow* other){ \
     FXRbCallVoidMethod(this,"reparent",father,other); \

data/ext/fox16_c/include/FXRuby.h

@@ -81,8 +81,6 @@ VALUE showHelper(VALUE self, int argc, VALUE *argv, TYPE *p, swig_type_info *typ
 // Wrapper around SWIG_Ruby_NewPointerObj()
 VALUE FXRbNewPointerObj(void *ptr, swig_type_info *typeinfo);
 bool FXRbIsBorrowed(void* ptr);
-bool FXRbSetInGC(const void* ptr, bool enabled);
-bool FXRbIsInGC(const void* ptr);
 
 // Wrapper around SWIG_TypeQuery()
 swig_type_info *FXRbTypeQuery(const char *name);
@@ -369,7 +367,6 @@ template<class TYPE>
 void FXRbCallVoidMethod_gvlcb(FXObject* recv,const char *func, TYPE& arg){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  FXASSERT(!FXRbIsInGC(recv));
   rb_funcall(obj,rb_intern(func),1,to_ruby(arg));
   FXRbUnregisterBorrowedRubyObj(&arg);
   }
@@ -386,7 +383,6 @@ template<class TYPE>
 void FXRbCallVoidMethod_gvlcb(const FXObject* recv, const char *func, TYPE& arg){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  FXASSERT(!FXRbIsInGC(recv));
   rb_funcall(obj,rb_intern(func),1,to_ruby(arg));
   FXRbUnregisterBorrowedRubyObj(&arg);
   }

data/ext/fox16_c/markfuncs.cpp

@@ -53,19 +53,6 @@ void FXRbObject::markfunc(FXObject* obj){
   FXTRACE((100,"%s::markfunc(%p)\n",obj?obj->getClassName():"FXRbObject",obj));
   }
 
-static void FXRbSetInGCParentsRecursive(FXWindow *window, bool enabled){
-  FXRbSetInGC( window, true );
-  if(window->getParent()) FXRbSetInGCParentsRecursive( window->getParent(), enabled );
-  }
-
-static void FXRbSetInGCChildrenRecursive(FXWindow *window, bool enabled){
-  FXRbSetInGC( window, true );
-  for(FXWindow* child=window->getFirst(); child; child=child->getNext()){
-    FXRbSetInGCChildrenRecursive( child, enabled );
-    }
-  }
-
-
 void FXRbObject::freefunc(FXObject* self){
   if(self!=0){
     // Unregister, but don't destroy, borrowed references
@@ -78,17 +65,6 @@ void FXRbObject::freefunc(FXObject* self){
     FXASSERT(classname!=0);
     FXASSERT(strlen(classname)>3);
     if(classname[0]=='F' && classname[1]=='X' && classname[2]=='R' && classname[3]=='b'){
-      // FXWindow destructor calls recalc() and changeFocus() of it's parent window.
-      // Since these methods are routed back to Ruby code, but calling Ruby code from
-      // GC isn't a good idea, we mark the parent window as "in_gc", so that it will
-      // ignore recalc() and changeFocus() calls completely.
-      // The parent window should also be scheduled to be free'd. In the other case,
-      // the child window would have been marked as used.
-      if(self->isMemberOf(FXMETACLASS(FXWindow))){
-        FXWindow *window = dynamic_cast<FXWindow*>(self);
-        FXRbSetInGCParentsRecursive( window, true );
-        FXRbSetInGCChildrenRecursive( window, true );
-        }
       delete self;
       }
     else{

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.31"
+    "1.6.32.pre1"
   end
 end

data/test/TC_FXTreeList.rb

@@ -67,12 +67,12 @@ class TC_FXTreeList < Fox::TestCase
     @treeList.connect(SEL_INSERTED) { |sender, sel, ptr|
       anItem = ptr
     }
-    theItem = @treeList.appendItem(nil, "", nil, nil, nil, true)
+    theItem = @treeList.appendItem(nil, FXTreeItem.new(""), true)
     assert_same(theItem, anItem)
   end
 
   def test_SEL_DELETED
-    theItem = @treeList.appendItem(nil, "")
+    theItem = @treeList.appendItem(nil, FXTreeItem.new(""))
     anItem = nil
     @treeList.connect(SEL_DELETED) { |sender, sel, ptr|
       anItem = ptr

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fxruby
 version: !ruby/object:Gem::Version
-  version: 1.6.31
+  version: 1.6.32.pre1
 platform: ruby
 authors:
 - Lyle Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile
@@ -1025,9 +1025,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8