<!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" />
<title>[Freeswitch-trunk][14763] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14763">14763</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-09-04 10:27:36 -0500 (Fri, 04 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>make luarun use a new pool every call</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_luafreeswitchi">freeswitch/trunk/src/mod/languages/mod_lua/freeswitch.i</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_luafreeswitch_luah">freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_luamod_luacpp">freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_luamod_lua_wrapcpp">freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodlanguagesmod_luafreeswitchi"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch.i (14762 => 14763)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch.i 2009-09-04 13:55:56 UTC (rev 14762)
+++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch.i 2009-09-04 15:27:36 UTC (rev 14763)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> %}
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> %ignore SwitchToMempool;
</span><span class="cx"> %newobject EventConsumer::pop;
</span><span class="cx"> %newobject Session;
</span><span class="lines">@@ -54,7 +55,7 @@
</span><span class="cx"> virtual switch_status_t run_dtmf_callback(void *input, switch_input_type_t itype);
</span><span class="cx"> void unsetInputCallback(void);
</span><span class="cx"> void setInputCallback(char *cbfunc, char *funcargs = NULL);
</span><del>- void setHangupHook(char *func, char *arg = NULL);
</del><ins>+ void setHangupHook(char *func, char *arg);
</ins><span class="cx"> bool ready();
</span><span class="cx"> int originate(CoreSession *a_leg_session, char *dest, int timeout);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_luafreeswitch_luah"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h (14762 => 14763)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h 2009-09-04 13:55:56 UTC (rev 14762)
+++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h 2009-09-04 15:27:36 UTC (rev 14763)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> virtual switch_status_t run_dtmf_callback(void *input, switch_input_type_t itype);
</span><span class="cx"> void unsetInputCallback(void);
</span><span class="cx"> void setInputCallback(char *cbfunc, char *funcargs = NULL);
</span><del>- void setHangupHook(char *func, char *arg = NULL);
</del><ins>+ void setHangupHook(char *func, char *arg);
</ins><span class="cx"> bool ready();
</span><span class="cx"> int originate(CoreSession *a_leg_session, char *dest, int timeout);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_luamod_luacpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp (14762 => 14763)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp 2009-09-04 13:55:56 UTC (rev 14762)
+++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp 2009-09-04 15:27:36 UTC (rev 14763)
</span><span class="lines">@@ -187,17 +187,23 @@
</span><span class="cx"> return error;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+struct lua_thread_helper {
+ switch_memory_pool_t *pool;
+ char *input_code;
+};
+
</ins><span class="cx"> static void *SWITCH_THREAD_FUNC lua_thread_run(switch_thread_t *thread, void *obj)
</span><span class="cx"> {
</span><del>- char *input_code = (char *) obj;
</del><ins>+ struct lua_thread_helper *lth = (struct lua_thread_helper *) obj;
+ switch_memory_pool_t *pool = lth->pool;
</ins><span class="cx"> lua_State *L = lua_init(); /* opens Lua */
</span><span class="cx">
</span><del>- lua_parse_and_execute(L, input_code);
</del><ins>+ lua_parse_and_execute(L, lth->input_code);
</ins><span class="cx">
</span><del>- if (input_code) {
- free(input_code);
- }
</del><ins>+ lth = NULL;
</ins><span class="cx">
</span><ins>+ switch_core_destroy_memory_pool(&pool);
+
</ins><span class="cx"> lua_uninit(L);
</span><span class="cx">
</span><span class="cx"> return NULL;
</span><span class="lines">@@ -365,11 +371,18 @@
</span><span class="cx"> {
</span><span class="cx"> switch_thread_t *thread;
</span><span class="cx"> switch_threadattr_t *thd_attr = NULL;
</span><ins>+ switch_memory_pool_t *pool;
+ lua_thread_helper *lth;
</ins><span class="cx">
</span><del>- switch_threadattr_create(&thd_attr, globals.pool);
</del><ins>+ switch_core_new_memory_pool(&pool);
+ lth = (lua_thread_helper *) switch_core_alloc(pool, sizeof(*lth));
+ lth->pool = pool;
+ lth->input_code = switch_core_strdup(lth->pool, text);
+
+ switch_threadattr_create(&thd_attr, lth->pool);
</ins><span class="cx"> switch_threadattr_detach_set(thd_attr, 1);
</span><span class="cx"> switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
</span><del>- switch_thread_create(&thread, thd_attr, lua_thread_run, strdup(text), globals.pool);
</del><ins>+ switch_thread_create(&thread, thd_attr, lua_thread_run, lth, lth->pool);
</ins><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_luamod_lua_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp (14762 => 14763)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp 2009-09-04 13:55:56 UTC (rev 14762)
+++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp 2009-09-04 15:27:36 UTC (rev 14763)
</span><span class="lines">@@ -7747,7 +7747,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-static int _wrap_Session_setHangupHook__SWIG_0(lua_State* L) {
</del><ins>+static int _wrap_Session_setHangupHook(lua_State* L) {
</ins><span class="cx"> int SWIG_arg = -1;
</span><span class="cx"> LUA::Session *arg1 = (LUA::Session *) 0 ;
</span><span class="cx"> char *arg2 = (char *) 0 ;
</span><span class="lines">@@ -7777,89 +7777,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-static int _wrap_Session_setHangupHook__SWIG_1(lua_State* L) {
- int SWIG_arg = -1;
- LUA::Session *arg1 = (LUA::Session *) 0 ;
- char *arg2 = (char *) 0 ;
-
- SWIG_check_num_args("setHangupHook",2,2)
- if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("setHangupHook",1,"LUA::Session *");
- if(!lua_isstring(L,2)) SWIG_fail_arg("setHangupHook",2,"char *");
-
- if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_LUA__Session,0))){
- SWIG_fail_ptr("Session_setHangupHook",1,SWIGTYPE_p_LUA__Session);
- }
-
- arg2 = (char *)lua_tostring(L, 2);
- (arg1)->setHangupHook(arg2);
- SWIG_arg=0;
-
- return SWIG_arg;
-
- if(0) SWIG_fail;
-
-fail:
- lua_error(L);
- return SWIG_arg;
-}
-
-
-static int _wrap_Session_setHangupHook(lua_State* L) {
- int argc;
- int argv[4]={
- 1,2,3,4
- };
-
- argc = lua_gettop(L);
- if (argc == 2) {
- int _v;
- {
- void *ptr;
- if (SWIG_isptrtype(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_LUA__Session, 0)) {
- _v = 0;
- } else {
- _v = 1;
- }
- }
- if (_v) {
- {
- _v = lua_isstring(L,argv[1]);
- }
- if (_v) {
- return _wrap_Session_setHangupHook__SWIG_1(L);
- }
- }
- }
- if (argc == 3) {
- int _v;
- {
- void *ptr;
- if (SWIG_isptrtype(L,argv[0])==0 || SWIG_ConvertPtr(L,argv[0], (void **) &ptr, SWIGTYPE_p_LUA__Session, 0)) {
- _v = 0;
- } else {
- _v = 1;
- }
- }
- if (_v) {
- {
- _v = lua_isstring(L,argv[1]);
- }
- if (_v) {
- {
- _v = lua_isstring(L,argv[2]);
- }
- if (_v) {
- return _wrap_Session_setHangupHook__SWIG_0(L);
- }
- }
- }
- }
-
- lua_pushstring(L,"No matching function for overloaded 'Session_setHangupHook'");
- lua_error(L);return 0;
-}
-
-
</del><span class="cx"> static int _wrap_Session_ready(lua_State* L) {
</span><span class="cx"> int SWIG_arg = -1;
</span><span class="cx"> LUA::Session *arg1 = (LUA::Session *) 0 ;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>