<!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][14405] </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=14405">14405</a></dd>
<dt>Author</dt> <dd>michaelgg</dd>
<dt>Date</dt> <dd>2009-07-28 21:08:47 -0500 (Tue, 28 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>More robust loading; make demo more clear</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedFreeSWITCHManagedcsproj">freeswitch/trunk/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.csproj</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedLoadercs">freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedDemocsx">freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.csx</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedDemocs">freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedDemocs"></a>
<div class="delfile"><h4>Deleted: freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs</h4></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedDemocsx"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.csx (0 => 14405)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.csx (rev 0)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.csx 2009-07-29 02:08:47 UTC (rev 14405)
</span><span class="lines">@@ -0,0 +1,110 @@
</span><ins>+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - mod_managed
+ * Copyright (C) 2008, Michael Giagnocavo <mgg@giagnocavo.net>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - mod_managed
+ *
+ * The Initial Developer of the Original Code is
+ * Michael Giagnocavo <mgg@giagnocavo.net>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Michael Giagnocavo <mgg@giagnocavo.net>
+ *
+ * Demo.cs -- mod_mono demo classes
+ *
+ */
+
+// How to test the demo (in the mod/managed directory):
+// -- Compile to dll for "normal" loading
+// -- Compile to exe for script EXE loading
+// -- Copy to managed directory for dynamic compilation
+
+using System;
+using FreeSWITCH;
+using FreeSWITCH.Native;
+
+public class AppDemo : IAppPlugin {
+
+ ManagedSession Session;
+ public void Run(AppContext context) {
+ Session = context.Session;
+ Session.HangupFunction = hangupHook;
+ Session.Answer();
+ Session.DtmfReceivedFunction = (d, t) => {
+ Log.WriteLine(LogLevel.Notice, "Received {0} for {1}.", d, t);
+ return "";
+ };
+ Log.WriteLine(LogLevel.Notice, "Inside AppDemo.Run (args '{0}'); HookState is {1}. Now will collect digits.", context.Arguments, Session.HookState);
+ Session.CollectDigits(5000); // Hanging up here will cause an abort and the next line won't be written
+ Log.WriteLine(LogLevel.Notice, "AppDemo is finishing its run and will now hang up.");
+ Session.Hangup("USER_BUSY");
+ }
+
+ void hangupHook() {
+ Log.WriteLine(LogLevel.Notice, "AppDemo hanging up, UUID: {0}.", this.Session.Uuid);
+ }
+
+}
+
+public class ApiDemo : IApiPlugin {
+
+ public void Execute(ApiContext context) {
+ context.Stream.Write(string.Format("ApiDemo executed with args '{0}' and event type {1}.",
+ context.Arguments, context.Event == null ? "<none>" : context.Event.GetEventType()));
+ }
+
+ public void ExecuteBackground(ApiBackgroundContext context) {
+ Log.WriteLine(LogLevel.Notice, "ApiDemo on a background thread #({0}), with args '{1}'.",
+ System.Threading.Thread.CurrentThread.ManagedThreadId,
+ context.Arguments);
+ }
+
+}
+
+public class LoadDemo : ILoadNotificationPlugin {
+ public bool Load() {
+ Log.WriteLine(LogLevel.Notice, "LoadDemo running.");
+ return true;
+ }
+}
+
+public class ScriptDemo {
+
+ public static void Main() {
+ switch (FreeSWITCH.Script.ContextType) {
+ case ScriptContextType.Api: {
+ var ctx = FreeSWITCH.Script.GetApiContext();
+ ctx.Stream.Write("Script executing as API with args: " + ctx.Arguments);
+ break;
+ }
+ case ScriptContextType.ApiBackground: {
+ var ctx = FreeSWITCH.Script.GetApiBackgroundContext();
+ Log.WriteLine(LogLevel.Notice, "Executing as APIBackground with args: " + ctx.Arguments);
+ break;
+ }
+ case ScriptContextType.App: {
+ var ctx = FreeSWITCH.Script.GetAppContext();
+ Log.WriteLine(LogLevel.Notice, "Executing as App with args: " + ctx.Arguments);
+ break;
+ }
+ }
+
+ }
+
+}
+
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedFreeSWITCHManagedcsproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.csproj (14404 => 14405)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.csproj 2009-07-28 23:54:18 UTC (rev 14404)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.csproj 2009-07-29 02:08:47 UTC (rev 14405)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> <Compile Include="Loader.cs" />
</span><span class="cx"> <Compile Include="Extensions.cs" />
</span><span class="cx"> <Compile Include="Log.cs" />
</span><del>- <None Include="Demo.cs" />
</del><ins>+ <None Include="Demo.csx" />
</ins><span class="cx"> <Compile Include="PluginInterfaces.cs" />
</span><span class="cx"> <Compile Include="PluginManager.cs" />
</span><span class="cx"> <Compile Include="ScriptPluginManager.cs" />
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedLoadercs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs (14404 => 14405)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs 2009-07-28 23:54:18 UTC (rev 14404)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs 2009-07-29 02:08:47 UTC (rev 14405)
</span><span class="lines">@@ -219,15 +219,24 @@
</span><span class="cx"> setup.ApplicationName = Path.GetFileName(fileName) + "_" + appDomainCount;
</span><span class="cx"> var domain = AppDomain.CreateDomain(setup.ApplicationName, null, setup);
</span><span class="cx">
</span><del>- var pm = (PluginManager)domain.CreateInstanceAndUnwrap(pmType.Assembly.FullName, pmType.FullName, null);
- if (!pm.Load(fileName)) {
</del><ins>+ PluginManager pm;
+ try {
+ pm = (PluginManager)domain.CreateInstanceAndUnwrap(pmType.Assembly.FullName, pmType.FullName, null);
+ if (!pm.Load(fileName)) {
+ AppDomain.Unload(domain);
+ unloadFile(fileName);
+ return;
+ }
+ } catch (Exception ex) {
+ // On an exception, we will unload the current file so an old copy doesnt stay active
+ Log.WriteLine(LogLevel.Alert, "Exception loading {0}: {1}", fileName, ex.ToString());
</ins><span class="cx"> AppDomain.Unload(domain);
</span><span class="cx"> unloadFile(fileName);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Update dictionaries atomically
</ins><span class="cx"> lock (loaderLock) {
</span><del>- // Update dictionaries atomically
</del><span class="cx"> unloadFile(fileName);
</span><span class="cx">
</span><span class="cx"> var pi = new PluginInfo { FileName = fileName, Domain = domain, Manager = pm };
</span><span class="lines">@@ -279,7 +288,7 @@
</span><span class="cx"> AppDomain.Unload(d);
</span><span class="cx"> Log.WriteLine(LogLevel.Info, "Unloaded {0}, domain {1}.", pi.FileName, friendlyName);
</span><span class="cx"> } catch (Exception ex) {
</span><del>- Log.WriteLine(LogLevel.Critical, "Could not unload {0}, domain {1}: {2}", pi.FileName, friendlyName, ex.ToString());
</del><ins>+ Log.WriteLine(LogLevel.Alert, "Could not unload {0}, domain {1}: {2}", pi.FileName, friendlyName, ex.ToString());
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx"> t.Priority = System.Threading.ThreadPriority.BelowNormal;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>