<!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][14654] </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=14654">14654</a></dd>
<dt>Author</dt> <dd>michaelgg</dd>
<dt>Date</dt> <dd>2009-08-28 02:57:19 -0500 (Fri, 28 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add plugin options to skip autoreload</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedAssemblyInfocs">freeswitch/trunk/src/mod/languages/mod_managed/managed/AssemblyInfo.cs</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedFreeSWITCHManageddll">freeswitch/trunk/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.dll</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedFreeSWITCHManagedpdb">freeswitch/trunk/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.pdb</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedLoadercs">freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedPluginInterfacescs">freeswitch/trunk/src/mod/languages/mod_managed/managed/PluginInterfaces.cs</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedPluginManagercs">freeswitch/trunk/src/mod/languages/mod_managed/managed/PluginManager.cs</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedScriptPluginManagercs">freeswitch/trunk/src/mod/languages/mod_managed/managed/ScriptPluginManager.cs</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedAssemblyInfocs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/AssemblyInfo.cs (14653 => 14654)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/managed/AssemblyInfo.cs 2009-08-27 22:58:55 UTC (rev 14653)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/AssemblyInfo.cs 2009-08-28 07:57:19 UTC (rev 14654)
</span><span class="lines">@@ -32,5 +32,5 @@
</span><span class="cx"> // You can specify all the values or you can default the Build and Revision Numbers
</span><span class="cx"> // by using the '*' as shown below:
</span><span class="cx"> // [assembly: AssemblyVersion("1.0.*")]
</span><del>-[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
</del><ins>+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.0")]
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedFreeSWITCHManageddll"></a>
<div class="binary"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.dll</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedFreeSWITCHManagedpdb"></a>
<div class="binary"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.pdb</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedLoadercs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs (14653 => 14654)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs 2009-08-27 22:58:55 UTC (rev 14653)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs 2009-08-28 07:57:19 UTC (rev 14654)
</span><span class="lines">@@ -133,7 +133,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void watcher_Changed(object sender, FileSystemEventArgs e) {
</span><del>- Action<string> queueFile = x => { lock (watcherLock) { watcherFiles.Add(x); } };
</del><ins>+ Action<string> queueFile = fileName => {
+ var currentPi = pluginInfos.FirstOrDefault(p => string.Compare(fileName, p.FileName, StringComparison.OrdinalIgnoreCase) == 0);
+ if (currentPi != null) {
+ var noReload = currentPi.Manager.ApiExecutors.Any(x => (x.PluginOptions & PluginOptions.NoAutoReload) == PluginOptions.NoAutoReload) ||
+ currentPi.Manager.AppExecutors.Any(x => (x.PluginOptions & PluginOptions.NoAutoReload) == PluginOptions.NoAutoReload);
+ if (noReload) return;
+ }
+ lock (watcherLock) {
+ watcherFiles.Add(fileName);
+ }
+ };
</ins><span class="cx"> try {
</span><span class="cx"> if (!initialLoadComplete) return;
</span><span class="cx"> var file = e.FullPath;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedPluginInterfacescs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/PluginInterfaces.cs (14653 => 14654)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/managed/PluginInterfaces.cs 2009-08-27 22:58:55 UTC (rev 14653)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/PluginInterfaces.cs 2009-08-28 07:57:19 UTC (rev 14654)
</span><span class="lines">@@ -88,4 +88,14 @@
</span><span class="cx"> bool Load();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ [Flags]
+ public enum PluginOptions {
+ None = 0,
+ NoAutoReload = 1,
+ }
+
+ public interface IPluginOptionsProvider {
+ PluginOptions GetOptions();
+ }
+
</ins><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedPluginManagercs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/PluginManager.cs (14653 => 14654)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/managed/PluginManager.cs 2009-08-27 22:58:55 UTC (rev 14653)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/PluginManager.cs 2009-08-28 07:57:19 UTC (rev 14654)
</span><span class="lines">@@ -51,11 +51,15 @@
</span><span class="cx"> public string Name { get { return name; } }
</span><span class="cx"> readonly string name;
</span><span class="cx">
</span><del>- protected PluginExecutor(string name, List<string> aliases) {
</del><ins>+ public PluginOptions PluginOptions { get { return pluginOptions; } }
+ readonly PluginOptions pluginOptions;
+
+ protected PluginExecutor(string name, List<string> aliases, PluginOptions pluginOptions) {
</ins><span class="cx"> if (string.IsNullOrEmpty(name)) throw new ArgumentException("No name provided.");
</span><span class="cx"> if (aliases == null || aliases.Count == 0) throw new ArgumentException("No aliases provided.");
</span><span class="cx"> this.name = name;
</span><span class="cx"> this.aliases = aliases.Distinct().ToList();
</span><ins>+ this.pluginOptions = pluginOptions;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int useCount = 0;
</span><span class="lines">@@ -85,8 +89,8 @@
</span><span class="cx">
</span><span class="cx"> readonly Func<IAppPlugin> createPlugin;
</span><span class="cx">
</span><del>- public AppPluginExecutor(string name, List<string> aliases, Func<IAppPlugin> creator)
- : base(name, aliases) {
</del><ins>+ public AppPluginExecutor(string name, List<string> aliases, Func<IAppPlugin> creator, PluginOptions pluginOptions)
+ : base(name, aliases, pluginOptions) {
</ins><span class="cx"> if (creator == null) throw new ArgumentNullException("Creator cannot be null.");
</span><span class="cx"> this.createPlugin = creator;
</span><span class="cx"> }
</span><span class="lines">@@ -117,8 +121,8 @@
</span><span class="cx">
</span><span class="cx"> readonly Func<IApiPlugin> createPlugin;
</span><span class="cx">
</span><del>- public ApiPluginExecutor(string name, List<string> aliases, Func<IApiPlugin> creator)
- : base(name, aliases) {
</del><ins>+ public ApiPluginExecutor(string name, List<string> aliases, Func<IApiPlugin> creator, PluginOptions pluginOptions)
+ : base(name, aliases, pluginOptions) {
</ins><span class="cx"> if (creator == null) throw new ArgumentNullException("Creator cannot be null.");
</span><span class="cx"> this.createPlugin = creator;
</span><span class="cx"> }
</span><span class="lines">@@ -196,7 +200,7 @@
</span><span class="cx"> var pluginTypes = allTypes.Where(x => ty.IsAssignableFrom(x) && !x.IsAbstract).ToList();
</span><span class="cx"> if (pluginTypes.Count == 0) return true;
</span><span class="cx"> foreach (var pt in pluginTypes) {
</span><del>- var load = ((ILoadNotificationPlugin)Activator.CreateInstance(pt, false));
</del><ins>+ var load = ((ILoadNotificationPlugin)Activator.CreateInstance(pt, true));
</ins><span class="cx"> if (!load.Load()) {
</span><span class="cx"> Log.WriteLine(LogLevel.Notice, "Type {0} requested no loading. Assembly will not be loaded.", pt.FullName);
</span><span class="cx"> return false;
</span><span class="lines">@@ -205,20 +209,29 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- protected void AddApiPlugins(Type[] allTypes) {
</del><ins>+ protected PluginOptions GetOptions(Type[] allTypes) {
+ var ty = typeof(IPluginOptionsProvider);
+ var pluginTypes = allTypes.Where(x => ty.IsAssignableFrom(x) && !x.IsAbstract).ToList();
+ return pluginTypes.Aggregate(PluginOptions.None, (opts, t) => {
+ var x = ((IPluginOptionsProvider)Activator.CreateInstance(t, true));
+ return opts | x.GetOptions();
+ });
+ }
+
+ protected void AddApiPlugins(Type[] allTypes, PluginOptions pluginOptions) {
</ins><span class="cx"> var iApiTy = typeof(IApiPlugin);
</span><span class="cx"> foreach (var ty in allTypes.Where(x => iApiTy.IsAssignableFrom(x) && !x.IsAbstract)) {
</span><span class="cx"> var del = CreateConstructorDelegate<IApiPlugin>(ty);
</span><del>- var exec = new ApiPluginExecutor(ty.FullName, new List<string> { ty.FullName, ty.Name }, del);
</del><ins>+ var exec = new ApiPluginExecutor(ty.FullName, new List<string> { ty.FullName, ty.Name }, del, pluginOptions);
</ins><span class="cx"> this.ApiExecutors.Add(exec);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- protected void AddAppPlugins(Type[] allTypes) {
</del><ins>+ protected void AddAppPlugins(Type[] allTypes, PluginOptions pluginOptions) {
</ins><span class="cx"> var iAppTy = typeof(IAppPlugin);
</span><span class="cx"> foreach (var ty in allTypes.Where(x => iAppTy.IsAssignableFrom(x) && !x.IsAbstract)) {
</span><span class="cx"> var del = CreateConstructorDelegate<IAppPlugin>(ty);
</span><del>- var exec = new AppPluginExecutor(ty.FullName, new List<string> { ty.FullName, ty.Name }, del);
</del><ins>+ var exec = new AppPluginExecutor(ty.FullName, new List<string> { ty.FullName, ty.Name }, del, pluginOptions);
</ins><span class="cx"> this.AppExecutors.Add(exec);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -283,9 +296,11 @@
</span><span class="cx"> var allTypes = asm.GetExportedTypes();
</span><span class="cx"> if (!RunLoadNotify(allTypes)) return false;
</span><span class="cx">
</span><del>- AddApiPlugins(allTypes);
- AddAppPlugins(allTypes);
</del><ins>+ var opts = GetOptions(allTypes);
</ins><span class="cx">
</span><ins>+ AddApiPlugins(allTypes, opts);
+ AddAppPlugins(allTypes, opts);
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedScriptPluginManagercs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/ScriptPluginManager.cs (14653 => 14654)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/managed/ScriptPluginManager.cs 2009-08-27 22:58:55 UTC (rev 14653)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/ScriptPluginManager.cs 2009-08-28 07:57:19 UTC (rev 14654)
</span><span class="lines">@@ -161,14 +161,15 @@
</span><span class="cx"> if (!RunLoadNotify(allTypes)) return false;
</span><span class="cx">
</span><span class="cx"> // Scripts can specify classes too
</span><del>- AddApiPlugins(allTypes);
- AddAppPlugins(allTypes);
</del><ins>+ var opts = GetOptions(allTypes);
+ AddApiPlugins(allTypes, opts);
+ AddAppPlugins(allTypes, opts);
</ins><span class="cx">
</span><span class="cx"> // Add the script executors
</span><span class="cx"> var name = Path.GetFileName(fileName);
</span><span class="cx"> var aliases = new List<string> { name };
</span><del>- this.ApiExecutors.Add(new ApiPluginExecutor(name, aliases, () => new ScriptApiWrapper(entryPoint)));
- this.AppExecutors.Add(new AppPluginExecutor(name, aliases, () => new ScriptAppWrapper(entryPoint)));
</del><ins>+ this.ApiExecutors.Add(new ApiPluginExecutor(name, aliases, () => new ScriptApiWrapper(entryPoint), opts));
+ this.AppExecutors.Add(new AppPluginExecutor(name, aliases, () => new ScriptAppWrapper(entryPoint), opts));
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>