thr3ads.net - wxruby development - [Wxruby-development] [1069] trunk/wxruby2/swig/typemap.i: Fix big memory leak in methods taking wxString as a parameter [Jun 2007]

If this information is useful, please help other people find it:
Share via:

nobody at rubyforge.org

2007-Jun-25 22:49 UTC

[Wxruby-development] [1069] trunk/wxruby2/swig/typemap.i: Fix big memory leak in methods taking wxString as a parameter

<!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>[1069] trunk/wxruby2/swig/typemap.i: Fix big memory leak in methods
taking wxString as a parameter</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>1069</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-06-25 18:49:21 -0400 (Mon, 25 Jun
2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix big memory leak in methods taking wxString as a
parameter</pre>

<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2swigtypemapi">trunk/wxruby2/swig/typemap.i</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2swigtypemapi"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/typemap.i (1068 => 1069)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/typemap.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-06-25
18:37:07 UTC (rev 1068)
+++
trunk/wxruby2/swig/typemap.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-06-25
22:49:21 UTC (rev 1069)
</span><span class="lines">@@ -1,24 +1,11 @@
</span><span class="cx"> // Copyright 2004-2007 by Kevin
Smith
</span><span class="cx"> // released under the MIT-style
wxruby2 license
</span><span class="cx"> 
</span><del>-##############################################################
-%typemap(in) wxString& {
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp//
$argnum: $1_type $1_name ($1_mangle) [$1_ltype]
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp$1 =
new wxString(StringValuePtr($input), wxConvUTF8);
-}
</del><span class="cx"> 
</span><del>-%typemap(in) const wxString& {
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp$1 =
new wxString(StringValuePtr($input), wxConvUTF8);
-}
-
-%typemap(in) wxString* {
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp$1 =
new wxString(StringValuePtr($input), wxConvUTF8);
-}
-
-%typemap(directorout) wxString, wxString& "$result =
wxString(StringValuePtr($input), wxConvUTF8);";
-
</del><ins>+// include SWIG''s built-in typemaps, eg for
OUTPUT/INPUT
</ins><span class="cx"> %include "typemaps.i"
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> %typemap(directorargout) ( int *
OUTPUT ) {
</span><span class="cx">   if($1 != NULL)
</span><span class="cx">   {
</span><span class="lines">@@ -59,22 +46,17 @@
</span><span class="cx">   }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-/*
-Currently incompatible with the ruby post-processing of swigged .cpp files
-Needs to be fixed in fixdeleting.rb before this can be uncommented out
-%typemap(freearg) wxString & {
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspdelete
$1;
-}
</del><ins>+// (ruby) String <-> wxString
+%typemap(in) wxString& "$1 = new wxString(StringValuePtr($input),
wxConvUTF8);"
+%typemap(in) wxString* "$1 = new wxString(StringValuePtr($input),
wxConvUTF8);"
</ins><span class="cx"> 
</span><del>-%typemap(freearg) const wxString& {
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspdelete
$1;
-}
</del><ins>+%typemap(directorout) wxString, wxString&
"$result = wxString(StringValuePtr($input), wxConvUTF8);";
</ins><span class="cx"> 
</span><del>- Removed temporarily 2006-04-16 kbs
-%typemap(freearg) wxString* {
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspdelete
$1;
-}
-*/
</del><ins>+// Only free the wxString argument if it has been
assigned as a heap
+// variable by the typemap - SWIG assigns the default as stack varialbes
+// - but can''t get these to work in the input typemap for now.
+%typemap(freearg) wxString & "if ( argc > $argnum - 2 ) delete
$1;"
+%typemap(freearg) wxString* "if ( argc > $argnum - 2 ) delete $1;"
</ins><span class="cx"> 
</span><span class="cx"> %typemap(directorin) wxString,
const wxString &, wxString & "$input = rb_str_new2((const char
*)$1.mb_str());";
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>

Reasonably Related Threads

Search for more reasonably related threads

wxruby development - Jun 2007 - [1069] trunk/wxruby2/swig/typemap.i: Fix big memory leak in methods taking wxString as a parameter

[Wxruby-development] [1069] trunk/wxruby2/swig/typemap.i: Fix big memory leak in methods taking wxString as a parameter

Reasonably Related Threads

Wisdom of the Ancients