nobody at rubyforge.org
2007-Jul-21 15:51 UTC
[Wxruby-development] [1134] trunk/wxruby2/swig/mark_free_impl.i: When window is deleted, unhook ruby obj from DATA_PTR to avoid MSW crashes
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type"
content="text/html; charset=utf-8" /><style
type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:'':'';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family:
verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;
font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding:
6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid;
padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family:
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch
.binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[1134] trunk/wxruby2/swig/mark_free_impl.i: When window is deleted,
unhook ruby obj from DATA_PTR to avoid MSW crashes</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1134</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-07-21 11:51:00 -0400 (Sat, 21 Jul
2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>When window is deleted, unhook ruby obj from DATA_PTR to avoid MSW
crashes
where same pointer address is re-used before GC. Also move CtrlWItems
here</pre>
<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2swigmark_free_impli">trunk/wxruby2/swig/mark_free_impl.i</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2swigmark_free_impli"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/mark_free_impl.i (1133 => 1134)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/mark_free_impl.i        2007-07-21
15:50:04 UTC (rev 1133)
+++
trunk/wxruby2/swig/mark_free_impl.i        2007-07-21
15:51:00 UTC (rev 1134)
</span><span class="lines">@@ -22,6 +22,8 @@
</span><span class="cx"> // WindowDestroyEvent handled by
wxRubyApp
</span><span class="cx"> bool GC_IsWindowDeleted(void
*ptr)
</span><span class="cx"> {
</span><ins>+ // If objects have been ''unlinked''
then DATA_PTR = 0
+ if ( ! ptr ) return true;
</ins><span class="cx"> VALUE rb_win =
SWIG_RubyInstanceFor(ptr);
</span><span class="cx"> if ( rb_ivar_defined(rb_win,
wx_destroyed_sym ) )
</span><span class="cx">
        return
true;
</span><span class="lines">@@ -37,6 +39,8 @@
</span><span class="cx"> if ( rb_win != Qnil )
</span><span class="cx">
        {
</span><span class="cx">
        
rb_ivar_set(rb_win, wx_destroyed_sym, Qtrue);
</span><ins>+        
SWIG_RubyUnlinkObjects(ptr);
+        
SWIG_RubyRemoveTracking(ptr);
</ins><span class="cx">
        }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -92,8 +96,6 @@
</span><span class="cx"> // belong to this window
</span><span class="cx"> void GC_mark_wxWindow(void *ptr)
</span><span class="cx"> {
</span><del>- // can occasionally be NULL if called in an
evt_create handler
- if ( ! ptr ) return;
</del><span class="cx"> if ( GC_IsWindowDeleted(ptr) )
return;
</span><span class="cx">
</span><span class="cx"> wxWindow* wx_win =
(wxWindow*)ptr;
</span><span class="lines">@@ -130,4 +132,25 @@
</span><span class="cx"> if ( menu_bar )
</span><span class="cx">
        {
GC_mark_MenuBarBelongingToFrame(menu_bar); }
</span><span class="cx"> }
</span><ins>+
+// Prevents Ruby''s GC sweeping up items that are stored as client data
+// Checks whether the C++ object is still around first...
+void mark_wxControlWithItems(void* ptr) {
+ if ( GC_IsWindowDeleted(ptr) )
+        return;
+
+ wxControlWithItems* wx_cwi = (wxControlWithItems*) ptr;
+ int count = wx_cwi->GetCount();
+ if ( count == 0 )
+        return;
// Empty control
+ if ( ! wx_cwi->HasClientObjectData() && !
wx_cwi->HasClientUntypedData() )
+        return;
// Control containing only strings
+
+ for (int i = 0; i < count; ++i)
+        {
+         VALUE
object = (VALUE) wx_cwi->GetClientData(i);
+         if (
object && object != Qnil )
+                rb_gc_mark(object);
+        }
+}
</ins><span class="cx"> %}
</span></span></pre>
</div>
</div>
</body>
</html>
Maybe Matching Threads
- [1135] trunk/wxruby2/swig/mark_free_impl.i: Convert from DOS to Unix newlines
- [1140] trunk/wxruby2/swig/mark_free_impl.i: Remove instance variable marking of deleted Wx Windows because it''s redundant
- [1127] trunk/wxruby2: Move shared C++ GC functions into separate file included into wx.i
- [1141] trunk/wxruby2/swig/mark_free_impl.i: ControlWithItems call default Window mark routine to preserve ToolTips etc
- [1109] trunk/wxruby2/swig: Move marking of MenuBar from direct %markfunc to via mark_wxFrame, so
Wisdom of the Ancients
